alxarafe / alixar

Dolibarr/Modules/Install/Controller/InstallController.php

Spacing +12 added lines, -12 removed lines

@@ -152,9 +152,9 @@ 
 // Only works if you are not in safe_mode. / Ne fonctionne que si on est pas en safe_mode.
 
         $err = error_reporting();
-        error_reporting(0);      // Disable all errors
+        error_reporting(0); // Disable all errors
 //error_reporting(E_ALL);
-        @set_time_limit(1800);   // Need 1800 on some very slow OS like Windows 7/64
+        @set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64
         error_reporting($err);
 
         $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
@@ -220,7 +220,7 @@ 
             print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
             $error = 0;
 
-            $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int)$conf->db->port);
+            $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
 
             if ($db->connected) {
                 print "<tr><td>";
@@ -704,7 +704,7 @@ 
 
         $this->conf->file->instance_unique_id = (empty($conf->main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $conf->main_instance_unique_id); // Unique id of instance
 
-        $hash_unique_id = Security::dol_hash('dolibarr' . $this->conf->file->instance_unique_id, 'sha256');   // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+        $hash_unique_id = Security::dol_hash('dolibarr' . $this->conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
         $out = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"' . ((getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked" checked="true"') . '> ';
         $out .= '<label for="dolibarrpingno">' . $this->langs->trans("MakeAnonymousPing") . '</label>';
@@ -1166,7 +1166,7 @@ 
                 $this->conf->db->name = $config->main_db_name;
                 $this->conf->db->user = $config->main_db_user;
                 $this->conf->db->pass = $config->main_db_pass;
-                $db = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $this->conf->db->user, $this->conf->db->pass, $this->conf->db->name, (int)$this->conf->db->port);
+                $db = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $this->conf->db->user, $this->conf->db->pass, $this->conf->db->name, (int) $this->conf->db->port);
                 if ($db->connected && $db->database_selected) {
                     $ok = true;
                 }
@@ -1345,7 +1345,7 @@ 
 
     private function getMigrationScript()
     {
-        $dir = BASE_PATH . "/../Dolibarr/Modules/Install/mysql/migration/";   // We use mysql migration scripts whatever is database driver
+        $dir = BASE_PATH . "/../Dolibarr/Modules/Install/mysql/migration/"; // We use mysql migration scripts whatever is database driver
         dolibarr_install_syslog("Scan sql files for migration files in " . $dir);
 
         // Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration
@@ -1426,7 +1426,7 @@ 
                 $db_user,
                 $db_pass,
                 'User an database creation',
-                (int)$this->config->db->port
+                (int) $this->config->db->port
             );
 
             if ($this->db_create_database) {
@@ -1464,7 +1464,7 @@ 
             $this->config->db->user,
             $this->config->db->pass,
             $this->config->db->name,
-            (int)$this->config->db->port
+            (int) $this->config->db->port
         );
 
         if (!$db->ok) {
@@ -1652,7 +1652,7 @@ 
 
                     // Check database connection
 
-                    $db = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $userroot, $passroot, $databasefortest, (int)$this->conf->db->port);
+                    $db = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $userroot, $passroot, $databasefortest, (int) $this->conf->db->port);
 
                     if ($db->error) {
                         print '<div class="error">' . $db->error . '</div>';
@@ -1736,7 +1736,7 @@ 
                 // If database creation was asked, we create it
                 if (!$error && (isset($this->db_create_database) && ($this->db_create_database == "1" || $this->db_create_database == "on"))) {
                     dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);
-                    $newdb = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $userroot, $passroot, '', (int)$this->conf->db->port);
+                    $newdb = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $userroot, $passroot, '', (int) $this->conf->db->port);
                     //print 'eee'.$this->conf->db->type." ".$this->conf->db->host." ".$userroot." ".$passroot." ".$this->conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
 
                     if ($newdb->connected) {
@@ -1796,7 +1796,7 @@ 
                     dolibarr_install_syslog("step1: connection type=" . $this->conf->db->type . " on host=" . $this->conf->db->host . " port=" . $this->conf->db->port . " user=" . $this->conf->db->user . " name=" . $this->conf->db->name);
                     //print "connection de type=".$this->conf->db->type." sur host=".$this->conf->db->host." port=".$this->conf->db->port." user=".$this->conf->db->user." name=".$this->conf->db->name;
 
-                    $db = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $this->conf->db->user, $this->conf->db->pass, $this->conf->db->name, (int)$this->conf->db->port);
+                    $db = getDoliDBInstance($this->conf->db->type, $this->conf->db->host, $this->conf->db->user, $this->conf->db->pass, $this->conf->db->name, (int) $this->conf->db->port);
 
                     if ($db->connected) {
                         dolibarr_install_syslog("step1: connection to server by user " . $this->conf->db->user . " ok");
@@ -1922,7 +1922,7 @@ 
             fwrite($fp, '$dolibarr_main_db_host=\'' . dol_escape_php(trim($this->db_host), 1) . '\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_port=\'' . ((int)$this->db_port) . '\';');
+            fwrite($fp, '$dolibarr_main_db_port=\'' . ((int) $this->db_port) . '\';');
             fwrite($fp, "\n");
 
             fwrite($fp, '$dolibarr_main_db_name=\'' . dol_escape_php(trim($this->db_name), 1) . '\';');