XOOPS / XoopsCore25

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

Spacing +10 added lines, -10 removed lines

@@ -16,10 +16,10 @@ 
  * @access              public
  **/
 
-include_once XOOPS_ROOT_PATH . '/class/logger/xoopslogger.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';
+include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.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
@@ -63,7 +63,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);
     }
@@ -125,7 +125,7 @@ 
                         }
                     }
                 } elseif ($prefixed_query[1] === 'DROP TABLE') {
-                    if ($this->db->query('DROP TABLE ' . $table) != false) {
+                    if ($this->db->query('DROP TABLE '.$table) != false) {
                         if (!isset($this->s_tables['drop'][$table])) {
                             $this->s_tables['drop'][$table] = 1;
                         }
@@ -228,7 +228,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;
@@ -266,7 +266,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[] = $ct;
             }
         }
@@ -285,9 +285,9 @@ 
         $ret   = false;
         if ($table != '') {
             $this->db->connect();
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix($table);
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix($table);
             $result = $this->db->query($sql);
-            $ret = !empty($result);  //return false on error or $table not found
+            $ret = !empty($result); //return false on error or $table not found
         }
 
         return $ret;

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

Spacing +18 added lines, -18 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function check_config()
     {
-        $sql = 'SELECT COUNT(*) FROM `' . $GLOBALS['xoopsDB']->prefix('config') . "` WHERE `conf_name` IN ('break1', 'usetips')";
+        $sql = 'SELECT COUNT(*) FROM `'.$GLOBALS['xoopsDB']->prefix('config')."` WHERE `conf_name` IN ('break1', 'usetips')";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
@@ -43,7 +43,7 @@ 
      */
     public function check_templates()
     {
-        $sql = 'SELECT COUNT(*) FROM `' . $GLOBALS['xoopsDB']->prefix('tplfile') . "` WHERE `tpl_file` IN ('system_header.html', 'system_header.tpl') AND `tpl_type` = 'admin'";
+        $sql = 'SELECT COUNT(*) FROM `'.$GLOBALS['xoopsDB']->prefix('tplfile')."` WHERE `tpl_file` IN ('system_header.html', 'system_header.tpl') AND `tpl_type` = 'admin'";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
@@ -59,13 +59,13 @@ 
     {
         $dbm = new Db_manager();
 
-        $sql = 'SELECT conf_id FROM `' . $GLOBALS['xoopsDB']->prefix('config') . "` WHERE `conf_name` IN ('cpanel')";
+        $sql = 'SELECT conf_id FROM `'.$GLOBALS['xoopsDB']->prefix('config')."` WHERE `conf_name` IN ('cpanel')";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
         $count = $GLOBALS['xoopsDB']->fetchRow($result);
 
-        $sql = 'UPDATE `' . $GLOBALS['xoopsDB']->prefix('config') . "` SET `conf_value` = 'default' WHERE `conf_id` = " . $count[0];
+        $sql = 'UPDATE `'.$GLOBALS['xoopsDB']->prefix('config')."` SET `conf_value` = 'default' WHERE `conf_id` = ".$count[0];
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             return false;
         }
@@ -112,25 +112,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;
@@ -147,11 +147,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)."')");
             }
         }
 
@@ -172,10 +172,10 @@ 
      */
     private function strayblockCriteria()
     {
-        $criteria = new CriteriaCompo(new Criteria('mid','1', '='));
-        $criteria->add(new Criteria('block_type','S', '='));
-        $criteria->add(new Criteria('func_num','1', '='));
-        $criteria->add(new Criteria('template','system_block_user.html', '='));
+        $criteria = new CriteriaCompo(new Criteria('mid', '1', '='));
+        $criteria->add(new Criteria('block_type', 'S', '='));
+        $criteria->add(new Criteria('func_num', '1', '='));
+        $criteria->add(new Criteria('template', 'system_block_user.html', '='));
         return $criteria;
     }
 

upgrade/upd-2.3.3-to-2.4.0/index.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
             return false;
         }
 
-        return @$this->xoops_putLicenseKey($this->xoops_buildLicenceKey(), XOOPS_ROOT_PATH . '/include/license.php', __DIR__ . '/license.dist.php');
+        return @$this->xoops_putLicenseKey($this->xoops_buildLicenceKey(), XOOPS_ROOT_PATH.'/include/license.php', __DIR__.'/license.dist.php');
     }
 
     /**
@@ -68,7 +68,7 @@ 
         $fver_buf = file($license_file_dist);
         foreach ($fver_buf as $line => $value) {
             if (strpos($value, 'XOOPS_LICENSE_KEY') > 0) {
-                $ret = 'define(\'XOOPS_LICENSE_KEY\', \'' . $system_key . "');";
+                $ret = 'define(\'XOOPS_LICENSE_KEY\', \''.$system_key."');";
             } else {
                 $ret = $value;
             }
@@ -77,7 +77,7 @@ 
         fclose($fver);
         chmod($licensefile, 0444);
 
-        return 'Written License Key: ' . $system_key;
+        return 'Written License Key: '.$system_key;
     }
 
     /**
@@ -87,8 +87,8 @@ 
     public function xoops_buildLicenceKey()
     {
         $xoops_serdat = array();
-        mt_srand(((float)('0' . substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
-        mt_srand(((float)('0' . substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
+        mt_srand(((float)('0'.substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
+        mt_srand(((float)('0'.substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
         $checksums = array(1 => 'md5', 2 => 'sha1');
         $type      = mt_rand(1, 2);
         $func      = $checksums[$type];
@@ -124,7 +124,7 @@ 
         }
         while (strlen($xoops_key) > 40) {
             $lpos      = mt_rand(18, strlen($xoops_key));
-            $xoops_key = substr($xoops_key, 0, $lpos) . substr($xoops_key, $lpos + 1, strlen($xoops_key) - ($lpos + 1));
+            $xoops_key = substr($xoops_key, 0, $lpos).substr($xoops_key, $lpos + 1, strlen($xoops_key) - ($lpos + 1));
         }
 
         return $this->xoops_stripeKey($xoops_key);
@@ -144,7 +144,7 @@ 
             if ($i < $length) {
                 ++$uu;
                 if ($uu == $strip) {
-                    $ret .= substr($xoops_key, $i, 1) . '-';
+                    $ret .= substr($xoops_key, $i, 1).'-';
                     $uu = 0;
                 } else {
                     if (substr($xoops_key, $i, 1) != '-') {
@@ -179,7 +179,7 @@ 
         $tables['xoopscomments'] = array('com_status');
 
         foreach ($tables as $table => $keys) {
-            $sql = 'SHOW KEYS FROM `' . $GLOBALS['xoopsDB']->prefix($table) . '`';
+            $sql = 'SHOW KEYS FROM `'.$GLOBALS['xoopsDB']->prefix($table).'`';
             if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
                 continue;
             }
@@ -210,7 +210,7 @@ 
         $tables['xoopscomments'] = array('com_status');
 
         foreach ($tables as $table => $keys) {
-            $sql = 'SHOW KEYS FROM `' . $GLOBALS['xoopsDB']->prefix($table) . '`';
+            $sql = 'SHOW KEYS FROM `'.$GLOBALS['xoopsDB']->prefix($table).'`';
             if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
                 continue;
             }
@@ -220,7 +220,7 @@ 
             }
             foreach ($keys as $key) {
                 if (!in_array($key, $existing_keys)) {
-                    $sql = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix($table) . "` ADD INDEX `{$key}` (`{$key}`)";
+                    $sql = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix($table)."` ADD INDEX `{$key}` (`{$key}`)";
                     if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
                         return false;
                     }

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

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
         $this->tasks = array('sess_id', 'mainfile', 'zaplegacy');
         $this->usedFiles = array(
             'mainfile.php',
-            XOOPS_VAR_PATH . '/data/secure.php',
+            XOOPS_VAR_PATH.'/data/secure.php',
             'modules/system/themes/legacy/legacy.php'
         );
     }
@@ -60,7 +60,7 @@ 
             $row = $db->fetchRow($result);
             if ($row) {
                 $columnLength = $row[0];
-                return (int) $columnLength;
+                return (int)$columnLength;
             }
         }
         return 0;
@@ -73,7 +73,7 @@ 
      */
     public function check_sess_id()
     {
-        return (bool) ($this->getColumnLength('session', 'sess_id') >= 256);
+        return (bool)($this->getColumnLength('session', 'sess_id') >= 256);
     }
 
     /**
@@ -104,10 +104,10 @@ 
     {
         $path .= '/';
         clearstatcache();
-        if (!$inFile = fopen($path . $sourceName, 'r')) {
+        if (!$inFile = fopen($path.$sourceName, 'r')) {
             return sprintf(_FILE_ACCESS_ERROR, $sourceName);
         } else {
-            $content = fread($inFile, filesize($path . $sourceName));
+            $content = fread($inFile, filesize($path.$sourceName));
             fclose($inFile);
 
             foreach ($vars as $key => $val) {
@@ -118,7 +118,7 @@ 
                     $content = preg_replace("/(define\()([\"'])({$key})\\2,\s*([\"'])(.*?)\\4\s*\)/", "define('{$key}', '{$val}')", $content);
                 }
             }
-            $outFile = fopen($path . $fileName, 'w');
+            $outFile = fopen($path.$fileName, 'w');
             if (false === $outFile) {
                 return sprintf(_FILE_ACCESS_ERROR, $fileName);
             }
@@ -167,7 +167,7 @@ 
         } else {
             $result = $this->writeConfigurationFile(
                 $upgradeControl->mainfileKeys,
-                XOOPS_VAR_PATH . '/data',
+                XOOPS_VAR_PATH.'/data',
                 'secure.dist.php',
                 'secure.php'
             );
@@ -197,7 +197,7 @@ 
     public function apply_zaplegacy()
     {
         $fileName = 'modules/system/themes/legacy/legacy.php';
-        $result = rename('../' . $fileName, '../' . $fileName . '.bak');
+        $result = rename('../'.$fileName, '../'.$fileName.'.bak');
         if (false === $result) {
             return sprintf(_FILE_ACCESS_ERROR, $fileName);
         }

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

Spacing +2 added lines, -2 removed lines

@@ -7,9 +7,9 @@
 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_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_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.");

upgrade/index.php

Spacing +5 added lines, -5 removed lines

@@ -89,22 +89,22 @@ 
     } else {
         if (!empty($upgradeControl->needWriteFiles)) {
             echo '<div class="panel panel-danger">'
-                . '<div class="panel-heading">' . _SET_FILES_WRITABLE . '</div>'
+                . '<div class="panel-heading">'._SET_FILES_WRITABLE.'</div>'
                 . '<div class="panel-body"><ul class="fa-ul">';
             foreach ($upgradeControl->needWriteFiles as $file) {
-                echo '<li><i class="fa-li fa fa-ban text-danger"></i>' . $file . '</li>';
+                echo '<li><i class="fa-li fa fa-ban text-danger"></i>'.$file.'</li>';
                 $GLOBALS['error'] = true;
             }
             echo '</ul></div></div>';
         } else {
             $next = $upgradeControl->getNextPatch();
-            printf('<h2>' . _PERFORMING_UPGRADE . '</h2>', $next);
+            printf('<h2>'._PERFORMING_UPGRADE.'</h2>', $next);
             /** @var $upgrader XoopsUpgrade */
             $upgradeClass = $upgradeControl->upgradeQueue[$next]->patchClass;
             $upgrader = new $upgradeClass();
             $res = $upgrader->apply();
             if ($message = $upgrader->message()) {
-                echo '<div class="well">' . $message . '</div>';
+                echo '<div class="well">'.$message.'</div>';
             }
 
             if ($res) {
@@ -114,7 +114,7 @@ 
     }
     if (0 === $upgradeControl->countUpgradeQueue()) {
             echo $upgradeControl->oneButtonContinueForm(
-                XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=system',
+                XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=system',
                 array()
             );
     } else {

upgrade/upgrade_tpl.php

Spacing +11 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title><?php echo XOOPS_VERSION . ' : ' . _XOOPS_UPGRADE; ?></title>
+    <title><?php echo XOOPS_VERSION.' : '._XOOPS_UPGRADE; ?></title>
 
     <link rel="icon" type="image/png" href="<?php echo XOOPS_URL ?>/upgrade/assets/img/favicon.png"/>
     <!-- Bootstrap Core CSS -->
@@ -39,9 +39,9 @@ 
     }
     ?>
     <?php
-    if (file_exists('language/' . $upgradeControl->upgradeLanguage . '/style.css')) {
+    if (file_exists('language/'.$upgradeControl->upgradeLanguage.'/style.css')) {
         echo '<link rel="stylesheet" type="text/css" media="all" href="language/'
-            . $upgradeControl->upgradeLanguage . '/style.css" />';
+            . $upgradeControl->upgradeLanguage.'/style.css" />';
     }
     ?>
 
@@ -71,7 +71,7 @@ 
                     $languages = $upgradeControl->availableLanguages();
                     foreach ($languages as $lang) {
                         $upgradeControl->loadLanguage('support', $lang);
-                        echo '<li><a href="?lang=' . $lang . '">' . $lang . '</a></li>';
+                        echo '<li><a href="?lang='.$lang.'">'.$lang.'</a></li>';
                     }
                     ?>
                 </ul>
@@ -81,7 +81,7 @@ 
                 <ul class="dropdown-menu">
                     <?php
                     foreach ($upgradeControl->supportSites as $lang => $support) {
-                        echo '<li><a href="' . $support['url'] . '" target="_blank">' . $support['title'] . '</a></li>';
+                        echo '<li><a href="'.$support['url'].'" target="_blank">'.$support['title'].'</a></li>';
                     }
                     ?>
                 </ul>
@@ -98,14 +98,14 @@ 
                 foreach ($upgradeControl->upgradeQueue as $stepName => $info) {
                     if (!$info->applied && $firstNeeded) {
                         echo'<li class="active"><a><span class="fa fa-exclamation-triangle"></span> '
-                            . $stepName . '</a></li>';
+                            . $stepName.'</a></li>';
                         $firstNeeded = false;
                     } elseif (!$info->applied) {
                         echo'<li><a><span class="fa fa-exclamation-triangle text-warning"></span> '
-                            . $stepName . '</a></li>';
+                            . $stepName.'</a></li>';
                     } else {
                         echo'<li><a><span class="fa fa-check text-success"></span> '
-                            . $stepName . '</a></li>';
+                            . $stepName.'</a></li>';
                     }
                 }
                 ?>
@@ -159,8 +159,8 @@ 
                     </div>
                 </div>
                 <?php
-                $versionParts=array();
-                $versionResult = preg_match ('/(^[a-z\s]*)([0-9\.]*)/i', XOOPS_VERSION, $versionParts);
+                $versionParts = array();
+                $versionResult = preg_match('/(^[a-z\s]*)([0-9\.]*)/i', XOOPS_VERSION, $versionParts);
                 ?>
 
                 <div class="col-lg-3 col-md-6">
@@ -215,7 +215,7 @@ 
          * Check the url to see if we reached 'page_end.php' and if so, launch the cleanup via ajax.
          **/
         if ('page_end.php' == location.pathname.substring(location.pathname.lastIndexOf('/') + 1)) {
-            $.post( "cleanup.php", { instsuffix: <?php echo isset($install_rename_suffix) ? "'" . $install_rename_suffix . "'" : "''"; ?> } );
+            $.post( "cleanup.php", { instsuffix: <?php echo isset($install_rename_suffix) ? "'".$install_rename_suffix."'" : "''"; ?> } );
         };
     });
 </script>

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

Spacing +10 added lines, -10 removed lines

@@ -34,13 +34,13 @@ 
         }
     }
 ";
-        $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\";
     }
 </pre>";
-        $lines     = file('../mainfile.php');
+        $lines = file('../mainfile.php');
 
         $insert         = -1;
         $matchProtector = '/modules/protector/include/precheck.inc.php';
@@ -58,7 +58,7 @@ 
             }
         }
         if ($insert == -1) {
-            printf(_FAILED_PATCH . '<br>', 'mainfile.php');
+            printf(_FAILED_PATCH.'<br>', 'mainfile.php');
             echo $manual;
 
             return false;
@@ -80,7 +80,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);
@@ -99,7 +99,7 @@ 
     public function check_auth_db()
     {
         $db    = $GLOBALS['xoopsDB'];
-        $value = $this->getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_provisionning' AND `conf_catid` = " . XOOPS_CONF_AUTH);
+        $value = $this->getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_provisionning' AND `conf_catid` = ".XOOPS_CONF_AUTH);
 
         return (bool)$value;
     }
@@ -125,13 +125,13 @@ 
         $cat = $this->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');
@@ -142,7 +142,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",
@@ -154,7 +154,7 @@ 
             'ldap_surname_attr'        => "'_MD_AM_LDAP_SURNAME_ATTR', 'sn', '_MD_AM_LDAP_SURNAME_ATTR_DESC', 'textbox', 'text', 17");
         foreach ($data as $name => $values) {
             if (!$this->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

upgrade/upd-2.4.0-to-2.4.1/index.php

Spacing +11 added lines, -11 removed lines

@@ -58,9 +58,9 @@ 
             return false;
         }
         if (XOOPS_LICENSE_KEY == '000000-000000-000000-000000-000000') {
-            return @$this->xoops_putLicenseKey($this->xoops_buildLicenceKey(), XOOPS_ROOT_PATH . '/include/license.php', __DIR__ . '/license.dist.php');
+            return @$this->xoops_putLicenseKey($this->xoops_buildLicenceKey(), XOOPS_ROOT_PATH.'/include/license.php', __DIR__.'/license.dist.php');
         } else {
-            return @$this->xoops_upgradeLicenseKey($this->xoops_getPublicLicenceKey(), XOOPS_ROOT_PATH . '/include/license.php', __DIR__ . '/license.dist.php');
+            return @$this->xoops_upgradeLicenseKey($this->xoops_getPublicLicenceKey(), XOOPS_ROOT_PATH.'/include/license.php', __DIR__.'/license.dist.php');
         }
     }
 
@@ -73,10 +73,10 @@ 
         chmod($licensefile, 0777);
         $fver        = fopen($licensefile, 'w');
         $fver_buf    = file($license_file_dist);
-        $license_key = $public_key . substr(XOOPS_LICENSE_KEY, 13, strlen(XOOPS_LICENSE_KEY) - 13);
+        $license_key = $public_key.substr(XOOPS_LICENSE_KEY, 13, strlen(XOOPS_LICENSE_KEY) - 13);
         foreach ($fver_buf as $line => $value) {
             if (strpos($value, 'XOOPS_LICENSE_KEY') > 0) {
-                $ret = 'define(\'XOOPS_LICENSE_KEY\', \'' . $license_key . "');";
+                $ret = 'define(\'XOOPS_LICENSE_KEY\', \''.$license_key."');";
             } else {
                 $ret = $value;
             }
@@ -85,7 +85,7 @@ 
         fclose($fver);
         chmod($licensefile, 0444);
 
-        return 'Written License Key: ' . $license_key;
+        return 'Written License Key: '.$license_key;
     }
 
     /**
@@ -99,7 +99,7 @@ 
         $fver_buf = file($license_file_dist);
         foreach ($fver_buf as $line => $value) {
             if (strpos($value, 'XOOPS_LICENSE_KEY') > 0) {
-                $ret = 'define(\'XOOPS_LICENSE_KEY\', \'' . $system_key . "');";
+                $ret = 'define(\'XOOPS_LICENSE_KEY\', \''.$system_key."');";
             } else {
                 $ret = $value;
             }
@@ -108,7 +108,7 @@ 
         fclose($fver);
         chmod($licensefile, 0444);
 
-        return 'Written License Key: ' . $system_key;
+        return 'Written License Key: '.$system_key;
     }
 
     /**
@@ -159,8 +159,8 @@ 
     public function xoops_buildLicenceKey()
     {
         $xoops_serdat = array();
-        mt_srand(((float)('0' . substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
-        mt_srand(((float)('0' . substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
+        mt_srand(((float)('0'.substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
+        mt_srand(((float)('0'.substr(microtime(), strpos(microtime(), ' ') + 1, strlen(microtime()) - strpos(microtime(), ' ') + 1))) * mt_rand(30, 99999));
         $checksums = array(1 => 'md5', 2 => 'sha1');
         $type      = mt_rand(1, 2);
         $func      = $checksums[$type];
@@ -197,7 +197,7 @@ 
         }
         while (strlen($xoops_key) > 40) {
             $lpos      = mt_rand(18, strlen($xoops_key));
-            $xoops_key = substr($xoops_key, 0, $lpos) . substr($xoops_key, $lpos + 1, strlen($xoops_key) - ($lpos + 1));
+            $xoops_key = substr($xoops_key, 0, $lpos).substr($xoops_key, $lpos + 1, strlen($xoops_key) - ($lpos + 1));
         }
 
         return $this->xoops_stripeKey($xoops_key);
@@ -215,7 +215,7 @@ 
             if ($i < $length) {
                 ++$uu;
                 if ($uu == $strip) {
-                    $ret .= substr($xoops_key, $i, 1) . '-';
+                    $ret .= substr($xoops_key, $i, 1).'-';
                     $uu = 0;
                 } else {
                     if (substr($xoops_key, $i, 1) != '-') {