mambax7 / newbb5

class/Migrate.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }

class/PostHandler.php

Spacing +16 added lines, -16 removed lines

@@ -58,7 +58,7 @@ 
     {
         $id   = (int)$id;
         $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p LEFT JOIN '.$this->db->prefix('newbb_posts_text').' t ON p.post_id=t.post_id WHERE p.post_id='.$id;
         if ($array = $this->db->fetchArray($this->db->query($sql))) {
             $post = $this->create(false);
             $post->assignVars($array);
@@ -87,7 +87,7 @@ 
         $topic_id = 0,
         $approved = 1
     ) {
-        $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
+        $sql = 'SELECT p.*, t.*, tp.topic_status FROM '
                   . $this->db->prefix('newbb_posts')
                   . ' p LEFT JOIN '
                   . $this->db->prefix('newbb_posts_text')
@@ -380,14 +380,14 @@ 
 
         /* Set active post as deleted */
         if ($post->getVar('approved') > 0 && empty($force)) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
+            $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET approved = -1 WHERE post_id = '.$post->getVar('post_id');
             if (!$result = $this->db->queryF($sql)) {
             }
             /* delete pending post directly */
         } else {
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('delete post error: ' . $sql);
+                $post->setErrors('delete post error: '.$sql);
 
                 return false;
             }
@@ -395,7 +395,7 @@ 
 
             $sql = sprintf('DELETE FROM %s WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('Could not remove post text: ' . $sql);
+                $post->setErrors('Could not remove post text: '.$sql);
 
                 return false;
             }
@@ -432,11 +432,11 @@ 
                 }
             }
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
-                            LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.topic_id = t.topic_id
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics').' t
+                            LEFT JOIN ' . $this->db->prefix('newbb_posts').' p ON p.topic_id = t.topic_id
                             SET t.topic_last_post_id = p.post_id
-                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id') . '
-                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id=t.topic_id)';
+                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id').'
+                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts').' WHERE topic_id=t.topic_id)';
             if (!$result = $this->db->queryF($sql)) {
             }
         }
@@ -458,7 +458,7 @@ 
             }
             // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
             if (!$post->isTopic()) {
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
+                $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET pid = '.$post->getVar('pid').' WHERE approved=1 AND pid='.$post->getVar('post_id');
                 if (!$result = $this->db->queryF($sql)) {
                     //xoops_error($this->db->error());
                 }
@@ -482,12 +482,12 @@ 
             return parent::getCount($criteria);
         }
 
-        $sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT COUNT(*) as count'.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         // LEFT JOIN
         $sql .= $join;
         // WHERE
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             //xoops_error($this->db->error().'<br>'.$sql);
@@ -512,14 +512,14 @@ 
     public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
     {
         $ret = [];
-        $sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT p.*, t.* '.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         if (!empty($join)) {
             $sql .= $join;
         }
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
         }
         $result = $this->db->query($sql, (int)$limit, (int)$start);
@@ -560,7 +560,7 @@ 
         parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
         parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
 
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_posts_text').' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM '.$this->table.') )';
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;

Indentation +10 added lines, -10 removed lines

@@ -88,16 +88,16 @@
         $approved = 1
     ) {
         $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
-                  . $this->db->prefix('newbb_posts')
-                  . ' p LEFT JOIN '
-                  . $this->db->prefix('newbb_posts_text')
-                  . ' t ON p.post_id=t.post_id LEFT JOIN '
-                  . $this->db->prefix('newbb_topics')
-                  . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
-                  . $topic_id
-                  . ' AND p.approved ='
-                  . $approved
-                  . ' ORDER BY p.post_time DESC';
+                    . $this->db->prefix('newbb_posts')
+                    . ' p LEFT JOIN '
+                    . $this->db->prefix('newbb_posts_text')
+                    . ' t ON p.post_id=t.post_id LEFT JOIN '
+                    . $this->db->prefix('newbb_topics')
+                    . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
+                    . $topic_id
+                    . ' AND p.approved ='
+                    . $approved
+                    . ' ORDER BY p.post_time DESC';
         $result = $this->db->query($sql, $limit, 0);
         $ret    = [];
         while (false !== ($myrow = $this->db->fetchArray($result))) {

class/DigestHandler.php

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
         //            $start = 0;
         //        }
 
-        $sql    = 'SELECT * FROM ' . $this->db->prefix('newbb_digest') . ' ORDER BY digest_id DESC';
+        $sql    = 'SELECT * FROM '.$this->db->prefix('newbb_digest').' ORDER BY digest_id DESC';
         $result = $this->db->query($sql, $perpage, $start);
         $ret    = [];
         //        $reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
@@ -102,7 +102,7 @@ 
      */
     public function getDigestCount()
     {
-        $sql    = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_digest');
+        $sql    = 'SELECT COUNT(*) AS count FROM '.$this->db->prefix('newbb_digest');
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;
@@ -115,7 +115,7 @@ 
 
     public function getLastDigest()
     {
-        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM ' . $this->db->prefix('newbb_digest');
+        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM '.$this->db->prefix('newbb_digest');
         $result = $this->db->query($sql);
         if (!$result) {
             $this->last_digest = 0;
@@ -206,9 +206,9 @@ 
         $GLOBALS['xoopsUser'] = $thisUser;
 
         $accessForums    = $forumHandler->getIdsByPermission(); // get all accessible forums
-        $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $accessForums) . ')';
+        $forumCriteria   = ' AND t.forum_id IN ('.implode(',', $accessForums).')';
         $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
-        $time_criteria   = ' AND t.digest_time > ' . $this->last_digest;
+        $time_criteria   = ' AND t.digest_time > '.$this->last_digest;
 
         $karma_criteria = $GLOBALS['xoopsModuleConfig']['enable_karma'] ? ' AND p.post_karma=0' : '';
         $reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
@@ -243,7 +243,7 @@ 
         if (count($uids) > 0) {
             /** @var \XoopsMemberHandler $memberHandler */
             $memberHandler = xoops_getHandler('member');
-            $user_criteria = new \Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
+            $user_criteria = new \Criteria('uid', '('.implode(',', $uids).')', 'IN');
             $users         = $memberHandler->getUsers($user_criteria, true);
         } else {
             $users = [];
@@ -261,8 +261,8 @@ 
                 $topic['uname'] = $topic['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous'];
             }
             $summary = \Xmf\Metagen::generateDescription($topic['post_text'], SUMMARY_LENGTH);
-            $author  = $topic['uname'] . ' (' . formatTimestamp($topic['topic_time']) . ')';
-            $link    = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/viewtopic.php?topic_id=' . $topic['topic_id'] . '&forum=' . $topic['forum_id'];
+            $author  = $topic['uname'].' ('.formatTimestamp($topic['topic_time']).')';
+            $link    = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/viewtopic.php?topic_id='.$topic['topic_id'].'&forum='.$topic['forum_id'];
             $title   = $topic['topic_title'];
             $digest->addItem($title, $link, $author, $summary);
         }

Indentation +12 added lines, -12 removed lines

@@ -214,18 +214,18 @@
         $reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
 
         $query = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_time, t.digest_time, p.uid, p.poster_name, pt.post_text FROM '
-                 . $this->db->prefix('newbb_topics')
-                 . ' t, '
-                 . $this->db->prefix('newbb_posts_text')
-                 . ' pt, '
-                 . $this->db->prefix('newbb_posts')
-                 . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
-                 . $forumCriteria
-                 . $approveCriteria
-                 . $time_criteria
-                 . $karma_criteria
-                 . $reply_criteria
-                 . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
+                    . $this->db->prefix('newbb_topics')
+                    . ' t, '
+                    . $this->db->prefix('newbb_posts_text')
+                    . ' pt, '
+                    . $this->db->prefix('newbb_posts')
+                    . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
+                    . $forumCriteria
+                    . $approveCriteria
+                    . $time_criteria
+                    . $karma_criteria
+                    . $reply_criteria
+                    . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
         if (!$result = $this->db->query($query)) {
             //echo "<br>No result:<br>$query";
             return false;

rss.php

Indentation +21 added lines, -21 removed lines

@@ -124,27 +124,27 @@
     $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
 
     $query = 'SELECT'
-             . '    f.forum_id, f.forum_name,'
-             . '    t.topic_id, t.topic_title, t.type_id,'
-             . '    p.post_id, p.post_time, p.subject, p.uid, p.poster_name, p.post_karma, p.require_reply, '
-             . '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr,'
-             . '    pt.post_text'
-             . '    FROM '
-             . $GLOBALS['xoopsDB']->prefix('newbb_posts')
-             . ' AS p'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_topics')
-             . ' AS t ON t.topic_last_post_id=p.post_id'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_posts_text')
-             . ' AS pt ON pt.post_id=p.post_id'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_forums')
-             . ' AS f ON f.forum_id=p.forum_id'
-             . '    WHERE 1=1 '
-             . $forumCriteria
-             . $approveCriteria
-             . ' ORDER BY p.post_id DESC';
+                . '    f.forum_id, f.forum_name,'
+                . '    t.topic_id, t.topic_title, t.type_id,'
+                . '    p.post_id, p.post_time, p.subject, p.uid, p.poster_name, p.post_karma, p.require_reply, '
+                . '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr,'
+                . '    pt.post_text'
+                . '    FROM '
+                . $GLOBALS['xoopsDB']->prefix('newbb_posts')
+                . ' AS p'
+                . '    LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('newbb_topics')
+                . ' AS t ON t.topic_last_post_id=p.post_id'
+                . '    LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('newbb_posts_text')
+                . ' AS pt ON pt.post_id=p.post_id'
+                . '    LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('newbb_forums')
+                . ' AS f ON f.forum_id=p.forum_id'
+                . '    WHERE 1=1 '
+                . $forumCriteria
+                . $approveCriteria
+                . ' ORDER BY p.post_id DESC';
     $limit = (int)($GLOBALS['xoopsModuleConfig']['rss_maxitems'] * 1.5);
     if (!$result = $GLOBALS['xoopsDB']->query($query, $limit)) {
         newbbTrackbackResponse(1, _MD_NEWBB_ERROR);

Spacing +20 added lines, -20 removed lines

@@ -31,12 +31,12 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('class/template.php');
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.rpc.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
+    require_once __DIR__.'/seo_url.php';
 }
 /* for seo */
 
@@ -59,7 +59,7 @@ 
     $validForums = array_intersect($forums, $validForums);
 } elseif ($category > 0) {
     $crit_top = new \CriteriaCompo(new \Criteria('cat_id', $category));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'));
+    $crit_top->add(new \Criteria('forum_id', '('.implode(', ', $validForums).')', 'IN'));
     $forums_top  = $forumHandler->getIds($crit_top);
     $validForums = array_intersect($forums_top, $validForums);
 }
@@ -71,7 +71,7 @@ 
 $forumSet = implode(',', $validForums);
 
 $charset = 'UTF-8';
-header('Content-Type:text/xml; charset=' . $charset);
+header('Content-Type:text/xml; charset='.$charset);
 
 $tpl                 = new \XoopsTpl();
 $tpl->caching        = 2;
@@ -84,25 +84,25 @@ 
 $xoopsCachedTemplateId = "newbbb_rss_$forumSet";
 $compile_id            = null;
 if (!$tpl->is_cached('db:newbb_rss.tpl', $xoopsCachedTemplateId, $compile_id)) {
-    require_once __DIR__ . '/include/functions.time.php';
+    require_once __DIR__.'/include/functions.time.php';
 
     //    /** @var Newbb\XmlrssHandler $xmlrssHandler */
     //    $xmlrssHandler = Newbb\Helper::getInstance()->getHandler('Xmlrss');
     $rss = $xmlrssHandler->create();
 
-    $rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'] . ' :: ' . _MD_NEWBB_FORUM);
-    $rss->channel_link = XOOPS_URL . '/';
-    $rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'] . ' :: ' . $xoopsModule->getInfo('description'));
+    $rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'].' :: '._MD_NEWBB_FORUM);
+    $rss->channel_link = XOOPS_URL.'/';
+    $rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'].' :: '.$xoopsModule->getInfo('description'));
     $rss->setVarRss('channel_lastbuild', formatTimestamp(time(), 'rss'));
     $rss->channel_webmaster = $GLOBALS['xoopsConfig']['adminmail'];
     $rss->channel_editor    = $GLOBALS['xoopsConfig']['adminmail'];
     $rss->setVarRss('channel_category', $xoopsModule->getVar('name'));
-    $rss->channel_generator = 'NewBB ' . $xoopsModule->getInfo('version');
+    $rss->channel_generator = 'NewBB '.$xoopsModule->getInfo('version');
     $rss->channel_language  = _LANGCODE;
     $rss->xml_encoding      = $charset;
-    $rss->image_url         = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
+    $rss->image_url         = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('image');
 
-    $dimension = @getimagesize($GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image')));
+    $dimension = @getimagesize($GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('image')));
     if (empty($dimension[0])) {
         $width = 88;
     } else {
@@ -119,7 +119,7 @@ 
     $rss->max_items            = $GLOBALS['xoopsModuleConfig']['rss_maxitems'];
     $rss->max_item_description = $GLOBALS['xoopsModuleConfig']['rss_maxdescription'];
 
-    $forumCriteria = ' AND t.forum_id IN (' . implode(',', $validForums) . ')';
+    $forumCriteria = ' AND t.forum_id IN ('.implode(',', $validForums).')';
     unset($validForums);
     $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
 
@@ -169,7 +169,7 @@ 
     if (count($types) > 0) {
         //        /** @var Newbb\TypeHandler $typeHandler */
         //        $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $topic) {
@@ -184,16 +184,16 @@ 
         } else {
             $topic['uname'] = $topic['poster_name'] ? $myts->htmlSpecialChars($topic['poster_name']) : $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
         }
-        $description            = $topic['forum_name'] . '::';
-        $topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '[' . $type_list[$topic['type_id']] . '] ';
-        $description            .= $topic['topic_subject'] . $topic['topic_title'] . "<br>\n";
+        $description            = $topic['forum_name'].'::';
+        $topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '['.$type_list[$topic['type_id']].'] ';
+        $description            .= $topic['topic_subject'].$topic['topic_title']."<br>\n";
         $description            .= $myts->displayTarea($topic['post_text'], $topic['dohtml'], $topic['dosmiley'], $topic['doxcode'], $topic['dobr']);
-        $label                  = _MD_NEWBB_BY . ' ' . $topic['uname'];
+        $label                  = _MD_NEWBB_BY.' '.$topic['uname'];
         $time                   = formatTimestamp($topic['post_time'], 'rss');
-        $link                   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
+        $link                   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?post_id='.$topic['post_id'].'';
         if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $link   = XOOPS_URL . '/' . REAL_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
-            $oldurl = '<a href=\'' . $link . '\'>';
+            $link   = XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'';
+            $oldurl = '<a href=\''.$link.'\'>';
             $newurl = seo_urls($oldurl);
             $newurl = str_replace('<a href=\'', '', $newurl);
             $newurl = str_replace('\'>', '', $newurl);

blocks/newbb_block.php

Indentation +34 added lines, -34 removed lines

@@ -115,25 +115,25 @@ 
     }
 
     $query = 'SELECT'
-             . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id,'
-             . '    f.forum_name,t.topic_status,'
-             . '    p.post_id, p.post_time, p.icon, p.uid, p.poster_name'
-             . '    FROM '
-             . $GLOBALS['xoopsDB']->prefix('newbb_topics')
-             . ' AS t '
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_posts')
-             . ' AS p ON t.topic_last_post_id=p.post_id'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_forums')
-             . ' AS f ON f.forum_id=t.forum_id'
-             . '    WHERE 1=1 '
-             . $forumCriteria
-             . $approveCriteria
-             . $extraCriteria
-             . ' ORDER BY '
-             . $order
-             . ' DESC';
+                . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id,'
+                . '    f.forum_name,t.topic_status,'
+                . '    p.post_id, p.post_time, p.icon, p.uid, p.poster_name'
+                . '    FROM '
+                . $GLOBALS['xoopsDB']->prefix('newbb_topics')
+                . ' AS t '
+                . '    LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('newbb_posts')
+                . ' AS p ON t.topic_last_post_id=p.post_id'
+                . '    LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('newbb_forums')
+                . ' AS f ON f.forum_id=t.forum_id'
+                . '    WHERE 1=1 '
+                . $forumCriteria
+                . $approveCriteria
+                . $extraCriteria
+                . ' ORDER BY '
+                . $order
+                . ' DESC';
 
     $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
 
@@ -306,21 +306,21 @@ 
     $approveCriteria = ' AND t.approved = 1';
 
     $query = 'SELECT'
-             . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id, t.topic_time, t.topic_poster, t.poster_name,'
-             . '    f.forum_name'
-             . '    FROM '
-             . $GLOBALS['xoopsDB']->prefix('newbb_topics')
-             . ' AS t '
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_forums')
-             . ' AS f ON f.forum_id=t.forum_id'
-             . '    WHERE 1=1 '
-             . $forumCriteria
-             . $approveCriteria
-             . $extraCriteria
-             . ' ORDER BY '
-             . $order
-             . ' DESC';
+                . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id, t.topic_time, t.topic_poster, t.poster_name,'
+                . '    f.forum_name'
+                . '    FROM '
+                . $GLOBALS['xoopsDB']->prefix('newbb_topics')
+                . ' AS t '
+                . '    LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('newbb_forums')
+                . ' AS f ON f.forum_id=t.forum_id'
+                . '    WHERE 1=1 '
+                . $forumCriteria
+                . $approveCriteria
+                . $extraCriteria
+                . ' ORDER BY '
+                . $order
+                . ' DESC';
 
     $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
 

Spacing +132 added lines, -132 removed lines

@@ -56,8 +56,8 @@ 
     global $accessForums;
     global $xoopsLogger;
 
-    require_once __DIR__ . '/../include/functions.config.php';
-    require_once __DIR__ . '/../include/functions.time.php';
+    require_once __DIR__.'/../include/functions.config.php';
+    require_once __DIR__.'/../include/functions.time.php';
 
     $myts          = \MyTextSanitizer::getInstance();
     $block         = [];
@@ -66,7 +66,7 @@ 
     $extraCriteria = '';
     if (!empty($options[2])) {
         //require_once __DIR__ . '/../include/functions.time.php';
-        $extraCriteria .= ' AND p.post_time>' . (time() - newbbGetSinceTime($options[2]));
+        $extraCriteria .= ' AND p.post_time>'.(time() - newbbGetSinceTime($options[2]));
     }
     switch ($options[0]) {
         case 'time':
@@ -92,7 +92,7 @@ 
         return $block;
     }
 
-    $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
+    $forumCriteria   = ' AND t.forum_id IN ('.implode(',', $allowedForums).')';
     $approveCriteria = ' AND t.approved = 1';
 
     $newbbConfig = newbbLoadConfig();
@@ -148,13 +148,13 @@ 
         return $block;
     }
 
-    require_once __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
 
     if (count($types) > 0) {
         /** @var Newbb\TypeHandler $typeHandler */
         $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list   = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $arr) {
@@ -162,7 +162,7 @@ 
         xoops_loadLanguage('main', 'newbb');
         $topic                  = [];
         $topic_page_jump        = newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST);
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . ']';
+        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '['.$type_list[$arr['type_id']].']';
 
         $topic['post_id']      = $arr['post_id'];
         $topic['topic_status'] = $arr['topic_status'];
@@ -174,7 +174,7 @@ 
         if (!empty($options[5])) {
             $title = xoops_substr($title, 0, $options[5]);
         }
-        $topic['title']   = $topic['topic_subject'] . ' ' . $title;
+        $topic['title']   = $topic['topic_subject'].' '.$title;
         $topic['replies'] = $arr['topic_replies'];
         $topic['views']   = $arr['topic_views'];
         $topic['time']    = newbbFormatTimestamp($arr['post_time']);
@@ -186,9 +186,9 @@ 
         $topic['topic_poster']    = $topic_poster;
         $topic['topic_page_jump'] = $topic_page_jump;
         // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_url       = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'];
+        $seo_topic_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_url']       = seo_urls($seo_url);
             $topic['seo_topic_url'] = seo_urls($seo_topic_url);
@@ -203,11 +203,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
     $block['indexNav'] = (int)$options[4];
@@ -230,7 +230,7 @@ 
 function b_newbb_topic_show($options)
 {
     global $accessForums;
-    require_once __DIR__ . '/../include/functions.time.php';
+    require_once __DIR__.'/../include/functions.time.php';
     $myts          = \MyTextSanitizer::getInstance();
     $block         = [];
     $i             = 0;
@@ -239,7 +239,7 @@ 
     $time_criteria = null;
     if (!empty($options[2])) {
         $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND t.topic_time>' . $time_criteria;
+        $extraCriteria = ' AND t.topic_time>'.$time_criteria;
     }
     switch ($options[0]) {
         case 'views':
@@ -252,11 +252,11 @@ 
             $order         = 't.digest_time';
             $extraCriteria = ' AND t.topic_digest=1';
             if (null !== $time_criteria) {
-                $extraCriteria .= ' AND t.digest_time>' . $time_criteria;
+                $extraCriteria .= ' AND t.digest_time>'.$time_criteria;
             }
             break;
         case 'sticky':
-            $order         = 't.topic_id';
+            $order = 't.topic_id';
             $extraCriteria .= ' AND t.topic_sticky=1';
             break;
         case 'time':
@@ -292,7 +292,7 @@ 
         return false;
     }
 
-    $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
+    $forumCriteria   = ' AND t.forum_id IN ('.implode(',', $allowedForums).')';
     $approveCriteria = ' AND t.approved = 1';
 
     $query = 'SELECT'
@@ -332,19 +332,19 @@ 
     if (count($rows) < 1) {
         return $block;
     }
-    require_once __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
     if (count($types) > 0) {
         /** @var Newbb\TypeHandler $typeHandler */
         $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list   = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $arr) {
         // irmtfan remove $topic_page_jump because there is no last post
         //$topic_page_jump = '';
         $topic                  = [];
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . '] ';
+        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '['.$type_list[$arr['type_id']].'] ';
         $topic['forum_id']      = $arr['forum_id'];
         $topic['forum_name']    = $myts->htmlSpecialChars($arr['forum_name']);
         $topic['id']            = $arr['topic_id'];
@@ -353,7 +353,7 @@ 
         if (!empty($options[5])) {
             $title = xoops_substr($title, 0, $options[5]);
         }
-        $topic['title']   = $topic['topic_subject'] . $title;
+        $topic['title']   = $topic['topic_subject'].$title;
         $topic['replies'] = $arr['topic_replies'];
         $topic['views']   = $arr['topic_views'];
         $topic['time']    = newbbFormatTimestamp($arr['topic_time']);
@@ -366,8 +366,8 @@ 
         // irmtfan remove $topic_page_jump because there is no last post
         //$topic['topic_page_jump'] = $topic_page_jump;
         // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_topic_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
 
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_topic_url'] = seo_urls($seo_topic_url);
@@ -381,11 +381,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
     $block['indexNav'] = (int)$options[4];
@@ -410,7 +410,7 @@ 
     global $accessForums;
     global $newbbConfig;
 
-    require_once __DIR__ . '/../include/functions.time.php';
+    require_once __DIR__.'/../include/functions.time.php';
     $myts          = \MyTextSanitizer::getInstance();
     $block         = [];
     $i             = 0;
@@ -419,7 +419,7 @@ 
     $time_criteria = null;
     if (!empty($options[2])) {
         $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND p.post_time>' . $time_criteria;
+        $extraCriteria = ' AND p.post_time>'.$time_criteria;
     }
 
     switch ($options[0]) {
@@ -463,7 +463,7 @@ 
         return $block;
     }
 
-    $forumCriteria   = ' AND p.forum_id IN (' . implode(',', $allowedForums) . ')';
+    $forumCriteria   = ' AND p.forum_id IN ('.implode(',', $allowedForums).')';
     $approveCriteria = ' AND p.approved = 1';
 
     $query = 'SELECT';
@@ -471,11 +471,11 @@ 
     if ('text' === $options[0]) {
         $query .= '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr, pt.post_text,';
     }
-    $query .= '    f.forum_id, f.forum_name' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' AS p ' . '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' AS f ON f.forum_id=p.forum_id';
+    $query .= '    f.forum_id, f.forum_name'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' AS p '.'    LEFT JOIN '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' AS f ON f.forum_id=p.forum_id';
     if ('text' === $options[0]) {
-        $query .= '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . ' AS pt ON pt.post_id=p.post_id';
+        $query .= '    LEFT JOIN '.$GLOBALS['xoopsDB']->prefix('newbb_posts_text').' AS pt ON pt.post_id=p.post_id';
     }
-    $query .= '    WHERE 1=1 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' ORDER BY ' . $order . ' DESC';
+    $query .= '    WHERE 1=1 '.$forumCriteria.$approveCriteria.$extraCriteria.' ORDER BY '.$order.' DESC';
 
     $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
     if (!$result) {
@@ -492,15 +492,15 @@ 
     if (count($rows) < 1) {
         return $block;
     }
-    require_once __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
 
     foreach ($rows as $arr) {
         //if ($arr['icon'] && is_file($GLOBALS['xoops']->path('images/subject/' . $arr['icon']))) {
         if (!empty($arr['icon'])) {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
+            $last_post_icon = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5).'" alt="" />';
         } else {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/icon1.gif" alt="" />';
+            $last_post_icon = '<img src="'.XOOPS_URL.'/images/subject/icon1.gif" alt="" />';
         }
         //$topic['jump_post'] = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $arr['post_id'] ."#forumpost" . $arr['post_id'] . "'>" . $last_post_icon . '</a>';
         $topic               = [];
@@ -530,8 +530,8 @@ 
             $topic['post_text'] = $post_text;
         }
         // START irmtfan remove hardcoded html in URLs
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_url       = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
         // END irmtfan remove hardcoded html in URLs
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_url']       = seo_urls($seo_url);
@@ -545,11 +545,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
 
@@ -582,9 +582,9 @@ 
     $extraCriteria = '';
     $time_criteria = null;
     if (!empty($options[2])) {
-        require_once __DIR__ . '/../include/functions.time.php';
+        require_once __DIR__.'/../include/functions.time.php';
         $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND topic_time > ' . $time_criteria;
+        $extraCriteria = ' AND topic_time > '.$time_criteria;
     }
     switch ($options[0]) {
         case 'topic':
@@ -592,7 +592,7 @@ 
         case 'digest':
             $extraCriteria = ' AND topic_digest = 1';
             if (null !== $time_criteria) {
-                $extraCriteria .= ' AND digest_time > ' . $time_criteria;
+                $extraCriteria .= ' AND digest_time > '.$time_criteria;
             }
             break;
         case 'sticky':
@@ -602,7 +602,7 @@ 
         default:
             $type = 'post';
             if (null !== $time_criteria) {
-                $extraCriteria = ' AND post_time > ' . $time_criteria;
+                $extraCriteria = ' AND post_time > '.$time_criteria;
             }
             break;
     }
@@ -626,17 +626,17 @@ 
     }
 
     if ('topic' === $type) {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+        $forumCriteria   = ' AND forum_id IN ('.implode(',', $allowedForums).')';
         $approveCriteria = ' AND approved = 1';
         $query           = 'SELECT DISTINCT topic_poster AS author, COUNT(*) AS count
-                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '
-                    WHERE topic_poster>0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY topic_poster ORDER BY ' . $order . ' DESC';
+                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics').'
+                    WHERE topic_poster>0 ' . $forumCriteria.$approveCriteria.$extraCriteria.' GROUP BY topic_poster ORDER BY '.$order.' DESC';
     } else {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+        $forumCriteria   = ' AND forum_id IN ('.implode(',', $allowedForums).')';
         $approveCriteria = ' AND approved = 1';
         $query           = 'SELECT DISTINCT uid AS author, COUNT(*) AS count
-                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '
-                    WHERE uid > 0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY uid ORDER BY ' . $order . ' DESC';
+                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts').'
+                    WHERE uid > 0 ' . $forumCriteria.$approveCriteria.$extraCriteria.' GROUP BY uid ORDER BY '.$order.' DESC';
     }
 
     $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
@@ -651,12 +651,12 @@ 
     if (count($author) < 1) {
         return $block;
     }
-    require_once __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname']);
     foreach (array_keys($author) as $uid) {
         $author[$uid]['name'] = $myts->htmlSpecialChars($author_name[$uid]);
     }
-    $block['authors']   =& $author;
+    $block['authors']   = & $author;
     $block['disp_mode'] = $options[3]; // 0 - full view; 1 - lite view;
     $block['indexNav']  = (int)$options[4];
 
@@ -669,45 +669,45 @@ 
  */
 function b_newbb_edit($options)
 {
-    require_once __DIR__ . '/../include/functions.forum.php';
+    require_once __DIR__.'/../include/functions.forum.php';
 
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='time'";
     if ('time' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TIME.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_FULL."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='2'";
     if (2 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+    $form .= '<br>'._MB_NEWBB_TITLE_LENGTH."<input type='text' name='options[5]' value='".$options[5]."' />";
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
@@ -716,7 +716,7 @@ 
     if ($isAll) {
         $form .= ' selected';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -729,64 +729,64 @@ 
  */
 function b_newbb_topic_edit($options)
 {
-    require_once __DIR__ . '/../include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once __DIR__.'/../include/functions.forum.php';
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='time'";
     if ('time' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TIME.'</option>';
     $form .= "<option value='views'";
     if ('views' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_VIEWS . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_VIEWS.'</option>';
     $form .= "<option value='replies'";
     if ('replies' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_REPLIES . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_REPLIES.'</option>';
     $form .= "<option value='digest'";
     if ('digest' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_DIGEST . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_DIGEST.'</option>';
     $form .= "<option value='sticky'";
     if ('sticky' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_STICKY . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_STICKY.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_FULL."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='2'";
     if (2 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+    $form .= '<br>'._MB_NEWBB_TITLE_LENGTH."<input type='text' name='options[5]' value='".$options[5]."' />";
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
 
@@ -796,7 +796,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -809,49 +809,49 @@ 
  */
 function b_newbb_post_edit($options)
 {
-    require_once __DIR__ . '/../include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once __DIR__.'/../include/functions.forum.php';
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='title'";
     if ('title' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TITLE . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TITLE.'</option>';
     $form .= "<option value='text'";
     if ('text' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TEXT . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TEXT.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_FULL."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='2'";
     if (2 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+    $form .= '<br>'._MB_NEWBB_TITLE_LENGTH."<input type='text' name='options[5]' value='".$options[5]."' />";
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
@@ -860,7 +860,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -873,53 +873,53 @@ 
  */
 function b_newbb_author_edit($options)
 {
-    require_once __DIR__ . '/../include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once __DIR__.'/../include/functions.forum.php';
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='post'";
     if ('post' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_POST . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_POST.'</option>';
     $form .= "<option value='topic'";
     if ('topic' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TOPIC . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TOPIC.'</option>';
     $form .= "<option value='digest'";
     if ('digest' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_DIGESTS . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_DIGESTS.'</option>';
     $form .= "<option value='sticky'";
     if ('sticky' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_STICKYS . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_STICKYS.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 5), 'b_newbb_array_filter'); // get allowed forums
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
@@ -928,7 +928,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -942,8 +942,8 @@ 
 function b_newbb_custom($options)
 {
     // if no newbb module block set, we have to include the language file
-    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php'))) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php');
+    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php'))) {
+        require_once $GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php');
     } else {
         require_once $GLOBALS['xoops']->path('modules/newbb/language/english/blocks.php');
     }
@@ -967,8 +967,8 @@ 
 {
 
     // if no newbb module block set, we have to include the language file
-    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php'))) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php');
+    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php'))) {
+        require_once $GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php');
     } else {
         require_once $GLOBALS['xoops']->path('modules/newbb/language/english/blocks.php');
     }
@@ -992,8 +992,8 @@ 
 {
 
     // if no newbb module block set, we have to include the language file
-    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php'))) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php');
+    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php'))) {
+        require_once $GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php');
     } else {
         require_once $GLOBALS['xoops']->path('modules/newbb/language/english/blocks.php');
     }
@@ -1016,8 +1016,8 @@ 
 function b_newbb_custom_author($options)
 {
     // if no newbb module block set, we have to include the language file
-    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php'))) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php');
+    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php'))) {
+        require_once $GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php');
     } else {
         require_once $GLOBALS['xoops']->path('modules/newbb/language/english/blocks.php');
     }

reply.php

Indentation +3 added lines, -3 removed lines

@@ -119,9 +119,9 @@
 $xoopsTpl->assign('parentforum', $forumHandler->getParents($forumObject));
 
 $xoopsTpl->assign([
-                      'forum_id'   => $forumObject->getVar('forum_id'),
-                      'forum_name' => $forumObject->getVar('forum_name')
-                  ]);
+                        'forum_id'   => $forumObject->getVar('forum_id'),
+                        'forum_name' => $forumObject->getVar('forum_name')
+                    ]);
 
 if ($postParentObject->getVar('uid')) {
     $r_name = newbbGetUnameFromId($postParentObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $forum    = Request::getInt('forum', 0, 'GET');
 $topic_id = Request::getInt('topic_id', 0, 'GET');
@@ -65,7 +65,7 @@ 
 
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $topicObject  = $topicHandler->get($topic_id);
@@ -78,7 +78,7 @@ 
     $query_array = [];
     foreach ($query_vars as $var) {
         if (Request::getString($var, '', 'GET')) {
-            $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+            $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
         }
     }
     $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
@@ -133,8 +133,8 @@ 
 $r_subject = $postParentObject->getVar('subject', 'E');
 
 $subject = $r_subject;
-if (!preg_match('/^(Re|' . _MD_NEWBB_RE . '):/i', $r_subject)) {
-    $subject = _MD_NEWBB_RE . ': ' . $r_subject;
+if (!preg_match('/^(Re|'._MD_NEWBB_RE.'):/i', $r_subject)) {
+    $subject = _MD_NEWBB_RE.': '.$r_subject;
 }
 
 $q_message = $postParentObject->getVar('post_text', 'e');
@@ -143,12 +143,12 @@ 
     if (1 === Request::getInt('quotedac', 0, 'GET')) {
         $message = "[quote]\n";
         $message .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $message .= "\n" . $q_message . '[/quote]';
+        $message .= "\n".$q_message.'[/quote]';
         $hidden  = '';
     } else {
         $hidden  = "[quote]\n";
         $hidden  .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $hidden  .= "\n" . $q_message . '[/quote]';
+        $hidden  .= "\n".$q_message.'[/quote]';
         $message = '';
     }
 } else {
@@ -167,7 +167,7 @@ 
 $post_karma    = 0;
 $require_reply = 0;
 
-include __DIR__ . '/include/form.post.php';
+include __DIR__.'/include/form.post.php';
 
 ///** @var Newbb\KarmaHandler $karmaHandler */
 //$karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
@@ -180,7 +180,7 @@ 
 foreach ($posts_contextObject as $post_contextObject) {
     // Sorry, in order to save queries, we have to hide the non-open post_text even if you have replied or have adequate karma, even an admin.
     if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
-        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
+        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')).'</div>';
     } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
         $p_message = _MD_NEWBB_REPLY_REQUIREMENT;
     } else {
@@ -198,11 +198,11 @@ 
 
     $posts_context[] = [
         'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
+        'meta'    => _MD_NEWBB_BY.' '.$p_name.' '._MD_NEWBB_ON.' '.$p_date,
         'content' => $p_message
     ];
 }
 $xoopsTpl->assign_by_ref('posts_context', $posts_context);
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

viewtopic.php

Indentation +25 added lines, -25 removed lines

@@ -209,12 +209,12 @@ 
 // END irmtfan improve infobox
 
 $xoopsTpl->assign([
-                      'topic_title'    => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?topic_id=' . $topic_id . '">' . $topicObject->getFullTitle() . '</a>',
-                      'forum_name'     => $forumObject->getVar('forum_name'),
-                      'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC,
-                      'lang_prevtopic' => _MD_NEWBB_PREVTOPIC,
-                      'topic_status'   => $topicObject->getVar('topic_status')
-                  ]);
+                        'topic_title'    => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?topic_id=' . $topic_id . '">' . $topicObject->getFullTitle() . '</a>',
+                        'forum_name'     => $forumObject->getVar('forum_name'),
+                        'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC,
+                        'lang_prevtopic' => _MD_NEWBB_PREVTOPIC,
+                        'topic_status'   => $topicObject->getVar('topic_status')
+                    ]);
 
 //$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
 $categoryObject = $categoryHandler->get($forumObject->getVar('cat_id'), ['cat_title']);
@@ -528,13 +528,13 @@ 
                 $xp_config     = $configHandler->getConfigsByCat(0, $pollModuleHandler->getVar('mid'));
 
                 $GLOBALS['xoopsTpl']->assign([
-                                                 'is_visible'      => $isVisible,
-                                                 'visible_message' => $visibleMsg,
-                                                 'disp_votes'      => $xp_config['disp_vote_nums'],
-                                                 'lang_vote'       => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'),
-                                                 'lang_results'    => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'),
-                                                 'back_link'       => ''
-                                             ]);
+                                                    'is_visible'      => $isVisible,
+                                                    'visible_message' => $visibleMsg,
+                                                    'disp_votes'      => $xp_config['disp_vote_nums'],
+                                                    'lang_vote'       => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'),
+                                                    'lang_results'    => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'),
+                                                    'back_link'       => ''
+                                                ]);
                 $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer';
                 /** @var Xoopspoll\Renderer $renderer */
                 $renderer = new $classRenderer($pollObject);
@@ -687,18 +687,18 @@ 
 }
 
 $xoopsTpl->assign([
-                      'lang_forum_index' => sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
-                      'lang_from'        => _MD_NEWBB_FROM,
-                      'lang_joined'      => _MD_NEWBB_JOINED,
-                      'lang_posts'       => _MD_NEWBB_POSTS,
-                      'lang_poster'      => _MD_NEWBB_POSTER,
-                      'lang_thread'      => _MD_NEWBB_THREAD,
-                      'lang_edit'        => _EDIT,
-                      'lang_delete'      => _DELETE,
-                      'lang_reply'       => _REPLY,
-                      'lang_postedon'    => _MD_NEWBB_POSTEDON,
-                      'lang_groups'      => _MD_NEWBB_GROUPS
-                  ]);
+                        'lang_forum_index' => sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
+                        'lang_from'        => _MD_NEWBB_FROM,
+                        'lang_joined'      => _MD_NEWBB_JOINED,
+                        'lang_posts'       => _MD_NEWBB_POSTS,
+                        'lang_poster'      => _MD_NEWBB_POSTER,
+                        'lang_thread'      => _MD_NEWBB_THREAD,
+                        'lang_edit'        => _EDIT,
+                        'lang_delete'      => _DELETE,
+                        'lang_reply'       => _REPLY,
+                        'lang_postedon'    => _MD_NEWBB_POSTEDON,
+                        'lang_groups'      => _MD_NEWBB_GROUPS
+                    ]);
 
 $viewmode_options = [];
 if ('DESC' === $order) {

Switch Indentation +12 added lines, -12 removed lines

@@ -714,18 +714,18 @@
 }
 
 switch ($status) {
-    case 'active':
-        $current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
-        break;
-    case 'pending':
-        $current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
-        break;
-    case 'deleted':
-        $current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
-        break;
-    default:
-        $current_status = '';
-        break;
+        case 'active':
+            $current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
+            break;
+        case 'pending':
+            $current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
+            break;
+        case 'deleted':
+            $current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
+            break;
+        default:
+            $current_status = '';
+            break;
 }
 $xoopsTpl->assign('topicstatus', $current_status);
 

Spacing +65 added lines, -65 removed lines

@@ -34,10 +34,10 @@ 
 use XoopsModules\Newbb;
 use XoopsModules\Xoopspoll;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $xoopsLogger->startTime('newBB_viewtopic');
-require_once __DIR__ . '/include/functions.read.php';
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.read.php';
+require_once __DIR__.'/include/functions.render.php';
 xoops_loadLanguage('user');
 
 /*Build the page query*/
@@ -45,7 +45,7 @@ 
 $query_array = [];
 foreach ($query_vars as $var) {
     if (Request::getString($var, '', 'GET')) {
-        $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+        $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
     }
 }
 $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
@@ -73,7 +73,7 @@ 
 }
 
 if (!$topic_id && !$post_id) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/'.$xoopsModule->getVar('dirname').'/index.php' : XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum={$forum_id}";
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
@@ -90,7 +90,7 @@ 
 }
 
 if (!is_object($topicObject) || !$topic_id = $topicObject->getVar('topic_id')) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/'.$xoopsModule->getVar('dirname').'/index.php' : XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum={$forum_id}";
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 $forum_id = $topicObject->getVar('forum_id');
@@ -102,7 +102,7 @@ 
 
 if ((!$isAdmin && $topicObject->getVar('approved') < 0) || (!$forumHandler->getPermission($forumObject))
     || (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view'))) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?forum='.$forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 
 // START irmtfan - find if topic is read or unread - for all users (member and anon)
@@ -128,7 +128,7 @@ 
         // hack jump to last post read if post_id is empty - is there any better way?
         if (empty($post_id) && $topic_is_unread
             && !empty($GLOBALS['xoopsModuleConfig']['jump_to_topic_last_post_read_enabled'])) {
-            header('Location: ' . Request::getString('REQUEST_URI', '', 'SERVER') . '&post_id=' . $topic_last_post_time_or_id_read);
+            header('Location: '.Request::getString('REQUEST_URI', '', 'SERVER').'&post_id='.$topic_last_post_time_or_id_read);
         }
     }
 }
@@ -167,7 +167,7 @@ 
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forumObject->getVar('forum_id') . '" />
+    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forumObject->getVar('forum_id').'" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 
@@ -195,11 +195,11 @@ 
         'collapse' => $iconHandler->getImageSource('more')
     ];
     if (1 == $infobox['show']) {
-        $infobox['style'] = 'none';        //irmtfan move semicolon
+        $infobox['style'] = 'none'; //irmtfan move semicolon
         $infobox['alt']   = _MD_NEWBB_SEEUSERDATA;
         $infobox['src']   = 'more';
     } else {
-        $infobox['style'] = 'block';        //irmtfan move semicolon
+        $infobox['style'] = 'block'; //irmtfan move semicolon
         $infobox['alt']   = _MD_NEWBB_HIDEUSERDATA;
         $infobox['src']   = 'less';
     }
@@ -209,7 +209,7 @@ 
 // END irmtfan improve infobox
 
 $xoopsTpl->assign([
-                      'topic_title'    => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?topic_id=' . $topic_id . '">' . $topicObject->getFullTitle() . '</a>',
+                      'topic_title'    => '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?topic_id='.$topic_id.'">'.$topicObject->getFullTitle().'</a>',
                       'forum_name'     => $forumObject->getVar('forum_name'),
                       'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC,
                       'lang_prevtopic' => _MD_NEWBB_PREVTOPIC,
@@ -231,20 +231,20 @@ 
 $t_reply = newbbDisplayImage('t_reply', _MD_NEWBB_REPLY);
 // irmtfan show topic status if show reg is 0 and revise forum_post_or_register
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'post')) {
-    $xoopsTpl->assign('forum_post', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/newtopic.php?forum=' . $forum_id . '"> ' . $t_new . '</a>');
+    $xoopsTpl->assign('forum_post', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/newtopic.php?forum='.$forum_id.'"> '.$t_new.'</a>');
 } else {
     if ($topicObject->getVar('topic_status')) {
         $xoopsTpl->assign('topic_lock', _MD_NEWBB_TOPICLOCKED);
     }
     if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $xoopsTpl->assign('forum_register', '<a href="' . XOOPS_URL . '/user.php?xoops_redirect=' . htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5) . '">' . _MD_NEWBB_REGTOPOST . '</a>');
+        $xoopsTpl->assign('forum_register', '<a href="'.XOOPS_URL.'/user.php?xoops_redirect='.htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5).'">'._MD_NEWBB_REGTOPOST.'</a>');
     }
 }
 // irmtfan for backward compatibility assign forum_post_or_register smarty again.
-$xoopsTpl->assign('forum_post_or_register', @$xoopsTpl->get_template_vars('forum_post') . @$xoopsTpl->get_template_vars('forum_register') . @$xoopsTpl->get_template_vars('topic_lock'));
+$xoopsTpl->assign('forum_post_or_register', @$xoopsTpl->get_template_vars('forum_post').@$xoopsTpl->get_template_vars('forum_register').@$xoopsTpl->get_template_vars('topic_lock'));
 
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')) {
-    $xoopsTpl->assign('forum_reply', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/reply.php?topic_id=' . $topic_id . '"> ' . $t_reply . '</a>');
+    $xoopsTpl->assign('forum_reply', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/reply.php?topic_id='.$topic_id.'"> '.$t_reply.'</a>');
 }
 
 $poster_array  = [];
@@ -265,7 +265,7 @@ 
     /** @var \XoopsMemberHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $userid_array  = array_keys($poster_array);
-    $user_criteria = '(' . implode(',', $userid_array) . ')';
+    $user_criteria = '('.implode(',', $userid_array).')';
     $users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
 } else {
     $users = [];
@@ -283,10 +283,10 @@ 
 
 if ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $require_reply) {
     if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
-        $viewtopic_posters = newbbGetSession('t' . $topic_id, true);
+        $viewtopic_posters = newbbGetSession('t'.$topic_id, true);
         if (!is_array($viewtopic_posters) || 0 === count($viewtopic_posters)) {
             $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
-            newbbSetSession('t' . $topic_id, $viewtopic_posters);
+            newbbSetSession('t'.$topic_id, $viewtopic_posters);
         }
     } else {
         $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
@@ -302,7 +302,7 @@ 
         'post_date'       => 0,
         'post_image'      => '',
         'post_title'      => '',
-        'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>' . xoops_getbanner() . '</div>',
+        'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>'.xoops_getbanner().'</div>',
         'post_attachment' => '',
         'post_edit'       => 0,
         'post_no'         => 0,
@@ -339,7 +339,7 @@ 
 if ($total_posts > $GLOBALS['xoopsModuleConfig']['posts_per_page']) {
     include $GLOBALS['xoops']->path('class/pagenav.php');
 
-    $nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id=' . $topic_id . '&amp;order=' . $order . '&amp;status=' . $status . '&amp;mode=' . $mode);
+    $nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id='.$topic_id.'&amp;order='.$order.'&amp;status='.$status.'&amp;mode='.$mode);
     //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite']) && $GLOBALS['xoopsModuleConfig']['do_rewrite'] === 1) $nav->url = XOOPS_URL . $nav->url;
     if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
         $navi = $nav->renderSelect();
@@ -359,7 +359,7 @@ 
 }
 
 if (!empty($postsArray[$post_id])) {
-    $xoops_pagetitle = $postsArray[$post_id]->getVar('subject') . ' [' . $forumObject->getVar('forum_name') . ']';
+    $xoops_pagetitle = $postsArray[$post_id]->getVar('subject').' ['.$forumObject->getVar('forum_name').']';
     $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
     $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
     $kw                             = array_unique(explode(' ', strip_tags($postsArray[$post_id]->getVar('post_text')), 150));
@@ -368,7 +368,7 @@ 
     $z     = 0;
     foreach ($kw as $k) {
         if ($z < 30 && strlen(trim($k)) > 5) {
-            $kwort .= trim($k) . ' ';
+            $kwort .= trim($k).' ';
             ++$z;
         }
     }
@@ -395,56 +395,56 @@ 
 // START irmtfan add restore to viewtopic
 // if the topic is active
 if ($topicObject->getVar('approved') > 0) {
-    $admin_actions['merge']  = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=merge&amp;topic_id=' . $topic_id,
+    $admin_actions['merge'] = [
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=merge&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_MERGETOPIC,
         'image' => $ad_merge
     ];
-    $admin_actions['move']   = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=move&amp;topic_id=' . $topic_id,
+    $admin_actions['move'] = [
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=move&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_MOVETOPIC,
         'image' => $ad_move
     ];
     $admin_actions['delete'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=delete&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=delete&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_DELETETOPIC,
         'image' => $ad_delete
     ];
     if (!$topicObject->getVar('topic_status')) {
         $admin_actions['lock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=lock&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=lock&amp;topic_id='.$topic_id,
             'image' => $ad_lock,
             'name'  => _MD_NEWBB_LOCKTOPIC
         ];
     } else {
         $admin_actions['unlock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unlock&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=unlock&amp;topic_id='.$topic_id,
             'image' => $ad_unlock,
             'name'  => _MD_NEWBB_UNLOCKTOPIC
         ];
     }
     if (!$topicObject->getVar('topic_sticky')) {
         $admin_actions['sticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=sticky&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=sticky&amp;topic_id='.$topic_id,
             'image' => $ad_sticky,
             'name'  => _MD_NEWBB_STICKYTOPIC
         ];
     } else {
         $admin_actions['unsticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unsticky&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=unsticky&amp;topic_id='.$topic_id,
             'image' => $ad_unsticky,
             'name'  => _MD_NEWBB_UNSTICKYTOPIC
         ];
     }
     if (!$topicObject->getVar('topic_digest')) {
         $admin_actions['digest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=digest&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=digest&amp;topic_id='.$topic_id,
             'image' => $ad_digest,
             'name'  => _MD_NEWBB_DIGESTTOPIC
         ];
     } else {
         $admin_actions['undigest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=undigest&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=undigest&amp;topic_id='.$topic_id,
             'image' => $ad_undigest,
             'name'  => _MD_NEWBB_UNDIGESTTOPIC
         ];
@@ -452,7 +452,7 @@ 
     // if the topic is pending/deleted then restore/approve
 } else {
     $admin_actions['restore'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=restore&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=restore&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_RESTORETOPIC,
         'image' => $ad_restore
     ];
@@ -531,11 +531,11 @@ 
                                                  'is_visible'      => $isVisible,
                                                  'visible_message' => $visibleMsg,
                                                  'disp_votes'      => $xp_config['disp_vote_nums'],
-                                                 'lang_vote'       => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'),
-                                                 'lang_results'    => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'),
+                                                 'lang_vote'       => constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_VOTE'),
+                                                 'lang_results'    => constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_RESULTS'),
                                                  'back_link'       => ''
                                              ]);
-                $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer';
+                $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Renderer';
                 /** @var Xoopspoll\Renderer $renderer */
                 $renderer = new $classRenderer($pollObject);
                 // check to see if user has voted, show form if not, otherwise get results for form
@@ -547,7 +547,7 @@ 
                     $myTpl = new \XoopsTpl();
                     $renderer->assignForm($myTpl);
                     $myTpl->assign('action', $GLOBALS['xoops']->url("modules/newbb/votepolls.php?topic_id={$topic_id}&amp;poll_id={$poll_id}"));
-                    $topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/templates/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '_view.tpl'));
+                    $topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/templates/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'_view.tpl'));
                     $GLOBALS['xoopsTpl']->assign('topic_pollform', $topic_pollform);
                 } else {
                     $GLOBALS['xoopsTpl']->assign('can_vote', false);
@@ -558,7 +558,7 @@ 
             // old xoopspoll or umfrage or any clone from them
         } else {
             $pollObject    = new $classPoll($poll_id);
-            $classRenderer = $classPoll . 'Renderer';
+            $classRenderer = $classPoll.'Renderer';
             $renderer      = new $classRenderer($pollObject);
             $xoopsTpl->assign('lang_alreadyvoted2', _PL_ALREADYVOTED2);
             $xoopsTpl->assign('has_ended', $pollObject->getVar('end_time') < time() ? 1 : 0);
@@ -579,7 +579,7 @@ 
 
                 }
             }
-            $classLog = $classPoll . 'Log';
+            $classLog = $classPoll.'Log';
             $hasvoted = 0;
             if ($GLOBALS['xoopsUser']) {
                 if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $uid)) {
@@ -595,12 +595,12 @@ 
             if ($hasvoted || $pollObject->hasExpired()) {
                 $renderer->assignResults($xoopsTpl);
                 $xoopsTpl->assign('topic_pollresult', 1);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
+                setcookie('newbb_polls['.$poll_id.']', 1);
             } else {
                 $renderer->assignForm($xoopsTpl);
                 $xoopsTpl->assign('lang_vote', _PL_VOTE);
                 $xoopsTpl->assign('lang_results', _PL_RESULTS);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
+                setcookie('newbb_polls['.$poll_id.']', 1);
             }
         }
     }
@@ -611,7 +611,7 @@ 
             if (is_object($GLOBALS['xoopsUser'])
                 && $GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster')) {
                 $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-                $xoopsTpl->assign('forum_addpoll', '<a href=\'' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=add&amp;topic_id=' . $topic_id . '\'>' . $t_poll . '</a>');
+                $xoopsTpl->assign('forum_addpoll', '<a href=\''.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=add&amp;topic_id='.$topic_id.'\'>'.$t_poll.'</a>');
             }
         } elseif ($isAdmin
                   || (is_object($pollObject) && is_object($GLOBALS['xoopsUser'])
@@ -623,22 +623,22 @@ 
 
             $adminpoll_actions                = [];
             $adminpoll_actions['editpoll']    = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=edit&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=edit&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id,
                 'image' => $poll_edit,
                 'name'  => _MD_NEWBB_EDITPOLL
             ];
-            $adminpoll_actions['deletepoll']  = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=delete&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+            $adminpoll_actions['deletepoll'] = [
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=delete&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id,
                 'image' => $poll_delete,
                 'name'  => _MD_NEWBB_DELETEPOLL
             ];
             $adminpoll_actions['restartpoll'] = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=restart&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=restart&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id.'&amp;forum='.$forum_id,
                 'image' => $poll_restart,
                 'name'  => _MD_NEWBB_RESTARTPOLL
             ];
-            $adminpoll_actions['logpoll']     = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=log&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+            $adminpoll_actions['logpoll'] = [
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=log&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id.'&amp;forum='.$forum_id,
                 'image' => $poll_log,
                 'name'  => _MD_NEWBB_POLL_VIEWLOG
             ];
@@ -670,7 +670,7 @@ 
         $rating_img = newbbDisplayImage('blank');
     } else {
         // irmtfan - add alt key for rating
-        $rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
+        $rating_img = newbbDisplayImage('rate'.$rating, constant('_MD_NEWBB_RATE'.$rating));
     }
     $xoopsTpl->assign('rating_img', $rating_img);
     $xoopsTpl->assign('rate1', newbbDisplayImage('rate1', _MD_NEWBB_RATE1));
@@ -682,7 +682,7 @@ 
 
 // create jump box
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
@@ -703,25 +703,25 @@ 
 $viewmode_options = [];
 if ('DESC' === $order) {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id='.$topic_id,
         'title' => _OLDESTFIRST
     ];
 } else {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id='.$topic_id,
         'title' => _NEWESTFIRST
     ];
 }
 
 switch ($status) {
     case 'active':
-        $current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
+        $current_status = '['._MD_NEWBB_TYPE_ADMIN.']';
         break;
     case 'pending':
-        $current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
+        $current_status = '['._MD_NEWBB_TYPE_PENDING.']';
         break;
     case 'deleted':
-        $current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
+        $current_status = '['._MD_NEWBB_TYPE_DELETED.']';
         break;
     default:
         $current_status = '';
@@ -744,7 +744,7 @@ 
     && $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')
     && $moderateHandler->verifyUser(-1, '', $forumObject->getVar('forum_id'))) {
     // END irmtfan add verifyUser to quick reply
-    $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/post.php', 'post', true);
+    $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/post.php', 'post', true);
     if (!is_object($GLOBALS['xoopsUser'])) {
         //$configHandler = xoops_getHandler('config');
         $user_tray = new \XoopsFormElementTray(_MD_NEWBB_ACCOUNT);
@@ -779,7 +779,7 @@ 
 
     $forum_form->addElement(new \XoopsFormHidden('isreply', 1));
 
-    $forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE . ': ' . $topicObject->getVar('topic_title', 'e')));
+    $forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE.': '.$topicObject->getVar('topic_title', 'e')));
     $forum_form->addElement(new \XoopsFormHidden('pid', empty($post_id) ? $topicHandler->getTopPostId($topic_id) : $post_id));
     $forum_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
     $forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
@@ -791,7 +791,7 @@ 
     $forum_form->addElement(new \XoopsFormHidden('contents_submit', 1));
 
     $submit_button = new \XoopsFormButton('', 'quick_submit', _SUBMIT, 'submit');
-    $submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\'' . _MD_NEWBB_QUICKREPLY_EMPTY . '\'); return false;} else { return true;}"');
+    $submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\''._MD_NEWBB_QUICKREPLY_EMPTY.'\'); return false;} else { return true;}"');
     $forum_form->addElement($submit_button);
 
     $toggles = newbbGetCookie('G', true);
@@ -806,13 +806,13 @@ 
     $quickreply['show']   = 1; // = !empty($GLOBALS['xoopsModuleConfig']['quickreply_enabled']
     $quickreply['expand'] = (count($toggles) > 0) ? (in_array('qr', $toggles, true) ? false : true) : true;
     if ($quickreply['expand']) {
-        $quickreply['style']     = 'block';        //irmtfan move semicolon
+        $quickreply['style']     = 'block'; //irmtfan move semicolon
         $quickreply_icon_display = $qr_expand;
-        $quickreply_alt          = _MD_NEWBB_HIDE . ' ' . _MD_NEWBB_QUICKREPLY;
+        $quickreply_alt          = _MD_NEWBB_HIDE.' '._MD_NEWBB_QUICKREPLY;
     } else {
-        $quickreply['style']     = 'none';        //irmtfan move semicolon
+        $quickreply['style']     = 'none'; //irmtfan move semicolon
         $quickreply_icon_display = $qr_collapse;
-        $quickreply_alt          = _MD_NEWBB_SEE . ' ' . _MD_NEWBB_QUICKREPLY;
+        $quickreply_alt          = _MD_NEWBB_SEE.' '._MD_NEWBB_QUICKREPLY;
     }
     $quickreply['displayImage'] = newbbDisplayImage($quickreply_icon_display, $quickreply_alt);
     $quickreply['form']         = $forum_form->render();
@@ -828,6 +828,6 @@ 
     $xoopsTpl->assign('tagbar', tagBar($topicObject->getVar('topic_tags', 'n')));
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');
 $xoopsLogger->stopTime('newBB_viewtopic');

delete.php

Indentation +7 added lines, -7 removed lines

@@ -144,13 +144,13 @@
           </div>';
     if ($isAdmin) {
         xoops_confirm([
-                          'post_id'  => $post_id,
-                          'viewmode' => $viewmode,
-                          'order'    => $order,
-                          'forum'    => $forum,
-                          'topic_id' => $topic_id,
-                          'ok'       => 99
-                      ], 'delete.php', _MD_NEWBB_DEL_RELATED);
+                            'post_id'  => $post_id,
+                            'viewmode' => $viewmode,
+                            'order'    => $order,
+                            'forum'    => $forum,
+                            'topic_id' => $topic_id,
+                            'ok'       => 99
+                        ], 'delete.php', _MD_NEWBB_DEL_RELATED);
     }
     include $GLOBALS['xoops']->path('footer.php');
 }

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $ok = Request::getInt('ok', 0, 'POST');
 
@@ -43,15 +43,15 @@ 
 }
 $topic_id = $topic->getVar('topic_id');
 if (!$topic_id) {
-    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum='.$forum;
+    $redirect = XOOPS_URL.'/modules/newbb/'.$redirect;
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 $forum       = $topic->getVar('forum_id');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $isAdmin = newbbIsAdmin($forumObject);
@@ -62,11 +62,11 @@ 
 $topic_status = $topic->getVar('topic_status');
 if (($postObject->checkIdentity() || $isAdmin) && $topicHandler->getPermission($topic->getVar('forum_id'), $topic_status, 'delete')) {
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
 }
 
 if (!$isAdmin && !$postObject->checkTimelimit('delete_timelimit')) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -82,7 +82,7 @@ 
     }
     if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
         //$postHandler->emptyTopic($postObject);
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
     } else {
         if (Request::getString('post_text', '', 'POST')) {
             //send a message
@@ -101,11 +101,11 @@ 
                 $xoopsMailer->setToUsers($senduser);
                 $xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
                 $xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
-                $forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
+                $forenurl = '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postObject->getVar('topic_id').'">'.$postObject->getVar('subject').'</a>';
                 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
                     $forenurl = seo_urls($forenurl);
                 }
-                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
+                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL.'/');
                 $body = $myts->nl2Br($body);
                 $xoopsMailer->setBody($body);
                 $xoopsMailer->send();
@@ -121,25 +121,25 @@ 
 
     //$postObject->loadFilters('delete');
     if ($isDeleteOne) {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
     } else {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
     }
 } else {
     include $GLOBALS['xoops']->path('header.php');
     //xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
-    echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
-          <form method="post" action="' . XOOPS_URL . '/modules/newbb/delete.php">';
-    echo _MD_NEWBB_DELEDEDMSG . '<br>';
+    echo '<div class="confirmMsg">'._MD_NEWBB_DEL_ONE.'<br>
+          <form method="post" action="' . XOOPS_URL.'/modules/newbb/delete.php">';
+    echo _MD_NEWBB_DELEDEDMSG.'<br>';
     echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
-    echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="order" value="' . htmlspecialchars($order, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5) . '" />';
+    echo '<input type="hidden" name="post_id" value="'.htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="order" value="'.htmlspecialchars($order, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="forum" value="'.htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="topic_id" value="'.htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5).'" />';
     echo '<input type="hidden" name="ok" value="1" />';
     echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-    echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
-          <input type="button" name="confirm_back" value="' . _CANCEL . '" onclick="history.go(-1);" title="' . _CANCEL . '" />
+    echo '<input type="submit" name="confirm_submit" value="'._SUBMIT.'" title="'._SUBMIT.'"/>
+          <input type="button" name="confirm_back" value="' . _CANCEL.'" onclick="history.go(-1);" title="'._CANCEL.'" />
           </form>
           </div>';
     if ($isAdmin) {

language/english/common.php

Spacing +35 added lines, -35 removed lines

@@ -21,49 +21,49 @@
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
 
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
 
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
 
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');