Scrutinizer

Author: mambax7

class/ForumHandler.php

@@ -818,7 +818,7 @@ public function getSubforumStats($passedSubForums = null)
 
 
 
-        if (!$forums_id) {
+        if (empty($forums_id)) {
             return $stats;
         }
         $sql = '    SELECT forum_posts AS posts, forum_topics AS topics, forum_id AS id' . '    FROM ' . $this->table . '    WHERE forum_id IN (' . \implode(', ', $forums_id) . ')';

dl_attachment.php

@@ -11,11 +11,15 @@
 
 use Xmf\Request;
 use XoopsModules\Newbb\{
+    ForumHandler,
     Post,
-    PostHandler
+    PostHandler,
+    TopicHandler
 };
 /** @var Post $forumpost */
 /** @var PostHandler $postHandler */
+/** @var TopicHandler $topicHandler */
+/** @var ForumHandler $forumHandler */
 
 ob_start();
 require_once __DIR__ . '/header.php';
@@ -28,22 +32,17 @@
     exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $postId . '; attachid' . $attachId);
 }
 
-///** @var Newbb\PostHandler $postHandler */
 //$postHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Post');
-
-
 $forumpost = $postHandler->get($postId);
 if (!$approved = $forumpost->getVar('approved')) {
     exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
-///** @var TopicHandler $topicHandler */
 //$topicHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Topic');
 $topicObject = $topicHandler->getByPost($postId);
 $topic_id    = $topicObject->getVar('topic_id');
 if (!$approved = $topicObject->getVar('approved')) {
     exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
-///** @var NewbbForumHandler $forumHandler */
 //$forumHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($topicObject->getVar('forum_id'));
 if (!$forumHandler->getPermission($forumObject)) {

include/functions.read.php

@@ -46,6 +46,7 @@ function newbbSetRead($type, $item_id, $post_id, $uid = null)
      */
     function newbbGetRead($type, $item_id, $uid = null)
     {
+        /** @var ReadHandler $readHandler */
         $readHandler = Helper::getInstance()->getHandler('Read' . $type);
 
         return $readHandler->getRead($item_id, $uid);
@@ -58,9 +59,10 @@ function newbbGetRead($type, $item_id, $uid = null)
      */
     function newbbSetReadforum($status = 0, $uid = null)
     {
-        $ReadforumHandler = Helper::getInstance()->getHandler('Readforum');
+        /** @var ReadHandler $readforumHandler */
+        $readforumHandler = Helper::getInstance()->getHandler('Readforum');
 
-        return $ReadforumHandler->setReadItems($status, $uid);
+        return $readforumHandler->setReadItems($status, $uid);
     }
 
     /**
@@ -71,6 +73,7 @@ function newbbSetReadforum($status = 0, $uid = null)
      */
     function newbbSetReadTopic($status = 0, $forum_id = 0, $uid = null)
     {
+        /** @var ReadHandler $readTopicHandler */
         $readTopicHandler = Helper::getInstance()->getHandler('Readtopic');
 
         return $readTopicHandler->setReadItems($status, $forum_id, $uid);
@@ -84,6 +87,7 @@ function newbbSetReadTopic($status = 0, $forum_id = 0, $uid = null)
      */
     function newbbIsRead($type, $items, $uid = null)
     {
+        /** @var ReadHandler $readHandler */
         $readHandler = Helper::getInstance()->getHandler('Read' . $type);
 
         return $readHandler->isReadItems($items, $uid);

include/search.inc.php

@@ -69,7 +69,7 @@ function newbb_search(
     if (count($validForums) > 0) {
         $criteriaPermissions = new \CriteriaCompo();
         $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
-        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
+        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), ['forum_name'], false);
     }
 
     if (is_numeric($userid) && 0 !== $userid) {

include/sitemap.plugin.php

@@ -47,7 +47,7 @@ function b_sitemap_newbb()
     /* Fetch forum data */
     $forums_available = array_merge($forums_top_id, $forums_sub_id);
     $forums_array     = [];
-    if ($forums_available) {
+    if (!empty($forums_available)) {
         $crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
         $crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
         $crit_forum->setOrder('ASC');

post.php

@@ -22,12 +22,14 @@
     ForumHandler,
     TopicHandler,
     OnlineHandler,
+    Post,
     PostHandler
 };
 /** @var ForumHandler $forumHandler */
 /** @var TopicHandler $topicHandler */
 /** @var OnlineHandler $onlineHandler */
 /** @var PostHandler $postHandler */
+/** @var Post $postObject */
 
 require_once __DIR__ . '/header.php';
 
@@ -58,7 +60,6 @@
 //$postHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Post');
 
 if (!empty($isedit) && $post_id > 0) {
-    /** @var Post $postObject */
     $postObject = $postHandler->get($post_id);
     $topic_id   = $postObject->getVar('topic_id');
 } else {

viewtopic.php

@@ -38,6 +38,7 @@
 /** @var Post $eachpost */
 
 use XoopsModules\Xoopspoll;
+use XoopsModules\Xoopspoll\Helper as PollHelper;
 /** @var Xoopspoll\Poll $pollObject */
 /** @var Xoopspoll\LogHandler $logHandler */
 
@@ -522,7 +523,7 @@
         $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 201) {
-            $xpollHandler = Helper::getInstance()->getHandler('Poll');
+            $xpollHandler = PollHelper::getInstance()->getHandler('Poll');
             $pollObject = $xpollHandler->get($poll_id);
             if (is_object($pollObject)) {
                 /* check to see if user has rights to view the results */