mambax7 / XoopsCore25

htdocs/include/xoopscodes.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 function xoopsCodeTarea($textarea_id, $cols = 60, $rows = 15, $suffix = null)
 {
     xoops_load('XoopsFormDhtmlTextArea');
-    $hiddenText              = isset($suffix) ? 'xoopsHiddenText' . trim($suffix) : 'xoopsHiddenText';
+    $hiddenText              = isset($suffix) ? 'xoopsHiddenText'.trim($suffix) : 'xoopsHiddenText';
     $content                 = isset($GLOBALS[$textarea_id]) ? $GLOBALS[$textarea_id] : '';
     $text_editor             = new XoopsFormDhtmlTextArea('', $textarea_id, $content, $rows, $cols, $hiddenText);
     $text_editor->htmlEditor = null;
@@ -52,8 +52,8 @@ 
     $smiles = $myts->getSmileys(false);
     $count  = count($smiles);
     for ($i = 0; $i < $count; ++$i) {
-        echo "<img src='" . XOOPS_UPLOAD_URL . '/' . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />";
+        echo "<img src='".XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES)."' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" ".$smiles[$i]['code']." \");' onmouseover='style.cursor=\"hand\"' />";
     }
-    echo "&nbsp;[<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&amp;type=smilies&amp;target={$textarea_id}\",\"smilies\",300,475);'>" . _MORE . '</a>]';
+    echo "&nbsp;[<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&amp;type=smilies&amp;target={$textarea_id}\",\"smilies\",300,475);'>"._MORE.'</a>]';
 }
 /**#@-*/

htdocs/include/functions.php

Indentation +8 added lines, -8 removed lines

@@ -715,14 +715,14 @@
                                                                                 'renderBanner' => false));
     $xoopsTpl                         = $xoTheme->template;
     $xoopsTpl->assign(array(
-                          'xoops_theme'      => $theme,
-                          'xoops_imageurl'   => XOOPS_THEME_URL . '/' . $theme . '/',
-                          'xoops_themecss'   => xoops_getcss($theme),
-                          'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
-                          'xoops_sitename'   => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
-                          'xoops_slogan'     => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
-                          'xoops_dirname'    => isset($xoopsModule) && is_object($xoopsModule) ? $xoopsModule->getVar('dirname') : 'system',
-                          'xoops_pagetitle'  => isset($xoopsModule) && is_object($xoopsModule) ? $xoopsModule->getVar('name') : htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES)));
+                            'xoops_theme'      => $theme,
+                            'xoops_imageurl'   => XOOPS_THEME_URL . '/' . $theme . '/',
+                            'xoops_themecss'   => xoops_getcss($theme),
+                            'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
+                            'xoops_sitename'   => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
+                            'xoops_slogan'     => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
+                            'xoops_dirname'    => isset($xoopsModule) && is_object($xoopsModule) ? $xoopsModule->getVar('dirname') : 'system',
+                            'xoops_pagetitle'  => isset($xoopsModule) && is_object($xoopsModule) ? $xoopsModule->getVar('name') : htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES)));
     if ($xoopsConfig['debug_mode'] == 2 && $xoopsUserIsAdmin) {
         $xoopsTpl->assign('time', 300);
         $xoopsTpl->assign('xoops_logdump', $xoopsLogger->dump());

Spacing +65 added lines, -65 removed lines

@@ -30,17 +30,17 @@ 
     static $handlers;
     $name = strtolower(trim($name));
     if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+        if (file_exists($hnd_file = XOOPS_ROOT_PATH.'/kernel/'.$name.'.php')) {
             require_once $hnd_file;
         }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
+        $class = 'Xoops'.ucfirst($name).'Handler';
         if (class_exists($class)) {
             $xoopsDB         = XoopsDatabaseFactory::getDatabaseConnection();
             $handlers[$name] = new $class($xoopsDB);
         }
     }
     if (!isset($handlers[$name])) {
-        trigger_error('Class <strong>' . $class . '</strong> does not exist<br>Handler Name: ' . $name, $optional ? E_USER_WARNING : E_USER_ERROR);
+        trigger_error('Class <strong>'.$class.'</strong> does not exist<br>Handler Name: '.$name, $optional ? E_USER_WARNING : E_USER_ERROR);
     }
     if (isset($handlers[$name])) {
         return $handlers[$name];
@@ -74,17 +74,17 @@ 
     }
     $name = (!isset($name)) ? $module_dir : trim($name);
     if (!isset($handlers[$module_dir][$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/class/{$name}.php")) {
+        if (file_exists($hnd_file = XOOPS_ROOT_PATH."/modules/{$module_dir}/class/{$name}.php")) {
             include_once $hnd_file;
         }
-        $class = ucfirst(strtolower($module_dir)) . ucfirst($name) . 'Handler';
+        $class = ucfirst(strtolower($module_dir)).ucfirst($name).'Handler';
         if (class_exists($class)) {
             $xoopsDB                      = XoopsDatabaseFactory::getDatabaseConnection();
             $handlers[$module_dir][$name] = new $class($xoopsDB);
         }
     }
     if (!isset($handlers[$module_dir][$name])) {
-        trigger_error('Handler does not exist<br>Module: ' . $module_dir . '<br>Name: ' . $name, $optional ? E_USER_WARNING : E_USER_ERROR);
+        trigger_error('Handler does not exist<br>Module: '.$module_dir.'<br>Name: '.$name, $optional ? E_USER_WARNING : E_USER_ERROR);
     }
     if (isset($handlers[$module_dir][$name])) {
         return $handlers[$module_dir][$name];
@@ -109,7 +109,7 @@ 
 function xoops_load($name, $type = 'core')
 {
     if (!class_exists('XoopsLoad')) {
-        require_once XOOPS_ROOT_PATH . '/class/xoopsload.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsload.php';
     }
 
     return XoopsLoad::load($name, $type);
@@ -142,7 +142,7 @@ 
         return false;
     }
     $language = empty($language) ? $GLOBALS['xoopsConfig']['language'] : $language;
-    $path     = ((empty($domain) || 'global' === $domain) ? '' : "modules/{$domain}/") . 'language';
+    $path     = ((empty($domain) || 'global' === $domain) ? '' : "modules/{$domain}/").'language';
     if (!file_exists($fileinc = $GLOBALS['xoops']->path("{$path}/{$language}/{$name}.php"))) {
         if (!file_exists($fileinc = $GLOBALS['xoops']->path("{$path}/english/{$name}.php"))) {
             return false;
@@ -230,12 +230,12 @@ 
     global $xoopsConfig;
 
     $themeSet = $xoopsConfig['theme_set'];
-    $themePath = XOOPS_THEME_PATH . '/' . $themeSet . '/';
-    $themeUrl = XOOPS_THEME_URL . '/' . $themeSet . '/';
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    $themePath = XOOPS_THEME_PATH.'/'.$themeSet.'/';
+    $themeUrl = XOOPS_THEME_URL.'/'.$themeSet.'/';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $headTpl = new \XoopsTpl();
     $headTpl->assign(array(
-        'closeHead'      => (bool) $closehead,
+        'closeHead'      => (bool)$closehead,
         'themeUrl'       => $themeUrl,
         'xoops_langcode' => _LANGCODE,
         'xoops_charset'  => _CHARSET,
@@ -243,28 +243,28 @@ 
         'xoops_url'      => XOOPS_URL,
     ));
 
-    if (file_exists($themePath . 'theme_autorun.php')) {
-        include_once($themePath . 'theme_autorun.php');
+    if (file_exists($themePath.'theme_autorun.php')) {
+        include_once($themePath.'theme_autorun.php');
     }
 
     $headItems = array();
-    $headItems[] = '<script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>';
-    $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css">';
-    $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/media/font-awesome/css/font-awesome.min.css">';
-    $languageFile = 'language/' . $GLOBALS['xoopsConfig']['language'] . '/style.css';
+    $headItems[] = '<script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script>';
+    $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/xoops.css">';
+    $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/media/font-awesome/css/font-awesome.min.css">';
+    $languageFile = 'language/'.$GLOBALS['xoopsConfig']['language'].'/style.css';
     if (file_exists($GLOBALS['xoops']->path($languageFile))) {
-        $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $GLOBALS['xoops']->url($languageFile) . '">';
+        $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="'.$GLOBALS['xoops']->url($languageFile).'">';
     }
     $themecss = xoops_getcss($xoopsConfig['theme_set']);
-    if ($themecss!=='') {
-        $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $themecss . '">';
+    if ($themecss !== '') {
+        $headItems[] = '<link rel="stylesheet" type="text/css" media="all" href="'.$themecss.'">';
     }
     $headTpl->assign('headItems', $headItems);
 
     if (!headers_sent()) {
-        header('Content-Type:text/html; charset=' . _CHARSET);
+        header('Content-Type:text/html; charset='._CHARSET);
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, max-age=1, s-maxage=1, must-revalidate, post-check=0, pre-check=0');
         header('Pragma: no-cache');
     }
@@ -283,8 +283,8 @@ 
     global $xoopsConfig;
 
     $themeSet = $xoopsConfig['theme_set'];
-    $themePath = XOOPS_THEME_URL . '/' . $themeSet . '/';
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    $themePath = XOOPS_THEME_URL.'/'.$themeSet.'/';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $footTpl = new \XoopsTpl();
     $footTpl->assign(array(
         'themePath'      => $themePath,
@@ -309,7 +309,7 @@ 
 {
     echo '<div class="errorMsg">';
     if ($title != '') {
-        echo '<strong>' . $title . '</strong><br><br>';
+        echo '<strong>'.$title.'</strong><br><br>';
     }
     if (is_object($msg)) {
         $msg = (array)$msg;
@@ -338,7 +338,7 @@ 
 {
     echo '<div class="resultMsg">';
     if ($title != '') {
-        echo '<strong>' . $title . '</strong><br><br>';
+        echo '<strong>'.$title.'</strong><br><br>';
     }
     if (is_object($msg)) {
         $msg = (array)$msg;
@@ -369,23 +369,23 @@ 
 function xoops_confirm($hiddens, $action, $msg, $submit = '', $addtoken = true)
 {
     $submit = ($submit != '') ? trim($submit) : _SUBMIT;
-    echo '<div class="confirmMsg">' . $msg . '<br>
-          <form method="post" action="' . $action . '">';
+    echo '<div class="confirmMsg">'.$msg.'<br>
+          <form method="post" action="' . $action.'">';
     foreach ($hiddens as $name => $value) {
         if (is_array($value)) {
             foreach ($value as $caption => $newvalue) {
-                echo '<input type="radio" name="' . $name . '" value="' . htmlspecialchars($newvalue) . '" /> ' . $caption;
+                echo '<input type="radio" name="'.$name.'" value="'.htmlspecialchars($newvalue).'" /> '.$caption;
             }
             echo '<br>';
         } else {
-            echo '<input type="hidden" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
+            echo '<input type="hidden" name="'.$name.'" value="'.htmlspecialchars($value).'" />';
         }
     }
     if ($addtoken != false) {
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
     }
-    echo '<input type="submit" class="btn btn-default" name="confirm_submit" value="' . $submit . '" title="' . $submit . '"/>
-          <input type="button" class="btn btn-default" name="confirm_back" value="' . _CANCEL . '" onclick="history.go(-1);" title="' . _CANCEL . '" />
+    echo '<input type="submit" class="btn btn-default" name="confirm_submit" value="'.$submit.'" title="'.$submit.'"/>
+          <input type="button" class="btn btn-default" name="confirm_back" value="' . _CANCEL.'" onclick="history.go(-1);" title="'._CANCEL.'" />
           </form>
           </div>';
 }
@@ -598,7 +598,7 @@ 
     $url = trim($url);
     if ($url != '') {
         if ((!preg_match('/^http[s]*:\/\//i', $url)) && (!preg_match('/^ftp*:\/\//i', $url)) && (!preg_match('/^ed2k*:\/\//i', $url))) {
-            $url = 'http://' . $url;
+            $url = 'http://'.$url;
         }
     }
 
@@ -613,7 +613,7 @@ 
     global $xoopsConfig;
 
     $db      = XoopsDatabaseFactory::getDatabaseConnection();
-    $bresult = $db->query('SELECT COUNT(*) FROM ' . $db->prefix('banner'));
+    $bresult = $db->query('SELECT COUNT(*) FROM '.$db->prefix('banner'));
     list($numrows) = $db->fetchRow($bresult);
     if ($numrows > 1) {
         --$numrows;
@@ -623,7 +623,7 @@ 
         $bannum = 0;
     }
     if ($numrows > 0) {
-        $bresult = $db->query('SELECT * FROM ' . $db->prefix('banner'), 1, $bannum);
+        $bresult = $db->query('SELECT * FROM '.$db->prefix('banner'), 1, $bannum);
         list($bid, $cid, $imptotal, $impmade, $clicks, $imageurl, $clickurl, $date, $htmlbanner, $htmlcode) = $db->fetchRow($bresult);
         if ($xoopsConfig['my_ip'] == xoops_getenv('REMOTE_ADDR')) {
             // EMPTY
@@ -634,7 +634,7 @@ 
              * Check if this impression is the last one
              */
             if ($imptotal > 0 && $impmade >= $imptotal) {
-                $newid = $db->genId($db->prefix('bannerfinish') . '_bid_seq');
+                $newid = $db->genId($db->prefix('bannerfinish').'_bid_seq');
                 $sql   = sprintf('INSERT INTO %s (bid, cid, impressions, clicks, datestart, dateend) VALUES (%u, %u, %u, %u, %u, %u)', $db->prefix('bannerfinish'), $newid, $cid, $impmade, $clicks, $date, time());
                 $db->queryF($sql);
                 $db->queryF(sprintf('DELETE FROM %s WHERE bid = %u', $db->prefix('banner'), $bid));
@@ -648,18 +648,18 @@ 
             if ($htmlcode) {
                 $bannerobject = $htmlcode;
             } else {
-                $bannerobject = $bannerobject . '<div id="xo-bannerfix">';
+                $bannerobject = $bannerobject.'<div id="xo-bannerfix">';
                 // $bannerobject = $bannerobject . '<div id="xo-fixbanner">';
-                $bannerobject = $bannerobject . ' <iframe src=' . $imageurl . ' border="0" scrolling="no" allowtransparency="true" width="480px" height="60px" style="border:0" alt="' . $clickurl . ';"> </iframe>';
+                $bannerobject = $bannerobject.' <iframe src='.$imageurl.' border="0" scrolling="no" allowtransparency="true" width="480px" height="60px" style="border:0" alt="'.$clickurl.';"> </iframe>';
                 $bannerobject .= '</div>';
                 // $bannerobject .= '</div>';
             }
         } else {
             $bannerobject = '<div id="xo-bannerfix">';
             if (false !== stripos($imageurl, '.swf')) {
-                $bannerobject = $bannerobject . '<div id ="xo-fixbanner">' . '<a href="' . XOOPS_URL . '/banners.php?op=click&amp;bid=' . $bid . '" rel="external" title="' . $clickurl . '"></a></div>' . '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="z-index:100;">' . '<param name="movie" value="' . $imageurl . '" />' . '<param name="wmode" value="opaque" />' . '</object>';
+                $bannerobject = $bannerobject.'<div id ="xo-fixbanner">'.'<a href="'.XOOPS_URL.'/banners.php?op=click&amp;bid='.$bid.'" rel="external" title="'.$clickurl.'"></a></div>'.'<object type="application/x-shockwave-flash" width="468" height="60" data="'.$imageurl.'" style="z-index:100;">'.'<param name="movie" value="'.$imageurl.'" />'.'<param name="wmode" value="opaque" />'.'</object>';
             } else {
-                $bannerobject = $bannerobject . '<a href="' . XOOPS_URL . '/banners.php?op=click&amp;bid=' . $bid . '" rel="external" title="' . $clickurl . '"><img src="' . $imageurl . '" alt="' . $clickurl . '" /></a>';
+                $bannerobject = $bannerobject.'<a href="'.XOOPS_URL.'/banners.php?op=click&amp;bid='.$bid.'" rel="external" title="'.$clickurl.'"><img src="'.$imageurl.'" alt="'.$clickurl.'" /></a>';
             }
 
             $bannerobject .= '</div>';
@@ -704,8 +704,8 @@ 
         $theme = $xoopsConfig['theme_set'];
     }
 
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    require_once XOOPS_ROOT_PATH . '/class/theme.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
+    require_once XOOPS_ROOT_PATH.'/class/theme.php';
     $xoopsThemeFactory                = null;
     $xoopsThemeFactory                = new xos_opal_ThemeFactory();
     $xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed'];
@@ -716,7 +716,7 @@ 
     $xoopsTpl                         = $xoTheme->template;
     $xoopsTpl->assign(array(
                           'xoops_theme'      => $theme,
-                          'xoops_imageurl'   => XOOPS_THEME_URL . '/' . $theme . '/',
+                          'xoops_imageurl'   => XOOPS_THEME_URL.'/'.$theme.'/',
                           'xoops_themecss'   => xoops_getcss($theme),
                           'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
                           'xoops_sitename'   => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
@@ -731,16 +731,16 @@ 
     }
     if (!empty($_SERVER['REQUEST_URI']) && $addredirect && false !== strpos($url, 'user.php')) {
         if (false === strpos($url, '?')) {
-            $url .= '?xoops_redirect=' . urlencode($_SERVER['REQUEST_URI']);
+            $url .= '?xoops_redirect='.urlencode($_SERVER['REQUEST_URI']);
         } else {
-            $url .= '&amp;xoops_redirect=' . urlencode($_SERVER['REQUEST_URI']);
+            $url .= '&amp;xoops_redirect='.urlencode($_SERVER['REQUEST_URI']);
         }
     }
     if (defined('SID') && SID && (!isset($_COOKIE[session_name()]) || ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && !isset($_COOKIE[$xoopsConfig['session_name']])))) {
         if (false === strpos($url, '?')) {
-            $url .= '?' . SID;
+            $url .= '?'.SID;
         } else {
-            $url .= '&amp;' . SID;
+            $url .= '&amp;'.SID;
         }
     }
     $url = preg_replace('/&amp;/i', '&', htmlspecialchars($url, ENT_QUOTES));
@@ -793,18 +793,18 @@ 
     } elseif (preg_match("/MSIE (\d\.\d{1,2})/i", $uagent)) {
         $str_css = 'style.css';
     }
-    if (is_dir(XOOPS_THEME_PATH . '/' . $theme)) {
-        if (file_exists(XOOPS_THEME_PATH . '/' . $theme . '/' . $str_css)) {
-            return XOOPS_THEME_URL . '/' . $theme . '/' . $str_css;
-        } elseif (file_exists(XOOPS_THEME_PATH . '/' . $theme . '/style.css')) {
-            return XOOPS_THEME_URL . '/' . $theme . '/style.css';
+    if (is_dir(XOOPS_THEME_PATH.'/'.$theme)) {
+        if (file_exists(XOOPS_THEME_PATH.'/'.$theme.'/'.$str_css)) {
+            return XOOPS_THEME_URL.'/'.$theme.'/'.$str_css;
+        } elseif (file_exists(XOOPS_THEME_PATH.'/'.$theme.'/style.css')) {
+            return XOOPS_THEME_URL.'/'.$theme.'/style.css';
         }
     }
-    if (is_dir(XOOPS_THEME_PATH . '/' . $theme . '/css')) {
-        if (file_exists(XOOPS_THEME_PATH . '/' . $theme . '/css/' . $str_css)) {
-            return XOOPS_THEME_URL . '/' . $theme . '/css/' . $str_css;
-        } elseif (file_exists(XOOPS_THEME_PATH . '/' . $theme . '/css/style.css')) {
-            return XOOPS_THEME_URL . '/' . $theme . '/css/style.css';
+    if (is_dir(XOOPS_THEME_PATH.'/'.$theme.'/css')) {
+        if (file_exists(XOOPS_THEME_PATH.'/'.$theme.'/css/'.$str_css)) {
+            return XOOPS_THEME_URL.'/'.$theme.'/css/'.$str_css;
+        } elseif (file_exists(XOOPS_THEME_PATH.'/'.$theme.'/css/style.css')) {
+            return XOOPS_THEME_URL.'/'.$theme.'/css/style.css';
         }
     }
 
@@ -823,10 +823,10 @@ 
     if (is_object($mailer)) {
         return $mailer;
     }
-    include_once XOOPS_ROOT_PATH . '/class/xoopsmailer.php';
-    if (file_exists($file = XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/xoopsmailerlocal.php')) {
+    include_once XOOPS_ROOT_PATH.'/class/xoopsmailer.php';
+    if (file_exists($file = XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/xoopsmailerlocal.php')) {
         include_once $file;
-    } elseif (file_exists($file = XOOPS_ROOT_PATH . '/language/english/xoopsmailerlocal.php')) {
+    } elseif (file_exists($file = XOOPS_ROOT_PATH.'/language/english/xoopsmailerlocal.php')) {
         include_once $file;
     }
     unset($mailer);
@@ -853,9 +853,9 @@ 
     $rank_id = (int)$rank_id;
     $posts   = (int)$posts;
     if ($rank_id != 0) {
-        $sql = 'SELECT rank_title AS title, rank_image AS image FROM ' . $db->prefix('ranks') . ' WHERE rank_id = ' . $rank_id;
+        $sql = 'SELECT rank_title AS title, rank_image AS image FROM '.$db->prefix('ranks').' WHERE rank_id = '.$rank_id;
     } else {
-        $sql = 'SELECT rank_title AS title, rank_image AS image FROM ' . $db->prefix('ranks') . ' WHERE rank_min <= ' . $posts . ' AND rank_max >= ' . $posts . ' AND rank_special = 0';
+        $sql = 'SELECT rank_title AS title, rank_image AS image FROM '.$db->prefix('ranks').' WHERE rank_min <= '.$posts.' AND rank_max >= '.$posts.' AND rank_special = 0';
     }
     $rank          = $db->fetchArray($db->query($sql));
     $rank['title'] = $myts->htmlspecialchars($rank['title']);
@@ -1204,5 +1204,5 @@ 
     return $domain;
 }
 
-include_once __DIR__ . '/functions.encoding.php';
-include_once __DIR__ . '/functions.legacy.php';
+include_once __DIR__.'/functions.encoding.php';
+include_once __DIR__.'/functions.legacy.php';

htdocs/include/comment_reply.php

Spacing +6 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
 include_once $GLOBALS['xoops']->path('include/comment_constants.php');
 
 if (('system' !== $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) || (!is_object($xoopsUser) && !$xoopsModuleConfig['com_anonpost']) || !is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 xoops_loadLanguage('comment');
@@ -58,10 +58,10 @@ 
 }
 // End edit by voltan
 
-$r_text    = _CM_POSTER . ': <strong>' . $r_name . '</strong>&nbsp;&nbsp;' . _CM_POSTED . ': <strong>' . formatTimestamp($comment->getVar('com_created')) . '</strong><br><br>' . $comment->getVar('com_text');
+$r_text    = _CM_POSTER.': <strong>'.$r_name.'</strong>&nbsp;&nbsp;'._CM_POSTED.': <strong>'.formatTimestamp($comment->getVar('com_created')).'</strong><br><br>'.$comment->getVar('com_text');
 $com_title = $comment->getVar('com_title', 'E');
-if (!preg_match('/^' . _RE . '/i', $com_title)) {
-    $com_title = _RE . ' ' . xoops_substr($com_title, 0, 56);
+if (!preg_match('/^'._RE.'/i', $com_title)) {
+    $com_title = _RE.' '.xoops_substr($com_title, 0, 56);
 }
 $com_pid    = $com_id;
 $com_text   = '';
@@ -82,8 +82,8 @@ 
 
 include_once $GLOBALS['xoops']->path('header.php');
 echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
-      <tr><td class="head">' . $comment->getVar('com_title') . '</td></tr>
-      <tr><td><br>' . $r_text . '<br></td></tr>
+      <tr><td class="head">' . $comment->getVar('com_title').'</td></tr>
+      <tr><td><br>' . $r_text.'<br></td></tr>
       </table>';
 include_once $GLOBALS['xoops']->path('include/comment_form.php');
 include_once $GLOBALS['xoops']->path('footer.php');

htdocs/include/comment_form.php

Indentation +3 added lines, -3 removed lines

@@ -91,9 +91,9 @@
             include_once $GLOBALS['xoops']->path('include/comment_constants.php');
             $status_select = new XoopsFormSelect(_CM_STATUS, 'com_status', $com_status);
             $status_select->addOptionArray(array(
-                                               XOOPS_COMMENT_PENDING => _CM_PENDING,
-                                               XOOPS_COMMENT_ACTIVE  => _CM_ACTIVE,
-                                               XOOPS_COMMENT_HIDDEN  => _CM_HIDDEN));
+                                                XOOPS_COMMENT_PENDING => _CM_PENDING,
+                                                XOOPS_COMMENT_ACTIVE  => _CM_ACTIVE,
+                                                XOOPS_COMMENT_HIDDEN  => _CM_HIDDEN));
             $cform->addElement($status_select);
             $button_tray->addElement(new XoopsFormButton('', 'com_dodelete', _DELETE, 'submit'));
         }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 $icons_radio   = new XoopsFormRadio(_MESSAGEICON, 'com_icon', $com_icon);
 $subject_icons = XoopsLists::getSubjectsList();
 foreach ($subject_icons as $iconfile) {
-    $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
+    $icons_radio->addOption($iconfile, '<img src="'.XOOPS_URL.'/images/subject/'.$iconfile.'" alt="" />');
 }
 $cform->addElement($icons_radio);
 // editor

htdocs/include/version.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  * It is highly discouraged to use the license file
  * It will be depreciated and removed
  */
-@include_once __DIR__ . '/license.php';
+@include_once __DIR__.'/license.php';
 
 /**
  *  Define XOOPS version

htdocs/include/checklogin.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 $redirect = XoopsRequest::getUrl('xoops_redirect', '', 'POST');
 
 if ($uname == '' || $pass == '') {
-    redirect_header(XOOPS_URL . '/user.php', 1, _US_INCORRECTLOGIN);
+    redirect_header(XOOPS_URL.'/user.php', 1, _US_INCORRECTLOGIN);
 }
 
 /* @var $member_handler XoopsMemberHandler */
@@ -42,7 +42,7 @@ 
 
 if (false !== $user) {
     if (0 == $user->getVar('level')) {
-        redirect_header(XOOPS_URL . '/index.php', 5, _US_NOACTTPADM);
+        redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM);
     }
     if ($xoopsConfig['closesite'] == 1) {
         $allowed = false;
@@ -53,7 +53,7 @@ 
             }
         }
         if (!$allowed) {
-            redirect_header(XOOPS_URL . '/index.php', 1, _NOPERM);
+            redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
         }
     }
     $user->setVar('last_login', time());
@@ -76,7 +76,7 @@ 
             $claims = array(
                 'uid' => $_SESSION['xoopsUserId'],
             );
-            $rememberTime = 60*60*24*30;
+            $rememberTime = 60 * 60 * 24 * 30;
             $token = \Xmf\Jwt\TokenFactory::build('rememberme', $claims, $rememberTime);
             setcookie(
                 $GLOBALS['xoopsConfig']['usercookie'],
@@ -95,11 +95,11 @@ 
     if (!empty($redirect) && !strpos($redirect, 'register')) {
         $xoops_redirect = rawurldecode($redirect);
         $parsed         = parse_url(XOOPS_URL);
-        $url            = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : 'http://';
+        $url            = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
         if (isset($parsed['host'])) {
             $url .= $parsed['host'];
             if (isset($parsed['port'])) {
-                $url .= ':' . $parsed['port'];
+                $url .= ':'.$parsed['port'];
             }
         } else {
             $url .= $_SERVER['HTTP_HOST'];
@@ -111,7 +111,7 @@ 
         }
         $url .= $xoops_redirect;
     } else {
-        $url = XOOPS_URL . '/index.php';
+        $url = XOOPS_URL.'/index.php';
     }
 
     // RMV-NOTIFY
@@ -121,8 +121,8 @@ 
 
     redirect_header($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname')), false);
 } elseif (empty($redirect)) {
-    redirect_header(XOOPS_URL . '/user.php', 5, $xoopsAuth->getHtmlErrors());
+    redirect_header(XOOPS_URL.'/user.php', 5, $xoopsAuth->getHtmlErrors());
 } else {
-    redirect_header(XOOPS_URL . '/user.php?xoops_redirect=' . urlencode($redirect), 5, $xoopsAuth->getHtmlErrors(), false);
+    redirect_header(XOOPS_URL.'/user.php?xoops_redirect='.urlencode($redirect), 5, $xoopsAuth->getHtmlErrors(), false);
 }
 exit();

htdocs/include/notification_update.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 $redirect_args = array();
 foreach ($update_list as $update_item) {
     list($category, $item_id, $event) = preg_split('/,/', $update_item['params']);
-    $category_info =& notificationCategoryInfo($category);
+    $category_info = & notificationCategoryInfo($category);
     if (!empty($category_info['item_name'])) {
         $redirect_args[$category_info['item_name']] = $item_id;
     }
@@ -93,12 +93,12 @@ 
 $first_arg = 1;
 foreach (array_keys($redirect_args) as $arg) {
     if ($first_arg) {
-        $argstring .= '?' . $arg . '=' . $redirect_args[$arg];
+        $argstring .= '?'.$arg.'='.$redirect_args[$arg];
         $first_arg = 0;
     } else {
-        $argstring .= '&' . $arg . '=' . $redirect_args[$arg];
+        $argstring .= '&'.$arg.'='.$redirect_args[$arg];
     }
 }
 
-redirect_header($_POST['not_redirect'] . $argstring, 3, _NOT_UPDATEOK);
+redirect_header($_POST['not_redirect'].$argstring, 3, _NOT_UPDATEOK);
 exit();

htdocs/include/findusers.php

Indentation +16 added lines, -16 removed lines

@@ -352,14 +352,14 @@ 
 
             $mailok_radio = new XoopsFormRadio(_MA_USER_SHOWMAILOK, 'user_mailok', empty($_POST['user_mailok']) ? 'both' : $_POST['user_mailok']);
             $mailok_radio->addOptionArray(array(
-                                              'mailok' => _MA_USER_MAILOK,
-                                              'mailng' => _MA_USER_MAILNG,
-                                              'both' => _MA_USER_BOTH));
+                                                'mailok' => _MA_USER_MAILOK,
+                                                'mailng' => _MA_USER_MAILNG,
+                                                'both' => _MA_USER_BOTH));
             $avatar_radio = new XoopsFormRadio(_MA_USER_HASAVATAR, 'user_avatar', empty($_POST['user_avatar']) ? 'both' : $_POST['user_avatar']);
             $avatar_radio->addOptionArray(array(
-                                              'y' => _YES,
-                                              'n' => _NO,
-                                              'both' => _MA_USER_BOTH));
+                                                'y' => _YES,
+                                                'n' => _NO,
+                                                'both' => _MA_USER_BOTH));
 
             $level_radio = new XoopsFormRadio(_MA_USER_LEVEL, 'level', @$_POST['level']);
             $levels      = array(
@@ -391,8 +391,8 @@ 
             $form->addElement($rank_select);
         } else {
             foreach (array(
-                         'uname',
-                         'email') as $var) {
+                            'uname',
+                            'email') as $var) {
                 $title      = $items_match[$var];
                 $text       = new XoopsFormText('', $var, 30, 100, @$_POST[$var]);
                 $match      = new XoopsFormSelectMatchOption('', "{$var}_match", @$_POST["{$var}_match"]);
@@ -406,14 +406,14 @@ 
 
         $sort_select = new XoopsFormSelect(_MA_USER_SORT, 'user_sort', @$_POST['user_sort']);
         $sort_select->addOptionArray(array(
-                                         'uname' => _MA_USER_UNAME,
-                                         'last_login' => _MA_USER_LASTLOGIN,
-                                         'user_regdate' => _MA_USER_REGDATE,
-                                         'posts' => _MA_USER_POSTS));
+                                            'uname' => _MA_USER_UNAME,
+                                            'last_login' => _MA_USER_LASTLOGIN,
+                                            'user_regdate' => _MA_USER_REGDATE,
+                                            'posts' => _MA_USER_POSTS));
         $order_select = new XoopsFormSelect(_MA_USER_ORDER, 'user_order', @$_POST['user_order']);
         $order_select->addOptionArray(array(
-                                          'ASC' => _MA_USER_ASC,
-                                          'DESC' => _MA_USER_DESC));
+                                            'ASC' => _MA_USER_ASC,
+                                            'DESC' => _MA_USER_DESC));
 
         $form->addElement($sort_select);
         $form->addElement($order_select);
@@ -479,8 +479,8 @@ 
             $criteria->add(new Criteria('user_occ', '%' . $myts->addSlashes(trim($_POST['user_occ'])) . '%', 'LIKE'));
         }
         foreach (array(
-                     'last_login',
-                     'user_regdate') as $var) {
+                        'last_login',
+                        'user_regdate') as $var) {
             if (!empty($_POST["{$var}_more"]) && is_numeric($_POST["{$var}_more"])) {
                 $time = time() - (60 * 60 * 24 * (int)trim($_POST["{$var}_more"]));
                 if ($time > 0) {

Spacing +75 added lines, -75 removed lines

@@ -17,7 +17,7 @@ 
  */
 /* @var  $xoopsUser XoopsUser */
 
-include_once dirname(__DIR__) . '/mainfile.php';
+include_once dirname(__DIR__).'/mainfile.php';
 
 xoops_header(false);
 
@@ -36,8 +36,8 @@ 
 
 $token         = isset($_REQUEST['token']) ? $_REQUEST['token'] : '';
 $name_form     = 'memberslist';
-$name_userid   = 'uid' . (!empty($_REQUEST['multiple']) ? '[]' : '');
-$name_username = 'uname' . (!empty($_REQUEST['multiple']) ? '[]' : '');
+$name_userid   = 'uid'.(!empty($_REQUEST['multiple']) ? '[]' : '');
+$name_username = 'uname'.(!empty($_REQUEST['multiple']) ? '[]' : '');
 
 xoops_loadLanguage('findusers');
 
@@ -104,7 +104,7 @@ 
     public function get($id = 0)
     {
         $object = $this->create(false);
-        $sql    = 'SELECT * FROM ' . $this->db->prefix('ranks') . ' WHERE rank_id = ' . $this->db->quoteString($id);
+        $sql    = 'SELECT * FROM '.$this->db->prefix('ranks').' WHERE rank_id = '.$this->db->quoteString($id);
         if (!$result = $this->db->query($sql)) {
             $ret = null;
 
@@ -132,11 +132,11 @@ 
             $criteria = new CriteriaCompo();
         }
 
-        $sql = 'SELECT rank_id, rank_title FROM ' . $this->db->prefix('ranks');
+        $sql = 'SELECT rank_id, rank_title FROM '.$this->db->prefix('ranks');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -227,14 +227,14 @@ 
         }
         $groups = array_filter($groups);
         if (empty($groups)) {
-            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM ' . $this->db->prefix('users') . ' AS u' . '    WHERE 1=1';
+            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM '.$this->db->prefix('users').' AS u'.'    WHERE 1=1';
         } else {
-            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM ' . $this->db->prefix('users') . ' AS u' . '    LEFT JOIN ' . $this->db->prefix('groups_users_link') . ' AS g ON g.uid = u.uid' . '    WHERE g.groupid IN (' . implode(', ', array_map('intval', $groups)) . ')';
+            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM '.$this->db->prefix('users').' AS u'.'    LEFT JOIN '.$this->db->prefix('groups_users_link').' AS g ON g.uid = u.uid'.'    WHERE g.groupid IN ('.implode(', ', array_map('intval', $groups)).')';
         }
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             // Use the direct renderer, assuming no `uid` in criteria
             if ($render = $criteria->render()) {
-                $sql .= ' AND ' . $render;
+                $sql .= ' AND '.$render;
             }
         }
         $result = $this->db->query($sql);
@@ -260,16 +260,16 @@ 
         $limit  = null;
         $start  = null;
         if (empty($groups)) {
-            $sql = '    SELECT u.* FROM ' . $this->db->prefix('users') . ' AS u' . '    WHERE 1=1';
+            $sql = '    SELECT u.* FROM '.$this->db->prefix('users').' AS u'.'    WHERE 1=1';
         } else {
-            $sql = '    SELECT u.* FROM ' . $this->db->prefix('users') . ' AS u' . '    LEFT JOIN ' . $this->db->prefix('groups_users_link') . ' AS g ON g.uid = u.uid' . '    WHERE g.groupid IN (' . implode(', ', array_map('intval', $groups)) . ')';
+            $sql = '    SELECT u.* FROM '.$this->db->prefix('users').' AS u'.'    LEFT JOIN '.$this->db->prefix('groups_users_link').' AS g ON g.uid = u.uid'.'    WHERE g.groupid IN ('.implode(', ', array_map('intval', $groups)).')';
         }
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($render = $criteria->render()) {
-                $sql .= ' AND ' . $render;
+                $sql .= ' AND '.$render;
             }
             if ($sort = $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$sort.' '.$criteria->getOrder();
                 $orderSet = true;
             }
             $limit = $criteria->getLimit();
@@ -428,16 +428,16 @@ 
     $acttotal   = $user_handler->getCount(new Criteria('level', 0, '>'));
     $inacttotal = $user_handler->getCount(new Criteria('level', 0, '<='));
     echo '</html><body>';
-    echo "<h2 style='text-align:left;'>" . _MA_USER_FINDUS . ' - ' . $modes[$mode] . '</h2>';
+    echo "<h2 style='text-align:left;'>"._MA_USER_FINDUS.' - '.$modes[$mode].'</h2>';
     $modes_switch = array();
     foreach ($modes as $_mode => $title) {
         if ($mode == $_mode) {
             continue;
         }
-        $modes_switch[] = "<a href='findusers.php?target=" . htmlspecialchars(@$_REQUEST['target'], ENT_QUOTES) . '&amp;multiple=' . htmlspecialchars(@$_REQUEST['multiple'], ENT_QUOTES) . '&amp;token=' . htmlspecialchars($token, ENT_QUOTES) . "&amp;mode={$_mode}'>{$title}</a>";
+        $modes_switch[] = "<a href='findusers.php?target=".htmlspecialchars(@$_REQUEST['target'], ENT_QUOTES).'&amp;multiple='.htmlspecialchars(@$_REQUEST['multiple'], ENT_QUOTES).'&amp;token='.htmlspecialchars($token, ENT_QUOTES)."&amp;mode={$_mode}'>{$title}</a>";
     }
-    echo '<h4>' . implode(' | ', $modes_switch) . '</h4>';
-    echo '(' . sprintf(_MA_USER_ACTUS, "<span style='color:#ff0000;'>$acttotal</span>") . ' ' . sprintf(_MA_USER_INACTUS, "<span style='color:#ff0000;'>$inacttotal</span>") . ')';
+    echo '<h4>'.implode(' | ', $modes_switch).'</h4>';
+    echo '('.sprintf(_MA_USER_ACTUS, "<span style='color:#ff0000;'>$acttotal</span>").' '.sprintf(_MA_USER_INACTUS, "<span style='color:#ff0000;'>$inacttotal</span>").')';
     $form->display();
 } else {
     $myts  = MyTextSanitizer::getInstance();
@@ -451,32 +451,32 @@ 
                 $value = str_replace('_', "\\\_", $myts->addSlashes(trim($_POST[$var])));
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria($var, $value . '%', 'LIKE'));
+                        $criteria->add(new Criteria($var, $value.'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria($var, '%' . $value, 'LIKE'));
+                        $criteria->add(new Criteria($var, '%'.$value, 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria($var, $value));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria($var, '%' . $value . '%', 'LIKE'));
+                        $criteria->add(new Criteria($var, '%'.$value.'%', 'LIKE'));
                         break;
                 }
             }
         }
         if (!empty($_POST['url'])) {
             $url = formatURL(trim($_POST['url']));
-            $criteria->add(new Criteria('url', $url . '%', 'LIKE'));
+            $criteria->add(new Criteria('url', $url.'%', 'LIKE'));
         }
         if (!empty($_POST['user_from'])) {
-            $criteria->add(new Criteria('user_from', '%' . $myts->addSlashes(trim($_POST['user_from'])) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_from', '%'.$myts->addSlashes(trim($_POST['user_from'])).'%', 'LIKE'));
         }
         if (!empty($_POST['user_intrest'])) {
-            $criteria->add(new Criteria('user_intrest', '%' . $myts->addSlashes(trim($_POST['user_intrest'])) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_intrest', '%'.$myts->addSlashes(trim($_POST['user_intrest'])).'%', 'LIKE'));
         }
         if (!empty($_POST['user_occ'])) {
-            $criteria->add(new Criteria('user_occ', '%' . $myts->addSlashes(trim($_POST['user_occ'])) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_occ', '%'.$myts->addSlashes(trim($_POST['user_occ'])).'%', 'LIKE'));
         }
         foreach (array(
                      'last_login',
@@ -519,7 +519,7 @@ 
                 1 => 1,
                 2 => 0,
                 3 => -1);
-            $level       = isset($level_value[(int)$_POST['level']]) ? $level_value[(int)$_POST['level']] : 1;
+            $level = isset($level_value[(int)$_POST['level']]) ? $level_value[(int)$_POST['level']] : 1;
             $criteria->add(new Criteria('level', $level));
         }
         if (!empty($_POST['rank'])) {
@@ -555,21 +555,21 @@ 
     } else {
         $query = trim($_POST['query']);
         // Query with alias
-        if (preg_match("/select[\s]+.*[\s]+from[\s]+(" . $xoopsDB->prefix('users') . "[\s]+as[\s]+(\S+).*)/i", $query, $matches)) {
+        if (preg_match("/select[\s]+.*[\s]+from[\s]+(".$xoopsDB->prefix('users')."[\s]+as[\s]+(\S+).*)/i", $query, $matches)) {
             $alias    = $matches[2];
             $subquery = $matches[1];
 
             // Query without alias
-        } elseif (preg_match("/select[\s]+.*[\s]+from[\s]+(" . $xoopsDB->prefix('users') . "\b.*)/i", $query, $matches)) {
+        } elseif (preg_match("/select[\s]+.*[\s]+from[\s]+(".$xoopsDB->prefix('users')."\b.*)/i", $query, $matches)) {
             $alias    = '';
             $subquery = $matches[1];
 
             // Invalid query
         } else {
-            $query    = 'SELECT * FROM ' . $xoopsDB->prefix('users');
+            $query    = 'SELECT * FROM '.$xoopsDB->prefix('users');
             $subquery = $xoopsDB->prefix('users');
         }
-        $sql_count = 'SELECT COUNT(DISTINCT ' . (empty($alias) ? '' : $alias . '.') . 'uid) FROM ' . $subquery;
+        $sql_count = 'SELECT COUNT(DISTINCT '.(empty($alias) ? '' : $alias.'.').'uid) FROM '.$subquery;
         $result    = $xoopsDB->query($sql_count);
         list($total) = $xoopsDB->FetchRow($result);
         $result     = $xoopsDB->query($query, $limit, $start);
@@ -584,15 +584,15 @@ 
 
     echo $js_adduser = '
         <script type="text/javascript">
-        var multiple=' . (int)$_REQUEST['multiple'] . ';
+        var multiple=' . (int)$_REQUEST['multiple'].';
         function addusers()
         {
             var sel_str = "";
             var num = 0;
-            var mForm = document.forms["' . $name_form . '"];
+            var mForm = document.forms["' . $name_form.'"];
             for (var i=0;i!=mForm.elements.length;i++) {
                 var id=mForm.elements[i];
-                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid . '" ) ) {
+                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid.'" ) ) {
                     var name = mForm.elements[++i];
                     var len = id.value.length + name.value.length;
                     sel_str += len + ":" + id.value + ":" + name.value;
@@ -600,12 +600,12 @@ 
                 }
             }
             if (num == 0) {
-                alert("' . _MA_USER_NOUSERSELECTED . '");
+                alert("' . _MA_USER_NOUSERSELECTED.'");
                 return false;
             }
             sel_str = num + ":" + sel_str;
             window.opener.addusers(sel_str);
-            alert("' . _MA_USER_USERADDED . '");
+            alert("' . _MA_USER_USERADDED.'");
             if (multiple == 0) {
                 window.close();
                 window.opener.focus();
@@ -616,16 +616,16 @@ 
     ';
 
     echo '</html><body>';
-    echo "<a href='findusers.php?target=" . htmlspecialchars(@$_POST['target'], ENT_QUOTES) . '&amp;multiple=' . (int)(@$_POST['multiple']) . '&amp;token=' . htmlspecialchars($token, ENT_QUOTES) . "'>" . _MA_USER_FINDUS . "</a>&nbsp;<span style='font-weight:bold;'>&raquo;</span>&nbsp;" . _MA_USER_RESULTS . '<br><br>';
+    echo "<a href='findusers.php?target=".htmlspecialchars(@$_POST['target'], ENT_QUOTES).'&amp;multiple='.(int)(@$_POST['multiple']).'&amp;token='.htmlspecialchars($token, ENT_QUOTES)."'>"._MA_USER_FINDUS."</a>&nbsp;<span style='font-weight:bold;'>&raquo;</span>&nbsp;"._MA_USER_RESULTS.'<br><br>';
     if (empty($start) && empty($foundusers)) {
-        echo '<h4>' . _MA_USER_NOFOUND, '</h4>';
+        echo '<h4>'._MA_USER_NOFOUND, '</h4>';
         $hiddenform = "<form name='findnext' action='findusers.php' method='post'>";
         foreach ($_POST as $k => $v) {
             if ($k === 'XOOPS_TOKEN_REQUEST') {
                 // regenerate token value
-                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML() . "\n";
+                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML()."\n";
             } else {
-                $hiddenform .= "<input type='hidden' name='" . htmlspecialchars($k, ENT_QUOTES) . "' value='" . htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
+                $hiddenform .= "<input type='hidden' name='".htmlspecialchars($k, ENT_QUOTES)."' value='".htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES)."' />\n";
             }
         }
         if (!isset($_POST['limit'])) {
@@ -634,15 +634,15 @@ 
         if (!isset($_POST['start'])) {
             $hiddenform .= "<input type='hidden' name='start' value='{$start}' />\n";
         }
-        $hiddenform .= "<input type='hidden' name='token' value='" . htmlspecialchars($token, ENT_QUOTES) . "' />\n";
+        $hiddenform .= "<input type='hidden' name='token' value='".htmlspecialchars($token, ENT_QUOTES)."' />\n";
         $hiddenform .= '</form>';
 
-        echo '<div>' . $hiddenform;
-        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . _MA_USER_SEARCHAGAIN . "</a>\n";
+        echo '<div>'.$hiddenform;
+        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>"._MA_USER_SEARCHAGAIN."</a>\n";
         echo '</div>';
     } elseif ($start < $total) {
         if (!empty($total)) {
-            echo sprintf(_MA_USER_USERSFOUND, $total) . '<br>';
+            echo sprintf(_MA_USER_USERSFOUND, $total).'<br>';
         }
         if (!empty($foundusers)) {
             echo "<form action='findusers.php' method='post' name='{$name_form}' id='{$name_form}'>
@@ -653,11 +653,11 @@ 
                 echo "<input type='checkbox' name='memberslist_checkall' id='memberslist_checkall' onclick='xoopsCheckAll(\"{$name_form}\", \"memberslist_checkall\");' />";
             }
             echo "</th>
-            <th align='center'>" . _MA_USER_UNAME . "</th>
-            <th align='center'>" . _MA_USER_REALNAME . "</th>
-            <th align='center'>" . _MA_USER_REGDATE . "</th>
-            <th align='center'>" . _MA_USER_LASTLOGIN . "</th>
-            <th align='center'>" . _MA_USER_POSTS . '</th>
+            <th align='center'>" . _MA_USER_UNAME."</th>
+            <th align='center'>" . _MA_USER_REALNAME."</th>
+            <th align='center'>" . _MA_USER_REGDATE."</th>
+            <th align='center'>" . _MA_USER_LASTLOGIN."</th>
+            <th align='center'>" . _MA_USER_POSTS.'</th>
             </tr>';
             $ucount = 0;
             foreach (array_keys($foundusers) as $j) {
@@ -670,33 +670,33 @@ 
                 echo "<tr class='$class'>
                     <td align='center'>";
                 if (!empty($_POST['multiple'])) {
-                    echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar('uid') . "' />";
-                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar('uname') . "' />";
+                    echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar('uid')."' />";
+                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar('uname')."' />";
                 } else {
-                    echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar('uid') . "' />";
-                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar('uname') . "' />";
+                    echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar('uid')."' />";
+                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar('uname')."' />";
                 }
                 echo "</td>
-                    <td><a href='" . XOOPS_URL . '/userinfo.php?uid=' . $foundusers[$j]->getVar('uid') . "' target='_blank'>" . $foundusers[$j]->getVar('uname') . '</a></td>
-                    <td>' . $fuser_name . "</td>
-                    <td align='center'>" . ($foundusers[$j]->getVar('user_regdate') ? date('Y-m-d', $foundusers[$j]->getVar('user_regdate')) : '') . "</td>
-                    <td align='center'>" . ($foundusers[$j]->getVar('last_login') ? date('Y-m-d H:i', $foundusers[$j]->getVar('last_login')) : '') . "</td>
-                    <td align='center'>" . $foundusers[$j]->getVar('posts') . '</td>';
+                    <td><a href='" . XOOPS_URL.'/userinfo.php?uid='.$foundusers[$j]->getVar('uid')."' target='_blank'>".$foundusers[$j]->getVar('uname').'</a></td>
+                    <td>' . $fuser_name."</td>
+                    <td align='center'>" . ($foundusers[$j]->getVar('user_regdate') ? date('Y-m-d', $foundusers[$j]->getVar('user_regdate')) : '')."</td>
+                    <td align='center'>" . ($foundusers[$j]->getVar('last_login') ? date('Y-m-d H:i', $foundusers[$j]->getVar('last_login')) : '')."</td>
+                    <td align='center'>" . $foundusers[$j]->getVar('posts').'</td>';
                 echo "</tr>\n";
             }
             echo "<tr class='foot'><td colspan='6'>";
 
             // placeholder for external applications
             if (empty($_POST['target'])) {
-                echo "<select name='fct'><option value='users'>" . _DELETE . "</option><option value='mailusers'>" . _MA_USER_SENDMAIL . '</option>';
+                echo "<select name='fct'><option value='users'>"._DELETE."</option><option value='mailusers'>"._MA_USER_SENDMAIL.'</option>';
                 echo '</select>&nbsp;';
-                echo $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' value='" . _SUBMIT . "' />";
+                echo $GLOBALS['xoopsSecurity']->getTokenHTML()."<input type='submit' value='"._SUBMIT."' />";
 
                 // Add selected users
             } else {
-                echo "<input type='button' value='" . _MA_USER_ADD_SELECTED . "' onclick='addusers();' />";
+                echo "<input type='button' value='"._MA_USER_ADD_SELECTED."' onclick='addusers();' />";
             }
-            echo "<input type='hidden' name='token' value='" . htmlspecialchars($token, ENT_QUOTES) . "' />\n";
+            echo "<input type='hidden' name='token' value='".htmlspecialchars($token, ENT_QUOTES)."' />\n";
             echo "</td></tr></table></form>\n";
         }
 
@@ -704,31 +704,31 @@ 
         foreach ($_POST as $k => $v) {
             if ($k === 'XOOPS_TOKEN_REQUEST') {
                 // regenerate token value
-                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML() . "\n";
+                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML()."\n";
             } else {
-                $hiddenform .= "<input type='hidden' name='" . htmlspecialchars($k, ENT_QUOTES) . "' value='" . htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
+                $hiddenform .= "<input type='hidden' name='".htmlspecialchars($k, ENT_QUOTES)."' value='".htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES)."' />\n";
             }
         }
         if (!isset($_POST['limit'])) {
-            $hiddenform .= "<input type='hidden' name='limit' value='" . $limit . "' />\n";
+            $hiddenform .= "<input type='hidden' name='limit' value='".$limit."' />\n";
         }
         if (!isset($_POST['start'])) {
-            $hiddenform .= "<input type='hidden' name='start' value='" . $start . "' />\n";
+            $hiddenform .= "<input type='hidden' name='start' value='".$start."' />\n";
         }
-        $hiddenform .= "<input type='hidden' name='token' value='" . htmlspecialchars($token, ENT_QUOTES) . "' />\n";
+        $hiddenform .= "<input type='hidden' name='token' value='".htmlspecialchars($token, ENT_QUOTES)."' />\n";
         if (!isset($total) || ($totalpages = ceil($total / $limit)) > 1) {
             $prev = $start - $limit;
             if ($start - $limit >= 0) {
-                $hiddenform .= "<a href='#0' onclick='document.findnext.start.value=" . $prev . ";document.findnext.submit();'>" . _MA_USER_PREVIOUS . "</a>&nbsp;\n";
+                $hiddenform .= "<a href='#0' onclick='document.findnext.start.value=".$prev.";document.findnext.submit();'>"._MA_USER_PREVIOUS."</a>&nbsp;\n";
             }
             $counter     = 1;
             $currentpage = ($start + $limit) / $limit;
             if (!isset($total)) {
                 while ($counter <= $currentpage) {
                     if ($counter == $currentpage) {
-                        $hiddenform .= '<strong>' . $counter . '</strong> ';
+                        $hiddenform .= '<strong>'.$counter.'</strong> ';
                     } elseif (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1) {
-                        $hiddenform .= "<a href='#" . $counter . "' onclick='document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . '</a> ';
+                        $hiddenform .= "<a href='#".$counter."' onclick='document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter.'</a> ';
                         if ($counter == 1 && $currentpage > 5) {
                             $hiddenform .= '... ';
                         }
@@ -738,12 +738,12 @@ 
             } else {
                 while ($counter <= $totalpages) {
                     if ($counter == $currentpage) {
-                        $hiddenform .= '<strong>' . $counter . '</strong> ';
+                        $hiddenform .= '<strong>'.$counter.'</strong> ';
                     } elseif (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1 || $counter == $totalpages) {
                         if ($counter == $totalpages && $currentpage < $totalpages - 4) {
                             $hiddenform .= '... ';
                         }
-                        $hiddenform .= "<a href='#" . $counter . "' onclick='document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . '</a> ';
+                        $hiddenform .= "<a href='#".$counter."' onclick='document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter.'</a> ';
                         if ($counter == 1 && $currentpage > 5) {
                             $hiddenform .= '... ';
                         }
@@ -754,16 +754,16 @@ 
 
             $next = $start + $limit;
             if ((isset($total) && $total > $next) || (!isset($total) && count($foundusers) >= $limit)) {
-                $hiddenform .= "&nbsp;<a href='#" . $total . "' onclick='document.findnext.start.value=" . $next . ";document.findnext.submit();'>" . _MA_USER_NEXT . "</a>\n";
+                $hiddenform .= "&nbsp;<a href='#".$total."' onclick='document.findnext.start.value=".$next.";document.findnext.submit();'>"._MA_USER_NEXT."</a>\n";
             }
         }
         $hiddenform .= '</form>';
 
-        echo '<div>' . $hiddenform;
+        echo '<div>'.$hiddenform;
         if (isset($total)) {
-            echo '<br>' . sprintf(_MA_USER_USERSFOUND, $total) . '&nbsp;';
+            echo '<br>'.sprintf(_MA_USER_USERSFOUND, $total).'&nbsp;';
         }
-        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . _MA_USER_SEARCHAGAIN . "</a>\n";
+        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>"._MA_USER_SEARCHAGAIN."</a>\n";
         echo '</div>';
     }
 }

htdocs/language/english/errors.php

Spacing +2 added lines, -2 removed lines

@@ -2,5 +2,5 @@
 // _LANGCODE: en
 // _CHARSET : UTF-8
 // Translator: XOOPS Translation Team
-define('_XO_ER_FILENOTFOUND','Requested file: <b>%s</b> was not found ');
-define('_XO_ER_CLASSNOTFOUND','Requested class %s was not found');
+define('_XO_ER_FILENOTFOUND', 'Requested file: <b>%s</b> was not found ');
+define('_XO_ER_CLASSNOTFOUND', 'Requested class %s was not found');