mambax7 / XoopsCore25

htdocs/include/site-closed.php

Indentation +13 added lines, -13 removed lines

@@ -47,19 +47,19 @@
         'type' => 'text/javascript'));
     $xoopsTpl = $xoTheme->template;
     $xoopsTpl->assign(array(
-                          'xoops_theme'       => $xoopsConfig['theme_set'],
-                          'xoops_imageurl'    => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
-                          'xoops_themecss'    => xoops_getcss($xoopsConfig['theme_set']),
-                          'xoops_requesturi'  => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
-                          'xoops_sitename'    => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
-                          'xoops_slogan'      => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
-                          'xoops_dirname'     => @$xoopsModule ? $xoopsModule->getVar('dirname') : 'system',
-                          'xoops_banner'      => $xoopsConfig['banners'] ? xoops_getbanner() : ' ',
-                          'xoops_pagetitle'   => isset($xoopsModule) && is_object($xoopsModule) ? $xoopsModule->getVar('name') : htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
-                          'lang_login'        => _LOGIN,
-                          'lang_username'     => _USERNAME,
-                          'lang_password'     => _PASSWORD,
-                          'lang_siteclosemsg' => $xoopsConfig['closesite_text']));
+                            'xoops_theme'       => $xoopsConfig['theme_set'],
+                            'xoops_imageurl'    => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
+                            'xoops_themecss'    => xoops_getcss($xoopsConfig['theme_set']),
+                            'xoops_requesturi'  => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
+                            'xoops_sitename'    => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
+                            'xoops_slogan'      => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
+                            'xoops_dirname'     => @$xoopsModule ? $xoopsModule->getVar('dirname') : 'system',
+                            'xoops_banner'      => $xoopsConfig['banners'] ? xoops_getbanner() : ' ',
+                            'xoops_pagetitle'   => isset($xoopsModule) && is_object($xoopsModule) ? $xoopsModule->getVar('name') : htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
+                            'lang_login'        => _LOGIN,
+                            'lang_username'     => _USERNAME,
+                            'lang_password'     => _PASSWORD,
+                            'lang_siteclosemsg' => $xoopsConfig['closesite_text']));
     /* @var $config_handler XoopsConfigHandler  */
     $config_handler = xoops_getHandler('config');
     $criteria       = new CriteriaCompo(new Criteria('conf_modid', 0));

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     $xoopsTpl = $xoTheme->template;
     $xoopsTpl->assign(array(
                           'xoops_theme'       => $xoopsConfig['theme_set'],
-                          'xoops_imageurl'    => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
+                          'xoops_imageurl'    => XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/',
                           'xoops_themecss'    => xoops_getcss($xoopsConfig['theme_set']),
                           'xoops_requesturi'  => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
                           'xoops_sitename'    => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),

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/searchform.php

Indentation +3 added lines, -3 removed lines

@@ -25,9 +25,9 @@
 $search_form->addElement(new XoopsFormText(_SR_KEYWORDS, 'query', 30, 255, htmlspecialchars(stripslashes(implode(' ', $queries)), ENT_QUOTES)), true);
 $type_select = new XoopsFormSelect(_SR_TYPE, 'andor', $andor);
 $type_select->addOptionArray(array(
-                                 'AND'   => _SR_ALL,
-                                 'OR'    => _SR_ANY,
-                                 'exact' => _SR_EXACT));
+                                    'AND'   => _SR_ALL,
+                                    'OR'    => _SR_ANY,
+                                    'exact' => _SR_EXACT));
 $search_form->addElement($type_select);
 if (!empty($mids)) {
     $mods_checkbox = new XoopsFormCheckBox(_SR_SEARCHIN, 'mids[]', $mids);

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     $criteria->add(new Criteria('hassearch', 1));
     $criteria->add(new Criteria('isactive', 1));
     if (!empty($available_modules)) {
-        $criteria->add(new Criteria('mid', '(' . implode(',', $available_modules) . ')', 'IN'));
+        $criteria->add(new Criteria('mid', '('.implode(',', $available_modules).')', 'IN'));
     }
     /* @var $module_handler XoopsModuleHandler */
     $module_handler = xoops_getHandler('module');

htdocs/include/formdhtmltextarea_preview.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
  * @author              Vinod <smartvinu@gmail.com>
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include_once dirname(__DIR__) . '/mainfile.php';
+include_once dirname(__DIR__).'/mainfile.php';
 
 $xoopsLogger->activated = false;
 $myts                   = MyTextSanitizer::getInstance();
@@ -31,17 +31,17 @@ 
 $content = $myts->displayTarea($content, $html, 1, 1, 1, 1);
 if (preg_match_all('/%u([[:alnum:]]{4})/', $content, $matches)) {
     foreach ($matches[1] as $uniord) {
-        $utf     = '&#x' . $uniord . ';';
-        $content = str_replace('%u' . $uniord, $utf, $content);
+        $utf     = '&#x'.$uniord.';';
+        $content = str_replace('%u'.$uniord, $utf, $content);
     }
     $content = urldecode($content);
 }
 
 if (!headers_sent()) {
     $charset = (defined('_CHARSET') ? _CHARSET : 'UTF-8');
-    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('Cache-Control: private, no-cache');
     header('Pragma: no-cache');
 }
-echo '<div>' . $content . '</div>';
+echo '<div>'.$content.'</div>';

htdocs/include/functions.encoding.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     $r   = '';
     $len = strlen($hex);
     for ($a = 0; $a < $len; $a += 2) {
-        $r .= chr(hexdec($hex{$a} . $hex{$a + 1}));
+        $r .= chr(hexdec($hex{$a}.$hex{$a + 1}));
     }
 
     return $r;
@@ -66,7 +66,7 @@ 
     $accepted = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f');
     $len      = strlen($hex);
     if ($checklen > $len) {
-        $checklen = $len;//And???
+        $checklen = $len; //And???
     }
     $hex = strtolower($hex);
     for ($i = 0; $i < $len; ++$i) {

htdocs/include/notification_functions.php

Spacing +13 added lines, -13 removed lines

@@ -74,7 +74,7 @@ 
     if (!isset($module_id)) {
         global $xoopsModule;
         $module_id = !empty($xoopsModule) ? $xoopsModule->getVar('mid') : 0;
-        $module    =& $xoopsModule;
+        $module    = & $xoopsModule;
     } else {
         /* @var $module_handler XoopsModuleHandler */
         $module_handler = xoops_getHandler('module');
@@ -110,12 +110,12 @@ 
 function &notificationCommentCategoryInfo($module_id = null)
 {
     $ret            = false;
-    $all_categories =& notificationCategoryInfo('', $module_id);
+    $all_categories = & notificationCategoryInfo('', $module_id);
     if (empty($all_categories)) {
         return $ret;
     }
     foreach ($all_categories as $category) {
-        $all_events =& notificationEvents($category['name'], false, $module_id);
+        $all_events = & notificationEvents($category['name'], false, $module_id);
         if (empty($all_events)) {
             continue;
         }
@@ -145,7 +145,7 @@ 
     if (!isset($module_id)) {
         global $xoopsModule;
         $module_id = !empty($xoopsModule) ? $xoopsModule->getVar('mid') : 0;
-        $module    =& $xoopsModule;
+        $module    = & $xoopsModule;
     } else {
         /* @var $module_handler XoopsModuleHandler */
         $module_handler = xoops_getHandler('module');
@@ -156,7 +156,7 @@ 
     $config_handler = xoops_getHandler('config');
     $mod_config     = $config_handler->getConfigsByCat(0, $module_id);
 
-    $category =& notificationCategoryInfo($category_name, $module_id);
+    $category = & notificationCategoryInfo($category_name, $module_id);
 
     global $xoopsConfig;
     $event_array = array();
@@ -167,8 +167,8 @@ 
 
     foreach ($not_config['event'] as $event) {
         if ($event['category'] == $category_name) {
-            if (!is_dir($dir = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/mail_template/')) {
-                $dir = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname') . '/language/english/mail_template/';
+            if (!is_dir($dir = XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/language/'.$xoopsConfig['language'].'/mail_template/')) {
+                $dir = XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/language/english/mail_template/';
             }
             $event['mail_template_dir'] = $dir;
             if (!$enabled_only || notificationEventEnabled($category, $event, $module)) {
@@ -192,8 +192,8 @@ 
     if ($module->getVar('hascomments')) {
         $com_config = $module->getInfo('comments');
         if (!empty($category['item_name']) && $category['item_name'] == $com_config['itemName']) {
-            if (!is_dir($dir = XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/mail_template/')) {
-                $dir = XOOPS_ROOT_PATH . '/language/english/mail_template/';
+            if (!is_dir($dir = XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/mail_template/')) {
+                $dir = XOOPS_ROOT_PATH.'/language/english/mail_template/';
             }
             $mail_template_dir = $dir;
 
@@ -319,7 +319,7 @@ 
  */
 function &notificationEventInfo($category_name, $event_name, $module_id = null)
 {
-    $all_events =& notificationEvents($category_name, false, $module_id);
+    $all_events = & notificationEvents($category_name, false, $module_id);
     foreach ($all_events as $event) {
         if ($event['name'] == $event_name) {
             return $event;
@@ -340,7 +340,7 @@ 
 
 function &notificationSubscribableCategoryInfo($module_id = null)
 {
-    $all_categories =& notificationCategoryInfo('', $module_id);
+    $all_categories = & notificationCategoryInfo('', $module_id);
 
     // FIXME: better or more standardized way to do this?
     $script_url  = explode('/', $_SERVER['PHP_SELF']);
@@ -403,10 +403,10 @@ 
     switch ($type) {
         case 'option_value':
         case 'name':
-            return 'notify:' . $category['name'] . '-' . $event['name'];
+            return 'notify:'.$category['name'].'-'.$event['name'];
             break;
         case 'option_name':
-            return $category['name'] . '-' . $event['name'];
+            return $category['name'].'-'.$event['name'];
             break;
         default:
             return false;

htdocs/include/comment_edit.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,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');

htdocs/include/license.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
-$licenseFile = XOOPS_VAR_PATH . '/data/license.php';
+$licenseFile = XOOPS_VAR_PATH.'/data/license.php';
 if (file_exists($licenseFile)) {
     include_once $licenseFile;
 } else {

htdocs/include/xoops13_header.php

Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 }
 if ($xoopsUser != '') {
     $xoopsTpl->assign(array(
-                          'xoops_isuser'  => true,
-                          'xoops_userid'  => $xoopsUser->getVar('uid'),
-                          'xoops_uname'   => $xoopsUser->getVar('uname'),
-                          'xoops_isadmin' => $xoopsUserIsAdmin));
+                            'xoops_isuser'  => true,
+                            'xoops_userid'  => $xoopsUser->getVar('uid'),
+                            'xoops_uname'   => $xoopsUser->getVar('uname'),
+                            'xoops_isadmin' => $xoopsUserIsAdmin));
 }
 $xoopsTpl->assign('xoops_requesturi', htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES));
 include XOOPS_ROOT_PATH . '/include/old_functions.php';

Spacing +7 added lines, -7 removed lines

@@ -19,10 +19,10 @@ 
 
 $xoopsOption['theme_use_smarty'] = 0;
 
-if (file_exists(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/lang-' . $xoopsConfig['language'] . '.php')) {
-    include XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/lang-' . $xoopsConfig['language'] . '.php';
-} elseif (file_exists(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/lang-english.php')) {
-    include XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/lang-english.php';
+if (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/lang-'.$xoopsConfig['language'].'.php')) {
+    include XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/lang-'.$xoopsConfig['language'].'.php';
+} elseif (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/lang-english.php')) {
+    include XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/lang-english.php';
 }
 
 /* @var $config_handler XoopsConfigHandler  */
@@ -30,11 +30,11 @@ 
 $xoopsConfigMetaFooter = $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
 
 xoops_header(false);
-include XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/theme.php';
+include XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/theme.php';
 $xoopsOption['show_rblock'] = (!empty($xoopsOption['show_rblock'])) ? $xoopsOption['show_rblock'] : 0;
 
 // include Smarty template engine and initialize it
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 $xoopsTpl = new XoopsTpl();
 if ($xoopsConfig['debug_mode'] == 3) {
     $xoopsTpl->debugging = true;
@@ -47,7 +47,7 @@ 
                           'xoops_isadmin' => $xoopsUserIsAdmin));
 }
 $xoopsTpl->assign('xoops_requesturi', htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES));
-include XOOPS_ROOT_PATH . '/include/old_functions.php';
+include XOOPS_ROOT_PATH.'/include/old_functions.php';
 
 if ($xoopsOption['show_cblock'] || (!empty($xoopsModule) && preg_match("/index\.php$/i", xoops_getenv('PHP_SELF')) && $xoopsConfig['startpage'] == $xoopsModule->getVar('dirname'))) {
     $xoopsOption['show_rblock'] = $xoopsOption['show_cblock'] = 1;