mambax7 / newbb5

class/Post.php

Indentation +668 added lines, -668 removed lines

@@ -43,672 +43,672 @@
  */
 class Post extends \XoopsObject
 {
-    //class Post extends \XoopsObject {
-    private $attachmentArray = [];
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->initVar('post_id', XOBJ_DTYPE_INT);
-        $this->initVar('topic_id', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('forum_id', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('post_time', XOBJ_DTYPE_INT, 0, true);
-        //        $this->initVar('poster_ip', XOBJ_DTYPE_INT, 0);
-        $this->initVar('poster_ip', XOBJ_DTYPE_TXTBOX, '');
-        $this->initVar('poster_name', XOBJ_DTYPE_TXTBOX, '');
-        $this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true);
-        $this->initVar('pid', XOBJ_DTYPE_INT, 0);
-        $this->initVar('dohtml', XOBJ_DTYPE_INT, 0);
-        $this->initVar('dosmiley', XOBJ_DTYPE_INT, 1);
-        $this->initVar('doxcode', XOBJ_DTYPE_INT, 1);
-        $this->initVar('doimage', XOBJ_DTYPE_INT, 1);
-        $this->initVar('dobr', XOBJ_DTYPE_INT, 1);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 1);
-        $this->initVar('icon', XOBJ_DTYPE_TXTBOX, '');
-        $this->initVar('attachsig', XOBJ_DTYPE_INT, 0);
-        $this->initVar('approved', XOBJ_DTYPE_INT, 1);
-        $this->initVar('post_karma', XOBJ_DTYPE_INT, 0);
-        $this->initVar('require_reply', XOBJ_DTYPE_INT, 0);
-        $this->initVar('attachment', XOBJ_DTYPE_TXTAREA, '');
-        $this->initVar('post_text', XOBJ_DTYPE_TXTAREA, '');
-        $this->initVar('post_edit', XOBJ_DTYPE_TXTAREA, '');
-    }
-
-    // ////////////////////////////////////////////////////////////////////////////////////
-    // attachment functions    TODO: there should be a file/attachment management class
-    /**
-     * @return array|mixed|null
-     */
-    public function getAttachment()
-    {
-        if (count($this->attachmentArray)) {
-            return $this->attachmentArray;
-        }
-        $attachment = $this->getVar('attachment');
-        if (empty($attachment)) {
-            $this->attachmentArray = [];
-        } else {
-            $this->attachmentArray = @unserialize(base64_decode($attachment));
-        }
-
-        return $this->attachmentArray;
-    }
-
-    /**
-     * @param $attachKey
-     * @return bool
-     */
-    public function incrementDownload($attachKey)
-    {
-        if (!$attachKey) {
-            return false;
-        }
-        $this->attachmentArray[(string)$attachKey]['numDownload']++;
-
-        return $this->attachmentArray[(string)$attachKey]['numDownload'];
-    }
-
-    /**
-     * @return bool
-     */
-    public function saveAttachment()
-    {
-        $attachmentSave = '';
-        if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
-            $attachmentSave = base64_encode(serialize($this->attachmentArray));
-        }
-        $this->setVar('attachment', $attachmentSave);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachmentSave) . ' WHERE post_id = ' . $this->getVar('post_id');
-        if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            //xoops_error($GLOBALS['xoopsDB']->error());
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  array|null $attachArray
-     * @return bool
-     */
-    public function deleteAttachment($attachArray = null)
-    {
-        $attachOld = $this->getAttachment();
-        if (!is_array($attachOld) || count($attachOld) < 1) {
-            return true;
-        }
-        $this->attachmentArray = [];
-
-        if (null === $attachArray) {
-            $attachArray = array_keys($attachOld);
-        } // to delete all!
-        if (!is_array($attachArray)) {
-            $attachArray = [$attachArray];
-        }
-
-        foreach ($attachOld as $key => $attach) {
-            if (in_array($key, $attachArray)) {
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']));
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/thumbs/' . $attach['name_saved'])); // delete thumbnails
-                continue;
-            }
-            $this->attachmentArray[$key] = $attach;
-        }
-        $attachmentSave = '';
-        if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
-            $attachmentSave = base64_encode(serialize($this->attachmentArray));
-        }
-        $this->setVar('attachment', $attachmentSave);
-
-        return true;
-    }
-
-    /**
-     * @param  string $name_saved
-     * @param  string $nameDisplay
-     * @param  string $mimetype
-     * @param  int    $numDownload
-     * @return bool
-     */
-    public function setAttachment($name_saved = '', $nameDisplay = '', $mimetype = '', $numDownload = 0)
-    {
-        static $counter = 0;
-        $this->attachmentArray = $this->getAttachment();
-        if ($name_saved) {
-            $key                         = (string)(time() + $counter++);
-            $this->attachmentArray[$key] = [
-                'name_saved'  => $name_saved,
-                'nameDisplay' => empty($nameDisplay) ? $nameDisplay : $name_saved,
-                'mimetype'    => $mimetype,
-                'numDownload' => empty($numDownload) ? (int)$numDownload : 0
-            ];
-        }
-        $attachmentSave = null;
-        if (is_array($this->attachmentArray)) {
-            $attachmentSave = base64_encode(serialize($this->attachmentArray));
-        }
-        $this->setVar('attachment', $attachmentSave);
-
-        return true;
-    }
-
-    /**
-     * TODO: refactor
-     * @param  bool $asSource
-     * @return string
-     */
-    public function displayAttachment($asSource = false)
-    {
-        global $xoopsModule;
-
-        $post_attachment = '';
-        $attachments     = $this->getAttachment();
-        if (is_array($attachments) && count($attachments) > 0) {
-            $iconHandler = newbbGetIconHandler();
-            $mime_path   = $iconHandler->getPath('mime');
-            require_once dirname(__DIR__) . '/include/functions.image.php';
-            $image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_NEWBB_ATTACHMENT . '</strong>:';
-            $post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
-            foreach ($attachments as $key => $att) {
-                $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
-                $filetype       = $file_extension;
-                if (file_exists($GLOBALS['xoops']->path($mime_path . '/' . $filetype . '.gif'))) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
-                } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
-                }
-                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $att['name_saved']));
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
-                if (in_array(strtolower($file_extension), $image_extensions)
-                    && $GLOBALS['xoopsModuleConfig']['media_allowed']) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['nameDisplay'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . newbbAttachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
-                } else {
-                    if (empty($GLOBALS['xoopsModuleConfig']['show_userattach'])) {
-                        $post_attachment .= '<a href="'
-                                            . XOOPS_URL
-                                            . '/modules/'
-                                            . $xoopsModule->getVar('dirname', 'n')
-                                            . '/dl_attachment.php?attachid='
-                                            . $key
-                                            . '&amp;post_id='
-                                            . $this->getVar('post_id')
-                                            . '"> <img src="'
-                                            . $icon_filetype
-                                            . '" alt="'
-                                            . $filetype
-                                            . '" /> '
-                                            . $att['nameDisplay']
-                                            . '</a> '
-                                            . _MD_NEWBB_FILESIZE
-                                            . ': '
-                                            . $file_size
-                                            . '; '
-                                            . _MD_NEWBB_HITS
-                                            . ': '
-                                            . $att['numDownload'];
-                    } elseif ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->uid() > 0
-                              && $GLOBALS['xoopsUser']->isactive()) {
-                        $post_attachment .= '<a href="'
-                                            . XOOPS_URL
-                                            . '/modules/'
-                                            . $xoopsModule->getVar('dirname', 'n')
-                                            . '/dl_attachment.php?attachid='
-                                            . $key
-                                            . '&amp;post_id='
-                                            . $this->getVar('post_id')
-                                            . '"> <img src="'
-                                            . $icon_filetype
-                                            . '" alt="'
-                                            . $filetype
-                                            . '" /> '
-                                            . $att['nameDisplay']
-                                            . '</a> '
-                                            . _MD_NEWBB_FILESIZE
-                                            . ': '
-                                            . $file_size
-                                            . '; '
-                                            . _MD_NEWBB_HITS
-                                            . ': '
-                                            . $att['numDownload'];
-                    } else {
-                        $post_attachment .= _MD_NEWBB_SEENOTGUEST;
-                    }
-                }
-                $post_attachment .= '<br>';
-            }
-        }
-
-        return $post_attachment;
-    }
-    // attachment functions
-    // ////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param  string $poster_name
-     * @param  string $post_editmsg
-     * @return bool
-     */
-    public function setPostEdit($poster_name = '', $post_editmsg = '')
-    {
-        $edit_user = '';
-        if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])
-            || (time() - $this->getVar('post_time')) < $GLOBALS['xoopsModuleConfig']['recordedit_timelimit'] * 60
-            || $this->getVar('approved') < 1) {
-            return true;
-        }
-        if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isActive()) {
-            if ($GLOBALS['xoopsModuleConfig']['show_realname'] && $GLOBALS['xoopsUser']->getVar('name')) {
-                $edit_user = $GLOBALS['xoopsUser']->getVar('name');
-            } else {
-                $edit_user = $GLOBALS['xoopsUser']->getVar('uname');
-            }
-        }
-        $post_edit              = [];
-        $post_edit['edit_user'] = $edit_user; // (?) The proper way is to store uid instead of name.
-        // However, to save queries when displaying, the current way is ok.
-        $post_edit['edit_time'] = time();
-        $post_edit['edit_msg']  = $post_editmsg;
-
-        $post_edits = $this->getVar('post_edit');
-        if (!empty($post_edits)) {
-            $post_edits = unserialize(base64_decode($post_edits));
-        }
-        if (!is_array($post_edits)) {
-            $post_edits = [];
-        }
-        $post_edits[] = $post_edit;
-        $post_edit    = base64_encode(serialize($post_edits));
-        unset($post_edits);
-        $this->setVar('post_edit', $post_edit);
-
-        return true;
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function displayPostEdit()
-    {
-        global $myts;
-
-        if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])) {
-            return false;
-        }
-
-        $post_edit  = '';
-        $post_edits = $this->getVar('post_edit');
-        if (!empty($post_edits)) {
-            $post_edits = unserialize(base64_decode($post_edits));
-        }
-        if (!isset($post_edits) || !is_array($post_edits)) {
-            $post_edits = [];
-        }
-        if (is_array($post_edits) && count($post_edits) > 0) {
-            foreach ($post_edits as $postedit) {
-                $edit_time = (int)$postedit['edit_time'];
-                $edit_user = $postedit['edit_user'];
-                $edit_msg  = !empty($postedit['edit_msg']) ? $postedit['edit_msg'] : '';
-                // Start irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
-                if (empty($GLOBALS['xoopsModuleConfig']['do_latestedit'])) {
-                    $post_edit = '';
-                }
-                // End irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
-                // START hacked by irmtfan
-                // display/save all edit records.
-                $post_edit .= _MD_NEWBB_EDITEDBY . ' ' . $edit_user . ' ' . _MD_NEWBB_ON . ' ' . formatTimestamp($edit_time) . '<br>';
-                // if reason is not empty
-                if ('' !== $edit_msg) {
-                    $post_edit .= _MD_NEWBB_EDITEDMSG . ' ' . $edit_msg . '<br>';
-                }
-                // START hacked by irmtfan
-            }
-        }
-
-        return $post_edit;
-    }
-
-    /**
-     * @return array
-     */
-    public function &getPostBody()
-    {
-        global $viewtopic_users;
-        $newbbConfig = newbbLoadConfig();
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-
-        $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-        /** @var KarmaHandler $karmaHandler */
-        $karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
-        $user_karma   = $karmaHandler->getUserKarma();
-
-        $post               = [];
-        $post['attachment'] = false;
-        $post_text          = newbbDisplayTarea($this->vars['post_text']['value'], $this->getVar('dohtml'), $this->getVar('dosmiley'), $this->getVar('doxcode'), $this->getVar('doimage'), $this->getVar('dobr'));
-        if (newbbIsAdmin($this->getVar('forum_id')) || $this->checkIdentity()) {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
-        } elseif ($newbbConfig['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
-            $post['text'] = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma'));
-        } elseif ($newbbConfig['allow_require_reply'] && $this->getVar('require_reply')
-                  && (!$uid || !isset($viewtopic_users[$uid]))) {
-            $post['text'] = _MD_NEWBB_REPLY_REQUIREMENT;
-        } else {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
-        }
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = xoops_getHandler('member');
-        $eachposter    = $memberHandler->getUser($this->getVar('uid'));
-        if (is_object($eachposter) && $eachposter->isActive()) {
-            if ($newbbConfig['show_realname'] && $eachposter->getVar('name')) {
-                $post['author'] = $eachposter->getVar('name');
-            } else {
-                $post['author'] = $eachposter->getVar('uname');
-            }
-            unset($eachposter);
-        } else {
-            $post['author'] = $this->getVar('poster_name') ?: $GLOBALS['xoopsConfig']['anonymous'];
-        }
-
-        $post['subject'] = newbbHtmlspecialchars($this->vars['subject']['value']);
-
-        $post['date'] = $this->getVar('post_time');
-
-        return $post;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isTopic()
-    {
-        return !$this->getVar('pid');
-    }
-
-    /**
-     * @param  string $action_tag
-     * @return bool
-     */
-    public function checkTimelimit($action_tag = 'edit_timelimit')
-    {
-        $newbbConfig = newbbLoadConfig();
-        if (empty($newbbConfig['edit_timelimit'])) {
-            return true;
-        }
-
-        return ($this->getVar('post_time') > time() - $newbbConfig[$action_tag] * 60);
-    }
-
-    /**
-     * @param  int $uid
-     * @return bool
-     */
-    public function checkIdentity($uid = -1)
-    {
-        $uid = ($uid > -1) ? $uid : (is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0);
-        if ($this->getVar('uid') > 0) {
-            $user_ok = ($uid == $this->getVar('uid'));
-        } else {
-            static $user_ip;
-            if (!isset($user_ip)) {
-                $user_ip = \Xmf\IPAddress::fromRequest()->asReadable();
-            }
-            $user_ok = ($user_ip == $this->getVar('poster_ip'));
-        }
-
-        return $user_ok;
-    }
-
-    // TODO: cleaning up and merge with post hanldings in viewpost.php
-
-    /**
-     * @param $isAdmin
-     * @return array
-     */
-    public function showPost($isAdmin)
-    {
-        global $xoopsModule, $myts;
-        global $forumUrl, $forumImage, $forumObject, $online, $viewmode;
-        global $viewtopic_users, $viewtopic_posters, $topicObject, $user_karma;
-        global $order, $start, $total_posts, $topic_status;
-        static $post_NO = 0;
-        static $name_anonymous;
-        /** @var TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        if (null === $name_anonymous) {
-            $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
-        }
-
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-
-        $post_id  = $this->getVar('post_id');
-        $topic_id = $this->getVar('topic_id');
-        $forum_id = $this->getVar('forum_id');
-
-        $query_vars              = ['status', 'order', 'start', 'mode', 'viewmode'];
-        $query_array             = [];
-        $query_array['topic_id'] = "topic_id={$topic_id}";
-        foreach ($query_vars as $var) {
-            if (Request::getString($var, '', 'GET')) {
-                $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
-            }
-        }
-        $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
-
-        $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-
-        ++$post_NO;
-        if ('desc' === strtolower($order)) {
-            $post_no = $total_posts - ($start + $post_NO) + 1;
-        } else {
-            $post_no = $start + $post_NO;
-        }
-
-        if ($isAdmin || $this->checkIdentity()) {
-            $post_text       = $this->getVar('post_text');
-            $post_attachment = $this->displayAttachment();
-        } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
-            $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')) . '</div>';
-            $post_attachment = '';
-        } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $this->getVar('require_reply')
-                  && (!$uid || !in_array($uid, $viewtopic_posters))) {
-            $post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
-            $post_attachment = '';
-        } else {
-            $post_text       = $this->getVar('post_text');
-            $post_attachment = $this->displayAttachment();
-        }
-
-        // Hightlight search words
-        $post_title = $this->getVar('subject');
-        if ($keywords = Request::getString('keywords', '', 'GET')) {
-            //$keywords   = $myts->htmlSpecialChars(trim(urldecode(Request::getString('keywords', '', 'GET'))));
-            $post_text  = Highlighter::apply($keywords, $post_text, '<mark>', '</mark>');
-            $post_title = Highlighter::apply($keywords, $post_title, '<mark>', '</mark>');
-        }
-
-        if (isset($viewtopic_users[$this->getVar('uid')])) {
-            $poster = $viewtopic_users[$this->getVar('uid')];
-        } else {
-            $name   = ($post_name = $this->getVar('poster_name')) ? $post_name : $name_anonymous;
-            $poster = [
-                'poster_uid' => 0,
-                'name'       => $name,
-                'link'       => $name
-            ];
-        }
-
-        if ($posticon = $this->getVar('icon')) {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/subject/' . $posticon . '" alt="" /></a>';
-        } else {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/icons/posticon.gif" alt="" /></a>';
-        }
-
-        $thread_buttons = [];
-        $mod_buttons    = [];
-
-        if ($isAdmin && ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->getVar('uid') !== $this->getVar('uid'))
-            && $this->getVar('uid') > 0) {
-            $mod_buttons['bann']['image']    = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $mod_buttons['bann']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
-            $mod_buttons['bann']['name']     = _MD_NEWBB_SUSPEND_MANAGEMENT;
-            $thread_buttons['bann']['image'] = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $thread_buttons['bann']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
-            $thread_buttons['bann']['name']  = _MD_NEWBB_SUSPEND_MANAGEMENT;
-        }
-
-        if ($GLOBALS['xoopsModuleConfig']['enable_permcheck']) {
-            //            /** @var TopicHandler $topicHandler */
-            //            $topicHandler =  Newbb\Helper::getInstance()->getHandler('Topic');
-            $topic_status = $topicObject->getVar('topic_status');
-            if ($topicHandler->getPermission($forum_id, $topic_status, 'edit')) {
-                $edit_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('edit_timelimit')));
-
-                if ($edit_ok) {
-                    $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-                    $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
-                    $thread_buttons['edit']['name']  = _EDIT;
-                    $mod_buttons['edit']['image']    = newbbDisplayImage('p_edit', _EDIT);
-                    $mod_buttons['edit']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
-                    $mod_buttons['edit']['name']     = _EDIT;
-                }
-            }
-
-            if ($topicHandler->getPermission($forum_id, $topic_status, 'delete')) {
-                $delete_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('delete_timelimit')));
-
-                if ($delete_ok) {
-                    $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-                    $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
-                    $thread_buttons['delete']['name']  = _DELETE;
-                    $mod_buttons['delete']['image']    = newbbDisplayImage('p_delete', _DELETE);
-                    $mod_buttons['delete']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
-                    $mod_buttons['delete']['name']     = _DELETE;
-                }
-            }
-            if ($topicHandler->getPermission($forum_id, $topic_status, 'reply')) {
-                $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-                $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
-                $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
-
-                $thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
-                $thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}&amp;quotedac=1";
-                $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
-            }
-        } else {
-            $mod_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $mod_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
-            $mod_buttons['edit']['name']  = _EDIT;
-
-            $mod_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $mod_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
-            $mod_buttons['delete']['name']  = _DELETE;
-
-            $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
-            $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
-        }
-
-        if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
-            $thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
-            $thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/report.php?{$page_query}";
-            $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
-        }
-
-        $thread_action = [];
-        // irmtfan add pdf permission
-        if (file_exists(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
-            && $topicHandler->getPermission($forum_id, $topic_status, 'pdf')) {
-            $thread_action['pdf']['image']  = newbbDisplayImage('pdf', _MD_NEWBB_PDF);
-            $thread_action['pdf']['link']   = XOOPS_URL . '/modules/newbb/makepdf.php?type=post&amp;pageid=0';
-            $thread_action['pdf']['name']   = _MD_NEWBB_PDF;
-            $thread_action['pdf']['target'] = '_blank';
-        }
-        // irmtfan add print permission
-        if ($topicHandler->getPermission($forum_id, $topic_status, 'print')) {
-            $thread_action['print']['image']  = newbbDisplayImage('printer', _MD_NEWBB_PRINT);
-            $thread_action['print']['link']   = XOOPS_URL . '/modules/newbb/print.php?form=2&amp;forum=' . $forum_id . '&amp;topic_id=' . $topic_id;
-            $thread_action['print']['name']   = _MD_NEWBB_PRINT;
-            $thread_action['print']['target'] = '_blank';
-        }
-
-        if ($GLOBALS['xoopsModuleConfig']['show_sociallinks']) {
-            $full_title  = $this->getVar('subject');
-            $clean_title = preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
-            $full_link   = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
-
-            $thread_action['social_twitter']['image']  = newbbDisplayImage('twitter', _MD_NEWBB_SHARE_TWITTER);
-            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text=' . $clean_title . '&amp;url=' . $full_link;
-            $thread_action['social_twitter']['name']   = _MD_NEWBB_SHARE_TWITTER;
-            $thread_action['social_twitter']['target'] = '_blank';
-
-            $thread_action['social_facebook']['image']  = newbbDisplayImage('facebook', _MD_NEWBB_SHARE_FACEBOOK);
-            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u=' . $full_link;
-            $thread_action['social_facebook']['name']   = _MD_NEWBB_SHARE_FACEBOOK;
-            $thread_action['social_facebook']['target'] = '_blank';
-
-            $thread_action['social_gplus']['image']  = newbbDisplayImage('googleplus', _MD_NEWBB_SHARE_GOOGLEPLUS);
-            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url=' . $full_link;
-            $thread_action['social_gplus']['name']   = _MD_NEWBB_SHARE_GOOGLEPLUS;
-            $thread_action['social_gplus']['target'] = '_blank';
-
-            $thread_action['social_linkedin']['image']  = newbbDisplayImage('linkedin', _MD_NEWBB_SHARE_LINKEDIN);
-            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_linkedin']['name']   = _MD_NEWBB_SHARE_LINKEDIN;
-            $thread_action['social_linkedin']['target'] = '_blank';
-
-            $thread_action['social_delicious']['image']  = newbbDisplayImage('delicious', _MD_NEWBB_SHARE_DELICIOUS);
-            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_delicious']['name']   = _MD_NEWBB_SHARE_DELICIOUS;
-            $thread_action['social_delicious']['target'] = '_blank';
-
-            $thread_action['social_digg']['image']  = newbbDisplayImage('digg', _MD_NEWBB_SHARE_DIGG);
-            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_digg']['name']   = _MD_NEWBB_SHARE_DIGG;
-            $thread_action['social_digg']['target'] = '_blank';
-
-            $thread_action['social_reddit']['image']  = newbbDisplayImage('reddit', _MD_NEWBB_SHARE_REDDIT);
-            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_reddit']['name']   = _MD_NEWBB_SHARE_REDDIT;
-            $thread_action['social_reddit']['target'] = '_blank';
-
-            $thread_action['social_wong']['image']  = newbbDisplayImage('wong', _MD_NEWBB_SHARE_MRWONG);
-            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url=' . $full_link;
-            $thread_action['social_wong']['name']   = _MD_NEWBB_SHARE_MRWONG;
-            $thread_action['social_wong']['target'] = '_blank';
-        }
-
-        $post = [
-            'post_id'         => $post_id,
-            'post_parent_id'  => $this->getVar('pid'),
-            'post_date'       => newbbFormatTimestamp($this->getVar('post_time')),
-            'post_image'      => $post_image,
-            'post_title'      => $post_title,
-            // irmtfan $post_title to add highlight keywords
-            'post_text'       => $post_text,
-            'post_attachment' => $post_attachment,
-            'post_edit'       => $this->displayPostEdit(),
-            'post_no'         => $post_no,
-            'post_signature'  => $this->getVar('attachsig') ? @$poster['signature'] : '',
-            //            'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($this->getVar('poster_ip')) : '',
-            'poster_ip'       => ($isAdmin
-                                  && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $this->getVar('poster_ip') : '',
-            'thread_action'   => $thread_action,
-            'thread_buttons'  => $thread_buttons,
-            'mod_buttons'     => $mod_buttons,
-            'poster'          => $poster,
-            'post_permalink'  => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '"></a>'
-        ];
-
-        unset($thread_buttons, $mod_buttons, $eachposter);
-
-        return $post;
-    }
+	//class Post extends \XoopsObject {
+	private $attachmentArray = [];
+
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->initVar('post_id', XOBJ_DTYPE_INT);
+		$this->initVar('topic_id', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('forum_id', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('post_time', XOBJ_DTYPE_INT, 0, true);
+		//        $this->initVar('poster_ip', XOBJ_DTYPE_INT, 0);
+		$this->initVar('poster_ip', XOBJ_DTYPE_TXTBOX, '');
+		$this->initVar('poster_name', XOBJ_DTYPE_TXTBOX, '');
+		$this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true);
+		$this->initVar('pid', XOBJ_DTYPE_INT, 0);
+		$this->initVar('dohtml', XOBJ_DTYPE_INT, 0);
+		$this->initVar('dosmiley', XOBJ_DTYPE_INT, 1);
+		$this->initVar('doxcode', XOBJ_DTYPE_INT, 1);
+		$this->initVar('doimage', XOBJ_DTYPE_INT, 1);
+		$this->initVar('dobr', XOBJ_DTYPE_INT, 1);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 1);
+		$this->initVar('icon', XOBJ_DTYPE_TXTBOX, '');
+		$this->initVar('attachsig', XOBJ_DTYPE_INT, 0);
+		$this->initVar('approved', XOBJ_DTYPE_INT, 1);
+		$this->initVar('post_karma', XOBJ_DTYPE_INT, 0);
+		$this->initVar('require_reply', XOBJ_DTYPE_INT, 0);
+		$this->initVar('attachment', XOBJ_DTYPE_TXTAREA, '');
+		$this->initVar('post_text', XOBJ_DTYPE_TXTAREA, '');
+		$this->initVar('post_edit', XOBJ_DTYPE_TXTAREA, '');
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////
+	// attachment functions    TODO: there should be a file/attachment management class
+	/**
+	 * @return array|mixed|null
+	 */
+	public function getAttachment()
+	{
+		if (count($this->attachmentArray)) {
+			return $this->attachmentArray;
+		}
+		$attachment = $this->getVar('attachment');
+		if (empty($attachment)) {
+			$this->attachmentArray = [];
+		} else {
+			$this->attachmentArray = @unserialize(base64_decode($attachment));
+		}
+
+		return $this->attachmentArray;
+	}
+
+	/**
+	 * @param $attachKey
+	 * @return bool
+	 */
+	public function incrementDownload($attachKey)
+	{
+		if (!$attachKey) {
+			return false;
+		}
+		$this->attachmentArray[(string)$attachKey]['numDownload']++;
+
+		return $this->attachmentArray[(string)$attachKey]['numDownload'];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function saveAttachment()
+	{
+		$attachmentSave = '';
+		if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
+			$attachmentSave = base64_encode(serialize($this->attachmentArray));
+		}
+		$this->setVar('attachment', $attachmentSave);
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachmentSave) . ' WHERE post_id = ' . $this->getVar('post_id');
+		if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
+			//xoops_error($GLOBALS['xoopsDB']->error());
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param  array|null $attachArray
+	 * @return bool
+	 */
+	public function deleteAttachment($attachArray = null)
+	{
+		$attachOld = $this->getAttachment();
+		if (!is_array($attachOld) || count($attachOld) < 1) {
+			return true;
+		}
+		$this->attachmentArray = [];
+
+		if (null === $attachArray) {
+			$attachArray = array_keys($attachOld);
+		} // to delete all!
+		if (!is_array($attachArray)) {
+			$attachArray = [$attachArray];
+		}
+
+		foreach ($attachOld as $key => $attach) {
+			if (in_array($key, $attachArray)) {
+				@unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']));
+				@unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/thumbs/' . $attach['name_saved'])); // delete thumbnails
+				continue;
+			}
+			$this->attachmentArray[$key] = $attach;
+		}
+		$attachmentSave = '';
+		if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
+			$attachmentSave = base64_encode(serialize($this->attachmentArray));
+		}
+		$this->setVar('attachment', $attachmentSave);
+
+		return true;
+	}
+
+	/**
+	 * @param  string $name_saved
+	 * @param  string $nameDisplay
+	 * @param  string $mimetype
+	 * @param  int    $numDownload
+	 * @return bool
+	 */
+	public function setAttachment($name_saved = '', $nameDisplay = '', $mimetype = '', $numDownload = 0)
+	{
+		static $counter = 0;
+		$this->attachmentArray = $this->getAttachment();
+		if ($name_saved) {
+			$key                         = (string)(time() + $counter++);
+			$this->attachmentArray[$key] = [
+				'name_saved'  => $name_saved,
+				'nameDisplay' => empty($nameDisplay) ? $nameDisplay : $name_saved,
+				'mimetype'    => $mimetype,
+				'numDownload' => empty($numDownload) ? (int)$numDownload : 0
+			];
+		}
+		$attachmentSave = null;
+		if (is_array($this->attachmentArray)) {
+			$attachmentSave = base64_encode(serialize($this->attachmentArray));
+		}
+		$this->setVar('attachment', $attachmentSave);
+
+		return true;
+	}
+
+	/**
+	 * TODO: refactor
+	 * @param  bool $asSource
+	 * @return string
+	 */
+	public function displayAttachment($asSource = false)
+	{
+		global $xoopsModule;
+
+		$post_attachment = '';
+		$attachments     = $this->getAttachment();
+		if (is_array($attachments) && count($attachments) > 0) {
+			$iconHandler = newbbGetIconHandler();
+			$mime_path   = $iconHandler->getPath('mime');
+			require_once dirname(__DIR__) . '/include/functions.image.php';
+			$image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
+			$post_attachment  .= '<br><strong>' . _MD_NEWBB_ATTACHMENT . '</strong>:';
+			$post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
+			foreach ($attachments as $key => $att) {
+				$file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
+				$filetype       = $file_extension;
+				if (file_exists($GLOBALS['xoops']->path($mime_path . '/' . $filetype . '.gif'))) {
+					$icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+				} else {
+					$icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+				}
+				$file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $att['name_saved']));
+				$file_size = number_format($file_size / 1024, 2) . ' KB';
+				if (in_array(strtolower($file_extension), $image_extensions)
+					&& $GLOBALS['xoopsModuleConfig']['media_allowed']) {
+					$post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['nameDisplay'] . '</strong> <small>(' . $file_size . ')</small>';
+					$post_attachment .= '<br>' . newbbAttachmentImage($att['name_saved']);
+					$isDisplayed     = true;
+				} else {
+					if (empty($GLOBALS['xoopsModuleConfig']['show_userattach'])) {
+						$post_attachment .= '<a href="'
+											. XOOPS_URL
+											. '/modules/'
+											. $xoopsModule->getVar('dirname', 'n')
+											. '/dl_attachment.php?attachid='
+											. $key
+											. '&amp;post_id='
+											. $this->getVar('post_id')
+											. '"> <img src="'
+											. $icon_filetype
+											. '" alt="'
+											. $filetype
+											. '" /> '
+											. $att['nameDisplay']
+											. '</a> '
+											. _MD_NEWBB_FILESIZE
+											. ': '
+											. $file_size
+											. '; '
+											. _MD_NEWBB_HITS
+											. ': '
+											. $att['numDownload'];
+					} elseif ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->uid() > 0
+							  && $GLOBALS['xoopsUser']->isactive()) {
+						$post_attachment .= '<a href="'
+											. XOOPS_URL
+											. '/modules/'
+											. $xoopsModule->getVar('dirname', 'n')
+											. '/dl_attachment.php?attachid='
+											. $key
+											. '&amp;post_id='
+											. $this->getVar('post_id')
+											. '"> <img src="'
+											. $icon_filetype
+											. '" alt="'
+											. $filetype
+											. '" /> '
+											. $att['nameDisplay']
+											. '</a> '
+											. _MD_NEWBB_FILESIZE
+											. ': '
+											. $file_size
+											. '; '
+											. _MD_NEWBB_HITS
+											. ': '
+											. $att['numDownload'];
+					} else {
+						$post_attachment .= _MD_NEWBB_SEENOTGUEST;
+					}
+				}
+				$post_attachment .= '<br>';
+			}
+		}
+
+		return $post_attachment;
+	}
+	// attachment functions
+	// ////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param  string $poster_name
+	 * @param  string $post_editmsg
+	 * @return bool
+	 */
+	public function setPostEdit($poster_name = '', $post_editmsg = '')
+	{
+		$edit_user = '';
+		if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])
+			|| (time() - $this->getVar('post_time')) < $GLOBALS['xoopsModuleConfig']['recordedit_timelimit'] * 60
+			|| $this->getVar('approved') < 1) {
+			return true;
+		}
+		if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isActive()) {
+			if ($GLOBALS['xoopsModuleConfig']['show_realname'] && $GLOBALS['xoopsUser']->getVar('name')) {
+				$edit_user = $GLOBALS['xoopsUser']->getVar('name');
+			} else {
+				$edit_user = $GLOBALS['xoopsUser']->getVar('uname');
+			}
+		}
+		$post_edit              = [];
+		$post_edit['edit_user'] = $edit_user; // (?) The proper way is to store uid instead of name.
+		// However, to save queries when displaying, the current way is ok.
+		$post_edit['edit_time'] = time();
+		$post_edit['edit_msg']  = $post_editmsg;
+
+		$post_edits = $this->getVar('post_edit');
+		if (!empty($post_edits)) {
+			$post_edits = unserialize(base64_decode($post_edits));
+		}
+		if (!is_array($post_edits)) {
+			$post_edits = [];
+		}
+		$post_edits[] = $post_edit;
+		$post_edit    = base64_encode(serialize($post_edits));
+		unset($post_edits);
+		$this->setVar('post_edit', $post_edit);
+
+		return true;
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function displayPostEdit()
+	{
+		global $myts;
+
+		if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])) {
+			return false;
+		}
+
+		$post_edit  = '';
+		$post_edits = $this->getVar('post_edit');
+		if (!empty($post_edits)) {
+			$post_edits = unserialize(base64_decode($post_edits));
+		}
+		if (!isset($post_edits) || !is_array($post_edits)) {
+			$post_edits = [];
+		}
+		if (is_array($post_edits) && count($post_edits) > 0) {
+			foreach ($post_edits as $postedit) {
+				$edit_time = (int)$postedit['edit_time'];
+				$edit_user = $postedit['edit_user'];
+				$edit_msg  = !empty($postedit['edit_msg']) ? $postedit['edit_msg'] : '';
+				// Start irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
+				if (empty($GLOBALS['xoopsModuleConfig']['do_latestedit'])) {
+					$post_edit = '';
+				}
+				// End irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
+				// START hacked by irmtfan
+				// display/save all edit records.
+				$post_edit .= _MD_NEWBB_EDITEDBY . ' ' . $edit_user . ' ' . _MD_NEWBB_ON . ' ' . formatTimestamp($edit_time) . '<br>';
+				// if reason is not empty
+				if ('' !== $edit_msg) {
+					$post_edit .= _MD_NEWBB_EDITEDMSG . ' ' . $edit_msg . '<br>';
+				}
+				// START hacked by irmtfan
+			}
+		}
+
+		return $post_edit;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function &getPostBody()
+	{
+		global $viewtopic_users;
+		$newbbConfig = newbbLoadConfig();
+		require_once  dirname(__DIR__) . '/include/functions.user.php';
+		require_once  dirname(__DIR__) . '/include/functions.render.php';
+
+		$uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+		/** @var KarmaHandler $karmaHandler */
+		$karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
+		$user_karma   = $karmaHandler->getUserKarma();
+
+		$post               = [];
+		$post['attachment'] = false;
+		$post_text          = newbbDisplayTarea($this->vars['post_text']['value'], $this->getVar('dohtml'), $this->getVar('dosmiley'), $this->getVar('doxcode'), $this->getVar('doimage'), $this->getVar('dobr'));
+		if (newbbIsAdmin($this->getVar('forum_id')) || $this->checkIdentity()) {
+			$post['text'] = $post_text . '<br>' . $this->displayAttachment();
+		} elseif ($newbbConfig['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
+			$post['text'] = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma'));
+		} elseif ($newbbConfig['allow_require_reply'] && $this->getVar('require_reply')
+				  && (!$uid || !isset($viewtopic_users[$uid]))) {
+			$post['text'] = _MD_NEWBB_REPLY_REQUIREMENT;
+		} else {
+			$post['text'] = $post_text . '<br>' . $this->displayAttachment();
+		}
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = xoops_getHandler('member');
+		$eachposter    = $memberHandler->getUser($this->getVar('uid'));
+		if (is_object($eachposter) && $eachposter->isActive()) {
+			if ($newbbConfig['show_realname'] && $eachposter->getVar('name')) {
+				$post['author'] = $eachposter->getVar('name');
+			} else {
+				$post['author'] = $eachposter->getVar('uname');
+			}
+			unset($eachposter);
+		} else {
+			$post['author'] = $this->getVar('poster_name') ?: $GLOBALS['xoopsConfig']['anonymous'];
+		}
+
+		$post['subject'] = newbbHtmlspecialchars($this->vars['subject']['value']);
+
+		$post['date'] = $this->getVar('post_time');
+
+		return $post;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isTopic()
+	{
+		return !$this->getVar('pid');
+	}
+
+	/**
+	 * @param  string $action_tag
+	 * @return bool
+	 */
+	public function checkTimelimit($action_tag = 'edit_timelimit')
+	{
+		$newbbConfig = newbbLoadConfig();
+		if (empty($newbbConfig['edit_timelimit'])) {
+			return true;
+		}
+
+		return ($this->getVar('post_time') > time() - $newbbConfig[$action_tag] * 60);
+	}
+
+	/**
+	 * @param  int $uid
+	 * @return bool
+	 */
+	public function checkIdentity($uid = -1)
+	{
+		$uid = ($uid > -1) ? $uid : (is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0);
+		if ($this->getVar('uid') > 0) {
+			$user_ok = ($uid == $this->getVar('uid'));
+		} else {
+			static $user_ip;
+			if (!isset($user_ip)) {
+				$user_ip = \Xmf\IPAddress::fromRequest()->asReadable();
+			}
+			$user_ok = ($user_ip == $this->getVar('poster_ip'));
+		}
+
+		return $user_ok;
+	}
+
+	// TODO: cleaning up and merge with post hanldings in viewpost.php
+
+	/**
+	 * @param $isAdmin
+	 * @return array
+	 */
+	public function showPost($isAdmin)
+	{
+		global $xoopsModule, $myts;
+		global $forumUrl, $forumImage, $forumObject, $online, $viewmode;
+		global $viewtopic_users, $viewtopic_posters, $topicObject, $user_karma;
+		global $order, $start, $total_posts, $topic_status;
+		static $post_NO = 0;
+		static $name_anonymous;
+		/** @var TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		if (null === $name_anonymous) {
+			$name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
+		}
+
+		require_once  dirname(__DIR__) . '/include/functions.time.php';
+		require_once  dirname(__DIR__) . '/include/functions.render.php';
+
+		$post_id  = $this->getVar('post_id');
+		$topic_id = $this->getVar('topic_id');
+		$forum_id = $this->getVar('forum_id');
+
+		$query_vars              = ['status', 'order', 'start', 'mode', 'viewmode'];
+		$query_array             = [];
+		$query_array['topic_id'] = "topic_id={$topic_id}";
+		foreach ($query_vars as $var) {
+			if (Request::getString($var, '', 'GET')) {
+				$query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+			}
+		}
+		$page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
+
+		$uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+
+		++$post_NO;
+		if ('desc' === strtolower($order)) {
+			$post_no = $total_posts - ($start + $post_NO) + 1;
+		} else {
+			$post_no = $start + $post_NO;
+		}
+
+		if ($isAdmin || $this->checkIdentity()) {
+			$post_text       = $this->getVar('post_text');
+			$post_attachment = $this->displayAttachment();
+		} elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
+			$post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')) . '</div>';
+			$post_attachment = '';
+		} elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $this->getVar('require_reply')
+				  && (!$uid || !in_array($uid, $viewtopic_posters))) {
+			$post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
+			$post_attachment = '';
+		} else {
+			$post_text       = $this->getVar('post_text');
+			$post_attachment = $this->displayAttachment();
+		}
+
+		// Hightlight search words
+		$post_title = $this->getVar('subject');
+		if ($keywords = Request::getString('keywords', '', 'GET')) {
+			//$keywords   = $myts->htmlSpecialChars(trim(urldecode(Request::getString('keywords', '', 'GET'))));
+			$post_text  = Highlighter::apply($keywords, $post_text, '<mark>', '</mark>');
+			$post_title = Highlighter::apply($keywords, $post_title, '<mark>', '</mark>');
+		}
+
+		if (isset($viewtopic_users[$this->getVar('uid')])) {
+			$poster = $viewtopic_users[$this->getVar('uid')];
+		} else {
+			$name   = ($post_name = $this->getVar('poster_name')) ? $post_name : $name_anonymous;
+			$poster = [
+				'poster_uid' => 0,
+				'name'       => $name,
+				'link'       => $name
+			];
+		}
+
+		if ($posticon = $this->getVar('icon')) {
+			$post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/subject/' . $posticon . '" alt="" /></a>';
+		} else {
+			$post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/icons/posticon.gif" alt="" /></a>';
+		}
+
+		$thread_buttons = [];
+		$mod_buttons    = [];
+
+		if ($isAdmin && ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->getVar('uid') !== $this->getVar('uid'))
+			&& $this->getVar('uid') > 0) {
+			$mod_buttons['bann']['image']    = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
+			$mod_buttons['bann']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+			$mod_buttons['bann']['name']     = _MD_NEWBB_SUSPEND_MANAGEMENT;
+			$thread_buttons['bann']['image'] = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
+			$thread_buttons['bann']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+			$thread_buttons['bann']['name']  = _MD_NEWBB_SUSPEND_MANAGEMENT;
+		}
+
+		if ($GLOBALS['xoopsModuleConfig']['enable_permcheck']) {
+			//            /** @var TopicHandler $topicHandler */
+			//            $topicHandler =  Newbb\Helper::getInstance()->getHandler('Topic');
+			$topic_status = $topicObject->getVar('topic_status');
+			if ($topicHandler->getPermission($forum_id, $topic_status, 'edit')) {
+				$edit_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('edit_timelimit')));
+
+				if ($edit_ok) {
+					$thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
+					$thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+					$thread_buttons['edit']['name']  = _EDIT;
+					$mod_buttons['edit']['image']    = newbbDisplayImage('p_edit', _EDIT);
+					$mod_buttons['edit']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+					$mod_buttons['edit']['name']     = _EDIT;
+				}
+			}
+
+			if ($topicHandler->getPermission($forum_id, $topic_status, 'delete')) {
+				$delete_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('delete_timelimit')));
+
+				if ($delete_ok) {
+					$thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
+					$thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+					$thread_buttons['delete']['name']  = _DELETE;
+					$mod_buttons['delete']['image']    = newbbDisplayImage('p_delete', _DELETE);
+					$mod_buttons['delete']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+					$mod_buttons['delete']['name']     = _DELETE;
+				}
+			}
+			if ($topicHandler->getPermission($forum_id, $topic_status, 'reply')) {
+				$thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
+				$thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+				$thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
+
+				$thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
+				$thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}&amp;quotedac=1";
+				$thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
+			}
+		} else {
+			$mod_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
+			$mod_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+			$mod_buttons['edit']['name']  = _EDIT;
+
+			$mod_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
+			$mod_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+			$mod_buttons['delete']['name']  = _DELETE;
+
+			$thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
+			$thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+			$thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
+		}
+
+		if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
+			$thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
+			$thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/report.php?{$page_query}";
+			$thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
+		}
+
+		$thread_action = [];
+		// irmtfan add pdf permission
+		if (file_exists(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
+			&& $topicHandler->getPermission($forum_id, $topic_status, 'pdf')) {
+			$thread_action['pdf']['image']  = newbbDisplayImage('pdf', _MD_NEWBB_PDF);
+			$thread_action['pdf']['link']   = XOOPS_URL . '/modules/newbb/makepdf.php?type=post&amp;pageid=0';
+			$thread_action['pdf']['name']   = _MD_NEWBB_PDF;
+			$thread_action['pdf']['target'] = '_blank';
+		}
+		// irmtfan add print permission
+		if ($topicHandler->getPermission($forum_id, $topic_status, 'print')) {
+			$thread_action['print']['image']  = newbbDisplayImage('printer', _MD_NEWBB_PRINT);
+			$thread_action['print']['link']   = XOOPS_URL . '/modules/newbb/print.php?form=2&amp;forum=' . $forum_id . '&amp;topic_id=' . $topic_id;
+			$thread_action['print']['name']   = _MD_NEWBB_PRINT;
+			$thread_action['print']['target'] = '_blank';
+		}
+
+		if ($GLOBALS['xoopsModuleConfig']['show_sociallinks']) {
+			$full_title  = $this->getVar('subject');
+			$clean_title = preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
+			$full_link   = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+
+			$thread_action['social_twitter']['image']  = newbbDisplayImage('twitter', _MD_NEWBB_SHARE_TWITTER);
+			$thread_action['social_twitter']['link']   = 'http://twitter.com/share?text=' . $clean_title . '&amp;url=' . $full_link;
+			$thread_action['social_twitter']['name']   = _MD_NEWBB_SHARE_TWITTER;
+			$thread_action['social_twitter']['target'] = '_blank';
+
+			$thread_action['social_facebook']['image']  = newbbDisplayImage('facebook', _MD_NEWBB_SHARE_FACEBOOK);
+			$thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u=' . $full_link;
+			$thread_action['social_facebook']['name']   = _MD_NEWBB_SHARE_FACEBOOK;
+			$thread_action['social_facebook']['target'] = '_blank';
+
+			$thread_action['social_gplus']['image']  = newbbDisplayImage('googleplus', _MD_NEWBB_SHARE_GOOGLEPLUS);
+			$thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url=' . $full_link;
+			$thread_action['social_gplus']['name']   = _MD_NEWBB_SHARE_GOOGLEPLUS;
+			$thread_action['social_gplus']['target'] = '_blank';
+
+			$thread_action['social_linkedin']['image']  = newbbDisplayImage('linkedin', _MD_NEWBB_SHARE_LINKEDIN);
+			$thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_linkedin']['name']   = _MD_NEWBB_SHARE_LINKEDIN;
+			$thread_action['social_linkedin']['target'] = '_blank';
+
+			$thread_action['social_delicious']['image']  = newbbDisplayImage('delicious', _MD_NEWBB_SHARE_DELICIOUS);
+			$thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_delicious']['name']   = _MD_NEWBB_SHARE_DELICIOUS;
+			$thread_action['social_delicious']['target'] = '_blank';
+
+			$thread_action['social_digg']['image']  = newbbDisplayImage('digg', _MD_NEWBB_SHARE_DIGG);
+			$thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_digg']['name']   = _MD_NEWBB_SHARE_DIGG;
+			$thread_action['social_digg']['target'] = '_blank';
+
+			$thread_action['social_reddit']['image']  = newbbDisplayImage('reddit', _MD_NEWBB_SHARE_REDDIT);
+			$thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_reddit']['name']   = _MD_NEWBB_SHARE_REDDIT;
+			$thread_action['social_reddit']['target'] = '_blank';
+
+			$thread_action['social_wong']['image']  = newbbDisplayImage('wong', _MD_NEWBB_SHARE_MRWONG);
+			$thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url=' . $full_link;
+			$thread_action['social_wong']['name']   = _MD_NEWBB_SHARE_MRWONG;
+			$thread_action['social_wong']['target'] = '_blank';
+		}
+
+		$post = [
+			'post_id'         => $post_id,
+			'post_parent_id'  => $this->getVar('pid'),
+			'post_date'       => newbbFormatTimestamp($this->getVar('post_time')),
+			'post_image'      => $post_image,
+			'post_title'      => $post_title,
+			// irmtfan $post_title to add highlight keywords
+			'post_text'       => $post_text,
+			'post_attachment' => $post_attachment,
+			'post_edit'       => $this->displayPostEdit(),
+			'post_no'         => $post_no,
+			'post_signature'  => $this->getVar('attachsig') ? @$poster['signature'] : '',
+			//            'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($this->getVar('poster_ip')) : '',
+			'poster_ip'       => ($isAdmin
+								  && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $this->getVar('poster_ip') : '',
+			'thread_action'   => $thread_action,
+			'thread_buttons'  => $thread_buttons,
+			'mod_buttons'     => $mod_buttons,
+			'poster'          => $poster,
+			'post_permalink'  => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '"></a>'
+		];
+
+		unset($thread_buttons, $mod_buttons, $eachposter);
+
+		return $post;
+	}
 }

Spacing +56 added lines, -56 removed lines

@@ -107,9 +107,9 @@ 
         if (!$attachKey) {
             return false;
         }
-        $this->attachmentArray[(string)$attachKey]['numDownload']++;
+        $this->attachmentArray[(string) $attachKey]['numDownload']++;
 
-        return $this->attachmentArray[(string)$attachKey]['numDownload'];
+        return $this->attachmentArray[(string) $attachKey]['numDownload'];
     }
 
     /**
@@ -122,7 +122,7 @@ 
             $attachmentSave = base64_encode(serialize($this->attachmentArray));
         }
         $this->setVar('attachment', $attachmentSave);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachmentSave) . ' WHERE post_id = ' . $this->getVar('post_id');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachmentSave).' WHERE post_id = '.$this->getVar('post_id');
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             //xoops_error($GLOBALS['xoopsDB']->error());
             return false;
@@ -152,8 +152,8 @@ 
 
         foreach ($attachOld as $key => $attach) {
             if (in_array($key, $attachArray)) {
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']));
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/thumbs/' . $attach['name_saved'])); // delete thumbnails
+                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']));
+                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/thumbs/'.$attach['name_saved'])); // delete thumbnails
                 continue;
             }
             $this->attachmentArray[$key] = $attach;
@@ -179,12 +179,12 @@ 
         static $counter = 0;
         $this->attachmentArray = $this->getAttachment();
         if ($name_saved) {
-            $key                         = (string)(time() + $counter++);
+            $key                         = (string) (time() + $counter++);
             $this->attachmentArray[$key] = [
                 'name_saved'  => $name_saved,
                 'nameDisplay' => empty($nameDisplay) ? $nameDisplay : $name_saved,
                 'mimetype'    => $mimetype,
-                'numDownload' => empty($numDownload) ? (int)$numDownload : 0
+                'numDownload' => empty($numDownload) ? (int) $numDownload : 0
             ];
         }
         $attachmentSave = null;
@@ -210,25 +210,25 @@ 
         if (is_array($attachments) && count($attachments) > 0) {
             $iconHandler = newbbGetIconHandler();
             $mime_path   = $iconHandler->getPath('mime');
-            require_once dirname(__DIR__) . '/include/functions.image.php';
+            require_once dirname(__DIR__).'/include/functions.image.php';
             $image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_NEWBB_ATTACHMENT . '</strong>:';
+            $post_attachment  .= '<br><strong>'._MD_NEWBB_ATTACHMENT.'</strong>:';
             $post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
             foreach ($attachments as $key => $att) {
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
                 $filetype       = $file_extension;
-                if (file_exists($GLOBALS['xoops']->path($mime_path . '/' . $filetype . '.gif'))) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+                if (file_exists($GLOBALS['xoops']->path($mime_path.'/'.$filetype.'.gif'))) {
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
                 } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
                 }
-                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $att['name_saved']));
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
+                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$att['name_saved']));
+                $file_size = number_format($file_size / 1024, 2).' KB';
                 if (in_array(strtolower($file_extension), $image_extensions)
                     && $GLOBALS['xoopsModuleConfig']['media_allowed']) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['nameDisplay'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . newbbAttachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'" /><strong>&nbsp; '.$att['nameDisplay'].'</strong> <small>('.$file_size.')</small>';
+                    $post_attachment .= '<br>'.newbbAttachmentImage($att['name_saved']);
+                    $isDisplayed = true;
                 } else {
                     if (empty($GLOBALS['xoopsModuleConfig']['show_userattach'])) {
                         $post_attachment .= '<a href="'
@@ -352,7 +352,7 @@ 
         }
         if (is_array($post_edits) && count($post_edits) > 0) {
             foreach ($post_edits as $postedit) {
-                $edit_time = (int)$postedit['edit_time'];
+                $edit_time = (int) $postedit['edit_time'];
                 $edit_user = $postedit['edit_user'];
                 $edit_msg  = !empty($postedit['edit_msg']) ? $postedit['edit_msg'] : '';
                 // Start irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
@@ -362,10 +362,10 @@ 
                 // End irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
                 // START hacked by irmtfan
                 // display/save all edit records.
-                $post_edit .= _MD_NEWBB_EDITEDBY . ' ' . $edit_user . ' ' . _MD_NEWBB_ON . ' ' . formatTimestamp($edit_time) . '<br>';
+                $post_edit .= _MD_NEWBB_EDITEDBY.' '.$edit_user.' '._MD_NEWBB_ON.' '.formatTimestamp($edit_time).'<br>';
                 // if reason is not empty
                 if ('' !== $edit_msg) {
-                    $post_edit .= _MD_NEWBB_EDITEDMSG . ' ' . $edit_msg . '<br>';
+                    $post_edit .= _MD_NEWBB_EDITEDMSG.' '.$edit_msg.'<br>';
                 }
                 // START hacked by irmtfan
             }
@@ -381,8 +381,8 @@ 
     {
         global $viewtopic_users;
         $newbbConfig = newbbLoadConfig();
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
+        require_once  dirname(__DIR__).'/include/functions.user.php';
+        require_once  dirname(__DIR__).'/include/functions.render.php';
 
         $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
         /** @var KarmaHandler $karmaHandler */
@@ -393,14 +393,14 @@ 
         $post['attachment'] = false;
         $post_text          = newbbDisplayTarea($this->vars['post_text']['value'], $this->getVar('dohtml'), $this->getVar('dosmiley'), $this->getVar('doxcode'), $this->getVar('doimage'), $this->getVar('dobr'));
         if (newbbIsAdmin($this->getVar('forum_id')) || $this->checkIdentity()) {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
+            $post['text'] = $post_text.'<br>'.$this->displayAttachment();
         } elseif ($newbbConfig['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
             $post['text'] = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma'));
         } elseif ($newbbConfig['allow_require_reply'] && $this->getVar('require_reply')
                   && (!$uid || !isset($viewtopic_users[$uid]))) {
             $post['text'] = _MD_NEWBB_REPLY_REQUIREMENT;
         } else {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
+            $post['text'] = $post_text.'<br>'.$this->displayAttachment();
         }
         /** @var \XoopsMemberHandler $memberHandler */
         $memberHandler = xoops_getHandler('member');
@@ -485,8 +485,8 @@ 
             $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
         }
 
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
+        require_once  dirname(__DIR__).'/include/functions.time.php';
+        require_once  dirname(__DIR__).'/include/functions.render.php';
 
         $post_id  = $this->getVar('post_id');
         $topic_id = $this->getVar('topic_id');
@@ -497,7 +497,7 @@ 
         $query_array['topic_id'] = "topic_id={$topic_id}";
         foreach ($query_vars as $var) {
             if (Request::getString($var, '', 'GET')) {
-                $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+                $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
             }
         }
         $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
@@ -515,11 +515,11 @@ 
             $post_text       = $this->getVar('post_text');
             $post_attachment = $this->displayAttachment();
         } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
-            $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')) . '</div>';
+            $post_text       = "<div class='karma'>".sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')).'</div>';
             $post_attachment = '';
         } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $this->getVar('require_reply')
                   && (!$uid || !in_array($uid, $viewtopic_posters))) {
-            $post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
+            $post_text       = "<div class='karma'>"._MD_NEWBB_REPLY_REQUIREMENT.'</div>';
             $post_attachment = '';
         } else {
             $post_text       = $this->getVar('post_text');
@@ -546,9 +546,9 @@ 
         }
 
         if ($posticon = $this->getVar('icon')) {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/subject/' . $posticon . '" alt="" /></a>';
+            $post_image = '<a name="'.$post_id.'"><img src="'.XOOPS_URL.'/images/subject/'.$posticon.'" alt="" /></a>';
         } else {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/icons/posticon.gif" alt="" /></a>';
+            $post_image = '<a name="'.$post_id.'"><img src="'.XOOPS_URL.'/images/icons/posticon.gif" alt="" /></a>';
         }
 
         $thread_buttons = [];
@@ -557,10 +557,10 @@ 
         if ($isAdmin && ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->getVar('uid') !== $this->getVar('uid'))
             && $this->getVar('uid') > 0) {
             $mod_buttons['bann']['image']    = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $mod_buttons['bann']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+            $mod_buttons['bann']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/moderate.php?forum='.$forum_id.'&amp;uid='.$this->getVar('uid');
             $mod_buttons['bann']['name']     = _MD_NEWBB_SUSPEND_MANAGEMENT;
             $thread_buttons['bann']['image'] = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $thread_buttons['bann']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+            $thread_buttons['bann']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/moderate.php?forum='.$forum_id.'&amp;uid='.$this->getVar('uid');
             $thread_buttons['bann']['name']  = _MD_NEWBB_SUSPEND_MANAGEMENT;
         }
 
@@ -573,10 +573,10 @@ 
 
                 if ($edit_ok) {
                     $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-                    $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+                    $thread_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
                     $thread_buttons['edit']['name']  = _EDIT;
                     $mod_buttons['edit']['image']    = newbbDisplayImage('p_edit', _EDIT);
-                    $mod_buttons['edit']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+                    $mod_buttons['edit']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
                     $mod_buttons['edit']['name']     = _EDIT;
                 }
             }
@@ -586,55 +586,55 @@ 
 
                 if ($delete_ok) {
                     $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-                    $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+                    $thread_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
                     $thread_buttons['delete']['name']  = _DELETE;
                     $mod_buttons['delete']['image']    = newbbDisplayImage('p_delete', _DELETE);
-                    $mod_buttons['delete']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+                    $mod_buttons['delete']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
                     $mod_buttons['delete']['name']     = _DELETE;
                 }
             }
             if ($topicHandler->getPermission($forum_id, $topic_status, 'reply')) {
                 $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-                $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+                $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}";
                 $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
 
                 $thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
-                $thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}&amp;quotedac=1";
+                $thread_buttons['quote']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}&amp;quotedac=1";
                 $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
             }
         } else {
             $mod_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $mod_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+            $mod_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
             $mod_buttons['edit']['name']  = _EDIT;
 
             $mod_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $mod_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+            $mod_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
             $mod_buttons['delete']['name']  = _DELETE;
 
             $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+            $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}";
             $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
         }
 
         if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
             $thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
-            $thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/report.php?{$page_query}";
+            $thread_buttons['report']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/report.php?{$page_query}";
             $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
         }
 
         $thread_action = [];
         // irmtfan add pdf permission
-        if (file_exists(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
+        if (file_exists(XOOPS_ROOT_PATH.'/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
             && $topicHandler->getPermission($forum_id, $topic_status, 'pdf')) {
             $thread_action['pdf']['image']  = newbbDisplayImage('pdf', _MD_NEWBB_PDF);
-            $thread_action['pdf']['link']   = XOOPS_URL . '/modules/newbb/makepdf.php?type=post&amp;pageid=0';
+            $thread_action['pdf']['link']   = XOOPS_URL.'/modules/newbb/makepdf.php?type=post&amp;pageid=0';
             $thread_action['pdf']['name']   = _MD_NEWBB_PDF;
             $thread_action['pdf']['target'] = '_blank';
         }
         // irmtfan add print permission
         if ($topicHandler->getPermission($forum_id, $topic_status, 'print')) {
             $thread_action['print']['image']  = newbbDisplayImage('printer', _MD_NEWBB_PRINT);
-            $thread_action['print']['link']   = XOOPS_URL . '/modules/newbb/print.php?form=2&amp;forum=' . $forum_id . '&amp;topic_id=' . $topic_id;
+            $thread_action['print']['link']   = XOOPS_URL.'/modules/newbb/print.php?form=2&amp;forum='.$forum_id.'&amp;topic_id='.$topic_id;
             $thread_action['print']['name']   = _MD_NEWBB_PRINT;
             $thread_action['print']['target'] = '_blank';
         }
@@ -642,45 +642,45 @@ 
         if ($GLOBALS['xoopsModuleConfig']['show_sociallinks']) {
             $full_title  = $this->getVar('subject');
             $clean_title = preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
-            $full_link   = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+            $full_link   = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post_id;
 
             $thread_action['social_twitter']['image']  = newbbDisplayImage('twitter', _MD_NEWBB_SHARE_TWITTER);
-            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text=' . $clean_title . '&amp;url=' . $full_link;
+            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text='.$clean_title.'&amp;url='.$full_link;
             $thread_action['social_twitter']['name']   = _MD_NEWBB_SHARE_TWITTER;
             $thread_action['social_twitter']['target'] = '_blank';
 
             $thread_action['social_facebook']['image']  = newbbDisplayImage('facebook', _MD_NEWBB_SHARE_FACEBOOK);
-            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u=' . $full_link;
+            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u='.$full_link;
             $thread_action['social_facebook']['name']   = _MD_NEWBB_SHARE_FACEBOOK;
             $thread_action['social_facebook']['target'] = '_blank';
 
             $thread_action['social_gplus']['image']  = newbbDisplayImage('googleplus', _MD_NEWBB_SHARE_GOOGLEPLUS);
-            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url=' . $full_link;
+            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url='.$full_link;
             $thread_action['social_gplus']['name']   = _MD_NEWBB_SHARE_GOOGLEPLUS;
             $thread_action['social_gplus']['target'] = '_blank';
 
             $thread_action['social_linkedin']['image']  = newbbDisplayImage('linkedin', _MD_NEWBB_SHARE_LINKEDIN);
-            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_linkedin']['name']   = _MD_NEWBB_SHARE_LINKEDIN;
             $thread_action['social_linkedin']['target'] = '_blank';
 
             $thread_action['social_delicious']['image']  = newbbDisplayImage('delicious', _MD_NEWBB_SHARE_DELICIOUS);
-            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_delicious']['name']   = _MD_NEWBB_SHARE_DELICIOUS;
             $thread_action['social_delicious']['target'] = '_blank';
 
             $thread_action['social_digg']['image']  = newbbDisplayImage('digg', _MD_NEWBB_SHARE_DIGG);
-            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_digg']['name']   = _MD_NEWBB_SHARE_DIGG;
             $thread_action['social_digg']['target'] = '_blank';
 
             $thread_action['social_reddit']['image']  = newbbDisplayImage('reddit', _MD_NEWBB_SHARE_REDDIT);
-            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_reddit']['name']   = _MD_NEWBB_SHARE_REDDIT;
             $thread_action['social_reddit']['target'] = '_blank';
 
             $thread_action['social_wong']['image']  = newbbDisplayImage('wong', _MD_NEWBB_SHARE_MRWONG);
-            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url=' . $full_link;
+            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url='.$full_link;
             $thread_action['social_wong']['name']   = _MD_NEWBB_SHARE_MRWONG;
             $thread_action['social_wong']['target'] = '_blank';
         }
@@ -704,7 +704,7 @@ 
             'thread_buttons'  => $thread_buttons,
             'mod_buttons'     => $mod_buttons,
             'poster'          => $poster,
-            'post_permalink'  => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '"></a>'
+            'post_permalink'  => '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?post_id='.$post_id.'"></a>'
         ];
 
         unset($thread_buttons, $mod_buttons, $eachposter);

class/PermissionCategoryHandler.php

Indentation +71 added lines, -71 removed lines

@@ -23,82 +23,82 @@
  */
 class PermissionCategoryHandler extends Newbb\PermissionHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        //        $this->PermissionHandler($db);
-        parent::__construct($db);
-    }
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		//        $this->PermissionHandler($db);
+		parent::__construct($db);
+	}
 
-    /**
-     * @param        $mid
-     * @param  int   $id
-     * @return array
-     */
-    public function getValidItems($mid, $id = 0)
-    {
-        $full_items = [];
-        if (empty($mid)) {
-            return $full_items;
-        }
+	/**
+	 * @param        $mid
+	 * @param  int   $id
+	 * @return array
+	 */
+	public function getValidItems($mid, $id = 0)
+	{
+		$full_items = [];
+		if (empty($mid)) {
+			return $full_items;
+		}
 
-        $full_items[] = "'category_access'";
+		$full_items[] = "'category_access'";
 
-        return $full_items;
-    }
+		return $full_items;
+	}
 
-    /**
-     * @param $cat_id
-     * @return bool
-     */
-    public function deleteByCategory($cat_id)
-    {
-        $cat_id = (int)$cat_id;
-        if (empty($cat_id)) {
-            return false;
-        }
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-        $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
-        $criteria->add(new \Criteria('gperm_name', 'category_access'));
-        $criteria->add(new \Criteria('gperm_itemid', $cat_id));
+	/**
+	 * @param $cat_id
+	 * @return bool
+	 */
+	public function deleteByCategory($cat_id)
+	{
+		$cat_id = (int)$cat_id;
+		if (empty($cat_id)) {
+			return false;
+		}
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+		$criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
+		$criteria->add(new \Criteria('gperm_name', 'category_access'));
+		$criteria->add(new \Criteria('gperm_itemid', $cat_id));
 
-        return $grouppermHandler->deleteAll($criteria);
-    }
+		return $grouppermHandler->deleteAll($criteria);
+	}
 
-    /**
-     * @param        $category
-     * @param  array $groups
-     * @return bool
-     */
-    public function setCategoryPermission($category, array $groups = [])
-    {
-        if (is_object($GLOBALS['xoopsModule']) && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
-            $mid = $GLOBALS['xoopsModule']->getVar('mid');
-        } else {
-            /** @var \XoopsModuleHandler $moduleHandler */
-            $moduleHandler = xoops_getHandler('module');
-            $newbb         = $moduleHandler->getByDirname('newbb');
-            $mid           = $newbb->getVar('mid');
-        }
-        if (empty($groups)) {
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $glist         = $memberHandler->getGroupList();
-            $groups        = array_keys($glist);
-        }
-        $ids     = $this->getGroupIds('category_access', $category, $mid);
-        $ids_add = array_diff($groups, $ids);
-        $ids_rmv = array_diff($ids, $groups);
-        foreach ($ids_add as $group) {
-            $this->addRight('category_access', $category, $group, $mid);
-        }
-        foreach ($ids_rmv as $group) {
-            $this->deleteRight('category_access', $category, $group, $mid);
-        }
+	/**
+	 * @param        $category
+	 * @param  array $groups
+	 * @return bool
+	 */
+	public function setCategoryPermission($category, array $groups = [])
+	{
+		if (is_object($GLOBALS['xoopsModule']) && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
+			$mid = $GLOBALS['xoopsModule']->getVar('mid');
+		} else {
+			/** @var \XoopsModuleHandler $moduleHandler */
+			$moduleHandler = xoops_getHandler('module');
+			$newbb         = $moduleHandler->getByDirname('newbb');
+			$mid           = $newbb->getVar('mid');
+		}
+		if (empty($groups)) {
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$glist         = $memberHandler->getGroupList();
+			$groups        = array_keys($glist);
+		}
+		$ids     = $this->getGroupIds('category_access', $category, $mid);
+		$ids_add = array_diff($groups, $ids);
+		$ids_rmv = array_diff($ids, $groups);
+		foreach ($ids_add as $group) {
+			$this->addRight('category_access', $category, $group, $mid);
+		}
+		foreach ($ids_rmv as $group) {
+			$this->deleteRight('category_access', $category, $group, $mid);
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -55,13 +55,13 @@
      */
     public function deleteByCategory($cat_id)
     {
-        $cat_id = (int)$cat_id;
+        $cat_id = (int) $cat_id;
         if (empty($cat_id)) {
             return false;
         }
         /** @var \XoopsGroupPermHandler $grouppermHandler */
         $grouppermHandler = xoops_getHandler('groupperm');
-        $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
+        $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
         $criteria->add(new \Criteria('gperm_name', 'category_access'));
         $criteria->add(new \Criteria('gperm_itemid', $cat_id));
 

class/RateHandler.php

Indentation +26 added lines, -26 removed lines

@@ -39,32 +39,32 @@
  */
 class RateHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_votedata', Rate::class, 'ratingid', '');
-    }
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_votedata', Rate::class, 'ratingid', '');
+	}
 
-    /**
-     *
-     */
-    public function synchronization()
-    {
-        //        return;
-    }
+	/**
+	 *
+	 */
+	public function synchronization()
+	{
+		//        return;
+	}
 
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        return parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
-    }
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		return parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
+	}
 }

class/UserstatsHandler.php

Indentation +62 added lines, -62 removed lines

@@ -20,47 +20,47 @@ 
  */
 class UserstatsHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_user_stats', Userstats::class, 'uid', '');
-    }
-
-    /**
-     * @param  null $db
-     * @return UserstatsHandler
-     */
-    public static function getInstance($db = null)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($db);
-        }
-
-        return $instance;
-    }
-
-    /**
-     * @param  mixed $id
-     * @param  null  $fields
-     * @return null|\XoopsObject
-     */
-    public function get($id = null, $fields = null) //get($id)
-    {
-        $object = null;
-        if (!$id = (int)$id) {
-            return $object;
-        }
-        $object = $this->create(false);
-        $object->setVar($this->keyName, $id);
-        if (!$row = $this->getStats($id)) {
-            return $object;
-        }
-        $object->assignVars($row);
-
-        /*
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_user_stats', Userstats::class, 'uid', '');
+	}
+
+	/**
+	 * @param  null $db
+	 * @return UserstatsHandler
+	 */
+	public static function getInstance($db = null)
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($db);
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * @param  mixed $id
+	 * @param  null  $fields
+	 * @return null|\XoopsObject
+	 */
+	public function get($id = null, $fields = null) //get($id)
+	{
+		$object = null;
+		if (!$id = (int)$id) {
+			return $object;
+		}
+		$object = $this->create(false);
+		$object->setVar($this->keyName, $id);
+		if (!$row = $this->getStats($id)) {
+			return $object;
+		}
+		$object->assignVars($row);
+
+		/*
         $sql = "SELECT * FROM " . $this->table . " WHERE ".$this->keyName." = " . $id;
         if (!$result = $this->db->query($sql)) {
             return $object;
@@ -70,27 +70,27 @@ 
         }
         */
 
-        return $object;
-    }
-
-    /**
-     * @param $id
-     * @return null|array
-     */
-    public function getStats($id)
-    {
-        if (empty($id)) {
-            return null;
-        }
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->keyName . ' = ' . (int)$id;
-        if (!$result = $this->db->query($sql)) {
-            return null;
-        }
-        $row = $this->db->fetchArray($result);
-
-        return $row;
-    }
-    /*
+		return $object;
+	}
+
+	/**
+	 * @param $id
+	 * @return null|array
+	 */
+	public function getStats($id)
+	{
+		if (empty($id)) {
+			return null;
+		}
+		$sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->keyName . ' = ' . (int)$id;
+		if (!$result = $this->db->query($sql)) {
+			return null;
+		}
+		$row = $this->db->fetchArray($result);
+
+		return $row;
+	}
+	/*
         function insert(\XoopsObject $object, $force = true)
         {
             if (!$object->isDirty()) {

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     public function get($id = null, $fields = null) //get($id)
     {
         $object = null;
-        if (!$id = (int)$id) {
+        if (!$id = (int) $id) {
             return $object;
         }
         $object = $this->create(false);
@@ -82,7 +82,7 @@ 
         if (empty($id)) {
             return null;
         }
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->keyName . ' = ' . (int)$id;
+        $sql = 'SELECT * FROM '.$this->table.' WHERE '.$this->keyName.' = '.(int) $id;
         if (!$result = $this->db->query($sql)) {
             return null;
         }

class/PermissionHandler.php

Indentation +398 added lines, -398 removed lines

@@ -19,7 +19,7 @@ 
 
 // Initializing XoopsGroupPermHandler if not loaded yet
 if (!class_exists('XoopsGroupPermHandler')) {
-    require_once $GLOBALS['xoops']->path('kernel/groupperm.php');
+	require_once $GLOBALS['xoops']->path('kernel/groupperm.php');
 }
 
 /**
@@ -27,402 +27,402 @@ 
  */
 class PermissionHandler extends \XoopsGroupPermHandler
 {
-    /** @var \Xmf\Module\Helper\Cache */
-    protected $cacheHelper;
-
-    /** @var array */
-    private $_handler;
-
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        $this->cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-
-        $this->db = $db;
-        parent::__construct($db);
-    }
-
-    /**
-     * @param $name
-     * @return mixed
-     */
-    public function loadHandler($name)
-    {
-        if (!isset($this->_handler[$name])) {
+	/** @var \Xmf\Module\Helper\Cache */
+	protected $cacheHelper;
+
+	/** @var array */
+	private $_handler;
+
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		$this->cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+
+		$this->db = $db;
+		parent::__construct($db);
+	}
+
+	/**
+	 * @param $name
+	 * @return mixed
+	 */
+	public function loadHandler($name)
+	{
+		if (!isset($this->_handler[$name])) {
 //            require_once __DIR__ . "/permission.{$name}.php";
-            $className             = '\\XoopsModules\\Newbb\\Permission' . ucfirst($name) . 'Handler';
-            $this->_handler[$name] = new $className($this->db);
-        }
-
-        return $this->_handler[$name];
-    }
-
-    /**
-     * @param  bool $fullname
-     * @return mixed
-     */
-    public function getValidForumPerms($fullname = false)
-    {
-        $handler = $this->loadHandler('forum');
-
-        return $handler->getValidPerms($fullname);
-    }
-
-    /**
-     * @param  int  $forum
-     * @param  bool $topic_locked
-     * @param  bool $isAdmin
-     * @return mixed
-     */
-    public function getPermissionTable($forum = 0, $topic_locked = false, $isAdmin = false)
-    {
-        $handler = $this->loadHandler('forum');
-        $perm    = $handler->getPermissionTable($forum, $topic_locked, $isAdmin);
-
-        return $perm;
-    }
-
-    /**
-     * @param $forum_id
-     * @return mixed
-     */
-    public function deleteByForum($forum_id)
-    {
-        $this->cacheHelper->delete('permission_forum');
-        $handler = $this->loadHandler('forum');
-
-        return $handler->deleteByForum($forum_id);
-    }
-
-    /**
-     * @param $cat_id
-     * @return mixed
-     */
-    public function deleteByCategory($cat_id)
-    {
-        $this->cacheHelper->delete('permission_category');
-        $handler = $this->loadHandler('category');
-
-        return $handler->deleteByCategory($cat_id);
-    }
-
-    /**
-     * @param        $category
-     * @param  array $groups
-     * @return mixed
-     */
-    public function setCategoryPermission($category, array $groups = [])
-    {
-        $this->cacheHelper->delete('permission_category');
-        $handler = $this->loadHandler('category');
-
-        return $handler->setCategoryPermission($category, $groups);
-    }
-
-    /**
-     * @param         $type
-     * @param  string $gperm_name
-     * @param  int    $id
-     * @return bool
-     */
-    public function getPermission($type, $gperm_name = 'access', $id = 0)
-    {
-        global $xoopsModule;
-        $ret = false;
-        if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $xoopsModule->getVar('dirname')) {
-            $ret = true;
-        }
-
-        $groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : [XOOPS_GROUP_ANONYMOUS];
-        if (!$groups) {
-            $ret = false;
-        }
-        if (!$allowed_groups = $this->getGroups("{$type}_{$gperm_name}", $id)) {
-            $ret = false;
-        }
-
-        if (count(array_intersect($allowed_groups, $groups)) > 0) {
-            $ret = true;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param  string $perm_name
-     * @return array
-     */
-    public function &getCategories($perm_name = 'access')
-    {
-        $ret = $this->getAllowedItems('category', "category_{$perm_name}");
-
-        return $ret;
-    }
-
-    /**
-     * @param  string $perm_name
-     * @return array
-     */
-    public function getForums($perm_name = 'access')
-    {
-        $ret = $this->getAllowedItems('forum', "forum_{$perm_name}");
-
-        return $ret;
-    }
-
-    /**
-     * @param $type
-     * @param $perm_name
-     * @return array
-     */
-    public function getAllowedItems($type, $perm_name)
-    {
-        $ret = [];
-
-        $groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : [XOOPS_GROUP_ANONYMOUS];
-        if (count($groups) < 1) {
-            return $ret;
-        }
-
-        if (!$_cachedPerms = $this->loadPermData($perm_name, $type)) {
-            return $ret;
-        }
-
-        $allowed_items = [];
-        foreach ($_cachedPerms as $id => $allowed_groups) {
-            if (0 == $id || empty($allowed_groups)) {
-                continue;
-            }
-
-            if (array_intersect($groups, $allowed_groups)) {
-                $allowed_items[$id] = 1;
-            }
-        }
-        unset($_cachedPerms);
-        $ret = array_keys($allowed_items);
-
-        return $ret;
-    }
-
-    /**
-     * @param        $gperm_name
-     * @param  int   $id
-     * @return array
-     */
-    public function getGroups($gperm_name, $id = 0)
-    {
-        $_cachedPerms = $this->loadPermData($gperm_name);
-        $groups       = empty($_cachedPerms[$id]) ? [] : array_unique($_cachedPerms[$id]);
-        unset($_cachedPerms);
-
-        return $groups;
-    }
-
-    /**
-     * @param  string $perm_name
-     * @return array
-     */
-    public function createPermData($perm_name = 'forum_all')
-    {
-        global $xoopsModule;
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $perms = [];
-
-        if (is_object($xoopsModule) && 'newbb' === $xoopsModule->getVar('dirname')) {
-            $modid = $xoopsModule->getVar('mid');
-        } else {
-            $moduleHandler = xoops_getHandler('module');
-            $module        = $moduleHandler->getByDirname('newbb');
-            $modid         = $module->getVar('mid');
-            unset($module);
-        }
-
-        if (in_array($perm_name, ['forum_all', 'category_all'], true)) {
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $groups        = array_keys($memberHandler->getGroupList());
-
-            $type          = ('category_all' === $perm_name) ? 'category' : 'forum';
-            $objectHandler = Newbb\Helper::getInstance()->getHandler($type);
-            $object_ids    = $objectHandler->getIds();
-            foreach ($object_ids as $item_id) {
-                $perms[$perm_name][$item_id] = $groups;
-            }
-        } else {
-            $grouppermHandler = xoops_getHandler('groupperm');
-            $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $modid));
-            if (!empty($perm_name) && 'forum_all' !== $perm_name && 'category_all' !== $perm_name) {
-                $criteria->add(new \Criteria('gperm_name', $perm_name));
-            }
-            $permissions = $this->getObjects($criteria);
-
-            foreach ($permissions as $gperm) {
-                $item_id                                         = $gperm->getVar('gperm_itemid');
-                $group_id                                        = (int)$gperm->getVar('gperm_groupid');
-                $perms[$gperm->getVar('gperm_name')][$item_id][] = $group_id;
-            }
-        }
-        if (count($perms) > 0) {
-            foreach (array_keys($perms) as $perm) {
-                $this->cacheHelper->write("permission_{$perm}", $perms[$perm]);
-            }
-        }
-        $ret = !empty($perm_name) ? @$perms[$perm_name] : $perms;
-
-        return $ret;
-    }
-
-    /**
-     * @param  string $perm_name
-     * @return array|mixed|null
-     */
-    public function &loadPermData($perm_name = 'forum_access')
-    {
-        if (!$perms = $this->cacheHelper->read("permission_{$perm_name}")) {
-            $perms = $this->createPermData($perm_name);
-        }
-
-        return $perms;
-    }
-
-    /**
-     * @param       $perm
-     * @param       $itemid
-     * @param       $groupid
-     * @param  null $mid
-     * @return bool
-     */
-    public function validateRight($perm, $itemid, $groupid, $mid = null)
-    {
-        if (empty($mid)) {
-            if (is_object($GLOBALS['xoopsModule']) && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
-                $mid = $GLOBALS['xoopsModule']->getVar('mid');
-            } else {
-                /** @var \XoopsModuleHandler $moduleHandler */
-                $moduleHandler = xoops_getHandler('module');
-                $mod           = $moduleHandler->getByDirname('newbb');
-                $mid           = $mod->getVar('mid');
-                unset($mod);
-            }
-        }
-        if ($this->myCheckRight($perm, $itemid, $groupid, $mid)) {
-            return true;
-        }
-        $this->cacheHelper->delete('permission');
-        $this->addRight($perm, $itemid, $groupid, $mid);
-
-        return true;
-    }
-
-    /**
-     * Check permission (directly)
-     *
-     * @param string $gperm_name   Name of permission
-     * @param int    $gperm_itemid ID of an item
-     * @param        int           /array $gperm_groupid A group ID or an array of group IDs
-     * @param int    $gperm_modid  ID of a module
-     *
-     * @return bool TRUE if permission is enabled
-     */
-    public function myCheckRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid = 1)
-    {
-        $ret      = false;
-        $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $gperm_modid));
-        $criteria->add(new \Criteria('gperm_name', $gperm_name));
-        $gperm_itemid = (int)$gperm_itemid;
-        if ($gperm_itemid > 0) {
-            $criteria->add(new \Criteria('gperm_itemid', $gperm_itemid));
-        }
-        if (is_array($gperm_groupid)) {
-            $criteria2 = new \CriteriaCompo();
-            foreach ($gperm_groupid as $gid) {
-                $criteria2->add(new \Criteria('gperm_groupid', $gid), 'OR');
-            }
-            $criteria->add($criteria2);
-        } else {
-            $criteria->add(new \Criteria('gperm_groupid', $gperm_groupid));
-        }
-        if ($this->getCount($criteria) > 0) {
-            $ret = true;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param       $perm
-     * @param       $itemid
-     * @param       $groupid
-     * @param  null $mid
-     * @return bool
-     */
-    public function deleteRight($perm, $itemid, $groupid, $mid = null)
-    {
-        $this->cacheHelper->delete('permission');
-        if (null === $mid) {
-            if (is_object($GLOBALS['xoopsModule']) && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
-                $mid = $GLOBALS['xoopsModule']->getVar('mid');
-            } else {
-                /** @var \XoopsModuleHandler $moduleHandler */
-                $moduleHandler = xoops_getHandler('module');
-                $mod           = $moduleHandler->getByDirname('newbb');
-                $mid           = $mod->getVar('mid');
-                unset($mod);
-            }
-        }
-        if (is_callable('parent::deleteRight')) {
-            return parent::deleteRight($perm, $itemid, $groupid, $mid);
-        } else {
-            $criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
-            $criteria->add(new \Criteria('gperm_groupid', $groupid));
-            $criteria->add(new \Criteria('gperm_itemid', $itemid));
-            $criteria->add(new \Criteria('gperm_modid', $mid));
-            $permsObject = $this->getObjects($criteria);
-            if (!empty($permsObject)) {
-                foreach ($permsObject as $permObject) {
-                    $this->delete($permObject);
-                }
-            }
-            unset($criteria, $permsObject);
-        }
-
-        return true;
-    }
-
-    /**
-     * @param        $forum
-     * @param  int   $mid
-     * @return mixed
-     */
-    public function applyTemplate($forum, $mid = 0)
-    {
-        $this->cacheHelper->delete('permission_forum');
-        $handler = $this->loadHandler('forum');
-
-        return $handler->applyTemplate($forum, $mid);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getTemplate()
-    {
-        $handler  = $this->loadHandler('forum');
-        $template = $handler->getTemplate();
-
-        return $template;
-    }
-
-    /**
-     * @param $perms
-     * @return mixed
-     */
-    public function setTemplate($perms)
-    {
-        $handler = $this->loadHandler('forum');
-
-        return $handler->setTemplate($perms);
-    }
+			$className             = '\\XoopsModules\\Newbb\\Permission' . ucfirst($name) . 'Handler';
+			$this->_handler[$name] = new $className($this->db);
+		}
+
+		return $this->_handler[$name];
+	}
+
+	/**
+	 * @param  bool $fullname
+	 * @return mixed
+	 */
+	public function getValidForumPerms($fullname = false)
+	{
+		$handler = $this->loadHandler('forum');
+
+		return $handler->getValidPerms($fullname);
+	}
+
+	/**
+	 * @param  int  $forum
+	 * @param  bool $topic_locked
+	 * @param  bool $isAdmin
+	 * @return mixed
+	 */
+	public function getPermissionTable($forum = 0, $topic_locked = false, $isAdmin = false)
+	{
+		$handler = $this->loadHandler('forum');
+		$perm    = $handler->getPermissionTable($forum, $topic_locked, $isAdmin);
+
+		return $perm;
+	}
+
+	/**
+	 * @param $forum_id
+	 * @return mixed
+	 */
+	public function deleteByForum($forum_id)
+	{
+		$this->cacheHelper->delete('permission_forum');
+		$handler = $this->loadHandler('forum');
+
+		return $handler->deleteByForum($forum_id);
+	}
+
+	/**
+	 * @param $cat_id
+	 * @return mixed
+	 */
+	public function deleteByCategory($cat_id)
+	{
+		$this->cacheHelper->delete('permission_category');
+		$handler = $this->loadHandler('category');
+
+		return $handler->deleteByCategory($cat_id);
+	}
+
+	/**
+	 * @param        $category
+	 * @param  array $groups
+	 * @return mixed
+	 */
+	public function setCategoryPermission($category, array $groups = [])
+	{
+		$this->cacheHelper->delete('permission_category');
+		$handler = $this->loadHandler('category');
+
+		return $handler->setCategoryPermission($category, $groups);
+	}
+
+	/**
+	 * @param         $type
+	 * @param  string $gperm_name
+	 * @param  int    $id
+	 * @return bool
+	 */
+	public function getPermission($type, $gperm_name = 'access', $id = 0)
+	{
+		global $xoopsModule;
+		$ret = false;
+		if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $xoopsModule->getVar('dirname')) {
+			$ret = true;
+		}
+
+		$groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : [XOOPS_GROUP_ANONYMOUS];
+		if (!$groups) {
+			$ret = false;
+		}
+		if (!$allowed_groups = $this->getGroups("{$type}_{$gperm_name}", $id)) {
+			$ret = false;
+		}
+
+		if (count(array_intersect($allowed_groups, $groups)) > 0) {
+			$ret = true;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param  string $perm_name
+	 * @return array
+	 */
+	public function &getCategories($perm_name = 'access')
+	{
+		$ret = $this->getAllowedItems('category', "category_{$perm_name}");
+
+		return $ret;
+	}
+
+	/**
+	 * @param  string $perm_name
+	 * @return array
+	 */
+	public function getForums($perm_name = 'access')
+	{
+		$ret = $this->getAllowedItems('forum', "forum_{$perm_name}");
+
+		return $ret;
+	}
+
+	/**
+	 * @param $type
+	 * @param $perm_name
+	 * @return array
+	 */
+	public function getAllowedItems($type, $perm_name)
+	{
+		$ret = [];
+
+		$groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : [XOOPS_GROUP_ANONYMOUS];
+		if (count($groups) < 1) {
+			return $ret;
+		}
+
+		if (!$_cachedPerms = $this->loadPermData($perm_name, $type)) {
+			return $ret;
+		}
+
+		$allowed_items = [];
+		foreach ($_cachedPerms as $id => $allowed_groups) {
+			if (0 == $id || empty($allowed_groups)) {
+				continue;
+			}
+
+			if (array_intersect($groups, $allowed_groups)) {
+				$allowed_items[$id] = 1;
+			}
+		}
+		unset($_cachedPerms);
+		$ret = array_keys($allowed_items);
+
+		return $ret;
+	}
+
+	/**
+	 * @param        $gperm_name
+	 * @param  int   $id
+	 * @return array
+	 */
+	public function getGroups($gperm_name, $id = 0)
+	{
+		$_cachedPerms = $this->loadPermData($gperm_name);
+		$groups       = empty($_cachedPerms[$id]) ? [] : array_unique($_cachedPerms[$id]);
+		unset($_cachedPerms);
+
+		return $groups;
+	}
+
+	/**
+	 * @param  string $perm_name
+	 * @return array
+	 */
+	public function createPermData($perm_name = 'forum_all')
+	{
+		global $xoopsModule;
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$perms = [];
+
+		if (is_object($xoopsModule) && 'newbb' === $xoopsModule->getVar('dirname')) {
+			$modid = $xoopsModule->getVar('mid');
+		} else {
+			$moduleHandler = xoops_getHandler('module');
+			$module        = $moduleHandler->getByDirname('newbb');
+			$modid         = $module->getVar('mid');
+			unset($module);
+		}
+
+		if (in_array($perm_name, ['forum_all', 'category_all'], true)) {
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$groups        = array_keys($memberHandler->getGroupList());
+
+			$type          = ('category_all' === $perm_name) ? 'category' : 'forum';
+			$objectHandler = Newbb\Helper::getInstance()->getHandler($type);
+			$object_ids    = $objectHandler->getIds();
+			foreach ($object_ids as $item_id) {
+				$perms[$perm_name][$item_id] = $groups;
+			}
+		} else {
+			$grouppermHandler = xoops_getHandler('groupperm');
+			$criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $modid));
+			if (!empty($perm_name) && 'forum_all' !== $perm_name && 'category_all' !== $perm_name) {
+				$criteria->add(new \Criteria('gperm_name', $perm_name));
+			}
+			$permissions = $this->getObjects($criteria);
+
+			foreach ($permissions as $gperm) {
+				$item_id                                         = $gperm->getVar('gperm_itemid');
+				$group_id                                        = (int)$gperm->getVar('gperm_groupid');
+				$perms[$gperm->getVar('gperm_name')][$item_id][] = $group_id;
+			}
+		}
+		if (count($perms) > 0) {
+			foreach (array_keys($perms) as $perm) {
+				$this->cacheHelper->write("permission_{$perm}", $perms[$perm]);
+			}
+		}
+		$ret = !empty($perm_name) ? @$perms[$perm_name] : $perms;
+
+		return $ret;
+	}
+
+	/**
+	 * @param  string $perm_name
+	 * @return array|mixed|null
+	 */
+	public function &loadPermData($perm_name = 'forum_access')
+	{
+		if (!$perms = $this->cacheHelper->read("permission_{$perm_name}")) {
+			$perms = $this->createPermData($perm_name);
+		}
+
+		return $perms;
+	}
+
+	/**
+	 * @param       $perm
+	 * @param       $itemid
+	 * @param       $groupid
+	 * @param  null $mid
+	 * @return bool
+	 */
+	public function validateRight($perm, $itemid, $groupid, $mid = null)
+	{
+		if (empty($mid)) {
+			if (is_object($GLOBALS['xoopsModule']) && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
+				$mid = $GLOBALS['xoopsModule']->getVar('mid');
+			} else {
+				/** @var \XoopsModuleHandler $moduleHandler */
+				$moduleHandler = xoops_getHandler('module');
+				$mod           = $moduleHandler->getByDirname('newbb');
+				$mid           = $mod->getVar('mid');
+				unset($mod);
+			}
+		}
+		if ($this->myCheckRight($perm, $itemid, $groupid, $mid)) {
+			return true;
+		}
+		$this->cacheHelper->delete('permission');
+		$this->addRight($perm, $itemid, $groupid, $mid);
+
+		return true;
+	}
+
+	/**
+	 * Check permission (directly)
+	 *
+	 * @param string $gperm_name   Name of permission
+	 * @param int    $gperm_itemid ID of an item
+	 * @param        int           /array $gperm_groupid A group ID or an array of group IDs
+	 * @param int    $gperm_modid  ID of a module
+	 *
+	 * @return bool TRUE if permission is enabled
+	 */
+	public function myCheckRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid = 1)
+	{
+		$ret      = false;
+		$criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $gperm_modid));
+		$criteria->add(new \Criteria('gperm_name', $gperm_name));
+		$gperm_itemid = (int)$gperm_itemid;
+		if ($gperm_itemid > 0) {
+			$criteria->add(new \Criteria('gperm_itemid', $gperm_itemid));
+		}
+		if (is_array($gperm_groupid)) {
+			$criteria2 = new \CriteriaCompo();
+			foreach ($gperm_groupid as $gid) {
+				$criteria2->add(new \Criteria('gperm_groupid', $gid), 'OR');
+			}
+			$criteria->add($criteria2);
+		} else {
+			$criteria->add(new \Criteria('gperm_groupid', $gperm_groupid));
+		}
+		if ($this->getCount($criteria) > 0) {
+			$ret = true;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param       $perm
+	 * @param       $itemid
+	 * @param       $groupid
+	 * @param  null $mid
+	 * @return bool
+	 */
+	public function deleteRight($perm, $itemid, $groupid, $mid = null)
+	{
+		$this->cacheHelper->delete('permission');
+		if (null === $mid) {
+			if (is_object($GLOBALS['xoopsModule']) && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
+				$mid = $GLOBALS['xoopsModule']->getVar('mid');
+			} else {
+				/** @var \XoopsModuleHandler $moduleHandler */
+				$moduleHandler = xoops_getHandler('module');
+				$mod           = $moduleHandler->getByDirname('newbb');
+				$mid           = $mod->getVar('mid');
+				unset($mod);
+			}
+		}
+		if (is_callable('parent::deleteRight')) {
+			return parent::deleteRight($perm, $itemid, $groupid, $mid);
+		} else {
+			$criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
+			$criteria->add(new \Criteria('gperm_groupid', $groupid));
+			$criteria->add(new \Criteria('gperm_itemid', $itemid));
+			$criteria->add(new \Criteria('gperm_modid', $mid));
+			$permsObject = $this->getObjects($criteria);
+			if (!empty($permsObject)) {
+				foreach ($permsObject as $permObject) {
+					$this->delete($permObject);
+				}
+			}
+			unset($criteria, $permsObject);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param        $forum
+	 * @param  int   $mid
+	 * @return mixed
+	 */
+	public function applyTemplate($forum, $mid = 0)
+	{
+		$this->cacheHelper->delete('permission_forum');
+		$handler = $this->loadHandler('forum');
+
+		return $handler->applyTemplate($forum, $mid);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getTemplate()
+	{
+		$handler  = $this->loadHandler('forum');
+		$template = $handler->getTemplate();
+
+		return $template;
+	}
+
+	/**
+	 * @param $perms
+	 * @return mixed
+	 */
+	public function setTemplate($perms)
+	{
+		$handler = $this->loadHandler('forum');
+
+		return $handler->setTemplate($perms);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
     {
         if (!isset($this->_handler[$name])) {
 //            require_once __DIR__ . "/permission.{$name}.php";
-            $className             = '\\XoopsModules\\Newbb\\Permission' . ucfirst($name) . 'Handler';
+            $className             = '\\XoopsModules\\Newbb\\Permission'.ucfirst($name).'Handler';
             $this->_handler[$name] = new $className($this->db);
         }
 
@@ -252,7 +252,7 @@ 
             }
         } else {
             $grouppermHandler = xoops_getHandler('groupperm');
-            $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $modid));
+            $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $modid));
             if (!empty($perm_name) && 'forum_all' !== $perm_name && 'category_all' !== $perm_name) {
                 $criteria->add(new \Criteria('gperm_name', $perm_name));
             }
@@ -260,7 +260,7 @@ 
 
             foreach ($permissions as $gperm) {
                 $item_id                                         = $gperm->getVar('gperm_itemid');
-                $group_id                                        = (int)$gperm->getVar('gperm_groupid');
+                $group_id                                        = (int) $gperm->getVar('gperm_groupid');
                 $perms[$gperm->getVar('gperm_name')][$item_id][] = $group_id;
             }
         }
@@ -331,7 +331,7 @@ 
         $ret      = false;
         $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $gperm_modid));
         $criteria->add(new \Criteria('gperm_name', $gperm_name));
-        $gperm_itemid = (int)$gperm_itemid;
+        $gperm_itemid = (int) $gperm_itemid;
         if ($gperm_itemid > 0) {
             $criteria->add(new \Criteria('gperm_itemid', $gperm_itemid));
         }

class/ReportHandler.php

Indentation +100 added lines, -100 removed lines

@@ -19,114 +19,114 @@
  */
 class ReportHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_report', Report::class, 'report_id', '');
-    }
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_report', Report::class, 'report_id', '');
+	}
 
-    /**
-     * @param $posts
-     * @return array
-     */
-    public function getByPost($posts)
-    {
-        $ret = [];
-        if (!$posts) {
-            return $ret;
-        }
-        if (!is_array($posts)) {
-            $posts = [$posts];
-        }
-        $post_criteria = new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN');
-        $ret           = $this->getAll($post_criteria);
+	/**
+	 * @param $posts
+	 * @return array
+	 */
+	public function getByPost($posts)
+	{
+		$ret = [];
+		if (!$posts) {
+			return $ret;
+		}
+		if (!is_array($posts)) {
+			$posts = [$posts];
+		}
+		$post_criteria = new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN');
+		$ret           = $this->getAll($post_criteria);
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param  int|array    $forums
-     * @param  string $order
-     * @param  int    $perpage
-     * @param         $start
-     * @param  int    $report_result
-     * @param  int    $report_id
-     * @return array
-     */
-    public function getAllReports(
-        $forums = 0,
-        $order = 'ASC',
-        $perpage = 0,
-        &$start,
-        $report_result = 0,
-        $report_id = 0
-    ) {
-        $forumCriteria = '';
-        $row           = [];
-        if ('DESC' === $order) {
-            $operator_for_position = '>';
-        } else {
-            $order                 = 'ASC';
-            $operator_for_position = '<';
-        }
-        $order_criteria = " ORDER BY r.report_id $order";
+	/**
+	 * @param  int|array    $forums
+	 * @param  string $order
+	 * @param  int    $perpage
+	 * @param         $start
+	 * @param  int    $report_result
+	 * @param  int    $report_id
+	 * @return array
+	 */
+	public function getAllReports(
+		$forums = 0,
+		$order = 'ASC',
+		$perpage = 0,
+		&$start,
+		$report_result = 0,
+		$report_id = 0
+	) {
+		$forumCriteria = '';
+		$row           = [];
+		if ('DESC' === $order) {
+			$operator_for_position = '>';
+		} else {
+			$order                 = 'ASC';
+			$operator_for_position = '<';
+		}
+		$order_criteria = " ORDER BY r.report_id $order";
 
-        if ($perpage <= 0) {
-            $perpage = 10;
-        }
-        if (empty($start)) {
-            $start = 0;
-        }
-        $result_criteria = ' AND r.report_result = ' . $report_result;
+		if ($perpage <= 0) {
+			$perpage = 10;
+		}
+		if (empty($start)) {
+			$start = 0;
+		}
+		$result_criteria = ' AND r.report_result = ' . $report_result;
 
-        if ($forums) {
-            $forumCriteria = '';
-        } elseif (!is_array($forums)) {
-            $forums        = [$forums];
-            $forumCriteria = ' AND p.forum_id IN (' . implode(',', $forums) . ')';
-        }
-        $tables_criteria = ' FROM ' . $this->db->prefix('newbb_report') . ' r, ' . $this->db->prefix('newbb_posts') . ' p WHERE r.post_id= p.post_id';
+		if ($forums) {
+			$forumCriteria = '';
+		} elseif (!is_array($forums)) {
+			$forums        = [$forums];
+			$forumCriteria = ' AND p.forum_id IN (' . implode(',', $forums) . ')';
+		}
+		$tables_criteria = ' FROM ' . $this->db->prefix('newbb_report') . ' r, ' . $this->db->prefix('newbb_posts') . ' p WHERE r.post_id= p.post_id';
 
-        if ($report_id) {
-            $result = $this->db->query('SELECT COUNT(*) as report_count' . $tables_criteria . $forumCriteria . $result_criteria . " AND report_id $operator_for_position $report_id" . $order_criteria);
-            if ($result) {
-                $row = $this->db->fetchArray($result);
-            }
-            $position = $row['report_count'];
-            $start    = (int)($position / $perpage) * $perpage;
-        }
+		if ($report_id) {
+			$result = $this->db->query('SELECT COUNT(*) as report_count' . $tables_criteria . $forumCriteria . $result_criteria . " AND report_id $operator_for_position $report_id" . $order_criteria);
+			if ($result) {
+				$row = $this->db->fetchArray($result);
+			}
+			$position = $row['report_count'];
+			$start    = (int)($position / $perpage) * $perpage;
+		}
 
-        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id' . $tables_criteria . $forumCriteria . $result_criteria . $order_criteria;
-        $result = $this->db->query($sql, $perpage, $start);
-        $ret    = [];
-        //$reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $ret[] = $myrow; // return as array
-        }
+		$sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id' . $tables_criteria . $forumCriteria . $result_criteria . $order_criteria;
+		$result = $this->db->query($sql, $perpage, $start);
+		$ret    = [];
+		//$reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$ret[] = $myrow; // return as array
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     *
-     */
-    public function synchronization()
-    {
-        //        return;
-    }
+	/**
+	 *
+	 */
+	public function synchronization()
+	{
+		//        return;
+	}
 
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        return parent::cleanOrphan($this->db->prefix('newbb_posts'), 'post_id');
-    }
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		return parent::cleanOrphan($this->db->prefix('newbb_posts'), 'post_id');
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
         if (!is_array($posts)) {
             $posts = [$posts];
         }
-        $post_criteria = new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN');
+        $post_criteria = new \Criteria('post_id', '('.implode(', ', $posts).')', 'IN');
         $ret           = $this->getAll($post_criteria);
 
         return $ret;
@@ -79,26 +79,26 @@ 
         if (empty($start)) {
             $start = 0;
         }
-        $result_criteria = ' AND r.report_result = ' . $report_result;
+        $result_criteria = ' AND r.report_result = '.$report_result;
 
         if ($forums) {
             $forumCriteria = '';
         } elseif (!is_array($forums)) {
             $forums        = [$forums];
-            $forumCriteria = ' AND p.forum_id IN (' . implode(',', $forums) . ')';
+            $forumCriteria = ' AND p.forum_id IN ('.implode(',', $forums).')';
         }
-        $tables_criteria = ' FROM ' . $this->db->prefix('newbb_report') . ' r, ' . $this->db->prefix('newbb_posts') . ' p WHERE r.post_id= p.post_id';
+        $tables_criteria = ' FROM '.$this->db->prefix('newbb_report').' r, '.$this->db->prefix('newbb_posts').' p WHERE r.post_id= p.post_id';
 
         if ($report_id) {
-            $result = $this->db->query('SELECT COUNT(*) as report_count' . $tables_criteria . $forumCriteria . $result_criteria . " AND report_id $operator_for_position $report_id" . $order_criteria);
+            $result = $this->db->query('SELECT COUNT(*) as report_count'.$tables_criteria.$forumCriteria.$result_criteria." AND report_id $operator_for_position $report_id".$order_criteria);
             if ($result) {
                 $row = $this->db->fetchArray($result);
             }
             $position = $row['report_count'];
-            $start    = (int)($position / $perpage) * $perpage;
+            $start    = (int) ($position / $perpage) * $perpage;
         }
 
-        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id' . $tables_criteria . $forumCriteria . $result_criteria . $order_criteria;
+        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id'.$tables_criteria.$forumCriteria.$result_criteria.$order_criteria;
         $result = $this->db->query($sql, $perpage, $start);
         $ret    = [];
         //$reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');

class/PostHandler.php

Indentation +545 added lines, -545 removed lines

@@ -41,555 +41,555 @@
  */
 class PostHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_posts', Post::class, 'post_id', 'subject');
-    }
-
-    /**
-     * @param  mixed $id
-     * @param  null  $var
-     * @return null|\XoopsObject
-     */
-    public function get($id = null, $var = null) //get($id)
-    {
-        $id   = (int)$id;
-        $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
-        if ($array = $this->db->fetchArray($this->db->query($sql))) {
-            $post = $this->create(false);
-            $post->assignVars($array);
-        }
-
-        return $post;
-    }
-
-    /**
-     * @param  int             $limit
-     * @param  int             $start
-     * @param  \CriteriaElement $criteria
-     * @param  null            $fields
-     * @param  bool            $asObject
-     * @param  int             $topic_id
-     * @param  int             $approved
-     * @return array
-     */
-    //    public function getByLimit($topic_id, $limit, $approved = 1)
-    public function &getByLimit(
-        $limit = 0,
-        $start = 0,
-        \CriteriaElement $criteria = null,
-        $fields = null,
-        $asObject = true,
-        $topic_id = 0,
-        $approved = 1
-    ) {
-        $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
-                  . $this->db->prefix('newbb_posts')
-                  . ' p LEFT JOIN '
-                  . $this->db->prefix('newbb_posts_text')
-                  . ' t ON p.post_id=t.post_id LEFT JOIN '
-                  . $this->db->prefix('newbb_topics')
-                  . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
-                  . $topic_id
-                  . ' AND p.approved ='
-                  . $approved
-                  . ' ORDER BY p.post_time DESC';
-        $result = $this->db->query($sql, $limit, 0);
-        $ret    = [];
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $post = $this->create(false);
-            $post->assignVars($myrow);
-
-            $ret[$myrow['post_id']] = $post;
-            unset($post);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param Post $post
-     * @return mixed
-     */
-    public function getPostForPDF(&$post)
-    {
-        return $post->getPostBody(true);
-    }
-
-    /**
-     * @param Post $post
-     * @return mixed
-     */
-    public function getPostForPrint(&$post)
-    {
-        return $post->getPostBody();
-    }
-
-    /**
-     * @param  int|Post|\XoopsObject $post
-     * @param  bool $force
-     * @return bool
-     */
-    public function approve(&$post, $force = false)
-    {
-        if (empty($post)) {
-            return false;
-        }
-        if (is_numeric($post)) {
-            $post = $this->get($post);
-        }
-
-        $wasApproved = $post->getVar('approved');
-        // irmtfan approve post if the approved = 0 (pending) or -1 (deleted)
-        if (empty($force) && $wasApproved > 0) {
-            return true;
-        }
-        $post->setVar('approved', 1);
-        $this->insert($post, true);
-
-        /** @var Newbb\TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        $topicObject  = $topicHandler->get($post->getVar('topic_id'));
-        if ($topicObject->getVar('topic_last_post_id') < $post->getVar('post_id')) {
-            $topicObject->setVar('topic_last_post_id', $post->getVar('post_id'));
-        }
-        if ($post->isTopic()) {
-            $topicObject->setVar('approved', 1);
-        } else {
-            $topicObject->setVar('topic_replies', $topicObject->getVar('topic_replies') + 1);
-        }
-        $topicHandler->insert($topicObject, true);
-
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forumObject  = $forumHandler->get($post->getVar('forum_id'));
-        if ($forumObject->getVar('forum_last_post_id') < $post->getVar('post_id')) {
-            $forumObject->setVar('forum_last_post_id', $post->getVar('post_id'));
-        }
-        $forumObject->setVar('forum_posts', $forumObject->getVar('forum_posts') + 1);
-        if ($post->isTopic()) {
-            $forumObject->setVar('forum_topics', $forumObject->getVar('forum_topics') + 1);
-        }
-        $forumHandler->insert($forumObject, true);
-
-        // Update user stats
-        if ($post->getVar('uid') > 0) {
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $poster        = $memberHandler->getUser($post->getVar('uid'));
-            if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
-                $poster->setVar('posts', $poster->getVar('posts') + 1);
-                $res = $memberHandler->insertUser($poster, true);
-                unset($poster);
-            }
-        }
-
-        // Update forum stats
-        /** @var StatsHandler $statsHandler */
-        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-        $statsHandler->update($post->getVar('forum_id'), 'post');
-        if ($post->isTopic()) {
-            $statsHandler->update($post->getVar('forum_id'), 'topic');
-        }
-
-        return true;
-    }
-
-    /**
-     * @param \XoopsObject $post
-     * @param  bool        $force
-     * @return bool
-     */
-    public function insert(\XoopsObject $post, $force = true) //insert(&$post, $force = true)
-    {
-        $topicObject = null;
-        // Set the post time
-        // The time should be "publish" time. To be adjusted later
-        if (!$post->getVar('post_time')) {
-            $post->setVar('post_time', time());
-        }
-
-        /** @var Newbb\TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        // Verify the topic ID
-        if ($topic_id = $post->getVar('topic_id')) {
-            $topicObject = $topicHandler->get($topic_id);
-            // Invalid topic OR the topic is no approved and the post is not top post
-            if (!$topicObject//    || (!$post->isTopic() && $topicObject->getVar("approved") < 1)
-            ) {
-                return false;
-            }
-        }
-        if (empty($topic_id)) {
-            $post->setVar('topic_id', 0);
-            $post->setVar('pid', 0);
-            $post->setNew();
-            $topicObject = $topicHandler->create();
-        }
-        $textHandler    = Newbb\Helper::getInstance()->getHandler('Text');
-        $post_text_vars = ['post_text', 'post_edit', 'dohtml', 'doxcode', 'dosmiley', 'doimage', 'dobr'];
-        if ($post->isNew()) {
-            if (!$topic_id = $post->getVar('topic_id')) {
-                $topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
-                $topicObject->setVar('topic_poster', $post->getVar('uid'));
-                $topicObject->setVar('forum_id', $post->getVar('forum_id'));
-                $topicObject->setVar('topic_time', $post->getVar('post_time'));
-                $topicObject->setVar('poster_name', $post->getVar('poster_name'));
-                $topicObject->setVar('approved', $post->getVar('approved'));
-
-                if (!$topic_id = $topicHandler->insert($topicObject, $force)) {
-                    $post->deleteAttachment();
-                    $post->setErrors('insert topic error');
-
-                    //xoops_error($topicObject->getErrors());
-                    return false;
-                }
-                $post->setVar('topic_id', $topic_id);
-
-                $pid = 0;
-                $post->setVar('pid', 0);
-            } elseif (!$post->getVar('pid')) {
-                $pid = $topicHandler->getTopPostId($topic_id);
-                $post->setVar('pid', $pid);
-            }
-
-            $textObject = $textHandler->create();
-            foreach ($post_text_vars as $key) {
-                $textObject->vars[$key] = $post->vars[$key];
-            }
-            $post->destroyVars($post_text_vars);
-
-            //            if (!$post_id = parent::insert($post, $force)) {
-            //                return false;
-            //            }
-
-            if (!$post_id = parent::insert($post, $force)) {
-                return false;
-            } else {
-                $post->unsetNew();
-            }
-
-            $textObject->setVar('post_id', $post_id);
-            if (!$textHandler->insert($textObject, $force)) {
-                $this->delete($post);
-                $post->setErrors('post text insert error');
-
-                //xoops_error($textObject->getErrors());
-                return false;
-            }
-            if ($post->getVar('approved') > 0) {
-                $this->approve($post, true);
-            }
-            $post->setVar('post_id', $post_id);
-        } else {
-            if ($post->isTopic()) {
-                if ($post->getVar('subject') !== $topicObject->getVar('topic_title')) {
-                    $topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
-                }
-                if ($post->getVar('approved') !== $topicObject->getVar('approved')) {
-                    $topicObject->setVar('approved', $post->getVar('approved'));
-                }
-                $topicObject->setDirty();
-                if (!$result = $topicHandler->insert($topicObject, $force)) {
-                    $post->setErrors('update topic error');
-
-                    //xoops_error($topicObject->getErrors());
-                    return false;
-                }
-            }
-            $textObject = $textHandler->get($post->getVar('post_id'));
-            $textObject->setDirty();
-            foreach ($post_text_vars as $key) {
-                $textObject->vars[$key] = $post->vars[$key];
-            }
-            $post->destroyVars($post_text_vars);
-            if (!$post_id = parent::insert($post, $force)) {
-                //xoops_error($post->getErrors());
-                return false;
-            } else {
-                $post->unsetNew();
-            }
-            if (!$textHandler->insert($textObject, $force)) {
-                $post->setErrors('update post text error');
-
-                //xoops_error($textObject->getErrors());
-                return false;
-            }
-        }
-
-        return $post->getVar('post_id');
-    }
-
-    /**
-     * @param \XoopsObject|Post $post
-     * @param  bool        $isDeleteOne
-     * @param  bool        $force
-     * @return bool
-     */
-    public function delete(\XoopsObject $post, $isDeleteOne = true, $force = false)
-    {
-        if (!is_object($post) || 0 == $post->getVar('post_id')) {
-            return false;
-        }
-
-        if ($isDeleteOne) {
-            if ($post->isTopic()) {
-                $criteria = new \CriteriaCompo(new \Criteria('topic_id', $post->getVar('topic_id')));
-                $criteria->add(new \Criteria('approved', 1));
-                $criteria->add(new \Criteria('pid', 0, '>'));
-                if ($this->getPostCount($criteria) > 0) {
-                    return false;
-                }
-            }
-
-            return $this->myDelete($post, $force);
-        } else {
-            require_once $GLOBALS['xoops']->path('class/xoopstree.php');
-            $mytree = new \XoopsTree($this->db->prefix('newbb_posts'), 'post_id', 'pid');
-            $arr    = $mytree->getAllChild($post->getVar('post_id'));
-            // irmtfan - delete childs in a reverse order
-            for ($i = count($arr) - 1; $i >= 0; $i--) {
-                $childpost = $this->create(false);
-                $childpost->assignVars($arr[$i]);
-                $this->myDelete($childpost, $force);
-                unset($childpost);
-            }
-            $this->myDelete($post, $force);
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  Post|\XoopsObject $post
-     * @param  bool $force
-     * @return bool
-     */
-    public function myDelete(Post $post, $force = false)
-    {
-        global $xoopsModule;
-
-        if (!is_object($post) || 0 == $post->getVar('post_id')) {
-            return false;
-        }
-
-        /* Set active post as deleted */
-        if ($post->getVar('approved') > 0 && empty($force)) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
-            if (!$result = $this->db->queryF($sql)) {
-            }
-            /* delete pending post directly */
-        } else {
-            $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
-            if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('delete post error: ' . $sql);
-
-                return false;
-            }
-            $post->deleteAttachment();
-
-            $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
-            if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('Could not remove post text: ' . $sql);
-
-                return false;
-            }
-        }
-
-        if ($post->isTopic()) {
-            $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-            /** @var Topic $topicObject */
-            $topicObject = $topicHandler->get($post->getVar('topic_id'));
-            if (is_object($topicObject) && $topicObject->getVar('approved') > 0 && empty($force)) {
-                $topiccount_toupdate = 1;
-                $topicObject->setVar('approved', -1);
-                $topicHandler->insert($topicObject);
-                xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
-            } else {
-                if (is_object($topicObject)) {
-                    if ($topicObject->getVar('approved') > 0) {
-                        xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
-                    }
-
-                    $poll_id = $topicObject->getVar('poll_id');
-                    // START irmtfan poll_module
-                    $topicObject->deletePoll($poll_id);
-                    // END irmtfan poll_module
-                }
-
-                $sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_topics'), $post->getVar('topic_id'));
-                if (!$result = $this->db->queryF($sql)) {
-                    //xoops_error($this->db->error());
-                }
-                $sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_votedata'), $post->getVar('topic_id'));
-                if (!$result = $this->db->queryF($sql)) {
-                    //xoops_error($this->db->error());
-                }
-            }
-        } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_posts', Post::class, 'post_id', 'subject');
+	}
+
+	/**
+	 * @param  mixed $id
+	 * @param  null  $var
+	 * @return null|\XoopsObject
+	 */
+	public function get($id = null, $var = null) //get($id)
+	{
+		$id   = (int)$id;
+		$post = null;
+		$sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
+		if ($array = $this->db->fetchArray($this->db->query($sql))) {
+			$post = $this->create(false);
+			$post->assignVars($array);
+		}
+
+		return $post;
+	}
+
+	/**
+	 * @param  int             $limit
+	 * @param  int             $start
+	 * @param  \CriteriaElement $criteria
+	 * @param  null            $fields
+	 * @param  bool            $asObject
+	 * @param  int             $topic_id
+	 * @param  int             $approved
+	 * @return array
+	 */
+	//    public function getByLimit($topic_id, $limit, $approved = 1)
+	public function &getByLimit(
+		$limit = 0,
+		$start = 0,
+		\CriteriaElement $criteria = null,
+		$fields = null,
+		$asObject = true,
+		$topic_id = 0,
+		$approved = 1
+	) {
+		$sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
+				  . $this->db->prefix('newbb_posts')
+				  . ' p LEFT JOIN '
+				  . $this->db->prefix('newbb_posts_text')
+				  . ' t ON p.post_id=t.post_id LEFT JOIN '
+				  . $this->db->prefix('newbb_topics')
+				  . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
+				  . $topic_id
+				  . ' AND p.approved ='
+				  . $approved
+				  . ' ORDER BY p.post_time DESC';
+		$result = $this->db->query($sql, $limit, 0);
+		$ret    = [];
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$post = $this->create(false);
+			$post->assignVars($myrow);
+
+			$ret[$myrow['post_id']] = $post;
+			unset($post);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param Post $post
+	 * @return mixed
+	 */
+	public function getPostForPDF(&$post)
+	{
+		return $post->getPostBody(true);
+	}
+
+	/**
+	 * @param Post $post
+	 * @return mixed
+	 */
+	public function getPostForPrint(&$post)
+	{
+		return $post->getPostBody();
+	}
+
+	/**
+	 * @param  int|Post|\XoopsObject $post
+	 * @param  bool $force
+	 * @return bool
+	 */
+	public function approve(&$post, $force = false)
+	{
+		if (empty($post)) {
+			return false;
+		}
+		if (is_numeric($post)) {
+			$post = $this->get($post);
+		}
+
+		$wasApproved = $post->getVar('approved');
+		// irmtfan approve post if the approved = 0 (pending) or -1 (deleted)
+		if (empty($force) && $wasApproved > 0) {
+			return true;
+		}
+		$post->setVar('approved', 1);
+		$this->insert($post, true);
+
+		/** @var Newbb\TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		$topicObject  = $topicHandler->get($post->getVar('topic_id'));
+		if ($topicObject->getVar('topic_last_post_id') < $post->getVar('post_id')) {
+			$topicObject->setVar('topic_last_post_id', $post->getVar('post_id'));
+		}
+		if ($post->isTopic()) {
+			$topicObject->setVar('approved', 1);
+		} else {
+			$topicObject->setVar('topic_replies', $topicObject->getVar('topic_replies') + 1);
+		}
+		$topicHandler->insert($topicObject, true);
+
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forumObject  = $forumHandler->get($post->getVar('forum_id'));
+		if ($forumObject->getVar('forum_last_post_id') < $post->getVar('post_id')) {
+			$forumObject->setVar('forum_last_post_id', $post->getVar('post_id'));
+		}
+		$forumObject->setVar('forum_posts', $forumObject->getVar('forum_posts') + 1);
+		if ($post->isTopic()) {
+			$forumObject->setVar('forum_topics', $forumObject->getVar('forum_topics') + 1);
+		}
+		$forumHandler->insert($forumObject, true);
+
+		// Update user stats
+		if ($post->getVar('uid') > 0) {
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$poster        = $memberHandler->getUser($post->getVar('uid'));
+			if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
+				$poster->setVar('posts', $poster->getVar('posts') + 1);
+				$res = $memberHandler->insertUser($poster, true);
+				unset($poster);
+			}
+		}
+
+		// Update forum stats
+		/** @var StatsHandler $statsHandler */
+		$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+		$statsHandler->update($post->getVar('forum_id'), 'post');
+		if ($post->isTopic()) {
+			$statsHandler->update($post->getVar('forum_id'), 'topic');
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param \XoopsObject $post
+	 * @param  bool        $force
+	 * @return bool
+	 */
+	public function insert(\XoopsObject $post, $force = true) //insert(&$post, $force = true)
+	{
+		$topicObject = null;
+		// Set the post time
+		// The time should be "publish" time. To be adjusted later
+		if (!$post->getVar('post_time')) {
+			$post->setVar('post_time', time());
+		}
+
+		/** @var Newbb\TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		// Verify the topic ID
+		if ($topic_id = $post->getVar('topic_id')) {
+			$topicObject = $topicHandler->get($topic_id);
+			// Invalid topic OR the topic is no approved and the post is not top post
+			if (!$topicObject//    || (!$post->isTopic() && $topicObject->getVar("approved") < 1)
+			) {
+				return false;
+			}
+		}
+		if (empty($topic_id)) {
+			$post->setVar('topic_id', 0);
+			$post->setVar('pid', 0);
+			$post->setNew();
+			$topicObject = $topicHandler->create();
+		}
+		$textHandler    = Newbb\Helper::getInstance()->getHandler('Text');
+		$post_text_vars = ['post_text', 'post_edit', 'dohtml', 'doxcode', 'dosmiley', 'doimage', 'dobr'];
+		if ($post->isNew()) {
+			if (!$topic_id = $post->getVar('topic_id')) {
+				$topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
+				$topicObject->setVar('topic_poster', $post->getVar('uid'));
+				$topicObject->setVar('forum_id', $post->getVar('forum_id'));
+				$topicObject->setVar('topic_time', $post->getVar('post_time'));
+				$topicObject->setVar('poster_name', $post->getVar('poster_name'));
+				$topicObject->setVar('approved', $post->getVar('approved'));
+
+				if (!$topic_id = $topicHandler->insert($topicObject, $force)) {
+					$post->deleteAttachment();
+					$post->setErrors('insert topic error');
+
+					//xoops_error($topicObject->getErrors());
+					return false;
+				}
+				$post->setVar('topic_id', $topic_id);
+
+				$pid = 0;
+				$post->setVar('pid', 0);
+			} elseif (!$post->getVar('pid')) {
+				$pid = $topicHandler->getTopPostId($topic_id);
+				$post->setVar('pid', $pid);
+			}
+
+			$textObject = $textHandler->create();
+			foreach ($post_text_vars as $key) {
+				$textObject->vars[$key] = $post->vars[$key];
+			}
+			$post->destroyVars($post_text_vars);
+
+			//            if (!$post_id = parent::insert($post, $force)) {
+			//                return false;
+			//            }
+
+			if (!$post_id = parent::insert($post, $force)) {
+				return false;
+			} else {
+				$post->unsetNew();
+			}
+
+			$textObject->setVar('post_id', $post_id);
+			if (!$textHandler->insert($textObject, $force)) {
+				$this->delete($post);
+				$post->setErrors('post text insert error');
+
+				//xoops_error($textObject->getErrors());
+				return false;
+			}
+			if ($post->getVar('approved') > 0) {
+				$this->approve($post, true);
+			}
+			$post->setVar('post_id', $post_id);
+		} else {
+			if ($post->isTopic()) {
+				if ($post->getVar('subject') !== $topicObject->getVar('topic_title')) {
+					$topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
+				}
+				if ($post->getVar('approved') !== $topicObject->getVar('approved')) {
+					$topicObject->setVar('approved', $post->getVar('approved'));
+				}
+				$topicObject->setDirty();
+				if (!$result = $topicHandler->insert($topicObject, $force)) {
+					$post->setErrors('update topic error');
+
+					//xoops_error($topicObject->getErrors());
+					return false;
+				}
+			}
+			$textObject = $textHandler->get($post->getVar('post_id'));
+			$textObject->setDirty();
+			foreach ($post_text_vars as $key) {
+				$textObject->vars[$key] = $post->vars[$key];
+			}
+			$post->destroyVars($post_text_vars);
+			if (!$post_id = parent::insert($post, $force)) {
+				//xoops_error($post->getErrors());
+				return false;
+			} else {
+				$post->unsetNew();
+			}
+			if (!$textHandler->insert($textObject, $force)) {
+				$post->setErrors('update post text error');
+
+				//xoops_error($textObject->getErrors());
+				return false;
+			}
+		}
+
+		return $post->getVar('post_id');
+	}
+
+	/**
+	 * @param \XoopsObject|Post $post
+	 * @param  bool        $isDeleteOne
+	 * @param  bool        $force
+	 * @return bool
+	 */
+	public function delete(\XoopsObject $post, $isDeleteOne = true, $force = false)
+	{
+		if (!is_object($post) || 0 == $post->getVar('post_id')) {
+			return false;
+		}
+
+		if ($isDeleteOne) {
+			if ($post->isTopic()) {
+				$criteria = new \CriteriaCompo(new \Criteria('topic_id', $post->getVar('topic_id')));
+				$criteria->add(new \Criteria('approved', 1));
+				$criteria->add(new \Criteria('pid', 0, '>'));
+				if ($this->getPostCount($criteria) > 0) {
+					return false;
+				}
+			}
+
+			return $this->myDelete($post, $force);
+		} else {
+			require_once $GLOBALS['xoops']->path('class/xoopstree.php');
+			$mytree = new \XoopsTree($this->db->prefix('newbb_posts'), 'post_id', 'pid');
+			$arr    = $mytree->getAllChild($post->getVar('post_id'));
+			// irmtfan - delete childs in a reverse order
+			for ($i = count($arr) - 1; $i >= 0; $i--) {
+				$childpost = $this->create(false);
+				$childpost->assignVars($arr[$i]);
+				$this->myDelete($childpost, $force);
+				unset($childpost);
+			}
+			$this->myDelete($post, $force);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param  Post|\XoopsObject $post
+	 * @param  bool $force
+	 * @return bool
+	 */
+	public function myDelete(Post $post, $force = false)
+	{
+		global $xoopsModule;
+
+		if (!is_object($post) || 0 == $post->getVar('post_id')) {
+			return false;
+		}
+
+		/* Set active post as deleted */
+		if ($post->getVar('approved') > 0 && empty($force)) {
+			$sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
+			if (!$result = $this->db->queryF($sql)) {
+			}
+			/* delete pending post directly */
+		} else {
+			$sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
+			if (!$result = $this->db->queryF($sql)) {
+				$post->setErrors('delete post error: ' . $sql);
+
+				return false;
+			}
+			$post->deleteAttachment();
+
+			$sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
+			if (!$result = $this->db->queryF($sql)) {
+				$post->setErrors('Could not remove post text: ' . $sql);
+
+				return false;
+			}
+		}
+
+		if ($post->isTopic()) {
+			$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+			/** @var Topic $topicObject */
+			$topicObject = $topicHandler->get($post->getVar('topic_id'));
+			if (is_object($topicObject) && $topicObject->getVar('approved') > 0 && empty($force)) {
+				$topiccount_toupdate = 1;
+				$topicObject->setVar('approved', -1);
+				$topicHandler->insert($topicObject);
+				xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
+			} else {
+				if (is_object($topicObject)) {
+					if ($topicObject->getVar('approved') > 0) {
+						xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
+					}
+
+					$poll_id = $topicObject->getVar('poll_id');
+					// START irmtfan poll_module
+					$topicObject->deletePoll($poll_id);
+					// END irmtfan poll_module
+				}
+
+				$sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_topics'), $post->getVar('topic_id'));
+				if (!$result = $this->db->queryF($sql)) {
+					//xoops_error($this->db->error());
+				}
+				$sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_votedata'), $post->getVar('topic_id'));
+				if (!$result = $this->db->queryF($sql)) {
+					//xoops_error($this->db->error());
+				}
+			}
+		} else {
+			$sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
                             LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.topic_id = t.topic_id
                             SET t.topic_last_post_id = p.post_id
                             WHERE t.topic_last_post_id = ' . $post->getVar('post_id') . '
                                     AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id=t.topic_id)';
-            if (!$result = $this->db->queryF($sql)) {
-            }
-        }
-
-        $postcount_toupdate = $post->getVar('approved');
-
-        if ($postcount_toupdate > 0) {
-
-            // Update user stats
-            if ($post->getVar('uid') > 0) {
-                /** @var \XoopsMemberHandler $memberHandler */
-                $memberHandler = xoops_getHandler('member');
-                $poster        = $memberHandler->getUser($post->getVar('uid'));
-                if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
-                    $poster->setVar('posts', $poster->getVar('posts') - 1);
-                    $res = $memberHandler->insertUser($poster, true);
-                    unset($poster);
-                }
-            }
-            // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
-            if (!$post->isTopic()) {
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
-                if (!$result = $this->db->queryF($sql)) {
-                    //xoops_error($this->db->error());
-                }
-            }
-        }
-
-        return true;
-    }
-
-    // START irmtfan enhance getPostCount when there is join (read_mode = 2)
-
-    /**
-     * @param  null $criteria
-     * @param  null $join
-     * @return int|null
-     */
-    public function getPostCount($criteria = null, $join = null)
-    {
-        // if not join get the count from XOOPS/class/model/stats as before
-        if (empty($join)) {
-            return parent::getCount($criteria);
-        }
-
-        $sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
-        // LEFT JOIN
-        $sql .= $join;
-        // WHERE
-        if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            //xoops_error($this->db->error().'<br>'.$sql);
-            return null;
-        }
-        $myrow = $this->db->fetchArray($result);
-        $count = $myrow['count'];
-
-        return $count;
-    }
-    // END irmtfan enhance getPostCount when there is join (read_mode = 2)
-    /*
+			if (!$result = $this->db->queryF($sql)) {
+			}
+		}
+
+		$postcount_toupdate = $post->getVar('approved');
+
+		if ($postcount_toupdate > 0) {
+
+			// Update user stats
+			if ($post->getVar('uid') > 0) {
+				/** @var \XoopsMemberHandler $memberHandler */
+				$memberHandler = xoops_getHandler('member');
+				$poster        = $memberHandler->getUser($post->getVar('uid'));
+				if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
+					$poster->setVar('posts', $poster->getVar('posts') - 1);
+					$res = $memberHandler->insertUser($poster, true);
+					unset($poster);
+				}
+			}
+			// irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
+			if (!$post->isTopic()) {
+				$sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
+				if (!$result = $this->db->queryF($sql)) {
+					//xoops_error($this->db->error());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// START irmtfan enhance getPostCount when there is join (read_mode = 2)
+
+	/**
+	 * @param  null $criteria
+	 * @param  null $join
+	 * @return int|null
+	 */
+	public function getPostCount($criteria = null, $join = null)
+	{
+		// if not join get the count from XOOPS/class/model/stats as before
+		if (empty($join)) {
+			return parent::getCount($criteria);
+		}
+
+		$sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+		// LEFT JOIN
+		$sql .= $join;
+		// WHERE
+		if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (!$result = $this->db->query($sql)) {
+			//xoops_error($this->db->error().'<br>'.$sql);
+			return null;
+		}
+		$myrow = $this->db->fetchArray($result);
+		$count = $myrow['count'];
+
+		return $count;
+	}
+	// END irmtfan enhance getPostCount when there is join (read_mode = 2)
+	/*
      * TODO: combining viewtopic.php
      */
-    /**
-     * @param  null $criteria
-     * @param  int  $limit
-     * @param  int  $start
-     * @param  null $join
-     * @return array
-     */
-    public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
-    {
-        $ret = [];
-        $sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
-        if (!empty($join)) {
-            $sql .= $join;
-        }
-        if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-        }
-        $result = $this->db->query($sql, (int)$limit, (int)$start);
-        if (!$result) {
-            //xoops_error($this->db->error());
-            return $ret;
-        }
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $post = $this->create(false);
-            $post->assignVars($myrow);
-            $ret[$myrow['post_id']] = $post;
-            unset($post);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @return bool
-     */
-    public function synchronization()
-    {
-        //$this->cleanOrphan();
-        return true;
-    }
-
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        $this->deleteAll(new \Criteria('post_time', 0), true, true);
-        parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
-        parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
-
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
-        if (!$result = $this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * clean expired objects from database
-     *
-     * @param  int $expire time limit for expiration
-     * @return bool true on success
-     */
-    public function cleanExpires($expire = 0)
-    {
-        // irmtfan if 0 no cleanup look include/plugin.php
-        if (!func_num_args()) {
-            $newbbConfig = newbbLoadConfig();
-            $expire      = isset($newbbConfig['pending_expire']) ? (int)$newbbConfig['pending_expire'] : 7;
-            $expire      = $expire * 24 * 3600; // days to seconds
-        }
-        if (empty($expire)) {
-            return false;
-        }
-        $crit_expire = new \CriteriaCompo(new \Criteria('approved', 0, '<='));
-        //if (!empty($expire)) {
-        $crit_expire->add(new \Criteria('post_time', time() - (int)$expire, '<'));
-
-        //}
-        return $this->deleteAll($crit_expire, true/*, true*/);
-    }
+	/**
+	 * @param  null $criteria
+	 * @param  int  $limit
+	 * @param  int  $start
+	 * @param  null $join
+	 * @return array
+	 */
+	public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
+	{
+		$ret = [];
+		$sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+		if (!empty($join)) {
+			$sql .= $join;
+		}
+		if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ('' !== $criteria->getSort()) {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+		}
+		$result = $this->db->query($sql, (int)$limit, (int)$start);
+		if (!$result) {
+			//xoops_error($this->db->error());
+			return $ret;
+		}
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$post = $this->create(false);
+			$post->assignVars($myrow);
+			$ret[$myrow['post_id']] = $post;
+			unset($post);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function synchronization()
+	{
+		//$this->cleanOrphan();
+		return true;
+	}
+
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		$this->deleteAll(new \Criteria('post_time', 0), true, true);
+		parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
+		parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
+
+		$sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
+		if (!$result = $this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * clean expired objects from database
+	 *
+	 * @param  int $expire time limit for expiration
+	 * @return bool true on success
+	 */
+	public function cleanExpires($expire = 0)
+	{
+		// irmtfan if 0 no cleanup look include/plugin.php
+		if (!func_num_args()) {
+			$newbbConfig = newbbLoadConfig();
+			$expire      = isset($newbbConfig['pending_expire']) ? (int)$newbbConfig['pending_expire'] : 7;
+			$expire      = $expire * 24 * 3600; // days to seconds
+		}
+		if (empty($expire)) {
+			return false;
+		}
+		$crit_expire = new \CriteriaCompo(new \Criteria('approved', 0, '<='));
+		//if (!empty($expire)) {
+		$crit_expire->add(new \Criteria('post_time', time() - (int)$expire, '<'));
+
+		//}
+		return $this->deleteAll($crit_expire, true/*, true*/);
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -56,9 +56,9 @@ 
      */
     public function get($id = null, $var = null) //get($id)
     {
-        $id   = (int)$id;
+        $id   = (int) $id;
         $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p LEFT JOIN '.$this->db->prefix('newbb_posts_text').' t ON p.post_id=t.post_id WHERE p.post_id='.$id;
         if ($array = $this->db->fetchArray($this->db->query($sql))) {
             $post = $this->create(false);
             $post->assignVars($array);
@@ -87,7 +87,7 @@ 
         $topic_id = 0,
         $approved = 1
     ) {
-        $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
+        $sql = 'SELECT p.*, t.*, tp.topic_status FROM '
                   . $this->db->prefix('newbb_posts')
                   . ' p LEFT JOIN '
                   . $this->db->prefix('newbb_posts_text')
@@ -379,14 +379,14 @@ 
 
         /* Set active post as deleted */
         if ($post->getVar('approved') > 0 && empty($force)) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
+            $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET approved = -1 WHERE post_id = '.$post->getVar('post_id');
             if (!$result = $this->db->queryF($sql)) {
             }
             /* delete pending post directly */
         } else {
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('delete post error: ' . $sql);
+                $post->setErrors('delete post error: '.$sql);
 
                 return false;
             }
@@ -394,7 +394,7 @@ 
 
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('Could not remove post text: ' . $sql);
+                $post->setErrors('Could not remove post text: '.$sql);
 
                 return false;
             }
@@ -431,11 +431,11 @@ 
                 }
             }
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
-                            LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.topic_id = t.topic_id
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics').' t
+                            LEFT JOIN ' . $this->db->prefix('newbb_posts').' p ON p.topic_id = t.topic_id
                             SET t.topic_last_post_id = p.post_id
-                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id') . '
-                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id=t.topic_id)';
+                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id').'
+                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts').' WHERE topic_id=t.topic_id)';
             if (!$result = $this->db->queryF($sql)) {
             }
         }
@@ -457,7 +457,7 @@ 
             }
             // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
             if (!$post->isTopic()) {
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
+                $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET pid = '.$post->getVar('pid').' WHERE approved=1 AND pid='.$post->getVar('post_id');
                 if (!$result = $this->db->queryF($sql)) {
                     //xoops_error($this->db->error());
                 }
@@ -481,12 +481,12 @@ 
             return parent::getCount($criteria);
         }
 
-        $sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT COUNT(*) as count'.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         // LEFT JOIN
         $sql .= $join;
         // WHERE
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             //xoops_error($this->db->error().'<br>'.$sql);
@@ -511,17 +511,17 @@ 
     public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
     {
         $ret = [];
-        $sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT p.*, t.* '.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         if (!empty($join)) {
             $sql .= $join;
         }
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
         }
-        $result = $this->db->query($sql, (int)$limit, (int)$start);
+        $result = $this->db->query($sql, (int) $limit, (int) $start);
         if (!$result) {
             //xoops_error($this->db->error());
             return $ret;
@@ -559,7 +559,7 @@ 
         parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
         parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
 
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_posts_text').' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM '.$this->table.') )';
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;
@@ -579,7 +579,7 @@ 
         // irmtfan if 0 no cleanup look include/plugin.php
         if (!func_num_args()) {
             $newbbConfig = newbbLoadConfig();
-            $expire      = isset($newbbConfig['pending_expire']) ? (int)$newbbConfig['pending_expire'] : 7;
+            $expire      = isset($newbbConfig['pending_expire']) ? (int) $newbbConfig['pending_expire'] : 7;
             $expire      = $expire * 24 * 3600; // days to seconds
         }
         if (empty($expire)) {
@@ -587,7 +587,7 @@ 
         }
         $crit_expire = new \CriteriaCompo(new \Criteria('approved', 0, '<='));
         //if (!empty($expire)) {
-        $crit_expire->add(new \Criteria('post_time', time() - (int)$expire, '<'));
+        $crit_expire->add(new \Criteria('post_time', time() - (int) $expire, '<'));
 
         //}
         return $this->deleteAll($crit_expire, true/*, true*/);

class/CategoryHandler.php

Indentation +132 added lines, -132 removed lines

@@ -19,136 +19,136 @@
  */
 class CategoryHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param null|\XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_categories', Category::class, 'cat_id', 'cat_title');
-    }
-
-    /**
-     * @param  string $perm
-     * @return mixed
-     */
-    public function getIdsByPermission($perm = 'access')
-    {
-        /** var Newbb\PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->getCategories($perm);
-    }
-
-    /**
-     * @param  string $permission
-     * @param  null   $tags
-     * @param  bool   $asObject
-     * @return array
-     */
-    public function &getByPermission($permission = 'access', $tags = null, $asObject = true)
-    {
-        $categories = [];
-        if (!$valid_ids = $this->getIdsByPermission($permission)) {
-            return $categories;
-        }
-        $criteria = new \Criteria('cat_id', '(' . implode(', ', $valid_ids) . ')', 'IN');
-        $criteria->setSort('cat_order');
-        $categories = $this->getAll($criteria, $tags, $asObject);
-
-        return $categories;
-    }
-
-    /**
-     * @param \XoopsObject $category
-     * @param  bool        $force
-     * @return mixed
-     */
-    public function insert(\XoopsObject $category, $force = true)
-    {
-        $className = Category::class;
-        if (!($category instanceof $className)) {
-            return false;
-        }
-        parent::insert($category, $force);
-        if ($category->isNew()) {
-            $this->applyPermissionTemplate($category);
-        }
-
-        return $category->getVar('cat_id');
-    }
-
-    /**
-     * @param \XoopsObject $category
-     * @param  bool        $force
-     * @return bool|mixed
-     * @internal param Category $category
-     */
-    public function delete(\XoopsObject $category, $force = false)//delete(Category $category)
-    {
-        $className = Category::class;
-        if (!($category instanceof $className)) {
-            return false;
-        }
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forumHandler->deleteAll(new \Criteria('cat_id', $category->getVar('cat_id')), true, true);
-        if ($result = parent::delete($category)) {
-            // Delete group permissions
-            return $this->deletePermission($category);
-        } else {
-            $category->setErrors('delete category error');
-
-            return false;
-        }
-    }
-
-    /**
-     * Check permission for a category
-     *
-     * @param  Category|int $category object or id
-     * @param  string       $perm     permission name
-     *
-     * @return bool
-     */
-    public function getPermission($category, $perm = 'access')
-    {
-        if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
-            return true;
-        }
-
-        $cat_id = is_object($category) ? $category->getVar('cat_id') : (int)$category;
-        /** @var PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->getPermission('category', $perm, $cat_id);
-    }
-
-    /**
-     * @param Category $category
-     * @return mixed
-     */
-    public function deletePermission(Category $category)
-    {
-        /** @var PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->deleteByCategory($category->getVar('cat_id'));
-    }
-
-    /**
-     * @param Category $category
-     * @return mixed
-     */
-    public function applyPermissionTemplate(Category $category)
-    {
-        /** @var PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->setCategoryPermission($category->getVar('cat_id'));
-    }
-
-    /**
-     * @param  mixed $object
-     * @return bool
-     */
-    public function synchronization($object = null)
-    {
-        return true;
-    }
+	/**
+	 * @param null|\XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_categories', Category::class, 'cat_id', 'cat_title');
+	}
+
+	/**
+	 * @param  string $perm
+	 * @return mixed
+	 */
+	public function getIdsByPermission($perm = 'access')
+	{
+		/** var Newbb\PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->getCategories($perm);
+	}
+
+	/**
+	 * @param  string $permission
+	 * @param  null   $tags
+	 * @param  bool   $asObject
+	 * @return array
+	 */
+	public function &getByPermission($permission = 'access', $tags = null, $asObject = true)
+	{
+		$categories = [];
+		if (!$valid_ids = $this->getIdsByPermission($permission)) {
+			return $categories;
+		}
+		$criteria = new \Criteria('cat_id', '(' . implode(', ', $valid_ids) . ')', 'IN');
+		$criteria->setSort('cat_order');
+		$categories = $this->getAll($criteria, $tags, $asObject);
+
+		return $categories;
+	}
+
+	/**
+	 * @param \XoopsObject $category
+	 * @param  bool        $force
+	 * @return mixed
+	 */
+	public function insert(\XoopsObject $category, $force = true)
+	{
+		$className = Category::class;
+		if (!($category instanceof $className)) {
+			return false;
+		}
+		parent::insert($category, $force);
+		if ($category->isNew()) {
+			$this->applyPermissionTemplate($category);
+		}
+
+		return $category->getVar('cat_id');
+	}
+
+	/**
+	 * @param \XoopsObject $category
+	 * @param  bool        $force
+	 * @return bool|mixed
+	 * @internal param Category $category
+	 */
+	public function delete(\XoopsObject $category, $force = false)//delete(Category $category)
+	{
+		$className = Category::class;
+		if (!($category instanceof $className)) {
+			return false;
+		}
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forumHandler->deleteAll(new \Criteria('cat_id', $category->getVar('cat_id')), true, true);
+		if ($result = parent::delete($category)) {
+			// Delete group permissions
+			return $this->deletePermission($category);
+		} else {
+			$category->setErrors('delete category error');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Check permission for a category
+	 *
+	 * @param  Category|int $category object or id
+	 * @param  string       $perm     permission name
+	 *
+	 * @return bool
+	 */
+	public function getPermission($category, $perm = 'access')
+	{
+		if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
+			return true;
+		}
+
+		$cat_id = is_object($category) ? $category->getVar('cat_id') : (int)$category;
+		/** @var PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->getPermission('category', $perm, $cat_id);
+	}
+
+	/**
+	 * @param Category $category
+	 * @return mixed
+	 */
+	public function deletePermission(Category $category)
+	{
+		/** @var PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->deleteByCategory($category->getVar('cat_id'));
+	}
+
+	/**
+	 * @param Category $category
+	 * @return mixed
+	 */
+	public function applyPermissionTemplate(Category $category)
+	{
+		/** @var PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->setCategoryPermission($category->getVar('cat_id'));
+	}
+
+	/**
+	 * @param  mixed $object
+	 * @return bool
+	 */
+	public function synchronization($object = null)
+	{
+		return true;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
         if (!$valid_ids = $this->getIdsByPermission($permission)) {
             return $categories;
         }
-        $criteria = new \Criteria('cat_id', '(' . implode(', ', $valid_ids) . ')', 'IN');
+        $criteria = new \Criteria('cat_id', '('.implode(', ', $valid_ids).')', 'IN');
         $criteria->setSort('cat_order');
         $categories = $this->getAll($criteria, $tags, $asObject);
 
@@ -115,7 +115,7 @@ 
             return true;
         }
 
-        $cat_id = is_object($category) ? $category->getVar('cat_id') : (int)$category;
+        $cat_id = is_object($category) ? $category->getVar('cat_id') : (int) $category;
         /** @var PermissionHandler $permHandler */
         $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
         return $permHandler->getPermission('category', $perm, $cat_id);

class/OnlineHandler.php

Indentation +352 added lines, -352 removed lines

@@ -22,356 +22,356 @@
  */
 class OnlineHandler
 {
-    public $db;
-    public $forum_id;
-    public $forumObject;
-    public $topic_id;
-    public $user_ids = [];
-
-    /**
-     * OnlineHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        $this->db = $db;
-    }
-
-    /**
-     * @param null|Newbb\Forum $forum
-     * @param null|Topic  $forumtopic
-     */
-    public function init($forum = null, $forumtopic = null)
-    {
-        if (is_object($forum)) {
-            $this->forum_id    = $forum->getVar('forum_id');
-            $this->forumObject = $forum;
-        } else {
-            $this->forum_id    = (int)$forum;
-            $this->forumObject = $forum;
-        }
-        if (is_object($forumtopic)) {
-            $this->topic_id = $forumtopic->getVar('topic_id');
-            if (empty($this->forum_id)) {
-                $this->forum_id = $forumtopic->getVar('forum_id');
-            }
-        } else {
-            $this->topic_id = (int)$forumtopic;
-        }
-
-        $this->update();
-    }
-
-    public function update()
-    {
-        global $xoopsModule;
-
-        mt_srand((double)microtime() * 1000000);
-        // set gc probabillity to 10% for now..
-        if (mt_rand(1, 100) < 60) {
-            $this->gc(150);
-        }
-        if (is_object($GLOBALS['xoopsUser'])) {
-            $uid   = $GLOBALS['xoopsUser']->getVar('uid');
-            $uname = $GLOBALS['xoopsUser']->getVar('uname');
-            $name  = $GLOBALS['xoopsUser']->getVar('name');
-        } else {
-            $uid   = 0;
-            $uname = '';
-            $name  = '';
-        }
-
-        $xoops_onlineHandler = xoops_getHandler('online');
-        $xoopsupdate         = $xoops_onlineHandler->write($uid, $uname, time(), $xoopsModule->getVar('mid'), \Xmf\IPAddress::fromRequest()->asReadable());
-        if (!$xoopsupdate) {
-            //xoops_error("newbb online upate error");
-        }
-
-        $uname = (empty($GLOBALS['xoopsModuleConfig']['show_realname']) || empty($name)) ? $uname : $name;
-        $this->write($uid, $uname, time(), $this->forum_id, IPAddress::fromRequest()->asReadable(), $this->topic_id);
-    }
-
-    /**
-     * @param $xoopsTpl
-     */
-    public function render(\Smarty $xoopsTpl)
-    {
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
-        $criteria = null;
-        if ($this->topic_id) {
-            $criteria = new \Criteria('online_topic', $this->topic_id);
-        } elseif ($this->forum_id) {
-            $criteria = new \Criteria('online_forum', $this->forum_id);
-        }
-        $users     = $this->getAll($criteria);
-        $num_total = count($users);
-
-        $num_user     = 0;
-        $users_id     = [];
-        $users_online = [];
-        for ($i = 0; $i < $num_total; ++$i) {
-            if (empty($users[$i]['online_uid'])) {
-                continue;
-            }
-            $users_id[]                             = $users[$i]['online_uid'];
-            $users_online[$users[$i]['online_uid']] = [
-                'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
-                'uname' => $users[$i]['online_uname']
-            ];
-            ++$num_user;
-        }
-        $num_anonymous           = $num_total - $num_user;
-        $online                  = [];
-        $online['image']         = newbbDisplayImage('whosonline');
-        $online['num_total']     = $num_total;
-        $online['num_user']      = $num_user;
-        $online['num_anonymous'] = $num_anonymous;
-        $administrator_list      = newbbIsModuleAdministrators($users_id);
-        $moderator_list          = [];
-        if ($member_list = array_diff(array_keys($administrator_list), $users_id)) {
-            if (is_object($this->forumObject)) {
-                $moderator_list = $this->forumObject->getVar('forum_moderator');
-            } else {
-                $moderator_list = newbbIsForumModerators($member_list);
-            }
-        }
-        foreach ($users_online as $uid => $user) {
-            if (!empty($administrator_list[$uid])) {
-                $user['level'] = 2;
-            } elseif (!empty($moderator_list[$uid])) {
-                $user['level'] = 1;
-            } else {
-                $user['level'] = 0;
-            }
-            $online['users'][] = $user;
-        }
-
-        $xoopsTpl->assign_by_ref('online', $online);
-    }
-
-    /**
-     * Deprecated
-     */
-    public function showOnline()
-    {
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
-        $criteria = null;
-        if ($this->topic_id) {
-            $criteria = new \Criteria('online_topic', $this->topic_id);
-        } elseif ($this->forum_id) {
-            $criteria = new \Criteria('online_forum', $this->forum_id);
-        }
-        $users     = $this->getAll($criteria);
-        $num_total = count($users);
-
-        $num_user     = 0;
-        $users_id     = [];
-        $users_online = [];
-        for ($i = 0; $i < $num_total; ++$i) {
-            if (empty($users[$i]['online_uid'])) {
-                continue;
-            }
-            $users_id[]                             = $users[$i]['online_uid'];
-            $users_online[$users[$i]['online_uid']] = [
-                'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
-                'uname' => $users[$i]['online_uname']
-            ];
-            ++$num_user;
-        }
-        $num_anonymous           = $num_total - $num_user;
-        $online                  = [];
-        $online['image']         = newbbDisplayImage('whosonline');
-        $online['statistik']     = newbbDisplayImage('statistik');
-        $online['num_total']     = $num_total;
-        $online['num_user']      = $num_user;
-        $online['num_anonymous'] = $num_anonymous;
-        $administrator_list      = newbbIsModuleAdministrators($users_id);
-        $moderator_list          = [];
-        if ($member_list = array_diff($users_id, array_keys($administrator_list))) {
-            if (is_object($this->forumObject)) {
-                $moderator_list = $this->forumObject->getVar('forum_moderator');
-            } else {
-                $moderator_list = newbbIsForumModerators($member_list);
-            }
-        }
-
-        foreach ($users_online as $uid => $user) {
-            if (in_array($uid, $administrator_list)) {
-                $user['level'] = 2;
-            } elseif (in_array($uid, $moderator_list)) {
-                $user['level'] = 1;
-            } else {
-                $user['level'] = 0;
-            }
-            $online['users'][] = $user;
-        }
-
-        return $online;
-    }
-
-    /**
-     * Write online information to the database
-     *
-     * @param  int    $uid      UID of the active user
-     * @param  string $uname    Username
-     * @param         $time
-     * @param  string $forum_id Current forum_id
-     * @param  string $ip       User's IP adress
-     * @param         $topic_id
-     * @return bool   TRUE on success
-     * @internal param string $timestamp
-     */
-    public function write($uid, $uname, $time, $forum_id, $ip, $topic_id)
-    {
-        global $xoopsModule, $xoopsDB;
-
-        $uid = (int)$uid;
-        if ($uid > 0) {
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid;
-        } else {
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid . " AND online_ip='" . $ip . "'";
-        }
-        list($count) = $this->db->fetchRow($this->db->queryF($sql));
-        if ($count > 0) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_online') . " SET online_updated= '" . $time . "', online_forum = '" . $forum_id . "', online_topic = '" . $topic_id . "' WHERE online_uid = " . $uid;
-            if (0 == $uid) {
-                $sql .= " AND online_ip='" . $ip . "'";
-            }
-        } else {
-            $sql = sprintf('INSERT INTO `%s` (online_uid, online_uname, online_updated, online_ip, online_forum, online_topic) VALUES (%u, %s, %u, %s, %u, %u)', $this->db->prefix('newbb_online'), $uid, $this->db->quote($uname), $time, $this->db->quote($ip), $forum_id, $topic_id);
-        }
-        if (!$this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-
-        /** @var \XoopsOnlineHandler $xoops_onlineHandler */
-        $xoops_onlineHandler = xoops_getHandler('online');
-        $xoopsOnlineTable    = $xoops_onlineHandler->table;
-
-        $sql = 'DELETE FROM '
-               . $this->db->prefix('newbb_online')
-               . ' WHERE'
-               . ' ( online_uid > 0 AND online_uid NOT IN ( SELECT online_uid FROM '
-               . $xoopsOnlineTable
-               . ' WHERE online_module ='
-               . $xoopsModule->getVar('mid')
-               . ' ) )'
-               . ' OR ( online_uid = 0 AND online_ip NOT IN ( SELECT online_ip FROM '
-               . $xoopsOnlineTable
-               . ' WHERE online_module ='
-               . $xoopsModule->getVar('mid')
-               . ' AND online_uid = 0 ) )';
-
-        if ($result = $this->db->queryF($sql)) {
-            return true;
-        } else {
-            //xoops_error($this->db->error());
-            return false;
-        }
-    }
-
-    /**
-     * Garbage Collection
-     *
-     * Delete all online information that has not been updated for a certain time
-     *
-     * @param int $expire Expiration time in seconds
-     */
-    public function gc($expire)
-    {
-        global $xoopsModule;
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_updated < ' . (time() - (int)$expire);
-        $this->db->queryF($sql);
-
-        $xoops_onlineHandler = xoops_getHandler('online');
-        $xoops_onlineHandler->gc($expire);
-    }
-
-    /**
-     * Get an array of online information
-     *
-     * @param  \CriteriaElement $criteria {@link \CriteriaElement}
-     * @return array           Array of associative arrays of online information
-     */
-    public function getAll(\CriteriaElement $criteria = null)
-    {
-        $ret   = [];
-        $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('newbb_online');
-        if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql   .= ' ' . $criteria->renderWhere();
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $ret[] = $myrow;
-            if ($myrow['online_uid'] > 0) {
-                $this->user_ids[] = $myrow['online_uid'];
-            }
-            unset($myrow);
-        }
-        $this->user_ids = array_unique($this->user_ids);
-
-        return $ret;
-    }
-
-    /**
-     * @param $uids
-     * @return array
-     */
-    public function checkStatus($uids)
-    {
-        $online_users = [];
-        $ret          = [];
-        if (!empty($this->user_ids)) {
-            $online_users = $this->user_ids;
-        } else {
-            $sql = 'SELECT online_uid FROM ' . $this->db->prefix('newbb_online');
-            if (!empty($uids)) {
-                $sql .= ' WHERE online_uid IN (' . implode(', ', array_map('intval', $uids)) . ')';
-            }
-
-            $result = $this->db->query($sql);
-            if (!$result) {
-                return $ret;
-            }
-            while (false !== (list($uid) = $this->db->fetchRow($result))) {
-                $online_users[] = $uid;
-            }
-        }
-        foreach ($uids as $uid) {
-            if (in_array($uid, $online_users)) {
-                $ret[$uid] = 1;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Count the number of online users
-     *
-     * @param  \CriteriaElement $criteria {@link CriteriaElement}
-     * @return bool
-     */
-    public function getCount(\CriteriaElement $criteria = null)
-    {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online');
-        if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        list($ret) = $this->db->fetchRow($result);
-
-        return $ret;
-    }
+	public $db;
+	public $forum_id;
+	public $forumObject;
+	public $topic_id;
+	public $user_ids = [];
+
+	/**
+	 * OnlineHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * @param null|Newbb\Forum $forum
+	 * @param null|Topic  $forumtopic
+	 */
+	public function init($forum = null, $forumtopic = null)
+	{
+		if (is_object($forum)) {
+			$this->forum_id    = $forum->getVar('forum_id');
+			$this->forumObject = $forum;
+		} else {
+			$this->forum_id    = (int)$forum;
+			$this->forumObject = $forum;
+		}
+		if (is_object($forumtopic)) {
+			$this->topic_id = $forumtopic->getVar('topic_id');
+			if (empty($this->forum_id)) {
+				$this->forum_id = $forumtopic->getVar('forum_id');
+			}
+		} else {
+			$this->topic_id = (int)$forumtopic;
+		}
+
+		$this->update();
+	}
+
+	public function update()
+	{
+		global $xoopsModule;
+
+		mt_srand((double)microtime() * 1000000);
+		// set gc probabillity to 10% for now..
+		if (mt_rand(1, 100) < 60) {
+			$this->gc(150);
+		}
+		if (is_object($GLOBALS['xoopsUser'])) {
+			$uid   = $GLOBALS['xoopsUser']->getVar('uid');
+			$uname = $GLOBALS['xoopsUser']->getVar('uname');
+			$name  = $GLOBALS['xoopsUser']->getVar('name');
+		} else {
+			$uid   = 0;
+			$uname = '';
+			$name  = '';
+		}
+
+		$xoops_onlineHandler = xoops_getHandler('online');
+		$xoopsupdate         = $xoops_onlineHandler->write($uid, $uname, time(), $xoopsModule->getVar('mid'), \Xmf\IPAddress::fromRequest()->asReadable());
+		if (!$xoopsupdate) {
+			//xoops_error("newbb online upate error");
+		}
+
+		$uname = (empty($GLOBALS['xoopsModuleConfig']['show_realname']) || empty($name)) ? $uname : $name;
+		$this->write($uid, $uname, time(), $this->forum_id, IPAddress::fromRequest()->asReadable(), $this->topic_id);
+	}
+
+	/**
+	 * @param $xoopsTpl
+	 */
+	public function render(\Smarty $xoopsTpl)
+	{
+		require_once  dirname(__DIR__) . '/include/functions.render.php';
+		require_once  dirname(__DIR__) . '/include/functions.user.php';
+		$criteria = null;
+		if ($this->topic_id) {
+			$criteria = new \Criteria('online_topic', $this->topic_id);
+		} elseif ($this->forum_id) {
+			$criteria = new \Criteria('online_forum', $this->forum_id);
+		}
+		$users     = $this->getAll($criteria);
+		$num_total = count($users);
+
+		$num_user     = 0;
+		$users_id     = [];
+		$users_online = [];
+		for ($i = 0; $i < $num_total; ++$i) {
+			if (empty($users[$i]['online_uid'])) {
+				continue;
+			}
+			$users_id[]                             = $users[$i]['online_uid'];
+			$users_online[$users[$i]['online_uid']] = [
+				'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
+				'uname' => $users[$i]['online_uname']
+			];
+			++$num_user;
+		}
+		$num_anonymous           = $num_total - $num_user;
+		$online                  = [];
+		$online['image']         = newbbDisplayImage('whosonline');
+		$online['num_total']     = $num_total;
+		$online['num_user']      = $num_user;
+		$online['num_anonymous'] = $num_anonymous;
+		$administrator_list      = newbbIsModuleAdministrators($users_id);
+		$moderator_list          = [];
+		if ($member_list = array_diff(array_keys($administrator_list), $users_id)) {
+			if (is_object($this->forumObject)) {
+				$moderator_list = $this->forumObject->getVar('forum_moderator');
+			} else {
+				$moderator_list = newbbIsForumModerators($member_list);
+			}
+		}
+		foreach ($users_online as $uid => $user) {
+			if (!empty($administrator_list[$uid])) {
+				$user['level'] = 2;
+			} elseif (!empty($moderator_list[$uid])) {
+				$user['level'] = 1;
+			} else {
+				$user['level'] = 0;
+			}
+			$online['users'][] = $user;
+		}
+
+		$xoopsTpl->assign_by_ref('online', $online);
+	}
+
+	/**
+	 * Deprecated
+	 */
+	public function showOnline()
+	{
+		require_once  dirname(__DIR__) . '/include/functions.render.php';
+		require_once  dirname(__DIR__) . '/include/functions.user.php';
+		$criteria = null;
+		if ($this->topic_id) {
+			$criteria = new \Criteria('online_topic', $this->topic_id);
+		} elseif ($this->forum_id) {
+			$criteria = new \Criteria('online_forum', $this->forum_id);
+		}
+		$users     = $this->getAll($criteria);
+		$num_total = count($users);
+
+		$num_user     = 0;
+		$users_id     = [];
+		$users_online = [];
+		for ($i = 0; $i < $num_total; ++$i) {
+			if (empty($users[$i]['online_uid'])) {
+				continue;
+			}
+			$users_id[]                             = $users[$i]['online_uid'];
+			$users_online[$users[$i]['online_uid']] = [
+				'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
+				'uname' => $users[$i]['online_uname']
+			];
+			++$num_user;
+		}
+		$num_anonymous           = $num_total - $num_user;
+		$online                  = [];
+		$online['image']         = newbbDisplayImage('whosonline');
+		$online['statistik']     = newbbDisplayImage('statistik');
+		$online['num_total']     = $num_total;
+		$online['num_user']      = $num_user;
+		$online['num_anonymous'] = $num_anonymous;
+		$administrator_list      = newbbIsModuleAdministrators($users_id);
+		$moderator_list          = [];
+		if ($member_list = array_diff($users_id, array_keys($administrator_list))) {
+			if (is_object($this->forumObject)) {
+				$moderator_list = $this->forumObject->getVar('forum_moderator');
+			} else {
+				$moderator_list = newbbIsForumModerators($member_list);
+			}
+		}
+
+		foreach ($users_online as $uid => $user) {
+			if (in_array($uid, $administrator_list)) {
+				$user['level'] = 2;
+			} elseif (in_array($uid, $moderator_list)) {
+				$user['level'] = 1;
+			} else {
+				$user['level'] = 0;
+			}
+			$online['users'][] = $user;
+		}
+
+		return $online;
+	}
+
+	/**
+	 * Write online information to the database
+	 *
+	 * @param  int    $uid      UID of the active user
+	 * @param  string $uname    Username
+	 * @param         $time
+	 * @param  string $forum_id Current forum_id
+	 * @param  string $ip       User's IP adress
+	 * @param         $topic_id
+	 * @return bool   TRUE on success
+	 * @internal param string $timestamp
+	 */
+	public function write($uid, $uname, $time, $forum_id, $ip, $topic_id)
+	{
+		global $xoopsModule, $xoopsDB;
+
+		$uid = (int)$uid;
+		if ($uid > 0) {
+			$sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid;
+		} else {
+			$sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid . " AND online_ip='" . $ip . "'";
+		}
+		list($count) = $this->db->fetchRow($this->db->queryF($sql));
+		if ($count > 0) {
+			$sql = 'UPDATE ' . $this->db->prefix('newbb_online') . " SET online_updated= '" . $time . "', online_forum = '" . $forum_id . "', online_topic = '" . $topic_id . "' WHERE online_uid = " . $uid;
+			if (0 == $uid) {
+				$sql .= " AND online_ip='" . $ip . "'";
+			}
+		} else {
+			$sql = sprintf('INSERT INTO `%s` (online_uid, online_uname, online_updated, online_ip, online_forum, online_topic) VALUES (%u, %s, %u, %s, %u, %u)', $this->db->prefix('newbb_online'), $uid, $this->db->quote($uname), $time, $this->db->quote($ip), $forum_id, $topic_id);
+		}
+		if (!$this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+
+		/** @var \XoopsOnlineHandler $xoops_onlineHandler */
+		$xoops_onlineHandler = xoops_getHandler('online');
+		$xoopsOnlineTable    = $xoops_onlineHandler->table;
+
+		$sql = 'DELETE FROM '
+			   . $this->db->prefix('newbb_online')
+			   . ' WHERE'
+			   . ' ( online_uid > 0 AND online_uid NOT IN ( SELECT online_uid FROM '
+			   . $xoopsOnlineTable
+			   . ' WHERE online_module ='
+			   . $xoopsModule->getVar('mid')
+			   . ' ) )'
+			   . ' OR ( online_uid = 0 AND online_ip NOT IN ( SELECT online_ip FROM '
+			   . $xoopsOnlineTable
+			   . ' WHERE online_module ='
+			   . $xoopsModule->getVar('mid')
+			   . ' AND online_uid = 0 ) )';
+
+		if ($result = $this->db->queryF($sql)) {
+			return true;
+		} else {
+			//xoops_error($this->db->error());
+			return false;
+		}
+	}
+
+	/**
+	 * Garbage Collection
+	 *
+	 * Delete all online information that has not been updated for a certain time
+	 *
+	 * @param int $expire Expiration time in seconds
+	 */
+	public function gc($expire)
+	{
+		global $xoopsModule;
+		$sql = 'DELETE FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_updated < ' . (time() - (int)$expire);
+		$this->db->queryF($sql);
+
+		$xoops_onlineHandler = xoops_getHandler('online');
+		$xoops_onlineHandler->gc($expire);
+	}
+
+	/**
+	 * Get an array of online information
+	 *
+	 * @param  \CriteriaElement $criteria {@link \CriteriaElement}
+	 * @return array           Array of associative arrays of online information
+	 */
+	public function getAll(\CriteriaElement $criteria = null)
+	{
+		$ret   = [];
+		$limit = $start = 0;
+		$sql   = 'SELECT * FROM ' . $this->db->prefix('newbb_online');
+		if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
+			$sql   .= ' ' . $criteria->renderWhere();
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$ret[] = $myrow;
+			if ($myrow['online_uid'] > 0) {
+				$this->user_ids[] = $myrow['online_uid'];
+			}
+			unset($myrow);
+		}
+		$this->user_ids = array_unique($this->user_ids);
+
+		return $ret;
+	}
+
+	/**
+	 * @param $uids
+	 * @return array
+	 */
+	public function checkStatus($uids)
+	{
+		$online_users = [];
+		$ret          = [];
+		if (!empty($this->user_ids)) {
+			$online_users = $this->user_ids;
+		} else {
+			$sql = 'SELECT online_uid FROM ' . $this->db->prefix('newbb_online');
+			if (!empty($uids)) {
+				$sql .= ' WHERE online_uid IN (' . implode(', ', array_map('intval', $uids)) . ')';
+			}
+
+			$result = $this->db->query($sql);
+			if (!$result) {
+				return $ret;
+			}
+			while (false !== (list($uid) = $this->db->fetchRow($result))) {
+				$online_users[] = $uid;
+			}
+		}
+		foreach ($uids as $uid) {
+			if (in_array($uid, $online_users)) {
+				$ret[$uid] = 1;
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Count the number of online users
+	 *
+	 * @param  \CriteriaElement $criteria {@link CriteriaElement}
+	 * @return bool
+	 */
+	public function getCount(\CriteriaElement $criteria = null)
+	{
+		$sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online');
+		if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		list($ret) = $this->db->fetchRow($result);
+
+		return $ret;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -15,7 +15,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once  dirname(__DIR__) . '/include/functions.config.php';
+require_once  dirname(__DIR__).'/include/functions.config.php';
 
 /**
  * Class OnlineHandler
@@ -47,7 +47,7 @@ 
             $this->forum_id    = $forum->getVar('forum_id');
             $this->forumObject = $forum;
         } else {
-            $this->forum_id    = (int)$forum;
+            $this->forum_id    = (int) $forum;
             $this->forumObject = $forum;
         }
         if (is_object($forumtopic)) {
@@ -56,7 +56,7 @@ 
                 $this->forum_id = $forumtopic->getVar('forum_id');
             }
         } else {
-            $this->topic_id = (int)$forumtopic;
+            $this->topic_id = (int) $forumtopic;
         }
 
         $this->update();
@@ -66,7 +66,7 @@ 
     {
         global $xoopsModule;
 
-        mt_srand((double)microtime() * 1000000);
+        mt_srand((double) microtime() * 1000000);
         // set gc probabillity to 10% for now..
         if (mt_rand(1, 100) < 60) {
             $this->gc(150);
@@ -96,8 +96,8 @@ 
      */
     public function render(\Smarty $xoopsTpl)
     {
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
+        require_once  dirname(__DIR__).'/include/functions.render.php';
+        require_once  dirname(__DIR__).'/include/functions.user.php';
         $criteria = null;
         if ($this->topic_id) {
             $criteria = new \Criteria('online_topic', $this->topic_id);
@@ -116,7 +116,7 @@ 
             }
             $users_id[]                             = $users[$i]['online_uid'];
             $users_online[$users[$i]['online_uid']] = [
-                'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
+                'link'  => XOOPS_URL.'/userinfo.php?uid='.$users[$i]['online_uid'],
                 'uname' => $users[$i]['online_uname']
             ];
             ++$num_user;
@@ -155,8 +155,8 @@ 
      */
     public function showOnline()
     {
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
+        require_once  dirname(__DIR__).'/include/functions.render.php';
+        require_once  dirname(__DIR__).'/include/functions.user.php';
         $criteria = null;
         if ($this->topic_id) {
             $criteria = new \Criteria('online_topic', $this->topic_id);
@@ -175,7 +175,7 @@ 
             }
             $users_id[]                             = $users[$i]['online_uid'];
             $users_online[$users[$i]['online_uid']] = [
-                'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
+                'link'  => XOOPS_URL.'/userinfo.php?uid='.$users[$i]['online_uid'],
                 'uname' => $users[$i]['online_uname']
             ];
             ++$num_user;
@@ -227,17 +227,17 @@ 
     {
         global $xoopsModule, $xoopsDB;
 
-        $uid = (int)$uid;
+        $uid = (int) $uid;
         if ($uid > 0) {
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid;
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_online').' WHERE online_uid='.$uid;
         } else {
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid . " AND online_ip='" . $ip . "'";
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_online').' WHERE online_uid='.$uid." AND online_ip='".$ip."'";
         }
         list($count) = $this->db->fetchRow($this->db->queryF($sql));
         if ($count > 0) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_online') . " SET online_updated= '" . $time . "', online_forum = '" . $forum_id . "', online_topic = '" . $topic_id . "' WHERE online_uid = " . $uid;
+            $sql = 'UPDATE '.$this->db->prefix('newbb_online')." SET online_updated= '".$time."', online_forum = '".$forum_id."', online_topic = '".$topic_id."' WHERE online_uid = ".$uid;
             if (0 == $uid) {
-                $sql .= " AND online_ip='" . $ip . "'";
+                $sql .= " AND online_ip='".$ip."'";
             }
         } else {
             $sql = sprintf('INSERT INTO `%s` (online_uid, online_uname, online_updated, online_ip, online_forum, online_topic) VALUES (%u, %s, %u, %s, %u, %u)', $this->db->prefix('newbb_online'), $uid, $this->db->quote($uname), $time, $this->db->quote($ip), $forum_id, $topic_id);
@@ -283,7 +283,7 @@ 
     public function gc($expire)
     {
         global $xoopsModule;
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_updated < ' . (time() - (int)$expire);
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_online').' WHERE online_updated < '.(time() - (int) $expire);
         $this->db->queryF($sql);
 
         $xoops_onlineHandler = xoops_getHandler('online');
@@ -300,9 +300,9 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('newbb_online');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('newbb_online');
         if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql   .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
@@ -333,9 +333,9 @@ 
         if (!empty($this->user_ids)) {
             $online_users = $this->user_ids;
         } else {
-            $sql = 'SELECT online_uid FROM ' . $this->db->prefix('newbb_online');
+            $sql = 'SELECT online_uid FROM '.$this->db->prefix('newbb_online');
             if (!empty($uids)) {
-                $sql .= ' WHERE online_uid IN (' . implode(', ', array_map('intval', $uids)) . ')';
+                $sql .= ' WHERE online_uid IN ('.implode(', ', array_map('intval', $uids)).')';
             }
 
             $result = $this->db->query($sql);
@@ -363,9 +363,9 @@ 
      */
     public function getCount(\CriteriaElement $criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_online');
         if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             return false;