mambax7 / newbb5

class/User.php

Spacing +20 added lines, -20 removed lines

@@ -81,13 +81,13 @@ 
     $level              = [];
     $level['level']     = $showlevel;
     $level['exp']       = $ep;
-    $level['exp_width'] = $ep . '%';
+    $level['exp_width'] = $ep.'%';
     $level['hp']        = $hp;
     $level['hp_max']    = $maxhp;
-    $level['hp_width']  = $hpf . '%';
+    $level['hp_width']  = $hpf.'%';
     $level['mp']        = $mp;
     $level['mp_max']    = $maxmp;
-    $level['mp_width']  = $mpf . '%';
+    $level['mp_width']  = $mpf.'%';
 
     return $level;
 }
@@ -117,49 +117,49 @@ 
 
         $user               = $this->user;
         $userbar['profile'] = [
-            'link' => XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid'),
+            'link' => XOOPS_URL.'/userinfo.php?uid='.$user->getVar('uid'),
             'name' => _PROFILE
         ];
 
         if (is_object($GLOBALS['xoopsUser'])) {
             $userbar['pm'] = [
-                'link' => "javascript:void openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $user->getVar('uid') . "', 'pmlite', 450, 380);",
+                'link' => "javascript:void openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&to_userid='.$user->getVar('uid')."', 'pmlite', 450, 380);",
                 'name' => _MD_NEWBB_PM
             ];
         }
         if ($user->getVar('user_viewemail') || $isAdmin) {
             $userbar['email'] = [
-                'link' => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');",
+                'link' => "javascript:void window.open('mailto:".$user->getVar('email')."', 'new');",
                 'name' => _MD_NEWBB_EMAIL
             ];
         }
         if ($url = $user->getVar('url')) {
             $userbar['url'] = [
-                'link' => "javascript:void window.open('" . $url . "', 'new');",
+                'link' => "javascript:void window.open('".$url."', 'new');",
                 'name' => _MD_NEWBB_WWW
             ];
         }
         if ($icq = $user->getVar('user_icq')) {
             $userbar['icq'] = [
-                'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq . "', 'new');",
+                'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=".$icq."', 'new');",
                 'name' => _MD_NEWBB_ICQ
             ];
         }
         if ($aim = $user->getVar('user_aim')) {
             $userbar['aim'] = [
-                'link' => "javascript:void window.open('aim:goim?screenname=" . $aim . '&message=Hi+' . $aim . '+Are+you+there?' . "', 'new');",
+                'link' => "javascript:void window.open('aim:goim?screenname=".$aim.'&message=Hi+'.$aim.'+Are+you+there?'."', 'new');",
                 'name' => _MD_NEWBB_AIM
             ];
         }
         if ($yim = $user->getVar('user_yim')) {
             $userbar['yim'] = [
-                'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . '&.src=pg' . "', 'new');",
+                'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=".$yim.'&.src=pg'."', 'new');",
                 'name' => _MD_NEWBB_YIM
             ];
         }
         if ($msn = $user->getVar('user_msnm')) {
             $userbar['msnm'] = [
-                'link' => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');",
+                'link' => "javascript:void window.open('http://members.msn.com?mem=".$msn."', 'new');",
                 'name' => _MD_NEWBB_MSNM
             ];
         }
@@ -183,7 +183,7 @@ 
                 $rpg_path    = $iconHandler->getPath('rpg');
                 foreach (['img_left', 'img_backing', 'img_right', 'blue', 'green', 'orange'] as $img) {
                     // irmtfan fix: double "/" removed
-                    $rpg_images[$img] = XOOPS_URL . $rpg_path . '/' . $img . '.gif';
+                    $rpg_images[$img] = XOOPS_URL.$rpg_path.'/'.$img.'.gif';
                 }
             }
             // irmtfan hardcore removed align="left"
@@ -195,13 +195,13 @@ 
                      . $rpg_images['img_right']
                      . "' alt='' /></td></tr></table>";
 
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '<br><span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>' . sprintf($table, $rpg_images['orange'], $level['hp_width']);
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span><br>' . sprintf($table, $rpg_images['green'], $level['mp_width']);
-            $info .= '<span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>' . sprintf($table, $rpg_images['blue'], $level['exp_width']);
+            $info = _MD_NEWBB_LEVEL.' '.$level['level'].'<br><span title="'._MD_NEWBB_HP_DESC.'">'._MD_NEWBB_HP.' '.$level['hp'].' / '.$level['hp_max'].'</span><br>'.sprintf($table, $rpg_images['orange'], $level['hp_width']);
+            $info .= '<span title="'._MD_NEWBB_MP_DESC.'">'._MD_NEWBB_MP.' '.$level['mp'].' / '.$level['mp_max'].'</span><br>'.sprintf($table, $rpg_images['green'], $level['mp_width']);
+            $info .= '<span title="'._MD_NEWBB_EXP_DESC.'">'._MD_NEWBB_EXP.' '.$level['exp'].'</span><br>'.sprintf($table, $rpg_images['blue'], $level['exp_width']);
         } else {
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '; <span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>';
-            $info .= '<span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>';
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span>';
+            $info = _MD_NEWBB_LEVEL.' '.$level['level'].'; <span title="'._MD_NEWBB_EXP_DESC.'">'._MD_NEWBB_EXP.' '.$level['exp'].'</span><br>';
+            $info .= '<span title="'._MD_NEWBB_HP_DESC.'">'._MD_NEWBB_HP.' '.$level['hp'].' / '.$level['hp_max'].'</span><br>';
+            $info .= '<span title="'._MD_NEWBB_MP_DESC.'">'._MD_NEWBB_MP.' '.$level['mp'].' / '.$level['mp_max'].'</span>';
         }
 
         return $info;
@@ -231,7 +231,7 @@ 
         $name             = empty($GLOBALS['xoopsModuleConfig']['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
         $userinfo['name'] = $name ?: $user->getVar('uname');
 
-        $userinfo['link'] = '<a href=\'' . XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid') . '\'>' . $userinfo['name'] . '</a>';
+        $userinfo['link'] = '<a href=\''.XOOPS_URL.'/userinfo.php?uid='.$user->getVar('uid').'\'>'.$userinfo['name'].'</a>';
 
         $userinfo['avatar'] = $user->getVar('user_avatar');
         // START hacked by irmtfan - easier rank getting - consistency with previous version back rank.title and rank.image
@@ -254,7 +254,7 @@ 
         // END hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
         $userinfo['from'] = $user->getVar('user_from');
 
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
+        require_once  dirname(__DIR__).'/include/functions.time.php';
         $userinfo['regdate']    = newbbFormatTimestamp($user->getVar('user_regdate'), 'reg');
         $userinfo['last_login'] = newbbFormatTimestamp($user->getVar('last_login')); // irmtfan add last_login
 

Indentation +243 added lines, -243 removed lines

@@ -22,74 +22,74 @@ 
 function newbb_calculateLevel($RPG, $RPGDIFF)
 {
 
-    //$RPG = $user->getVar('posts');
-    //$RPGDIFF = $user->getVar('user_regdate');
-
-    $today = time();
-    $diff  = $today - $RPGDIFF;
-    $exp   = round($diff / 86400, 0);
-    if ($exp <= 0) {
-        $exp = 1;
-    }
-    $ppd       = round($RPG / $exp, 0);
-    $level     = log10($RPG) ** 3;
-    $ep        = floor(100 * ($level - floor($level)));
-    $showlevel = floor($level + 1);
-    $hpmulti   = round($ppd / 6, 1);
-    if ($hpmulti > 1.5) {
-        $hpmulti = 1.5;
-    }
-    if ($hpmulti < 1) {
-        $hpmulti = 1;
-    }
-    $maxhp = $level * 25 * $hpmulti;
-    $hp    = $ppd / 5;
-    if ($hp >= 1) {
-        $hp = $maxhp;
-    } else {
-        $hp = floor($hp * $maxhp);
-    }
-    $hp    = floor($hp);
-    $maxhp = floor($maxhp);
-    $zhp   = $maxhp;
-    if ($maxhp <= 0) {
-        $zhp = 1;
-    }
-    $hpf   = floor(100 * ($hp / $zhp)) - 1;
-    $maxmp = ($exp * $level) / 5;
-    $mp    = $RPG / 3;
-    if ($mp >= $maxmp) {
-        $mp = $maxmp;
-    }
-    $maxmp = floor($maxmp);
-    $mp    = floor($mp);
-    $zmp   = $maxmp;
-    if ($maxmp <= 0) {
-        $zmp = 1;
-    }
-    $mpf = floor(100 * ($mp / $zmp)) - 1;
-    if ($hpf >= 98) {
-        $hpf -= 2;
-    }
-    if ($ep >= 98) {
-        $ep -= 2;
-    }
-    if ($mpf >= 98) {
-        $mpf -= 2;
-    }
-
-    $level              = [];
-    $level['level']     = $showlevel;
-    $level['exp']       = $ep;
-    $level['exp_width'] = $ep . '%';
-    $level['hp']        = $hp;
-    $level['hp_max']    = $maxhp;
-    $level['hp_width']  = $hpf . '%';
-    $level['mp']        = $mp;
-    $level['mp_max']    = $maxmp;
-    $level['mp_width']  = $mpf . '%';
-
-    return $level;
+	//$RPG = $user->getVar('posts');
+	//$RPGDIFF = $user->getVar('user_regdate');
+
+	$today = time();
+	$diff  = $today - $RPGDIFF;
+	$exp   = round($diff / 86400, 0);
+	if ($exp <= 0) {
+		$exp = 1;
+	}
+	$ppd       = round($RPG / $exp, 0);
+	$level     = log10($RPG) ** 3;
+	$ep        = floor(100 * ($level - floor($level)));
+	$showlevel = floor($level + 1);
+	$hpmulti   = round($ppd / 6, 1);
+	if ($hpmulti > 1.5) {
+		$hpmulti = 1.5;
+	}
+	if ($hpmulti < 1) {
+		$hpmulti = 1;
+	}
+	$maxhp = $level * 25 * $hpmulti;
+	$hp    = $ppd / 5;
+	if ($hp >= 1) {
+		$hp = $maxhp;
+	} else {
+		$hp = floor($hp * $maxhp);
+	}
+	$hp    = floor($hp);
+	$maxhp = floor($maxhp);
+	$zhp   = $maxhp;
+	if ($maxhp <= 0) {
+		$zhp = 1;
+	}
+	$hpf   = floor(100 * ($hp / $zhp)) - 1;
+	$maxmp = ($exp * $level) / 5;
+	$mp    = $RPG / 3;
+	if ($mp >= $maxmp) {
+		$mp = $maxmp;
+	}
+	$maxmp = floor($maxmp);
+	$mp    = floor($mp);
+	$zmp   = $maxmp;
+	if ($maxmp <= 0) {
+		$zmp = 1;
+	}
+	$mpf = floor(100 * ($mp / $zmp)) - 1;
+	if ($hpf >= 98) {
+		$hpf -= 2;
+	}
+	if ($ep >= 98) {
+		$ep -= 2;
+	}
+	if ($mpf >= 98) {
+		$mpf -= 2;
+	}
+
+	$level              = [];
+	$level['level']     = $showlevel;
+	$level['exp']       = $ep;
+	$level['exp_width'] = $ep . '%';
+	$level['hp']        = $hp;
+	$level['hp_max']    = $maxhp;
+	$level['hp_width']  = $hpf . '%';
+	$level['mp']        = $mp;
+	$level['mp_max']    = $maxmp;
+	$level['mp_width']  = $mpf . '%';
+
+	return $level;
 }
 
 /**
@@ -97,179 +97,179 @@ 
  */
 class User
 {
-    public $user;
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getUserbar()
-    {
-        global $isAdmin;
-
-        $userbar = [];
-        if (empty($GLOBALS['xoopsModuleConfig']['userbar_enabled'])) {
-            return $userbar;
-        }
-
-        $user               = $this->user;
-        $userbar['profile'] = [
-            'link' => XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid'),
-            'name' => _PROFILE
-        ];
-
-        if (is_object($GLOBALS['xoopsUser'])) {
-            $userbar['pm'] = [
-                'link' => "javascript:void openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&amp;to_userid=' . $user->getVar('uid') . "', 'pmlite', 450, 380);",
-                'name' => _MD_NEWBB_PM
-            ];
-        }
-        if ($user->getVar('user_viewemail') || $isAdmin) {
-            $userbar['email'] = [
-                'link' => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');",
-                'name' => _MD_NEWBB_EMAIL
-            ];
-        }
-        if ($url = $user->getVar('url')) {
-            $userbar['url'] = [
-                'link' => "javascript:void window.open('" . $url . "', 'new');",
-                'name' => _MD_NEWBB_WWW
-            ];
-        }
-        if ($icq = $user->getVar('user_icq')) {
-            $userbar['icq'] = [
-                'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq . "', 'new');",
-                'name' => _MD_NEWBB_ICQ
-            ];
-        }
-        if ($aim = $user->getVar('user_aim')) {
-            $userbar['aim'] = [
-                'link' => "javascript:void window.open('aim:goim?screenname=" . $aim . '&amp;message=Hi+' . $aim . '+Are+you+there?' . "', 'new');",
-                'name' => _MD_NEWBB_AIM
-            ];
-        }
-        if ($yim = $user->getVar('user_yim')) {
-            $userbar['yim'] = [
-                'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . '&.src=pg' . "', 'new');",
-                'name' => _MD_NEWBB_YIM
-            ];
-        }
-        if ($msn = $user->getVar('user_msnm')) {
-            $userbar['msnm'] = [
-                'link' => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');",
-                'name' => _MD_NEWBB_MSNM
-            ];
-        }
-
-        return $userbar;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLevel()
-    {
-        global $forumUrl;
-
-        $level = newbb_calculateLevel($this->user->getVar('posts'), $this->user->getVar('user_regdate'));
-        $info  = '';
-        if (2 == $GLOBALS['xoopsModuleConfig']['user_level']) {
-            static $rpg_images;
-            if (null === $rpg_images) {
-                $iconHandler = newbbGetIconHandler();
-                $rpg_path    = $iconHandler->getPath('rpg');
-                foreach (['img_left', 'img_backing', 'img_right', 'blue', 'green', 'orange'] as $img) {
-                    // irmtfan fix: double "/" removed
-                    $rpg_images[$img] = XOOPS_URL . $rpg_path . '/' . $img . '.gif';
-                }
-            }
-            // irmtfan hardcore removed align="left"
-            $table = "<table class='userlevel'><tr><td class='end'><img src='"
-                     . $rpg_images['img_left']
-                     . "' alt='' /></td><td class='center' background='"
-                     . $rpg_images['img_backing']
-                     . "'><img src='%s' width='%d' alt='' class='icon_left' /></td><td><img src='"
-                     . $rpg_images['img_right']
-                     . "' alt='' /></td></tr></table>";
-
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '<br><span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>' . sprintf($table, $rpg_images['orange'], $level['hp_width']);
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span><br>' . sprintf($table, $rpg_images['green'], $level['mp_width']);
-            $info .= '<span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>' . sprintf($table, $rpg_images['blue'], $level['exp_width']);
-        } else {
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '; <span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>';
-            $info .= '<span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>';
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span>';
-        }
-
-        return $info;
-    }
-
-    /**
-     * @param \XoopsUser $user
-     * @return mixed
-     */
-    public function getInfo(&$user)
-    {
-        global $myts;
-        static $name_anonymous;
-
-        if (!is_object($user) || !$user->isActive()) {
-            if (null === $name_anonymous) {
-                $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
-            }
-
-            return ['name' => $name_anonymous, 'link' => $name_anonymous];
-        }
-
-        $this->user = $user;
-
-        $userinfo['uid'] = $user->getVar('uid');
-
-        $name             = empty($GLOBALS['xoopsModuleConfig']['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
-        $userinfo['name'] = $name ?: $user->getVar('uname');
-
-        $userinfo['link'] = '<a href=\'' . XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid') . '\'>' . $userinfo['name'] . '</a>';
-
-        $userinfo['avatar'] = $user->getVar('user_avatar');
-        // START hacked by irmtfan - easier rank getting - consistency with previous version back rank.title and rank.image
-        $userrank         = $user->rank();
-        $userinfo['rank'] = [];
-        if (isset($userrank['image']) && $userrank['image']) {
-            $userinfo['rank']['image'] = $userrank['image'];
-            $userinfo['rank']['title'] = $userrank['title'];
-        }
-        // END hacked by irmtfan - easier rank getting  - a little correctness dot removed
-        // START hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
-        //checks for user's groups
-        $userinfo['groups'] = [];
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = xoops_getHandler('member');
-        $usergroups    = $memberHandler->getGroupsByUser($userinfo['uid'], true);
-        foreach ($usergroups as $group) {
-            $userinfo['groups'][] = $group->getVar('name');
-        }
-        // END hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
-        $userinfo['from'] = $user->getVar('user_from');
-
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
-        $userinfo['regdate']    = newbbFormatTimestamp($user->getVar('user_regdate'), 'reg');
-        $userinfo['last_login'] = newbbFormatTimestamp($user->getVar('last_login')); // irmtfan add last_login
-
-        $userinfo['posts'] = $user->getVar('posts');
-
-        if (!empty($GLOBALS['xoopsModuleConfig']['user_level'])) {
-            $userinfo['level'] = $this->getLevel();
-        }
-
-        if (!empty($GLOBALS['xoopsModuleConfig']['userbar_enabled'])) {
-            $userinfo['userbar'] = $this->getUserbar();
-        }
-
-        $userinfo['signature'] = $user->getVar('user_sig');
-
-        return $userinfo;
-    }
+	public $user;
+
+	public function __construct()
+	{
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getUserbar()
+	{
+		global $isAdmin;
+
+		$userbar = [];
+		if (empty($GLOBALS['xoopsModuleConfig']['userbar_enabled'])) {
+			return $userbar;
+		}
+
+		$user               = $this->user;
+		$userbar['profile'] = [
+			'link' => XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid'),
+			'name' => _PROFILE
+		];
+
+		if (is_object($GLOBALS['xoopsUser'])) {
+			$userbar['pm'] = [
+				'link' => "javascript:void openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&amp;to_userid=' . $user->getVar('uid') . "', 'pmlite', 450, 380);",
+				'name' => _MD_NEWBB_PM
+			];
+		}
+		if ($user->getVar('user_viewemail') || $isAdmin) {
+			$userbar['email'] = [
+				'link' => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');",
+				'name' => _MD_NEWBB_EMAIL
+			];
+		}
+		if ($url = $user->getVar('url')) {
+			$userbar['url'] = [
+				'link' => "javascript:void window.open('" . $url . "', 'new');",
+				'name' => _MD_NEWBB_WWW
+			];
+		}
+		if ($icq = $user->getVar('user_icq')) {
+			$userbar['icq'] = [
+				'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq . "', 'new');",
+				'name' => _MD_NEWBB_ICQ
+			];
+		}
+		if ($aim = $user->getVar('user_aim')) {
+			$userbar['aim'] = [
+				'link' => "javascript:void window.open('aim:goim?screenname=" . $aim . '&amp;message=Hi+' . $aim . '+Are+you+there?' . "', 'new');",
+				'name' => _MD_NEWBB_AIM
+			];
+		}
+		if ($yim = $user->getVar('user_yim')) {
+			$userbar['yim'] = [
+				'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . '&.src=pg' . "', 'new');",
+				'name' => _MD_NEWBB_YIM
+			];
+		}
+		if ($msn = $user->getVar('user_msnm')) {
+			$userbar['msnm'] = [
+				'link' => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');",
+				'name' => _MD_NEWBB_MSNM
+			];
+		}
+
+		return $userbar;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLevel()
+	{
+		global $forumUrl;
+
+		$level = newbb_calculateLevel($this->user->getVar('posts'), $this->user->getVar('user_regdate'));
+		$info  = '';
+		if (2 == $GLOBALS['xoopsModuleConfig']['user_level']) {
+			static $rpg_images;
+			if (null === $rpg_images) {
+				$iconHandler = newbbGetIconHandler();
+				$rpg_path    = $iconHandler->getPath('rpg');
+				foreach (['img_left', 'img_backing', 'img_right', 'blue', 'green', 'orange'] as $img) {
+					// irmtfan fix: double "/" removed
+					$rpg_images[$img] = XOOPS_URL . $rpg_path . '/' . $img . '.gif';
+				}
+			}
+			// irmtfan hardcore removed align="left"
+			$table = "<table class='userlevel'><tr><td class='end'><img src='"
+					 . $rpg_images['img_left']
+					 . "' alt='' /></td><td class='center' background='"
+					 . $rpg_images['img_backing']
+					 . "'><img src='%s' width='%d' alt='' class='icon_left' /></td><td><img src='"
+					 . $rpg_images['img_right']
+					 . "' alt='' /></td></tr></table>";
+
+			$info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '<br><span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>' . sprintf($table, $rpg_images['orange'], $level['hp_width']);
+			$info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span><br>' . sprintf($table, $rpg_images['green'], $level['mp_width']);
+			$info .= '<span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>' . sprintf($table, $rpg_images['blue'], $level['exp_width']);
+		} else {
+			$info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '; <span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>';
+			$info .= '<span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>';
+			$info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span>';
+		}
+
+		return $info;
+	}
+
+	/**
+	 * @param \XoopsUser $user
+	 * @return mixed
+	 */
+	public function getInfo(&$user)
+	{
+		global $myts;
+		static $name_anonymous;
+
+		if (!is_object($user) || !$user->isActive()) {
+			if (null === $name_anonymous) {
+				$name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
+			}
+
+			return ['name' => $name_anonymous, 'link' => $name_anonymous];
+		}
+
+		$this->user = $user;
+
+		$userinfo['uid'] = $user->getVar('uid');
+
+		$name             = empty($GLOBALS['xoopsModuleConfig']['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
+		$userinfo['name'] = $name ?: $user->getVar('uname');
+
+		$userinfo['link'] = '<a href=\'' . XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid') . '\'>' . $userinfo['name'] . '</a>';
+
+		$userinfo['avatar'] = $user->getVar('user_avatar');
+		// START hacked by irmtfan - easier rank getting - consistency with previous version back rank.title and rank.image
+		$userrank         = $user->rank();
+		$userinfo['rank'] = [];
+		if (isset($userrank['image']) && $userrank['image']) {
+			$userinfo['rank']['image'] = $userrank['image'];
+			$userinfo['rank']['title'] = $userrank['title'];
+		}
+		// END hacked by irmtfan - easier rank getting  - a little correctness dot removed
+		// START hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
+		//checks for user's groups
+		$userinfo['groups'] = [];
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = xoops_getHandler('member');
+		$usergroups    = $memberHandler->getGroupsByUser($userinfo['uid'], true);
+		foreach ($usergroups as $group) {
+			$userinfo['groups'][] = $group->getVar('name');
+		}
+		// END hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
+		$userinfo['from'] = $user->getVar('user_from');
+
+		require_once  dirname(__DIR__) . '/include/functions.time.php';
+		$userinfo['regdate']    = newbbFormatTimestamp($user->getVar('user_regdate'), 'reg');
+		$userinfo['last_login'] = newbbFormatTimestamp($user->getVar('last_login')); // irmtfan add last_login
+
+		$userinfo['posts'] = $user->getVar('posts');
+
+		if (!empty($GLOBALS['xoopsModuleConfig']['user_level'])) {
+			$userinfo['level'] = $this->getLevel();
+		}
+
+		if (!empty($GLOBALS['xoopsModuleConfig']['userbar_enabled'])) {
+			$userinfo['userbar'] = $this->getUserbar();
+		}
+
+		$userinfo['signature'] = $user->getVar('user_sig');
+
+		return $userinfo;
+	}
 }

class/Text.php

Indentation +10 added lines, -10 removed lines

@@ -19,14 +19,14 @@
  */
 class Text extends \XoopsObject
 {
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->initVar('post_id', XOBJ_DTYPE_INT);
-        $this->initVar('post_text', XOBJ_DTYPE_TXTAREA);
-        $this->initVar('post_edit', XOBJ_DTYPE_SOURCE);
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->initVar('post_id', XOBJ_DTYPE_INT);
+		$this->initVar('post_text', XOBJ_DTYPE_TXTAREA);
+		$this->initVar('post_edit', XOBJ_DTYPE_SOURCE);
+	}
 }

class/StatsHandler.php

Indentation +216 added lines, -216 removed lines

@@ -30,238 +30,238 @@
  */
 class StatsHandler
 {
-    public $db;
-    public $table;
-    public $param = [
-        'type'   => ['topic', 'post', 'digest', 'view'],
-        'period' => ['total', 'day', 'week', 'month']
-    ];
+	public $db;
+	public $table;
+	public $param = [
+		'type'   => ['topic', 'post', 'digest', 'view'],
+		'period' => ['total', 'day', 'week', 'month']
+	];
 
-    /**
-     * @param null|\XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        //$this->db = $db;
-        //if (!$db || !($db instanceof XoopsDatabase)) {
-        $this->db = $GLOBALS['xoopsDB'];
-        //}
-        $this->table = $this->db->prefix('newbb_stats');
-    }
+	/**
+	 * @param null|\XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		//$this->db = $db;
+		//if (!$db || !($db instanceof XoopsDatabase)) {
+		$this->db = $GLOBALS['xoopsDB'];
+		//}
+		$this->table = $this->db->prefix('newbb_stats');
+	}
 
-    /**
-     * @param  null|\XoopsDatabase $db
-     * @return StatsHandler
-     */
-    public static function getInstance(\XoopsDatabase $db = null)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($db);
-        }
+	/**
+	 * @param  null|\XoopsDatabase $db
+	 * @return StatsHandler
+	 */
+	public static function getInstance(\XoopsDatabase $db = null)
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($db);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @param       $id
-     * @param       $type
-     * @param  int  $increment
-     * @return bool
-     */
-    public function update($id, $type, $increment = 1)
-    {
-        $id        = (int)$id;
-        $increment = (int)$increment;
+	/**
+	 * @param       $id
+	 * @param       $type
+	 * @param  int  $increment
+	 * @return bool
+	 */
+	public function update($id, $type, $increment = 1)
+	{
+		$id        = (int)$id;
+		$increment = (int)$increment;
 
-        if (empty($increment) || false === ($type = array_search($type, $this->param['type']))) {
-            return false;
-        }
+		if (empty($increment) || false === ($type = array_search($type, $this->param['type']))) {
+			return false;
+		}
 
-        $sql    = "    UPDATE {$this->table}"
-                  . '    SET stats_value = CASE '
-                  . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
-                  . "                    ELSE '{$increment}' "
-                  . '                END, '
-                  . '        time_update = NOW()'
-                  . '    WHERE '
-                  . "        (stats_id = '0' OR stats_id = '{$id}') "
-                  . "        AND stats_type='{$type}' ";
-        $result = $this->db->queryF($sql);
-        $rows   = $this->db->getAffectedRows();
-        if (0 == $rows) {
-            $sql    = "    INSERT INTO {$this->table}"
-                      . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                      . '    VALUES '
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('total', $this->param['period'], true)
-                      . "', NOW(), ''), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('day', $this->param['period'], true)
-                      . "', NOW(), '%Y%j'), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('week', $this->param['period'], true)
-                      . "', NOW(), '%Y%u'), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('month', $this->param['period'], true)
-                      . "', NOW(), '%Y%m')";
-            $result = $this->db->queryF($sql);
-        }
-        if ($rows < 2 * count($this->param['period']) && !empty($id)) {
-            $sql    = "    INSERT INTO {$this->table}"
-                      . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                      . '    VALUES '
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('total', $this->param['period'], true)
-                      . "', NOW(), ''), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('day', $this->param['period'], true)
-                      . "', NOW(), '%Y%j'), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('week', $this->param['period'], true)
-                      . "', NOW(), '%Y%u'), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('month', $this->param['period'], true)
-                      . "', NOW(), '%Y%m')";
-            $result = $this->db->queryF($sql);
-        }
-    }
+		$sql    = "    UPDATE {$this->table}"
+				  . '    SET stats_value = CASE '
+				  . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
+				  . "                    ELSE '{$increment}' "
+				  . '                END, '
+				  . '        time_update = NOW()'
+				  . '    WHERE '
+				  . "        (stats_id = '0' OR stats_id = '{$id}') "
+				  . "        AND stats_type='{$type}' ";
+		$result = $this->db->queryF($sql);
+		$rows   = $this->db->getAffectedRows();
+		if (0 == $rows) {
+			$sql    = "    INSERT INTO {$this->table}"
+					  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+					  . '    VALUES '
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('total', $this->param['period'], true)
+					  . "', NOW(), ''), "
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('day', $this->param['period'], true)
+					  . "', NOW(), '%Y%j'), "
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('week', $this->param['period'], true)
+					  . "', NOW(), '%Y%u'), "
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('month', $this->param['period'], true)
+					  . "', NOW(), '%Y%m')";
+			$result = $this->db->queryF($sql);
+		}
+		if ($rows < 2 * count($this->param['period']) && !empty($id)) {
+			$sql    = "    INSERT INTO {$this->table}"
+					  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+					  . '    VALUES '
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('total', $this->param['period'], true)
+					  . "', NOW(), ''), "
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('day', $this->param['period'], true)
+					  . "', NOW(), '%Y%j'), "
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('week', $this->param['period'], true)
+					  . "', NOW(), '%Y%u'), "
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('month', $this->param['period'], true)
+					  . "', NOW(), '%Y%m')";
+			$result = $this->db->queryF($sql);
+		}
+	}
 
-    /**
-     * Get stats of "Today"
-     *
-     * @param  array $ids     ID of forum: > 0, forum; 0 - global; empty - all
-     * @param  array $types   type of stats items: 1 - topic; 2 - post; 3 - digest; 4 - click; empty - all
-     * @param  array $periods time period: 1 - all time; 2 - today; 3 - this week; 4 - this month; empty - all
-     * @return array
-     */
-    public function getStats(array $ids, array $types = [], array $periods = [])
-    {
-        $ret = [];
+	/**
+	 * Get stats of "Today"
+	 *
+	 * @param  array $ids     ID of forum: > 0, forum; 0 - global; empty - all
+	 * @param  array $types   type of stats items: 1 - topic; 2 - post; 3 - digest; 4 - click; empty - all
+	 * @param  array $periods time period: 1 - all time; 2 - today; 3 - this week; 4 - this month; empty - all
+	 * @return array
+	 */
+	public function getStats(array $ids, array $types = [], array $periods = [])
+	{
+		$ret = [];
 
-        $_types = [];
-        foreach ($types as $type) {
-            $_types[] = array_search($type, $this->param['type']);
-        }
-        $_periods = [];
-        foreach ($periods as $period) {
-            $_periods[] = array_search($period, $this->param['period']);
-        }
-        $sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
-                  . "    FROM {$this->table} "
-                  . '    WHERE '
-                  . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
-                  . '        '
-                  . (empty($ids) ? '' : 'AND stats_id IN ('
-                                        . implode(', ', array_map('intval', $ids))
-                                        . ')')
-                  . '        '
-                  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
-                  . '        '
-                  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
-        $result = $this->db->query($sql);
+		$_types = [];
+		foreach ($types as $type) {
+			$_types[] = array_search($type, $this->param['type']);
+		}
+		$_periods = [];
+		foreach ($periods as $period) {
+			$_periods[] = array_search($period, $this->param['period']);
+		}
+		$sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
+				  . "    FROM {$this->table} "
+				  . '    WHERE '
+				  . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
+				  . '        '
+				  . (empty($ids) ? '' : 'AND stats_id IN ('
+										. implode(', ', array_map('intval', $ids))
+										. ')')
+				  . '        '
+				  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
+				  . '        '
+				  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
+		$result = $this->db->query($sql);
 
-        while (false !== ($row = $this->db->fetchArray($result))) {
-            $ret[(string)$row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
-        }
+		while (false !== ($row = $this->db->fetchArray($result))) {
+			$ret[(string)$row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    public function reset()
-    {
-        $this->db->queryF('TRUNCATE TABLE ' . $this->table);
-        $now        = time();
-        $time_start = [
-            'day'   => '%Y%j',
-            'week'  => '%Y%u',
-            'month' => '%Y%m'
-        ];
-        $counts     = [];
+	public function reset()
+	{
+		$this->db->queryF('TRUNCATE TABLE ' . $this->table);
+		$now        = time();
+		$time_start = [
+			'day'   => '%Y%j',
+			'week'  => '%Y%u',
+			'month' => '%Y%m'
+		];
+		$counts     = [];
 
-        $sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
-        $ret = $this->db->query($sql);
-        while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
-            $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
-            $result = $this->db->query($sql);
-            list($topics, $views) = $this->db->fetchRow($result);
-            $this->update($forum_id, 'topic', $topics);
-            $this->update($forum_id, 'view', $views);
+		$sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
+		$ret = $this->db->query($sql);
+		while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
+			$sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+			$result = $this->db->query($sql);
+			list($topics, $views) = $this->db->fetchRow($result);
+			$this->update($forum_id, 'topic', $topics);
+			$this->update($forum_id, 'view', $views);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
-            $result = $this->db->query($sql);
-            list($digests) = $this->db->fetchRow($result);
-            $this->update($forum_id, 'digest', $digests);
+			$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
+			$result = $this->db->query($sql);
+			list($digests) = $this->db->fetchRow($result);
+			$this->update($forum_id, 'digest', $digests);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
-            $result = $this->db->query($sql);
-            list($posts) = $this->db->fetchRow($result);
-            $this->update($forum_id, 'post', $posts);
+			$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+			$result = $this->db->query($sql);
+			list($posts) = $this->db->fetchRow($result);
+			$this->update($forum_id, 'post', $posts);
 
-            foreach ($time_start as $period => $format) {
-                $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
-                $result = $this->db->query($sql);
-                list($topics, $views) = $this->db->fetchRow($result);
-                $views = empty($views) ? 0 : $views; // null check
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$topics}', '"
-                                  . array_search('topic', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$views}', '"
-                                  . array_search('view', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
-                @$counts['topic'][$period] += $topics;
-                @$counts['view'][$period] += $views;
+			foreach ($time_start as $period => $format) {
+				$sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+				$result = $this->db->query($sql);
+				list($topics, $views) = $this->db->fetchRow($result);
+				$views = empty($views) ? 0 : $views; // null check
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$topics}', '"
+								  . array_search('topic', $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'])
+								  . "', NOW(), '{$format}')");
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$views}', '"
+								  . array_search('view', $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'])
+								  . "', NOW(), '{$format}')");
+				@$counts['topic'][$period] += $topics;
+				@$counts['view'][$period] += $views;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
-                $result = $this->db->query($sql);
-                list($digests) = $this->db->fetchRow($result);
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$digests}', '"
-                                  . array_search('digest', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
-                @$counts['digest'][$period] += $digests;
+				$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+				$result = $this->db->query($sql);
+				list($digests) = $this->db->fetchRow($result);
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$digests}', '"
+								  . array_search('digest', $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'])
+								  . "', NOW(), '{$format}')");
+				@$counts['digest'][$period] += $digests;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
-                $result = $this->db->query($sql);
-                list($posts) = $this->db->fetchRow($result);
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$posts}', '"
-                                  . array_search('post', $this->param['type'])
-                                  . "', '"
-                                  . array_search($period, $this->param['period'], true)
-                                  . "', NOW(), '{$format}')");
-                @$counts['post'][$period] += $posts;
-            }
-        }
+				$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+				$result = $this->db->query($sql);
+				list($posts) = $this->db->fetchRow($result);
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$posts}', '"
+								  . array_search('post', $this->param['type'])
+								  . "', '"
+								  . array_search($period, $this->param['period'], true)
+								  . "', NOW(), '{$format}')");
+				@$counts['post'][$period] += $posts;
+			}
+		}
 
-        $this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
-        foreach ($time_start as $period => $format) {
-            foreach (array_keys($counts) as $type) {
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('0', '{$counts[$type][$period]}', '"
-                                  . array_search($type, $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'], true)
-                                  . "', NOW(), '{$format}')");
-            }
-        }
-    }
+		$this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
+		foreach ($time_start as $period => $format) {
+			foreach (array_keys($counts) as $type) {
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('0', '{$counts[$type][$period]}', '"
+								  . array_search($type, $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'], true)
+								  . "', NOW(), '{$format}')");
+			}
+		}
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 
 define('NEWBB_STATS_TYPE_TOPIC', 1);
 define('NEWBB_STATS_TYPE_POST', 2);
@@ -71,14 +71,14 @@ 
      */
     public function update($id, $type, $increment = 1)
     {
-        $id        = (int)$id;
-        $increment = (int)$increment;
+        $id        = (int) $id;
+        $increment = (int) $increment;
 
         if (empty($increment) || false === ($type = array_search($type, $this->param['type']))) {
             return false;
         }
 
-        $sql    = "    UPDATE {$this->table}"
+        $sql = "    UPDATE {$this->table}"
                   . '    SET stats_value = CASE '
                   . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
                   . "                    ELSE '{$increment}' "
@@ -90,7 +90,7 @@ 
         $result = $this->db->queryF($sql);
         $rows   = $this->db->getAffectedRows();
         if (0 == $rows) {
-            $sql    = "    INSERT INTO {$this->table}"
+            $sql = "    INSERT INTO {$this->table}"
                       . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
                       . '    VALUES '
                       . "        ('0', '{$increment}', '{$type}', '"
@@ -147,7 +147,7 @@ 
         foreach ($periods as $period) {
             $_periods[] = array_search($period, $this->param['period']);
         }
-        $sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
+        $sql = '    SELECT stats_id, stats_value, stats_type, stats_period '
                   . "    FROM {$this->table} "
                   . '    WHERE '
                   . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
@@ -156,13 +156,13 @@ 
                                         . implode(', ', array_map('intval', $ids))
                                         . ')')
                   . '        '
-                  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
+                  . (empty($_types) ? '' : 'AND stats_type IN ('.implode(', ', $_types).')')
                   . '        '
-                  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
+                  . (empty($_periods) ? '' : 'AND stats_period IN ('.implode(', ', $_periods).')');
         $result = $this->db->query($sql);
 
         while (false !== ($row = $this->db->fetchArray($result))) {
-            $ret[(string)$row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
+            $ret[(string) $row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
         }
 
         return $ret;
@@ -170,36 +170,36 @@ 
 
     public function reset()
     {
-        $this->db->queryF('TRUNCATE TABLE ' . $this->table);
+        $this->db->queryF('TRUNCATE TABLE '.$this->table);
         $now        = time();
         $time_start = [
             'day'   => '%Y%j',
             'week'  => '%Y%u',
             'month' => '%Y%m'
         ];
-        $counts     = [];
+        $counts = [];
 
-        $sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
+        $sql = '    SELECT forum_id'.'    FROM '.$this->db->prefix('newbb_forums');
         $ret = $this->db->query($sql);
         while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
-            $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($topics, $views) = $this->db->fetchRow($result);
             $this->update($forum_id, 'topic', $topics);
             $this->update($forum_id, 'view', $views);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($digests) = $this->db->fetchRow($result);
             $this->update($forum_id, 'digest', $digests);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($posts) = $this->db->fetchRow($result);
             $this->update($forum_id, 'post', $posts);
 
             foreach ($time_start as $period => $format) {
-                $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($topics, $views) = $this->db->fetchRow($result);
                 $views = empty($views) ? 0 : $views; // null check
@@ -222,7 +222,7 @@ 
                 @$counts['topic'][$period] += $topics;
                 @$counts['view'][$period] += $views;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($digests) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -235,7 +235,7 @@ 
                                   . "', NOW(), '{$format}')");
                 @$counts['digest'][$period] += $digests;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($posts) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -250,7 +250,7 @@ 
             }
         }
 
-        $this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
+        $this->db->queryF("    DELETE FROM {$this->table}"."    WHERE stats_id = '0' AND stats_period <> ".array_search('total', $this->param['period'], true));
         foreach ($time_start as $period => $format) {
             foreach (array_keys($counts) as $type) {
                 $this->db->queryF("    INSERT INTO {$this->table}"

class/Readtopic.php

Indentation +8 added lines, -8 removed lines

@@ -44,12 +44,12 @@
  */
 class Readtopic extends Newbb\Read
 {
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        //$this->initVar('forum_id', XOBJ_DTYPE_INT);
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		//$this->initVar('forum_id', XOBJ_DTYPE_INT);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/Read.php';
+require_once __DIR__.'/Read.php';
 
 /**
  * A handler for read/unread handling

class/Topic.php

Indentation +177 added lines, -177 removed lines

@@ -22,186 +22,186 @@
  */
 class Topic extends \XoopsObject
 {
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->initVar('topic_id', XOBJ_DTYPE_INT);
-        $this->initVar('topic_title', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('topic_poster', XOBJ_DTYPE_INT);
-        $this->initVar('topic_time', XOBJ_DTYPE_INT);
-        $this->initVar('topic_views', XOBJ_DTYPE_INT);
-        $this->initVar('topic_replies', XOBJ_DTYPE_INT);
-        $this->initVar('topic_last_post_id', XOBJ_DTYPE_INT);
-        $this->initVar('forum_id', XOBJ_DTYPE_INT);
-        $this->initVar('topic_status', XOBJ_DTYPE_INT);
-        $this->initVar('type_id', XOBJ_DTYPE_INT);
-        $this->initVar('topic_sticky', XOBJ_DTYPE_INT);
-        $this->initVar('topic_digest', XOBJ_DTYPE_INT);
-        $this->initVar('digest_time', XOBJ_DTYPE_INT);
-        $this->initVar('approved', XOBJ_DTYPE_INT);
-        $this->initVar('poster_name', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('rating', XOBJ_DTYPE_OTHER);
-        $this->initVar('votes', XOBJ_DTYPE_INT);
-        $this->initVar('topic_haspoll', XOBJ_DTYPE_INT);
-        $this->initVar('poll_id', XOBJ_DTYPE_INT);
-        $this->initVar('topic_tags', XOBJ_DTYPE_SOURCE);
-    }
-
-    // irmtfan add LAST_INSERT_ID to enhance the mysql performances
-    public function incrementCounter()
-    {
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' SET topic_views = LAST_INSERT_ID(topic_views + 1) WHERE topic_id =' . $this->getVar('topic_id');
-        $GLOBALS['xoopsDB']->queryF($sql);
-    }
-
-    /**
-     * Create full title of the topic
-     *
-     * the title is composed of [type_name] if type_id is greater than 0 plus topic_title
-     *
-     */
-    public function getFullTitle()
-    {
-        $topic_title = $this->getVar('topic_title');
-        if (!$this->getVar('type_id')) {
-            return $topic_title;
-        }
-        $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        if (!$typeObject = $typeHandler->get($this->getVar('type_id'))) {
-            return $topic_title;
-        }
-
-        require_once  dirname(__DIR__) . '/include/functions.topic.php';
-
-        return getTopicTitle($topic_title, $typeObject->getVar('type_name'), $typeObject->getVar('type_color'));
-    }
-    // START irmtfan loadOldPoll function
-
-    /**
-     * Load functions needed for old xoopspoll (older than version 1.4 by zyspec) and umfrage modules
-     *
-     * @access public
-     * @param  string $pollModule dirname of the poll module
-     * @return string|false $classPoll = the name of the old poll class eg: "XoopsPoll" | "Umfrage"
-     */
-
-    public function loadOldPoll($pollModule = null)
-    {
-        static $classPoll = false;
-        if ($classPoll && empty($pollModule)) {
-            return $classPoll;
-        }
-        $newbbConfig = newbbLoadConfig();
-        if (!empty($pollModule)) {
-            $newbbConfig['poll_module'] = $pollModule;
-        }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->initVar('topic_id', XOBJ_DTYPE_INT);
+		$this->initVar('topic_title', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('topic_poster', XOBJ_DTYPE_INT);
+		$this->initVar('topic_time', XOBJ_DTYPE_INT);
+		$this->initVar('topic_views', XOBJ_DTYPE_INT);
+		$this->initVar('topic_replies', XOBJ_DTYPE_INT);
+		$this->initVar('topic_last_post_id', XOBJ_DTYPE_INT);
+		$this->initVar('forum_id', XOBJ_DTYPE_INT);
+		$this->initVar('topic_status', XOBJ_DTYPE_INT);
+		$this->initVar('type_id', XOBJ_DTYPE_INT);
+		$this->initVar('topic_sticky', XOBJ_DTYPE_INT);
+		$this->initVar('topic_digest', XOBJ_DTYPE_INT);
+		$this->initVar('digest_time', XOBJ_DTYPE_INT);
+		$this->initVar('approved', XOBJ_DTYPE_INT);
+		$this->initVar('poster_name', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('rating', XOBJ_DTYPE_OTHER);
+		$this->initVar('votes', XOBJ_DTYPE_INT);
+		$this->initVar('topic_haspoll', XOBJ_DTYPE_INT);
+		$this->initVar('poll_id', XOBJ_DTYPE_INT);
+		$this->initVar('topic_tags', XOBJ_DTYPE_SOURCE);
+	}
+
+	// irmtfan add LAST_INSERT_ID to enhance the mysql performances
+	public function incrementCounter()
+	{
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' SET topic_views = LAST_INSERT_ID(topic_views + 1) WHERE topic_id =' . $this->getVar('topic_id');
+		$GLOBALS['xoopsDB']->queryF($sql);
+	}
+
+	/**
+	 * Create full title of the topic
+	 *
+	 * the title is composed of [type_name] if type_id is greater than 0 plus topic_title
+	 *
+	 */
+	public function getFullTitle()
+	{
+		$topic_title = $this->getVar('topic_title');
+		if (!$this->getVar('type_id')) {
+			return $topic_title;
+		}
+		$typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
+		if (!$typeObject = $typeHandler->get($this->getVar('type_id'))) {
+			return $topic_title;
+		}
+
+		require_once  dirname(__DIR__) . '/include/functions.topic.php';
+
+		return getTopicTitle($topic_title, $typeObject->getVar('type_name'), $typeObject->getVar('type_color'));
+	}
+	// START irmtfan loadOldPoll function
+
+	/**
+	 * Load functions needed for old xoopspoll (older than version 1.4 by zyspec) and umfrage modules
+	 *
+	 * @access public
+	 * @param  string $pollModule dirname of the poll module
+	 * @return string|false $classPoll = the name of the old poll class eg: "XoopsPoll" | "Umfrage"
+	 */
+
+	public function loadOldPoll($pollModule = null)
+	{
+		static $classPoll = false;
+		if ($classPoll && empty($pollModule)) {
+			return $classPoll;
+		}
+		$newbbConfig = newbbLoadConfig();
+		if (!empty($pollModule)) {
+			$newbbConfig['poll_module'] = $pollModule;
+		}
 //        $relPath = $GLOBALS['xoops']->path('modules/' . $newbbConfig['poll_module'] . '/class/' . $newbbConfig['poll_module']);
 //        require_once $relPath . '.php';
 //        require_once $relPath . 'option.php';
 //        require_once $relPath . 'log.php';
 //        require_once $relPath . 'renderer.php';
-        $classes = get_declared_classes();
-        foreach (array_reverse($classes) as $class) {
-            if (strtolower($class) == $newbbConfig['poll_module']) {
-                $classPoll = $class;
-
-                return $classPoll;
-            }
-        }
-
-        return false;
-    }
-    // END irmtfan loadOldPoll function
-    // START irmtfan add deletePoll function
-    /**
-     * delete a poll in database
-     *
-     * @access public
-     * @param  int $poll_id
-     * @return bool
-     */
-    public function deletePoll($poll_id)
-    {
-        if (empty($poll_id)) {
-            return false;
-        }
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler     = xoops_getHandler('module');
-        $newbbConfig       = newbbLoadConfig();
-        $pollModuleHandler = $moduleHandler->getByDirname($newbbConfig['poll_module']);
-        if (!is_object($pollModuleHandler) || !$pollModuleHandler->getVar('isactive')) {
-            return false;
-        }
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            /** @var \XoopsPollHandler $pollHandler */
-            $pollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
-            if (false !== $pollHandler->deleteAll(new \Criteria('poll_id', $poll_id, '='))) {
-                /** @var XoopsPoll\OptionHandler $optionHandler */
-                $optionHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                $optionHandler->deleteAll(new \Criteria('poll_id', $poll_id, '='));
-                /** @var XoopsPoll\LogHandler $logHandler */
-                $logHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                $logHandler->deleteAll(new \Criteria('poll_id', $poll_id, '='));
-                xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $poll_id);
-            }
-            // old Xoopspoll or Umfrage or any clone from them
-        } else {
-            $classPoll = $this->loadOldPoll();
-            /** @var \XoopsPoll $poll */
-            $poll = new $classPoll($poll_id);
-            if (false !== $poll->delete()) {
-                $classOption = $classPoll . 'Option';
-                $classOption::deleteByPollId($poll->getVar('poll_id'));
-                $classLog = $classPoll . 'Log';
-                $classLog::deleteByPollId($poll->getVar('poll_id'));
-                xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $poll->getVar('poll_id'));
-            }
-        } // end poll_module new or old
-
-        return true;
-    }
-    // END irmtfan add deletePoll function
-
-    // START irmtfan add getPoll function
-    /**
-     * get a poll object from a poll module.
-     * note: can be used to find if a poll exist in a module
-     * @access public
-     * @param  int    $poll_id
-     * @param  string $pollModule dirname of the poll module
-     * @return bool|\XoopsObject poll
-     */
-    public function getPoll($poll_id, $pollModule = null)
-    {
-        if (empty($poll_id)) {
-            return false;
-        }
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $newbbConfig   = newbbLoadConfig();
-        if (!empty($pollModule)) {
-            $newbbConfig['poll_module'] = $pollModule;
-        }
-
-        $pollModuleHandler = $moduleHandler->getByDirname($newbbConfig['poll_module']);
-        if (!is_object($pollModuleHandler) || !$pollModuleHandler->getVar('isactive')) {
-            return false;
-        }
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $pollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
-            $pollObject  = $pollHandler->get($poll_id);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classPoll  = $this->loadOldPoll($newbbConfig['poll_module']);
-            $pollObject = new $classPoll($poll_id);
-        } // end poll_module new or old
-
-        return $pollObject;
-    }
-    // END irmtfan add getPoll function
+		$classes = get_declared_classes();
+		foreach (array_reverse($classes) as $class) {
+			if (strtolower($class) == $newbbConfig['poll_module']) {
+				$classPoll = $class;
+
+				return $classPoll;
+			}
+		}
+
+		return false;
+	}
+	// END irmtfan loadOldPoll function
+	// START irmtfan add deletePoll function
+	/**
+	 * delete a poll in database
+	 *
+	 * @access public
+	 * @param  int $poll_id
+	 * @return bool
+	 */
+	public function deletePoll($poll_id)
+	{
+		if (empty($poll_id)) {
+			return false;
+		}
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler     = xoops_getHandler('module');
+		$newbbConfig       = newbbLoadConfig();
+		$pollModuleHandler = $moduleHandler->getByDirname($newbbConfig['poll_module']);
+		if (!is_object($pollModuleHandler) || !$pollModuleHandler->getVar('isactive')) {
+			return false;
+		}
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			/** @var \XoopsPollHandler $pollHandler */
+			$pollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
+			if (false !== $pollHandler->deleteAll(new \Criteria('poll_id', $poll_id, '='))) {
+				/** @var XoopsPoll\OptionHandler $optionHandler */
+				$optionHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+				$optionHandler->deleteAll(new \Criteria('poll_id', $poll_id, '='));
+				/** @var XoopsPoll\LogHandler $logHandler */
+				$logHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+				$logHandler->deleteAll(new \Criteria('poll_id', $poll_id, '='));
+				xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $poll_id);
+			}
+			// old Xoopspoll or Umfrage or any clone from them
+		} else {
+			$classPoll = $this->loadOldPoll();
+			/** @var \XoopsPoll $poll */
+			$poll = new $classPoll($poll_id);
+			if (false !== $poll->delete()) {
+				$classOption = $classPoll . 'Option';
+				$classOption::deleteByPollId($poll->getVar('poll_id'));
+				$classLog = $classPoll . 'Log';
+				$classLog::deleteByPollId($poll->getVar('poll_id'));
+				xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $poll->getVar('poll_id'));
+			}
+		} // end poll_module new or old
+
+		return true;
+	}
+	// END irmtfan add deletePoll function
+
+	// START irmtfan add getPoll function
+	/**
+	 * get a poll object from a poll module.
+	 * note: can be used to find if a poll exist in a module
+	 * @access public
+	 * @param  int    $poll_id
+	 * @param  string $pollModule dirname of the poll module
+	 * @return bool|\XoopsObject poll
+	 */
+	public function getPoll($poll_id, $pollModule = null)
+	{
+		if (empty($poll_id)) {
+			return false;
+		}
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$newbbConfig   = newbbLoadConfig();
+		if (!empty($pollModule)) {
+			$newbbConfig['poll_module'] = $pollModule;
+		}
+
+		$pollModuleHandler = $moduleHandler->getByDirname($newbbConfig['poll_module']);
+		if (!is_object($pollModuleHandler) || !$pollModuleHandler->getVar('isactive')) {
+			return false;
+		}
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			$pollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
+			$pollObject  = $pollHandler->get($poll_id);
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			$classPoll  = $this->loadOldPoll($newbbConfig['poll_module']);
+			$pollObject = new $classPoll($poll_id);
+		} // end poll_module new or old
+
+		return $pollObject;
+	}
+	// END irmtfan add getPoll function
 }

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
     // irmtfan add LAST_INSERT_ID to enhance the mysql performances
     public function incrementCounter()
     {
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' SET topic_views = LAST_INSERT_ID(topic_views + 1) WHERE topic_id =' . $this->getVar('topic_id');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' SET topic_views = LAST_INSERT_ID(topic_views + 1) WHERE topic_id ='.$this->getVar('topic_id');
         $GLOBALS['xoopsDB']->queryF($sql);
     }
 
@@ -74,7 +74,7 @@ 
             return $topic_title;
         }
 
-        require_once  dirname(__DIR__) . '/include/functions.topic.php';
+        require_once  dirname(__DIR__).'/include/functions.topic.php';
 
         return getTopicTitle($topic_title, $typeObject->getVar('type_name'), $typeObject->getVar('type_color'));
     }
@@ -154,9 +154,9 @@ 
             /** @var \XoopsPoll $poll */
             $poll = new $classPoll($poll_id);
             if (false !== $poll->delete()) {
-                $classOption = $classPoll . 'Option';
+                $classOption = $classPoll.'Option';
                 $classOption::deleteByPollId($poll->getVar('poll_id'));
-                $classLog = $classPoll . 'Log';
+                $classLog = $classPoll.'Log';
                 $classLog::deleteByPollId($poll->getVar('poll_id'));
                 xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $poll->getVar('poll_id'));
             }

class/IconHandler.php

Indentation +180 added lines, -180 removed lines

@@ -36,184 +36,184 @@
  */
 class IconHandler
 {
-    /**
-     * reference to XOOPS template
-     */
-    public $template;
-
-    /**
-     * image set
-     */
-    private $forumImage = [];
-
-    /**
-     * prefix
-     */
-    private $prefix = '';
-
-    /**
-     * postfix, including extension
-     */
-    private $postfix = '.png';
-
-    /**
-     * images to be assigned to template
-     */
-    private $images = [];
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Access the only instance of this class
-     * @return IconHandler
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
-
-        return $instance;
-    }
-
-    /**
-     * TODO: get compatible with new theme engine
-     * @param         $type
-     * @param  string $dirname
-     * @param  string $default
-     * @param  string $endDir
-     * @return mixed
-     */
-    // START irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
-    public function getPath($type, $dirname = 'newbb', $default = '', $endDir = 'images')
-    {
-        static $paths;
-        if (isset($paths[$endDir . '/' . $type])) {
-            return $paths[$endDir . '/' . $type];
-        }
-
-        $theme_path = $this->template->currentTheme->path;
-        $rel_dir    = "modules/{$dirname}/{$endDir}";
-        // START irmtfan add default for all pathes
-        if (empty($default)) {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}"
-                : (is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
-                : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}"));
-        } else {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
-                is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
-                is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
-                 . "/default/{$rel_dir}/{$type}" : (
-                     is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
-                    : (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
-                    : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
-            ) // XOOPS_THEME_PATH {$default}
-            ) // XOOPS_THEME_PATH
-            ); // $theme_path {$default}
-        }
-        // END irmtfan add default for all pathes
-        $paths[$endDir . '/' . $type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
-
-        return $paths[$endDir . '/' . $type];
-    }
-
-    // END irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
-
-    /**
-     * @param string $language
-     * @param string $dirname
-     */
-    public function init(/*$set = "default", */
-        $language = 'english',
-        $dirname = 'newbb'
-    ) {
-        $this->forumImage = require_once $GLOBALS['xoops']->path("modules/{$dirname}/include/images.php");
-
-        $this->forumImage['icon']     = XOOPS_URL . $this->getPath('icon', $dirname) . '/';
-        $this->forumImage['language'] = XOOPS_URL . $this->getPath("language/{$language}", $dirname, 'language/english') . '/';
-    }
-
-    /**
-     * @param        $image
-     * @param string $alt
-     * @param string $extra
-     */
-    public function setImage($image, $alt = '', $extra = '')
-    {
-        if (!isset($this->images[$image])) {
-            $imageSource = $this->getImageSource($image);
-            // irmtfan add id={$image}
-            $this->images[$image] = "<img src=\"{$imageSource}\" alt=\"{$alt}\" title=\"{$alt}\" align=\"middle\" {$extra} id={$image} />";
-        }
-    }
-
-    /**
-     * TODO: How about image not exist?
-     * @param $image
-     * @return string
-     */
-    public function getImageSource($image)
-    {
-        return $this->forumImage[$this->forumImage[$image]] . $this->prefix . $image . $this->postfix;
-    }
-
-    /**
-     * @param         $image
-     * @param  string $alt
-     * @param  string $extra
-     * @return mixed
-     */
-    public function getImage($image, $alt = '', $extra = '')
-    {
-        $this->setImage($image, $alt, $extra);
-
-        return $this->images[$image];
-    }
-
-    /**
-     * @param         $image
-     * @param  string $alt
-     * @param  string $extra
-     * @return string
-     */
-    public function assignImage($image, $alt = '', $extra = '')
-    {
-        $this->setImage($image, $alt, $extra);
-        // START hacked by irmtfan - improve function to CSS3 buttons - add alt and title attributes - use span instead of button to support IE7&8
-        $tag = 'span';
-        if ("class='forum_icon'" === $extra && in_array(substr($image, 0, 2), ['t_', 'p_', 'up'])) {
-            $extra = "class='forum_icon forum_button'";
-        }
-
-        return "<{$tag} alt=\"{$alt}\" title=\"{$alt}\" align=\"middle\" {$extra} id={$image}>$alt</{$tag}>";
-        // END hacked by irmtfan - improve function to CSS3 buttons
-    }
-
-    /**
-     * @param $images
-     */
-    public function assignImages($images)
-    {
-        foreach ($images as $myImage) {
-            list($image, $alt, $extra) = $myImage;
-            $this->assignImage($image, $alt, $extra);
-        }
-    }
-
-    /**
-     * @return int|void
-     */
-    public function render()
-    {
-        //$this->template->assign_by_ref("image", $this->images);
-        $this->template->assign($this->images);
-
-        return count($this->images);
-    }
+	/**
+	 * reference to XOOPS template
+	 */
+	public $template;
+
+	/**
+	 * image set
+	 */
+	private $forumImage = [];
+
+	/**
+	 * prefix
+	 */
+	private $prefix = '';
+
+	/**
+	 * postfix, including extension
+	 */
+	private $postfix = '.png';
+
+	/**
+	 * images to be assigned to template
+	 */
+	private $images = [];
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Access the only instance of this class
+	 * @return IconHandler
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * TODO: get compatible with new theme engine
+	 * @param         $type
+	 * @param  string $dirname
+	 * @param  string $default
+	 * @param  string $endDir
+	 * @return mixed
+	 */
+	// START irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
+	public function getPath($type, $dirname = 'newbb', $default = '', $endDir = 'images')
+	{
+		static $paths;
+		if (isset($paths[$endDir . '/' . $type])) {
+			return $paths[$endDir . '/' . $type];
+		}
+
+		$theme_path = $this->template->currentTheme->path;
+		$rel_dir    = "modules/{$dirname}/{$endDir}";
+		// START irmtfan add default for all pathes
+		if (empty($default)) {
+			$path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}"
+				: (is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
+				: $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}"));
+		} else {
+			$path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
+				is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
+				is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
+				 . "/default/{$rel_dir}/{$type}" : (
+					 is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
+					: (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
+					: $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
+			) // XOOPS_THEME_PATH {$default}
+			) // XOOPS_THEME_PATH
+			); // $theme_path {$default}
+		}
+		// END irmtfan add default for all pathes
+		$paths[$endDir . '/' . $type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
+
+		return $paths[$endDir . '/' . $type];
+	}
+
+	// END irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
+
+	/**
+	 * @param string $language
+	 * @param string $dirname
+	 */
+	public function init(/*$set = "default", */
+		$language = 'english',
+		$dirname = 'newbb'
+	) {
+		$this->forumImage = require_once $GLOBALS['xoops']->path("modules/{$dirname}/include/images.php");
+
+		$this->forumImage['icon']     = XOOPS_URL . $this->getPath('icon', $dirname) . '/';
+		$this->forumImage['language'] = XOOPS_URL . $this->getPath("language/{$language}", $dirname, 'language/english') . '/';
+	}
+
+	/**
+	 * @param        $image
+	 * @param string $alt
+	 * @param string $extra
+	 */
+	public function setImage($image, $alt = '', $extra = '')
+	{
+		if (!isset($this->images[$image])) {
+			$imageSource = $this->getImageSource($image);
+			// irmtfan add id={$image}
+			$this->images[$image] = "<img src=\"{$imageSource}\" alt=\"{$alt}\" title=\"{$alt}\" align=\"middle\" {$extra} id={$image} />";
+		}
+	}
+
+	/**
+	 * TODO: How about image not exist?
+	 * @param $image
+	 * @return string
+	 */
+	public function getImageSource($image)
+	{
+		return $this->forumImage[$this->forumImage[$image]] . $this->prefix . $image . $this->postfix;
+	}
+
+	/**
+	 * @param         $image
+	 * @param  string $alt
+	 * @param  string $extra
+	 * @return mixed
+	 */
+	public function getImage($image, $alt = '', $extra = '')
+	{
+		$this->setImage($image, $alt, $extra);
+
+		return $this->images[$image];
+	}
+
+	/**
+	 * @param         $image
+	 * @param  string $alt
+	 * @param  string $extra
+	 * @return string
+	 */
+	public function assignImage($image, $alt = '', $extra = '')
+	{
+		$this->setImage($image, $alt, $extra);
+		// START hacked by irmtfan - improve function to CSS3 buttons - add alt and title attributes - use span instead of button to support IE7&8
+		$tag = 'span';
+		if ("class='forum_icon'" === $extra && in_array(substr($image, 0, 2), ['t_', 'p_', 'up'])) {
+			$extra = "class='forum_icon forum_button'";
+		}
+
+		return "<{$tag} alt=\"{$alt}\" title=\"{$alt}\" align=\"middle\" {$extra} id={$image}>$alt</{$tag}>";
+		// END hacked by irmtfan - improve function to CSS3 buttons
+	}
+
+	/**
+	 * @param $images
+	 */
+	public function assignImages($images)
+	{
+		foreach ($images as $myImage) {
+			list($image, $alt, $extra) = $myImage;
+			$this->assignImage($image, $alt, $extra);
+		}
+	}
+
+	/**
+	 * @return int|void
+	 */
+	public function render()
+	{
+		//$this->template->assign_by_ref("image", $this->images);
+		$this->template->assign($this->images);
+
+		return count($this->images);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -94,23 +94,23 @@ 
     public function getPath($type, $dirname = 'newbb', $default = '', $endDir = 'images')
     {
         static $paths;
-        if (isset($paths[$endDir . '/' . $type])) {
-            return $paths[$endDir . '/' . $type];
+        if (isset($paths[$endDir.'/'.$type])) {
+            return $paths[$endDir.'/'.$type];
         }
 
         $theme_path = $this->template->currentTheme->path;
         $rel_dir    = "modules/{$dirname}/{$endDir}";
         // START irmtfan add default for all pathes
         if (empty($default)) {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}"
-                : (is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}"
+                : (is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
                 : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}"));
         } else {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
-                is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
-                is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}" : (
+                is_dir($theme_path."/{$rel_dir}/{$default}/") ? $theme_path."/{$rel_dir}/{$default}" : (
+                is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
                  . "/default/{$rel_dir}/{$type}" : (
-                     is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
+                     is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
                     : (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
                     : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
             ) // XOOPS_THEME_PATH {$default}
@@ -118,9 +118,9 @@ 
             ); // $theme_path {$default}
         }
         // END irmtfan add default for all pathes
-        $paths[$endDir . '/' . $type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
+        $paths[$endDir.'/'.$type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
 
-        return $paths[$endDir . '/' . $type];
+        return $paths[$endDir.'/'.$type];
     }
 
     // END irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
@@ -135,8 +135,8 @@ 
     ) {
         $this->forumImage = require_once $GLOBALS['xoops']->path("modules/{$dirname}/include/images.php");
 
-        $this->forumImage['icon']     = XOOPS_URL . $this->getPath('icon', $dirname) . '/';
-        $this->forumImage['language'] = XOOPS_URL . $this->getPath("language/{$language}", $dirname, 'language/english') . '/';
+        $this->forumImage['icon']     = XOOPS_URL.$this->getPath('icon', $dirname).'/';
+        $this->forumImage['language'] = XOOPS_URL.$this->getPath("language/{$language}", $dirname, 'language/english').'/';
     }
 
     /**
@@ -160,7 +160,7 @@ 
      */
     public function getImageSource($image)
     {
-        return $this->forumImage[$this->forumImage[$image]] . $this->prefix . $image . $this->postfix;
+        return $this->forumImage[$this->forumImage[$image]].$this->prefix.$image.$this->postfix;
     }
 
     /**

class/Report.php

Indentation +15 added lines, -15 removed lines

@@ -19,19 +19,19 @@
  */
 class Report extends \XoopsObject
 {
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->initVar('report_id', XOBJ_DTYPE_INT);
-        $this->initVar('post_id', XOBJ_DTYPE_INT);
-        $this->initVar('reporter_uid', XOBJ_DTYPE_INT);
-        $this->initVar('reporter_ip', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('report_time', XOBJ_DTYPE_INT);
-        $this->initVar('report_text', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('report_result', XOBJ_DTYPE_INT);
-        $this->initVar('report_memo', XOBJ_DTYPE_TXTBOX);
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->initVar('report_id', XOBJ_DTYPE_INT);
+		$this->initVar('post_id', XOBJ_DTYPE_INT);
+		$this->initVar('reporter_uid', XOBJ_DTYPE_INT);
+		$this->initVar('reporter_ip', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('report_time', XOBJ_DTYPE_INT);
+		$this->initVar('report_text', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('report_result', XOBJ_DTYPE_INT);
+		$this->initVar('report_memo', XOBJ_DTYPE_TXTBOX);
+	}
 }

votepolls.php

Indentation +98 added lines, -98 removed lines

@@ -37,119 +37,119 @@
 //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
 $topicObject = $topicHandler->get($topic_id);
 if (!$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'vote')) {
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _NOPERM);
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _NOPERM);
 }
 
 if (!Request::getInt('option_id', 0, 'POST')) {
-    // irmtfan - add error message - simple url
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
+	// irmtfan - add error message - simple url
+	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
 if (is_object($pollModuleHandler) && $pollModuleHandler->getVar('isactive')) {
-    // new xoopspoll module
-    if ($pollModuleHandler->getVar('version') >= 140) {
-        xoops_load('constants', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        xoops_loadLanguage('main', $GLOBALS['xoopsModuleConfig']['poll_module']);
+	// new xoopspoll module
+	if ($pollModuleHandler->getVar('version') >= 140) {
+		xoops_load('constants', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		xoops_loadLanguage('main', $GLOBALS['xoopsModuleConfig']['poll_module']);
 
-        /** @var Xoopspoll\PollHandler $xpPollHandler */
-        $xpPollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
-        /** @var Xoopspoll\LogHandler $xpLogHandler */
-        $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-        /** @var Xoopspoll\Poll $pollObject */
-        $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
-        // old xoopspoll or umfrage or any clone from them
-    } else {
-        require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
-        $classPoll  = $topicObject->loadOldPoll();
-        $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
-    }
+		/** @var Xoopspoll\PollHandler $xpPollHandler */
+		$xpPollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
+		/** @var Xoopspoll\LogHandler $xpLogHandler */
+		$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+		/** @var Xoopspoll\Poll $pollObject */
+		$pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
+		// old xoopspoll or umfrage or any clone from them
+	} else {
+		require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+		$classPoll  = $topicObject->loadOldPoll();
+		$pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
+	}
 } else {
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_POLLMODULE_ERROR);
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_POLLMODULE_ERROR);
 }
 
 $mail_author = false;
 // new xoopspoll module
 if ($pollModuleHandler->getVar('version') >= 140) {
-    $classConstants = Xoopspoll\Constants();
-    if (is_object($pollObject)) {
-        if ($pollObject->getVar('multiple')) {
-            $optionId = Request::getInt('option_id', 0, 'POST');
-            $optionId = (array)$optionId; // type cast to make sure it's an array
-            $optionId = array_map('intval', $optionId); // make sure values are integers
-        } else {
-            $optionId = Request::getInt('option_id', 0, 'POST');
-        }
-        if (!$pollObject->hasExpired()) {
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_MUSTLOGIN');
-            //@todo:: add $url to all redirects
-            //            $url = $GLOBALS['xoops']->buildUrl("index.php", array('poll_id' => $poll_id));
-            if ($pollObject->isAllowedToVote()) {
-                $thisVoter     = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : null;
-                $votedThisPoll = $xpLogHandler->hasVoted($poll_id, xoops_getenv('REMOTE_ADDR'), $thisVoter);
-                if (!$votedThisPoll) {
-                    /* user that hasn't voted before in this poll or module preferences allow it */
-                    $voteTime = time();
-                    if ($pollObject->vote($optionId, xoops_getenv('REMOTE_ADDR'), $voteTime)) {
-                        if (!$xpPollHandler->updateCount($pollObject)) { // update the count and save in db
-                            echo $pollObject->getHtmlErrors();
-                            exit();
-                        }
-                        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_THANKSFORVOTE');
-                    } else {
-                        /* there was a problem registering the vote */
-                        redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR'));
-                    }
-                } else {
-                    $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ALREADYVOTED');
-                }
-                /* set anon user vote (and the time they voted) */
-                if (!is_object($GLOBALS['xoopsUser'])) {
-                    xoops_load('pollUtility', $GLOBALS['xoopsModuleConfig']['poll_module']);
-                    /** @var Xoopspoll\Utility $classPollUtility */
-                    $classPollUtility = new Xoopspoll\Utility();
-                    $classPollUtility::setVoteCookie($poll_id, $voteTime, 0);
-                }
-            } else {
-                $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_CANNOTVOTE');
-            }
-        } else {
-            /* poll has expired so just show the results */
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . 'SORRYEXPIRED');
-        }
-    } else {
-        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ERROR_INVALID_POLLID');
-    }
-    if (null !== $url) {
-        redirect_header($url, $classConstants::REDIRECT_DELAY_MEDIUM, $msg);
-    } else {
-        redirect_header($GLOBALS['xoops']->buildUrl('viewtopic.php', ['topic_id' => $topic_id]), $classConstants::REDIRECT_DELAY_MEDIUM, $msg);
-    }
-    // old xoopspoll or umfrage or any clone from them
+	$classConstants = Xoopspoll\Constants();
+	if (is_object($pollObject)) {
+		if ($pollObject->getVar('multiple')) {
+			$optionId = Request::getInt('option_id', 0, 'POST');
+			$optionId = (array)$optionId; // type cast to make sure it's an array
+			$optionId = array_map('intval', $optionId); // make sure values are integers
+		} else {
+			$optionId = Request::getInt('option_id', 0, 'POST');
+		}
+		if (!$pollObject->hasExpired()) {
+			$msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_MUSTLOGIN');
+			//@todo:: add $url to all redirects
+			//            $url = $GLOBALS['xoops']->buildUrl("index.php", array('poll_id' => $poll_id));
+			if ($pollObject->isAllowedToVote()) {
+				$thisVoter     = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : null;
+				$votedThisPoll = $xpLogHandler->hasVoted($poll_id, xoops_getenv('REMOTE_ADDR'), $thisVoter);
+				if (!$votedThisPoll) {
+					/* user that hasn't voted before in this poll or module preferences allow it */
+					$voteTime = time();
+					if ($pollObject->vote($optionId, xoops_getenv('REMOTE_ADDR'), $voteTime)) {
+						if (!$xpPollHandler->updateCount($pollObject)) { // update the count and save in db
+							echo $pollObject->getHtmlErrors();
+							exit();
+						}
+						$msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_THANKSFORVOTE');
+					} else {
+						/* there was a problem registering the vote */
+						redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR'));
+					}
+				} else {
+					$msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ALREADYVOTED');
+				}
+				/* set anon user vote (and the time they voted) */
+				if (!is_object($GLOBALS['xoopsUser'])) {
+					xoops_load('pollUtility', $GLOBALS['xoopsModuleConfig']['poll_module']);
+					/** @var Xoopspoll\Utility $classPollUtility */
+					$classPollUtility = new Xoopspoll\Utility();
+					$classPollUtility::setVoteCookie($poll_id, $voteTime, 0);
+				}
+			} else {
+				$msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_CANNOTVOTE');
+			}
+		} else {
+			/* poll has expired so just show the results */
+			$msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . 'SORRYEXPIRED');
+		}
+	} else {
+		$msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ERROR_INVALID_POLLID');
+	}
+	if (null !== $url) {
+		redirect_header($url, $classConstants::REDIRECT_DELAY_MEDIUM, $msg);
+	} else {
+		redirect_header($GLOBALS['xoops']->buildUrl('viewtopic.php', ['topic_id' => $topic_id]), $classConstants::REDIRECT_DELAY_MEDIUM, $msg);
+	}
+	// old xoopspoll or umfrage or any clone from them
 } else {
-    $classLog = $classPoll . 'Log';
-    if (is_object($GLOBALS['xoopsUser'])) {
-        if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $GLOBALS['xoopsUser']->getVar('uid'))) {
-            $msg = _PL_ALREADYVOTED;
-            setcookie("newbb_polls[{$poll_id}]", 1);
-        } else {
-            // irmtfan save ip to db
-            $pollObject->vote(Request::getInt('option_id', 0, 'POST'), Request::getString('REMOTE_ADDR', '', 'SERVER'), $GLOBALS['xoopsUser']->getVar('uid'));
-            $pollObject->updateCount();
-            $msg = _PL_THANKSFORVOTE;
-            setcookie("newbb_polls[{$poll_id}]", 1);
-        }
-    } else {
-        if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'))) {
-            $msg = _PL_ALREADYVOTED;
-            setcookie("newbb_polls[{$poll_id}]", 1);
-        } else {
-            $pollObject->vote(Request::getInt('option_id', 0, 'POST'), Request::getString('REMOTE_ADDR', '', 'SERVER'));
-            $pollObject->updateCount();
-            $msg = _PL_THANKSFORVOTE;
-            setcookie("newbb_polls[{$poll_id}]", 1);
-        }
-    }
+	$classLog = $classPoll . 'Log';
+	if (is_object($GLOBALS['xoopsUser'])) {
+		if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $GLOBALS['xoopsUser']->getVar('uid'))) {
+			$msg = _PL_ALREADYVOTED;
+			setcookie("newbb_polls[{$poll_id}]", 1);
+		} else {
+			// irmtfan save ip to db
+			$pollObject->vote(Request::getInt('option_id', 0, 'POST'), Request::getString('REMOTE_ADDR', '', 'SERVER'), $GLOBALS['xoopsUser']->getVar('uid'));
+			$pollObject->updateCount();
+			$msg = _PL_THANKSFORVOTE;
+			setcookie("newbb_polls[{$poll_id}]", 1);
+		}
+	} else {
+		if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'))) {
+			$msg = _PL_ALREADYVOTED;
+			setcookie("newbb_polls[{$poll_id}]", 1);
+		} else {
+			$pollObject->vote(Request::getInt('option_id', 0, 'POST'), Request::getString('REMOTE_ADDR', '', 'SERVER'));
+			$pollObject->updateCount();
+			$msg = _PL_THANKSFORVOTE;
+			setcookie("newbb_polls[{$poll_id}]", 1);
+		}
+	}
 }
 // irmtfan - simple url
 redirect_header("viewtopic.php?topic_id={$topic_id}", 1, $msg);

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
 use Xmf\Request;
 use XoopsModules\Xoopspoll;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $poll_id  = Request::getInt('poll_id', Request::getInt('poll_id', 0, 'POST'), 'GET');
 $topic_id = Request::getInt('topic_id', Request::getInt('topic_id', 0, 'POST'), 'GET');
 $forum    = Request::getInt('forum', Request::getInt('forum', 0, 'POST'), 'GET');
@@ -42,7 +42,7 @@ 
 
 if (!Request::getInt('option_id', 0, 'POST')) {
     // irmtfan - add error message - simple url
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
@@ -60,7 +60,7 @@ 
         $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
         // old xoopspoll or umfrage or any clone from them
     } else {
-        require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+        require_once $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/include/constants.php');
         $classPoll  = $topicObject->loadOldPoll();
         $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
     }
@@ -75,13 +75,13 @@ 
     if (is_object($pollObject)) {
         if ($pollObject->getVar('multiple')) {
             $optionId = Request::getInt('option_id', 0, 'POST');
-            $optionId = (array)$optionId; // type cast to make sure it's an array
+            $optionId = (array) $optionId; // type cast to make sure it's an array
             $optionId = array_map('intval', $optionId); // make sure values are integers
         } else {
             $optionId = Request::getInt('option_id', 0, 'POST');
         }
         if (!$pollObject->hasExpired()) {
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_MUSTLOGIN');
+            $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_MUSTLOGIN');
             //@todo:: add $url to all redirects
             //            $url = $GLOBALS['xoops']->buildUrl("index.php", array('poll_id' => $poll_id));
             if ($pollObject->isAllowedToVote()) {
@@ -95,13 +95,13 @@ 
                             echo $pollObject->getHtmlErrors();
                             exit();
                         }
-                        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_THANKSFORVOTE');
+                        $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_THANKSFORVOTE');
                     } else {
                         /* there was a problem registering the vote */
-                        redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR'));
+                        redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_VOTE_ERROR'));
                     }
                 } else {
-                    $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ALREADYVOTED');
+                    $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_ALREADYVOTED');
                 }
                 /* set anon user vote (and the time they voted) */
                 if (!is_object($GLOBALS['xoopsUser'])) {
@@ -111,14 +111,14 @@ 
                     $classPollUtility::setVoteCookie($poll_id, $voteTime, 0);
                 }
             } else {
-                $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_CANNOTVOTE');
+                $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_CANNOTVOTE');
             }
         } else {
             /* poll has expired so just show the results */
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . 'SORRYEXPIRED');
+            $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'SORRYEXPIRED');
         }
     } else {
-        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ERROR_INVALID_POLLID');
+        $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_ERROR_INVALID_POLLID');
     }
     if (null !== $url) {
         redirect_header($url, $classConstants::REDIRECT_DELAY_MEDIUM, $msg);
@@ -127,7 +127,7 @@ 
     }
     // old xoopspoll or umfrage or any clone from them
 } else {
-    $classLog = $classPoll . 'Log';
+    $classLog = $classPoll.'Log';
     if (is_object($GLOBALS['xoopsUser'])) {
         if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $GLOBALS['xoopsUser']->getVar('uid'))) {
             $msg = _PL_ALREADYVOTED;

viewforum.php

Indentation +125 added lines, -125 removed lines

@@ -14,7 +14,7 @@ 
 require_once __DIR__ . '/header.php';
 
 if (!Request::getInt('forum', 0, 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 require_once __DIR__ . '/include/functions.read.php';
 
@@ -24,54 +24,54 @@ 
 $query_vars  = ['forum', 'type', 'status', 'sort', 'order', 'start', 'since'];
 $query_array = [];
 foreach ($query_vars as $var) {
-    if (Request::getString($var, '', 'GET')) {
-        $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
-    }
+	if (Request::getString($var, '', 'GET')) {
+		$query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+	}
 }
 $page_query = implode('&', array_values($query_array));
 
 if (Request::getInt('mark', 0, 'GET')) {
-    if (1 === Request::getInt('mark', 0, 'GET')) { // marked as read
-        $markvalue  = 1;
-        $markresult = _MD_NEWBB_MARK_READ;
-    } else { // marked as unread
-        $markvalue  = 0;
-        $markresult = _MD_NEWBB_MARK_UNREAD;
-    }
-    newbbSetReadTopic($markvalue, Request::getInt('forum', 0, 'GET'));
-    $url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?' . $page_query;
-    redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED . ' ' . $markresult);
+	if (1 === Request::getInt('mark', 0, 'GET')) { // marked as read
+		$markvalue  = 1;
+		$markresult = _MD_NEWBB_MARK_READ;
+	} else { // marked as unread
+		$markvalue  = 0;
+		$markresult = _MD_NEWBB_MARK_UNREAD;
+	}
+	newbbSetReadTopic($markvalue, Request::getInt('forum', 0, 'GET'));
+	$url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?' . $page_query;
+	redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED . ' ' . $markresult);
 }
 
 $forum_id = Request::getInt('forum', 0, 'GET');
 $type     = Request::getInt('type', 0, 'GET');
 $status   = (Request::getString('status', '', 'GET')
-             && in_array(Request::getString('status', '', 'GET'), [
-        'active',
-        'pending',
-        'deleted',
-        'digest',
-        'unreplied',
-        'unread'
-    ], true)) ? Request::getString('status', '', 'GET') : '';
+			 && in_array(Request::getString('status', '', 'GET'), [
+		'active',
+		'pending',
+		'deleted',
+		'digest',
+		'unreplied',
+		'unread'
+	], true)) ? Request::getString('status', '', 'GET') : '';
 
 $mode = (Request::getString('status', '', 'GET')
-         && in_array(Request::getString('status', '', 'GET'), [
-        'active',
-        'pending',
-        'deleted'
-    ], true)) ? 2 : Request::getInt('mode', 0, 'GET');
+		 && in_array(Request::getString('status', '', 'GET'), [
+		'active',
+		'pending',
+		'deleted'
+	], true)) ? 2 : Request::getInt('mode', 0, 'GET');
 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($forum_id);
 
 if (!$forumObject) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+	redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _NOPERM);
+	redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _NOPERM);
 }
 newbbSetRead('forum', $forum_id, $forumObject->getVar('forum_last_post_id'));
 
@@ -84,7 +84,7 @@ 
 require_once __DIR__ . '/include/functions.render.php';
 
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
-    $xoopsTpl->assign('xoops_module_header', '
+	$xoopsTpl->assign('xoops_module_header', '
     <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forum_id . '" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
@@ -99,41 +99,41 @@ 
 $xoopsTpl->assign('viewer_level', $isAdmin ? 2 : 0);
 /* Only admin has access to admin mode */
 if (!$isAdmin) {
-    $status = (!empty($status) && in_array($status, ['active', 'pending', 'deleted'], true)) ? '' : $status;
-    // irmtfan add mode
-    $mode = 0;
+	$status = (!empty($status) && in_array($status, ['active', 'pending', 'deleted'], true)) ? '' : $status;
+	// irmtfan add mode
+	$mode = 0;
 }
 // irmtfan add mode
 $xoopsTpl->assign('mode', $mode);
 $xoopsTpl->assign('status', $status);
 if ($isAdmin) {
-    $xoopsTpl->assign('forum_index_cpanel', ['link' => 'admin/index.php', 'name' => _MD_NEWBB_ADMINCP]);
+	$xoopsTpl->assign('forum_index_cpanel', ['link' => 'admin/index.php', 'name' => _MD_NEWBB_ADMINCP]);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
-    $xoopsTpl->assign('online', $onlineHandler->showOnline());
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
+	$xoopsTpl->assign('online', $onlineHandler->showOnline());
 }
 
 if ($forumHandler->getPermission($forumObject, 'post')) {
-    $xoopsTpl->assign('viewer_level', $isAdmin ? 2 : 1);
-    $xoopsTpl->assign('forum_post_or_register', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/newtopic.php?forum={$forum_id}\">" . newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW) . '</a>');
-    if ($pollmodules && $forumHandler->getPermission($forumObject, 'addpoll')) {
-        $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-        $xoopsTpl->assign('forum_addpoll', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
-    }
+	$xoopsTpl->assign('viewer_level', $isAdmin ? 2 : 1);
+	$xoopsTpl->assign('forum_post_or_register', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/newtopic.php?forum={$forum_id}\">" . newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW) . '</a>');
+	if ($pollmodules && $forumHandler->getPermission($forumObject, 'addpoll')) {
+		$t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
+		$xoopsTpl->assign('forum_addpoll', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
+	}
 } else {
-    $xoopsTpl->assign('viewer_level', 0);
-    if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=" . $forum_id, htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5));
-        $xoopsTpl->assign('forum_post_or_register', "<a href='" . XOOPS_URL . "/user.php?xoops_redirect={$redirect}'>" . _MD_NEWBB_REGTOPOST . '</a>');
-        $xoopsTpl->assign('forum_addpoll', '');
-    } else {
-        $xoopsTpl->assign('forum_post_or_register', '');
-        $xoopsTpl->assign('forum_addpoll', '');
-    }
+	$xoopsTpl->assign('viewer_level', 0);
+	if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
+		$redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=" . $forum_id, htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5));
+		$xoopsTpl->assign('forum_post_or_register', "<a href='" . XOOPS_URL . "/user.php?xoops_redirect={$redirect}'>" . _MD_NEWBB_REGTOPOST . '</a>');
+		$xoopsTpl->assign('forum_addpoll', '');
+	} else {
+		$xoopsTpl->assign('forum_post_or_register', '');
+		$xoopsTpl->assign('forum_addpoll', '');
+	}
 }
 $parentforum = $forumHandler->getParents($forumObject);
 $xoopsTpl->assign_by_ref('parentforum', $parentforum);
@@ -143,10 +143,10 @@ 
 $criteria->setSort('forum_order');
 
 if ($forums = $forumHandler->getAll($criteria, null, false)) {
-    $subforum_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']);
-    $subforum       = array_values($subforum_array[$forum_id]);
-    unset($subforum_array);
-    $xoopsTpl->assign_by_ref('subforum', $subforum);
+	$subforum_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']);
+	$subforum       = array_values($subforum_array[$forum_id]);
+	unset($subforum_array);
+	$xoopsTpl->assign_by_ref('subforum', $subforum);
 }
 
 //$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
@@ -159,30 +159,30 @@ 
 
 // irmtfan - add and edit: u.uname => t.topic_poster | t.topic_time => t.topic_id | "t.rating"=>_MD_NEWBB_RATINGS, | p.post_time => t.topic_last_post_id
 $sel_sort_array = [
-    't.topic_title'        => _MD_NEWBB_TOPICTITLE,
-    't.topic_poster'       => _MD_NEWBB_TOPICPOSTER,
-    't.topic_id'           => _MD_NEWBB_TOPICTIME,
-    't.topic_replies'      => _MD_NEWBB_NUMBERREPLIES,
-    't.topic_views'        => _MD_NEWBB_VIEWS,
-    't.rating'             => _MD_NEWBB_RATINGS,
-    't.topic_last_post_id' => _MD_NEWBB_LASTPOSTTIME
+	't.topic_title'        => _MD_NEWBB_TOPICTITLE,
+	't.topic_poster'       => _MD_NEWBB_TOPICPOSTER,
+	't.topic_id'           => _MD_NEWBB_TOPICTIME,
+	't.topic_replies'      => _MD_NEWBB_NUMBERREPLIES,
+	't.topic_views'        => _MD_NEWBB_VIEWS,
+	't.rating'             => _MD_NEWBB_RATINGS,
+	't.topic_last_post_id' => _MD_NEWBB_LASTPOSTTIME
 ];
 if (!Request::getString('sort', '', 'GET') || !array_key_exists(Request::getString('sort', '', 'GET'), $sel_sort_array)) {
-    $sort = 't.topic_last_post_id';
+	$sort = 't.topic_last_post_id';
 } else {
-    $sort = Request::getString('sort', '', 'GET');
+	$sort = Request::getString('sort', '', 'GET');
 }
 
 $forum_selection_sort = '<select name="sort">';
 foreach ($sel_sort_array as $sort_k => $sort_v) {
-    $forum_selection_sort .= '<option value="' . $sort_k . '"' . (($sort == $sort_k) ? ' selected="selected"' : '') . '>' . $sort_v . '</option>';
+	$forum_selection_sort .= '<option value="' . $sort_k . '"' . (($sort == $sort_k) ? ' selected="selected"' : '') . '>' . $sort_v . '</option>';
 }
 $forum_selection_sort .= '</select>';
 
 $xoopsTpl->assign_by_ref('forum_selection_sort', $forum_selection_sort);
 
 $order                 = (!Request::getString('order', '', 'GET')
-                          || 'ASC' !== Request::getString('order', '', 'GET')) ? 'DESC' : 'ASC';
+						  || 'ASC' !== Request::getString('order', '', 'GET')) ? 'DESC' : 'ASC';
 $forum_selection_order = '<select name="order">';
 $forum_selection_order .= '<option value="ASC"' . (('ASC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_ASCENDING . '</option>';
 $forum_selection_order .= '<option value="DESC"' . (('DESC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_DESCENDING . '</option>';
@@ -205,10 +205,10 @@ 
 $xoopsTpl->assign('h_poster_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_poster&amp;order=" . (('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
 $xoopsTpl->assign('h_views_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_views&amp;order=" . (('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
 $xoopsTpl->assign('h_rating_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.rating&amp;order=" . (('t.rating' === $sort
-                                                                                                                                  && 'DESC' === $order) ? 'ASC' : 'DESC')); // irmtfan t.topic_ratings to t.rating
+																																  && 'DESC' === $order) ? 'ASC' : 'DESC')); // irmtfan t.topic_ratings to t.rating
 $xoopsTpl->assign('h_date_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_last_post_id&amp;order=" . (('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
 $xoopsTpl->assign('h_publish_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_id&amp;order=" . (('t.topic_id' === $sort
-                                                                                                                                     && 'DESC' === $order) ? 'ASC' : 'DESC'));
+																																	 && 'DESC' === $order) ? 'ASC' : 'DESC'));
 $xoopsTpl->assign('forum_since', $since); // For $since in search.php
 
 // irmtfan - if no since it should be 0
@@ -218,7 +218,7 @@ 
 
 $criteria_vars = ['startdate', 'start', 'sort', 'order', 'type', 'status', 'excerpt'];
 foreach ($criteria_vars as $var) {
-    $criteria_topic[$var] = @${$var};
+	$criteria_topic[$var] = @${$var};
 }
 $criteria_topic['excerpt'] = $GLOBALS['xoopsModuleConfig']['post_excerpt'];
 
@@ -252,17 +252,17 @@ 
 $typeOptions = null;
 $types       = [];
 if ($types = $typeHandler->getByForum($forum_id)) {
-    $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"];
-    foreach ($types as $key => $item) {
-        $typeOptions[] = [
-            'title' => $item['type_name'],
-            'link'  => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
-        ];
-    }
+	$typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"];
+	foreach ($types as $key => $item) {
+		$typeOptions[] = [
+			'title' => $item['type_name'],
+			'link'  => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
+		];
+	}
 }
 if ($type > 0) {
-    require_once __DIR__ . '/include/functions.topic.php';
-    $xoopsTpl->assign('forum_topictype', getTopicTitle('', $types[$type]['type_name'], $types[$type]['type_color']));
+	require_once __DIR__ . '/include/functions.topic.php';
+	$xoopsTpl->assign('forum_topictype', getTopicTitle('', $types[$type]['type_name'], $types[$type]['type_color']));
 }
 $xoopsTpl->assign_by_ref('typeOptions', $typeOptions);
 
@@ -276,66 +276,66 @@ 
 $xoopsTpl->assign('unreplied_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unreplied");
 $xoopsTpl->assign('unread_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unread");
 switch ($status) {
-    case 'digest':
-        $current_status = _MD_NEWBB_DIGEST;
-        break;
-    case 'unreplied':
-        $current_status = _MD_NEWBB_UNREPLIED;
-        break;
-    case 'unread':
-        $current_status = _MD_NEWBB_UNREAD;
-        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;
+	case 'digest':
+		$current_status = _MD_NEWBB_DIGEST;
+		break;
+	case 'unreplied':
+		$current_status = _MD_NEWBB_UNREPLIED;
+		break;
+	case 'unread':
+		$current_status = _MD_NEWBB_UNREAD;
+		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('forum_topicstatus', $current_status);
 
 $all_topics = $forumHandler->getTopicCount($forumObject, $startdate, $status);
 if ($all_topics > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
-    require_once $GLOBALS['xoops']->path('class/pagenav.php');
-    $query_nav = $query_array;
-    unset($query_nav['start']);
-    $page_query_nav = implode('&amp;', array_values($query_nav));
-    unset($query_nav);
-    $nav = new \XoopsPageNav($all_topics, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', $page_query_nav);
-    if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
-        $navi = $nav->renderSelect();
-    } elseif ('image' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
-        $navi = $nav->renderImageNav(4);
-    } else {
-        $navi = $nav->renderNav(4);
-    }
-
-    $xoopsTpl->assign('forum_pagenav', $navi);
+	require_once $GLOBALS['xoops']->path('class/pagenav.php');
+	$query_nav = $query_array;
+	unset($query_nav['start']);
+	$page_query_nav = implode('&amp;', array_values($query_nav));
+	unset($query_nav);
+	$nav = new \XoopsPageNav($all_topics, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', $page_query_nav);
+	if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
+		$navi = $nav->renderSelect();
+	} elseif ('image' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
+		$navi = $nav->renderImageNav(4);
+	} else {
+		$navi = $nav->renderNav(4);
+	}
+
+	$xoopsTpl->assign('forum_pagenav', $navi);
 } else {
-    $xoopsTpl->assign('forum_pagenav', '');
+	$xoopsTpl->assign('forum_pagenav', '');
 }
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
-    $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
+	require_once __DIR__ . '/include/functions.forum.php';
+	$xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
 if ($GLOBALS['xoopsModuleConfig']['show_permissiontable']) {
-    //    /** var Newbb\PermissionHandler $permHandler */
-    //    $permHandler      = Newbb\Helper::getInstance()->getHandler('Permission');
-    $permission_table = $permHandler->getPermissionTable($forum_id, false, $isAdmin);
-    $xoopsTpl->assign_by_ref('permission_table', $permission_table);
-    unset($permission_table);
+	//    /** var Newbb\PermissionHandler $permHandler */
+	//    $permHandler      = Newbb\Helper::getInstance()->getHandler('Permission');
+	$permission_table = $permHandler->getPermissionTable($forum_id, false, $isAdmin);
+	$xoopsTpl->assign_by_ref('permission_table', $permission_table);
+	unset($permission_table);
 }
 
 if (1 == $GLOBALS['xoopsModuleConfig']['rss_enable']) {
-    $xoopsTpl->assign('rss_button', "<div align='right'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/rss.php?f=' . $forum_id . "' title='RSS feed' target='_blank'>" . newbbDisplayImage('rss', 'RSS feed') . '</a></div>');
+	$xoopsTpl->assign('rss_button', "<div align='right'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/rss.php?f=' . $forum_id . "' title='RSS feed' target='_blank'>" . newbbDisplayImage('rss', 'RSS feed') . '</a></div>');
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Spacing +42 added lines, -42 removed lines

@@ -11,12 +11,12 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!Request::getInt('forum', 0, 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
-require_once __DIR__ . '/include/functions.read.php';
+require_once __DIR__.'/include/functions.read.php';
 
 /*
  * Build the page query
@@ -25,7 +25,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 = implode('&', array_values($query_array));
@@ -39,8 +39,8 @@ 
         $markresult = _MD_NEWBB_MARK_UNREAD;
     }
     newbbSetReadTopic($markvalue, Request::getInt('forum', 0, 'GET'));
-    $url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?' . $page_query;
-    redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED . ' ' . $markresult);
+    $url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?'.$page_query;
+    redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED.' '.$markresult);
 }
 
 $forum_id = Request::getInt('forum', 0, 'GET');
@@ -67,25 +67,25 @@ 
 $forumObject = $forumHandler->get($forum_id);
 
 if (!$forumObject) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _NOPERM);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php', 2, _NOPERM);
 }
 newbbSetRead('forum', $forum_id, $forumObject->getVar('forum_last_post_id'));
 
-$xoops_pagetitle = $forumObject->getVar('forum_name') . ' [' . $xoopsModule->getVar('name') . ']';
+$xoops_pagetitle = $forumObject->getVar('forum_name').' ['.$xoopsModule->getVar('name').']';
 
 $xoopsOption['template_main']   = 'newbb_viewforum.tpl';
 $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
 
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.render.php';
 
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forum_id . '" />
+    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_id.'" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 $forumDescription = $forumObject->getVar('forum_desc');
@@ -119,16 +119,16 @@ 
 
 if ($forumHandler->getPermission($forumObject, 'post')) {
     $xoopsTpl->assign('viewer_level', $isAdmin ? 2 : 1);
-    $xoopsTpl->assign('forum_post_or_register', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/newtopic.php?forum={$forum_id}\">" . newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW) . '</a>');
+    $xoopsTpl->assign('forum_post_or_register', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/newtopic.php?forum={$forum_id}\">".newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW).'</a>');
     if ($pollmodules && $forumHandler->getPermission($forumObject, 'addpoll')) {
         $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-        $xoopsTpl->assign('forum_addpoll', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
+        $xoopsTpl->assign('forum_addpoll', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
     }
 } else {
     $xoopsTpl->assign('viewer_level', 0);
     if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=" . $forum_id, htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5));
-        $xoopsTpl->assign('forum_post_or_register', "<a href='" . XOOPS_URL . "/user.php?xoops_redirect={$redirect}'>" . _MD_NEWBB_REGTOPOST . '</a>');
+        $redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=".$forum_id, htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5));
+        $xoopsTpl->assign('forum_post_or_register', "<a href='".XOOPS_URL."/user.php?xoops_redirect={$redirect}'>"._MD_NEWBB_REGTOPOST.'</a>');
         $xoopsTpl->assign('forum_addpoll', '');
     } else {
         $xoopsTpl->assign('forum_post_or_register', '');
@@ -139,7 +139,7 @@ 
 $xoopsTpl->assign_by_ref('parentforum', $parentforum);
 
 $criteria = new \CriteriaCompo(new \Criteria('parent_forum', $forum_id));
-$criteria->add(new \Criteria('forum_id', '(' . implode(', ', $forumHandler->getIdsByPermission('access')) . ')', 'IN'));
+$criteria->add(new \Criteria('forum_id', '('.implode(', ', $forumHandler->getIdsByPermission('access')).')', 'IN'));
 $criteria->setSort('forum_order');
 
 if ($forums = $forumHandler->getAll($criteria, null, false)) {
@@ -175,7 +175,7 @@ 
 
 $forum_selection_sort = '<select name="sort">';
 foreach ($sel_sort_array as $sort_k => $sort_v) {
-    $forum_selection_sort .= '<option value="' . $sort_k . '"' . (($sort == $sort_k) ? ' selected="selected"' : '') . '>' . $sort_v . '</option>';
+    $forum_selection_sort .= '<option value="'.$sort_k.'"'.(($sort == $sort_k) ? ' selected="selected"' : '').'>'.$sort_v.'</option>';
 }
 $forum_selection_sort .= '</select>';
 
@@ -184,14 +184,14 @@ 
 $order                 = (!Request::getString('order', '', 'GET')
                           || 'ASC' !== Request::getString('order', '', 'GET')) ? 'DESC' : 'ASC';
 $forum_selection_order = '<select name="order">';
-$forum_selection_order .= '<option value="ASC"' . (('ASC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_ASCENDING . '</option>';
-$forum_selection_order .= '<option value="DESC"' . (('DESC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_DESCENDING . '</option>';
+$forum_selection_order .= '<option value="ASC"'.(('ASC' === $order) ? ' selected' : '').'>'._MD_NEWBB_ASCENDING.'</option>';
+$forum_selection_order .= '<option value="DESC"'.(('DESC' === $order) ? ' selected' : '').'>'._MD_NEWBB_DESCENDING.'</option>';
 $forum_selection_order .= '</select>';
 
 $xoopsTpl->assign_by_ref('forum_selection_order', $forum_selection_order);
 
 $since = Request::getInt('since', $GLOBALS['xoopsModuleConfig']['since_default'], 'GET');
-require_once __DIR__ . '/include/functions.time.php';
+require_once __DIR__.'/include/functions.time.php';
 $forum_selection_since = newbbSinceSelectBox($since);
 $xoopsTpl->assign_by_ref('forum_selection_since', $forum_selection_since);
 
@@ -200,14 +200,14 @@ 
 $page_query_sort = implode('&amp;', array_values($query_sort));
 unset($query_sort);
 // irmtfan - edit: u.uname => t.topic_poster | t.topic_time => t.topic_id | p.post_time => t.topic_last_post_id
-$xoopsTpl->assign('h_topic_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_title&amp;order=" . (('t.topic_title' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_reply_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_replies&amp;order=" . (('t.topic_replies' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_poster_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_poster&amp;order=" . (('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_views_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_views&amp;order=" . (('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_rating_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.rating&amp;order=" . (('t.rating' === $sort
+$xoopsTpl->assign('h_topic_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_title&amp;order=".(('t.topic_title' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_reply_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_replies&amp;order=".(('t.topic_replies' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_poster_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_poster&amp;order=".(('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_views_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_views&amp;order=".(('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_rating_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.rating&amp;order=".(('t.rating' === $sort
                                                                                                                                   && 'DESC' === $order) ? 'ASC' : 'DESC')); // irmtfan t.topic_ratings to t.rating
-$xoopsTpl->assign('h_date_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_last_post_id&amp;order=" . (('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_publish_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_id&amp;order=" . (('t.topic_id' === $sort
+$xoopsTpl->assign('h_date_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_last_post_id&amp;order=".(('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_publish_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_id&amp;order=".(('t.topic_id' === $sort
                                                                                                                                      && 'DESC' === $order) ? 'ASC' : 'DESC'));
 $xoopsTpl->assign('forum_since', $since); // For $since in search.php
 
@@ -237,11 +237,11 @@ 
 $xoopsTpl->assign('img_digest', newbbDisplayImage('topic_digest', _MD_NEWBB_TOPICDIGEST));
 $xoopsTpl->assign('img_poll', newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL));
 
-$xoopsTpl->assign('mark_read', XOOPS_URL . "/modules/newbb/viewforum.php?mark=1&amp;{$page_query}");
-$xoopsTpl->assign('mark_unread', XOOPS_URL . "/modules/newbb/viewforum.php?mark=2&amp;{$page_query}");
+$xoopsTpl->assign('mark_read', XOOPS_URL."/modules/newbb/viewforum.php?mark=1&amp;{$page_query}");
+$xoopsTpl->assign('mark_unread', XOOPS_URL."/modules/newbb/viewforum.php?mark=2&amp;{$page_query}");
 
-$xoopsTpl->assign('post_link', XOOPS_URL . '/modules/newbb/viewpost.php?forum=' . $forum_id);
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/newbb/viewpost.php?status=new&amp;forum=' . $forum_id);
+$xoopsTpl->assign('post_link', XOOPS_URL.'/modules/newbb/viewpost.php?forum='.$forum_id);
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/newbb/viewpost.php?status=new&amp;forum='.$forum_id);
 
 $query_type = $query_array;
 unset($query_type['type']);
@@ -252,16 +252,16 @@ 
 $typeOptions = null;
 $types       = [];
 if ($types = $typeHandler->getByForum($forum_id)) {
-    $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"];
+    $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_type}"];
     foreach ($types as $key => $item) {
         $typeOptions[] = [
             'title' => $item['type_name'],
-            'link'  => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
+            'link'  => XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
         ];
     }
 }
 if ($type > 0) {
-    require_once __DIR__ . '/include/functions.topic.php';
+    require_once __DIR__.'/include/functions.topic.php';
     $xoopsTpl->assign('forum_topictype', getTopicTitle('', $types[$type]['type_name'], $types[$type]['type_color']));
 }
 $xoopsTpl->assign_by_ref('typeOptions', $typeOptions);
@@ -270,11 +270,11 @@ 
 unset($query_status['status']);
 $page_query_status = implode('&amp;', array_values($query_status));
 unset($query_status);
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/newbb/viewpost.php?status=new&amp;forum=' . $forumObject->getVar('forum_id'));
-$xoopsTpl->assign('all_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}");
-$xoopsTpl->assign('digest_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=digest");
-$xoopsTpl->assign('unreplied_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unreplied");
-$xoopsTpl->assign('unread_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unread");
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/newbb/viewpost.php?status=new&amp;forum='.$forumObject->getVar('forum_id'));
+$xoopsTpl->assign('all_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}");
+$xoopsTpl->assign('digest_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=digest");
+$xoopsTpl->assign('unreplied_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unreplied");
+$xoopsTpl->assign('unread_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unread");
 switch ($status) {
     case 'digest':
         $current_status = _MD_NEWBB_DIGEST;
@@ -322,7 +322,7 @@ 
 }
 
 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));
 }
 
@@ -335,8 +335,8 @@ 
 }
 
 if (1 == $GLOBALS['xoopsModuleConfig']['rss_enable']) {
-    $xoopsTpl->assign('rss_button', "<div align='right'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/rss.php?f=' . $forum_id . "' title='RSS feed' target='_blank'>" . newbbDisplayImage('rss', 'RSS feed') . '</a></div>');
+    $xoopsTpl->assign('rss_button', "<div align='right'><a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/rss.php?f='.$forum_id."' title='RSS feed' target='_blank'>".newbbDisplayImage('rss', 'RSS feed').'</a></div>');
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');