XOOPS / XoopsCore25

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');

htdocs/language/english/xmf.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 
-define('_AM_XMF_MODULE_NOTFOUND','Please install or reactivate %1$s module. Minimum version required: %2$s');
-define('_AM_XMF_MODULE_VERSION','Minimum %1$s module version required: %2$s (your version is %3$s)');
+define('_AM_XMF_MODULE_NOTFOUND', 'Please install or reactivate %1$s module. Minimum version required: %2$s');
+define('_AM_XMF_MODULE_VERSION', 'Minimum %1$s module version required: %2$s (your version is %3$s)');
 define('_AM_XMF_MODULE_INSTALLED', 'The module \'%s\' is installed!');
 define('_AM_XMF_MODULE_NOT_INSTALLED', 'The module \'%s\' is not installed!');
 
-define('_DB_XMF_TABLE_IS_NOT_DEFINED','Table is not defined');
+define('_DB_XMF_TABLE_IS_NOT_DEFINED', 'Table is not defined');

htdocs/language/english/findusers.php

Spacing +1 added lines, -1 removed lines

@@ -61,5 +61,5 @@
 
 //2.5.4
 define('_MA_USER_FACEBOOK', 'Facebook Link'); //TO DO
-define('_MA_USER_SKYPE', 'Skype Link');//TO DO
+define('_MA_USER_SKYPE', 'Skype Link'); //TO DO
 

htdocs/language/english/locale.php

Spacing +2 added lines, -2 removed lines

@@ -30,10 +30,10 @@
 define('_MONTHDAY', 'n/j G:i');
 define('_YEARMONTHDAY', 'Y/n/j G:i');
 define('_ELAPSE', '%s ago');
-define('_TIMEFORMAT_DESC', "Valid formats: \"s\" - " . _SHORTDATESTRING . "; \"m\" - " . _MEDIUMDATESTRING . "; \"l\" - " . _DATESTRING . ';<br>' . "\"c\" or \"custom\" - format determined according to interval to present; \"e\" - Elapsed; \"mysql\" - Y-m-d H:i:s;<br>" . "specified string - Refer to <a href=\"http://php.net/manual/en/function.date.php\" rel=\"external\">PHP manual</a>.");
+define('_TIMEFORMAT_DESC', "Valid formats: \"s\" - "._SHORTDATESTRING."; \"m\" - "._MEDIUMDATESTRING."; \"l\" - "._DATESTRING.';<br>'."\"c\" or \"custom\" - format determined according to interval to present; \"e\" - Elapsed; \"mysql\" - Y-m-d H:i:s;<br>"."specified string - Refer to <a href=\"http://php.net/manual/en/function.date.php\" rel=\"external\">PHP manual</a>.");
 
 if (!class_exists('XoopsLocalAbstract')) {
-    include_once XOOPS_ROOT_PATH . '/class/xoopslocal.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopslocal.php';
 }
 
 /**

htdocs/language/english/formdhtmltextarea.php

Indentation +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
     'Verdana',
     'Haettenschweiler');
 /**
- * Localized font sizes: 'font size value' => 'font size name'
- */
+     * Localized font sizes: 'font size value' => 'font size name'
+     */
 $GLOBALS['formtextdhtml_sizes'] = array(
     'xx-small' => 'xx-Small',
     'x-small'  => 'x-Small',

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 define('_XOOPS_FORM_ALT_CHECKLENGTH', 'Check text length');
 define('_XOOPS_FORM_ALT_LENGTH', 'Current content length: %s');
 define('_XOOPS_FORM_ALT_LENGTH_MAX', 'Maximum length: ');
-define('_XOOPS_FORM_PREVIEW_CONTENT', 'Click the <strong>' . _PREVIEW . '</strong> to see the content in action.');
+define('_XOOPS_FORM_PREVIEW_CONTENT', 'Click the <strong>'._PREVIEW.'</strong> to see the content in action.');
 
 define('_XOOPS_FORM_ALTYOUTUBE', 'Youtube');
 define('_XOOPS_FORM_ENTER_SOUNDCLOUD_URL', 'Enter SoundCloud URL');

htdocs/include/cp_functions.php

Spacing +26 added lines, -26 removed lines

@@ -67,7 +67,7 @@ 
  */
 function themecenterposts($title, $content)
 {
-    echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"><tr><td class="head">' . $title . '</td></tr><tr><td><br>' . $content . '<br></td></tr></table>';
+    echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"><tr><td class="head">'.$title.'</td></tr><tr><td><br>'.$content.'<br></td></tr></table>';
 }
 
 /**
@@ -79,7 +79,7 @@ 
  */
 function myTextForm($url, $value)
 {
-    return '<form action="' . $url . '" method="post"><input type="submit" value="' . $value . '" /></form>';
+    return '<form action="'.$url.'" method="post"><input type="submit" value="'.$value.'" /></form>';
 }
 
 /**
@@ -108,7 +108,7 @@ 
  */
 function xoops_module_get_admin_menu()
 {
-    $GLOBALS['xoopsLogger']->addDeprecated(__FUNCTION__ . ' is deprecated, should not be used any longer');
+    $GLOBALS['xoopsLogger']->addDeprecated(__FUNCTION__.' is deprecated, should not be used any longer');
     /************************************************************
      * Based on:
      * - PHP Layers Menu 1.0.7(c)2001,2002 Marco Pratesi <pratesi@telug.it>
@@ -135,22 +135,22 @@ 
     foreach ($mods as $mod) {
         $mid         = $mod->getVar('mid');
         $module_name = $mod->getVar('name');
-        $module_url  = "\".XOOPS_URL.\"/modules/" . $mod->getVar('dirname') . '/' . trim($mod->getInfo('adminindex'));
-        $module_img  = "<img class='admin_layer_img' src='\".XOOPS_URL.\"/modules/" . $mod->getVar('dirname') . '/' . $mod->getInfo('image') . "' alt='' />";
-        $module_desc = "<strong>\"._VERSION.\":</strong> " . round($mod->getVar('version') / 100, 2) . "<br><strong>\"._DESCRIPTION.\":</strong> " . $mod->getInfo('description');
+        $module_url  = "\".XOOPS_URL.\"/modules/".$mod->getVar('dirname').'/'.trim($mod->getInfo('adminindex'));
+        $module_img  = "<img class='admin_layer_img' src='\".XOOPS_URL.\"/modules/".$mod->getVar('dirname').'/'.$mod->getInfo('image')."' alt='' />";
+        $module_desc = "<strong>\"._VERSION.\":</strong> ".round($mod->getVar('version') / 100, 2)."<br><strong>\"._DESCRIPTION.\":</strong> ".$mod->getInfo('description');
 
         $top += 15;
-        $js .= "\nfunction popUpL" . $mid . "() {\n    shutdown();\n    popUp('L" . $mid . "',true);}";
-        $moveLayers .= "\n    setleft('L" . $mid . "'," . $left . ");\n    settop('L" . $mid . "'," . $top . ');';
-        $shutdown .= "\n    popUp('L" . $mid . "',false);";
-        $firstleveltable .= "$" . 'xoops_admin_menu_ft[' . $mid . "] = \"<a href='" . $module_url . "' title='" . $module_name . "' onmouseover='moveLayerY(\\\"L" . $mid . "\\\", currentY, event) ; popUpL" . $mid . "(); ' >" . $module_img . "</a><br>\";\n";
-        $menu_layers .= "\n<div id='L" . $mid . "' style='position: absolute; visibility: hidden; z-index:1000;' >\n<table class='admin_layer' cellpadding='0' cellspacing='0'>\n<tr><th nowrap='nowrap'>" . $module_name . "</th></tr>\n<tr><td class='even' nowrap='nowrap'>";
+        $js .= "\nfunction popUpL".$mid."() {\n    shutdown();\n    popUp('L".$mid."',true);}";
+        $moveLayers .= "\n    setleft('L".$mid."',".$left.");\n    settop('L".$mid."',".$top.');';
+        $shutdown .= "\n    popUp('L".$mid."',false);";
+        $firstleveltable .= "$".'xoops_admin_menu_ft['.$mid."] = \"<a href='".$module_url."' title='".$module_name."' onmouseover='moveLayerY(\\\"L".$mid."\\\", currentY, event) ; popUpL".$mid."(); ' >".$module_img."</a><br>\";\n";
+        $menu_layers .= "\n<div id='L".$mid."' style='position: absolute; visibility: hidden; z-index:1000;' >\n<table class='admin_layer' cellpadding='0' cellspacing='0'>\n<tr><th nowrap='nowrap'>".$module_name."</th></tr>\n<tr><td class='even' nowrap='nowrap'>";
 
         $adminmenu = $mod->getAdminMenu();
 
         if ($mod->getVar('hasnotification') || ($mod->getInfo('config') && is_array($mod->getInfo('config'))) || ($mod->getInfo('comments') && is_array($mod->getInfo('comments')))) {
             $adminmenu[] = array(
-                'link'     => '".XOOPS_URL."/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=' . $mid,
+                'link'     => '".XOOPS_URL."/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mid,
                 'title'    => _PREFERENCES,
                 'absolute' => true);
         }
@@ -159,27 +159,27 @@ 
             foreach ($adminmenu as $menuitem) {
                 $menu_link   = trim($menuitem['link']);
                 $menu_title  = trim($menuitem['title']);
-                $menu_target = isset($menuitem['target']) ? " target='" . trim($menuitem['target']) . "'" : '';
+                $menu_target = isset($menuitem['target']) ? " target='".trim($menuitem['target'])."'" : '';
                 if (isset($menuitem['absolute']) && $menuitem['absolute']) {
                     $menu_link = empty($menu_link) ? '#' : $menu_link;
                 } else {
-                    $menu_link = empty($menu_link) ? '#' : "\".XOOPS_URL.\"/modules/" . $mod->getVar('dirname') . '/' . $menu_link;
+                    $menu_link = empty($menu_link) ? '#' : "\".XOOPS_URL.\"/modules/".$mod->getVar('dirname').'/'.$menu_link;
                 }
 
-                $menu_layers .= "\n<img src='\".XOOPS_URL.\"/images/pointer.gif' width='8' height='8' alt='' />&nbsp;<a href='" . $menu_link . "'" . $menu_target . " onmouseover='popUpL" . $mid . "' >" . $menu_title . "</a><br>\n";
+                $menu_layers .= "\n<img src='\".XOOPS_URL.\"/images/pointer.gif' width='8' height='8' alt='' />&nbsp;<a href='".$menu_link."'".$menu_target." onmouseover='popUpL".$mid."' >".$menu_title."</a><br>\n";
             }
         }
 
-        $menu_layers .= "\n<div style='margin-top: 5px; font-size: smaller; text-align: right;'><a href='#' onmouseover='shutdown();'>[" . _CLOSE . "]</a></div></td></tr><tr><th style='font-size: smaller; text-align: left;'>" . $module_img . '<br>' . $module_desc . "</th></tr></table></div>\n";
+        $menu_layers .= "\n<div style='margin-top: 5px; font-size: smaller; text-align: right;'><a href='#' onmouseover='shutdown();'>["._CLOSE."]</a></div></td></tr><tr><th style='font-size: smaller; text-align: left;'>".$module_img.'<br>'.$module_desc."</th></tr></table></div>\n";
     }
     $menu_layers .= "\n<script language='JavaScript' type='text/javascript'>\n<!--\nmoveLayers();\nloaded = 1;\n// -->\n</script>\n";
-    $content = '<' . "?php\n";
-    $content .= "\$xoops_admin_menu_js = \"" . $js . "\n\";\n\n";
-    $content .= "\$xoops_admin_menu_ml = \"" . $moveLayers . "\n\";\n\n";
-    $content .= "\$xoops_admin_menu_sd = \"" . $shutdown . "\n\";\n\n";
-    $content .= $firstleveltable . "\n";
-    $content .= "\$xoops_admin_menu_dv = \"" . $menu_layers . "\";\n";
-    $content .= "\n?" . '>';
+    $content = '<'."?php\n";
+    $content .= "\$xoops_admin_menu_js = \"".$js."\n\";\n\n";
+    $content .= "\$xoops_admin_menu_ml = \"".$moveLayers."\n\";\n\n";
+    $content .= "\$xoops_admin_menu_sd = \"".$shutdown."\n\";\n\n";
+    $content .= $firstleveltable."\n";
+    $content .= "\$xoops_admin_menu_dv = \"".$menu_layers."\";\n";
+    $content .= "\n?".'>';
 
     return $content;
 }
@@ -192,11 +192,11 @@ 
  */
 function xoops_module_write_admin_menu($content)
 {
-    $GLOBALS['xoopsLogger']->addDeprecated(__FUNCTION__ . ' is deprecated, should not be used any longer');
+    $GLOBALS['xoopsLogger']->addDeprecated(__FUNCTION__.' is deprecated, should not be used any longer');
     if (!xoopsfwrite()) {
         return false;
     }
-    $filename = XOOPS_CACHE_PATH . '/adminmenu.php';
+    $filename = XOOPS_CACHE_PATH.'/adminmenu.php';
     if (!$file = fopen($filename, 'w')) {
         echo 'failed open file';
 
@@ -232,7 +232,7 @@ 
     }
 
     $path     = substr($path, -1) === '/' ? substr($path, 0, -1) : $path;
-    $filename = $path . '/index.html';
+    $filename = $path.'/index.html';
     if (file_exists($filename)) {
         return true;
     }

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_new.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,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');
@@ -32,14 +32,14 @@ 
     if (isset($com_replytitle)) {
         if (isset($com_replytext)) {
             echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
-                  <tr><td class="head">' . $com_replytitle . '</td></tr>
-                  <tr><td><br>' . $com_replytext . '<br></td></tr>
+                  <tr><td class="head">' . $com_replytitle.'</td></tr>
+                  <tr><td><br>' . $com_replytext.'<br></td></tr>
                   </table>';
         }
         $myts      = MyTextSanitizer::getInstance();
         $com_title = $myts->htmlSpecialChars($com_replytitle);
-        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);
         }
     } else {
         $com_title = '';

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