XOOPS / XoopsCore25

upgrade/checkmainfile.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 unset ($mainfileKeys['XOOPS_PROT']);
 if (!defined('XOOPS_PROT')) {
     $parts = parse_url(XOOPS_URL);
-    $http = (empty($parts['scheme']) ? 'http' : $parts['scheme']) . '://';
+    $http = (empty($parts['scheme']) ? 'http' : $parts['scheme']).'://';
     define('XOOPS_PROT', $http);
     unset($parts, $http);
 }
@@ -66,7 +66,7 @@ 
 // we have what we need so continue
 if ($loadCommon) {
     unset($xoopsOption['nocommon']);
-    include XOOPS_ROOT_PATH . '/include/common.php';
+    include XOOPS_ROOT_PATH.'/include/common.php';
 }
 
 unset($loadCommon);

upgrade/class/abstract.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
      */
     public function apply()
     {
-        $patchStatus  = $this->isApplied();
+        $patchStatus = $this->isApplied();
         $tasks = $patchStatus->tasks;
         foreach ($tasks as $task) {
             $res = $this->{"apply_{$task}"}();

upgrade/class/control.php

Spacing +4 added lines, -4 removed lines

@@ -183,7 +183,7 @@ 
 
         foreach ($this->upgradeQueue as $directory => $patch) {
             if (!$patch->applied) {
-                $next =  $directory;
+                $next = $directory;
                 break;
             }
         }
@@ -200,11 +200,11 @@ 
      */
     public function oneButtonContinueForm($action = 'index.php', $parameters = array('action' =>'next'))
     {
-        $form  = '<form action="' . $action . '" method="post">';
-        $form .= '<button class="btn btn-lg btn-success" type="submit">' . _CONTINUE;
+        $form  = '<form action="'.$action.'" method="post">';
+        $form .= '<button class="btn btn-lg btn-success" type="submit">'._CONTINUE;
         $form .= '  <span class="fa fa-caret-right"></span></button>';
         foreach ($parameters as $name => $value) {
-            $form .= '<input type="hidden" name="' . $name . '" value="' . $value . '">';
+            $form .= '<input type="hidden" name="'.$name.'" value="'.$value.'">';
         }
         $form .= '</form>';
 

upgrade/upd-2.0.17-to-2.0.18/index.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public function check_config_type()
     {
         $db     = $GLOBALS['xoopsDB'];
-        $sql    = 'SHOW COLUMNS FROM ' . $db->prefix('config') . " LIKE 'conf_title'";
+        $sql    = 'SHOW COLUMNS FROM '.$db->prefix('config')." LIKE 'conf_title'";
         $result = $db->queryF($sql);
         while (false !== ($row = $db->fetchArray($result))) {
             if (strtolower(trim($row['Type'])) === 'varchar(255)') {
@@ -48,7 +48,7 @@ 
 
         foreach ($this->fields as $table => $data) {
             foreach ($data as $field => $property) {
-                $sql = 'ALTER TABLE ' . $db->prefix($table) . " CHANGE `$field` `$field` $property";
+                $sql = 'ALTER TABLE '.$db->prefix($table)." CHANGE `$field` `$field` $property";
                 $this->query($sql);
             }
         }

upgrade/upd-2.5.9-to-2.5.10/index.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
             $row = $db->fetchRow($result);
             if ($row) {
                 $count = $row[0];
-                return (0 === (int) $count) ? true : false;
+                return (0 === (int)$count) ? true : false;
             }
         }
         return false;
@@ -81,7 +81,7 @@ 
      */
     public function check_protectordata()
     {
-        $destinationPath = XOOPS_VAR_PATH . '/protector/';
+        $destinationPath = XOOPS_VAR_PATH.'/protector/';
         return file_exists($destinationPath);
     }
 
@@ -93,8 +93,8 @@ 
     public function apply_protectordata()
     {
         $returnResult = false;
-        $sourcePath = XOOPS_PATH . '/modules/protector/configs/';
-        $destinationPath = XOOPS_VAR_PATH . '/protector/';
+        $sourcePath = XOOPS_PATH.'/modules/protector/configs/';
+        $destinationPath = XOOPS_VAR_PATH.'/protector/';
 
         if (!file_exists($destinationPath)) {
             mkdir($destinationPath);
@@ -104,8 +104,8 @@ 
             $returnResult = true;
             while (false !== ($entry = $directory->read())) {
                 if ('.' !== $entry && '..' !== $entry) {
-                    $src = $sourcePath . $entry;
-                    $dest = $destinationPath . $entry;
+                    $src = $sourcePath.$entry;
+                    $dest = $destinationPath.$entry;
                     $result = copy($src, $dest);
                     if (false === $result) {
                         $returnResult = false;

upgrade/upd-2.0.18-to-2.3.0/settings_path.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
         }
         $msg = $myts->htmlspecialchars($msg, ENT_QUOTES, _UPGRADE_CHARSET, false);
 
-        return '<span class="result-y">y</span> ' . $msg;
+        return '<span class="result-y">y</span> '.$msg;
     } else {
         switch ($path) {
             case 'lib':
@@ -57,11 +57,11 @@ 
         }
         $msg = $myts->htmlspecialchars($msg, ENT_QUOTES, _UPGRADE_CHARSET, false);
 
-        return '<span class="result-x">x</span> ' . $msg;
+        return '<span class="result-x">x</span> '.$msg;
     }
 }
 
-$vars =& $_SESSION['settings'];
+$vars = & $_SESSION['settings'];
 $ctrl = new PathStuffController();
 if ($res = $ctrl->execute()) {
     return $res;
@@ -83,13 +83,13 @@ 
         <div><?php echo genPathCheckHtml('data', $ctrl->validPath['data']); ?></div>
         <?php if ($ctrl->validPath['data'] && !empty($ctrl->permErrors['data'])) { ?>
         <div id="dataperms" class="x2-note">
-            <?php echo CHECKING_PERMISSIONS . '<br><p>' . ERR_NEED_WRITE_ACCESS . '</p>'; ?>
+            <?php echo CHECKING_PERMISSIONS.'<br><p>'.ERR_NEED_WRITE_ACCESS.'</p>'; ?>
             <ul class="diags">
                 <?php 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>';
     }
 } ?>
             </ul>

upgrade/upd-2.0.18-to-2.3.0/settings_db.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
     die('Bad installation: please add this folder to the XOOPS install you want to upgrade');
 }
 
-$vars =& $_SESSION['settings'];
+$vars = & $_SESSION['settings'];
 
 /**
  * @return array
@@ -89,17 +89,17 @@ 
 
     $field = "<label for='$name'>$label</label>\n";
     if ($help) {
-        $field .= '<div class="xoform-help">' . $help . "</div>\n";
+        $field .= '<div class="xoform-help">'.$help."</div>\n";
     }
     $field .= "<select name='$name' id='$name'\">";
-    $field .= "<option value=''>" . DB_COLLATION_NOCHANGE . '</option>';
+    $field .= "<option value=''>".DB_COLLATION_NOCHANGE.'</option>';
 
     $collation_default = '';
     $options           = '';
     foreach ($collations as $key => $charset) {
         $field .= "<optgroup label='{$key} - ({$charset['desc']})'>";
         foreach ($charset['collation'] as $collation) {
-            $field .= "<option value='{$collation}'" . (($value == $collation) ? " selected='selected'" : '') . ">{$collation}</option>";
+            $field .= "<option value='{$collation}'".(($value == $collation) ? " selected='selected'" : '').">{$collation}</option>";
         }
         $field .= '</optgroup>';
     }
@@ -123,7 +123,7 @@ 
 
 ?>
 <?php if (!empty($error)) {
-    echo '<div class="x2-note error">' . $error . "</div>\n";
+    echo '<div class="x2-note error">'.$error."</div>\n";
 } ?>
 
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method='post'>

upgrade/upd-2.0.18-to-2.3.0/pathcontroller.php

Spacing +15 added lines, -15 removed lines

@@ -50,17 +50,17 @@ 
             } elseif (defined('XOOPS_TRUST_PATH')) {
                 $this->xoopsPath['lib'] = XOOPS_TRUST_PATH;
             } else {
-                $this->xoopsPath['lib'] = dirname($path) . '/xoops_lib';
-                if (!is_dir($this->xoopsPath['lib'] . '/')) {
-                    $this->xoopsPath['lib'] = $path . '/xoops_lib';
+                $this->xoopsPath['lib'] = dirname($path).'/xoops_lib';
+                if (!is_dir($this->xoopsPath['lib'].'/')) {
+                    $this->xoopsPath['lib'] = $path.'/xoops_lib';
                 }
             }
             if (defined('XOOPS_VAR_PATH')) {
                 $this->xoopsPath['data'] = XOOPS_VAR_PATH;
             } else {
-                $this->xoopsPath['data'] = dirname($path) . '/xoops_data';
-                if (!is_dir($this->xoopsPath['data'] . '/')) {
-                    $this->xoopsPath['data'] = $path . '/xoops_data';
+                $this->xoopsPath['data'] = dirname($path).'/xoops_data';
+                if (!is_dir($this->xoopsPath['data'].'/')) {
+                    $this->xoopsPath['data'] = $path.'/xoops_data';
                 }
             }
         }
@@ -166,19 +166,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;
@@ -191,7 +191,7 @@ 
      */
     public function checkPermissions($path = 'data')
     {
-        $paths  = array(
+        $paths = array(
             'data' => array(
                 'caches' => array(
                     'xoops_cache',
@@ -233,23 +233,23 @@ 
                 return false;
             } else {
                 $perm = 6;
-                @mkdir($path, octdec('0' . $perm . '00'));
+                @mkdir($path, octdec('0'.$perm.'00'));
             }
         } else {
             $perm = is_dir($path) ? 6 : 7;
         }
         if (!is_writable($path)) {
             // First try using owner bit
-            @chmod($path, octdec('0' . $perm . '00'));
+            @chmod($path, octdec('0'.$perm.'00'));
             clearstatcache();
             if (!is_writable($path) && $group !== false) {
                 // If group has been specified, try using the group bit
                 @chgrp($path, $group);
-                @chmod($path, octdec('0' . $perm . $perm . '0'));
+                @chmod($path, octdec('0'.$perm.$perm.'0'));
             }
             clearstatcache();
             if (!is_writable($path)) {
-                @chmod($path, octdec('0' . $perm . $perm . $perm));
+                @chmod($path, octdec('0'.$perm.$perm.$perm));
             }
         }
         clearstatcache();

upgrade/upd-2.0.18-to-2.3.0/index.php

Spacing +26 added lines, -26 removed lines

@@ -22,7 +22,7 @@ 
  * @author           Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include_once __DIR__ . '/pathcontroller.php';
+include_once __DIR__.'/pathcontroller.php';
 
 /**
  * Class upgrade_230
@@ -45,7 +45,7 @@ 
      */
     public function check_config()
     {
-        $sql = 'SELECT COUNT(*) FROM `' . $GLOBALS['xoopsDB']->prefix('config') . "` WHERE `conf_name` IN ('welcome_type', 'cpanel')";
+        $sql = 'SELECT COUNT(*) FROM `'.$GLOBALS['xoopsDB']->prefix('config')."` WHERE `conf_name` IN ('welcome_type', 'cpanel')";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
@@ -60,7 +60,7 @@ 
      */
     public function check_cache()
     {
-        $sql    = "SHOW TABLES LIKE '" . $GLOBALS['xoopsDB']->prefix('cache_model') . "'";
+        $sql    = "SHOW TABLES LIKE '".$GLOBALS['xoopsDB']->prefix('cache_model')."'";
         $result = $GLOBALS['xoopsDB']->queryF($sql);
         if (!$result) {
             return false;
@@ -86,7 +86,7 @@ 
     {
         // MySQL 5.0+
         //$sql = "SHOW KEYS FROM `" . $GLOBALS['xoopsDB']->prefix('block_module_link') . "` WHERE `KEY_NAME` LIKE 'PRIMARY'";
-        $sql = 'SHOW KEYS FROM `' . $GLOBALS['xoopsDB']->prefix('block_module_link') . '`';
+        $sql = 'SHOW KEYS FROM `'.$GLOBALS['xoopsDB']->prefix('block_module_link').'`';
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
@@ -104,7 +104,7 @@ 
      */
     public function apply_bmlink()
     {
-        $sql = 'SHOW KEYS FROM `' . $GLOBALS['xoopsDB']->prefix('block_module_link') . '`';
+        $sql = 'SHOW KEYS FROM `'.$GLOBALS['xoopsDB']->prefix('block_module_link').'`';
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
@@ -119,11 +119,11 @@ 
             }
         }
         foreach ($keys_drop as $drop) {
-            $sql = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('block_module_link') . "` DROP KEY `{$drop}`";
+            $sql = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('block_module_link')."` DROP KEY `{$drop}`";
             $GLOBALS['xoopsDB']->queryF($sql);
         }
         if ($primary_add) {
-            $sql = 'ALTER IGNORE TABLE `' . $GLOBALS['xoopsDB']->prefix('block_module_link') . '` ADD PRIMARY KEY (`block_id`, `module_id`)';
+            $sql = 'ALTER IGNORE TABLE `'.$GLOBALS['xoopsDB']->prefix('block_module_link').'` ADD PRIMARY KEY (`block_id`, `module_id`)';
 
             return $GLOBALS['xoopsDB']->queryF($sql);
         }
@@ -138,13 +138,13 @@ 
     {
         $result = true;
         if (!isset($GLOBALS['xoopsConfig']['cpanel'])) {
-            $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('config') . ' (conf_id, conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) ' . ' VALUES ' . " (NULL, 0, 1, 'cpanel', '_MD_AM_CPANEL', 'default', '_MD_AM_CPANELDSC', 'cpanel', 'other', 11)";
+            $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('config').' (conf_id, conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) '.' VALUES '." (NULL, 0, 1, 'cpanel', '_MD_AM_CPANEL', 'default', '_MD_AM_CPANELDSC', 'cpanel', 'other', 11)";
 
             $result *= $GLOBALS['xoopsDB']->queryF($sql);
         }
 
         $welcometype_installed = false;
-        $sql                   = 'SELECT COUNT(*) FROM `' . $GLOBALS['xoopsDB']->prefix('config') . "` WHERE `conf_name` = 'welcome_type'";
+        $sql                   = 'SELECT COUNT(*) FROM `'.$GLOBALS['xoopsDB']->prefix('config')."` WHERE `conf_name` = 'welcome_type'";
         if ($result = $GLOBALS['xoopsDB']->queryF($sql)) {
             list($count) = $GLOBALS['xoopsDB']->fetchRow($result);
             if ($count == 1) {
@@ -152,14 +152,14 @@ 
             }
         }
         if (!$welcometype_installed) {
-            $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('config') . ' (conf_id, conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) ' . ' VALUES ' . " (NULL, 0, 2, 'welcome_type', '_MD_AM_WELCOMETYPE', '1', '_MD_AM_WELCOMETYPE_DESC', 'select', 'int', 3)";
+            $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('config').' (conf_id, conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) '.' VALUES '." (NULL, 0, 2, 'welcome_type', '_MD_AM_WELCOMETYPE', '1', '_MD_AM_WELCOMETYPE_DESC', 'select', 'int', 3)";
 
             if (!$GLOBALS['xoopsDB']->queryF($sql)) {
                 return false;
             }
             $config_id = $GLOBALS['xoopsDB']->getInsertId();
 
-            $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('configoption') . ' (confop_id, confop_name, confop_value, conf_id)' . ' VALUES' . " (NULL, '_NO', '0', {$config_id})," . " (NULL, '_MD_AM_WELCOMETYPE_EMAIL', '1', {$config_id})," . " (NULL, '_MD_AM_WELCOMETYPE_PM', '2', {$config_id})," . " (NULL, '_MD_AM_WELCOMETYPE_BOTH', '3', {$config_id})";
+            $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('configoption').' (confop_id, confop_name, confop_value, conf_id)'.' VALUES'." (NULL, '_NO', '0', {$config_id}),"." (NULL, '_MD_AM_WELCOMETYPE_EMAIL', '1', {$config_id}),"." (NULL, '_MD_AM_WELCOMETYPE_PM', '2', {$config_id}),"." (NULL, '_MD_AM_WELCOMETYPE_BOTH', '3', {$config_id})";
             if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
                 return false;
             }
@@ -172,7 +172,7 @@ 
     {
         $allowWebChanges                     = $GLOBALS['xoopsDB']->allowWebChanges;
         $GLOBALS['xoopsDB']->allowWebChanges = true;
-        $result                              = $GLOBALS['xoopsDB']->queryFromFile(__DIR__ . '/mysql.structure.sql');
+        $result                              = $GLOBALS['xoopsDB']->queryFromFile(__DIR__.'/mysql.structure.sql');
         $GLOBALS['xoopsDB']->allowWebChanges = $allowWebChanges;
 
         return $result;
@@ -261,11 +261,11 @@ 
      */
     public function convert_db($charset, $collation)
     {
-        $sql = 'ALTER DATABASE `' . XOOPS_DB_NAME . '` DEFAULT CHARACTER SET ' . $GLOBALS['xoopsDB']->quote($charset) . ' COLLATE ' . $GLOBALS['xoopsDB']->quote($collation);
+        $sql = 'ALTER DATABASE `'.XOOPS_DB_NAME.'` DEFAULT CHARACTER SET '.$GLOBALS['xoopsDB']->quote($charset).' COLLATE '.$GLOBALS['xoopsDB']->quote($collation);
         if (!$GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
-        if (!$result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '" . XOOPS_DB_PREFIX . "\_%'")) {
+        if (!$result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '".XOOPS_DB_PREFIX."\_%'")) {
             return false;
         }
         $tables = array();
@@ -305,15 +305,15 @@ 
                 while (false !== ($result = $GLOBALS['xoopsDB']->fetchArray($resource))) {
                     if (preg_match('/(char)|(text)|(enum)|(set)/', $result['Type'])) {
                         // String Type SQL Sentence.
-                        $string_querys[] = "ALTER TABLE `$table` MODIFY `" . $result['Field'] . '` ' . $result['Type'] . " CHARACTER SET $charset COLLATE $collation " . (((!empty($result['Default'])) || ($result['Default'] === '0') || ($result['Default'] === 0)) ? "DEFAULT '" . $result['Default'] . "' " : '') . ('YES' === $result['Null'] ? '' : 'NOT ') . 'NULL';
+                        $string_querys[] = "ALTER TABLE `$table` MODIFY `".$result['Field'].'` '.$result['Type']." CHARACTER SET $charset COLLATE $collation ".(((!empty($result['Default'])) || ($result['Default'] === '0') || ($result['Default'] === 0)) ? "DEFAULT '".$result['Default']."' " : '').('YES' === $result['Null'] ? '' : 'NOT ').'NULL';
 
                         // Binary String Type SQL Sentence.
                         if (preg_match('/(enum)|(set)/', $result['Type'])) {
-                            $binary_querys[] = "ALTER TABLE `$table` MODIFY `" . $result['Field'] . '` ' . $result['Type'] . ' CHARACTER SET binary ' . (((!empty($result['Default'])) || ($result['Default'] === '0') || ($result['Default'] === 0)) ? "DEFAULT '" . $result['Default'] . "' " : '') . ('YES' === $result['Null'] ? '' : 'NOT ') . 'NULL';
+                            $binary_querys[] = "ALTER TABLE `$table` MODIFY `".$result['Field'].'` '.$result['Type'].' CHARACTER SET binary '.(((!empty($result['Default'])) || ($result['Default'] === '0') || ($result['Default'] === 0)) ? "DEFAULT '".$result['Default']."' " : '').('YES' === $result['Null'] ? '' : 'NOT ').'NULL';
                         } else {
                             $result['Type']  = str_replace('char', 'binary', $result['Type']);
                             $result['Type']  = str_replace('text', 'blob', $result['Type']);
-                            $binary_querys[] = "ALTER TABLE `$table` MODIFY `" . $result['Field'] . '` ' . $result['Type'] . ' ' . (((!empty($result['Default'])) || ($result['Default'] === '0') || ($result['Default'] === 0)) ? "DEFAULT '" . $result['Default'] . "' " : '') . ('YES' === $result['Null'] ? '' : 'NOT ') . 'NULL';
+                            $binary_querys[] = "ALTER TABLE `$table` MODIFY `".$result['Field'].'` '.$result['Type'].' '.(((!empty($result['Default'])) || ($result['Default'] === '0') || ($result['Default'] === 0)) ? "DEFAULT '".$result['Default']."' " : '').('YES' === $result['Null'] ? '' : 'NOT ').'NULL';
                         }
                     }
                 }
@@ -334,9 +334,9 @@ 
                         $tmp_gen_index_query = "ALTER TABLE `$table` ADD FULLTEXT `$key_name`(";
                         $fields_names        = array_keys($column);
                         for ($i = 1; $i <= count($column); ++$i) {
-                            $tmp_gen_index_query .= $fields_names[$i - 1] . (($i == count($column)) ? '' : ', ');
+                            $tmp_gen_index_query .= $fields_names[$i - 1].(($i == count($column)) ? '' : ', ');
                         }
-                        $gen_index_querys[] = $tmp_gen_index_query . ')';
+                        $gen_index_querys[] = $tmp_gen_index_query.')';
                     }
                 }
 
@@ -371,23 +371,23 @@ 
             return false;
         }
 
-        $file = __DIR__ . '/mainfile.dist.php';
+        $file = __DIR__.'/mainfile.dist.php';
 
         $lines = file($file);
         foreach (array_keys($lines) as $ln) {
             if (preg_match("/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([0-9]+)\s*\)/", $lines[$ln], $matches)) {
                 $val        = isset($vars[$matches[3]]) ? (string)constant($matches[3]) : (defined($matches[3]) ? (string)constant($matches[3]) : '0');
-                $lines[$ln] = preg_replace("/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([0-9]+)\s*\)/", "define('" . $matches[3] . "', " . $val . ' )', $lines[$ln]);
+                $lines[$ln] = preg_replace("/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([0-9]+)\s*\)/", "define('".$matches[3]."', ".$val.' )', $lines[$ln]);
             } elseif (preg_match("/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([\"'])([^\"']*?)\\4\s*\)/", $lines[$ln], $matches)) {
                 $val        = isset($vars[$matches[3]]) ? (string)$vars[$matches[3]] : (defined($matches[3]) ? (string)constant($matches[3]) : '');
-                $lines[$ln] = preg_replace("/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([\"'])(.*?)\\4\s*\)/", "define('" . $matches[3] . "', '" . $val . "' )", $lines[$ln]);
+                $lines[$ln] = preg_replace("/(define\()([\"'])(XOOPS_[^\"']+)\\2,\s*([\"'])(.*?)\\4\s*\)/", "define('".$matches[3]."', '".$val."' )", $lines[$ln]);
             }
         }
 
-        $fp = fopen(XOOPS_ROOT_PATH . '/mainfile.php', 'wt');
+        $fp = fopen(XOOPS_ROOT_PATH.'/mainfile.php', 'wt');
         if (!$fp) {
             echo ERR_COULD_NOT_WRITE_MAINFILE;
-            echo "<pre style='border: 1px solid black; width: 80%; overflow: auto;'><div style='color: #ff0000; font-weight: bold;'><div>" . implode('</div><div>', array_map('htmlspecialchars', $lines)) . '</div></div></pre>';
+            echo "<pre style='border: 1px solid black; width: 80%; overflow: auto;'><div style='color: #ff0000; font-weight: bold;'><div>".implode('</div><div>', array_map('htmlspecialchars', $lines)).'</div></div></pre>';
 
             return false;
         } else {
@@ -409,7 +409,7 @@ 
     public function set_configs($task)
     {
         $ret     = array();
-        $configs = include __DIR__ . "/settings_{$task}.php";
+        $configs = include __DIR__."/settings_{$task}.php";
         if (!$configs || !is_array($configs)) {
             return $ret;
         }
@@ -418,7 +418,7 @@ 
         }
 
         foreach ($configs as $key => $val) {
-            $ret['XOOPS_' . $key] = $val;
+            $ret['XOOPS_'.$key] = $val;
         }
 
         return $ret;