XOOPS / XoopsCore

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

htdocs/install/class/pathcontroller.php

Spacing +10 added lines, -10 removed lines

@@ -100,16 +100,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'])) {
@@ -230,19 +230,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;
     }

htdocs/install/class/installwizard.php

Spacing +17 added lines, -17 removed lines

@@ -64,12 +64,12 @@ 
         $this->initLanguage(!empty($_COOKIE['xo_install_lang']) ? $_COOKIE['xo_install_lang'] : 'en_US');
         // Setup pages
         $pages = array();
-        include_once dirname(__DIR__) . '/include/page.php';
+        include_once dirname(__DIR__).'/include/page.php';
         $this->pages = $pages;
 
         // Load default configs
         $configs = array();
-        include_once dirname(__DIR__) . '/include/config.php';
+        include_once dirname(__DIR__).'/include/config.php';
         $this->configs = $configs;
 
         if (!$this->checkAccess()) {
@@ -135,10 +135,10 @@ 
      */
     public function loadLangFile($file)
     {
-        if (file_exists($file = XOOPS_INSTALL_PATH . "/locale/{$this->language}/{$file}.php")) {
+        if (file_exists($file = XOOPS_INSTALL_PATH."/locale/{$this->language}/{$file}.php")) {
             include_once $file;
         } else {
-            $file = XOOPS_INSTALL_PATH . "/locale/en_US/{$file}.php";
+            $file = XOOPS_INSTALL_PATH."/locale/en_US/{$file}.php";
             include_once $file;
         }
     }
@@ -151,7 +151,7 @@ 
     public function initLanguage($language)
     {
         $language = preg_replace("/[^a-z0-9_\-]/i", "", $language);
-        if (!file_exists(XOOPS_INSTALL_PATH . "/locale/{$language}/install.php")) {
+        if (!file_exists(XOOPS_INSTALL_PATH."/locale/{$language}/install.php")) {
             $language = 'en_US';
         }
         $this->language = $language;
@@ -193,7 +193,7 @@ 
         $proto = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ? 'https' : 'http';
         $host = $_SERVER['HTTP_HOST'];
         $base = substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
-        return $proto . '://' . $host . $base;
+        return $proto.'://'.$host.$base;
     }
 
     /**
@@ -218,13 +218,13 @@ 
         }
         if (!isset($pages[$pageIndex])) {
             if (defined("XOOPS_URL")) {
-                return XOOPS_URL . '/';
+                return XOOPS_URL.'/';
             } else {
                 return $this->baseLocation();
             }
         }
         $page = $pages[$pageIndex];
-        return $this->baseLocation() . "/page_{$page}.php";
+        return $this->baseLocation()."/page_{$page}.php";
     }
 
     /**
@@ -253,7 +253,7 @@ 
 
         /* @var Xoops\Form\Form $form */
         foreach ($this->form as $form) {
-            $ret .= "<fieldset><legend>" . $form->getTitle() . "</legend>\n";
+            $ret .= "<fieldset><legend>".$form->getTitle()."</legend>\n";
 
             /* @var Xoops\Form\Element $ele */
             foreach ($form->getElements() as $ele) {
@@ -261,31 +261,31 @@ 
                 if ($ele instanceof Xoops\Form\Element) {
                     if (!$ele->isHidden()) {
                         if (($caption = $ele->getCaption()) != '') {
-                            $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'>";
                                 $ret .= $desc;
                                 $ret .= "</div>";
                             }
                         }
-                        $ret .= $ele->render() . "\n";
+                        $ret .= $ele->render()."\n";
                     } else {
-                        $hidden .= $ele->render() . "\n";
+                        $hidden .= $ele->render()."\n";
                     }
                 }
             }
-            $ret .= "</fieldset>\n" . $hidden . "\n" . $form->renderValidationJS(true);
+            $ret .= "</fieldset>\n".$hidden."\n".$form->renderValidationJS(true);
         }
         return $ret;
     }
 
     function cleanCache($cacheFolder) {
-        $cache = array(1,2,3);
+        $cache = array(1, 2, 3);
         if (!empty($cache)) {
             for ($i = 0; $i < count($cache); ++$i) {
                 switch ($cache[$i]) {
                     case 1:
-                        $files = glob($cacheFolder. '/caches/smarty_cache/*.*');
+                        $files = glob($cacheFolder.'/caches/smarty_cache/*.*');
                         foreach ($files as $filename) {
                             if (basename(strtolower($filename)) !== 'index.html') {
                                 unlink($filename);
@@ -294,7 +294,7 @@ 
                         break;
 
                     case 2:
-                        $files = glob($cacheFolder . '/caches/smarty_compile/*.*');
+                        $files = glob($cacheFolder.'/caches/smarty_compile/*.*');
                         foreach ($files as $filename) {
                             if (basename(strtolower($filename)) !== 'index.html') {
                                 unlink($filename);
@@ -303,7 +303,7 @@ 
                         break;
 
                     case 3:
-                        $files = glob($cacheFolder . '/caches/xoops_cache/*.*');
+                        $files = glob($cacheFolder.'/caches/xoops_cache/*.*');
                         foreach ($files as $filename) {
                             if (basename(strtolower($filename)) !== 'index.html') {
                                 unlink($filename);

htdocs/install/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,5 +25,5 @@
  * @version     $Id$
  */
 
-require_once __DIR__ . '/page_langselect.php';
+require_once __DIR__.'/page_langselect.php';
 exit();