XOOPS / XoopsCore

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

Indentation -2 removed lines

@@ -29,7 +29,6 @@ 
 
     /**
      * Check if keys already exist
-
      */
     function check_keys()
     {
@@ -61,7 +60,6 @@ 
 
     /**
      * Apply keys that are missing
-
      */
     function apply_keys()
     {

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
         $tables['xoopscomments'] = array('com_status');
 
         foreach ($tables as $table => $keys) {
-            $sql = "SHOW KEYS FROM `" . $xoops->db()->prefix($table) . "`";
+            $sql = "SHOW KEYS FROM `".$xoops->db()->prefix($table)."`";
             if (!$result = $xoops->db()->queryF($sql)) {
                 continue;
             }
@@ -74,7 +74,7 @@ 
         $tables['xoopscomments'] = array('com_status');
 
         foreach ($tables as $table => $keys) {
-            $sql = "SHOW KEYS FROM `" . $xoops->db()->prefix($table) . "`";
+            $sql = "SHOW KEYS FROM `".$xoops->db()->prefix($table)."`";
             if (!$result = $xoops->db()->queryF($sql)) {
                 continue;
             }
@@ -84,7 +84,7 @@ 
             }
             foreach ($keys as $key) {
                 if (!in_array($key, $existing_keys)) {
-                    $sql = "ALTER TABLE `" . $xoops->db()->prefix($table) . "` ADD INDEX `{$key}` (`{$key}`)";
+                    $sql = "ALTER TABLE `".$xoops->db()->prefix($table)."` ADD INDEX `{$key}` (`{$key}`)";
                     if (!$result = $xoops->db()->queryF($sql)) {
                         return false;
                     }

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

Indentation -1 removed lines

@@ -33,7 +33,6 @@
 
     /**
      * Check if field type already fixed for mysql strict mode
-
      */
     function check_field()
     {

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
             "user_sig"       => "users", "bio" => "users",
         );
         foreach ($fields as $field => $table) {
-            $sql = "SHOW COLUMNS FROM `" . $db->prefix($table) . "` LIKE '{$field}'";
+            $sql = "SHOW COLUMNS FROM `".$db->prefix($table)."` LIKE '{$field}'";
             if (!$result = $db->queryF($sql)) {
                 return false;
             }
@@ -69,7 +69,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;
     }

upgrade/language.php

Spacing +4 added lines, -4 removed lines

@@ -118,8 +118,8 @@ 
         if (strpos($expr, '[-_]') === FALSE) {
             $expr = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $expr);
         }
-        if (($envType == 1 && eregi('^(' . $expr . ')(;q=[0-9]\\.[0-9])?$', $str))
-            || ($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $expr . ')(;|\]|\))', $str))) {
+        if (($envType == 1 && eregi('^('.$expr.')(;q=[0-9]\\.[0-9])?$', $str))
+            || ($envType == 2 && eregi('(\(|\[|;[[:space:]])('.$expr.')(;|\]|\))', $str))) {
             $lang = $key;
             break;
         }
@@ -140,7 +140,7 @@ 
     }
 
     $lang = '';
-    $xoops_lang ='';
+    $xoops_lang = '';
     // 1. try to findout user's language by checking its HTTP_ACCEPT_LANGUAGE
     // variable
     if (empty($lang) && !empty($HTTP_ACCEPT_LANGUAGE)) {
@@ -149,7 +149,7 @@ 
         reset($accepted);
         for ($i = 0; $i < $acceptedCnt; $i++) {
             $lang = xoops_analyzeLanguage($accepted[$i], 1);
-            if(strncasecmp($lang,'en',2)){
+            if (strncasecmp($lang, 'en', 2)) {
                 break;
             }
         }

htdocs/userinfo.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops_url = \XoopsBaseConfig::get('url');
 $xoops = Xoops::getInstance();
@@ -83,9 +83,9 @@ 
 // Let extensions add navigation button(s)
 //$xoops->events()->triggerEvent('core.userinfo.button', array($thisUser, &$btn));
 $response = $xoops->service("Avatar")->getAvatarEditUrl($thisUser);
-$link=$response->getValue();
+$link = $response->getValue();
 if (!empty($link)) {
-    $btn[] = array( 'link' => $link, 'title' => XoopsLocale::AVATAR, 'icon' => 'glyphicon glyphicon-user');
+    $btn[] = array('link' => $link, 'title' => XoopsLocale::AVATAR, 'icon' => 'glyphicon glyphicon-user');
     $xoops->tpl()->assign('btn', $btn);
 }
 
@@ -104,7 +104,7 @@ 
 } else {
     $xoops->tpl()->assign(
         'user_websiteurl',
-        '<a href="' . $thisUser->getVar('url', 'E') . '" rel="external">' . $thisUser->getVar('url') . '</a>'
+        '<a href="'.$thisUser->getVar('url', 'E').'" rel="external">'.$thisUser->getVar('url').'</a>'
     );
 }
 $xoops->tpl()->assign('lang_email', XoopsLocale::EMAIL);
@@ -156,9 +156,9 @@ 
 if ($xoops->isUser()) {
     $xoops->tpl()->assign(
         'user_pmlink',
-        "<a class=\"btn btn-default\" href=\"javascript:openWithSelfMain('" . $xoops_url . "/pmlite.php?send2=1&amp;to_userid="
-        . $thisUser->getVar('uid') . "', 'pmlite', 450, 380);\"><span class=\"glyphicon glyphicon-send\" "
-        . 'title="' . sprintf(XoopsLocale::F_SEND_PRIVATE_MESSAGE_TO, $thisUser->getVar('uname')) . '"></span></a>'
+        "<a class=\"btn btn-default\" href=\"javascript:openWithSelfMain('".$xoops_url."/pmlite.php?send2=1&amp;to_userid="
+        . $thisUser->getVar('uid')."', 'pmlite', 450, 380);\"><span class=\"glyphicon glyphicon-send\" "
+        . 'title="'.sprintf(XoopsLocale::F_SEND_PRIVATE_MESSAGE_TO, $thisUser->getVar('uname')).'"></span></a>'
     );
 } else {
     $xoops->tpl()->assign('user_pmlink', '');
@@ -168,7 +168,7 @@ 
     if (isset($userrank['image']) && $userrank['image']) {
         $xoops->tpl()->assign(
             'user_rankimage',
-            '<img src="' . $userrank['image'] . '" alt="' . $userrank['title']. '" />'
+            '<img src="'.$userrank['image'].'" alt="'.$userrank['title'].'" />'
         );
     }
     $xoops->tpl()->assign('user_ranktitle', $userrank['title']);
@@ -200,14 +200,14 @@ 
                 foreach ($results as $k => $result) {
                     if (isset($result['image']) && $result['image'] != '') {
                         $results[$k]['image']
-                            = $xoops->url('modules/' . $modules[$i]->getVar('dirname') . '/' . $result['image']);
+                            = $xoops->url('modules/'.$modules[$i]->getVar('dirname').'/'.$result['image']);
                     } else {
                         $results[$k]['image'] = $xoops->url('images/icons/posticon2.gif');
                     }
 
                     if (!preg_match("/^http[s]*:\/\//i", $result['link'])) {
                         $results[$k]['link']
-                            = $xoops->url("modules/" . $modules[$i]->getVar('dirname') . "/" . $result['link']);
+                            = $xoops->url("modules/".$modules[$i]->getVar('dirname')."/".$result['link']);
                     }
 
                     $results[$k]['title'] = $myts->htmlSpecialChars($result['title']);
@@ -222,8 +222,8 @@ 
                 }
                 if ($count == 5) {
                     $showall_link = '<a href="search.php?action=showallbyuser&amp;mid='
-                        . $modules[$i]->getVar('mid') . '&amp;uid=' . $thisUser->getVar('uid')
-                        . '">' . XoopsLocale::SHOW_ALL . '</a>';
+                        . $modules[$i]->getVar('mid').'&amp;uid='.$thisUser->getVar('uid')
+                        . '">'.XoopsLocale::SHOW_ALL.'</a>';
                 } else {
                     $showall_link = '';
                 }
@@ -231,7 +231,7 @@ 
                     'modules',
                     array(
                         'name' => $modules[$i]->getVar('name'),
-                        'image' => $xoops->url('modules/' . $modules[$i]->getVar('dirname') . '/icons/logo_large.png'),
+                        'image' => $xoops->url('modules/'.$modules[$i]->getVar('dirname').'/icons/logo_large.png'),
                         'result' => $results,
                         'showall_link' => $showall_link
                     )

htdocs/imagemanager.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = \Xoops::getInstance();
 $xoops->events()->triggerEvent('core.imagemanager');

htdocs/edituser.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 
 use Xmf\Request;
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->events()->triggerEvent('core.edituser.start');
@@ -41,7 +41,7 @@ 
         $xoops->redirect(
             'index.php',
             3,
-            XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors())
+            XoopsLocale::E_NO_ACTION_PERMISSION."<br />".implode('<br />', $xoops->security()->getErrors())
         );
         exit();
     }
@@ -51,10 +51,10 @@ 
         exit();
     }
     $errors = array();
-    $email='';
+    $email = '';
     if ($xoops->getConfig('allow_chgmail') == 1) {
         $email = Request::getString('email', '');
-        if ($email == '' || ! $xoops->checkEmail($email)) {
+        if ($email == '' || !$xoops->checkEmail($email)) {
             $errors[] = XoopsLocale::E_INVALID_EMAIL;
         }
     }
@@ -72,7 +72,7 @@ 
         $xoops->header();
         echo '<div>';
         foreach ($errors as $er) {
-            echo '<span class="red bold">' . $er . '</span><br />';
+            echo '<span class="red bold">'.$er.'</span><br />';
         }
         echo '</div><br />';
         $op = 'editprofile';
@@ -105,12 +105,12 @@ 
         $edituser->setVar('user_occ', Request::getString('user_occ', ''));
         $edituser->setVar('user_intrest', Request::getString('user_intrest', ''));
         $edituser->setVar('user_mailok', Request::getBool('user_mailok', 0));
-        if (! $member_handler->insertUser($edituser)) {
+        if (!$member_handler->insertUser($edituser)) {
             $xoops->header();
             echo $edituser->getHtmlErrors();
             $xoops->footer();
         } else {
-            $xoops->redirect('userinfo.php?uid=' . $uid, 1, XoopsLocale::S_YOUR_PROFILE_UPDATED);
+            $xoops->redirect('userinfo.php?uid='.$uid, 1, XoopsLocale::S_YOUR_PROFILE_UPDATED);
         }
         exit();
     }
@@ -181,7 +181,7 @@ 
     $pwd_text = new Xoops\Form\Password('', 'password');
     $pwd_text2 = new Xoops\Form\Password('', 'vpass');
     $pwd_tray = new Xoops\Form\ElementTray(
-        XoopsLocale::PASSWORD . '<br />' . XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT
+        XoopsLocale::PASSWORD.'<br />'.XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT
     );
     $pwd_tray->addElement($pwd_text);
     $pwd_tray->addElement($pwd_text2);

htdocs/pda.php

Spacing +6 added lines, -6 removed lines

@@ -19,27 +19,27 @@
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 $xoops_url = \XoopsBaseConfig::get('url');
 
 header("Content-Type: text/html");
-echo "<html><head><title>" . htmlspecialchars($xoops->getConfig('sitename')) . "</title>
+echo "<html><head><title>".htmlspecialchars($xoops->getConfig('sitename'))."</title>
       <meta name='HandheldFriendly' content='True' />
       <meta name='PalmComputingPlatform' content='True' />
       </head>
       <body>";
 
-$sql = "SELECT storyid, title FROM " . $xoopsDB->prefix("stories") . " WHERE published>0 AND published<" . time() . " ORDER BY published DESC";
+$sql = "SELECT storyid, title FROM ".$xoopsDB->prefix("stories")." WHERE published>0 AND published<".time()." ORDER BY published DESC";
 $result = $xoopsDB->query($sql, 10, 0);
 //TODO Remove this hardcoded string
 if (!$result) {
     echo "An error occured";
 } else {
-    echo "<img src='images/logo.gif' alt='" . htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES) . "' border='0' /><br />";
-    echo "<h2>" . htmlspecialchars($xoops->getConfig('slogan')) . "</h2>";
+    echo "<img src='images/logo.gif' alt='".htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES)."' border='0' /><br />";
+    echo "<h2>".htmlspecialchars($xoops->getConfig('slogan'))."</h2>";
     echo "<div>";
     while (false !== (list ($storyid, $title) = $xoopsDB->fetchRow($result))) {
-        echo "<a href='" . $xoops_url . "/modules/news/print.php?storyid={$storyid}'>" . htmlspecialchars($title) . "</a><br />";
+        echo "<a href='".$xoops_url."/modules/news/print.php?storyid={$storyid}'>".htmlspecialchars($title)."</a><br />";
     }
     echo "</div>";
 }

htdocs/install/locale/en_US/install.php

Spacing +6 added lines, -6 removed lines

@@ -29,8 +29,8 @@ 
 define("RECOMMENDED_EXTENSIONS", "Recommended extensions");
 define("RECOMMENDED", "Recommended");
 define("CURRENT", "Current");
-define("COMPOSER","Composer");
-define("COMPOSER_ENVIRONMENT",'Composer required. <a href="http://getcomposer.org/" target="_blank">http://getcomposer.org/</a>');
+define("COMPOSER", "Composer");
+define("COMPOSER_ENVIRONMENT", 'Composer required. <a href="http://getcomposer.org/" target="_blank">http://getcomposer.org/</a>');
 
 define("RECOMMENDED_EXTENSIONS_MSG", "These extensions are not required for normal use, but may be necessary to exploit
     some specific features (like the multi-language or RSS support). Thus, it is recommended to have them installed.");
@@ -73,9 +73,9 @@ 
 define("XOOPS_ROOT_PATH_HELP", "Physical path to the XOOPS documents (served) directory WITHOUT trailing slash");
 
 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_LABEL . " 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_LABEL." 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_LABEL . " 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_LABEL." to make it secure.");
 
 define("XOOPS_URL_LABEL", "Website location (URL)"); // L56
 define("XOOPS_URL_HELP", "Main URL that will be used to access your XOOPS installation"); // L58
@@ -159,8 +159,8 @@ 
 define("ERR_READ_MAINFILE", "Could not open mainfile.php for reading");
 
 define("ERR_COPY_SECURE", "Could not copy into secure.php the distribution file: ");
-define("ERR_READ_SECURE","Could not open secure.php for reading");
-define("ERR_WRITE_SECURE","Could not write into secure.php. Please check the file permission and try again.");
+define("ERR_READ_SECURE", "Could not open secure.php for reading");
+define("ERR_WRITE_SECURE", "Could not write into secure.php. Please check the file permission and try again.");
 
 define("ERR_INVALID_DBCHARSET", "The charset '%s' is not supported.");
 define("ERR_INVALID_DBCOLLATION", "The collation '%s' is not supported.");

htdocs/install/page_langselect.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
  * @version     $Id$
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 /* @var $wizard XoopsInstallWizard */
 $wizard = $_SESSION['wizard'];
@@ -57,4 +57,4 @@ 
 $_SESSION['pageHasHelp'] = false;
 $_SESSION['pageHasForm'] = true;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';