XOOPS / XoopsCore25

htdocs/install/class/dbmanager.php

Spacing +15 added lines, -15 removed lines

@@ -23,12 +23,12 @@ 
 //  along with this program; if not, write to the Free Software              //
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
-include_once XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsload.php';
-include_once XOOPS_ROOT_PATH . '/class/preload.php';
-include_once XOOPS_ROOT_PATH . '/class/database/databasefactory.php';
-include_once XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php';
-include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
+include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsload.php';
+include_once XOOPS_ROOT_PATH.'/class/preload.php';
+include_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
+include_once XOOPS_ROOT_PATH.'/class/database/'.XOOPS_DB_TYPE.'database.php';
+include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
 
 /**
  * database manager for XOOPS installer
@@ -60,7 +60,7 @@ 
     {
         $isConnected = ($this->db->connect(false) !== false);
         if (!$isConnected) {
-            $_SESSION['error'] = '(' . $this->db->conn->connect_errno . ') ' . $this->db->conn->connect_error;
+            $_SESSION['error'] = '('.$this->db->conn->connect_errno.') '.$this->db->conn->connect_error;
         }
         return $isConnected;
     }
@@ -70,7 +70,7 @@ 
      */
     public function dbExists()
     {
-        return ($this->db->connect() != false);// ? true : false;
+        return ($this->db->connect() != false); // ? true : false;
     }
 
     /**
@@ -80,9 +80,9 @@ 
     {
         $this->db->connect(false);
 
-        $result = $this->db->query('CREATE DATABASE ' . XOOPS_DB_NAME);
+        $result = $this->db->query('CREATE DATABASE '.XOOPS_DB_NAME);
 
-        return ($result != false);// ? true : false;
+        return ($result != false); // ? true : false;
     }
 
     /**
@@ -142,7 +142,7 @@ 
                         }
                     }
                 } elseif ($prefixed_query[1] === 'DROP TABLE') {
-                    if ($this->db->query('DROP TABLE ' . $table) != false) {
+                    if ($this->db->query('DROP TABLE '.$table) != false) {
                         if (!isset($this->s_tables['drop'][$table])) {
                             $this->s_tables['drop'][$table] = 1;
                         }
@@ -245,7 +245,7 @@ 
     {
         $this->db->connect();
         $table = $this->db->prefix($table);
-        $query = 'INSERT INTO ' . $table . ' ' . $query;
+        $query = 'INSERT INTO '.$table.' '.$query;
         if (!$this->db->queryF($query)) {
             if (!isset($this->f_tables['insert'][$table])) {
                 $this->f_tables['insert'][$table] = 1;
@@ -283,7 +283,7 @@ 
         $deleted = array();
         $this->db->connect();
         foreach ($tables as $key => $val) {
-            if (!$this->db->query('DROP TABLE ' . $this->db->prefix($key))) {
+            if (!$this->db->query('DROP TABLE '.$this->db->prefix($key))) {
                 $deleted[] = $ct;
             }
         }
@@ -302,9 +302,9 @@ 
         $ret   = false;
         if ($table != '') {
             $this->db->connect();
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix($table);
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix($table);
             $ret = $this->db->query($sql);
-            $ret = !empty($ret);  //return false on error or $table not found
+            $ret = !empty($ret); //return false on error or $table not found
         }
 
         return $ret;

htdocs/install/class/pathcontroller.php

Spacing +11 added lines, -11 removed lines

@@ -73,16 +73,16 @@ 
                 $this->xoopsPath['root'] = $path;
             }
             // Firstly, locate XOOPS lib folder out of XOOPS root folder
-            $this->xoopsPath['lib'] = dirname($path) . '/' . $this->xoopsPathDefault['lib'];
+            $this->xoopsPath['lib'] = dirname($path).'/'.$this->xoopsPathDefault['lib'];
             // If the folder is not created, re-locate XOOPS lib folder inside XOOPS root folder
-            if (!is_dir($this->xoopsPath['lib'] . '/')) {
-                $this->xoopsPath['lib'] = $path . '/' . $this->xoopsPathDefault['lib'];
+            if (!is_dir($this->xoopsPath['lib'].'/')) {
+                $this->xoopsPath['lib'] = $path.'/'.$this->xoopsPathDefault['lib'];
             }
             // Firstly, locate XOOPS data folder out of XOOPS root folder
-            $this->xoopsPath['data'] = dirname($path) . '/' . $this->xoopsPathDefault['data'];
+            $this->xoopsPath['data'] = dirname($path).'/'.$this->xoopsPathDefault['data'];
             // If the folder is not created, re-locate XOOPS data folder inside XOOPS root folder
-            if (!is_dir($this->xoopsPath['data'] . '/')) {
-                $this->xoopsPath['data'] = $path . '/' . $this->xoopsPathDefault['data'];
+            if (!is_dir($this->xoopsPath['data'].'/')) {
+                $this->xoopsPath['data'] = $path.'/'.$this->xoopsPathDefault['data'];
             }
         }
         if (isset($_SESSION['settings']['URL'])) {
@@ -143,7 +143,7 @@ 
                     $tempCookieDomain = $tempParts['host'];
                 }
                 $request['COOKIE_DOMAIN'] = $tempCookieDomain;
-                $this->xoopsCookieDomain = $tempCookieDomain;;
+                $this->xoopsCookieDomain = $tempCookieDomain; ;
             }
         }
     }
@@ -223,19 +223,19 @@ 
         if (is_array($path)) {
             foreach (array_keys($path) as $item) {
                 if (is_string($item)) {
-                    $error[$parent . '/' . $item] = $this->makeWritable($parent . '/' . $item);
+                    $error[$parent.'/'.$item] = $this->makeWritable($parent.'/'.$item);
                     if (empty($path[$item])) {
                         continue;
                     }
                     foreach ($path[$item] as $child) {
-                        $this->setPermission($parent . '/' . $item, $child, $error);
+                        $this->setPermission($parent.'/'.$item, $child, $error);
                     }
                 } else {
-                    $error[$parent . '/' . $path[$item]] = $this->makeWritable($parent . '/' . $path[$item]);
+                    $error[$parent.'/'.$path[$item]] = $this->makeWritable($parent.'/'.$path[$item]);
                 }
             }
         } else {
-            $error[$parent . '/' . $path] = $this->makeWritable($parent . '/' . $path);
+            $error[$parent.'/'.$path] = $this->makeWritable($parent.'/'.$path);
         }
 
         return null;

htdocs/install/class/installwizard.php

Spacing +7 added lines, -7 removed lines

@@ -195,7 +195,7 @@ 
         $host  = $_SERVER['HTTP_HOST'];
         $base  = substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
 
-        return $proto . '://' . $host . $base;
+        return $proto.'://'.$host.$base;
     }
 
     /**
@@ -225,7 +225,7 @@ 
         }
         $page = $pages[$pageIndex];
 
-        return $this->baseLocation() . "/page_{$page}.php";
+        return $this->baseLocation()."/page_{$page}.php";
     }
 
     /**
@@ -252,7 +252,7 @@ 
 
         foreach ($this->form as $form) {
             $ret .= '<div class="panel panel-info">';
-            $ret .= '<div class="panel-heading">' . $form->getTitle() . '</div>';
+            $ret .= '<div class="panel-heading">'.$form->getTitle().'</div>';
             $ret .= '<div class="panel-body">';
 
             foreach ($form->getElements() as $ele) {
@@ -260,20 +260,20 @@ 
                     if (!$ele->isHidden()) {
                         if (($caption = $ele->getCaption()) != '') {
                             $name = $ele->getName();
-                            $ret .= "<label class='xolabel' for='" . $ele->getName() . "'>" . $caption . '</label>';
+                            $ret .= "<label class='xolabel' for='".$ele->getName()."'>".$caption.'</label>';
                             if (($desc = $ele->getDescription()) != '') {
                                 $ret .= "<div class='xoform-help  alert alert-info'>";
                                 $ret .= $desc;
                                 $ret .= '</div>';
                             }
                         }
-                        $ret .= $ele->render() . "\n";
+                        $ret .= $ele->render()."\n";
                     } else {
-                        $hidden .= $ele->render() . "\n";
+                        $hidden .= $ele->render()."\n";
                     }
                 }
             }
-            $ret .= "</div></div>\n" . $hidden . "\n" . $form->renderValidationJS(true);
+            $ret .= "</div></div>\n".$hidden."\n".$form->renderValidationJS(true);
         }
 
         return $ret;

htdocs/install/page_siteinit.php

Spacing +12 added lines, -12 removed lines

@@ -31,9 +31,9 @@ 
 $pageHasForm = true;
 $pageHasHelp = false;
 
-$vars =& $_SESSION['siteconfig'];
+$vars = & $_SESSION['siteconfig'];
 
-$error =& $_SESSION['error'];
+$error = & $_SESSION['error'];
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $vars['adminname']  = trim($_POST['adminname']);
@@ -75,7 +75,7 @@ 
         exit();
     }
 
-    $res = $dbm->query('SELECT COUNT(*) FROM ' . $dbm->db->prefix('users'));
+    $res = $dbm->query('SELECT COUNT(*) FROM '.$dbm->db->prefix('users'));
     list($isadmin) = $dbm->db->fetchRow($res);
 }
 
@@ -85,15 +85,15 @@ 
 if ($isadmin) {
     $pageHasForm = false;
     $pageHasHelp = false;
-    echo "<div class='alert alert-warning'>" . ADMIN_EXIST . "</div>\n";
+    echo "<div class='alert alert-warning'>".ADMIN_EXIST."</div>\n";
 } else {
         echo '<script type="text/javascript">
                 var desc = new Array();
-                desc[0] = "' . PASSWORD_VERY_WEAK . '";
-                desc[1] = "' . PASSWORD_WEAK . '";
-                desc[2] = "' . PASSWORD_BETTER . '";
-                desc[3] = "' . PASSWORD_MEDIUM . '";
-                desc[4] = "' . PASSWORD_STRONG . '";
+                desc[0] = "' . PASSWORD_VERY_WEAK.'";
+                desc[1] = "' . PASSWORD_WEAK.'";
+                desc[2] = "' . PASSWORD_BETTER.'";
+                desc[3] = "' . PASSWORD_MEDIUM.'";
+                desc[4] = "' . PASSWORD_STRONG.'";
         </script>';
 
     ?>
@@ -106,14 +106,14 @@ 
         echo xoFormField('adminname', $vars['adminname'], ADMIN_LOGIN_LABEL);
         if (isset($error['name'])) {
             foreach ($error['name'] as $errmsg) {
-                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . $errmsg . '</div>';
+                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.$errmsg.'</div>';
             }
         }
 
         echo xoFormField('adminmail', $vars['adminmail'], ADMIN_EMAIL_LABEL);
         if (isset($error['email'])) {
             foreach ($error['email'] as $errmsg) {
-                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . $errmsg . '</div>';
+                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.$errmsg.'</div>';
             }
         }
         ?>
@@ -125,7 +125,7 @@ 
                 echo xoPassField('adminpass2', '', ADMIN_CONFIRMPASS_LABEL);
                 if (isset($error['pass'])) {
                     foreach ($error['pass'] as $errmsg) {
-                        echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . $errmsg . '</div>';
+                        echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.$errmsg.'</div>';
                     }
                 }
                 ?>

htdocs/install/page_end.php

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
 $key->kill();
 defined('XOOPS_INSTALL') || die('XOOPS Installation wizard die');
 
-$install_rename_suffix = uniqid(substr(md5($x = mt_rand()) . $x, -10));
-$installer_modified    = 'install_remove_' . $install_rename_suffix;
+$install_rename_suffix = uniqid(substr(md5($x = mt_rand()).$x, -10));
+$installer_modified    = 'install_remove_'.$install_rename_suffix;
 
 $pageHasForm = false;
 

htdocs/install/cleanup.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 $install_rename_suffix = $_POST['instsuffix'];
 if (preg_match('/^[a-f0-9]{23}$/', $install_rename_suffix)) {
-    $installer_modified = 'install_remove_' . $install_rename_suffix;
+    $installer_modified = 'install_remove_'.$install_rename_suffix;
     install_finalize($installer_modified);
     echo 'OK';
 } else {

htdocs/install/page_tablescreate.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 $pageHasForm = false;
 $pageHasHelp = false;
 
-$vars =& $_SESSION['settings'];
+$vars = & $_SESSION['settings'];
 
 include_once '../mainfile.php';
 include_once './class/dbmanager.php';
@@ -43,10 +43,10 @@ 
 }
 
 if ($dbm->tableExists('users')) {
-    $content = '<div class="alert alert-info"><span class="fa fa-info-circle text-info"></span> ' . XOOPS_TABLES_FOUND . '</div>';
+    $content = '<div class="alert alert-info"><span class="fa fa-info-circle text-info"></span> '.XOOPS_TABLES_FOUND.'</div>';
 } else {
-    $result  = $dbm->queryFromFile('./sql/' . XOOPS_DB_TYPE . '.structure.sql');
-    $content = '<div class="alert alert-success"><span class="fa fa-check text-success"></span> ' . XOOPS_TABLES_CREATED
-        . '</div><div class="well">' . $dbm->report() . '</div>';
+    $result  = $dbm->queryFromFile('./sql/'.XOOPS_DB_TYPE.'.structure.sql');
+    $content = '<div class="alert alert-success"><span class="fa fa-check text-success"></span> '.XOOPS_TABLES_CREATED
+        . '</div><div class="well">'.$dbm->report().'</div>';
 }
 include './include/install_tpl.php';

htdocs/install/page_start.php

Spacing +6 added lines, -6 removed lines

@@ -35,26 +35,26 @@
 
 $writable = '<div class="alert alert-warning"><ul style="list-style: none;">';
 foreach ($wizard->configs['writable'] as $key => $value) {
-    if (is_dir('../' . $value)) {
-        $writable .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>' . $value . '</strong></li>';
+    if (is_dir('../'.$value)) {
+        $writable .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>'.$value.'</strong></li>';
     } else {
-        $writable .= '<li><span class="fa fa-fw fa-file-code-o"></span> <strong>' . $value . '</strong></li>';
+        $writable .= '<li><span class="fa fa-fw fa-file-code-o"></span> <strong>'.$value.'</strong></li>';
     }
 }
 $writable .= '</ul></div>';
 
 $xoops_trust = '<div class="alert alert-warning"><ul style="list-style: none;">';
 foreach ($wizard->configs['xoopsPathDefault'] as $key => $value) {
-    $xoops_trust .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>' . $value . '</strong></li>';
+    $xoops_trust .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>'.$value.'</strong></li>';
 }
 $xoops_trust .= '</ul></div>';
 
 $writable_trust = '<div class="alert alert-warning"><ul style="list-style: none;">';
 foreach ($wizard->configs['dataPath'] as $key => $value) {
-    $writable_trust .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>' . $wizard->configs['xoopsPathDefault']['data'] . '/' . $key . '</strong></li>';
+    $writable_trust .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>'.$wizard->configs['xoopsPathDefault']['data'].'/'.$key.'</strong></li>';
     if (is_array($value)) {
         foreach ($value as $key2 => $value2) {
-            $writable_trust .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>' . $wizard->configs['xoopsPathDefault']['data'] . '/' . $key . '/' . $value2 . '</strong></li>';
+            $writable_trust .= '<li><span class="fa fa-fw fa-folder-open-o"></span> <strong>'.$wizard->configs['xoopsPathDefault']['data'].'/'.$key.'/'.$value2.'</strong></li>';
         }
     }
 }

htdocs/install/page_dbsettings.php

Indentation +6 added lines, -6 removed lines

@@ -69,8 +69,8 @@ 
         }
         if ($db_exist && $vars['DB_CHARSET']) {
             $sql = 'ALTER DATABASE `' . $dbName . '` DEFAULT CHARACTER SET '
-                   . mysqli_real_escape_string($link, $vars['DB_CHARSET'])
-                   . ($vars['DB_COLLATION'] ? ' COLLATE ' . mysqli_real_escape_string($link, $vars['DB_COLLATION']) : '');
+                    . mysqli_real_escape_string($link, $vars['DB_CHARSET'])
+                    . ($vars['DB_COLLATION'] ? ' COLLATE ' . mysqli_real_escape_string($link, $vars['DB_COLLATION']) : '');
             if (!mysqli_query($link, $sql)) {
                 $error = ERR_CHARSET_NOT_SET . $sql;
             }
@@ -85,10 +85,10 @@ 
 if (@empty($vars['DB_NAME'])) {
     // Fill with default values
     $vars = array_merge($vars, array(
-                                 'DB_NAME'      => '',
-                                 'DB_CHARSET'   => 'utf8',
-                                 'DB_COLLATION' => '',
-                                 'DB_PREFIX'    => 'x' . substr(md5(time()), 0, 3)));
+                                    'DB_NAME'      => '',
+                                    'DB_CHARSET'   => 'utf8',
+                                    'DB_COLLATION' => '',
+                                    'DB_PREFIX'    => 'x' . substr(md5(time()), 0, 3)));
 }
 
 ob_start();

Spacing +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@ 
 $pageHasForm = true;
 $pageHasHelp = true;
 
-$vars =& $_SESSION['settings'];
+$vars = & $_SESSION['settings'];
 
 $hostConnectPrefix = empty($vars['DB_PCONNECT']) ? '' : 'p:';
 $link = mysqli_connect($hostConnectPrefix.$vars['DB_HOST'], $vars['DB_USER'], $vars['DB_PASS']);
 if (0 !== $link->connect_errno) {
-    $error = ERR_NO_DBCONNECTION .' (' . $link->connect_errno . ') ' . $link->connect_error;
+    $error = ERR_NO_DBCONNECTION.' ('.$link->connect_errno.') '.$link->connect_error;
     $wizard->redirectToPage('-1', $error);
     exit();
 }
@@ -61,18 +61,18 @@ 
     if (empty($error)) {
         if (!@mysqli_select_db($link, $dbName)) {
             // Database not here: try to create it
-            $result = mysqli_query($link, 'CREATE DATABASE `' . $dbName . '`');
+            $result = mysqli_query($link, 'CREATE DATABASE `'.$dbName.'`');
             if (!$result) {
                 $error    = ERR_NO_DATABASE;
                 $db_exist = false;
             }
         }
         if ($db_exist && $vars['DB_CHARSET']) {
-            $sql = 'ALTER DATABASE `' . $dbName . '` DEFAULT CHARACTER SET '
+            $sql = 'ALTER DATABASE `'.$dbName.'` DEFAULT CHARACTER SET '
                    . mysqli_real_escape_string($link, $vars['DB_CHARSET'])
-                   . ($vars['DB_COLLATION'] ? ' COLLATE ' . mysqli_real_escape_string($link, $vars['DB_COLLATION']) : '');
+                   . ($vars['DB_COLLATION'] ? ' COLLATE '.mysqli_real_escape_string($link, $vars['DB_COLLATION']) : '');
             if (!mysqli_query($link, $sql)) {
-                $error = ERR_CHARSET_NOT_SET . $sql;
+                $error = ERR_CHARSET_NOT_SET.$sql;
             }
         }
     }
@@ -88,13 +88,13 @@ 
                                  'DB_NAME'      => '',
                                  'DB_CHARSET'   => 'utf8',
                                  'DB_COLLATION' => '',
-                                 'DB_PREFIX'    => 'x' . substr(md5(time()), 0, 3)));
+                                 'DB_PREFIX'    => 'x'.substr(md5(time()), 0, 3)));
 }
 
 ob_start();
 ?>
 <?php if (!empty($error)) {
-    echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . htmlspecialchars($error) . "</div>\n";
+    echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.htmlspecialchars($error)."</div>\n";
 } ?>
 
     <script type="text/javascript">