mambax7 / newbb5

ratethread.php

Indentation +29 added lines, -29 removed lines

@@ -37,48 +37,48 @@ 
 $anonwaitdays = 1;
 $ip           = \Xmf\IPAddress::fromRequest()->asReadable();
 foreach (['topic_id', 'rate', 'forum'] as $var) {
-    //    ${$var} = isset($_POST[$var]) ? (int)($_POST[$var]) : (isset($_GET[$var])?(int)($_GET[$var]):0);
-    ${$var} = Request::getInt($var, Request::getInt($var, 0, 'POST'), 'GET');
+	//    ${$var} = isset($_POST[$var]) ? (int)($_POST[$var]) : (isset($_GET[$var])?(int)($_GET[$var]):0);
+	${$var} = Request::getInt($var, Request::getInt($var, 0, 'POST'), 'GET');
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
 //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
 $topicObject = $topicHandler->get($topic_id);
 if (!$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'post')
-    && !$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'reply')) {
-    // irmtfan - issue with javascript:history.go(-1)
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _NOPERM);
+	&& !$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'reply')) {
+	// irmtfan - issue with javascript:history.go(-1)
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _NOPERM);
 }
 
 if (empty($rate)) {
-    redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_NOVOTERATE);
+	redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_NOVOTERATE);
 }
 ///** @var Newbb\RateHandler $rateHandler */
 //$rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
 if (0 !== $ratinguser) {
-    // Check if Topic POSTER is voting (UNLESS Anonymous users allowed to post)
-    $crit_post = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-    $crit_post->add(new \Criteria('uid', $ratinguser));
-    //    /** @var Newbb\PostHandler $postHandler */
-    //    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-    if ($postHandler->getCount($crit_post)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_CANTVOTEOWN);
-    }
-    // Check if REG user is trying to vote twice.
-    $crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-    $crit_rate->add(new \Criteria('ratinguser', $ratinguser));
-    if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
-    }
+	// Check if Topic POSTER is voting (UNLESS Anonymous users allowed to post)
+	$crit_post = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+	$crit_post->add(new \Criteria('uid', $ratinguser));
+	//    /** @var Newbb\PostHandler $postHandler */
+	//    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+	if ($postHandler->getCount($crit_post)) {
+		redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_CANTVOTEOWN);
+	}
+	// Check if REG user is trying to vote twice.
+	$crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+	$crit_rate->add(new \Criteria('ratinguser', $ratinguser));
+	if ($rateHandler->getCount($crit_rate)) {
+		redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+	}
 } else {
-    // Check if ANONYMOUS user is trying to vote more than once per day.
-    $crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-    $crit_rate->add(new \Criteria('ratinguser', $ratinguser));
-    $crit_rate->add(new \Criteria('ratinghostname', $ip));
-    $crit_rate->add(new \Criteria('ratingtimestamp', time() - (86400 * $anonwaitdays), '>'));
-    if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
-    }
+	// Check if ANONYMOUS user is trying to vote more than once per day.
+	$crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+	$crit_rate->add(new \Criteria('ratinguser', $ratinguser));
+	$crit_rate->add(new \Criteria('ratinghostname', $ip));
+	$crit_rate->add(new \Criteria('ratingtimestamp', time() - (86400 * $anonwaitdays), '>'));
+	if ($rateHandler->getCount($crit_rate)) {
+		redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+	}
 }
 $rateObject = $rateHandler->create();
 $rateObject->setVar('rating', $rate * 2);
@@ -94,7 +94,7 @@ 
 $votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
 $totalrating = 0;
 while (false !== (list($rating) = $GLOBALS['xoopsDB']->fetchRow($voteresult))) {
-    $totalrating += $rating;
+	$totalrating += $rating;
 }
 $finalrating = $totalrating / $votesDB;
 $finalrating = number_format($finalrating, 4);

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $ratinguser   = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 $anonwaitdays = 1;
@@ -51,7 +51,7 @@ 
 }
 
 if (empty($rate)) {
-    redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_NOVOTERATE);
+    redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_NOVOTERATE);
 }
 ///** @var Newbb\RateHandler $rateHandler */
 //$rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
@@ -62,13 +62,13 @@ 
     //    /** @var Newbb\PostHandler $postHandler */
     //    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
     if ($postHandler->getCount($crit_post)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_CANTVOTEOWN);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_CANTVOTEOWN);
     }
     // Check if REG user is trying to vote twice.
     $crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
     $crit_rate->add(new \Criteria('ratinguser', $ratinguser));
     if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_VOTEONCE);
     }
 } else {
     // Check if ANONYMOUS user is trying to vote more than once per day.
@@ -77,7 +77,7 @@ 
     $crit_rate->add(new \Criteria('ratinghostname', $ip));
     $crit_rate->add(new \Criteria('ratingtimestamp', time() - (86400 * $anonwaitdays), '>'));
     if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_VOTEONCE);
     }
 }
 $rateObject = $rateHandler->create();
@@ -89,7 +89,7 @@ 
 
 $ratingid = $rateHandler->insert($rateObject);
 
-$query       = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' WHERE topic_id = ' . $topic_id . ' ';
+$query       = 'SELECT rating FROM '.$GLOBALS['xoopsDB']->prefix('newbb_votedata').' WHERE topic_id = '.$topic_id.' ';
 $voteresult  = $GLOBALS['xoopsDB']->query($query);
 $votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
 $totalrating = 0;
@@ -101,7 +101,7 @@ 
 $sql         = sprintf('UPDATE "%s" SET rating = "%u", votes = "%u" WHERE topic_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $finalrating, $votesDB, $topic_id);
 $GLOBALS['xoopsDB']->queryF($sql);
 
-$ratemessage = _MD_NEWBB_VOTEAPPRE . '<br>' . sprintf(_MD_NEWBB_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
-redirect_header('viewtopic.php?topic_id=' . $topic_id . '&amp;forum=' . $forum . '', 2, $ratemessage);
+$ratemessage = _MD_NEWBB_VOTEAPPRE.'<br>'.sprintf(_MD_NEWBB_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
+redirect_header('viewtopic.php?topic_id='.$topic_id.'&amp;forum='.$forum.'', 2, $ratemessage);
 // irmtfan enhance include footer.php
 require_once $GLOBALS['xoops']->path('footer.php');

header.php

Indentation +35 added lines, -35 removed lines

@@ -23,42 +23,42 @@ 
 //require_once $GLOBALS['xoops']->path('header.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
-    /* for seo */
-    $toseo_url = ['index.php', 'viewforum.php', 'viewtopic.php', 'rss.php'];
+	require_once __DIR__ . '/seo_url.php';
+	/* for seo */
+	$toseo_url = ['index.php', 'viewforum.php', 'viewtopic.php', 'rss.php'];
 
-    if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)
-        && (false === strpos(getenv('REQUEST_URI'), '.html'))) {
-        $redir = false;
-        if (true === strpos(getenv('REQUEST_URI'), 'mark_read=') || true === strpos(getenv('REQUEST_URI'), 'mark=')) {
-            // Mark Forums
-        } else {
-            if (in_array(basename(getenv('SCRIPT_NAME')), $toseo_url)) {
-                //rewrite only for files
+	if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)
+		&& (false === strpos(getenv('REQUEST_URI'), '.html'))) {
+		$redir = false;
+		if (true === strpos(getenv('REQUEST_URI'), 'mark_read=') || true === strpos(getenv('REQUEST_URI'), 'mark=')) {
+			// Mark Forums
+		} else {
+			if (in_array(basename(getenv('SCRIPT_NAME')), $toseo_url)) {
+				//rewrite only for files
 
-                if ('' !== trim(getenv('SCRIPT_NAME'))) {
-                    if (false === strpos(getenv('REQUEST_URI'), '/' . SEO_MODULE_NAME . '/')) {
-                        $redir = true;
-                    } elseif (getenv('QUERY_STRING')) {
-                        $redir = true;
-                    }
-                }
-            }
-        }
+				if ('' !== trim(getenv('SCRIPT_NAME'))) {
+					if (false === strpos(getenv('REQUEST_URI'), '/' . SEO_MODULE_NAME . '/')) {
+						$redir = true;
+					} elseif (getenv('QUERY_STRING')) {
+						$redir = true;
+					}
+				}
+			}
+		}
 
-        if (true === $redir) {
-            $s      = 'http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI');
-            $s      = str_replace('/' . REAL_MODULE_NAME . '/', '/' . SEO_MODULE_NAME . '/', $s);
-            $newurl = seo_urls('<a href="' . $s . '"></a>');
-            $newurl = str_replace('<a href="', '', $newurl);
-            $newurl = str_replace('"></a>', '', $newurl);
-            if (!headers_sent()) {
-                header('HTTP/1.1 301 Moved Permanently');
-                header("Location: $newurl");
-                exit();
-            }
-        }
-    }
+		if (true === $redir) {
+			$s      = 'http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI');
+			$s      = str_replace('/' . REAL_MODULE_NAME . '/', '/' . SEO_MODULE_NAME . '/', $s);
+			$newurl = seo_urls('<a href="' . $s . '"></a>');
+			$newurl = str_replace('<a href="', '', $newurl);
+			$newurl = str_replace('"></a>', '', $newurl);
+			if (!headers_sent()) {
+				header('HTTP/1.1 301 Moved Permanently');
+				header("Location: $newurl");
+				exit();
+			}
+		}
+	}
 }
 
 require_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/vars.php');
@@ -81,8 +81,8 @@ 
 //}
 
 if (is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['welcome_forum'])
-    && !$GLOBALS['xoopsUser']->getVar('posts')) {
-    require_once __DIR__ . '/include/functions.welcome.php';
+	&& !$GLOBALS['xoopsUser']->getVar('posts')) {
+	require_once __DIR__ . '/include/functions.welcome.php';
 }
 // irmtfan for backward compatibility
 $pollmodules = $GLOBALS['xoopsModuleConfig']['poll_module'];

Spacing +12 added lines, -12 removed lines

@@ -11,8 +11,8 @@ 
 
 use Xmf\Request;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/common.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/common.php';
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 /** @var \XoopsLogger $xoopsLogger */
@@ -23,7 +23,7 @@ 
 //require_once $GLOBALS['xoops']->path('header.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
+    require_once __DIR__.'/seo_url.php';
     /* for seo */
     $toseo_url = ['index.php', 'viewforum.php', 'viewtopic.php', 'rss.php'];
 
@@ -37,7 +37,7 @@ 
                 //rewrite only for files
 
                 if ('' !== trim(getenv('SCRIPT_NAME'))) {
-                    if (false === strpos(getenv('REQUEST_URI'), '/' . SEO_MODULE_NAME . '/')) {
+                    if (false === strpos(getenv('REQUEST_URI'), '/'.SEO_MODULE_NAME.'/')) {
                         $redir = true;
                     } elseif (getenv('QUERY_STRING')) {
                         $redir = true;
@@ -47,9 +47,9 @@ 
         }
 
         if (true === $redir) {
-            $s      = 'http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI');
-            $s      = str_replace('/' . REAL_MODULE_NAME . '/', '/' . SEO_MODULE_NAME . '/', $s);
-            $newurl = seo_urls('<a href="' . $s . '"></a>');
+            $s      = 'http://'.getenv('HTTP_HOST').getenv('REQUEST_URI');
+            $s      = str_replace('/'.REAL_MODULE_NAME.'/', '/'.SEO_MODULE_NAME.'/', $s);
+            $newurl = seo_urls('<a href="'.$s.'"></a>');
             $newurl = str_replace('<a href="', '', $newurl);
             $newurl = str_replace('"></a>', '', $newurl);
             if (!headers_sent()) {
@@ -61,10 +61,10 @@ 
     }
 }
 
-require_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/vars.php');
+require_once $GLOBALS['xoops']->path('modules/'.$moduleDirName.'/include/vars.php');
 
-require_once __DIR__ . '/include/functions.user.php';
-require_once __DIR__ . '/include/functions.topic.php';
+require_once __DIR__.'/include/functions.user.php';
+require_once __DIR__.'/include/functions.topic.php';
 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 require_once $GLOBALS['xoops']->path('class/module.textsanitizer.php');
@@ -73,7 +73,7 @@ 
 $menumode       = 0;
 $menumode_other = [];
 $menu_url       = htmlspecialchars(preg_replace('/&menumode=[^&]/', '', Request::getString('REQUEST_URI', '', 'SERVER')), ENT_QUOTES | ENT_HTML5);
-$menu_url       .= (false === strpos($menu_url, '?')) ? '?menumode=' : '&amp;menumode=';
+$menu_url .= (false === strpos($menu_url, '?')) ? '?menumode=' : '&amp;menumode=';
 //foreach ($GLOBALS['xoopsModuleConfig']['valid_menumodes'] as $key => $val) {
 //    if ($key !== $menumode) {
 //        $menumode_other[] = array('title' => $val, 'link' => $menu_url . $key);
@@ -82,7 +82,7 @@ 
 
 if (is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['welcome_forum'])
     && !$GLOBALS['xoopsUser']->getVar('posts')) {
-    require_once __DIR__ . '/include/functions.welcome.php';
+    require_once __DIR__.'/include/functions.welcome.php';
 }
 // irmtfan for backward compatibility
 $pollmodules = $GLOBALS['xoopsModuleConfig']['poll_module'];

dl_attachment.php

Indentation +41 added lines, -41 removed lines

@@ -20,7 +20,7 @@ 
 $postId   = Request::getInt('post_id', 0, 'GET');
 
 if (!$postId || !$attachId) {
-    exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $postId . '; attachid' . $attachId);
+	exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $postId . '; attachid' . $attachId);
 }
 
 ///** @var Newbb\PostHandler $postHandler */
@@ -29,36 +29,36 @@ 
 /** @var Newbb\Post $forumpost */
 $forumpost = $postHandler->get($postId);
 if (!$approved = $forumpost->getVar('approved')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 ///** @var TopicHandler $topicHandler */
 //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
 $topicObject = $topicHandler->getByPost($postId);
 $topic_id    = $topicObject->getVar('topic_id');
 if (!$approved = $topicObject->getVar('approved')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 ///** @var NewbbForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($topicObject->getVar('forum_id'));
 if (!$forumHandler->getPermission($forumObject)) {
-    exit(_MD_NEWBB_NORIGHTTOACCESS);
+	exit(_MD_NEWBB_NORIGHTTOACCESS);
 }
 if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 
 $attachments = $forumpost->getAttachment();
 $attach      = $attachments[$attachId];
 if (!$attach) {
-    exit(_MD_NEWBB_NO_SUCH_FILE);
+	exit(_MD_NEWBB_NO_SUCH_FILE);
 }
 $file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
 if (!file_exists($file_saved)) {
-    exit(_MD_NEWBB_NO_SUCH_FILE);
+	exit(_MD_NEWBB_NO_SUCH_FILE);
 }
 if ($down = $forumpost->incrementDownload($attachId)) {
-    $forumpost->saveAttachment();
+	$forumpost->saveAttachment();
 }
 unset($forumpost);
 $msg = ob_get_contents();
@@ -66,41 +66,41 @@ 
 
 $xoopsLogger->activated = false;
 if (!empty($GLOBALS['xoopsModuleConfig']['download_direct'])) {
-    header('Cache-Control: no-store, no-cache, must-revalidate');
-    header('Cache-Control: post-check=0, pre-check=0', false);
-    header('Pragma: no-cache');
-    header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('location: ' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+	header('Cache-Control: no-store, no-cache, must-revalidate');
+	header('Cache-Control: post-check=0, pre-check=0', false);
+	header('Pragma: no-cache');
+	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+	header('location: ' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
 } else {
-    $file_display = $attach['nameDisplay'];
-    //$mimetype = $attach['mimetype'];
+	$file_display = $attach['nameDisplay'];
+	//$mimetype = $attach['mimetype'];
 
-    if (ini_get('zlib.output_compression')) {
-        @ini_set('zlib.output_compression', 'Off');
-    }
+	if (ini_get('zlib.output_compression')) {
+		@ini_set('zlib.output_compression', 'Off');
+	}
 
-    if (function_exists('mb_http_output')) {
-        mb_http_output('pass');
-    }
-    header('Expires: 0');
-    //header('Content-Type: '.$mimetype);
-    header('Content-Type: application/octet-stream');
-    if (preg_match("/MSIE (\d\.\d{1,2})/", Request::getString('HTTP_USER_AGENT', '', 'SERVER'))) {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
-        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-        header('Pragma: public');
-    } else {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
-        header('Pragma: no-cache');
-    }
-    header('Content-Type: application/force-download');
-    header('Content-Transfer-Encoding: binary');
+	if (function_exists('mb_http_output')) {
+		mb_http_output('pass');
+	}
+	header('Expires: 0');
+	//header('Content-Type: '.$mimetype);
+	header('Content-Type: application/octet-stream');
+	if (preg_match("/MSIE (\d\.\d{1,2})/", Request::getString('HTTP_USER_AGENT', '', 'SERVER'))) {
+		header('Content-Disposition: attachment; filename="' . $file_display . '"');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Pragma: public');
+	} else {
+		header('Content-Disposition: attachment; filename="' . $file_display . '"');
+		header('Pragma: no-cache');
+	}
+	header('Content-Type: application/force-download');
+	header('Content-Transfer-Encoding: binary');
 
-    $handle = fopen($file_saved, 'rb');
-    while (!feof($handle)) {
-        $buffer = fread($handle, 4096);
-        echo $buffer;
-    }
-    fclose($handle);
+	$handle = fopen($file_saved, 'rb');
+	while (!feof($handle)) {
+		$buffer = fread($handle, 4096);
+		echo $buffer;
+	}
+	fclose($handle);
 }

Spacing +7 added lines, -7 removed lines

@@ -13,14 +13,14 @@ 
 use XoopsModules\Newbb;
 
 ob_start();
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('header.php');
 
 $attachId = Request::getInt('attachid', 0, 'GET');
 $postId   = Request::getInt('post_id', 0, 'GET');
 
 if (!$postId || !$attachId) {
-    exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $postId . '; attachid' . $attachId);
+    exit(_MD_NEWBB_NO_SUCH_FILE.': post_id:'.$postId.'; attachid'.$attachId);
 }
 
 ///** @var Newbb\PostHandler $postHandler */
@@ -53,7 +53,7 @@ 
 if (!$attach) {
     exit(_MD_NEWBB_NO_SUCH_FILE);
 }
-$file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+$file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']);
 if (!file_exists($file_saved)) {
     exit(_MD_NEWBB_NO_SUCH_FILE);
 }
@@ -70,8 +70,8 @@ 
     header('Cache-Control: post-check=0, pre-check=0', false);
     header('Pragma: no-cache');
     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('location: ' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+    header('location: '.XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']);
 } else {
     $file_display = $attach['nameDisplay'];
     //$mimetype = $attach['mimetype'];
@@ -87,11 +87,11 @@ 
     //header('Content-Type: '.$mimetype);
     header('Content-Type: application/octet-stream');
     if (preg_match("/MSIE (\d\.\d{1,2})/", Request::getString('HTTP_USER_AGENT', '', 'SERVER'))) {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
+        header('Content-Disposition: attachment; filename="'.$file_display.'"');
         header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
         header('Pragma: public');
     } else {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
+        header('Content-Disposition: attachment; filename="'.$file_display.'"');
         header('Pragma: no-cache');
     }
     header('Content-Type: application/force-download');

list.tag.php

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
  * @since          4.00
  * @package        module::newbb
  */
-require_once __DIR__   . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('modules/tag/list.tag.php');

edit.php

Indentation +44 added lines, -44 removed lines

@@ -15,12 +15,12 @@ 
 require_once __DIR__ . '/header.php';
 
 foreach (['forum', 'topic_id', 'post_id', 'order'] as $getint) {
-    ${$getint} = Request::getInt($getint, 0, 'GET');
+	${$getint} = Request::getInt($getint, 0, 'GET');
 }
 
 if (!$topic_id && !$post_id) {
-    $redirect = empty($forum) ? 'index.php' : "viewforum.php?forum={$forum}";
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum) ? 'index.php' : "viewforum.php?forum={$forum}";
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -35,13 +35,13 @@ 
 $topicObject = $topicHandler->get($postObject->getVar('topic_id'));
 $forumObject = $forumHandler->get($postObject->getVar('forum_id'));
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header('index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header('index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 $isAdmin = newbbIsAdmin($forumObject);
 $uid     = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
@@ -51,30 +51,30 @@ 
 $error_msg    = null;
 
 if (!$topicHandler->getPermission($forumObject, $topic_status, 'edit') || (!$isAdmin && !$postObject->checkIdentity())) {
-    $error_msg = _MD_NEWBB_NORIGHTTOEDIT;
+	$error_msg = _MD_NEWBB_NORIGHTTOEDIT;
 } elseif (!$isAdmin && !$postObject->checkTimelimit('edit_timelimit')) {
-    $error_msg = _MD_NEWBB_TIMEISUP;
+	$error_msg = _MD_NEWBB_TIMEISUP;
 }
 
 if (!empty($error_msg)) {
-    /*
+	/*
      * Build the page query
      */
-    $query_vars  = ['topic_id', 'post_id', 'forum', 'status', 'order', 'mode', 'viewmode'];
-    $query_array = [];
-    foreach ($query_vars as $var) {
-        if (Request::getString($var, '', 'GET')) {
-            $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
-        }
-    }
-    $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
-    unset($query_array);
-    redirect_header("viewtopic.php?{$page_query}", 2, $error_msg);
+	$query_vars  = ['topic_id', 'post_id', 'forum', 'status', 'order', 'mode', 'viewmode'];
+	$query_array = [];
+	foreach ($query_vars as $var) {
+		if (Request::getString($var, '', 'GET')) {
+			$query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+		}
+	}
+	$page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
+	unset($query_array);
+	redirect_header("viewtopic.php?{$page_query}", 2, $error_msg);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 
 $xoopsOption['template_main']                                        = 'newbb_edit_post.tpl';
@@ -125,28 +125,28 @@ 
 $posts_context       = [];
 $posts_contextObject = $istopic ? [] : [$postHandler->get($postObject->getVar('pid'))];
 foreach ($posts_contextObject as $post_contextObject) {
-    if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
-        $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 {
-        $p_message = $post_contextObject->getVar('post_text');
-    }
-
-    if ($post_contextObject->getVar('uid')) {
-        $p_name = newbbGetUnameFromId($post_contextObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
-    } else {
-        $poster_name = $post_contextObject->getVar('poster_name');
-        $p_name      = empty($poster_name) ? htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5) : $poster_name;
-    }
-    $p_date    = formatTimestamp($post_contextObject->getVar('post_time'));
-    $p_subject = $post_contextObject->getVar('subject');
-
-    $posts_context[] = [
-        'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
-        'content' => $p_message
-    ];
+	if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
+		$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 {
+		$p_message = $post_contextObject->getVar('post_text');
+	}
+
+	if ($post_contextObject->getVar('uid')) {
+		$p_name = newbbGetUnameFromId($post_contextObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	} else {
+		$poster_name = $post_contextObject->getVar('poster_name');
+		$p_name      = empty($poster_name) ? htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5) : $poster_name;
+	}
+	$p_date    = formatTimestamp($post_contextObject->getVar('post_time'));
+	$p_subject = $post_contextObject->getVar('subject');
+
+	$posts_context[] = [
+		'subject' => $p_subject,
+		'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

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 foreach (['forum', 'topic_id', 'post_id', 'order'] as $getint) {
     ${$getint} = Request::getInt($getint, 0, 'GET');
@@ -64,7 +64,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);
@@ -115,8 +115,8 @@ 
 $post_karma    = $postObject->getVar('post_karma');
 $require_reply = $postObject->getVar('require_reply');
 
-$xoopsTpl->assign('error_message', _MD_NEWBB_EDITEDBY . ' ' . $GLOBALS['xoopsUser']->uname());
-require_once __DIR__   . '/include/form.post.php';
+$xoopsTpl->assign('error_message', _MD_NEWBB_EDITEDBY.' '.$GLOBALS['xoopsUser']->uname());
+require_once __DIR__.'/include/form.post.php';
 
 ///** @var Newbb\KarmaHandler $karmaHandler */
 //$karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
@@ -126,7 +126,7 @@ 
 $posts_contextObject = $istopic ? [] : [$postHandler->get($postObject->getVar('pid'))];
 foreach ($posts_contextObject as $post_contextObject) {
     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 {
@@ -144,11 +144,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';
 require_once $GLOBALS['xoops']->path('footer.php');

seo.php

Indentation +82 added lines, -82 removed lines

@@ -16,60 +16,60 @@ 
 $seos = ['c', 'f', 't', 'p', 'rc', 'rf', 'v', 'pr', 'pdf'];
 
 $seoMap = [
-    'c'   => 'index.php',
-    'f'   => 'viewforum.php',
-    't'   => 'viewtopic.php',
-    'p'   => 'viewtopic.php',
-    'rc'  => 'rss.php',
-    'rf'  => 'rss.php',
-    'pr'  => 'print.php',
-    'pdf' => 'makepdf.php'
+	'c'   => 'index.php',
+	'f'   => 'viewforum.php',
+	't'   => 'viewtopic.php',
+	'p'   => 'viewtopic.php',
+	'rc'  => 'rss.php',
+	'rf'  => 'rss.php',
+	'pr'  => 'print.php',
+	'pdf' => 'makepdf.php'
 ];
 
 if (!empty($seoOp) && !empty($seoMap[$seoOp]) && in_array($seoOp, $seos)) {
-    // module specific dispatching logic, other module must implement as
-    // per their requirements.
-    $ori_self               = Request::getString('PHP_SELF', '', 'SERVER');
-    $ori_self               = explode('modules/newbb', $ori_self);
-    $newUrl                 = $ori_self[0] . 'modules/newbb/' . $seoMap[$seoOp];
-    $_ENV['PHP_SELF']       = $newUrl;
-    $_SERVER['SCRIPT_NAME'] = $newUrl;
-    $_SERVER['PHP_SELF']    = $newUrl;
-    switch ($seoOp) {
-        case 'c':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?cat=' . $seoArg;
-            $_GET['cat']            = $seoArg;
-            break;
-        case 'f':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?forum=' . $seoArg;
-            $_GET['forum']          = $seoArg;
-            break;
-        case 'p':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?post_id=' . $seoArg;
-            $_GET['post_id']        = $seoArg;
-            break;
-        case 'rc':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?c=' . $seoArg;
-            $_GET['c']              = $seoArg;
-            break;
-        case 'rf':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?f=' . $seoArg;
-            $_GET['f']              = $seoArg;
-            break;
-        default:
-        case 't':
-        case 'pr':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?topic_id=' . $seoArg;
-            $_GET['topic_id']       = $seoArg;
-            break;
-    }
-    require_once $seoMap[$seoOp];
+	// module specific dispatching logic, other module must implement as
+	// per their requirements.
+	$ori_self               = Request::getString('PHP_SELF', '', 'SERVER');
+	$ori_self               = explode('modules/newbb', $ori_self);
+	$newUrl                 = $ori_self[0] . 'modules/newbb/' . $seoMap[$seoOp];
+	$_ENV['PHP_SELF']       = $newUrl;
+	$_SERVER['SCRIPT_NAME'] = $newUrl;
+	$_SERVER['PHP_SELF']    = $newUrl;
+	switch ($seoOp) {
+		case 'c':
+			$_SERVER['REQUEST_URI'] = $newUrl . '?cat=' . $seoArg;
+			$_GET['cat']            = $seoArg;
+			break;
+		case 'f':
+			$_SERVER['REQUEST_URI'] = $newUrl . '?forum=' . $seoArg;
+			$_GET['forum']          = $seoArg;
+			break;
+		case 'p':
+			$_SERVER['REQUEST_URI'] = $newUrl . '?post_id=' . $seoArg;
+			$_GET['post_id']        = $seoArg;
+			break;
+		case 'rc':
+			$_SERVER['REQUEST_URI'] = $newUrl . '?c=' . $seoArg;
+			$_GET['c']              = $seoArg;
+			break;
+		case 'rf':
+			$_SERVER['REQUEST_URI'] = $newUrl . '?f=' . $seoArg;
+			$_GET['f']              = $seoArg;
+			break;
+		default:
+		case 't':
+		case 'pr':
+			$_SERVER['REQUEST_URI'] = $newUrl . '?topic_id=' . $seoArg;
+			$_GET['topic_id']       = $seoArg;
+			break;
+	}
+	require_once $seoMap[$seoOp];
 } else {
-    $last = $seoOp . '/' . $seoArg;
-    if ('' !== $seoOther) {
-        $last .= '/' . $seoOther;
-    }
-    require_once $last;
+	$last = $seoOp . '/' . $seoArg;
+	if ('' !== $seoOther) {
+		$last .= '/' . $seoOther;
+	}
+	require_once $last;
 }
 exit();
 
@@ -79,45 +79,45 @@ 
  */
 function checker(&$value)
 {
-    // keine Tags erlaubt
-    $value = strip_tags($value);
+	// keine Tags erlaubt
+	$value = strip_tags($value);
 
-    // HTML-Tags maskieren
-    $value = htmlspecialchars($value, ENT_QUOTES);
+	// HTML-Tags maskieren
+	$value = htmlspecialchars($value, ENT_QUOTES);
 
-    // Leerzeichen am Anfang und Ende beseitigen
-    $value = trim($value);
+	// Leerzeichen am Anfang und Ende beseitigen
+	$value = trim($value);
 
-    // pruefe auf javascript include
-    if (false !== strpos($value, '<script')) {
-        $value = '';
-    }
+	// pruefe auf javascript include
+	if (false !== strpos($value, '<script')) {
+		$value = '';
+	}
 
-    // pruefe auf Kommentare (SQL-Injections)
-    if (false !== strpos($value, '/*')) {
-        $value = '';
-    }
+	// pruefe auf Kommentare (SQL-Injections)
+	if (false !== strpos($value, '/*')) {
+		$value = '';
+	}
 
-    // pruefe UNION Injections
-    if (preg_match('/\sUNION\s+(ALL|SELECT)/i', $value)) {
-        $value = '';
-    }
+	// pruefe UNION Injections
+	if (preg_match('/\sUNION\s+(ALL|SELECT)/i', $value)) {
+		$value = '';
+	}
 
-    // Nullbyte Injection
-    if (false !== strpos($value, chr(0))) {
-        $value = '';
-    }
+	// Nullbyte Injection
+	if (false !== strpos($value, chr(0))) {
+		$value = '';
+	}
 
-    //pruefe Verzeichnis
-    if (false !== strpos($value, '../')) {
-        $value = '';
-    }
+	//pruefe Verzeichnis
+	if (false !== strpos($value, '../')) {
+		$value = '';
+	}
 
-    //pruefe auf externe
-    $str = strstr($value, '://');
-    if (false !== strpos($value, '://')) {
-        $value = '';
-    }
+	//pruefe auf externe
+	$str = strstr($value, '://');
+	if (false !== strpos($value, '://')) {
+		$value = '';
+	}
 
-    return $value;
+	return $value;
 }

Spacing +10 added lines, -10 removed lines

@@ -2,7 +2,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 /*
  *
  * Module: newbbss
@@ -31,43 +31,43 @@ 
     // per their requirements.
     $ori_self               = Request::getString('PHP_SELF', '', 'SERVER');
     $ori_self               = explode('modules/newbb', $ori_self);
-    $newUrl                 = $ori_self[0] . 'modules/newbb/' . $seoMap[$seoOp];
+    $newUrl                 = $ori_self[0].'modules/newbb/'.$seoMap[$seoOp];
     $_ENV['PHP_SELF']       = $newUrl;
     $_SERVER['SCRIPT_NAME'] = $newUrl;
     $_SERVER['PHP_SELF']    = $newUrl;
     switch ($seoOp) {
         case 'c':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?cat=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?cat='.$seoArg;
             $_GET['cat']            = $seoArg;
             break;
         case 'f':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?forum=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?forum='.$seoArg;
             $_GET['forum']          = $seoArg;
             break;
         case 'p':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?post_id=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?post_id='.$seoArg;
             $_GET['post_id']        = $seoArg;
             break;
         case 'rc':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?c=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?c='.$seoArg;
             $_GET['c']              = $seoArg;
             break;
         case 'rf':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?f=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?f='.$seoArg;
             $_GET['f']              = $seoArg;
             break;
         default:
         case 't':
         case 'pr':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?topic_id=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?topic_id='.$seoArg;
             $_GET['topic_id']       = $seoArg;
             break;
     }
     require_once $seoMap[$seoOp];
 } else {
-    $last = $seoOp . '/' . $seoArg;
+    $last = $seoOp.'/'.$seoArg;
     if ('' !== $seoOther) {
-        $last .= '/' . $seoOther;
+        $last .= '/'.$seoOther;
     }
     require_once $last;
 }

preloads/autoloader.php

Indentation +19 added lines, -19 removed lines

@@ -4,29 +4,29 @@
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(function ($class) {
-    // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+	// project-specific namespace prefix
+	$prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
 
-    // base directory for the namespace prefix
-    $base_dir =  dirname(__DIR__) . '/class/';
+	// base directory for the namespace prefix
+	$base_dir =  dirname(__DIR__) . '/class/';
 
-    // does the class use the namespace prefix?
-    $len = strlen($prefix);
+	// does the class use the namespace prefix?
+	$len = strlen($prefix);
 
-    if (0 !== strncmp($prefix, $class, $len)) {
-        return;
-    }
+	if (0 !== strncmp($prefix, $class, $len)) {
+		return;
+	}
 
-    // get the relative class name
-    $relativeClass = substr($class, $len);
+	// get the relative class name
+	$relativeClass = substr($class, $len);
 
-    // replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file = $base_dir . str_replace('\\', '/', $relativeClass) . '.php';
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = $base_dir . str_replace('\\', '/', $relativeClass) . '.php';
 
-    // if the file exists, require it
-    if (file_exists($file)) {
-        require_once $file;
-    }
+	// if the file exists, require it
+	if (file_exists($file)) {
+		require_once $file;
+	}
 });

Spacing +4 added lines, -4 removed lines

@@ -3,12 +3,12 @@ 
 /**
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+    $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
     // base directory for the namespace prefix
-    $base_dir =  dirname(__DIR__) . '/class/';
+    $base_dir = dirname(__DIR__).'/class/';
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
@@ -23,7 +23,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $base_dir . str_replace('\\', '/', $relativeClass) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relativeClass).'.php';
 
     // if the file exists, require it
     if (file_exists($file)) {

preloads/core.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
  */
 class NewbbCorePreload extends \XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args)
-    {
-        require_once __DIR__   . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args)
+	{
+		require_once __DIR__   . '/autoloader.php';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args)
     {
-        require_once __DIR__   . '/autoloader.php';
+        require_once __DIR__.'/autoloader.php';
     }
 }

rss.php

Indentation +134 added lines, -134 removed lines

@@ -36,7 +36,7 @@ 
 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 */
 
@@ -47,7 +47,7 @@ 
 $category = Request::getInt('c', 0, 'GET');
 $forumSet = Request::getString('f', '', 'GET');
 if ('' !== $forumSet) {
-    $forums = array_map('intval', array_map('trim', explode('|', $forumSet)));
+	$forums = array_map('intval', array_map('trim', explode('|', $forumSet)));
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -56,15 +56,15 @@ 
 $validForums = $forumHandler->getIdsByPermission(); // get all accessible forums
 
 if (is_array($forums) && count($forums) > 0) {
-    $validForums = array_intersect($forums, $validForums);
+	$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'));
-    $forums_top  = $forumHandler->getIds($crit_top);
-    $validForums = array_intersect($forums_top, $validForums);
+	$crit_top = new \CriteriaCompo(new \Criteria('cat_id', $category));
+	$crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'));
+	$forums_top  = $forumHandler->getIds($crit_top);
+	$validForums = array_intersect($forums_top, $validForums);
 }
 if (0 === count($validForums)) {
-    newbbTrackbackResponse(1, _NOPERM);
+	newbbTrackbackResponse(1, _NOPERM);
 }
 
 asort($validForums);
@@ -77,137 +77,137 @@ 
 $tpl->caching        = 2;
 $tpl->cache_lifetime = $GLOBALS['xoopsModuleConfig']['rss_cachetime'] * 60;
 if (!empty($GLOBALS['xoopsConfig']['rewrite'])) {
-    $tpl->load_filter('output', 'xoRewriteModule');
+	$tpl->load_filter('output', 'xoRewriteModule');
 }
 
 //mod_loadFunctions('cache');
 $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';
-
-    //    /** @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_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_language  = _LANGCODE;
-    $rss->xml_encoding      = $charset;
-    $rss->image_url         = XOOPS_URL . '/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 {
-        $width = ($dimension[0] > 144) ? 144 : $dimension[0];
-    }
-    if (empty($dimension[1])) {
-        $height = 31;
-    } else {
-        $height = ($dimension[1] > 400) ? 400 : $dimension[1];
-    }
-    $rss->image_width  = $width;
-    $rss->image_height = $height;
-
-    $rss->max_items            = $GLOBALS['xoopsModuleConfig']['rss_maxitems'];
-    $rss->max_item_description = $GLOBALS['xoopsModuleConfig']['rss_maxdescription'];
-
-    $forumCriteria = ' AND t.forum_id IN (' . implode(',', $validForums) . ')';
-    unset($validForums);
-    $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';
-    $limit = (int)($GLOBALS['xoopsModuleConfig']['rss_maxitems'] * 1.5);
-    if (!$result = $GLOBALS['xoopsDB']->query($query, $limit)) {
-        newbbTrackbackResponse(1, _MD_NEWBB_ERROR);
-        //xoops_error($GLOBALS['xoopsDB']->error());
-        //return $xmlrssHandler->get($rss);
-    }
-    $rows  = [];
-    $types = [];
-    while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $users[$row['uid']] = 1;
-        if ($row['type_id'] > 0) {
-            $types[$row['type_id']] = 1;
-        }
-        $rows[] = $row;
-    }
-
-    if (count($rows) < 1) {
-        newbbTrackbackResponse(1, _MD_NEWBB_NORSS_DATA);
-        //return $xmlrssHandler->get($rss);
-    }
-    $users = newbbGetUnameFromIds(array_keys($users), $GLOBALS['xoopsModuleConfig']['show_realname']);
-    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'));
-    }
-
-    foreach ($rows as $topic) {
-        if ($topic['post_karma'] > 0 && $GLOBALS['xoopsModuleConfig']['enable_karma']) {
-            continue;
-        }
-        if ($topic['require_reply'] && $GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
-            continue;
-        }
-        if (!empty($users[$topic['uid']])) {
-            $topic['uname'] = $users[$topic['uid']];
-        } 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            .= $myts->displayTarea($topic['post_text'], $topic['dohtml'], $topic['dosmiley'], $topic['doxcode'], $topic['dobr']);
-        $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'] . '';
-        if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $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);
-            $link   = $newurl;
-        }
-        $title = $topic['subject'];
-        if (!$rss->addItem($title, $link, $description, $label, $time)) {
-            break;
-        }
-    }
-
-    $rss_feed = $xmlrssHandler->get($rss);
-
-    $tpl->assign('rss', $rss_feed);
-    unset($rss);
+	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_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_language  = _LANGCODE;
+	$rss->xml_encoding      = $charset;
+	$rss->image_url         = XOOPS_URL . '/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 {
+		$width = ($dimension[0] > 144) ? 144 : $dimension[0];
+	}
+	if (empty($dimension[1])) {
+		$height = 31;
+	} else {
+		$height = ($dimension[1] > 400) ? 400 : $dimension[1];
+	}
+	$rss->image_width  = $width;
+	$rss->image_height = $height;
+
+	$rss->max_items            = $GLOBALS['xoopsModuleConfig']['rss_maxitems'];
+	$rss->max_item_description = $GLOBALS['xoopsModuleConfig']['rss_maxdescription'];
+
+	$forumCriteria = ' AND t.forum_id IN (' . implode(',', $validForums) . ')';
+	unset($validForums);
+	$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';
+	$limit = (int)($GLOBALS['xoopsModuleConfig']['rss_maxitems'] * 1.5);
+	if (!$result = $GLOBALS['xoopsDB']->query($query, $limit)) {
+		newbbTrackbackResponse(1, _MD_NEWBB_ERROR);
+		//xoops_error($GLOBALS['xoopsDB']->error());
+		//return $xmlrssHandler->get($rss);
+	}
+	$rows  = [];
+	$types = [];
+	while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+		$users[$row['uid']] = 1;
+		if ($row['type_id'] > 0) {
+			$types[$row['type_id']] = 1;
+		}
+		$rows[] = $row;
+	}
+
+	if (count($rows) < 1) {
+		newbbTrackbackResponse(1, _MD_NEWBB_NORSS_DATA);
+		//return $xmlrssHandler->get($rss);
+	}
+	$users = newbbGetUnameFromIds(array_keys($users), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	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'));
+	}
+
+	foreach ($rows as $topic) {
+		if ($topic['post_karma'] > 0 && $GLOBALS['xoopsModuleConfig']['enable_karma']) {
+			continue;
+		}
+		if ($topic['require_reply'] && $GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
+			continue;
+		}
+		if (!empty($users[$topic['uid']])) {
+			$topic['uname'] = $users[$topic['uid']];
+		} 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            .= $myts->displayTarea($topic['post_text'], $topic['dohtml'], $topic['dosmiley'], $topic['doxcode'], $topic['dobr']);
+		$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'] . '';
+		if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+			$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);
+			$link   = $newurl;
+		}
+		$title = $topic['subject'];
+		if (!$rss->addItem($title, $link, $description, $label, $time)) {
+			break;
+		}
+	}
+
+	$rss_feed = $xmlrssHandler->get($rss);
+
+	$tpl->assign('rss', $rss_feed);
+	unset($rss);
 }
 $tpl->display('db:newbb_rss.tpl', $xoopsCachedTemplateId, $compile_id);

Spacing +21 added lines, -21 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';
 
@@ -145,7 +145,7 @@ 
              . $forumCriteria
              . $approveCriteria
              . ' ORDER BY p.post_id DESC';
-    $limit = (int)($GLOBALS['xoopsModuleConfig']['rss_maxitems'] * 1.5);
+    $limit = (int) ($GLOBALS['xoopsModuleConfig']['rss_maxitems'] * 1.5);
     if (!$result = $GLOBALS['xoopsDB']->query($query, $limit)) {
         newbbTrackbackResponse(1, _MD_NEWBB_ERROR);
         //xoops_error($GLOBALS['xoopsDB']->error());
@@ -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);