Merge branch 'master' of https://github.com/manusreload/GLFramework

Author: manusreload

modules/installer/controller/setup.php

@@ -110,7 +110,6 @@ private function step1()
             $upload = $this->getUploads()->allocate('banner');
             $config = $this->loadCurrentConfig();
             $this->parseUploads();
-            $config['app'] = array_merge($config['app'], $_POST['settings']);
             if($upload->isSuccess())
             {
                 if($upload->move())
@@ -126,6 +125,7 @@ private function step1()
             $config['app']['name'] = $_POST['site_name'];
             $config['app']['debug'] = $_POST['debug']?true:false;
             $config['app']['ssl'] = $_POST['ssl']?true:false;
+            $config['app'] = array_merge($config['app'], $_POST['settings']);
             if($this->saveConfig($config))
             {
                 return true;
@@ -147,6 +147,7 @@ private function step2()
             $config['database']['username'] = $_POST['username'];
             $config['database']['password'] = $_POST['password'];
             $config['database']['database'] = $_POST['database'];
+            $config['database']['port'] = $_POST['port'];
             try
             {
                 if($this->getDb()->isSelected())
@@ -386,4 +387,4 @@ public function getInstallers()
         }
         return $result;
     }
-}
+}

modules/installer/view/steps/2.twig

@@ -27,11 +27,17 @@
                     </div>
                 </div>
                 <div class="form-group">
-                        <label class="control-label col-lg-4">Dase de datos</label>
+                    <label class="control-label col-lg-4">Dase de datos</label>
                     <div class="col-lg-8">
                         <input class="form-control" name="database" value="{{  _POST.database | default(mainconfig.database.database ) }}">
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="control-label col-lg-4">Puerto</label>
+                    <div class="col-lg-8">
+                        <input class="form-control" name="port" value="{{  _POST.port | default(mainconfig.database.port ) }}" placeholder="(Opcional)">
+                    </div>
+                </div>
                 <div class="form-group">
                     <div class="col-lg-8 col-lg-offset-4">
                         <input type="submit" class="btn btn-success" name="save" value="Siguiente Paso">
@@ -66,4 +72,4 @@
 GRANT ALL ON &lt;databasename&gt;.* TO '&lt;username&gt;'@'localhost' IDENTIFIED BY '&lt;password&gt;';</pre>
         </p>
     </div>
-</div>
+</div>

src/Database/Connection.php

@@ -41,7 +41,7 @@ abstract class Connection
      * @param $password
      * @return mixed
      */
-    abstract public function connect($hostname, $username, $password);
+    abstract public function connect($hostname, $username, $password, $port = null);
 
     /**
      * TODO

src/Database/MySQLConnection.php

@@ -59,10 +59,10 @@ class MySQLConnection extends Connection
      * @param $password
      * @return bool
      */
-    public function connect($hostname, $username, $password)
+    public function connect($hostname, $username, $password, $port = null)
     {
         try {
-            $this->pdo = new \PDO('mysql:host=' . $hostname . ';', $username, $password);
+            $this->pdo = new \PDO('mysql:host=' . $hostname . ';' . ($port>0?"port=" . $port . ";":""), $username, $password);
             $result = Events::dispatch('onPDOCreated', array(&$this->pdo));
             if (intval($this->pdo->errorCode()) === 0) {
                 $this->pdo->exec('SET NAMES utf8');

src/DatabaseManager.php

@@ -155,7 +155,8 @@ public function connect()
             $host = $config['database']['hostname'];
             $user = $config['database']['username'];
             $pass = $config['database']['password'];
-            if ($conn->connect($host, $user, $pass)) {
+            $port = $config['database']['port'];
+            if ($conn->connect($host, $user, $pass, $port)) {
                 $this->connection = $conn;
                 $this->createCache();
                 return true;