XOOPS / XoopsCore

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';
     }

htdocs/install/include/install_tpl.php

Spacing +5 added lines, -5 removed lines

@@ -89,15 +89,15 @@ 
 
 <head>
     <title>
-        <?php echo XOOPS_VERSION . ' : ' . XOOPS_INSTALL_WIZARD; ?>
-        (<?php echo ($wizard->pageIndex + 1) . '/' . count($wizard->pages); ?>)
+        <?php echo XOOPS_VERSION.' : '.XOOPS_INSTALL_WIZARD; ?>
+        (<?php echo ($wizard->pageIndex + 1).'/'.count($wizard->pages); ?>)
     </title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _INSTALL_CHARSET ?>"/>
     <link rel="shortcut icon" type="image/ico" href="../favicon.ico"/>
     <link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="css/style.css"/>
     <?php
-    if (file_exists('locale/' . $wizard->language . '/style.css')) {
-        echo '<link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="locale/' . $wizard->language . '/style.css" />';
+    if (file_exists('locale/'.$wizard->language.'/style.css')) {
+        echo '<link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="locale/'.$wizard->language.'/style.css" />';
     }
     ?>
 
@@ -126,7 +126,7 @@ 
     <form id='<?php echo $wizard->pages[$wizard->currentPage]['name']; ?>' action='<?php echo $_SERVER['PHP_SELF']; ?>'
           method='post'>
         <div id="xo-page-title">
-            <?php if (@$pageHasHelp) { echo "<img id=\"help_button\" src=\"./img/help.png\" alt=\"" . HELP_BUTTON_ALT . "\" title=\"" . HELP_BUTTON_ALT . "\" onclick=\"document.body.className = 'show-help';\" />"; }; ?>
+            <?php if (@$pageHasHelp) { echo "<img id=\"help_button\" src=\"./img/help.png\" alt=\"".HELP_BUTTON_ALT."\" title=\"".HELP_BUTTON_ALT."\" onclick=\"document.body.className = 'show-help';\" />"; }; ?>
             <span class="index"><?php echo $wizard->pageIndex + 1; ?></span>
             <span class="setup"><?php echo XOOPS_INSTALL_WIZARD; ?></span>
             <span class="title"><?php echo $wizard->pages[$wizard->currentPage]['title']; ?></span>

htdocs/install/include/common.inc.php

Spacing +9 added lines, -9 removed lines

@@ -40,26 +40,26 @@
     $xoopsOption['nocommon'] = true;
     session_start();
 }
-$mainfile = dirname(dirname(__DIR__)) . '/mainfile.php';
+$mainfile = dirname(dirname(__DIR__)).'/mainfile.php';
 if (file_exists($mainfile)) {
     include $mainfile;
 }
 if (!defined("XOOPS_ROOT_PATH")) {
     define("XOOPS_ROOT_PATH", str_replace("\\", "/", realpath('../')));
-    define("XOOPS_PATH", isset($_SESSION['settings']['PATH']) ? $_SESSION['settings']['PATH']:"");
-    define("XOOPS_VAR_PATH", isset($_SESSION['settings']['VAR_PATH']) ? $_SESSION['settings']['VAR_PATH']:"");
-    define("XOOPS_URL", isset($_SESSION['settings']['URL']) ? $_SESSION['settings']['URL']:"");
+    define("XOOPS_PATH", isset($_SESSION['settings']['PATH']) ? $_SESSION['settings']['PATH'] : "");
+    define("XOOPS_VAR_PATH", isset($_SESSION['settings']['VAR_PATH']) ? $_SESSION['settings']['VAR_PATH'] : "");
+    define("XOOPS_URL", isset($_SESSION['settings']['URL']) ? $_SESSION['settings']['URL'] : "");
 }
 
-include XOOPS_INSTALL_PATH . '/class/installwizard.php';
-include_once XOOPS_ROOT_PATH . '/include/version.php';
-include_once XOOPS_INSTALL_PATH . '/include/functions.php';
+include XOOPS_INSTALL_PATH.'/class/installwizard.php';
+include_once XOOPS_ROOT_PATH.'/include/version.php';
+include_once XOOPS_INSTALL_PATH.'/include/functions.php';
 //include_once XOOPS_ROOT_PATH . '/class/xoopsload.php';
 if (!class_exists('XoopsBaseConfig', false)) {
-    include_once XOOPS_ROOT_PATH . '/class/XoopsBaseConfig.php';
+    include_once XOOPS_ROOT_PATH.'/class/XoopsBaseConfig.php';
     XoopsBaseConfig::bootstrapTransition();
 }
-include_once XOOPS_ROOT_PATH . '/include/defines.php';
+include_once XOOPS_ROOT_PATH.'/include/defines.php';
 $_SESSION['pageHasHelp'] = false;
 $_SESSION['pageHasForm'] = false;
 

htdocs/install/include/config.php

Spacing +4 added lines, -4 removed lines

@@ -31,11 +31,11 @@ 
 $available_pdo_drivers = \PDO::getAvailableDrivers();
 $configs['db_types'] = array();
 if (in_array('mysql', $available_pdo_drivers)) {
-    $configs['db_types']['pdo_mysql']  = array(
+    $configs['db_types']['pdo_mysql'] = array(
         'desc' => 'PDO MySql Driver',
         'type' => 'mysql',
         'params' => 'dbname,host,user,password,port,unix_socket',
-        'ignoredb' => array('information_schema','test'),
+        'ignoredb' => array('information_schema', 'test'),
     );
 }
 if (in_array('sqlite', $available_pdo_drivers)) {
@@ -99,7 +99,7 @@ 
         'desc' => 'Mysqli Driver (untested)',
         'type' => 'mysql',
         'params' => 'dbname,host,user,password,port,unix_socket',
-        'ignoredb' => array('information_schema','test'),
+        'ignoredb' => array('information_schema', 'test'),
     );
 }
 
@@ -141,7 +141,7 @@ 
     'xml' => array('XML', sprintf(PHP_EXTENSION, XML_PARSING)),
     'zlib' => array('Zlib', sprintf(PHP_EXTENSION, ZLIB_COMPRESSION)),
     'gd' => array(
-        (function_exists('gd_info') && $gdlib = @gd_info()) ? 'GD ' . $gdlib['GD Version'] : '',
+        (function_exists('gd_info') && $gdlib = @gd_info()) ? 'GD '.$gdlib['GD Version'] : '',
         sprintf(PHP_EXTENSION, IMAGE_FUNCTIONS)
     ),
     'exif' => array('Exif', sprintf(PHP_EXTENSION, IMAGE_METAS)),

htdocs/install/include/createconfigform.php

Spacing +12 added lines, -12 removed lines

@@ -64,7 +64,7 @@ 
 
             case 'select':
                 $ele = new Xoops\Form\Select($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
-                $options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+                $options = & $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
                 $opcount = count($options);
                 for ($j = 0; $j < $opcount; ++$j) {
                     $optval = \Xoops\Locale::translate($options[$j]->getVar('confop_value'), 'system');
@@ -75,7 +75,7 @@ 
 
             case 'select_multi':
                 $ele = new Xoops\Form\Select($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
-                $options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+                $options = & $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
                 $opcount = count($options);
                 for ($j = 0; $j < $opcount; ++$j) {
                     $optval = \Xoops\Locale::translate($options[$j]->getVar('confop_value'), 'system');
@@ -127,7 +127,7 @@ 
                 $module_handler = $xoops->getHandlerModule();
                 $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
                 $criteria->add(new Criteria('isactive', 1));
-                $moduleslist =& $module_handler->getNameList($criteria, true);
+                $moduleslist = & $module_handler->getNameList($criteria, true);
                 $moduleslist['--'] = XoopsLocale::NONE;
                 $ele->addOptionArray($moduleslist);
                 break;
@@ -170,7 +170,7 @@ 
                     $ele = new Xoops\Form\ElementTray($title, '<br />');
                     foreach (array_keys($modules) as $mid) {
                         $c_val = isset($currrent_val[$mid]) ? (int)($currrent_val[$mid]) : null;
-                        $selform = new Xoops\Form\Select($modules[$mid]->getVar('name'), $config[$i]->getVar('conf_name') . "[$mid]", $c_val);
+                        $selform = new Xoops\Form\Select($modules[$mid]->getVar('name'), $config[$i]->getVar('conf_name')."[$mid]", $c_val);
                         $selform->addOptionArray($cache_options);
                         $ele->addElement($selform);
                         unset($selform);
@@ -236,7 +236,7 @@ 
  */
 function createThemeform(XoopsConfigItem $config)
 {
-    $title = $config->getVar('conf_desc') == '' ? \Xoops\Locale::translate($config->getVar('conf_title'), 'system') : \Xoops\Locale::translate($config->getVar('conf_title'), 'system') . '<br /><br /><span>' . \Xoops\Locale::translate($config->getVar('conf_desc'), 'system') . '</span>';
+    $title = $config->getVar('conf_desc') == '' ? \Xoops\Locale::translate($config->getVar('conf_title'), 'system') : \Xoops\Locale::translate($config->getVar('conf_title'), 'system').'<br /><br /><span>'.\Xoops\Locale::translate($config->getVar('conf_desc'), 'system').'</span>';
     $form_theme_set = new Xoops\Form\Select('', $config->getVar('conf_name'), $config->getConfValueForOutput(), 1, false);
     $dirlist = XoopsLists::getThemesList();
     if (!empty($dirlist)) {
@@ -269,18 +269,18 @@ 
         } else {
             $label_content .= "<div id='$theme' rel='theme' style='display:none;'>";
         }
-        if (file_exists(XOOPS_ROOT_PATH . "/themes/$theme/theme.ini")) {
-            $theme_ini = parse_ini_file(XOOPS_ROOT_PATH . "/themes/$theme/theme.ini");
+        if (file_exists(XOOPS_ROOT_PATH."/themes/$theme/theme.ini")) {
+            $theme_ini = parse_ini_file(XOOPS_ROOT_PATH."/themes/$theme/theme.ini");
             if ($theme_ini['screenshot'] == '') {
                 $theme_ini['screenshot'] = 'screenshot.png';
                 $theme_ini['thumbnail'] = 'thumbnail.png';
             }
         }
 
-        if ($theme_ini['screenshot'] != '' && file_exists(XOOPS_ROOT_PATH . "/themes/$theme/" . $theme_ini['screenshot'])) {
-            $label_content .= "<img src='" . XOOPS_URL . "/themes/" . $theme . "/" . $theme_ini['screenshot'] . "' alt='Screenshot' />";
-        } elseif ($theme_ini['thumbnail'] != '' && file_exists(XOOPS_ROOT_PATH . "/themes/$theme/" . $theme_ini['thumbnail'])) {
-            $label_content .= "<img src='" . XOOPS_URL . "/themes/" . $theme . "/" . $theme_ini['thumbnail'] . "' alt='$theme' />";
+        if ($theme_ini['screenshot'] != '' && file_exists(XOOPS_ROOT_PATH."/themes/$theme/".$theme_ini['screenshot'])) {
+            $label_content .= "<img src='".XOOPS_URL."/themes/".$theme."/".$theme_ini['screenshot']."' alt='Screenshot' />";
+        } elseif ($theme_ini['thumbnail'] != '' && file_exists(XOOPS_ROOT_PATH."/themes/$theme/".$theme_ini['thumbnail'])) {
+            $label_content .= "<img src='".XOOPS_URL."/themes/".$theme."/".$theme_ini['thumbnail']."' alt='$theme' />";
         } else {
             $label_content .= THEME_NO_SCREENSHOT;
         }
@@ -292,7 +292,7 @@ 
 
     $form = new Xoops\Form\ThemeForm($title, 'themes', 'index.php', 'post');
     $form->addElement($form_theme_set);
-    $form->addElement(new Xoops\Form\Label('', "<div id='screenshot'>" . $label_content . "</div>"));
+    $form->addElement(new Xoops\Form\Label('', "<div id='screenshot'>".$label_content."</div>"));
 
     $form->addElement(new Xoops\Form\Hidden('conf_ids[]', $config->getVar('conf_id')));
     return array($form);

htdocs/install/page_dbconnection.php

Spacing +16 added lines, -16 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'];
@@ -37,14 +37,14 @@ 
 }
 // get list of parameters the selected drive accepts
 $driver_info = $wizard->configs['db_types'][$settings['DB_DRIVER']];
-$driver_params=explode(',', $driver_info['params']);
+$driver_params = explode(',', $driver_info['params']);
 $settings['DB_TYPE'] = $driver_info['type'];
 
 // get settings name and value (post, session or default) for each parameter
 foreach ($driver_params as $param) {
-    $name=false;
+    $name = false;
     if (!empty($wizard->configs['db_param_names'][$param])) {
-        $name=$wizard->configs['db_param_names'][$param];
+        $name = $wizard->configs['db_param_names'][$param];
         $default = null;
         switch ($param) {
             case 'host':
@@ -82,7 +82,7 @@ 
         if ($_SERVER['REQUEST_METHOD'] === 'POST') {
             $value = empty($_POST[$name]) ? $default : $_POST[$name];
         }
-        $settings[$name]=$value;
+        $settings[$name] = $value;
     }
 }
 
@@ -102,7 +102,7 @@ 
 ob_start();
 ?>
 <?php if (!empty($error)) {
-    echo '<div class="x2-note errorMsg">' . $error . "</div>\n";
+    echo '<div class="x2-note errorMsg">'.$error."</div>\n";
 } ?>
 <fieldset>
     <legend><?php echo LEGEND_CONNECTION; ?>
@@ -111,26 +111,26 @@ 
 <?php
 foreach ($driver_params as $param) {
     $name = $wizard->configs['db_param_names'][$param];
-    if ($wizard->configs['db_param_types'][$param]==='string') {
+    if ($wizard->configs['db_param_types'][$param] === 'string') {
         echo xoFormField(
             $name,
             $settings[$name],
-            constant($name . '_LABEL'),
-            constant($name . '_HELP')
+            constant($name.'_LABEL'),
+            constant($name.'_HELP')
         );
-    } elseif ($wizard->configs['db_param_types'][$param]==='boolean') {
+    } elseif ($wizard->configs['db_param_types'][$param] === 'boolean') {
         echo xoBoolField(
             $name,
             $settings[$name],
-            constant($name . '_LABEL'),
-            constant($name . '_HELP')
+            constant($name.'_LABEL'),
+            constant($name.'_HELP')
         );
-    } elseif ($wizard->configs['db_param_types'][$param]==='password') {
+    } elseif ($wizard->configs['db_param_types'][$param] === 'password') {
         echo xoPassField(
             $name,
             $settings[$name],
-            constant($name . '_LABEL'),
-            constant($name . '_HELP')
+            constant($name.'_LABEL'),
+            constant($name.'_HELP')
         );
     }
 }
@@ -154,4 +154,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_end.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
  * @version     $Id$
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 $xoops = Xoops::getInstance();
 
@@ -33,7 +33,7 @@ 
 
 setcookie('xo_install_user', '', null, null, null);
 
-$installer_modified = "install_remove_" . uniqid(mt_rand());
+$installer_modified = "install_remove_".uniqid(mt_rand());
 register_shutdown_function('install_finalize', $installer_modified);
 
 $_SESSION['installer_modified'] = $installer_modified;
@@ -44,5 +44,5 @@ 
 $_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';
 $_SESSION = array();

htdocs/install/page_theme.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 $xoopsOption['checkadmin'] = true;
 $xoopsOption['hascommon'] = true;
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 $xoops = Xoops::getInstance();
 
@@ -36,7 +36,7 @@ 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     if (array_key_exists('conf_ids', $_REQUEST)) {
         foreach ($_REQUEST['conf_ids'] as $key => $conf_id) {
-            $config =& $config_handler->getConfig($conf_id);
+            $config = & $config_handler->getConfig($conf_id);
             $new_value = $_REQUEST[$config->getVar('conf_name')];
             $config->setConfValueForInput($new_value);
             $config_handler->insertConfig($config);
@@ -58,11 +58,11 @@ 
 $tempvar = $config_handler->getConfigs($criteria);
 $config = array_pop($tempvar);
 
-include XOOPS_INSTALL_PATH . '/include/createconfigform.php';
+include XOOPS_INSTALL_PATH.'/include/createconfigform.php';
 $wizard->form = createThemeform($config);
 $content = $wizard->CreateForm();
 
 $_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';