mambax7 / XoopsCore25

htdocs/include/old_theme_functions.php

Spacing +5 added lines, -5 removed lines

@@ -24,15 +24,15 @@ 
      */
     function openTable($width = '100%')
     {
-        $GLOBALS['xoopsLogger']->addDeprecated("Function '" . __FUNCTION__ . "' in '" . __FILE__ . "' is deprecated, should not be used any more");
-        echo '<table width="' . $width . '" cellspacing="0" class="outer"><tr><td class="even">';
+        $GLOBALS['xoopsLogger']->addDeprecated("Function '".__FUNCTION__."' in '".__FILE__."' is deprecated, should not be used any more");
+        echo '<table width="'.$width.'" cellspacing="0" class="outer"><tr><td class="even">';
     }
 }
 
 if (!function_exists('closetable')) {
     function closeTable()
     {
-        $GLOBALS['xoopsLogger']->addDeprecated("Function '" . __FUNCTION__ . "' in '" . __FILE__ . "' is deprecated, should not be used any more");
+        $GLOBALS['xoopsLogger']->addDeprecated("Function '".__FUNCTION__."' in '".__FILE__."' is deprecated, should not be used any more");
         echo '</td></tr></table>';
     }
 }
@@ -44,7 +44,7 @@ 
      */
     function themecenterposts($title, $content)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated("Function '" . __FUNCTION__ . "' in '" . __FILE__ . "' is deprecated, should not be used any more");
-        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>';
+        $GLOBALS['xoopsLogger']->addDeprecated("Function '".__FUNCTION__."' in '".__FILE__."' is deprecated, should not be used any more");
+        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>';
     }
 }

htdocs/include/comment_post.php

Spacing +29 added lines, -29 removed lines

@@ -34,7 +34,7 @@ 
     $module          = $module_handler->get($comment->getVar('com_modid'));
     $comment_config  = $module->getInfo('comments');
     $com_modid       = $module->getVar('mid');
-    $redirect_page   = XOOPS_URL . '/modules/system/admin.php?fct=comments&com_modid=' . $com_modid . '&com_itemid';
+    $redirect_page   = XOOPS_URL.'/modules/system/admin.php?fct=comments&com_modid='.$com_modid.'&com_itemid';
     $moddir          = $module->getVar('dirname');
     unset($comment);
 } else {
@@ -44,11 +44,11 @@ 
     }
     $comment_config = $xoopsModule->getInfo('comments');
     $com_modid      = $xoopsModule->getVar('mid');
-    $redirect_page  = $comment_config['pageName'] . '?';
+    $redirect_page  = $comment_config['pageName'].'?';
     if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
         $extra_params = '';
         foreach ($comment_config['extraParams'] as $extra_param) {
-            $extra_params .= isset($_POST[$extra_param]) ? $extra_param . '=' . htmlspecialchars($_POST[$extra_param]) . '&' : $extra_param . '=&';
+            $extra_params .= isset($_POST[$extra_param]) ? $extra_param.'='.htmlspecialchars($_POST[$extra_param]).'&' : $extra_param.'=&';
         }
         $redirect_page .= $extra_params;
     }
@@ -81,7 +81,7 @@ 
         xoops_load('XoopsCaptcha');
         $xoopsCaptcha = XoopsCaptcha::getInstance();
         if (!$xoopsCaptcha->verify()) {
-            $error_message .= $xoopsCaptcha->getMessage() . '<br>';
+            $error_message .= $xoopsCaptcha->getMessage().'<br>';
         }
 
         // Start add by voltan
@@ -90,7 +90,7 @@ 
         $myts = MyTextSanitizer::getInstance();
 
         // Check user name
-        $search_arr  = array(
+        $search_arr = array(
             '&nbsp;',
             "\t",
             "\r\n",
@@ -184,16 +184,16 @@ 
         $com_email = filter_var($com_email, FILTER_VALIDATE_EMAIL);
         // Invalid email address
         if (!checkEmail($com_email)) {
-            $error_message .= _US_INVALIDMAIL . '<br>';
+            $error_message .= _US_INVALIDMAIL.'<br>';
         }
         if (strrpos($com_email, ' ') > 0) {
-            $error_message .= _US_EMAILNOSPACES . '<br>';
+            $error_message .= _US_EMAILNOSPACES.'<br>';
         }
         // Check forbidden email address if current operator is not an administrator
         if (!$xoopsUser_isAdmin) {
             foreach ($xoopsConfigUser['bad_emails'] as $be) {
-                if (!empty($be) && preg_match('/' . $be . '/i', $com_email)) {
-                    $error_message .= _US_INVALIDMAIL . '<br>';
+                if (!empty($be) && preg_match('/'.$be.'/i', $com_email)) {
+                    $error_message .= _US_INVALIDMAIL.'<br>';
                     break;
                 }
             }
@@ -243,7 +243,7 @@ 
                 $dohtml = 0;
             }
         }
-        $p_comment =& $myts->previewTarea($_POST['com_text'], $dohtml, $dosmiley, $doxcode, $doimage, $dobr);
+        $p_comment = & $myts->previewTarea($_POST['com_text'], $dohtml, $dosmiley, $doxcode, $doimage, $dobr);
         $noname    = isset($noname) ? (int)$noname : 0;
         $com_text  = $myts->htmlSpecialChars($myts->stripSlashesGPC($_POST['com_text']));
         if ($xoopsModule->getVar('dirname') !== 'system') {
@@ -252,16 +252,16 @@ 
                 xoops_error($error_message);
             }
             echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
-                  <tr><td class="head">' . $com_title . '</td></tr>
-                  <tr><td><br>' . $p_comment . '<br></td></tr>
+                  <tr><td class="head">' . $com_title.'</td></tr>
+                  <tr><td><br>' . $p_comment.'<br></td></tr>
                   </table>';
             include_once $GLOBALS['xoops']->path('include/comment_form.php');
             include_once $GLOBALS['xoops']->path('footer.php');
         } else {
             xoops_cp_header();
             echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
-                  <tr><td class="head">' . $com_title . '</td></tr>
-                  <tr><td><br>' . $p_comment . '<br></td></tr>
+                  <tr><td class="head">' . $com_title.'</td></tr>
+                  <tr><td><br>' . $p_comment.'<br></td></tr>
                   </table>';
             include_once $GLOBALS['xoops']->path('include/comment_form.php');
             xoops_cp_footer();
@@ -320,7 +320,7 @@ 
                 $accesserror = true;
             }
             if (false !== $accesserror) {
-                redirect_header($redirect_page . '=' . $com_itemid . '&amp;com_id=' . $com_id . '&amp;com_mode=' . $com_mode . '&amp;com_order=' . $com_order, 1, _NOPERM);
+                redirect_header($redirect_page.'='.$com_itemid.'&amp;com_id='.$com_id.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order, 1, _NOPERM);
             }
         } else {
             $comment = $comment_handler->create();
@@ -368,7 +368,7 @@ 
                 $dohtml = 0;
                 $uid    = 0;
                 if ($xoopsModuleConfig['com_anonpost'] != 1) {
-                    redirect_header($redirect_page . '=' . $com_itemid . '&amp;com_id=' . $com_id . '&amp;com_mode=' . $com_mode . '&amp;com_order=' . $com_order, 1, _NOPERM);
+                    redirect_header($redirect_page.'='.$com_itemid.'&amp;com_id='.$com_id.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order, 1, _NOPERM);
                 }
             }
             if ($uid == 0) {
@@ -428,8 +428,8 @@ 
                 if (!function_exists($comment_config['callback']['approve'])) {
                     if (isset($comment_config['callbackFile'])) {
                         $callbackfile = trim($comment_config['callbackFile']);
-                        if ($callbackfile != '' && file_exists($GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
-                            include_once $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile);
+                        if ($callbackfile != '' && file_exists($GLOBALS['xoops']->path('modules/'.$moddir.'/'.$callbackfile))) {
+                            include_once $GLOBALS['xoops']->path('modules/'.$moddir.'/'.$callbackfile);
                         }
                         if (!function_exists($comment_config['callback']['approve'])) {
                             $skip = true;
@@ -449,8 +449,8 @@ 
                 if (!function_exists($comment_config['callback']['update'])) {
                     if (isset($comment_config['callbackFile'])) {
                         $callbackfile = trim($comment_config['callbackFile']);
-                        if ($callbackfile != '' && file_exists($GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
-                            include_once $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile);
+                        if ($callbackfile != '' && file_exists($GLOBALS['xoops']->path('modules/'.$moddir.'/'.$callbackfile))) {
+                            include_once $GLOBALS['xoops']->path('modules/'.$moddir.'/'.$callbackfile);
                         }
                         if (!function_exists($comment_config['callback']['update'])) {
                             $skip = true;
@@ -488,7 +488,7 @@ 
             if ($notify_event) {
                 $not_modid = $com_modid;
                 include_once $GLOBALS['xoops']->path('include/notification_functions.php');
-                $not_catinfo  =& notificationCommentCategoryInfo($not_modid);
+                $not_catinfo  = & notificationCommentCategoryInfo($not_modid);
                 $not_category = $not_catinfo['name'];
                 $not_itemid   = $com_itemid;
                 $not_event    = $notify_event;
@@ -501,21 +501,21 @@ 
                     $module_handler = xoops_getHandler('module');
                     $not_module     = $module_handler->get($not_modid);
                 } else {
-                    $not_module =& $xoopsModule;
+                    $not_module = & $xoopsModule;
                 }
                 if (!isset($comment_url)) {
-                    $com_config  =& $not_module->getInfo('comments');
-                    $comment_url = $com_config['pageName'] . '?';
+                    $com_config  = & $not_module->getInfo('comments');
+                    $comment_url = $com_config['pageName'].'?';
                     if (isset($com_config['extraParams']) && is_array($com_config['extraParams'])) {
                         $extra_params = '';
                         foreach ($com_config['extraParams'] as $extra_param) {
-                            $extra_params .= isset($_POST[$extra_param]) ? $extra_param . '=' . htmlspecialchars($_POST[$extra_param]) . '&amp;' : $extra_param . '=&amp;';
+                            $extra_params .= isset($_POST[$extra_param]) ? $extra_param.'='.htmlspecialchars($_POST[$extra_param]).'&amp;' : $extra_param.'=&amp;';
                         }
                         $comment_url .= $extra_params;
                     }
                     $comment_url .= $com_config['itemName'];
                 }
-                $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&amp;com_id=' . $newcid . '&amp;com_rootid=' . $com_rootid . '&amp;com_mode=' . $com_mode . '&amp;com_order=' . $com_order . '#comment' . $newcid;
+                $comment_tags['X_COMMENT_URL'] = XOOPS_URL.'/modules/'.$not_module->getVar('dirname').'/'.$comment_url.'='.$com_itemid.'&amp;com_id='.$newcid.'&amp;com_rootid='.$com_rootid.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order.'#comment'.$newcid;
                 /* @var  $notification_handler XoopsNotificationHandler */
                 $notification_handler          = xoops_getHandler('notification');
                 $notification_handler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
@@ -523,10 +523,10 @@ 
             if (!isset($comment_post_results)) {
                 // if the comment is active, redirect to posted comment
                 if ($comment->getVar('com_status') == XOOPS_COMMENT_ACTIVE) {
-                    redirect_header($redirect_page . '=' . $com_itemid . '&amp;com_id=' . $newcid . '&amp;com_rootid=' . $com_rootid . '&amp;com_mode=' . $com_mode . '&amp;com_order=' . $com_order . '#comment' . $newcid, 1, _CM_THANKSPOST);
+                    redirect_header($redirect_page.'='.$com_itemid.'&amp;com_id='.$newcid.'&amp;com_rootid='.$com_rootid.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order.'#comment'.$newcid, 1, _CM_THANKSPOST);
                 } else {
                     // not active, so redirect to top comment page
-                    redirect_header($redirect_page . '=' . $com_itemid . '&amp;com_mode=' . $com_mode . '&amp;com_order=' . $com_order . '#comment' . $newcid, 1, _CM_THANKSPOST);
+                    redirect_header($redirect_page.'='.$com_itemid.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order.'#comment'.$newcid, 1, _CM_THANKSPOST);
                 }
             }
         } else {
@@ -540,6 +540,6 @@ 
         }
         break;
     default:
-        redirect_header(XOOPS_URL . '/', 1, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        redirect_header(XOOPS_URL.'/', 1, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         break;
 }

htdocs/include/comment_view.php

Indentation +20 added lines, -20 removed lines

@@ -58,13 +58,13 @@ 
         }
         if ($com_order != XOOPS_COMMENT_OLD1ST) {
             $xoopsTpl->assign(array(
-                                  'comment_order' => XOOPS_COMMENT_NEW1ST,
-                                  'order_other'   => XOOPS_COMMENT_OLD1ST));
+                                    'comment_order' => XOOPS_COMMENT_NEW1ST,
+                                    'order_other'   => XOOPS_COMMENT_OLD1ST));
             $com_dborder = 'DESC';
         } else {
             $xoopsTpl->assign(array(
-                                  'comment_order' => XOOPS_COMMENT_OLD1ST,
-                                  'order_other'   => XOOPS_COMMENT_NEW1ST));
+                                    'comment_order' => XOOPS_COMMENT_OLD1ST,
+                                    'order_other'   => XOOPS_COMMENT_NEW1ST));
             $com_dborder = 'ASC';
         }
         // admins can view all comments and IPs, others can only view approved(active) comments
@@ -289,24 +289,24 @@ 
         // End add by voltan
 
         $xoopsTpl->assign(array(
-                              'commentsnav'        => $navbar,
-                              'editcomment_link'   => 'comment_edit.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra,
-                              'deletecomment_link' => 'comment_delete.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra,
-                              'replycomment_link'  => 'comment_reply.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra));
+                                'commentsnav'        => $navbar,
+                                'editcomment_link'   => 'comment_edit.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra,
+                                'deletecomment_link' => 'comment_delete.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra,
+                                'replycomment_link'  => 'comment_reply.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra));
 
         // assign some lang variables
         $xoopsTpl->assign(array(
-                              'lang_from'    => _CM_FROM,
-                              'lang_joined'  => _CM_JOINED,
-                              'lang_posts'   => _CM_POSTS,
-                              'lang_poster'  => _CM_POSTER,
-                              'lang_thread'  => _CM_THREAD,
-                              'lang_edit'    => _EDIT,
-                              'lang_delete'  => _DELETE,
-                              'lang_reply'   => _REPLY,
-                              'lang_subject' => _CM_REPLIES,
-                              'lang_posted'  => _CM_POSTED,
-                              'lang_updated' => _CM_UPDATED,
-                              'lang_notice'  => _CM_NOTICE));
+                                'lang_from'    => _CM_FROM,
+                                'lang_joined'  => _CM_JOINED,
+                                'lang_posts'   => _CM_POSTS,
+                                'lang_poster'  => _CM_POSTER,
+                                'lang_thread'  => _CM_THREAD,
+                                'lang_edit'    => _EDIT,
+                                'lang_delete'  => _DELETE,
+                                'lang_reply'   => _REPLY,
+                                'lang_subject' => _CM_REPLIES,
+                                'lang_posted'  => _CM_POSTED,
+                                'lang_updated' => _CM_UPDATED,
+                                'lang_notice'  => _CM_NOTICE));
     }
 }

Spacing +20 added lines, -20 removed lines

@@ -85,25 +85,25 @@ 
             $renderer->renderFlatView($admin_view);
         } elseif ($com_mode === 'thread') {
             // RMV-FIX... added extraParam stuff here
-            $comment_url = $comment_config['pageName'] . '?';
+            $comment_url = $comment_config['pageName'].'?';
             if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
                 $extra_params = '';
                 foreach ($comment_config['extraParams'] as $extra_param) {
                     // This page is included in the module hosting page -- param could be from anywhere
                     if (isset(${$extra_param})) {
-                        $extra_params .= $extra_param . '=' . ${$extra_param} . '&';
+                        $extra_params .= $extra_param.'='.${$extra_param}.'&';
                     } elseif (isset($_POST[$extra_param])) {
-                        $extra_params .= $extra_param . '=' . $_POST[$extra_param] . '&';
+                        $extra_params .= $extra_param.'='.$_POST[$extra_param].'&';
                     } elseif (isset($_GET[$extra_param])) {
-                        $extra_params .= $extra_param . '=' . $_GET[$extra_param] . '&';
+                        $extra_params .= $extra_param.'='.$_GET[$extra_param].'&';
                     } else {
-                        $extra_params .= $extra_param . '=&';
+                        $extra_params .= $extra_param.'=&';
                     }
                     //$extra_params .= isset(${$extra_param}) ? $extra_param .'='.${$extra_param}.'&' : $extra_param .'=&';
                 }
                 $comment_url .= $extra_params;
             }
-            $xoopsTpl->assign('comment_url', $comment_url . $comment_config['itemName'] . '=' . $com_itemid . '&com_mode=thread&com_order=' . $com_order);
+            $xoopsTpl->assign('comment_url', $comment_url.$comment_config['itemName'].'='.$com_itemid.'&com_mode=thread&com_order='.$com_order);
             if (!empty($com_id) && !empty($com_rootid) && ($com_id != $com_rootid)) {
                 // Show specific thread tree
                 $comments = $comment_handler->getThread($com_rootid, $com_id);
@@ -168,19 +168,19 @@ 
 
         unset($postcomment_link);
         if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
-            $postcomment_link = 'comment_new.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode;
+            $postcomment_link = 'comment_new.php?com_itemid='.$com_itemid.'&com_order='.$com_order.'&com_mode='.$com_mode;
 
             $xoopsTpl->assign('anon_canpost', true); // to main template
         }
 
         $commentBarHidden = '';
-        $commentBarHidden .= '<input type="hidden" name="' . $comment_config['itemName']
-            . '" value="' . $com_itemid . '" />';
+        $commentBarHidden .= '<input type="hidden" name="'.$comment_config['itemName']
+            . '" value="'.$com_itemid.'" />';
         $link_extra = '';
         if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
             foreach ($comment_config['extraParams'] as $extra_param) {
                 if (isset(${$extra_param})) {
-                    $link_extra .= '&amp;' . $extra_param . '=' . ${$extra_param};
+                    $link_extra .= '&amp;'.$extra_param.'='.${$extra_param};
                     $hidden_value    = htmlspecialchars(${$extra_param}, ENT_QUOTES);
                     $extra_param_val = ${$extra_param};
                 } elseif (isset($_POST[$extra_param])) {
@@ -189,9 +189,9 @@ 
                     $extra_param_val = $_GET[$extra_param];
                 }
                 if (isset($extra_param_val)) {
-                    $link_extra .= '&amp;' . $extra_param . '=' . $extra_param_val;
+                    $link_extra .= '&amp;'.$extra_param.'='.$extra_param_val;
                     $hidden_value = htmlspecialchars($extra_param_val, ENT_QUOTES);
-                    $commentBarHidden .= '<input type="hidden" name="' . $extra_param . '" value="' . $hidden_value . '" />';
+                    $commentBarHidden .= '<input type="hidden" name="'.$extra_param.'" value="'.$hidden_value.'" />';
                 }
             }
         }
@@ -199,7 +199,7 @@ 
         $commentPostButton = false;
         if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
             $commentPostButton = new XoopsFormButton('', 'com_post', _CM_POSTCOMMENT, 'button');
-            $commentPostButton->setExtra(' onclick="self.location.href=\'' . $postcomment_link . $link_extra . '\'"');
+            $commentPostButton->setExtra(' onclick="self.location.href=\''.$postcomment_link.$link_extra.'\'"');
         }
         $commentTpl->assign('commentPostButton', $commentPostButton);
         $commentTpl->assign('commentPostHidden', $commentBarHidden);
@@ -207,14 +207,14 @@ 
         $navbar = $commentTpl->fetch('db:system_comments_controls.tpl');
 
         if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
-            if (file_exists($GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/comment_fast.php'))) {
-                include_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/comment_fast.php');
+            if (file_exists($GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/comment_fast.php'))) {
+                include_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/comment_fast.php');
             }
             if (isset($com_replytitle)) {
                 $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 = '';
@@ -290,9 +290,9 @@ 
 
         $xoopsTpl->assign(array(
                               'commentsnav'        => $navbar,
-                              'editcomment_link'   => 'comment_edit.php?com_itemid=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode . '' . $link_extra,
-                              'deletecomment_link' => 'comment_delete.php?com_itemid=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode . '' . $link_extra,
-                              'replycomment_link'  => 'comment_reply.php?com_itemid=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode . '' . $link_extra));
+                              'editcomment_link'   => 'comment_edit.php?com_itemid='.$com_itemid.'&amp;com_order='.$com_order.'&amp;com_mode='.$com_mode.''.$link_extra,
+                              'deletecomment_link' => 'comment_delete.php?com_itemid='.$com_itemid.'&amp;com_order='.$com_order.'&amp;com_mode='.$com_mode.''.$link_extra,
+                              'replycomment_link'  => 'comment_reply.php?com_itemid='.$com_itemid.'&amp;com_order='.$com_order.'&amp;com_mode='.$com_mode.''.$link_extra));
 
         // assign some lang variables
         $xoopsTpl->assign(array(

htdocs/include/functions.legacy.php

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
 // Backward compatibility for 2.2*
 function xoops_load_lang_file($name, $module = '', $default = 'english')
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated, use xoops_loadLanguage() instead');
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated, use xoops_loadLanguage() instead');
 
     return xoops_loadLanguage($name, $module);
 }
@@ -40,7 +40,7 @@ 
  */
 function xoops_refcheck($docheck = 1)
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated, use xoopsSecurity::checkReferer instead');
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated, use xoopsSecurity::checkReferer instead');
 
     return $GLOBALS['xoopsSecurity']->checkReferer($docheck);
 }
@@ -52,7 +52,7 @@ 
  */
 function xoops_getLinkedUnameFromId($userid)
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated, use XoopsUserUtility::getUnameFromId() instead');
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated, use XoopsUserUtility::getUnameFromId() instead');
     xoops_load('XoopsUserUtility');
 
     return XoopsUserUtility::getUnameFromId($userid, false, true);
@@ -63,7 +63,7 @@ 
  */
 function showbanner()
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated, use xoops_getbanner instead');
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated, use xoops_getbanner instead');
     echo xoops_getbanner();
 }
 
@@ -72,7 +72,7 @@ 
  */
 function getTheme()
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . "() is deprecated, use \$xoopsConfig['theme_set'] directly");
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__."() is deprecated, use \$xoopsConfig['theme_set'] directly");
 
     return $GLOBALS['xoopsConfig']['theme_set'];
 }
@@ -88,7 +88,7 @@ 
  */
 function getcss($theme = '')
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated, use xoops_getcss instead');
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated, use xoops_getcss instead');
 
     return xoops_getcss($theme);
 }
@@ -98,8 +98,8 @@ 
  */
 function &getMailer()
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated, use xoops_getMailer instead');
-    $mailer =& xoops_getMailer();
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated, use xoops_getMailer instead');
+    $mailer = & xoops_getMailer();
 
     return $mailer;
 }
@@ -109,11 +109,11 @@ 
  */
 function OpenWaitBox()
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated');
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated');
     echo "<div id='waitDiv' style='position:absolute;left:40%;top:50%;visibility:hidden;text-align: center;'>
     <table cellpadding='6' border='2' class='bg2'>
       <tr>
-        <td align='center'><strong><big>" . _FETCHING . "</big></strong><br><img src='" . XOOPS_URL . "/images/await.gif' alt='' /><br>" . _PLEASEWAIT . "</td>
+        <td align='center'><strong><big>" . _FETCHING."</big></strong><br><img src='".XOOPS_URL."/images/await.gif' alt='' /><br>"._PLEASEWAIT."</td>
       </tr>
     </table>
     </div>
@@ -154,7 +154,7 @@ 
 
 function CloseWaitBox()
 {
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . '() is deprecated');
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.'() is deprecated');
     echo "<script type='text/javascript'>
     <!--//
     ap_showWaitMessage('waitDiv', 0);

htdocs/include/comment_delete.php

Spacing +19 added lines, -19 removed lines

@@ -49,7 +49,7 @@ 
     $module          = $module_handler->get($comment->getVar('com_modid'));
     $comment_config  = $module->getInfo('comments');
     $com_modid       = $module->getVar('mid');
-    $redirect_page   = XOOPS_URL . '/modules/system/admin.php?fct=comments&com_modid=' . $com_modid . '&com_itemid';
+    $redirect_page   = XOOPS_URL.'/modules/system/admin.php?fct=comments&com_modid='.$com_modid.'&com_itemid';
     $moddir          = $module->getVar('dirname');
     unset($comment);
 } else {
@@ -58,18 +58,18 @@ 
     }
     $comment_config        = $xoopsModule->getInfo('comments');
     $com_modid             = $xoopsModule->getVar('mid');
-    $redirect_page         = $comment_config['pageName'] . '?';
+    $redirect_page         = $comment_config['pageName'].'?';
     $comment_confirm_extra = array();
     if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
         foreach ($comment_config['extraParams'] as $extra_param) {
             if (isset(${$extra_param})) {
-                $redirect_page .= $extra_param . '=' . ${$extra_param} . '&';
+                $redirect_page .= $extra_param.'='.${$extra_param}.'&';
 
                 // for the confirmation page
                 $comment_confirm_extra[$extra_param] = ${$extra_param};
             } elseif (isset($_GET[$extra_param])) {
                 //                $redirect_page .= $extra_param . '=' . $_GET[$extra_param] . '&';
-                $redirect_page .= $extra_param . '=' . filter_input(INPUT_GET, $extra_param, FILTER_SANITIZE_STRING) . '&';
+                $redirect_page .= $extra_param.'='.filter_input(INPUT_GET, $extra_param, FILTER_SANITIZE_STRING).'&';
 
                 // for the confirmation page
                 //                $comment_confirm_extra[$extra_param] = $_GET[$extra_param];
@@ -100,7 +100,7 @@ 
     if ($ref != '') {
         redirect_header($ref, 2, _NOPERM);
     } else {
-        redirect_header($redirect_page . '?' . $comment_config['itemName'] . '=' . (int)$com_itemid, 2, _NOPERM);
+        redirect_header($redirect_page.'?'.$comment_config['itemName'].'='.(int)$com_itemid, 2, _NOPERM);
     }
     exit();
 }
@@ -113,7 +113,7 @@ 
         $comment         = $comment_handler->get($com_id);
         if (!$comment_handler->delete($comment)) {
             include_once $GLOBALS['xoops']->path('header.php');
-            xoops_error(_CM_COMDELETENG . ' (ID: ' . $comment->getVar('com_id') . ')');
+            xoops_error(_CM_COMDELETENG.' (ID: '.$comment->getVar('com_id').')');
             include_once $GLOBALS['xoops']->path('footer');
             exit();
         }
@@ -125,7 +125,7 @@ 
             if (!function_exists($comment_config['callback']['update'])) {
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != '' && file_exists($file = $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
+                    if ($callbackfile != '' && file_exists($file = $GLOBALS['xoops']->path('modules/'.$moddir.'/'.$callbackfile))) {
                         include_once $file;
                     }
                     if (!function_exists($comment_config['callback']['update'])) {
@@ -155,10 +155,10 @@ 
         }
 
         // get all comments posted later within the same thread
-        $thread_comments =& $comment_handler->getThread($comment->getVar('com_rootid'), $com_id);
+        $thread_comments = & $comment_handler->getThread($comment->getVar('com_rootid'), $com_id);
         include_once $GLOBALS['xoops']->path('class/tree.php');
         $xot            = new XoopsObjectTree($thread_comments, 'com_id', 'com_pid', 'com_rootid');
-        $child_comments =& $xot->getFirstChild($com_id);
+        $child_comments = & $xot->getFirstChild($com_id);
         // now set new parent ID for direct child comments
         $new_pid = $comment->getVar('com_pid');
         $errs    = array();
@@ -169,7 +169,7 @@ 
                 $new_rootid = $child_comments[$i]->getVar('com_id');
                 $child_comments[$i]->setVar('com_rootid', $child_comments[$i]->getVar('com_id'));
                 if (!$comment_handler->insert($child_comments[$i])) {
-                    $errs[] = 'Could not change comment parent ID from <strong>' . $com_id . '</strong> to <strong>' . $new_pid . '</strong>. (ID: ' . $new_rootid . ')';
+                    $errs[] = 'Could not change comment parent ID from <strong>'.$com_id.'</strong> to <strong>'.$new_pid.'</strong>. (ID: '.$new_rootid.')';
                 } else {
                     // need to change root id for all its child comments as well
                     $c_child_comments = &$xot->getAllChild($new_rootid);
@@ -177,13 +177,13 @@ 
                     foreach (array_keys($c_child_comments) as $j) {
                         $c_child_comments[$j]->setVar('com_rootid', $new_rootid);
                         if (!$comment_handler->insert($c_child_comments[$j])) {
-                            $errs[] = 'Could not change comment root ID from <strong>' . $com_id . '</strong> to <strong>' . $new_rootid . '</strong>.';
+                            $errs[] = 'Could not change comment root ID from <strong>'.$com_id.'</strong> to <strong>'.$new_rootid.'</strong>.';
                         }
                     }
                 }
             } else {
                 if (!$comment_handler->insert($child_comments[$i])) {
-                    $errs[] = 'Could not change comment parent ID from <strong>' . $com_id . '</strong> to <strong>' . $new_pid . '</strong>.';
+                    $errs[] = 'Could not change comment parent ID from <strong>'.$com_id.'</strong> to <strong>'.$new_pid.'</strong>.';
                 }
             }
         }
@@ -193,7 +193,7 @@ 
             include_once $GLOBALS['xoops']->path('footer.php');
             exit();
         }
-        redirect_header($redirect_page . '=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode, 1, _CM_COMDELETED);
+        redirect_header($redirect_page.'='.$com_itemid.'&amp;com_order='.$com_order.'&amp;com_mode='.$com_mode, 1, _CM_COMDELETED);
         break;
 
     case 'delete_all':
@@ -203,12 +203,12 @@ 
         $com_rootid      = $comment->getVar('com_rootid');
 
         // get all comments posted later within the same thread
-        $thread_comments =& $comment_handler->getThread($com_rootid, $com_id);
+        $thread_comments = & $comment_handler->getThread($com_rootid, $com_id);
 
         // construct a comment tree
         include_once $GLOBALS['xoops']->path('class/tree.php');
         $xot            = new XoopsObjectTree($thread_comments, 'com_id', 'com_pid', 'com_rootid');
-        $child_comments =& $xot->getAllChild($com_id);
+        $child_comments = & $xot->getAllChild($com_id);
         // add itself here
         $child_comments[$com_id] = &$comment;
         $msgs                    = array();
@@ -217,9 +217,9 @@ 
         $member_handler          = xoops_getHandler('member');
         foreach (array_keys($child_comments) as $i) {
             if (!$comment_handler->delete($child_comments[$i])) {
-                $msgs[] = _CM_COMDELETENG . ' (ID: ' . $child_comments[$i]->getVar('com_id') . ')';
+                $msgs[] = _CM_COMDELETENG.' (ID: '.$child_comments[$i]->getVar('com_id').')';
             } else {
-                $msgs[] = _CM_COMDELETED . ' (ID: ' . $child_comments[$i]->getVar('com_id') . ')';
+                $msgs[] = _CM_COMDELETED.' (ID: '.$child_comments[$i]->getVar('com_id').')';
                 // store poster ID and deleted post number into array for later use
                 $poster_id = $child_comments[$i]->getVar('com_uid');
                 if ($poster_id > 0) {
@@ -242,7 +242,7 @@ 
             if (!function_exists($comment_config['callback']['update'])) {
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != '' && file_exists($file = $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
+                    if ($callbackfile != '' && file_exists($file = $GLOBALS['xoops']->path('modules/'.$moddir.'/'.$callbackfile))) {
                         include_once $file;
                     }
                     if (!function_exists($comment_config['callback']['update'])) {
@@ -262,7 +262,7 @@ 
         }
         include_once $GLOBALS['xoops']->path('header.php');
         xoops_result($msgs);
-        echo '<br><a href="' . $redirect_page . '=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode . '">' . _BACK . '</a>';
+        echo '<br><a href="'.$redirect_page.'='.$com_itemid.'&amp;com_order='.$com_order.'&amp;com_mode='.$com_mode.'">'._BACK.'</a>';
         include_once $GLOBALS['xoops']->path('footer.php');
         break;
 

htdocs/include/old_functions.php

Spacing +28 added lines, -28 removed lines

@@ -18,7 +18,7 @@ 
  */
 defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
-trigger_error('Functions in ' . __FILE__ . ' are deprecated, should not be used any more', E_USER_WARNING);
+trigger_error('Functions in '.__FILE__.' are deprecated, should not be used any more', E_USER_WARNING);
 // #################### Block functions from here ##################
 /*
  * Purpose : Builds the blocks on both sides
@@ -54,7 +54,7 @@ 
         include_once $GLOBALS['xoops']->path('class/template.php');
         $xoopsTpl = new XoopsTpl();
     } else {
-        $xoopsTpl =& $GLOBALS['xoopsTpl'];
+        $xoopsTpl = & $GLOBALS['xoopsTpl'];
     }
     $xoopsLogger = XoopsLogger::getInstance();
     for ($i = 0; $i < $block_count; ++$i) {
@@ -67,33 +67,33 @@ 
         }
         $btpl = $block_arr[$i]->getVar('template');
         if ($btpl != '') {
-            if (empty($bcachetime) || !$xoopsTpl->is_cached('db:' . $btpl)) {
+            if (empty($bcachetime) || !$xoopsTpl->is_cached('db:'.$btpl)) {
                 $xoopsLogger->addBlock($block_arr[$i]->getVar('name'));
-                $bresult =& $block_arr[$i]->buildBlock();
+                $bresult = & $block_arr[$i]->buildBlock();
                 if (!$bresult) {
                     continue;
                 }
                 $xoopsTpl->assign_by_ref('block', $bresult);
-                $bcontent =& $xoopsTpl->fetch('db:' . $btpl);
+                $bcontent = & $xoopsTpl->fetch('db:'.$btpl);
                 $xoopsTpl->clear_assign('block');
             } else {
                 $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
-                $bcontent =& $xoopsTpl->fetch('db:' . $btpl);
+                $bcontent = & $xoopsTpl->fetch('db:'.$btpl);
             }
         } else {
             $bid = $block_arr[$i]->getVar('bid');
-            if (empty($bcachetime) || !$xoopsTpl->is_cached('db:system_dummy.tpl', 'blk_' . $bid)) {
+            if (empty($bcachetime) || !$xoopsTpl->is_cached('db:system_dummy.tpl', 'blk_'.$bid)) {
                 $xoopsLogger->addBlock($block_arr[$i]->getVar('name'));
                 $bresult = &$block_arr[$i]->buildBlock();
                 if (!$bresult) {
                     continue;
                 }
                 $xoopsTpl->assign_by_ref('dummy_content', $bresult['content']);
-                $bcontent =& $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_' . $bid);
+                $bcontent = & $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_'.$bid);
                 $xoopsTpl->clear_assign('block');
             } else {
                 $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
-                $bcontent =& $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_' . $bid);
+                $bcontent = & $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_'.$bid);
             }
         }
         switch ($block_arr[$i]->getVar('side')) {
@@ -126,7 +126,7 @@ 
             include_once $GLOBALS['xoops']->path('class/template.php');
             $xoopsTpl = new XoopsTpl();
         } else {
-            $xoopsTpl =& $GLOBALS['xoopsTpl'];
+            $xoopsTpl = & $GLOBALS['xoopsTpl'];
         }
         if (is_object($xoopsUser)) {
             $block_arr = $xoopsblock->getAllBlocksByGroup($xoopsUser->getGroups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
@@ -145,56 +145,56 @@ 
             }
             $btpl = $block_arr[$i]->getVar('template');
             if ($btpl != '') {
-                if (empty($bcachetime) || !$xoopsTpl->is_cached('db:' . $btpl)) {
+                if (empty($bcachetime) || !$xoopsTpl->is_cached('db:'.$btpl)) {
                     $xoopsLogger->addBlock($block_arr[$i]->getVar('name'));
-                    $bresult =& $block_arr[$i]->buildBlock();
+                    $bresult = & $block_arr[$i]->buildBlock();
                     if (!$bresult) {
                         continue;
                     }
                     $xoopsTpl->assign_by_ref('block', $bresult);
-                    $bcontent =& $xoopsTpl->fetch('db:' . $btpl);
+                    $bcontent = & $xoopsTpl->fetch('db:'.$btpl);
                     $xoopsTpl->clear_assign('block');
                 } else {
                     $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
-                    $bcontent =& $xoopsTpl->fetch('db:' . $btpl);
+                    $bcontent = & $xoopsTpl->fetch('db:'.$btpl);
                 }
             } else {
                 $bid = $block_arr[$i]->getVar('bid');
-                if (empty($bcachetime) || !$xoopsTpl->is_cached('db:system_dummy.tpl', 'blk_' . $bid)) {
+                if (empty($bcachetime) || !$xoopsTpl->is_cached('db:system_dummy.tpl', 'blk_'.$bid)) {
                     $xoopsLogger->addBlock($block_arr[$i]->getVar('name'));
-                    $bresult =& $block_arr[$i]->buildBlock();
+                    $bresult = & $block_arr[$i]->buildBlock();
                     if (!$bresult) {
                         continue;
                     }
                     $xoopsTpl->assign_by_ref('dummy_content', $bresult['content']);
-                    $bcontent =& $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_' . $bid);
+                    $bcontent = & $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_'.$bid);
                     $xoopsTpl->clear_assign('block');
                 } else {
                     $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
-                    $bcontent =& $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_' . $bid);
+                    $bcontent = & $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_'.$bid);
                 }
             }
             $title = $block_arr[$i]->getVar('title');
             switch ($block_arr[$i]->getVar('side')) {
                 case XOOPS_CENTERBLOCK_CENTER:
                     if ($title != '') {
-                        $cc_block .= '<tr valign="top"><td colspan="2"><strong>' . $title . '</strong><hr />' . $bcontent . '<br><br></td></tr>' . "\n";
+                        $cc_block .= '<tr valign="top"><td colspan="2"><strong>'.$title.'</strong><hr />'.$bcontent.'<br><br></td></tr>'."\n";
                     } else {
-                        $cc_block .= '<tr><td colspan="2">' . $bcontent . '<br><br></td></tr>' . "\n";
+                        $cc_block .= '<tr><td colspan="2">'.$bcontent.'<br><br></td></tr>'."\n";
                     }
                     break;
                 case XOOPS_CENTERBLOCK_LEFT:
                     if ($title != '') {
-                        $cl_block .= '<p><strong>' . $title . '</strong><hr />' . $bcontent . '</p>' . "\n";
+                        $cl_block .= '<p><strong>'.$title.'</strong><hr />'.$bcontent.'</p>'."\n";
                     } else {
-                        $cl_block .= '<p>' . $bcontent . '</p>' . "\n";
+                        $cl_block .= '<p>'.$bcontent.'</p>'."\n";
                     }
                     break;
                 case XOOPS_CENTERBLOCK_RIGHT:
                     if ($title != '') {
-                        $cr_block .= '<p><strong>' . $title . '</strong><hr />' . $bcontent . '</p>' . "\n";
+                        $cr_block .= '<p><strong>'.$title.'</strong><hr />'.$bcontent.'</p>'."\n";
                     } else {
-                        $cr_block .= '<p>' . $bcontent . '</p>' . "\n";
+                        $cr_block .= '<p>'.$bcontent.'</p>'."\n";
                     }
                     break;
                 default:
@@ -202,7 +202,7 @@ 
             }
             unset($bcontent, $title);
         }
-        echo '<table width="100%">' . $cc_block . '<tr valign="top"><td width="50%">' . $cl_block . '</td><td width="50%">' . $cr_block . '</td></tr></table>' . "\n";
+        echo '<table width="100%">'.$cc_block.'<tr valign="top"><td width="50%">'.$cl_block.'</td><td width="50%">'.$cr_block.'</td></tr></table>'."\n";
     }
 }
 
@@ -213,7 +213,7 @@ 
  */
 function openThread($width = '100%')
 {
-    echo "<table border='0' cellpadding='0' cellspacing='0' align='center' width='$width'><tr><td class='bg2'><table border='0' cellpadding='4' cellspacing='1' width='100%'><tr class='bg3' align='left'><td class='bg3' width='20%'>" . _CM_POSTER . "</td><td class='bg3'>" . _CM_THREAD . '</td></tr>';
+    echo "<table border='0' cellpadding='0' cellspacing='0' align='center' width='$width'><tr><td class='bg2'><table border='0' cellpadding='4' cellspacing='1' width='100%'><tr class='bg3' align='left'><td class='bg3' width='20%'>"._CM_POSTER."</td><td class='bg3'>"._CM_THREAD.'</td></tr>';
 }
 
 /**
@@ -252,9 +252,9 @@ 
         $bg = 'bg1';
     }
     echo "<tr align='left'><td valign='top' class='$bg' nowrap='nowrap'><strong>$username</strong><br>$rank_title<br>$rank_image<br>$avatar_image<br><br>$reg_date<br>$posts<br>$user_from<br><br>$online_image</td>";
-    echo "<td valign='top' class='$bg'><table width='100%' border='0'><tr><td valign='top'>$subject_image&nbsp;<strong>$subject</strong></td><td align='right'>" . $ip_image . '' . $reply_image . '' . $edit_image . '' . $delete_image . '</td></tr>';
+    echo "<td valign='top' class='$bg'><table width='100%' border='0'><tr><td valign='top'>$subject_image&nbsp;<strong>$subject</strong></td><td align='right'>".$ip_image.''.$reply_image.''.$edit_image.''.$delete_image.'</td></tr>';
     echo "<tr><td colspan='2'><p>$text</p></td></tr></table></td></tr>";
-    echo "<tr align='left'><td class='$bg' valign='middle'>$post_date</td><td class='$bg' valign='middle'>" . $profile_image . '' . $pm_image . '' . $email_image . '' . $www_image . '' . $icq_image . '' . $aim_image . '' . $yim_image . '' . $msnm_image . '</td></tr>';
+    echo "<tr align='left'><td class='$bg' valign='middle'>$post_date</td><td class='$bg' valign='middle'>".$profile_image.''.$pm_image.''.$email_image.''.$www_image.''.$icq_image.''.$aim_image.''.$yim_image.''.$msnm_image.'</td></tr>';
 }
 
 /**

htdocs/include/defines.php

Spacing +10 added lines, -10 removed lines

@@ -43,19 +43,19 @@
 define('XOOPS_MATCH_EQUAL', 2);
 define('XOOPS_MATCH_CONTAIN', 3);
 // YOU SHOULD AVOID USING THE FOLLOWING CONSTANTS, THEY WILL BE REMOVED
-define('XOOPS_THEME_PATH', XOOPS_ROOT_PATH . '/themes');
-define('XOOPS_ADMINTHEME_PATH', XOOPS_ROOT_PATH . '/modules/system/themes');
-define('XOOPS_UPLOAD_PATH', XOOPS_ROOT_PATH . '/uploads');
-define('XOOPS_LIBRARY_PATH', XOOPS_ROOT_PATH . '/libraries');
-define('XOOPS_THEME_URL', XOOPS_URL . '/themes');
-define('XOOPS_ADMINTHEME_URL', XOOPS_URL . '/modules/system/themes');
-define('XOOPS_UPLOAD_URL', XOOPS_URL . '/uploads');
-define('XOOPS_LIBRARY_URL', XOOPS_URL . '/libraries');
+define('XOOPS_THEME_PATH', XOOPS_ROOT_PATH.'/themes');
+define('XOOPS_ADMINTHEME_PATH', XOOPS_ROOT_PATH.'/modules/system/themes');
+define('XOOPS_UPLOAD_PATH', XOOPS_ROOT_PATH.'/uploads');
+define('XOOPS_LIBRARY_PATH', XOOPS_ROOT_PATH.'/libraries');
+define('XOOPS_THEME_URL', XOOPS_URL.'/themes');
+define('XOOPS_ADMINTHEME_URL', XOOPS_URL.'/modules/system/themes');
+define('XOOPS_UPLOAD_URL', XOOPS_URL.'/uploads');
+define('XOOPS_LIBRARY_URL', XOOPS_URL.'/libraries');
 
 // ----- BEGIN: Deprecated, move to template class -----
 // define('SMARTY_DIR', XOOPS_ROOT_PATH . '/class/smarty/');
-define('XOOPS_COMPILE_PATH', XOOPS_VAR_PATH . '/caches/smarty_compile');
-define('XOOPS_CACHE_PATH', XOOPS_VAR_PATH . '/caches/xoops_cache');
+define('XOOPS_COMPILE_PATH', XOOPS_VAR_PATH.'/caches/smarty_compile');
+define('XOOPS_CACHE_PATH', XOOPS_VAR_PATH.'/caches/xoops_cache');
 // ----- END: Deprecated, move to template class -----
 
 if (!defined('XOOPS_XMLRPC')) {

htdocs/include/commentform.inc.php

Spacing +3 added lines, -3 removed lines

@@ -25,15 +25,15 @@
 include $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
 $cform = new XoopsThemeForm(_CM_POSTCOMMENT, 'commentform', 'postcomment.php', 'post', true);
-if (!preg_match('/^' . _RE . '/i', $subject)) {
-    $subject = _RE . ' ' . xoops_substr($subject, 0, 56);
+if (!preg_match('/^'._RE.'/i', $subject)) {
+    $subject = _RE.' '.xoops_substr($subject, 0, 56);
 }
 
 $cform->addElement(new XoopsFormText(_CM_TITLE, 'subject', 50, 255, $subject), true);
 $icons_radio   = new XoopsFormRadio(_MESSAGEICON, 'icon', $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);
 $cform->addElement(new XoopsFormDhtmlTextArea(_CM_MESSAGE, 'message', $message, 10, 50), true);

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;
     }