geekwright / XoopsCore

upgrade/upd-2.0.15-to-2.0.16/index.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_use_TLS' AND `conf_catid` = " . XOOPS_CONF_AUTH);
+        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_use_TLS' AND `conf_catid` = ".XOOPS_CONF_AUTH);
         return (bool)($value);
     }
 
@@ -55,7 +55,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)");
             }
         }
         return true;

upgrade/login.php

Spacing +8 added lines, -8 removed lines

@@ -23,12 +23,12 @@ 
 } else {
     $xoops = Xoops::getInstance();
     $myts = MyTextsanitizer::getInstance();
-    $uname = !isset($_POST['uname']) ? '' : $myts->addSlashes( trim($_POST['uname']) );
-    $pass = !isset($_POST['pass']) ? '' : $myts->addSlashes( trim($_POST['pass']) );
+    $uname = !isset($_POST['uname']) ? '' : $myts->addSlashes(trim($_POST['uname']));
+    $pass = !isset($_POST['pass']) ? '' : $myts->addSlashes(trim($_POST['pass']));
 
     $member_handler = $xoops->getHandlerMember();
 
-    if (!@include_once XOOPS_ROOT_PATH.'/language/' . $upgrade_language . '/auth.php') {
+    if (!@include_once XOOPS_ROOT_PATH.'/language/'.$upgrade_language.'/auth.php') {
         include_once XOOPS_ROOT_PATH.'/language/english/auth.php';
     }
     $xoopsAuth = Xoops_Auth_Factory::getAuthConnection($uname);
@@ -48,7 +48,7 @@ 
             $groups = $user->getGroups();
             if (in_array(XOOPS_GROUP_ADMIN, $groups) || array_intersect($groups, $xoopsConfig['closesite_okgrp'])) {
                 $isAllowed = true;
-            }  else {
+            } else {
                 $isAllowed = false;
             }
         }
@@ -69,14 +69,14 @@ 
 
         // Set cookie for rememberme
         if ($xoops->getConfig('usercookie')) {
-            if ( !empty($_POST["rememberme"]) ) {
-                setcookie($xoops->getConfig('usercookie'), $_SESSION['xoopsUserId'], time() + 31536000, '/',  '', 0);
+            if (!empty($_POST["rememberme"])) {
+                setcookie($xoops->getConfig('usercookie'), $_SESSION['xoopsUserId'], time() + 31536000, '/', '', 0);
             } else {
-                setcookie($xoops->getConfig('usercookie'), 0, -1, '/',  '', 0);
+                setcookie($xoops->getConfig('usercookie'), 0, -1, '/', '', 0);
             }
         }
     }
 
-    header("location: " . XOOPS_URL . "/upgrade/index.php");
+    header("location: ".XOOPS_URL."/upgrade/index.php");
     exit();
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             $groups = $user->getGroups();
             if (in_array(XOOPS_GROUP_ADMIN, $groups) || array_intersect($groups, $xoopsConfig['closesite_okgrp'])) {
                 $isAllowed = true;
-            }  else {
+            } else {
                 $isAllowed = false;
             }
         }

upgrade/abstract.php

Braces +3 added lines, -1 removed lines

@@ -60,7 +60,9 @@
         $tasks = $_SESSION['xoops_upgrade'][$step];
         foreach ($tasks as $task) {
             $res = $this->{"apply_{$task}"}();
-            if (!$res) return false;
+            if (!$res) {
+                return false;
+            }
             array_shift($_SESSION['xoops_upgrade'][$step]);
         }
         return true;

upgrade/cnt-2.2.x-to-2.3.0/language/english.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 // _CHARSET : UTF-8
 // Translator: XOOPS Translation Team
 
-define("_CONFIRM_UPGRADE_220","
+define("_CONFIRM_UPGRADE_220", "
 The upgrade scripts will migrate data from existent 'profile' module.<br />
 Please don't uninstall the existent 'profile' module manually, otherwise corresponding data won't be migrated.<br /><br />
 Once the upgrade process is fully completed please <stong>go to module administration area to updade 'profile' module</strong>, by which profile data will be migrated completely.<br /><br />

upgrade/cnt-2.2.x-to-2.3.0/index.php

Indentation -3 removed lines

@@ -27,7 +27,6 @@ 
 
     /**
      * Check if config category already removed
-
      */
     function check_config()
     {
@@ -45,7 +44,6 @@ 
 
     /**
      * Check if user profile table already converted
-
      */
     function check_profile()
     {
@@ -67,7 +65,6 @@ 
 
     /**
      * Check if block table already converted
-
      */
     function check_block()
     {

Spacing +121 added lines, -121 removed lines

@@ -32,7 +32,7 @@ 
     function check_config()
     {
         $xoops = Xoops::getInstance();
-        $sql = "SHOW COLUMNS FROM `" . $xoops->db()->prefix('configcategory') . "` LIKE 'confcat_modid'";
+        $sql = "SHOW COLUMNS FROM `".$xoops->db()->prefix('configcategory')."` LIKE 'confcat_modid'";
         $result = $xoops->db()->queryF($sql);
         if (!$result) {
             return true;
@@ -54,7 +54,7 @@ 
         if (!$profile_module = $module_handler->getByDirname('profile')) {
             return true;
         }
-        $sql = "SHOW COLUMNS FROM " . $xoops->db()->prefix("users") . " LIKE 'posts'";
+        $sql = "SHOW COLUMNS FROM ".$xoops->db()->prefix("users")." LIKE 'posts'";
         $result = $xoops->db()->queryF($sql);
         if (!$result) {
             return false;
@@ -72,7 +72,7 @@ 
     function check_block()
     {
         $xoops = Xoops::getInstance();
-        $sql = "SHOW TABLES LIKE '" . $xoops->db()->prefix("block_instance") . "'";
+        $sql = "SHOW TABLES LIKE '".$xoops->db()->prefix("block_instance")."'";
         $result = $xoops->db()->queryF($sql);
         if (!$result) {
             return true;
@@ -101,25 +101,25 @@ 
         $result = true;
 
         //Set core configuration back to zero for system module
-        $xoops->db()->queryF("UPDATE `" . $xoops->db()->prefix('config') . "` SET conf_modid = 0 WHERE conf_modid = 1");
+        $xoops->db()->queryF("UPDATE `".$xoops->db()->prefix('config')."` SET conf_modid = 0 WHERE conf_modid = 1");
 
         //Change debug modes so there can only be one active at any one time
-        $xoops->db()->queryF("UPDATE `" . $xoops->db()->prefix('config') . "` SET conf_formtype = 'select', conf_valuetype = 'int' WHERE conf_name = 'debug_mode'");
+        $xoops->db()->queryF("UPDATE `".$xoops->db()->prefix('config')."` SET conf_formtype = 'select', conf_valuetype = 'int' WHERE conf_name = 'debug_mode'");
 
         //Reset category ID for non-system configs
-        $xoops->db()->queryF("UPDATE `" . $xoops->db()->prefix('config') . "` SET conf_catid = 0 WHERE conf_modid > 1 AND conf_catid > 0");
+        $xoops->db()->queryF("UPDATE `".$xoops->db()->prefix('config')."` SET conf_catid = 0 WHERE conf_modid > 1 AND conf_catid > 0");
 
         // remove admin theme configuration item
-        $xoops->db()->queryF("DELETE FROM `" . $xoops->db()->prefix('config') . "` WHERE conf_name='theme_set_admin'");
+        $xoops->db()->queryF("DELETE FROM `".$xoops->db()->prefix('config')."` WHERE conf_name='theme_set_admin'");
 
         //Drop non-System config categories
-        $xoops->db()->queryF("DELETE FROM `" . $xoops->db()->prefix('configcategory') . "` WHERE confcat_modid > 1");
+        $xoops->db()->queryF("DELETE FROM `".$xoops->db()->prefix('configcategory')."` WHERE confcat_modid > 1");
 
         //Drop category information fields added in 2.2
-        $xoops->db()->queryF("ALTER TABLE `" . $xoops->db()->prefix("configcategory") . "` DROP `confcat_nameid`, DROP `confcat_description`, DROP `confcat_modid`");
+        $xoops->db()->queryF("ALTER TABLE `".$xoops->db()->prefix("configcategory")."` DROP `confcat_nameid`, DROP `confcat_description`, DROP `confcat_modid`");
 
         // Re-add user configuration category
-        $xoops->db()->queryF("INSERT INTO `" . $xoops->db()->prefix("configcategory") . "` (confcat_id, confcat_name, confcat_order) VALUES (2, '_MD_AM_USERSETTINGS', 2)");
+        $xoops->db()->queryF("INSERT INTO `".$xoops->db()->prefix("configcategory")."` (confcat_id, confcat_name, confcat_order) VALUES (2, '_MD_AM_USERSETTINGS', 2)");
 
         //Rebuild user configuration items
         //Get values from Profile module
@@ -155,31 +155,31 @@ 
             }
         }
 
-        $xoops->db()->queryF("INSERT INTO `" .
-                $xoops->db()->prefix("config") .
-                "` (conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) VALUES " .
-                " (0, 2, 'minpass', '_MD_AM_MINPASS', " .
-                $xoops->db()->quote($profile_config_arr['minpass']) . ", '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)," .
-                " (0, 2, 'minuname', '_MD_AM_MINUNAME', " .
-                $xoops->db()->quote($profile_config_arr['minuname']) . ", '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)," . " (0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', " .
-                $xoops->db()->quote($profile_config_arr['new_user_notify']) . ", '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)," . " (0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', " .
-                $xoops->db()->quote($profile_config_arr['new_user_notify_group']) . ", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)," . " (0, 2, 'activation_type', '_MD_AM_ACTVTYPE', " .
-                $xoops->db()->quote($profile_config_arr['activation_type']) . ", '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)," . " (0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".
-                $xoops->db()->quote($profile_config_arr['activation_group']) . ", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)," . " (0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', " .
-                $xoops->db()->quote($profile_config_arr['uname_test_level']) . ", '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)," . " (0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', " .
-                $xoops->db()->quote($profile_config_arr['avatar_allow_upload']) . ", '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)," . " (0, 2, 'avatar_width', '_MD_AM_AVATARW', " .
-                $xoops->db()->quote($profile_config_arr['avatar_width']) . ", '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)," . " (0, 2, 'avatar_height', '_MD_AM_AVATARH', " .
-                $xoops->db()->quote($profile_config_arr['avatar_height']) . ", '_MD_AM_AVATARHDSC', 'textbox', 'int', 18)," . " (0, 2, 'avatar_maxsize', '_MD_AM_AVATARMAX', " .
-                $xoops->db()->quote($profile_config_arr['avatar_maxsize']) . ", '_MD_AM_AVATARMAXDSC', 'textbox', 'int', 20)," . " (0, 2, 'self_delete', '_MD_AM_SELFDELETE', " .
-                $xoops->db()->quote($profile_config_arr['self_delete']) . ", '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22)," . " (0, 2, 'bad_unames', '_MD_AM_BADUNAMES', " .
-                $xoops->db()->quote($profile_config_arr['bad_unames']) . ", '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)," . " (0, 2, 'bad_emails', '_MD_AM_BADEMAILS', " .
-                $xoops->db()->quote($profile_config_arr['bad_emails']) . ", '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)," . " (0, 2, 'maxuname', '_MD_AM_MAXUNAME', " .
-                $xoops->db()->quote($profile_config_arr['maxuname']) . ", '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)," . " (0, 2, 'avatar_minposts', '_MD_AM_AVATARMP', " .
-                $xoops->db()->quote($profile_config_arr['avatar_minposts']) . ", '_MD_AM_AVATARMPDSC', 'textbox', 'int', 15)," . " (0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', " .
-                $xoops->db()->quote($profile_config_arr['allow_chgmail']) . ", '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)," . " (0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', " .
-                $xoops->db()->quote($profile_config_arr['reg_dispdsclmr']) . ", '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30)," . " (0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', " .
-                $xoops->db()->quote($profile_config_arr['reg_disclaimer']) . ", '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32)," . " (0, 2, 'allow_register', '_MD_AM_ALLOWREG', " .
-                $xoops->db()->quote($profile_config_arr['allow_register']) . ", '_MD_AM_ALLOWREGDSC', 'yesno', 'int', 0)");
+        $xoops->db()->queryF("INSERT INTO `".
+                $xoops->db()->prefix("config").
+                "` (conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) VALUES ".
+                " (0, 2, 'minpass', '_MD_AM_MINPASS', ".
+                $xoops->db()->quote($profile_config_arr['minpass']).", '_MD_AM_MINPASSDSC', 'textbox', 'int', 1),".
+                " (0, 2, 'minuname', '_MD_AM_MINUNAME', ".
+                $xoops->db()->quote($profile_config_arr['minuname']).", '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2),"." (0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', ".
+                $xoops->db()->quote($profile_config_arr['new_user_notify']).", '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4),"." (0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".
+                $xoops->db()->quote($profile_config_arr['new_user_notify_group']).", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6),"." (0, 2, 'activation_type', '_MD_AM_ACTVTYPE', ".
+                $xoops->db()->quote($profile_config_arr['activation_type']).", '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8),"." (0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".
+                $xoops->db()->quote($profile_config_arr['activation_group']).", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10),"." (0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', ".
+                $xoops->db()->quote($profile_config_arr['uname_test_level']).", '_MD_AM_UNAMELVLDSC', 'select', 'int', 12),"." (0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', ".
+                $xoops->db()->quote($profile_config_arr['avatar_allow_upload']).", '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14),"." (0, 2, 'avatar_width', '_MD_AM_AVATARW', ".
+                $xoops->db()->quote($profile_config_arr['avatar_width']).", '_MD_AM_AVATARWDSC', 'textbox', 'int', 16),"." (0, 2, 'avatar_height', '_MD_AM_AVATARH', ".
+                $xoops->db()->quote($profile_config_arr['avatar_height']).", '_MD_AM_AVATARHDSC', 'textbox', 'int', 18),"." (0, 2, 'avatar_maxsize', '_MD_AM_AVATARMAX', ".
+                $xoops->db()->quote($profile_config_arr['avatar_maxsize']).", '_MD_AM_AVATARMAXDSC', 'textbox', 'int', 20),"." (0, 2, 'self_delete', '_MD_AM_SELFDELETE', ".
+                $xoops->db()->quote($profile_config_arr['self_delete']).", '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22),"." (0, 2, 'bad_unames', '_MD_AM_BADUNAMES', ".
+                $xoops->db()->quote($profile_config_arr['bad_unames']).", '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24),"." (0, 2, 'bad_emails', '_MD_AM_BADEMAILS', ".
+                $xoops->db()->quote($profile_config_arr['bad_emails']).", '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26),"." (0, 2, 'maxuname', '_MD_AM_MAXUNAME', ".
+                $xoops->db()->quote($profile_config_arr['maxuname']).", '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3),"." (0, 2, 'avatar_minposts', '_MD_AM_AVATARMP', ".
+                $xoops->db()->quote($profile_config_arr['avatar_minposts']).", '_MD_AM_AVATARMPDSC', 'textbox', 'int', 15),"." (0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', ".
+                $xoops->db()->quote($profile_config_arr['allow_chgmail']).", '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3),"." (0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', ".
+                $xoops->db()->quote($profile_config_arr['reg_dispdsclmr']).", '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30),"." (0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', ".
+                $xoops->db()->quote($profile_config_arr['reg_disclaimer']).", '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32),"." (0, 2, 'allow_register', '_MD_AM_ALLOWREG', ".
+                $xoops->db()->quote($profile_config_arr['allow_register']).", '_MD_AM_ALLOWREGDSC', 'yesno', 'int', 0)");
 
         //Rebuild user configuration options
         $criteria = new CriteriaCompo(new Criteria('conf_name', "('activation_type', 'uname_test_level')", "IN"));
@@ -189,14 +189,14 @@ 
         $configs = $config_handler->getConfigs($criteria);
         $id_activation_type = $configs[0]->getVar("conf_id");
         $id_uname_test_level = $configs[1]->getVar("conf_id");
-        $xoops->db()->queryF("INSERT INTO `" .
-                $xoops->db()->prefix("configoption") .
-                "` (confop_name, confop_value, conf_id) VALUES " .
-                " ('_MD_AM_USERACTV', '0', {$id_activation_type})," .
-                " ('_MD_AM_AUTOACTV', '1', {$id_activation_type})," .
-                " ('_MD_AM_ADMINACTV', '2', {$id_activation_type})," .
-                " ('_MD_AM_STRICT', '0', {$id_uname_test_level})," .
-                " ('_MD_AM_MEDIUM', '1', {$id_uname_test_level})," .
+        $xoops->db()->queryF("INSERT INTO `".
+                $xoops->db()->prefix("configoption").
+                "` (confop_name, confop_value, conf_id) VALUES ".
+                " ('_MD_AM_USERACTV', '0', {$id_activation_type}),".
+                " ('_MD_AM_AUTOACTV', '1', {$id_activation_type}),".
+                " ('_MD_AM_ADMINACTV', '2', {$id_activation_type}),".
+                " ('_MD_AM_STRICT', '0', {$id_uname_test_level}),".
+                " ('_MD_AM_MEDIUM', '1', {$id_uname_test_level}),".
                 " ('_MD_AM_LIGHT', '2', {$id_uname_test_level})");
 
         return $result;
@@ -207,7 +207,7 @@ 
         $xoops = Xoops::getInstance();
         $xoops->db();
         // Restore users table
-        $xoops->db()->queryF("ALTER TABLE `" . $xoops->db()->prefix("users") . "`
+        $xoops->db()->queryF("ALTER TABLE `".$xoops->db()->prefix("users")."`
               ADD url varchar(100) NOT NULL default '',
               ADD user_regdate int(10) unsigned NOT NULL default '0',
               ADD user_icq varchar(15) NOT NULL default '',
@@ -240,18 +240,18 @@ 
             "notify_method", "notify_mode", "user_occ", "bio", "user_intrest", "user_mailok"
         );
         foreach ($profile_fields as $field) {
-            $xoops->db()->queryF("UPDATE `" .
-                    $xoops->db()->prefix("users") . "` u, `" .
-                    $xoops->db()->prefix("user_profile") .
+            $xoops->db()->queryF("UPDATE `".
+                    $xoops->db()->prefix("users")."` u, `".
+                    $xoops->db()->prefix("user_profile").
                     "` p SET u.{$field} = p.{$field} WHERE u.uid=p.profileid");
         }
 
         //Set display name as real name
-        $xoops->db()->queryF("UPDATE `" . $xoops->db()->prefix("users") . "` SET name=uname WHERE name=''");
+        $xoops->db()->queryF("UPDATE `".$xoops->db()->prefix("users")."` SET name=uname WHERE name=''");
         //Set loginname as uname
-        $xoops->db()->queryF("UPDATE `" . $xoops->db()->prefix("users") . "` SET uname=loginname");
+        $xoops->db()->queryF("UPDATE `".$xoops->db()->prefix("users")."` SET uname=loginname");
         //Drop loginname
-        $xoops->db()->queryF("ALTER TABLE `" . $xoops->db()->prefix("users") . "` DROP loginname");
+        $xoops->db()->queryF("ALTER TABLE `".$xoops->db()->prefix("users")."` DROP loginname");
 
         return true;
     }
@@ -274,37 +274,37 @@ 
     function apply_block()
     {
         $xoops = Xoops::getInstance();
-        $xoops->db()->queryF("UPDATE " .
-                $xoops->db()->prefix("block_module_link") .
+        $xoops->db()->queryF("UPDATE ".
+                $xoops->db()->prefix("block_module_link").
                 " SET module_id = -1, pageid = 0 WHERE module_id < 2 AND pageid = 1");
 
         //Change block module link to remove pages
         //Remove page links for module subpages
-        $xoops->db()->queryF("DELETE FROM " .
-                $xoops->db()->prefix("block_module_link") .
+        $xoops->db()->queryF("DELETE FROM ".
+                $xoops->db()->prefix("block_module_link").
                 " WHERE pageid > 0");
 
-        $sql = "ALTER TABLE `" .
-                $xoops->db()->prefix("block_module_link") .
+        $sql = "ALTER TABLE `".
+                $xoops->db()->prefix("block_module_link").
                 "` DROP PRIMARY KEY";
         $xoops->db()->queryF($sql);
-        $sql = "ALTER TABLE `" .
-                $xoops->db()->prefix("block_module_link") .
+        $sql = "ALTER TABLE `".
+                $xoops->db()->prefix("block_module_link").
                 "` DROP pageid";
         $xoops->db()->queryF($sql);
-        $sql = "ALTER IGNORE TABLE `" .
-                $xoops->db()->prefix("block_module_link") .
+        $sql = "ALTER IGNORE TABLE `".
+                $xoops->db()->prefix("block_module_link").
                 "` ADD PRIMARY KEY (`block_id` , `module_id`)";
         $xoops->db()->queryF($sql);
 
-        $xoops->db()->queryF("RENAME TABLE `" .
-                $xoops->db()->prefix("newblocks") .
-                "` TO `" .
-                $xoops->db()->prefix("newblocks_bak") .
+        $xoops->db()->queryF("RENAME TABLE `".
+                $xoops->db()->prefix("newblocks").
+                "` TO `".
+                $xoops->db()->prefix("newblocks_bak").
                 "`");
 
         // Create new block table
-        $sql = "CREATE TABLE " . $xoops->db()->prefix("newblocks") . " (
+        $sql = "CREATE TABLE ".$xoops->db()->prefix("newblocks")." (
               bid mediumint(8) unsigned NOT NULL auto_increment,
               mid smallint(5) unsigned NOT NULL default '0',
               func_num tinyint(3) unsigned NOT NULL default '0',
@@ -334,20 +334,20 @@ 
             ";
         $xoops->db()->queryF($sql);
 
-        $sql = "SELECT MAX(instanceid) FROM " .
+        $sql = "SELECT MAX(instanceid) FROM ".
                 $xoops->db()->prefix('block_instance');
         $result = $xoops->db()->query($sql);
         list($MaxInstanceId) = $xoops->db()->fetchRow($result);
 
         // Change custom block mid from 1 to 0
-        $sql = "UPDATE `" .
-                $xoops->db()->prefix("newblocks_bak") .
+        $sql = "UPDATE `".
+                $xoops->db()->prefix("newblocks_bak").
                 "` SET mid = 0 WHERE show_func = 'b_system_custom_show'";
         $result = $xoops->db()->queryF($sql);
 
-        $sql = "SELECT b.*, i.instanceid " . "   FROM " .
-                $xoops->db()->prefix('block_instance') . " AS i LEFT JOIN " . $xoops->db()->prefix("newblocks_bak") .
-                " AS b ON b.bid = i.bid " . "   GROUP BY b.dirname, b.bid, i.instanceid";
+        $sql = "SELECT b.*, i.instanceid "."   FROM ".
+                $xoops->db()->prefix('block_instance')." AS i LEFT JOIN ".$xoops->db()->prefix("newblocks_bak").
+                " AS b ON b.bid = i.bid "."   GROUP BY b.dirname, b.bid, i.instanceid";
         $result = $xoops->db()->query($sql);
         $dirname = '';
         $bid = 0;
@@ -356,7 +356,7 @@ 
             if ($row['dirname'] != $dirname) {
                 $dirname = $row['dirname'];
                 $modversion = array();
-                if (!@include XOOPS_ROOT_PATH . '/modules/' . $dirname . '/xoops_version.php') {
+                if (!@include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/xoops_version.php') {
                     continue;
                 }
             }
@@ -376,39 +376,39 @@ 
             }
 
             // Copy data from block instance table and blocks table
-            $sql = "INSERT INTO " .
-                    $xoops->db()->prefix("newblocks") .
-                    " (bid, mid, options, name, title, side, weight, visible, " .
-                    " func_num, " .
-                    " block_type, " .
-                    " c_type, " .
-                    " isactive, dirname, func_file," .
-                    " show_func, edit_func, template, bcachetime, last_modified)" .
-                    " SELECT " .
-                    " i.instanceid, c.mid, i.options, c.name, i.title, i.side, i.weight, i.visible, " .
-                    " {$block_key}, " .
-                    ($isClone ? " CASE WHEN c.show_func='b_system_custom_show' THEN 'C' ELSE 'D' END," : " CASE WHEN c.show_func='b_system_custom_show' THEN 'C' WHEN c.mid = 1 THEN 'S' ELSE 'M' END,") .
-                    " CASE WHEN c.c_type='' THEN 'H' ELSE c.c_type END," .
-                    " c.isactive, c.dirname, c.func_file," .
-                    " c.show_func, c.edit_func, c.template, i.bcachetime, c.last_modified" .
-                    " FROM " . $xoops->db()->prefix("block_instance") .
-                    " AS i," .
-                    " " .
-                    $xoops->db()->prefix("newblocks_bak") .
-                    " AS c" .
-                    " WHERE i.bid = c.bid" .
-                    " AND i.instanceid = " .
+            $sql = "INSERT INTO ".
+                    $xoops->db()->prefix("newblocks").
+                    " (bid, mid, options, name, title, side, weight, visible, ".
+                    " func_num, ".
+                    " block_type, ".
+                    " c_type, ".
+                    " isactive, dirname, func_file,".
+                    " show_func, edit_func, template, bcachetime, last_modified)".
+                    " SELECT ".
+                    " i.instanceid, c.mid, i.options, c.name, i.title, i.side, i.weight, i.visible, ".
+                    " {$block_key}, ".
+                    ($isClone ? " CASE WHEN c.show_func='b_system_custom_show' THEN 'C' ELSE 'D' END," : " CASE WHEN c.show_func='b_system_custom_show' THEN 'C' WHEN c.mid = 1 THEN 'S' ELSE 'M' END,").
+                    " CASE WHEN c.c_type='' THEN 'H' ELSE c.c_type END,".
+                    " c.isactive, c.dirname, c.func_file,".
+                    " c.show_func, c.edit_func, c.template, i.bcachetime, c.last_modified".
+                    " FROM ".$xoops->db()->prefix("block_instance").
+                    " AS i,".
+                    " ".
+                    $xoops->db()->prefix("newblocks_bak").
+                    " AS c".
+                    " WHERE i.bid = c.bid".
+                    " AND i.instanceid = ".
                     $row['instanceid'];
             $xoops->db()->queryF($sql);
         }
 
-        $sql = "SELECT b.* " .
-                "FROM " .
-                $xoops->db()->prefix("newblocks_bak") .
-                " AS b LEFT JOIN " .
-                $xoops->db()->prefix('block_instance') .
-                " AS i ON b.bid = i.bid " .
-                " WHERE i.instanceid IS NULL" .
+        $sql = "SELECT b.* ".
+                "FROM ".
+                $xoops->db()->prefix("newblocks_bak").
+                " AS b LEFT JOIN ".
+                $xoops->db()->prefix('block_instance').
+                " AS i ON b.bid = i.bid ".
+                " WHERE i.instanceid IS NULL".
                 " GROUP BY b.dirname, b.bid";
         $result = $xoops->db()->query($sql);
         $dirname = '';
@@ -418,7 +418,7 @@ 
             if ($row['dirname'] != $dirname) {
                 $dirname = $row['dirname'];
                 $modversion = array();
-                if (!@include XOOPS_ROOT_PATH . '/modules/' . $dirname . '/xoops_version.php') {
+                if (!@include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/xoops_version.php') {
                     continue;
                 }
             }
@@ -436,41 +436,41 @@ 
             }
 
             // Copy data from blocks table
-            $sql = "    INSERT INTO " . $xoops->db()
-                    ->prefix("newblocks") . "       (bid, mid, options, name, title, side, weight, visible, " . "           func_num, " . "         block_type, " . "           c_type, " . "           isactive, dirname, func_file," . "          show_func, edit_func, template, bcachetime, last_modified)" . " SELECT " . "        bid + {$MaxInstanceId}, mid, options, name, name, 0, 0, 0, " . "        {$block_key}, " . "     CASE WHEN show_func='b_system_custom_show' THEN 'C' WHEN mid = 1 THEN 'S' ELSE 'M' END," . "        CASE WHEN c_type='' THEN 'H' ELSE c_type END," . "      isactive, dirname, func_file," . "      show_func, edit_func, template, 0, last_modified" . "   FROM " . $xoops
-                    ->db()->prefix("newblocks_bak") . " WHERE bid = " . $row['bid'];
+            $sql = "    INSERT INTO ".$xoops->db()
+                    ->prefix("newblocks")."       (bid, mid, options, name, title, side, weight, visible, "."           func_num, "."         block_type, "."           c_type, "."           isactive, dirname, func_file,"."          show_func, edit_func, template, bcachetime, last_modified)"." SELECT "."        bid + {$MaxInstanceId}, mid, options, name, name, 0, 0, 0, "."        {$block_key}, "."     CASE WHEN show_func='b_system_custom_show' THEN 'C' WHEN mid = 1 THEN 'S' ELSE 'M' END,"."        CASE WHEN c_type='' THEN 'H' ELSE c_type END,"."      isactive, dirname, func_file,"."      show_func, edit_func, template, 0, last_modified"."   FROM ".$xoops
+                    ->db()->prefix("newblocks_bak")." WHERE bid = ".$row['bid'];
             $xoops->db()->queryF($sql);
 
             // Build block-module link
-            $sql = "    INSERT INTO " . $xoops->db()
-                    ->prefix("block_module_link") . "       (block_id, module_id)" . "  SELECT " . "        bid + {$MaxInstanceId}, -1" . " FROM " . $xoops
-                    ->db()->prefix("newblocks_bak") . " WHERE bid = " . $row['bid'];
+            $sql = "    INSERT INTO ".$xoops->db()
+                    ->prefix("block_module_link")."       (block_id, module_id)"."  SELECT "."        bid + {$MaxInstanceId}, -1"." FROM ".$xoops
+                    ->db()->prefix("newblocks_bak")." WHERE bid = ".$row['bid'];
             $xoops->db()->queryF($sql);
         }
 
         // Dealing with tables
-        $xoops->db()->queryF("DROP TABLE `" . $xoops->db()->prefix("block_instance") . "`;");
-        $xoops->db()->queryF("DROP TABLE `" . $xoops->db()->prefix("newblocks_bak") . "`;");
+        $xoops->db()->queryF("DROP TABLE `".$xoops->db()->prefix("block_instance")."`;");
+        $xoops->db()->queryF("DROP TABLE `".$xoops->db()->prefix("newblocks_bak")."`;");
 
         // Deal with custom blocks, convert options to type and content
-        $sql = "SELECT bid, options FROM `" . $xoops->db()
-                ->prefix("newblocks") . "` WHERE show_func='b_system_custom_show'";
+        $sql = "SELECT bid, options FROM `".$xoops->db()
+                ->prefix("newblocks")."` WHERE show_func='b_system_custom_show'";
         $result = $xoops->db()->query($sql);
         while (false !== (list($bid, $options) = $xoops->db()->fetchRow($result))) {
             $_options = unserialize($options);
             $content = $_options[0];
             $type = $_options[1];
-            $xoops->db()->queryF("UPDATE `" . $xoops->db()
-                    ->prefix("newblocks") . "` SET c_type = '{$type}', options = '', content = " . $xoops->db()
-                    ->quote($content) . " WHERE bid = {$bid}");
+            $xoops->db()->queryF("UPDATE `".$xoops->db()
+                    ->prefix("newblocks")."` SET c_type = '{$type}', options = '', content = ".$xoops->db()
+                    ->quote($content)." WHERE bid = {$bid}");
         }
 
         // Deal with block options, convert array values to "," and "|" delimited
-        $sql = "UPDATE `" . $xoops->db()
-                ->prefix("newblocks") . "` SET options = '' WHERE show_func <> 'b_system_custom_show' AND ( options = 'a:1:{i:0;s:0:\"\";}' OR options = 'a:0:{}' )";
+        $sql = "UPDATE `".$xoops->db()
+                ->prefix("newblocks")."` SET options = '' WHERE show_func <> 'b_system_custom_show' AND ( options = 'a:1:{i:0;s:0:\"\";}' OR options = 'a:0:{}' )";
         $result = $xoops->db()->queryF($sql);
-        $sql = "SELECT bid, options FROM `" . $xoops->db()
-                ->prefix("newblocks") . "` WHERE show_func <> 'b_system_custom_show' AND options <> ''";
+        $sql = "SELECT bid, options FROM `".$xoops->db()
+                ->prefix("newblocks")."` WHERE show_func <> 'b_system_custom_show' AND options <> ''";
         $result = $xoops->db()->query($sql);
         while (false !== (list($bid, $_options) = $xoops->db()->fetchRow($result))) {
             $options = unserialize($_options);
@@ -485,8 +485,8 @@ 
                 }
             }
             $options = implode('|', $options);
-            $sql = "UPDATE `" . $xoops->db()->prefix("newblocks") . "` SET options = " . $xoops->db()
-                    ->quote($options) . " WHERE bid = {$bid}";
+            $sql = "UPDATE `".$xoops->db()->prefix("newblocks")."` SET options = ".$xoops->db()
+                    ->quote($options)." WHERE bid = {$bid}";
             $xoops->db()->queryF($sql);
         }
 

upgrade/upd-2.4.x-to-2.5.0/dbmanager.php

Indentation +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
                         if (!isset($this->f_tables['insert'][$table])) {
                             $this->f_tables['insert'][$table] = 1;
                         } else {
-                             $this->f_tables['insert'][$table]++;
+                                $this->f_tables['insert'][$table]++;
                         }
                     }
                 } else if ($prefixed_query[1] == 'ALTER TABLE') {

Spacing +10 added lines, -10 removed lines

@@ -17,9 +17,9 @@ 
  * @access      public
  **/
 
-include_once XOOPS_ROOT_PATH . '/class/database/databasefactory.php';
-include_once XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php';
-include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
+include_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
+include_once XOOPS_ROOT_PATH.'/class/database/'.XOOPS_DB_TYPE.'database.php';
+include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
 
 /**
  * Database manager
@@ -54,7 +54,7 @@ 
     {
         $this->db->connect(false);
 
-        $result = $this->db->query("CREATE DATABASE " . XOOPS_DB_NAME);
+        $result = $this->db->query("CREATE DATABASE ".XOOPS_DB_NAME);
 
         return ($result != false) ? true : false;
     }
@@ -74,7 +74,7 @@ 
             // [0] contains the prefixed query
             // [4] contains unprefixed table name
             $prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
-            if ($prefixed_query != false ) {
+            if ($prefixed_query != false) {
                 $table = $this->db->prefix($prefixed_query[4]);
                 if ($prefixed_query[1] == 'CREATE TABLE') {
                     if ($this->db->query($prefixed_query[0]) != false) {
@@ -142,7 +142,7 @@ 
 
     function report()
     {
-        $commands = array( 'create', 'insert', 'alter', 'drop' );
+        $commands = array('create', 'insert', 'alter', 'drop');
         $content = '<ul class="log">';
         foreach ($commands as $cmd) {
             if (!@empty($this->s_tables[$cmd])) {
@@ -154,7 +154,7 @@ 
             }
         }
         foreach ($commands as $cmd) {
-            if (!@empty( $this->f_tables[$cmd])) {
+            if (!@empty($this->f_tables[$cmd])) {
                 foreach ($this->f_tables[$cmd] as $key => $val) {
                     $content .= '<li class="failure">';
                     $content .= ($cmd != 'insert') ? sprintf($this->failureStrings[$cmd], $key) : sprintf($this->failureStrings[$cmd], $val, $key);
@@ -188,7 +188,7 @@ 
     {
         $this->db->connect();
         $table = $this->db->prefix($table);
-        $query = 'INSERT INTO ' . $table . ' '. $query;
+        $query = 'INSERT INTO '.$table.' '.$query;
         if (!$this->db->queryF($query)) {
             if (!isset($this->f_tables['insert'][$table])) {
                 $this->f_tables['insert'][$table] = 1;
@@ -216,7 +216,7 @@ 
         $deleted = array();
         $this->db->connect();
         foreach ($tables as $key => $val) {
-            if (!$this->db->query("DROP TABLE " . $this->db->prefix($key))) {
+            if (!$this->db->query("DROP TABLE ".$this->db->prefix($key))) {
                 $deleted[] = $va;
             }
         }
@@ -229,7 +229,7 @@ 
         $ret = false;
         if ($table != '') {
             $this->db->connect();
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix($table);
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix($table);
             $ret = (false != $this->db->query($sql)) ? true : false;
         }
         return $ret;

upgrade/upd-2.4.x-to-2.5.0/index.php

Indentation -1 removed lines

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

Spacing +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "SELECT COUNT(*) FROM `" . $db->prefix('config') . "` WHERE `conf_name` IN ('break1', 'usetips')";
+        $sql = "SELECT COUNT(*) FROM `".$db->prefix('config')."` WHERE `conf_name` IN ('break1', 'usetips')";
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -42,7 +42,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $sql = "SELECT COUNT(*) FROM `" . $db->prefix('tplfile') . "` WHERE `tpl_file` IN ('system_header.html') AND `tpl_type` = 'admin'";
+        $sql = "SELECT COUNT(*) FROM `".$db->prefix('tplfile')."` WHERE `tpl_file` IN ('system_header.html') AND `tpl_type` = 'admin'";
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -56,13 +56,13 @@ 
         $db = $xoops->db();
         $dbm = new db_manager();
 
-        $sql = "SELECT conf_id FROM `" . $db->prefix('config') . "` WHERE `conf_name` IN ('cpanel')";
+        $sql = "SELECT conf_id FROM `".$db->prefix('config')."` WHERE `conf_name` IN ('cpanel')";
         if (!$result = $db->queryF($sql)) {
             return false;
         }
         $count = $db->fetchRow($result);
 
-        $sql = "UPDATE `" . $db->prefix('config') . "` SET `conf_value` = 'default' WHERE `conf_id` = " . $count[0];
+        $sql = "UPDATE `".$db->prefix('config')."` SET `conf_value` = 'default' WHERE `conf_id` = ".$count[0];
         if (!$result = $db->queryF($sql)) {
             return false;
         }
@@ -109,25 +109,25 @@ 
         require_once '../class/xoopslists.php';
         $editors = XoopsLists::getDirListAsArray('../class/xoopseditor');
         foreach ($editors as $dir) {
-            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('" . $dir . "', '" . $dir . "', $block_id)");
+            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('".$dir."', '".$dir."', $block_id)");
         }
         foreach ($editors as $dir) {
-            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('" . $dir . "', '" . $dir . "', $com_id)");
+            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('".$dir."', '".$dir."', $com_id)");
         }
         foreach ($editors as $dir) {
-            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('" . $dir . "', '" . $dir . "', $main_id)");
+            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('".$dir."', '".$dir."', $main_id)");
         }
         $icons = XoopsLists::getDirListAsArray('../modules/system/images/icons');
         foreach ($icons as $dir) {
-            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('" . $dir . "', '" . $dir . "', $icon_id)");
+            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('".$dir."', '".$dir."', $icon_id)");
         }
         $breadcrumb = XoopsLists::getDirListAsArray('../modules/system/images/breadcrumb');
         foreach ($breadcrumb as $dir) {
-            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('" . $dir . "', '" . $dir . "', $bc_id)");
+            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('".$dir."', '".$dir."', $bc_id)");
         }
         $jqueryui = XoopsLists::getDirListAsArray('../modules/system/css/ui');
         foreach ($jqueryui as $dir) {
-            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('" . $dir . "', '" . $dir . "', $jquery_id)");
+            $dbm->insert('configoption', " (confop_name,confop_value,conf_id) VALUES ('".$dir."', '".$dir."', $jquery_id)");
         }
 
         return true;
@@ -142,11 +142,11 @@ 
         $time = time();
         foreach ($modversion['templates'] as $tplfile) {
             // Admin templates
-            if (isset($tplfile['type']) && $tplfile['type'] == 'admin' && $fp = fopen('../modules/system/templates/admin/' . $tplfile['file'], 'r')) {
-                $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ", " . $time . ", 'admin')");
-                $tplsource = fread($fp, filesize('../modules/system/templates/admin/' . $tplfile['file']));
+            if (isset($tplfile['type']) && $tplfile['type'] == 'admin' && $fp = fopen('../modules/system/templates/admin/'.$tplfile['file'], 'r')) {
+                $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '".addslashes($tplfile['file'])."', '".addslashes($tplfile['description'])."', ".$time.", ".$time.", 'admin')");
+                $tplsource = fread($fp, filesize('../modules/system/templates/admin/'.$tplfile['file']));
                 fclose($fp);
-                $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
+                $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (".$newtplid.", '".addslashes($tplsource)."')");
             }
         }
         return true;

upgrade/check_version.php

Spacing +12 added lines, -12 removed lines

@@ -24,9 +24,9 @@ 
  * @version     $Id$
  */
 
-defined( 'XOOPS_ROOT_PATH' ) or die();
+defined('XOOPS_ROOT_PATH') or die();
 
-$dirs = getDirList( "." );
+$dirs = getDirList(".");
 
 $results = array();
 $files = array();
@@ -35,14 +35,14 @@ 
 $_SESSION['xoops_upgrade'] = array();
 
 foreach ($dirs as $dir) {
-    if (strpos( $dir, "-to-")) {
+    if (strpos($dir, "-to-")) {
         $upgrader = include_once "{$dir}/index.php";
         if (is_object($upgrader)) {
-            if (!( $results[$dir] = $upgrader->isApplied())) {
+            if (!($results[$dir] = $upgrader->isApplied())) {
                 $_SESSION['xoops_upgrade']['steps'][] = $dir;
                 $needUpgrade = true;
-                if (!empty( $upgrader->usedFiles)) {
-                    $files = array_merge( $files, $upgrader->usedFiles );
+                if (!empty($upgrader->usedFiles)) {
+                    $files = array_merge($files, $upgrader->usedFiles);
                 }
             }
         }
@@ -63,23 +63,23 @@ 
 <?php foreach ($results as $upd => $res) { ?>
     <tr>
         <td><?php echo $upd; ?></td>
-        <td class="result-<?php echo $res?'y':'x'; ?>"><?php echo $res?'y':'x'; ?></td>
+        <td class="result-<?php echo $res ? 'y' : 'x'; ?>"><?php echo $res ? 'y' : 'x'; ?></td>
     </tr>
 <?php } ?>
 </table>
 <?php
     if (!$needUpgrade) {
-        $update_link = '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=system">' . _UPDATE_SYSTEM_MODULE . '</a>';
-        echo '<div class="x2-note">' . sprintf(_NO_NEED_UPGRADE, $update_link) . "</div>";
+        $update_link = '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=system">'._UPDATE_SYSTEM_MODULE.'</a>';
+        echo '<div class="x2-note">'.sprintf(_NO_NEED_UPGRADE, $update_link)."</div>";
         return;
     } else {
         if (!empty($files)) {
-            echo '<div class="x2-note"><p>' . _NEED_UPGRADE . "<br />" . _SET_FILES_WRITABLE . "</p><ul>";
+            echo '<div class="x2-note"><p>'._NEED_UPGRADE."<br />"._SET_FILES_WRITABLE."</p><ul>";
             foreach ($files as $file) echo "<li>{$file}</li>\n";
             echo "</ul></div>";
-            echo '<a id="link-next" href="index.php">' . _RELOAD . '</a>';
+            echo '<a id="link-next" href="index.php">'._RELOAD.'</a>';
         } else {
-            echo '<a id="link-next" href="index.php?action=next">' . _PROCEED_UPGRADE . '</a>';
+            echo '<a id="link-next" href="index.php?action=next">'._PROCEED_UPGRADE.'</a>';
         }
     }
 ?>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -75,7 +75,9 @@
     } else {
         if (!empty($files)) {
             echo '<div class="x2-note"><p>' . _NEED_UPGRADE . "<br />" . _SET_FILES_WRITABLE . "</p><ul>";
-            foreach ($files as $file) echo "<li>{$file}</li>\n";
+            foreach ($files as $file) {
+                echo "<li>{$file}</li>\n";
+            }
             echo "</ul></div>";
             echo '<a id="link-next" href="index.php">' . _RELOAD . '</a>';
         } else {

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

Spacing +44 added lines, -44 removed lines

@@ -46,28 +46,28 @@ 
 
     function PathStuffController()
     {
-        if ( isset( $_SESSION['settings']['VAR_PATH'] ) ) {
+        if (isset($_SESSION['settings']['VAR_PATH'])) {
             foreach ($this->path_lookup as $req => $sess) {
                 $this->xoopsPath[$req] = $_SESSION['settings'][$sess];
             }
         } else {
             $path = XOOPS_ROOT_PATH;
-            if ( defined("XOOPS_PATH") ) {
+            if (defined("XOOPS_PATH")) {
                 $this->xoopsPath['lib'] = XOOPS_PATH;
-            } elseif ( defined("XOOPS_TRUST_PATH") ) {
+            } 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") ) {
+            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";
                 }
             }
         }
@@ -77,11 +77,11 @@ 
     {
         $this->readRequest();
         $valid = $this->validate();
-        if ( $_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['task'] == 'path' ) {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['task'] == 'path') {
             foreach ($this->path_lookup as $req => $sess) {
                 $_SESSION['settings'][$sess] = $this->xoopsPath[$req];
             }
-            if ( $valid ) {
+            if ($valid) {
                 return $_SESSION['settings'];
             } else {
                 return false;
@@ -91,13 +91,13 @@ 
 
     function readRequest()
     {
-        if ( $_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['task'] == 'path' ) {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['task'] == 'path') {
             $request = $_POST;
             foreach ($this->path_lookup as $req => $sess) {
-                if ( isset($request[$req]) ) {
-                    $request[$req] = str_replace( "\\", "/", trim($request[$req]) );
-                    if ( substr( $request[$req], -1 ) == '/' ) {
-                        $request[$req] = substr( $request[$req], 0, -1 );
+                if (isset($request[$req])) {
+                    $request[$req] = str_replace("\\", "/", trim($request[$req]));
+                    if (substr($request[$req], -1) == '/') {
+                        $request[$req] = substr($request[$req], 0, -1);
                     }
                     $this->xoopsPath[$req] = $request[$req];
                 }
@@ -112,7 +112,7 @@ 
                 $this->checkPermissions($path);
             }
         }
-        $validPaths = ( array_sum(array_values($this->validPath)) == count(array_keys($this->validPath)) ) ? 1 : 0;
+        $validPaths = (array_sum(array_values($this->validPath)) == count(array_keys($this->validPath))) ? 1 : 0;
         $validPerms = true;
         foreach ($this->permErrors as $key => $errs) {
             if (empty($errs)) continue;
@@ -123,22 +123,22 @@ 
                 }
             }
         }
-        return ( $validPaths && $validPerms );
+        return ($validPaths && $validPerms);
     }
 
     function checkPath($PATH = '')
     {
         $ret = 1;
-        if ( $PATH == 'lib' || empty($PATH) ) {
+        if ($PATH == 'lib' || empty($PATH)) {
             $path = 'lib';
-            if ( is_dir( $this->xoopsPath[$path] ) && is_readable( $this->xoopsPath[$path] ) ) {
+            if (is_dir($this->xoopsPath[$path]) && is_readable($this->xoopsPath[$path])) {
                 $this->validPath[$path] = 1;
             }
             $ret *= $this->validPath[$path];
         }
-        if ( $PATH == 'data' || empty($PATH) ) {
+        if ($PATH == 'data' || empty($PATH)) {
             $path = 'data';
-            if ( is_dir( $this->xoopsPath[$path] ) && is_readable( $this->xoopsPath[$path] ) ) {
+            if (is_dir($this->xoopsPath[$path]) && is_readable($this->xoopsPath[$path])) {
                 $this->validPath[$path] = 1;
             }
             $ret *= $this->validPath[$path];
@@ -149,19 +149,19 @@ 
     function setPermission($parent, $path, &$error)
     {
         if (is_array($path)) {
-            foreach ( array_keys($path) as $item ) {
+            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;
     }
@@ -188,7 +188,7 @@ 
             return true;
         }
         $this->setPermission($this->xoopsPath[$path], $paths[$path], $errors[$path]);
-        if ( in_array( false, $errors[$path] ) ) {
+        if (in_array(false, $errors[$path])) {
             $this->permErrors[$path] = $errors[$path];
             return false;
         }
@@ -203,39 +203,39 @@ 
      * @param bool $recurse
      * @return false on failure, method (u-ser,g-roup,w-orld) on success
      */
-    function makeWritable( $path, $group = false, $create = true )
+    function makeWritable($path, $group = false, $create = true)
     {
-        if ( !file_exists( $path ) ) {
+        if (!file_exists($path)) {
             if (!$create) {
                 return false;
             } else {
                 $perm = 6;
-                @mkdir($path, octdec( '0' . $perm . '00' ));
+                @mkdir($path, octdec('0'.$perm.'00'));
             }
         } else {
-            $perm = is_dir( $path ) ? 6 : 7;
+            $perm = is_dir($path) ? 6 : 7;
         }
-        if ( !is_writable($path) ) {
+        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 (!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' ) );
+                @chgrp($path, $group);
+                @chmod($path, octdec('0'.$perm.$perm.'0'));
             }
             clearstatcache();
-            if ( !is_writable( $path ) ) {
-                @chmod( $path, octdec( '0' . $perm . $perm . $perm ) );
+            if (!is_writable($path)) {
+                @chmod($path, octdec('0'.$perm.$perm.$perm));
             }
         }
         clearstatcache();
-        if ( is_writable( $path ) ) {
-            $info = stat( $path );
+        if (is_writable($path)) {
+            $info = stat($path);
             //echo $path . ' : ' . sprintf( '%o', $info['mode'] ) . '....';
-            if ( $info['mode'] & 0002 ) {
+            if ($info['mode'] & 0002) {
                 return 'w';
-            } elseif ( $info['mode'] & 0020 ) {
+            } elseif ($info['mode'] & 0020) {
                 return 'g';
             }
             return 'u';

Braces +6 added lines, -2 removed lines

@@ -115,7 +115,9 @@ 
         $validPaths = ( array_sum(array_values($this->validPath)) == count(array_keys($this->validPath)) ) ? 1 : 0;
         $validPerms = true;
         foreach ($this->permErrors as $key => $errs) {
-            if (empty($errs)) continue;
+            if (empty($errs)) {
+                continue;
+            }
             foreach ($errs as $path => $status) {
                 if (empty($status)) {
                     $validPerms = false;
@@ -152,7 +154,9 @@ 
             foreach ( array_keys($path) as $item ) {
                 if (is_string($item)) {
                     $error[$parent . "/" . $item] = $this->makeWritable( $parent . "/" . $item );
-                    if (empty($path[$item])) continue;
+                    if (empty($path[$item])) {
+                        continue;
+                    }
                     foreach ($path[$item] as $child) {
                         $this->setPermission( $parent . "/" . $item, $child, $error );
                     }