XOOPS / XoopsCore

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

Spacing +20 added lines, -20 removed lines

@@ -24,8 +24,8 @@ 
  * @version     $Id$
  */
 
-if ( !defined( 'XOOPS_ROOT_PATH' ) ) {
-    die( 'Bad installation: please add this folder to the XOOPS install you want to upgrade');
+if (!defined('XOOPS_ROOT_PATH')) {
+    die('Bad installation: please add this folder to the XOOPS install you want to upgrade');
 }
 
 $vars = $_SESSION['settings'];
@@ -38,8 +38,8 @@ 
 
     $charsets["utf8"] = array();
     $ut8_available = false;
-    if ( $result = $db->queryF("SHOW CHARSET") ) {
-        while ( $row = $db->fetchArray($result) ) {
+    if ($result = $db->queryF("SHOW CHARSET")) {
+        while ($row = $db->fetchArray($result)) {
             $charsets[$row["Charset"]]["desc"] = $row["Description"];
             if ($row["Charset"] == "utf8") {
                 $ut8_available = true;
@@ -60,8 +60,8 @@ 
     $collations = array();
     $charsets = getDbCharsets();
 
-    if ( $result = $db->queryF("SHOW COLLATION") ) {
-        while ( $row = $db->fetchArray($result) ) {
+    if ($result = $db->queryF("SHOW COLLATION")) {
+        while ($row = $db->fetchArray($result)) {
             $charsets[$row["Charset"]]["collation"][] = $row["Collation"];
         }
     }
@@ -69,28 +69,28 @@ 
     return $charsets;
 }
 
-function xoFormFieldCollation( $name, $value, $label, $help = '' )
+function xoFormFieldCollation($name, $value, $label, $help = '')
 {
     $collations = getDbCollations();
 
     $myts = MyTextSanitizer::getInstance();
-    $label = $myts->htmlspecialchars( $label, ENT_QUOTES, _UPGRADE_CHARSET, false );
-    $name = $myts->htmlspecialchars( $name, ENT_QUOTES, _UPGRADE_CHARSET, false );
-    $value = $myts->htmlspecialchars( $value, ENT_QUOTES );
+    $label = $myts->htmlspecialchars($label, ENT_QUOTES, _UPGRADE_CHARSET, false);
+    $name = $myts->htmlspecialchars($name, ENT_QUOTES, _UPGRADE_CHARSET, false);
+    $value = $myts->htmlspecialchars($value, ENT_QUOTES);
 
     $field = "<label for='$name'>$label</label>\n";
-    if ( $help ) {
-        $field .= '<div class="xoform-help">' . $help . "</div>\n";
+    if ($help) {
+        $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>";
     }
@@ -99,26 +99,26 @@ 
     return $field;
 }
 
-if ( $_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['task'] == 'db' ) {
-    $params = array( 'DB_COLLATION' );
-    foreach ( $params as $name ) {
+if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['task'] == 'db') {
+    $params = array('DB_COLLATION');
+    foreach ($params as $name) {
         $vars[$name] = isset($_POST[$name]) ? $_POST[$name] : "";
     }
     return $vars;
 }
 
-if ( !isset( $vars['DB_COLLATION'] ) ) {
+if (!isset($vars['DB_COLLATION'])) {
     $vars['DB_COLLATION'] = '';
 }
 
 
 ?>
-<?php if ( !empty( $error ) ) echo '<div class="x2-note error">' . $error . "</div>\n"; ?>
+<?php if (!empty($error)) echo '<div class="x2-note error">'.$error."</div>\n"; ?>
 
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method='post'>
 <fieldset>
     <legend><?php echo LEGEND_DATABASE; ?></legend>
-    <?php echo xoFormFieldCollation( 'DB_COLLATION',    $vars['DB_COLLATION'],    DB_COLLATION_LABEL, DB_COLLATION_HELP ); ?>
+    <?php echo xoFormFieldCollation('DB_COLLATION', $vars['DB_COLLATION'], DB_COLLATION_LABEL, DB_COLLATION_HELP); ?>
 
 </fieldset>
 <input type="hidden" name="action" value="next" />

Braces +4 added lines, -1 removed lines

@@ -113,7 +113,10 @@
 
 
 ?>
-<?php if ( !empty( $error ) ) echo '<div class="x2-note error">' . $error . "</div>\n"; ?>
+<?php if ( !empty( $error ) ) {
+    echo '<div class="x2-note error">' . $error . "</div>\n";
+}
+?>
 
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method='post'>
 <fieldset>

upgrade/upd-2.0.18-to-2.3.0/language/english.php

Spacing +16 added lines, -16 removed lines

@@ -4,24 +4,24 @@
 // _CHARSET : UTF-8
 // Translator: XOOPS Translation Team
 
-define("LEGEND_XOOPS_PATHS","XOOPS Physical paths");
-define("LEGEND_DATABASE","Database Character Set");
+define("LEGEND_XOOPS_PATHS", "XOOPS Physical paths");
+define("LEGEND_DATABASE", "Database Character Set");
 
-define("XOOPS_LIB_PATH_LABEL","XOOPS library directory");
-define("XOOPS_LIB_PATH_HELP","Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH . " to make it secure.");
-define("XOOPS_DATA_PATH_LABEL","XOOPS datafiles directory");
-define("XOOPS_DATA_PATH_HELP","Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH . " to make it secure.");
+define("XOOPS_LIB_PATH_LABEL", "XOOPS library directory");
+define("XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of ".XOOPS_ROOT_PATH." to make it secure.");
+define("XOOPS_DATA_PATH_LABEL", "XOOPS datafiles directory");
+define("XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of ".XOOPS_ROOT_PATH." to make it secure.");
 
-define("DB_COLLATION_LABEL","Database character set and collation");
-define("DB_COLLATION_HELP","As of 4.12 MySQL supports custom character set and collation. However it is more complex than expected, so DON'T make any change unless you are confident with your choice.");
-define("DB_COLLATION_NOCHANGE","Do not change");
+define("DB_COLLATION_LABEL", "Database character set and collation");
+define("DB_COLLATION_HELP", "As of 4.12 MySQL supports custom character set and collation. However it is more complex than expected, so DON'T make any change unless you are confident with your choice.");
+define("DB_COLLATION_NOCHANGE", "Do not change");
 
-define("XOOPS_PATH_FOUND","Path found.");
-define("ERR_COULD_NOT_ACCESS","Could not access the specified folder. Please verify that it exists and is readable by the server.");
-define("CHECKING_PERMISSIONS","Checking file and directory permissions...");
-define("ERR_NEED_WRITE_ACCESS","The server must be given write access to the following files and folder<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)");
-define("IS_NOT_WRITABLE","%s is NOT writable.");
-define("IS_WRITABLE","%s is writable.");
-define("ERR_COULD_NOT_WRITE_MAINFILE","Error writing content to mainfile.php, write the content into mainfile.php manually.");
+define("XOOPS_PATH_FOUND", "Path found.");
+define("ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server.");
+define("CHECKING_PERMISSIONS", "Checking file and directory permissions...");
+define("ERR_NEED_WRITE_ACCESS", "The server must be given write access to the following files and folder<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)");
+define("IS_NOT_WRITABLE", "%s is NOT writable.");
+define("IS_WRITABLE", "%s is writable.");
+define("ERR_COULD_NOT_WRITE_MAINFILE", "Error writing content to mainfile.php, write the content into mainfile.php manually.");
 
 ?>
\ No newline at end of file

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

Indentation -3 removed lines

@@ -37,7 +37,6 @@ 
 
     /**
      * Check if cpanel config already exists
-
      */
     function check_config()
     {
@@ -53,7 +52,6 @@ 
 
     /**
      * Check if cache_model table already exists
-
      */
     function check_cache()
     {
@@ -79,7 +77,6 @@ 
 
     /**
      * Check if primary key for `block_module_link` is already set
-
      */
     function check_bmlink()
     {

Spacing +27 added lines, -27 removed lines

@@ -22,7 +22,7 @@ 
  * @version     $Id$
  */
 
-include_once dirname(__FILE__) . "/pathcontroller.php";
+include_once dirname(__FILE__)."/pathcontroller.php";
 
 class upgrade_230 extends xoopsUpgrade
 {
@@ -43,7 +43,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "SELECT COUNT(*) FROM `" . $db->prefix('config') . "` WHERE `conf_name` IN ('welcome_type', 'cpanel')";
+        $sql = "SELECT COUNT(*) FROM `".$db->prefix('config')."` WHERE `conf_name` IN ('welcome_type', 'cpanel')";
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -59,7 +59,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "SHOW TABLES LIKE '" . $db->prefix("cache_model") . "'";
+        $sql = "SHOW TABLES LIKE '".$db->prefix("cache_model")."'";
         $result = $db->queryF($sql);
         if (!$result) {
             return false;
@@ -87,7 +87,7 @@ 
         $db = $xoops->db();
         // MySQL 5.0+
         //$sql = "SHOW KEYS FROM `" . $db->prefix('block_module_link') . "` WHERE `KEY_NAME` LIKE 'PRIMARY'";
-        $sql = "SHOW KEYS FROM `" . $db->prefix('block_module_link');
+        $sql = "SHOW KEYS FROM `".$db->prefix('block_module_link');
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -104,7 +104,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "SHOW KEYS FROM `" . $db->prefix('block_module_link');
+        $sql = "SHOW KEYS FROM `".$db->prefix('block_module_link');
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -119,11 +119,11 @@ 
             }
         }
         foreach ($keys_drop as $drop) {
-            $sql = "ALTER TABLE `" . $db->prefix('block_module_link') . "` DROP KEY `{$drop}`";
+            $sql = "ALTER TABLE `".$db->prefix('block_module_link')."` DROP KEY `{$drop}`";
             $db->queryF($sql);
         }
         if ($primary_add) {
-            $sql = "ALTER IGNORE TABLE `" . $db->prefix('block_module_link') . "` ADD PRIMARY KEY (`block_id`, `module_id`)";
+            $sql = "ALTER IGNORE TABLE `".$db->prefix('block_module_link')."` ADD PRIMARY KEY (`block_id`, `module_id`)";
             return $db->queryF($sql);
         }
         return true;
@@ -135,13 +135,13 @@ 
         $db = $xoops->db();
         $result = true;
         if (!$xoops->getConfig("cpanel")) {
-            $sql = "INSERT INTO " . $db->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 ".$db->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 *= $db->queryF($sql);
         }
 
         $welcometype_installed = false;
-        $sql = "SELECT COUNT(*) FROM `" . $db->prefix('config') . "` WHERE `conf_name` = 'welcome_type'";
+        $sql = "SELECT COUNT(*) FROM `".$db->prefix('config')."` WHERE `conf_name` = 'welcome_type'";
         if ($result = $db->queryF($sql)) {
             list($count) = $db->fetchRow($result);
             if ($count == 1) {
@@ -149,14 +149,14 @@ 
             }
         }
         if (!$welcometype_installed) {
-            $sql = "INSERT INTO " . $db->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 ".$db->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 (!$db->queryF($sql)) {
                 return false;
             }
             $config_id = $db->getInsertId();
 
-            $sql = "INSERT INTO " . $db->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 ".$db->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 = $db->queryF($sql)) {
                 return false;
             }
@@ -171,7 +171,7 @@ 
         $db = $xoops->db();
         $allowWebChanges = $db->allowWebChanges;
         $db->allowWebChanges = true;
-        $result = $db->queryFromFile(dirname(__FILE__) . "/mysql.structure.sql");
+        $result = $db->queryFromFile(dirname(__FILE__)."/mysql.structure.sql");
         $db->allowWebChanges = $allowWebChanges;
         return $result;
     }
@@ -198,7 +198,7 @@ 
 
     function check_db()
     {
-        $lines = file(XOOPS_ROOT_PATH . '/mainfile.php');
+        $lines = file(XOOPS_ROOT_PATH.'/mainfile.php');
         foreach ($lines as $line) {
             if (preg_match("/(define\(\s*)([\"'])(XOOPS_DB_CHARSET)\\2,\s*([\"'])([^\"']*?)\\4\s*\);/", $line)) {
                 return true;
@@ -231,11 +231,11 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "ALTER DATABASE `" . XOOPS_DB_NAME . "` DEFAULT CHARACTER SET " . $db->quote($charset) . " COLLATE " . $db->quote($collation);
+        $sql = "ALTER DATABASE `".XOOPS_DB_NAME."` DEFAULT CHARACTER SET ".$db->quote($charset)." COLLATE ".$db->quote($collation);
         if (!$db->queryF($sql)) {
             return false;
         }
-        if (!$result = $db->queryF("SHOW TABLES LIKE '" . XOOPS_DB_PREFIX . "\_%'")) {
+        if (!$result = $db->queryF("SHOW TABLES LIKE '".XOOPS_DB_PREFIX."\_%'")) {
             return false;
         }
         $tables = array();
@@ -269,15 +269,15 @@ 
                 while (false !== ($result = $db->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'] = preg_replace('/char/', 'binary', $result['Type']);
                             $result['Type'] = preg_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';
                         }
                     }
                 }
@@ -298,9 +298,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.')';
                     }
                 }
 
@@ -330,23 +330,23 @@ 
             return false;
         }
 
-        $file = dirname(__FILE__) . '/mainfile.dist.php';
+        $file = dirname(__FILE__).'/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]]) ? strval(constant($matches[3])) : (defined($matches[3]) ? strval(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]]) ? strval($vars[$matches[3]]) : (defined($matches[3]) ? strval(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 {
             $newline = defined(PHP_EOL) ? PHP_EOL : (strpos(php_uname(), 'Windows') ? "\r\n" : "\n");
@@ -361,7 +361,7 @@ 
     function set_configs($task)
     {
         $ret = array();
-        $configs = include dirname(__FILE__) . "/settings_{$task}.php";
+        $configs = include dirname(__FILE__)."/settings_{$task}.php";
         if (!$configs || !is_array($configs)) {
             return $ret;
         }
@@ -370,7 +370,7 @@ 
         }
 
         foreach ($configs as $key => $val) {
-            $ret['XOOPS_' . $key] = $val;
+            $ret['XOOPS_'.$key] = $val;
         }
         return $ret;
     }

upgrade/upd-2.0.18-to-2.3.0/mainfile.dist.php

Indentation +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
         if (function_exists("debug_backtrace")) {
             $xoopsScriptPath = debug_backtrace();
             if (!count($xoopsScriptPath)) {
-                 die("XOOPS path check: this file cannot be requested directly");
+                    die("XOOPS path check: this file cannot be requested directly");
             }
             $xoopsScriptPath = $xoopsScriptPath[0]["file"];
         } else {
@@ -60,7 +60,7 @@ 
             $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
         }
         if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
-             exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+                exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
         }
     }
 

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     // URL Association for SSL and Protocol Compatibility
     $http = 'http://';
     if (!empty($_SERVER['HTTPS'])) {
-        $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
+        $http = ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';
     }
     define('XOOPS_PROT', $http);
 
@@ -53,7 +53,7 @@ 
             }
             $xoopsScriptPath = $xoopsScriptPath[0]["file"];
         } else {
-            $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] :  $_SERVER["SCRIPT_FILENAME"];
+            $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] : $_SERVER["SCRIPT_FILENAME"];
         }
         if (DIRECTORY_SEPARATOR != "/") {
             // IIS6 may double the \ chars

Braces +3 added lines, -1 removed lines

@@ -69,7 +69,9 @@
     define("XOOPS_DB_TYPE", "mysql");
 
     // Set the database charset if applicable
-    if (defined("XOOPS_DB_CHARSET")) die('Restricted Access');
+    if (defined("XOOPS_DB_CHARSET")) {
+        die('Restricted Access');
+    }
     define("XOOPS_DB_CHARSET", "");
 
     // Table Prefix

upgrade/upgrade_tpl.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _UPGRADE_CHARSET ?>" />
     <link rel="stylesheet" type="text/css" media="all" href="style.css" />
     <?php
-        if (file_exists('language/' . $upgrade_language . '/style.css')) {
-            echo '<link rel="stylesheet" type="text/css" media="all" href="language/' . $upgrade_language . '/style.css" />';
+        if (file_exists('language/'.$upgrade_language.'/style.css')) {
+            echo '<link rel="stylesheet" type="text/css" media="all" href="language/'.$upgrade_language.'/style.css" />';
         }
     ?>
 </head>

upgrade/language/english/upgrade.php

Spacing +14 added lines, -14 removed lines

@@ -4,25 +4,25 @@
 // _CHARSET : UTF-8
 // Translator: XOOPS Translation Team
 
-define("_XOOPS_UPGRADE","XOOPS system upgrade");
-define("_CHECKING_APPLIED","Checking applied upgrades:");
-define("_SET_FILES_WRITABLE","Make the following files writable before proceeding:");
-define("_NO_NEED_UPGRADE","No upgrade necessary. Please %s and remove this folder from your server");
-define("_NEED_UPGRADE","Upgrade needed");
-define("_PROCEED_UPGRADE","Proceed to upgrade");
-define("_PERFORMING_UPGRADE","Performing %s upgrade");
+define("_XOOPS_UPGRADE", "XOOPS system upgrade");
+define("_CHECKING_APPLIED", "Checking applied upgrades:");
+define("_SET_FILES_WRITABLE", "Make the following files writable before proceeding:");
+define("_NO_NEED_UPGRADE", "No upgrade necessary. Please %s and remove this folder from your server");
+define("_NEED_UPGRADE", "Upgrade needed");
+define("_PROCEED_UPGRADE", "Proceed to upgrade");
+define("_PERFORMING_UPGRADE", "Performing %s upgrade");
 
-define("_USER_LOGIN","User login");
+define("_USER_LOGIN", "User login");
 
-define("_MANUAL_INSTRUCTIONS","Manual installation instructions");
+define("_MANUAL_INSTRUCTIONS", "Manual installation instructions");
 
 // %s is filename
-define("_FAILED_PATCH","Failed to patch %s");
-define("_APPLY_NEXT","Apply next upgrade (%s)");
-define("_COPY_RED_LINES","Copy the following red lines to %s");
+define("_FAILED_PATCH", "Failed to patch %s");
+define("_APPLY_NEXT", "Apply next upgrade (%s)");
+define("_COPY_RED_LINES", "Copy the following red lines to %s");
 
-define("_FINISH","Finish");
-define("_RELOAD","Reload");
+define("_FINISH", "Finish");
+define("_RELOAD", "Reload");
 
 define('_UPGRADE_CHARSET', "UTF-8");
 define('_UPDATE_SYSTEM_MODULE', "update system module");

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

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $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.4.0a-to-2.4.0/index.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "SELECT COUNT(*) FROM `" . $db->prefix('config') . "` WHERE `conf_name` IN ('systemkey', 'soap_xoops_username', 'soap_xoops_password', 'soap_soapclient', 'soap_wdsl', 'soap_keepclient', 'soap_filterperson', 'soap_proxyhost', 'soap_proxyport', 'soap_proxyusername', 'soap_proxypassword', 'soap_timeout', 'soap_responsetimeout', 'soap_fieldmapping', 'soap_provisionning', 'soap_provisionning_group')";
+        $sql = "SELECT COUNT(*) FROM `".$db->prefix('config')."` WHERE `conf_name` IN ('systemkey', 'soap_xoops_username', 'soap_xoops_password', 'soap_soapclient', 'soap_wdsl', 'soap_keepclient', 'soap_filterperson', 'soap_proxyhost', 'soap_proxyport', 'soap_proxyusername', 'soap_proxypassword', 'soap_timeout', 'soap_responsetimeout', 'soap_fieldmapping', 'soap_provisionning', 'soap_provisionning_group')";
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -47,7 +47,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "SELECT COUNT(*) FROM `" . $db->prefix('configoption') . "` WHERE `confop_name` IN ('_MD_AM_AUTH_CONFOPTION_SOAP')";
+        $sql = "SELECT COUNT(*) FROM `".$db->prefix('configoption')."` WHERE `confop_name` IN ('_MD_AM_AUTH_CONFOPTION_SOAP')";
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -67,7 +67,7 @@ 
         );
         foreach ($configs as $config) {
             $config_installed = false;
-            $sql = "SELECT COUNT(*) FROM " . $db->prefix('config') . " WHERE `conf_name` = '{$config}' AND `conf_modid` = 0";
+            $sql = "SELECT COUNT(*) FROM ".$db->prefix('config')." WHERE `conf_name` = '{$config}' AND `conf_modid` = 0";
             if ($result = $db->queryF($sql)) {
                 list($count) = $db->fetchRow($result);
                 if ($count == 1) {
@@ -75,7 +75,7 @@ 
                 }
             }
             if ($config_installed) {
-                $sql = "DELETE FROM " . $db->prefix('config') . " WHERE `conf_name` = '{$config}' AND `conf_modid` = 0";
+                $sql = "DELETE FROM ".$db->prefix('config')." WHERE `conf_name` = '{$config}' AND `conf_modid` = 0";
                 if (!$db->queryF($sql)) {
                     return false;
                 }
@@ -90,7 +90,7 @@ 
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
         $configoption_installed = false;
-        $sql = "SELECT COUNT(*) FROM `" . $db->prefix('configoption') . "`" . " WHERE `confop_name` = '_MD_AM_AUTH_CONFOPTION_SOAP' AND `confop_value` = 'soap'";
+        $sql = "SELECT COUNT(*) FROM `".$db->prefix('configoption')."`"." WHERE `confop_name` = '_MD_AM_AUTH_CONFOPTION_SOAP' AND `confop_value` = 'soap'";
         if ($result = $db->queryF($sql)) {
             list($count) = $db->fetchRow($result);
             if ($count == 1) {
@@ -99,7 +99,7 @@ 
         }
 
         if ($configoption_installed) {
-            $sql = "DELETE FROM " . $db->prefix('configoption') . " WHERE `confop_name` = '_MD_AM_AUTH_CONFOPTION_SOAP' AND `confop_value` = 'soap'";
+            $sql = "DELETE FROM ".$db->prefix('configoption')." WHERE `confop_name` = '_MD_AM_AUTH_CONFOPTION_SOAP' AND `confop_value` = 'soap'";
             if (!$db->queryF($sql)) {
                 return false;
             }

Indentation -1 removed lines

@@ -24,7 +24,6 @@
 
     /**
      * Check if cpanel config already exists
-
      */
     function check_config()
     {

upgrade/upd-2.0.13-to-2.0.14/index.php

Spacing +9 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
         }
     }
 ";
-        $manual = "<h2>" . _MANUAL_INSTRUCTIONS . "</h2>\n<p>" . sprintf(_COPY_RED_LINES, "mainfile.php") . "</p>
+        $manual = "<h2>"._MANUAL_INSTRUCTIONS."</h2>\n<p>".sprintf(_COPY_RED_LINES, "mainfile.php")."</p>
 <pre style='border:1px solid black;width:650px;overflow:auto'><span style='color:#ff0000;font-weight:bold'>$patchCode</span>
     if (!isset(\$xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
         include XOOPS_ROOT_PATH.\"/include/common.php\";
@@ -67,7 +67,7 @@ 
             }
         }
         if ($insert == -1) {
-            printf(_FAILED_PATCH . "<br />", "mainfile.php");
+            printf(_FAILED_PATCH."<br />", "mainfile.php");
             echo $manual;
             return false;
         } elseif ($insert != -2) {
@@ -86,7 +86,7 @@ 
                     $prepend = implode('', array_slice($lines, 0, $insert));
                     $append = implode('', array_slice($lines, $insert));
 
-                    $content = $prepend . $patchCode . $append;
+                    $content = $prepend.$patchCode.$append;
                     $content = str_replace(array("\r\n", "\n"), $newline, $content);
 
                     fwrite($fp, $content);
@@ -102,7 +102,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_provisionning' AND `conf_catid` = " . XOOPS_CONF_AUTH);
+        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_provisionning' AND `conf_catid` = ".XOOPS_CONF_AUTH);
         return (bool)$value;
     }
 
@@ -123,13 +123,13 @@ 
         $cat = getDbValue($db, 'configcategory', 'confcat_id', "`confcat_name` ='_MD_AM_AUTHENTICATION'");
         if ($cat !== false && $cat != XOOPS_CONF_AUTH) {
             // 2.2 downgrade bug: LDAP cat is here but has a catid of 0
-            $db->queryF("DELETE FROM " . $db->prefix('configcategory') . " WHERE `confcat_name` ='_MD_AM_AUTHENTICATION' ");
-            $db->queryF("DELETE FROM " . $db->prefix('config') . " WHERE `conf_modid`=0 AND `conf_catid` = $cat");
+            $db->queryF("DELETE FROM ".$db->prefix('configcategory')." WHERE `confcat_name` ='_MD_AM_AUTHENTICATION' ");
+            $db->queryF("DELETE FROM ".$db->prefix('config')." WHERE `conf_modid`=0 AND `conf_catid` = $cat");
             $cat = false;
         }
         if (empty($cat)) {
             // Insert config category ( always XOOPS_CONF_AUTH = 7 )
-            $db->queryF("INSERT INTO " . $db->prefix("configcategory") . " (confcat_id,confcat_name) VALUES (7,'_MD_AM_AUTHENTICATION')");
+            $db->queryF("INSERT INTO ".$db->prefix("configcategory")." (confcat_id,confcat_name) VALUES (7,'_MD_AM_AUTHENTICATION')");
         }
         // Insert config values
         $table = $db->prefix('config');
@@ -140,7 +140,7 @@ 
             'ldap_manager_dn'          => "'_MD_AM_LDAP_MANAGER_DN', 'manager_dn', '_MD_AM_LDAP_MANAGER_DN_DESC', 'textbox', 'text', 5",
             'ldap_manager_pass'        => "'_MD_AM_LDAP_MANAGER_PASS', 'manager_pass', '_MD_AM_LDAP_MANAGER_PASS_DESC', 'textbox', 'text', 6",
             'ldap_version'             => "'_MD_AM_LDAP_VERSION', '3', '_MD_AM_LDAP_VERSION_DESC', 'textbox', 'text', 7",
-            'ldap_users_bypass'        => "'_MD_AM_LDAP_USERS_BYPASS', '" . serialize(array('admin')) . "', '_MD_AM_LDAP_USERS_BYPASS_DESC', 'textarea', 'array', 8",
+            'ldap_users_bypass'        => "'_MD_AM_LDAP_USERS_BYPASS', '".serialize(array('admin'))."', '_MD_AM_LDAP_USERS_BYPASS_DESC', 'textarea', 'array', 8",
             'ldap_loginname_asdn'      => "'_MD_AM_LDAP_LOGINNAME_ASDN', 'uid_asdn', '_MD_AM_LDAP_LOGINNAME_ASDN_D', 'yesno', 'int', 9",
             'ldap_loginldap_attr'      => "'_MD_AM_LDAP_LOGINLDAP_ATTR', 'uid', '_MD_AM_LDAP_LOGINLDAP_ATTR_D', 'textbox', 'text', 10",
             'ldap_filter_person'       => "'_MD_AM_LDAP_FILTER_PERSON', '', '_MD_AM_LDAP_FILTER_PERSON_DESC', 'textbox', 'text', 11",
@@ -153,7 +153,7 @@ 
         );
         foreach ($data as $name => $values) {
             if (!getDbValue($db, 'config', 'conf_id', "`conf_modid`=0 AND `conf_catid`=7 AND `conf_name`='$name'")) {
-                $this->query("INSERT INTO `$table` (conf_modid,conf_catid,conf_name,conf_title,conf_value,conf_desc,conf_formtype,conf_valuetype,conf_order) " . "VALUES ( 0,7,'$name',$values)");
+                $this->query("INSERT INTO `$table` (conf_modid,conf_catid,conf_name,conf_title,conf_value,conf_desc,conf_formtype,conf_valuetype,conf_order) "."VALUES ( 0,7,'$name',$values)");
             }
         }
         // Insert auth_method config options