XOOPS / XoopsCore

htdocs/install/page_extensioninstaller.php

Spacing +17 added lines, -17 removed lines

@@ -22,7 +22,7 @@ 
 $xoopsOption['checkadmin'] = true;
 $xoopsOption['hascommon'] = true;
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 $xoops = Xoops::getInstance();
 
@@ -32,8 +32,8 @@ 
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $xoops->loadLocale('system');
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
+    include_once XOOPS_ROOT_PATH."/modules/system/class/module.php";
+    include_once XOOPS_ROOT_PATH."/modules/system/class/system.php";
 
     $system = System::getInstance();
 
@@ -49,7 +49,7 @@ 
     $pageHasForm = false;
 
     if (count($msgs) > 0) {
-        $content = "<div class='x2-note successMsg'>" . INSTALLED_EXTENSION . "</div><ul class='log'>";
+        $content = "<div class='x2-note successMsg'>".INSTALLED_EXTENSION."</div><ul class='log'>";
         foreach ($msgs as $msg) {
             if ($msg instanceof XoopsModule) {
                 $tempvar = $msg->modinfo['name'];
@@ -58,7 +58,7 @@ 
         }
         $content .= "</ul>";
     } else {
-        $content = "<div class='x2-note confirmMsg'>" . NO_INSTALLED_EXTENSION . "</div>";
+        $content = "<div class='x2-note confirmMsg'>".NO_INSTALLED_EXTENSION."</div>";
     }
 
     //Reset module lists in cache folder
@@ -69,9 +69,9 @@ 
         $xoops->setConfig('locale', $_COOKIE['xo_install_lang']);
     }
     $xoops->loadLocale('system');
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/extension.php";
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
+    include_once XOOPS_ROOT_PATH."/modules/system/class/module.php";
+    include_once XOOPS_ROOT_PATH."/modules/system/class/extension.php";
+    include_once XOOPS_ROOT_PATH."/modules/system/class/system.php";
 
     $system = System::getInstance();
 
@@ -96,15 +96,15 @@ 
         }
 
         $form = new Xoops\Form\ThemeForm('', 'modules', 'index.php', 'post');
-        $moduleYN = new Xoops\Form\RadioYesNo('', 'modules[' . $ext->getInfo('dirname') . ']', $value, XoopsLocale::YES, XoopsLocale::NO);
-        $moduleYN->setExtra("onclick='selectModule(\"" . $ext->getInfo('dirname') . "\", this)'");
+        $moduleYN = new Xoops\Form\RadioYesNo('', 'modules['.$ext->getInfo('dirname').']', $value, XoopsLocale::YES, XoopsLocale::NO);
+        $moduleYN->setExtra("onclick='selectModule(\"".$ext->getInfo('dirname')."\", this)'");
         $form->addElement($moduleYN);
 
-        $content .= "<tr id='" . $ext->getInfo('dirname') . "'" . $style . ">\n";
-        $content .= "    <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $ext->getInfo('dirname') . "/" . $ext->getInfo('image') . "' alt='" . $ext->getInfo('name') . "'/></td>\n";
+        $content .= "<tr id='".$ext->getInfo('dirname')."'".$style.">\n";
+        $content .= "    <td class='img' ><img src='".XOOPS_URL."/modules/".$ext->getInfo('dirname')."/".$ext->getInfo('image')."' alt='".$ext->getInfo('name')."'/></td>\n";
         $content .= "    <td>";
-        $content .= "        " . $ext->getInfo('name') . "&nbsp;" . number_format(round($ext->getInfo('version'), 2), 2) . "&nbsp;(" . $ext->getInfo('dirname') . ")";
-        $content .= "        <br />" . $ext->getInfo('description');
+        $content .= "        ".$ext->getInfo('name')."&nbsp;".number_format(round($ext->getInfo('version'), 2), 2)."&nbsp;(".$ext->getInfo('dirname').")";
+        $content .= "        <br />".$ext->getInfo('description');
         $content .= "    </td>\n";
         $content .= "    <td class='yesno'>";
         $content .= $moduleYN->render();
@@ -112,13 +112,13 @@ 
         ++$toinstal;
     }
     $content .= "</table>";
-    $content .= "</li></ul><script type='text/javascript'>" . $javascript . "</script>";
+    $content .= "</li></ul><script type='text/javascript'>".$javascript."</script>";
     if ($toinstal == 0) {
         $pageHasForm = false;
-        $content = "<div class='x2-note confirmMsg'>" . NO_EXTENSION_FOUND . "</div>";
+        $content = "<div class='x2-note confirmMsg'>".NO_EXTENSION_FOUND."</div>";
     }
 }
 $_SESSION['pageHasHelp'] = false;
 $_SESSION['pageHasForm'] = $pageHasForm;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_configsave.php

Spacing +13 added lines, -13 removed lines

@@ -24,7 +24,7 @@ 
  * @version     $Id$
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 /* @var $wizard XoopsInstallWizard */
 $wizard = $_SESSION['wizard'];
@@ -45,15 +45,15 @@ 
 );
 $rewrite = array_merge($rewrite, $settings);
 
-if (!@copy($settings['ROOT_PATH'] . '/mainfile.dist.php', $settings['ROOT_PATH'] . '/mainfile.php')) {
+if (!@copy($settings['ROOT_PATH'].'/mainfile.dist.php', $settings['ROOT_PATH'].'/mainfile.php')) {
     $error = ERR_COPY_MAINFILE;
 } else {
     clearstatcache();
 
-    if (!$file = fopen($settings['ROOT_PATH'] . '/mainfile.php', "r")) {
+    if (!$file = fopen($settings['ROOT_PATH'].'/mainfile.php', "r")) {
         $error = ERR_READ_MAINFILE;
     } else {
-        $content = fread($file, filesize($settings['ROOT_PATH'] . '/mainfile.php'));
+        $content = fread($file, filesize($settings['ROOT_PATH'].'/mainfile.php'));
         fclose($file);
 
         foreach ($rewrite as $key => $val) {
@@ -72,7 +72,7 @@ 
                 }
             }
         }
-        if (!$file = fopen($settings['ROOT_PATH'] . '/mainfile.php', "w")) {
+        if (!$file = fopen($settings['ROOT_PATH'].'/mainfile.php', "w")) {
             $error = ERR_WRITE_MAINFILE;
         } else {
             if (fwrite($file, $content) == -1) {
@@ -83,15 +83,15 @@ 
     }
 }
 
-if (!@copy($rewrite['VAR_PATH'] . '/data/secure.dist.php', $rewrite['VAR_PATH'] . '/data/secure.php')) {
-    $error = ERR_COPY_SECURE . $rewrite['VAR_PATH'] . '/data/secure.dist.php';
+if (!@copy($rewrite['VAR_PATH'].'/data/secure.dist.php', $rewrite['VAR_PATH'].'/data/secure.php')) {
+    $error = ERR_COPY_SECURE.$rewrite['VAR_PATH'].'/data/secure.dist.php';
 } else {
     clearstatcache();
 
-    if (!$file = fopen($rewrite['VAR_PATH'] . '/data/secure.php', "r")) {
+    if (!$file = fopen($rewrite['VAR_PATH'].'/data/secure.php', "r")) {
         $error = ERR_READ_SECURE;
     } else {
-        $content = fread($file, filesize($rewrite['VAR_PATH'] . '/data/secure.php'));
+        $content = fread($file, filesize($rewrite['VAR_PATH'].'/data/secure.php'));
         fclose($file);
 
         foreach ($rewrite as $key => $val) {
@@ -107,7 +107,7 @@ 
                 }
             }
         }
-        if (!$file = fopen($rewrite['VAR_PATH'] . '/data/secure.php', "w")) {
+        if (!$file = fopen($rewrite['VAR_PATH'].'/data/secure.php', "w")) {
             $error = ERR_WRITE_SECURE;
         } else {
             if (fwrite($file, $content) == -1) {
@@ -149,7 +149,7 @@ 
     if ($k === 'authorized') {
         continue;
     }
-    echo "<li><strong>XOOPS_{$k}</strong> " . IS_VALOR . " {$v}</li>";
+    echo "<li><strong>XOOPS_{$k}</strong> ".IS_VALOR." {$v}</li>";
 }
     ?>
 </ul>
@@ -157,11 +157,11 @@ 
         $content = ob_get_contents();
     ob_end_clean();
 } else {
-    $content = '<div class="errorMsg">' . $error . '</div>';
+    $content = '<div class="errorMsg">'.$error.'</div>';
 }
 
 $_SESSION['pageHasHelp'] = false;
 $_SESSION['pageHasForm'] = false;
 $_SESSION['content'] = $content;
 $_SESSION['settings'] = $settings;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_pathsettings.php

Spacing +16 added lines, -16 removed lines

@@ -24,20 +24,20 @@ 
  * @version     $Id$
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
-include_once XOOPS_INSTALL_PATH . '/class/pathcontroller.php';
+include_once XOOPS_INSTALL_PATH.'/class/pathcontroller.php';
 
 $ctrl = new XoopsPathController($wizard->configs['xoopsPathDefault'], $wizard->configs['dataPath']);
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET' && @$_GET['var'] && @$_GET['action'] === 'checkpath') {
     $path = $_GET['var'];
-    $ctrl->xoopsPath[$path] = htmlspecialchars( trim($_GET['path']) );
-    echo genPathCheckHtml( $path, $ctrl->checkPath($path) );
+    $ctrl->xoopsPath[$path] = htmlspecialchars(trim($_GET['path']));
+    echo genPathCheckHtml($path, $ctrl->checkPath($path));
     exit();
 }
 $ctrl->execute();
-if ( $_SERVER['REQUEST_METHOD'] === 'POST' ) {
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     return;
 }
 ob_start();
@@ -64,17 +64,17 @@ 
     <label class="xolabel" for="root"><?php echo XOOPS_ROOT_PATH_LABEL; ?></label>
     <div class="xoform-help"><?php echo XOOPS_ROOT_PATH_HELP; ?></div>
         <input type="text" name="root" id="root" value="<?php echo $ctrl->xoopsPath['root']; ?>" onchange="updPath('root', this.value)" />
-        <span id="rootpathimg"><?php echo genPathCheckHtml( 'root', $ctrl->validPath['root'] ); ?></span>
+        <span id="rootpathimg"><?php echo genPathCheckHtml('root', $ctrl->validPath['root']); ?></span>
         <?php
-        if ($ctrl->validPath['root'] && !empty( $ctrl->permErrors['root'])) {
+        if ($ctrl->validPath['root'] && !empty($ctrl->permErrors['root'])) {
             echo '<div id="rootperms" class="x2-note">';
-            echo CHECKING_PERMISSIONS . '<br /><p>' . ERR_NEED_WRITE_ACCESS . '</p>';
+            echo CHECKING_PERMISSIONS.'<br /><p>'.ERR_NEED_WRITE_ACCESS.'</p>';
             echo '<ul class="diags">';
             foreach ($ctrl->permErrors['root'] as $path => $result) {
                 if ($result) {
-                    echo '<li class="success">' . sprintf(IS_WRITABLE, $path) . '</li>';
+                    echo '<li class="success">'.sprintf(IS_WRITABLE, $path).'</li>';
                 } else {
-                    echo '<li class="failure">' . sprintf(IS_NOT_WRITABLE, $path) . '</li>';
+                    echo '<li class="failure">'.sprintf(IS_NOT_WRITABLE, $path).'</li>';
                 }
             }
             echo '</ul>';
@@ -87,17 +87,17 @@ 
     <label class="xolabel" for="data"><?php echo XOOPS_DATA_PATH_LABEL; ?></label>
     <div class="xoform-help"><?php echo XOOPS_DATA_PATH_HELP; ?></div>
         <input type="text" name="data" id="data" value="<?php echo $ctrl->xoopsPath['data']; ?>" onchange="updPath('data', this.value)" />
-        <span id="datapathimg"><?php echo genPathCheckHtml('data', $ctrl->validPath['data'] ); ?></span>
+        <span id="datapathimg"><?php echo genPathCheckHtml('data', $ctrl->validPath['data']); ?></span>
         <?php
-        if ($ctrl->validPath['data'] && !empty( $ctrl->permErrors['data'])) {
+        if ($ctrl->validPath['data'] && !empty($ctrl->permErrors['data'])) {
             echo '<div id="dataperms" class="x2-note">';
-            echo CHECKING_PERMISSIONS . '<br /><p>' . ERR_NEED_WRITE_ACCESS . '</p>';
+            echo CHECKING_PERMISSIONS.'<br /><p>'.ERR_NEED_WRITE_ACCESS.'</p>';
             echo '<ul class="diags">';
             foreach ($ctrl->permErrors['data'] as $path => $result) {
                 if ($result) {
-                    echo '<li class="success">' . sprintf(IS_WRITABLE, $path) . '</li>';
+                    echo '<li class="success">'.sprintf(IS_WRITABLE, $path).'</li>';
                 } else {
-                    echo '<li class="failure">' . sprintf(IS_NOT_WRITABLE, $path) . '</li>';
+                    echo '<li class="failure">'.sprintf(IS_NOT_WRITABLE, $path).'</li>';
                 }
             }
             echo '</ul>';
@@ -127,4 +127,4 @@ 
 $_SESSION['pageHasHelp'] = true;
 $_SESSION['pageHasForm'] = true;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_configsite.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 $xoopsOption['checkadmin'] = true;
 $xoopsOption['hascommon'] = true;
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 $xoops = Xoops::getInstance();
 
@@ -63,10 +63,10 @@ 
 $criteria->setSort('conf_catid ASC, conf_order');
 $configs = $config_handler->getConfigs($criteria);
 
-include XOOPS_INSTALL_PATH . '/include/createconfigform.php';
+include XOOPS_INSTALL_PATH.'/include/createconfigform.php';
 $wizard->form = createConfigform($configs);
 
 $_SESSION['pageHasHelp'] = true;
 $_SESSION['pageHasForm'] = true;
 $_SESSION['content'] = $wizard->CreateForm();
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_modcheck.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
  * @version     $Id$
 **/
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 /* @var $wizard XoopsInstallWizard */
 $wizard = $_SESSION['wizard'];
@@ -63,7 +63,7 @@ 
 
 <tr>
     <th><?php printf(PHP_EXTENSION, 'PDO'); ?></th>
-    <td><?php echo xoDiag(extension_loaded('PDO') ? 1 : -1, 'PDO::getAvailableDrivers() = ' . @implode(', ', PDO::getAvailableDrivers())); ?></td>
+    <td><?php echo xoDiag(extension_loaded('PDO') ? 1 : -1, 'PDO::getAvailableDrivers() = '.@implode(', ', PDO::getAvailableDrivers())); ?></td>
 </tr>
 
 <tr>
@@ -99,7 +99,7 @@ 
 <tbody>
 <?php
 foreach ($wizard->configs['extensions'] as $key => $value) {
-    echo "<tr><th>" . $value[1] . "</th><td>" . $value[2] . "</td></tr>";
+    echo "<tr><th>".$value[1]."</th><td>".$value[2]."</td></tr>";
 }
 ?>
 
@@ -112,4 +112,4 @@ 
 $_SESSION['pageHasHelp'] = false;
 $_SESSION['pageHasForm'] = false;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_dbdriver.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
  * @version     $Id$
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 /* @var $wizard XoopsInstallWizard */
 $wizard = $_SESSION['wizard'];
@@ -57,7 +57,7 @@ 
         $settings,
         array(
             'DB_DRIVER' => 'pdo_mysql',
-            'DB_PREFIX' => 'x' . substr(md5(time()), 0, 3),
+            'DB_PREFIX' => 'x'.substr(md5(time()), 0, 3),
         )
     );
 }
@@ -65,7 +65,7 @@ 
 ?>
 <?php
 if (!empty($error)) {
-    echo '<div class="x2-note errorMsg">' . $error . "</div>\n";
+    echo '<div class="x2-note errorMsg">'.$error."</div>\n";
 }
 ?>
 <fieldset>
@@ -93,4 +93,4 @@ 
 $_SESSION['pageHasForm'] = true;
 $_SESSION['content'] = $content;
 $_SESSION['settings'] = $settings;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_dbsettings.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
  * @version     $Id$
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 /* @var $wizard XoopsInstallWizard */
 $wizard = $_SESSION['wizard'];
@@ -40,7 +40,7 @@ 
     $_SESSION['settings'] = $settings;
 }
 
-$platform=false;
+$platform = false;
 $error = '';
 $availableDatabases = array();
 
@@ -50,11 +50,11 @@ 
 // if we specified the dbname and failed, try again without it
 // we will try and create it later
 if (!$connection && !empty($settings['DB_NAME'])) {
-    $hold_name=$settings['DB_NAME'];
+    $hold_name = $settings['DB_NAME'];
     unset($settings['DB_NAME']);
     $_SESSION['settings'] = $settings;
     $hold_error = $error;
-    $error='';
+    $error = '';
     $connection = getDbConnection($error);
     $settings['DB_NAME'] = $hold_name;
     $_SESSION['settings'] = $settings;
@@ -129,7 +129,7 @@ 
     }
 }
 
-if (is_array($availableDatabases) && count($availableDatabases)==1) {
+if (is_array($availableDatabases) && count($availableDatabases) == 1) {
     if (empty($settings['DB_NAME'])) {
         $settings['DB_NAME'] = $availableDatabases[0];
     }
@@ -141,7 +141,7 @@ 
 ?>
 <?php
 if (!empty($error)) {
-    echo '<div class="x2-note errorMsg">' . $error . "</div>\n";
+    echo '<div class="x2-note errorMsg">'.$error."</div>\n";
 }
 ?>
 <script type="text/javascript">
@@ -155,8 +155,8 @@ 
 <fieldset>
 <?php
 if (!empty($availableDatabases)) {
-    echo '<legend>' . LEGEND_DATABASE . '</legend>';
-    echo '<div class="xoform-help">' . DB_AVAILABLE_HELP . '</div>';
+    echo '<legend>'.LEGEND_DATABASE.'</legend>';
+    echo '<div class="xoform-help">'.DB_AVAILABLE_HELP.'</div>';
     echo '<label class="xolabel" for="DB_DATABASE_LABEL" class="center">';
     echo DB_AVAILABLE_LABEL;
     echo ' <select size="1" name="DB_AVAILABLE" id="DB_AVAILABLE" onchange="updateDbName();">';
@@ -182,4 +182,4 @@ 
 $_SESSION['pageHasForm'] = true;
 $_SESSION['content'] = $content;
 $_SESSION['settings'] = $settings;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_tablesfill.php

Spacing +38 added lines, -38 removed lines

@@ -23,7 +23,7 @@ 
  * @author      DuGris (aka L. JEN) <dugris@frxoops.org>
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 
 $xoops = Xoops::getInstance();
@@ -41,7 +41,7 @@ 
 $xoops->loadLocale();
 
 $dbm = $xoops->db();
-$count = $dbm->fetchColumn('SELECT COUNT(*) FROM ' . $dbm->prefix('system_user'));
+$count = $dbm->fetchColumn('SELECT COUNT(*) FROM '.$dbm->prefix('system_user'));
 $process = $count ? false : true;
 $update = false;
 
@@ -59,40 +59,40 @@ 
         'system_user',
         array(
             //'uid'             => 1,             // mediumint(8) unsigned NOT NULL auto_increment,
-            'name'            => '',            // varchar(60) NOT NULL default '',
-            'uname'           => $adminname,    // varchar(25) NOT NULL default '',
-            'email'           => $adminmail,    // varchar(60) NOT NULL default '',
-            'url'             => XOOPS_URL,     // varchar(100) NOT NULL default '',
-            'user_avatar'     => 'blank.gif',   // varchar(30) NOT NULL default 'blank.gif',
-            'user_regdate'    => $regdate,      // int(10) unsigned NOT NULL default '0',
-            'user_icq'        => '',            // varchar(15) NOT NULL default '',
-            'user_from'       => '',            // varchar(100) NOT NULL default '',
-            'user_sig'        => '',            // tinytext,
-            'user_viewemail'  => 1,             // tinyint(1) unsigned NOT NULL default '0',
-            'actkey'          => '',            // varchar(8) NOT NULL default '',
-            'user_aim'        => '',            // varchar(18) NOT NULL default '',
-            'user_yim'        => '',            // varchar(25) NOT NULL default '',
-            'user_msnm'       => '',            // varchar(100) NOT NULL default '',
-            'pass'            => $temp,         // varchar(255) NOT NULL default '',
-            'posts'           => 0,             // mediumint(8) unsigned NOT NULL default '0',
-            'attachsig'       => 0,             // tinyint(1) unsigned NOT NULL default '0',
-            'rank'            => 7,             // smallint(5) unsigned NOT NULL default '0',
-            'level'           => 5,             // tinyint(3) unsigned NOT NULL default '1',
-            'theme'           => 'default',     // varchar(100) NOT NULL default '',
-            'timezone'        => 'UTC',         // varchar(32) NOT NULL default 'UTC',
-            'last_login'      => $regdate,      // int(10) unsigned NOT NULL default '0',
-            'last_pass_change'=> $regdate,      // int(10) unsigned NOT NULL default '0',
-            'umode'           => 'flat',        // varchar(10) NOT NULL default '',
-            'uorder'          => 0,             // tinyint(1) unsigned NOT NULL default '0',
-            'notify_method'   => 1,             // tinyint(1) NOT NULL default '1',
-            'notify_mode'     => 0,             // tinyint(1) NOT NULL default '0',
-            'user_occ'        => '',            // varchar(100) NOT NULL default '',
-            'bio'             => '',            // tinytext,
-            'user_intrest'    => '',            // varchar(150) NOT NULL default '',
-            'user_mailok'     => 0,             // tinyint(1) unsigned NOT NULL default '1',
+            'name'            => '', // varchar(60) NOT NULL default '',
+            'uname'           => $adminname, // varchar(25) NOT NULL default '',
+            'email'           => $adminmail, // varchar(60) NOT NULL default '',
+            'url'             => XOOPS_URL, // varchar(100) NOT NULL default '',
+            'user_avatar'     => 'blank.gif', // varchar(30) NOT NULL default 'blank.gif',
+            'user_regdate'    => $regdate, // int(10) unsigned NOT NULL default '0',
+            'user_icq'        => '', // varchar(15) NOT NULL default '',
+            'user_from'       => '', // varchar(100) NOT NULL default '',
+            'user_sig'        => '', // tinytext,
+            'user_viewemail'  => 1, // tinyint(1) unsigned NOT NULL default '0',
+            'actkey'          => '', // varchar(8) NOT NULL default '',
+            'user_aim'        => '', // varchar(18) NOT NULL default '',
+            'user_yim'        => '', // varchar(25) NOT NULL default '',
+            'user_msnm'       => '', // varchar(100) NOT NULL default '',
+            'pass'            => $temp, // varchar(255) NOT NULL default '',
+            'posts'           => 0, // mediumint(8) unsigned NOT NULL default '0',
+            'attachsig'       => 0, // tinyint(1) unsigned NOT NULL default '0',
+            'rank'            => 7, // smallint(5) unsigned NOT NULL default '0',
+            'level'           => 5, // tinyint(3) unsigned NOT NULL default '1',
+            'theme'           => 'default', // varchar(100) NOT NULL default '',
+            'timezone'        => 'UTC', // varchar(32) NOT NULL default 'UTC',
+            'last_login'      => $regdate, // int(10) unsigned NOT NULL default '0',
+            'last_pass_change'=> $regdate, // int(10) unsigned NOT NULL default '0',
+            'umode'           => 'flat', // varchar(10) NOT NULL default '',
+            'uorder'          => 0, // tinyint(1) unsigned NOT NULL default '0',
+            'notify_method'   => 1, // tinyint(1) NOT NULL default '1',
+            'notify_mode'     => 0, // tinyint(1) NOT NULL default '0',
+            'user_occ'        => '', // varchar(100) NOT NULL default '',
+            'bio'             => '', // tinytext,
+            'user_intrest'    => '', // varchar(150) NOT NULL default '',
+            'user_mailok'     => 0, // tinyint(1) unsigned NOT NULL default '1',
         )
     );
-    $content = '<div class="x2-note successMsg">' . DATA_INSERTED . '</div>';
+    $content = '<div class="x2-note successMsg">'.DATA_INSERTED.'</div>';
 } elseif ($update) {
     $dbm->updatePrefix(
         'system_user',
@@ -110,14 +110,14 @@ 
     );
     $content = '';
 } else {
-    $content = "<div class='x2-note confirmMsg'>" . DATA_ALREADY_INSERTED . "</div>";
+    $content = "<div class='x2-note confirmMsg'>".DATA_ALREADY_INSERTED."</div>";
 }
 
 setcookie('xo_install_user', '', null, null, null);
-if (isset( $settings['authorized'] ) && !empty($adminname) && !empty($adminpass)) {
+if (isset($settings['authorized']) && !empty($adminname) && !empty($adminpass)) {
     setcookie(
         'xo_install_user',
-        addslashes($adminname) . '-' . md5($temp . XOOPS_DB_NAME . XOOPS_DB_PASS . XOOPS_DB_PREFIX),
+        addslashes($adminname).'-'.md5($temp.XOOPS_DB_NAME.XOOPS_DB_PASS.XOOPS_DB_PREFIX),
         null,
         null,
         null
@@ -127,4 +127,4 @@ 
 $_SESSION['pageHasHelp'] = false;
 $_SESSION['pageHasForm'] = false;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/include/functions.php

Spacing +15 added lines, -15 removed lines

@@ -44,7 +44,7 @@ 
     /* @var $user XoopsUser */
     $users = $member_handler->getUsers(new Criteria('uname', $uname));
     $user = array_pop($users);
-    if ($hash_login != md5($user->getVar('pass') . XOOPS_DB_NAME . XOOPS_DB_PASS . XOOPS_DB_PREFIX)) {
+    if ($hash_login != md5($user->getVar('pass').XOOPS_DB_NAME.XOOPS_DB_PASS.XOOPS_DB_PREFIX)) {
         return false;
     }
     $xoops->user = $user;
@@ -61,11 +61,11 @@ 
 function install_finalize($installer_modified)
 {
     // Set mainfile.php readonly
-    @chmod(XOOPS_ROOT_PATH . "/mainfile.php", 0444);
+    @chmod(XOOPS_ROOT_PATH."/mainfile.php", 0444);
     // Set Secure file readonly
-    @chmod(XOOPS_VAR_PATH . "/data/secure.php", 0444);
+    @chmod(XOOPS_VAR_PATH."/data/secure.php", 0444);
     // Rename installer folder
-    @rename(XOOPS_ROOT_PATH . "/install", XOOPS_ROOT_PATH . "/" . $installer_modified);
+    @rename(XOOPS_ROOT_PATH."/install", XOOPS_ROOT_PATH."/".$installer_modified);
 }
 
 /**
@@ -85,7 +85,7 @@ 
     $value = installHtmlSpecialCharacters($value);
     echo "<label class='xolabel' for='$name'>$label</label>\n";
     if ($help) {
-        echo '<div class="xoform-help">' . $help . "</div>\n";
+        echo '<div class="xoform-help">'.$help."</div>\n";
     }
     if ($name === "adminname") {
         echo "<input type='text' name='$name' id='$name' value='$value' maxlength='25' />";
@@ -111,7 +111,7 @@ 
     $value = installHtmlSpecialCharacters($value);
     echo "<label class='xolabel' for='{$name}'>{$label}</label>\n";
     if ($help) {
-        echo '<div class="xoform-help">' . $help . "</div>\n";
+        echo '<div class="xoform-help">'.$help."</div>\n";
     }
 
     if ($name === "adminpass") {
@@ -138,11 +138,11 @@ 
     $value = installHtmlSpecialCharacters($value);
     echo "<label class='xolabel' for='$name'>$label</label>\n";
     if ($help) {
-        echo '<div class="xoform-help">' . $help . "</div>\n";
+        echo '<div class="xoform-help">'.$help."</div>\n";
     }
     $checked = $value ? 'checked' : '';
     echo "<input type=\"checkbox\" name=\"{$name}\" value=\"1\" {$checked} />"
-        . ENABLE . "<br />";
+        . ENABLE."<br />";
 }
 
 /*
@@ -156,7 +156,7 @@ 
     $dirlist = array();
     if ($handle = opendir($dirname)) {
         while ($file = readdir($handle)) {
-            if ($file{0} !== '.' && is_dir($dirname . $file)) {
+            if ($file{0} !== '.' && is_dir($dirname.$file)) {
                 $dirlist[] = $file;
             }
         }
@@ -182,7 +182,7 @@ 
     if (empty($str)) {
         $str = $strings[$status];
     }
-    return '<span class="' . $classes[$status] . '">' . $str . '</span>';
+    return '<span class="'.$classes[$status].'">'.$str.'</span>';
 }
 
 /**
@@ -208,7 +208,7 @@ 
  */
 function xoDiagIfWritable($path)
 {
-    $path = "../" . $path;
+    $path = "../".$path;
     $error = true;
     if (!is_dir($path)) {
         if (file_exists($path)) {
@@ -253,7 +253,7 @@ 
                 $msg = XOOPS_PATH_FOUND;
                 break;
         }
-        return '<span class="pathmessage"><img src="img/yes.png" alt="Success" />' . $msg . '</span>';
+        return '<span class="pathmessage"><img src="img/yes.png" alt="Success" />'.$msg.'</span>';
     } else {
         switch ($path) {
             case 'root':
@@ -266,7 +266,7 @@ 
                 $msg = ERR_COULD_NOT_ACCESS;
                 break;
         }
-        return '<span class="pathmessage"><img src="img/no.png" alt="Error" /> ' . $msg . '</span>';
+        return '<span class="pathmessage"><img src="img/no.png" alt="Error" /> '.$msg.'</span>';
     }
 }
 
@@ -283,7 +283,7 @@ 
 
     // get list of parameters the selected driver accepts
     $driver_info = $wizard->configs['db_types'][$settings['DB_DRIVER']];
-    $driver_params=explode(',', $driver_info['params']);
+    $driver_params = explode(',', $driver_info['params']);
 
     $connectionParams = array(
         'driver' => $settings['DB_DRIVER'],
@@ -291,7 +291,7 @@ 
     );
 
     // force mysql to use utf8mb4
-    if (false !== strstr($settings['DB_DRIVER'],'mysql')) {
+    if (false !== strstr($settings['DB_DRIVER'], 'mysql')) {
         $connectionParams['charset'] = 'utf8mb4';
         $connectionParams['collate'] = 'utf8mb4_unicode_ci';
     }