XOOPS / XoopsCore

htdocs/modules/comments/preloads/preload.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
     {
         $path = dirname(__DIR__);
         XoopsLoad::addMap(array(
-            'comments'                => $path . '/class/helper.php',
-            'commentscommentrenderer' => $path . '/class/commentrenderer.php'
+            'comments'                => $path.'/class/helper.php',
+            'commentscommentrenderer' => $path.'/class/commentrenderer.php'
         ));
     }
 

htdocs/modules/comments/language/english/main.php

Spacing +3 added lines, -3 removed lines

@@ -55,6 +55,6 @@
 define('_MD_COMMENTS_COMNOCOM', 'Disable comments');
 
 //For uninstall
-define("_MD_COMMENTS_DELETE","Deleting comments...");
-define("_MD_COMMENTS_DELETE_ERROR","ERROR: Could not delete comments");
-define("_MD_COMMENTS_DELETED","Comments deleted");
+define("_MD_COMMENTS_DELETE", "Deleting comments...");
+define("_MD_COMMENTS_DELETE_ERROR", "ERROR: Could not delete comments");
+define("_MD_COMMENTS_DELETED", "Comments deleted");

htdocs/modules/comments/language/english/admin.php

Spacing +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
 //define("_AM_COMMENTS_MODULE_ADMIN","Modules Administration");
 
 // Tips
-define("_AM_COMMENTS_NAV_TIPS","
+define("_AM_COMMENTS_NAV_TIPS", "
 <ul>
 <li>Manage comments for all your modules.</li>
 <li>Delete comments easily with the purge.</li>
@@ -33,28 +33,28 @@ 
 
 // Form
 //define("_AM_COMMENTS_FORM_LIST_COMMENTS","List Comments");
-define("_AM_COMMENTS_FORM_ALL_MODS","All modules");
-define("_AM_COMMENTS_FORM_ALL_STATUS","Any status");
+define("_AM_COMMENTS_FORM_ALL_MODS", "All modules");
+define("_AM_COMMENTS_FORM_ALL_STATUS", "Any status");
 
-define("_AM_COMMENTS_FORM_PURGE","Purge");
-define("_AM_COMMENTS_FORM_PURGE_DATE_AFTER","After this date (leave empty for any date)");
-define("_AM_COMMENTS_FORM_PURGE_DATE_BEFORE","Before this date (leave empty for any date)");
-define("_AM_COMMENTS_FORM_PURGE_GROUPS","Groups");
-define("_AM_COMMENTS_FORM_PURGE_USER","User name");
-define("_AM_COMMENTS_FORM_PURGE_STATUS","Status");
-define("_AM_COMMENTS_FORM_PURGE_MODULES","Modules");
+define("_AM_COMMENTS_FORM_PURGE", "Purge");
+define("_AM_COMMENTS_FORM_PURGE_DATE_AFTER", "After this date (leave empty for any date)");
+define("_AM_COMMENTS_FORM_PURGE_DATE_BEFORE", "Before this date (leave empty for any date)");
+define("_AM_COMMENTS_FORM_PURGE_GROUPS", "Groups");
+define("_AM_COMMENTS_FORM_PURGE_USER", "User name");
+define("_AM_COMMENTS_FORM_PURGE_STATUS", "Status");
+define("_AM_COMMENTS_FORM_PURGE_MODULES", "Modules");
 
 // Tab
-define("_AM_COMMENTS_TITLE","Title");
-define("_AM_COMMENTS_POSTED","Author");
-define("_AM_COMMENTS_IP","IP");
-define("_AM_COMMENTS_MODULE","Module");
-define("_AM_COMMENTS_STATUS","Status");
-define("_AM_COMMENTS_ACTION","Action");
-define("_AM_COMMENTS_VIEW","See comment");
-
-define("_AM_COMMENTS_NO_COMMENTS","No comments");
+define("_AM_COMMENTS_TITLE", "Title");
+define("_AM_COMMENTS_POSTED", "Author");
+define("_AM_COMMENTS_IP", "IP");
+define("_AM_COMMENTS_MODULE", "Module");
+define("_AM_COMMENTS_STATUS", "Status");
+define("_AM_COMMENTS_ACTION", "Action");
+define("_AM_COMMENTS_VIEW", "See comment");
+
+define("_AM_COMMENTS_NO_COMMENTS", "No comments");
 //define("_AM_COMMENTS_COMMENTS_FOUND","%s comment(s) found.");
 
 //since 2.6
-define("_AM_COMMENTS_DELETE_LIMIT","Sorry, you can delete only 4000 comments at a time.");
+define("_AM_COMMENTS_DELETE_LIMIT", "Sorry, you can delete only 4000 comments at a time.");

htdocs/modules/comments/comment_edit.php

Spacing +1 added lines, -1 removed lines

@@ -18,5 +18,5 @@
  * @version         $Id$
  */
 
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
 Comments::getInstance()->displayEdit();

htdocs/modules/comments/blocks/comments_blocks.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
     $moduleperm_handler = $xoops->getHandlerGroupPermission();
     $gperm_groupid = $xoops->getUserGroups();
     $criteria1 = new CriteriaCompo(new Criteria('gperm_name', 'module_read', '='));
-    $criteria1->add(new Criteria('gperm_groupid', '(' . implode(',', $gperm_groupid) . ')', 'IN'));
+    $criteria1->add(new Criteria('gperm_groupid', '('.implode(',', $gperm_groupid).')', 'IN'));
     $perms = $moduleperm_handler->getObjects($criteria1, true);
     $modIds = array();
     foreach ($perms as $item) {
@@ -47,7 +47,7 @@ 
     }
     if (count($modIds) > 0) {
         $modIds = array_unique($modIds);
-        $criteria->add(new Criteria('modid', '(' . implode(',', $modIds) . ')', 'IN'));
+        $criteria->add(new Criteria('modid', '('.implode(',', $modIds).')', 'IN'));
     } else {
         return $block;
     }
@@ -55,23 +55,23 @@ 
     $comments = $comment_handler->getObjects($criteria, true);
     $member_handler = $xoops->getHandlerMember();
     $module_handler = $xoops->getHandlerModule();
-    $modules = $module_handler->getObjectsArray(new Criteria('dirname', "('" . implode("','", array_keys($available_modules)) ."')", 'IN'), true);
+    $modules = $module_handler->getObjectsArray(new Criteria('dirname', "('".implode("','", array_keys($available_modules))."')", 'IN'), true);
     $comment_config = array();
     foreach (array_keys($comments) as $i) {
         $mid = $comments[$i]->getVar('modid');
-        $com['module'] = '<a href="' . \XoopsBaseConfig::get('url') . '/modules/' . $modules[$mid]->getVar('dirname') . '/">' . $modules[$mid]->getVar('name') . '</a>';
+        $com['module'] = '<a href="'.\XoopsBaseConfig::get('url').'/modules/'.$modules[$mid]->getVar('dirname').'/">'.$modules[$mid]->getVar('name').'</a>';
         if (!isset($comment_config[$mid])) {
             $comment_config[$mid] = \Xoops\Module\Plugin::getPlugin($modules[$mid]->getVar('dirname'), 'comments');
         }
         $com['id'] = $i;
-        $com['title'] = '<a href="' . \XoopsBaseConfig::get('url') . '/modules/' . $modules[$mid]->getVar('dirname') . '/' . $comment_config[$mid]->pageName() . '?' . $comment_config[$mid]->itemName() . '=' . $comments[$i]->getVar('itemid') . '&amp;com_id=' . $i . '&amp;com_rootid=' . $comments[$i]->getVar('rootid') . '&amp;' . htmlspecialchars($comments[$i]->getVar('exparams')) . '#comment' . $i . '">' . $comments[$i]->getVar('title') . '</a>';
+        $com['title'] = '<a href="'.\XoopsBaseConfig::get('url').'/modules/'.$modules[$mid]->getVar('dirname').'/'.$comment_config[$mid]->pageName().'?'.$comment_config[$mid]->itemName().'='.$comments[$i]->getVar('itemid').'&amp;com_id='.$i.'&amp;com_rootid='.$comments[$i]->getVar('rootid').'&amp;'.htmlspecialchars($comments[$i]->getVar('exparams')).'#comment'.$i.'">'.$comments[$i]->getVar('title').'</a>';
         $com['icon'] = htmlspecialchars($comments[$i]->getVar('icon'), ENT_QUOTES);
         $com['icon'] = ($com['icon'] != '') ? $com['icon'] : 'icon1.gif';
         $com['time'] = XoopsLocale::formatTimestamp($comments[$i]->getVar('created'), 'm');
         if ($comments[$i]->getVar('uid') > 0) {
             $poster = $member_handler->getUser($comments[$i]->getVar('uid'));
             if (is_object($poster)) {
-                $com['poster'] = '<a href="' . \XoopsBaseConfig::get('url') . '/userinfo.php?uid=' . $comments[$i]->getVar('uid') . '">' . $poster->getVar('uname') . '</a>';
+                $com['poster'] = '<a href="'.\XoopsBaseConfig::get('url').'/userinfo.php?uid='.$comments[$i]->getVar('uid').'">'.$poster->getVar('uname').'</a>';
             } else {
                 $com['poster'] = $xoops->getConfig('anonymous');
             }

htdocs/modules/comments/class/helper.php

Spacing +59 added lines, -59 removed lines

@@ -134,8 +134,8 @@ 
 
             echo $this->renderHeader($title, $text, $uid, $timestamp);
 
-            if (!preg_match("/^" . XoopsLocale::C_RE . "/i", $title)) {
-                $title = XoopsLocale::C_RE . " " . XoopsLocale::substr($title, 0, 56);
+            if (!preg_match("/^".XoopsLocale::C_RE."/i", $title)) {
+                $title = XoopsLocale::C_RE." ".XoopsLocale::substr($title, 0, 56);
             }
 
             $obj->setVar('itemid', $itemid);
@@ -151,7 +151,7 @@ 
     public function displayPost()
     {
         $xoops = Xoops::getInstance();
-        if (Request::getMethod()!=='POST') {
+        if (Request::getMethod() !== 'POST') {
             $xoops->redirect(\XoopsBaseConfig::get('url'), 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
         }
         $id = Request::getInt('com_id');
@@ -183,7 +183,7 @@ 
             if (empty($id)) {
                 $xoops->redirect(\XoopsBaseConfig::get('url'), 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
             }
-            $redirect_page = $this->url('admin/main.php?com_modid=' . $modid . '&com_itemid');
+            $redirect_page = $this->url('admin/main.php?com_modid='.$modid.'&com_itemid');
         } else {
             if (static::APPROVE_NONE == $xoops->getModuleConfig('com_rule', $module->getVar('dirname'))) {
                 $xoops->redirect(\XoopsBaseConfig::get('url'), 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
@@ -194,13 +194,13 @@ 
         /* @var $plugin CommentsPluginInterface */
         if ($plugin = \Xoops\Module\Plugin::getPlugin($moddir, 'comments')) {
             if (!$xoops->isAdminSide) {
-                $redirect_page = $xoops->url('modules/' . $moddir . '/' . $plugin->pageName() . '?');
+                $redirect_page = $xoops->url('modules/'.$moddir.'/'.$plugin->pageName().'?');
                 if (is_array($extraParams = $plugin->extraParams())) {
                     $extra_params = '';
                     foreach ($extraParams as $extra_param) {
                         $extra_params .= isset($_POST[$extra_param])
-                            ? $extra_param . '=' . htmlspecialchars($_POST[$extra_param]) . '&'
-                            : $extra_param . '=amp;';
+                            ? $extra_param.'='.htmlspecialchars($_POST[$extra_param]).'&'
+                            : $extra_param.'=amp;';
                     }
                     $redirect_page .= $extra_params;
                 }
@@ -328,9 +328,9 @@ 
                         }
                         if (false != $accesserror) {
                             $xoops->redirect(
-                                $redirect_page . '=' . $comment->getVar('itemid')
-                                . '&com_id=' . $comment->getVar('id')
-                                . '&com_mode=' . $mode . '&com_order=' . $order,
+                                $redirect_page.'='.$comment->getVar('itemid')
+                                . '&com_id='.$comment->getVar('id')
+                                . '&com_mode='.$mode.'&com_order='.$order,
                                 1,
                                 XoopsLocale::E_NO_ACCESS_PERMISSION
                             );
@@ -377,9 +377,9 @@ 
                             $comment->setVar('uid', 0);
                             if ($xoops->getModuleConfig('com_anonpost', $module->getVar('dirname')) != 1) {
                                 $xoops->redirect(
-                                    $redirect_page . '=' . $comment->getVar('itemid')
-                                    . '&com_id=' . $comment->getVar('id') . '&com_mode=' . $mode
-                                    . '&com_order=' . $order,
+                                    $redirect_page.'='.$comment->getVar('itemid')
+                                    . '&com_id='.$comment->getVar('id').'&com_mode='.$mode
+                                    . '&com_order='.$order,
                                     1,
                                     XoopsLocale::E_NO_ACCESS_PERMISSION
                                 );
@@ -461,11 +461,11 @@ 
                             // point to a viewable page (i.e. not the system administration
                             // module).
                             $comment_tags = array();
-                            $comment_tags['X_COMMENT_URL'] = $comment_url . '=' . $comment->getVar('itemid')
-                                . '&com_id=' . $comment->getVar('id')
-                                . '&com_rootid=' . $comment->getVar('rootid')
-                                . '&com_mode=' . $mode . '&com_order=' . $order
-                                . '#comment' . $comment->getVar('id');
+                            $comment_tags['X_COMMENT_URL'] = $comment_url.'='.$comment->getVar('itemid')
+                                . '&com_id='.$comment->getVar('id')
+                                . '&com_rootid='.$comment->getVar('rootid')
+                                . '&com_mode='.$mode.'&com_order='.$order
+                                . '#comment'.$comment->getVar('id');
 
                             if ($xoops->isActiveModule('notifications')) {
                                 Notifications::getInstance()->getHandlerNotification()->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
@@ -475,18 +475,18 @@ 
                             // if the comment is active, redirect to posted comment
                             if ($comment->getVar('status') == static::STATUS_ACTIVE) {
                                 $xoops->redirect(
-                                    $redirect_page . '=' . $comment->getVar('itemid')
-                                    . '&com_id=' . $comment->getVar('id')
-                                    . '&com_rootid=' . $comment->getVar('rootid') . '&com_mode=' . $mode
-                                    . '&com_order=' . $order . '#comment' . $comment->getVar('id'),
+                                    $redirect_page.'='.$comment->getVar('itemid')
+                                    . '&com_id='.$comment->getVar('id')
+                                    . '&com_rootid='.$comment->getVar('rootid').'&com_mode='.$mode
+                                    . '&com_order='.$order.'#comment'.$comment->getVar('id'),
                                     1,
                                     _MD_COMMENTS_THANKSPOST
                                 );
                             } else {
                                 // not active, so redirect to top comment page
                                 $xoops->redirect(
-                                    $redirect_page . '=' . $comment->getVar('itemid') . '&com_mode=' . $mode
-                                    . '&com_order=' . $order . '#comment' . $comment->getVar('id'),
+                                    $redirect_page.'='.$comment->getVar('itemid').'&com_mode='.$mode
+                                    . '&com_order='.$order.'#comment'.$comment->getVar('id'),
                                     1,
                                     _MD_COMMENTS_THANKSPOST
                                 );
@@ -504,7 +504,7 @@ 
                     break;
                 default:
                     $xoops->redirect(
-                        \XoopsBaseConfig::get('url') . '/',
+                        \XoopsBaseConfig::get('url').'/',
                         1,
                         implode('<br />', $xoops->security()->getErrors())
                     );
@@ -543,8 +543,8 @@ 
         $reply = $this->getHandlerComment()->create();
 
         $title = $comment->getVar('title', 'e');
-        if (!preg_match("/^" . XoopsLocale::C_RE . "/i", $title)) {
-            $title = XoopsLocale::C_RE . " " . XoopsLocale::substr($title, 0, 56);
+        if (!preg_match("/^".XoopsLocale::C_RE."/i", $title)) {
+            $title = XoopsLocale::C_RE." ".XoopsLocale::substr($title, 0, 56);
         }
         $reply->setVar('title', $title);
         $reply->setVar('modid', $comment->getVar('modid'));
@@ -574,12 +574,12 @@ 
     public function renderHeader($title, $text, $uid, $timestamp)
     {
         $ret = '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
-      <tr><td class="head">' . $title . '</td></tr><tr><td><br />';
+      <tr><td class="head">' . $title.'</td></tr><tr><td><br />';
         if ($uid) {
-            $ret .= _MD_COMMENTS_POSTER . ': <strong>' . XoopsUser::getUnameFromId($uid) . '</strong>&nbsp;&nbsp;';
+            $ret .= _MD_COMMENTS_POSTER.': <strong>'.XoopsUser::getUnameFromId($uid).'</strong>&nbsp;&nbsp;';
         }
-        $ret .= _MD_COMMENTS_POSTED . ': <strong>' . XoopsLocale::formatTimestamp($timestamp)
-            . '</strong><br /><br />' . $text . '<br /></td></tr>';
+        $ret .= _MD_COMMENTS_POSTED.': <strong>'.XoopsLocale::formatTimestamp($timestamp)
+            . '</strong><br /><br />'.$text.'<br /></td></tr>';
         $ret .= '</table>';
         return $ret;
     }
@@ -633,19 +633,19 @@ 
                         $renderer->renderFlatView($admin_view);
                     } elseif ($mode === 'thread') {
                         // RMV-FIX... added extraParam stuff here
-                        $comment_url = $plugin->pageName() . '?';
+                        $comment_url = $plugin->pageName().'?';
                         if (is_array($extraParams = $plugin->extraParams())) {
                             $extra_params = '';
                             foreach ($extraParams as $extra_param) {
                                 // This page is included in the module hosting page -- param could be from anywhere
 
                                 if (isset($_POST[$extra_param])) {
-                                    $extra_params .= $extra_param . '=' . $_POST[$extra_param] . '&amp;';
+                                    $extra_params .= $extra_param.'='.$_POST[$extra_param].'&amp;';
                                 } else {
                                     if (isset($_GET[$extra_param])) {
-                                        $extra_params .= $extra_param . '=' . $_GET[$extra_param] . '&amp;';
+                                        $extra_params .= $extra_param.'='.$_GET[$extra_param].'&amp;';
                                     } else {
-                                        $extra_params .= $extra_param . '=&amp;';
+                                        $extra_params .= $extra_param.'=&amp;';
                                     }
                                 }
                             }
@@ -653,7 +653,7 @@ 
                         }
                         $xoops->tpl()->assign(
                             'comment_url',
-                            $comment_url . $plugin->itemName() . '=' . $itemid . '&amp;com_mode=thread&amp;com_order='
+                            $comment_url.$plugin->itemName().'='.$itemid.'&amp;com_mode=thread&amp;com_order='
                             . $order
                         );
                         if (!empty($id) && !empty($rootid) && ($id != $rootid)) {
@@ -717,8 +717,8 @@ 
                     unset($postcomment_link);
                     if ($xoops->getModuleConfig('com_anonpost') || $xoops->isUser()) {
                         $postcomment_link = $this->url(
-                            'comment_new.php?com_modid=' . $modid . '&amp;com_itemid=' . $itemid
-                            . '&amp;com_order=' . $order . '&amp;com_mode=' . $mode
+                            'comment_new.php?com_modid='.$modid.'&amp;com_itemid='.$itemid
+                            . '&amp;com_order='.$order.'&amp;com_mode='.$mode
                         );
                         $xoops->tpl()->assign('anon_canpost', true);
                     }
@@ -733,7 +733,7 @@ 
                                 }
                             }
                             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);
                                 $xoops->tpl()->assign('extra_param', $extra_param);
                                 $xoops->tpl()->assign('hidden_value', $hidden_value);
@@ -745,9 +745,9 @@ 
                         $xoops->tpl()->assign('link_extra', $link_extra);
                     }
                     $xoops->tpl()->assign(array(
-                        'comments_editlink'   => $this->url('comment_edit.php?com_modid=' . $modid . '&amp;com_itemid=' . $itemid . '&amp;com_order=' . $order . '&amp;com_mode=' . $mode . '' . $link_extra),
-                        'comments_deletelink' => $this->url('comment_delete.php?com_modid=' . $modid . '&amp;com_itemid=' . $itemid . '&amp;com_order=' . $order . '&amp;com_mode=' . $mode . '' . $link_extra),
-                        'comments_replylink'  => $this->url('comment_reply.php?com_modid=' . $modid . '&amp;com_itemid=' . $itemid . '&amp;com_order=' . $order . '&amp;com_mode=' . $mode . '' . $link_extra)
+                        'comments_editlink'   => $this->url('comment_edit.php?com_modid='.$modid.'&amp;com_itemid='.$itemid.'&amp;com_order='.$order.'&amp;com_mode='.$mode.''.$link_extra),
+                        'comments_deletelink' => $this->url('comment_delete.php?com_modid='.$modid.'&amp;com_itemid='.$itemid.'&amp;com_order='.$order.'&amp;com_mode='.$mode.''.$link_extra),
+                        'comments_replylink'  => $this->url('comment_reply.php?com_modid='.$modid.'&amp;com_itemid='.$itemid.'&amp;com_order='.$order.'&amp;com_mode='.$mode.''.$link_extra)
                     ));
 
                     // assign some lang variables
@@ -833,14 +833,14 @@ 
         /* @var $plugin CommentsPluginInterface */
         if ($plugin = \Xoops\Module\Plugin::getPlugin($module->getVar('dirname'), 'comments')) {
             if ($xoops->isAdminSide) {
-                $redirect_page = $this->url('admin/main.php?com_modid=' . $modid . '&amp;com_itemid');
+                $redirect_page = $this->url('admin/main.php?com_modid='.$modid.'&amp;com_itemid');
             } else {
-                $redirect_page = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $plugin->pageName() . '?');
+                $redirect_page = $xoops->url('modules/'.$module->getVar('dirname').'/'.$plugin->pageName().'?');
                 $comment_confirm_extra = array();
                 if (is_array($extraParams = $plugin->extraParams())) {
                     foreach ($extraParams as $extra_param) {
                         if (isset($_GET[$extra_param])) {
-                            $redirect_page .= $extra_param . '=' . $_GET[$extra_param] . '&amp;';
+                            $redirect_page .= $extra_param.'='.$_GET[$extra_param].'&amp;';
                             // for the confirmation page
                             $comment_confirm_extra[$extra_param] = $_GET[$extra_param];
                         }
@@ -864,7 +864,7 @@ 
                     $xoops->redirect($ref, 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
                 } else {
                     $xoops->redirect(
-                        $redirect_page . '?' . $plugin->itemName() . '=' . (int)($id),
+                        $redirect_page.'?'.$plugin->itemName().'='.(int)($id),
                         2,
                         XoopsLocale::E_NO_ACCESS_PERMISSION
                     );
@@ -875,7 +875,7 @@ 
                 case 'delete_one':
                     if (!$comment_handler->delete($comment)) {
                         $xoops->header();
-                        echo $xoops->alert('error', _MD_COMMENTS_COMDELETENG . ' (ID: ' . $comment->getVar('id') . ')');
+                        echo $xoops->alert('error', _MD_COMMENTS_COMDELETENG.' (ID: '.$comment->getVar('id').')');
                         $xoops->footer();
                     }
 
@@ -911,8 +911,8 @@ 
                             $new_rootid = $child_comments[$i]->getVar('id');
                             $child_comments[$i]->setVar('rootid', $child_comments[$i]->getVar('id'));
                             if (!$comment_handler->insert($child_comments[$i])) {
-                                $errs[] = 'Could not change comment parent ID from <strong>' . $id
-                                    . '</strong> to <strong>' . $new_pid . '</strong>. (ID: ' . $new_rootid . ')';
+                                $errs[] = 'Could not change comment parent ID from <strong>'.$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);
@@ -920,15 +920,15 @@ 
                                 foreach (array_keys($c_child_comments) as $j) {
                                     $c_child_comments[$j]->setVar('rootid', $new_rootid);
                                     if (!$comment_handler->insert($c_child_comments[$j])) {
-                                        $errs[] = 'Could not change comment root ID from <strong>' . $id
-                                            . '</strong> to <strong>' . $new_rootid . '</strong>.';
+                                        $errs[] = 'Could not change comment root ID from <strong>'.$id
+                                            . '</strong> to <strong>'.$new_rootid.'</strong>.';
                                     }
                                 }
                             }
                         } else {
                             if (!$comment_handler->insert($child_comments[$i])) {
-                                $errs[] = 'Could not change comment parent ID from <strong>' . $id
-                                    . '</strong> to <strong>' . $new_pid . '</strong>.';
+                                $errs[] = 'Could not change comment parent ID from <strong>'.$id
+                                    . '</strong> to <strong>'.$new_pid.'</strong>.';
                             }
                         }
                     }
@@ -938,7 +938,7 @@ 
                         $xoops->footer();
                         exit();
                     }
-                    $xoops->redirect($redirect_page . '=' . $itemid . '&amp;com_order=' . $order . '&amp;com_mode=' . $mode, 1, _MD_COMMENTS_COMDELETED);
+                    $xoops->redirect($redirect_page.'='.$itemid.'&amp;com_order='.$order.'&amp;com_mode='.$mode, 1, _MD_COMMENTS_COMDELETED);
                     break;
 
                 case 'delete_all':
@@ -957,9 +957,9 @@ 
                     $member_handler = $xoops->getHandlerMember();
                     foreach (array_keys($child_comments) as $i) {
                         if (!$comment_handler->delete($child_comments[$i])) {
-                            $msgs[] = _MD_COMMENTS_COMDELETENG . ' (ID: ' . $child_comments[$i]->getVar('id') . ')';
+                            $msgs[] = _MD_COMMENTS_COMDELETENG.' (ID: '.$child_comments[$i]->getVar('id').')';
                         } else {
-                            $msgs[] = _MD_COMMENTS_COMDELETED . ' (ID: ' . $child_comments[$i]->getVar('id') . ')';
+                            $msgs[] = _MD_COMMENTS_COMDELETED.' (ID: '.$child_comments[$i]->getVar('id').')';
                             // store poster ID and deleted post number into array for later use
                             $poster_id = $child_comments[$i]->getVar('uid');
                             if ($poster_id > 0) {
@@ -986,8 +986,8 @@ 
 
                     $xoops->header();
                     echo $xoops->alert('info', $msgs);
-                    echo '<br /><a href="' . $redirect_page . '=' . $itemid . '&amp;com_order=' . $order
-                        . '&amp;com_mode=' . $mode . '">' . XoopsLocale::GO_BACK . '</a>';
+                    echo '<br /><a href="'.$redirect_page.'='.$itemid.'&amp;com_order='.$order
+                        . '&amp;com_mode='.$mode.'">'.XoopsLocale::GO_BACK.'</a>';
                     $xoops->footer();
                     break;
 
@@ -1074,7 +1074,7 @@ 
         //Delete all configs
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('conf_modid', $module->getVar('mid')));
-        $criteria->add(new Criteria('conf_name', "('" . implode("','", $configNames) . "')", 'IN'));
+        $criteria->add(new Criteria('conf_name', "('".implode("','", $configNames)."')", 'IN'));
         $configs = $config_handler->getConfigs($criteria);
         /* @var $config XoopsConfigItem */
         foreach ($configs as $config) {

htdocs/modules/comments/class/commentrenderer.php

Spacing +18 added lines, -18 removed lines

@@ -67,11 +67,11 @@ 
         $this->doIconCheck = $do_iconcheck;
         $this->statusText = array(
             Comments::STATUS_PENDING => '<span style="text-decoration: none; font-weight: bold; color: #00ff00;">'
-                . _MD_COMMENTS_PENDING . '</span>',
+                . _MD_COMMENTS_PENDING.'</span>',
             Comments::STATUS_ACTIVE  => '<span style="text-decoration: none; font-weight: bold; color: #ff0000;">'
-                . _MD_COMMENTS_ACTIVE . '</span>',
+                . _MD_COMMENTS_ACTIVE.'</span>',
             Comments::STATUS_HIDDEN  => '<span style="text-decoration: none; font-weight: bold; color: #0000ff;">'
-                . _MD_COMMENTS_HIDDEN . '</span>'
+                . _MD_COMMENTS_HIDDEN.'</span>'
         );
     }
 
@@ -106,7 +106,7 @@ 
         if (isset($this->comments)) {
             unset($this->comments);
         }
-        $this->comments =& $comments_arr;
+        $this->comments = & $comments_arr;
     }
 
     /**
@@ -127,8 +127,8 @@ 
             if (false != $admin_view) {
                 $text = $comment->getVar('text')
                     . '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">'
-                    . _MD_COMMENTS_STATUS . ': ' . $this->statusText[$comment->getVar('status')]
-                    . '<br />IP: <span style="font-weight: bold;">' . $comment->getVar('ip') . '</span></div>';
+                    . _MD_COMMENTS_STATUS.': '.$this->statusText[$comment->getVar('status')]
+                    . '<br />IP: <span style="font-weight: bold;">'.$comment->getVar('ip').'</span></div>';
             } else {
                 // hide comments that are not active
                 if (Comments::STATUS_ACTIVE != $comment->getVar('status')) {
@@ -179,8 +179,8 @@ 
             // admins can see all
             $text = $tree[$comment_id]['obj']->getVar('text')
                 . '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">'
-                . _MD_COMMENTS_STATUS . ': ' . $this->statusText[$tree[$comment_id]['obj']->getVar('status')]
-                . '<br />IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('ip')
+                . _MD_COMMENTS_STATUS.': '.$this->statusText[$tree[$comment_id]['obj']->getVar('status')]
+                . '<br />IP: <span style="font-weight: bold;">'.$tree[$comment_id]['obj']->getVar('ip')
                 . '</span></div>';
         } else {
             // hide comments that are not active
@@ -241,7 +241,7 @@ 
             $image = (false != $this->useIcons) ? $this->getTitleIcon($thread[$key]['obj']->getVar('icon')) : '';
             $title = $thread[$key]['obj']->getVar('title');
             $title = (false != $admin_view)
-                ? $title . ' ' . $this->statusText[$thread[$key]['obj']->getVar('status')] : $title;
+                ? $title.' '.$this->statusText[$thread[$key]['obj']->getVar('status')] : $title;
             $replies[] = array(
                 'id'          => $key,
                 'prefix'      => $current_prefix,
@@ -289,8 +289,8 @@ 
         if (false != $admin_view) {
             $text = $tree[$comment_id]['obj']->getVar('text')
                 . '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">'
-                . _MD_COMMENTS_STATUS . ': ' . $this->statusText[$tree[$comment_id]['obj']->getVar('status')]
-                . '<br />IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('ip')
+                . _MD_COMMENTS_STATUS.': '.$this->statusText[$tree[$comment_id]['obj']->getVar('status')]
+                . '<br />IP: <span style="font-weight: bold;">'.$tree[$comment_id]['obj']->getVar('ip')
                 . '</span></div>';
         } else {
             // skip this comment if it is not active and continue on processing its child comments instead
@@ -342,8 +342,8 @@ 
             $title = $thread[$key]['obj']->getVar('title');
             $text = (false != $admin_view) ? $thread[$key]['obj']->getVar('text')
                 . '<div style="text-align:right; margin-top: 2px; margin-right: 2px;">'
-                . _MD_COMMENTS_STATUS . ': ' . $this->statusText[$thread[$key]['obj']->getVar('status')]
-                . '<br />IP: <span style="font-weight: bold;">' . $thread[$key]['obj']->getVar('ip')
+                . _MD_COMMENTS_STATUS.': '.$this->statusText[$thread[$key]['obj']->getVar('status')]
+                . '<br />IP: <span style="font-weight: bold;">'.$thread[$key]['obj']->getVar('ip')
                 . '</span></div>'
                 : $thread[$key]['obj']->getVar('text');
             $replies[] = array(
@@ -457,18 +457,18 @@ 
         $icon_image = htmlspecialchars(trim($icon_image));
         if ($icon_image != '') {
             if (false != $this->doIconCheck) {
-                if (!XoopsLoad::fileExists(Xoops::getInstance()->path('images/subject/' . $icon_image))) {
-                    return '<img src="' . \XoopsBaseConfig::get('url')
+                if (!XoopsLoad::fileExists(Xoops::getInstance()->path('images/subject/'.$icon_image))) {
+                    return '<img src="'.\XoopsBaseConfig::get('url')
                         . '/images/icons/no_posticon.gif" alt="" />&nbsp;';
                 } else {
-                    return '<img src="' . \XoopsBaseConfig::get('url') . '/images/subject/' . $icon_image
+                    return '<img src="'.\XoopsBaseConfig::get('url').'/images/subject/'.$icon_image
                         . '" alt="" />&nbsp;';
                 }
             } else {
-                return '<img src="' . \XoopsBaseConfig::get('url') . '/images/subject/' . $icon_image
+                return '<img src="'.\XoopsBaseConfig::get('url').'/images/subject/'.$icon_image
                     . '" alt="" />&nbsp;';
             }
         }
-        return '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />&nbsp;';
+        return '<img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />&nbsp;';
     }
 }

htdocs/modules/userrank/admin/userrank.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
  * @author          Cointin Maxime (AKA Kraven30)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // Get main instance
 $system = System::getInstance();
@@ -74,7 +74,7 @@ 
                 $userrank['rank_max'] = $userrank_arr[$i]->getVar("rank_max");
                 $userrank['rank_special'] = $userrank_arr[$i]->getVar("rank_special");
                 $rank_img = ($userrank_arr[$i]->getVar("rank_image")) ? $userrank_arr[$i]->getVar("rank_image") : 'blank.gif';
-                $userrank['rank_image'] = '<img src="' . \XoopsBaseConfig::get('uploads-url') . '/' . $rank_img . '" alt="" />';
+                $userrank['rank_image'] = '<img src="'.\XoopsBaseConfig::get('uploads-url').'/'.$rank_img.'" alt="" />';
                 $xoops->tpl()->appendByRef('userrank', $userrank);
                 unset($userrank);
             }
@@ -88,7 +88,7 @@ 
 
     // New userrank
     case 'userrank_new':
-        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
+        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)).sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
         $admin_page->addItemButton(_AM_USERRANK_LIST, './userrank.php', 'application-view-detail');
         $admin_page->renderTips();
         $admin_page->renderButton();
@@ -100,7 +100,7 @@ 
 
     // Edit userrank
     case 'userrank_edit':
-        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
+        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)).sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
         $admin_page->addItemButton(_AM_USERRANK_ADD, './userrank.php?op=userrank_new', 'add');
         $admin_page->addItemButton(_AM_USERRANK_LIST, './userrank.php', 'application-view-detail');
         $admin_page->renderTips();
@@ -128,7 +128,7 @@ 
         $verif_rank_special = ($_POST["rank_special"] == 1) ? "1" : "0";
         $obj->setVar("rank_special", $verif_rank_special);
 
-        $uploader_rank_img = new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-url') . '/ranks', $mimetypes, $upload_size, null, null);
+        $uploader_rank_img = new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-url').'/ranks', $mimetypes, $upload_size, null, null);
 
         if ($uploader_rank_img->fetchMedia("rank_image")) {
             $uploader_rank_img->setPrefix("rank");
@@ -137,10 +137,10 @@ 
                 $errors = $uploader_rank_img->getErrors();
                 $xoops->redirect("javascript:history.go(-1)", 3, $errors);
             } else {
-                $obj->setVar("rank_image", 'ranks/' . $uploader_rank_img->getSavedFileName());
+                $obj->setVar("rank_image", 'ranks/'.$uploader_rank_img->getSavedFileName());
             }
         } else {
-            $obj->setVar("rank_image", 'ranks/' . $_POST["rank_image"]);
+            $obj->setVar("rank_image", 'ranks/'.$_POST["rank_image"]);
         }
 
         if ($userrank_Handler->insert($obj)) {
@@ -160,7 +160,7 @@ 
                 $xoops->redirect("userrank.php", 3, implode(",", $xoops->security()->getErrors()));
             }
             if ($userrank_Handler->delete($obj)) {
-                $urlfile = \XoopsBaseConfig::get('uploads-url') . '/' . $obj->getVar("rank_image");
+                $urlfile = \XoopsBaseConfig::get('uploads-url').'/'.$obj->getVar("rank_image");
                 if (is_file($urlfile)) {
                     chmod($urlfile, 0777);
                     unlink($urlfile);
@@ -173,7 +173,7 @@ 
             $rank_img = ($obj->getVar("rank_image")) ? $obj->getVar("rank_image") : 'blank.gif';
             echo $xoops->confirm(array(
                 "ok" => 1, "rank_id" => $_REQUEST["rank_id"], "op" => "userrank_delete"
-            ), $_SERVER["REQUEST_URI"], sprintf(_AM_USERRANK_SUREDEL) . '<br \><img src="' . \XoopsBaseConfig::get('uploads-url') . '/' . $rank_img . '" alt="" /><br \>');
+            ), $_SERVER["REQUEST_URI"], sprintf(_AM_USERRANK_SUREDEL).'<br \><img src="'.\XoopsBaseConfig::get('uploads-url').'/'.$rank_img.'" alt="" /><br \>');
         }
         break;
 

htdocs/modules/userrank/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @version         $Id$
  */
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 
 $xoops = Xoops::getInstance();
 XoopsLoad::load('system', 'system');