mambax7 / newbb5

class/ForumHandler.php

Spacing +56 added lines, -56 removed lines

@@ -100,11 +100,11 @@ 
             return $_cachedForums;
         }
 
-        $criteria = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $valid_ids) . ')', 'IN'));
+        $criteria = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $valid_ids).')', 'IN'));
         if (is_numeric($cat) && $cat > 0) {
             $criteria->add(new \Criteria('cat_id', (int)$cat));
         } elseif (is_array($cat) && count($cat) > 0) {
-            $criteria->add(new \Criteria('cat_id', '(' . implode(', ', $cat) . ')', 'IN'));
+            $criteria->add(new \Criteria('cat_id', '('.implode(', ', $cat).')', 'IN'));
         }
         $criteria->setSort('forum_order');
         $criteria->setOrder('ASC');
@@ -181,23 +181,23 @@ 
         $topic_lastread = newbbGetCookie('LT', true);
         $criteria_forum = '';
         if (is_object($forum)) {
-            $criteria_forum = ' AND t.forum_id = ' . $forum->getVar('forum_id');
+            $criteria_forum = ' AND t.forum_id = '.$forum->getVar('forum_id');
             $hot_threshold  = $forum->getVar('hot_threshold');
         } else {
             $hot_threshold = 10;
             if (is_array($forum) && count($forum) > 0) {
-                $criteria_forum = ' AND t.forum_id IN (' . implode(',', array_keys($forum)) . ')';
+                $criteria_forum = ' AND t.forum_id IN ('.implode(',', array_keys($forum)).')';
             } elseif (!empty($forum)) {
-                $criteria_forum = ' AND t.forum_id =' . (int)$forum;
+                $criteria_forum = ' AND t.forum_id ='.(int)$forum;
             }
         }
 
-        $criteria_post    = $startdate ? ' p.post_time > ' . $startdate : ' 1 = 1 ';
+        $criteria_post    = $startdate ? ' p.post_time > '.$startdate : ' 1 = 1 ';
         $criteria_topic   = empty($type) ? '' : " AND t.type_id={$type}";
         $criteria_extra   = '';
         $criteria_approve = ' AND t.approved = 1';
         $post_on          = ' p.post_id = t.topic_last_post_id';
-        $leftjoin         = ' LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.post_id = t.topic_last_post_id';
+        $leftjoin         = ' LEFT JOIN '.$this->db->prefix('newbb_posts').' p ON p.post_id = t.topic_last_post_id';
         $sort_array       = [];
         switch ($status) {
             case 'digest':
@@ -214,7 +214,7 @@ 
                     // START irmtfan use read_uid to find the unread posts when the user is logged in
                     $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
                     if (!empty($read_uid)) {
-                        $leftjoin      .= ' LEFT JOIN ' . $this->db->prefix('newbb_reads_topic') . ' r ON r.read_item = t.topic_id AND r.uid = ' . $read_uid . ' ';
+                        $leftjoin      .= ' LEFT JOIN '.$this->db->prefix('newbb_reads_topic').' r ON r.read_item = t.topic_id AND r.uid = '.$read_uid.' ';
                         $criteria_post .= ' AND (r.read_id IS NULL OR r.post_id < t.topic_last_post_id)';
                     } else {
                     }
@@ -222,7 +222,7 @@ 
                 } elseif (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
                     // START irmtfan fix read_mode = 1 bugs - for all users (member and anon)
                     if ($time_criterion = max($GLOBALS['last_visit'], $startdate)) {
-                        $criteria_post  = ' p.post_time > ' . $time_criterion; // for all users
+                        $criteria_post  = ' p.post_time > '.$time_criterion; // for all users
                         $topics         = [];
                         $topic_lastread = newbbGetCookie('LT', true);
                         if (count($topic_lastread) > 0) {
@@ -233,7 +233,7 @@ 
                             }
                         }
                         if (count($topics) > 0) {
-                            $criteria_extra = ' AND t.topic_id NOT IN (' . implode(',', $topics) . ')';
+                            $criteria_extra = ' AND t.topic_id NOT IN ('.implode(',', $topics).')';
                         }
                     }
                     // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
@@ -241,7 +241,7 @@ 
                 break;
             case 'pending':
                 $post_on          = ' p.topic_id = t.topic_id';
-                $criteria_post    .= ' AND p.pid = 0';
+                $criteria_post .= ' AND p.pid = 0';
                 $criteria_approve = ' AND t.approved = 0';
                 break;
 
@@ -255,31 +255,31 @@ 
 
             default:
                 if ($startdate > 0) {
-                    $criteria_post = ' (p.post_time > ' . $startdate . ' OR t.topic_sticky=1)';
+                    $criteria_post = ' (p.post_time > '.$startdate.' OR t.topic_sticky=1)';
                 }
                 $sort_array[] = 't.topic_sticky DESC';
                 break;
         }
 
-        $select = 't.*, ' . ' p.post_time as last_post_time, p.poster_name as last_poster_name, p.icon, p.post_id, p.uid';
-        $from   = $this->db->prefix('newbb_topics') . ' t ' . $leftjoin;
-        $where  = $criteria_post . $criteria_topic . $criteria_forum . $criteria_extra . $criteria_approve;
+        $select = 't.*, '.' p.post_time as last_post_time, p.poster_name as last_poster_name, p.icon, p.post_id, p.uid';
+        $from   = $this->db->prefix('newbb_topics').' t '.$leftjoin;
+        $where  = $criteria_post.$criteria_topic.$criteria_forum.$criteria_extra.$criteria_approve;
 
         if ($excerpt) {
             $select .= ', p.post_karma, p.require_reply, pt.post_text';
-            $from   .= ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' pt ON pt.post_id = t.topic_last_post_id';
+            $from   .= ' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' pt ON pt.post_id = t.topic_last_post_id';
         }
         if ('u.uname' === $sort) {
             $sort = 't.topic_poster';
         }
 
-        $sort_array[] = trim($sort . ' ' . $order);
+        $sort_array[] = trim($sort.' '.$order);
         $sortby       = implode(', ', array_filter($sort_array));
         if (empty($sortby)) {
             $sortby = 't.topic_last_post_id DESC';
         }
 
-        $sql = 'SELECT ' . $select . ' FROM ' . $from . ' WHERE ' . $where . ' ORDER BY ' . $sortby;
+        $sql = 'SELECT '.$select.' FROM '.$from.' WHERE '.$where.' ORDER BY '.$sortby;
 
         if (!$result = $this->db->query($sql, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start)) {
             redirect_header('index.php', 2, _MD_NEWBB_ERROROCCURED);
@@ -304,16 +304,16 @@ 
 
             if ($myrow['topic_haspoll']) {
                 if ($myrow['topic_sticky']) {
-                    $topic_icon = newbbDisplayImage('topic_sticky', _MD_NEWBB_TOPICSTICKY) . '<br>' . newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL);
+                    $topic_icon = newbbDisplayImage('topic_sticky', _MD_NEWBB_TOPICSTICKY).'<br>'.newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL);
                 } else {
                     $topic_icon = newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL);
                 }
             } elseif ($myrow['topic_sticky']) {
                 $topic_icon = newbbDisplayImage('topic_sticky', _MD_NEWBB_TOPICSTICKY);
             } elseif (!empty($myrow['icon'])) {
-                $topic_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($myrow['icon']) . '" alt="" />';
+                $topic_icon = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($myrow['icon']).'" alt="" />';
             } else {
-                $topic_icon = '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
+                $topic_icon = '<img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />';
             }
 
             // ------------------------------------------------------
@@ -323,7 +323,7 @@ 
             if ($rating < 1) {
                 $rating_img = newbbDisplayImage('blank');
             } else {
-                $rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
+                $rating_img = newbbDisplayImage('rate'.$rating, constant('_MD_NEWBB_RATE'.$rating));
             }
             // ------------------------------------------------------
             // topic_page_jump
@@ -332,28 +332,28 @@ 
             $totalpages           = ceil(($myrow['topic_replies'] + 1) / $GLOBALS['xoopsModuleConfig']['posts_per_page']);
             if ($totalpages > 1) {
                 $topic_page_jump .= '&nbsp;&nbsp;';
-                $append          = false;
+                $append = false;
                 for ($i = 1; $i <= $totalpages; ++$i) {
                     if ($i > 3 && $i < $totalpages) {
                         if (!$append) {
                             $topic_page_jump .= '...';
-                            $append          = true;
+                            $append = true;
                         }
                     } else {
-                        $topic_page_jump .= '[<a href="' . XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'] . '&amp;start=' . (($i - 1) * $GLOBALS['xoopsModuleConfig']['posts_per_page']) . '">' . $i . '</a>]';
+                        $topic_page_jump .= '[<a href="'.XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$myrow['topic_id'].'&amp;start='.(($i - 1) * $GLOBALS['xoopsModuleConfig']['posts_per_page']).'">'.$i.'</a>]';
                         // irmtfan remove here and move
                         //$topic_page_jump_icon = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $myrow['post_id'] . "&amp;start=" . (($i - 1) * $GLOBALS['xoopsModuleConfig']['posts_per_page']) . "'>" . newbbDisplayImage('lastposticon',_MD_NEWBB_GOTOLASTPOST) . '</a>';
                     }
                 }
             }
             // irmtfan - move here for both topics with and without pages
-            $topic_page_jump_icon = "<a href='" . XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $myrow['post_id'] . "'>" . newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST) . '</a>';
+            $topic_page_jump_icon = "<a href='".XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$myrow['post_id']."'>".newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST).'</a>';
 
             // ------------------------------------------------------
             // => topic array
             $forum_link = '';
             if (!empty($viewAllForums[$myrow['forum_id']])) {
-                $forum_link = '<a href="' . XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $myrow['forum_id'] . '">' . $viewAllForums[$myrow['forum_id']]['forum_name'] . '</a>';
+                $forum_link = '<a href="'.XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$myrow['forum_id'].'">'.$viewAllForums[$myrow['forum_id']]['forum_name'].'</a>';
             }
 
             $topic_title = $myts->htmlSpecialChars($myrow['topic_title']);
@@ -362,7 +362,7 @@ 
             //$topic_title = '<span style="color:'.$typen[$myrow["type_id"]]["type_color"].'">['.$typen[$myrow["type_id"]]["type_name"].']</span> '.$topic_title.'';
             //}
             if ($myrow['topic_digest']) {
-                $topic_title = "<span class='digest'>" . $topic_title . '</span>';
+                $topic_title = "<span class='digest'>".$topic_title.'</span>';
             }
 
             if (0 == $excerpt) {
@@ -381,7 +381,7 @@ 
                 //'type_text'                 => $topic_prefix,/*irmtfan remove here and move to for loop*/
                 'topic_title'          => $topic_title,
                 //'topic_link'                => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
-                'topic_link'           => 'viewtopic.php?topic_id=' . $myrow['topic_id'],
+                'topic_link'           => 'viewtopic.php?topic_id='.$myrow['topic_id'],
                 'rating_img'           => $rating_img,
                 'topic_page_jump'      => $topic_page_jump,
                 'topic_page_jump_icon' => $topic_page_jump_icon,
@@ -456,10 +456,10 @@ 
         } // irmtfan end for loop
         // END irmtfan move to a for loop
         if (count($topics) > 0) {
-            $sql = ' SELECT DISTINCT topic_id FROM ' . $this->db->prefix('newbb_posts') . " WHERE attachment != ''" . ' AND topic_id IN (' . implode(',', array_keys($topics)) . ')';
+            $sql = ' SELECT DISTINCT topic_id FROM '.$this->db->prefix('newbb_posts')." WHERE attachment != ''".' AND topic_id IN ('.implode(',', array_keys($topics)).')';
             if ($result = $this->db->query($sql)) {
                 while (false !== (list($topic_id) = $this->db->fetchRow($result))) {
-                    $topics[$topic_id]['attachment'] = '&nbsp;' . newbbDisplayImage('attachment', _MD_NEWBB_TOPICSHASATT);
+                    $topics[$topic_id]['attachment'] = '&nbsp;'.newbbDisplayImage('attachment', _MD_NEWBB_TOPICSHASATT);
                 }
             }
         }
@@ -479,8 +479,8 @@ 
 
         $criteria_extra   = '';
         $criteria_approve = ' AND t.approved = 1'; // any others?
-        $leftjoin         = ' LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.post_id = t.topic_last_post_id';
-        $criteria_post    = ' p.post_time > ' . $startdate;
+        $leftjoin         = ' LEFT JOIN '.$this->db->prefix('newbb_posts').' p ON p.post_id = t.topic_last_post_id';
+        $criteria_post    = ' p.post_time > '.$startdate;
         switch ($type) {
             case 'digest':
                 $criteria_extra = ' AND topic_digest = 1';
@@ -495,7 +495,7 @@ 
 
                     $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
                     if (!empty($read_uid)) {
-                        $leftjoin      .= ' LEFT JOIN ' . $this->db->prefix('newbb_reads_topic') . ' r ON r.read_item = t.topic_id AND r.uid = ' . $read_uid . ' ';
+                        $leftjoin      .= ' LEFT JOIN '.$this->db->prefix('newbb_reads_topic').' r ON r.read_item = t.topic_id AND r.uid = '.$read_uid.' ';
                         $criteria_post .= ' AND (r.read_id IS NULL OR r.post_id < t.topic_last_post_id)';
                     } else {
                     }
@@ -503,7 +503,7 @@ 
                 } elseif (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
                     // START irmtfan fix read_mode = 1 bugs - for all users (member and anon)
                     if ($time_criterion = max($GLOBALS['last_visit'], $startdate)) {
-                        $criteria_post  = ' p.post_time > ' . $time_criterion; // for all users
+                        $criteria_post  = ' p.post_time > '.$time_criterion; // for all users
                         $topics         = [];
                         $topic_lastread = newbbGetCookie('LT', true);
                         if (count($topic_lastread) > 0) {
@@ -514,7 +514,7 @@ 
                             }
                         }
                         if (count($topics) > 0) {
-                            $criteria_extra = ' AND t.topic_id NOT IN (' . implode(',', $topics) . ')';
+                            $criteria_extra = ' AND t.topic_id NOT IN ('.implode(',', $topics).')';
                         }
                     }
                     // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
@@ -529,22 +529,22 @@ 
             case 'all':
                 break;
             default:
-                $criteria_post = ' (p.post_time > ' . $startdate . ' OR t.topic_sticky=1)';
+                $criteria_post = ' (p.post_time > '.$startdate.' OR t.topic_sticky=1)';
                 break;
         }
         $criteria_forum = '';
         if (is_object($forum)) {
-            $criteria_forum = ' AND t.forum_id = ' . $forum->getVar('forum_id');
+            $criteria_forum = ' AND t.forum_id = '.$forum->getVar('forum_id');
         } else {
             if (is_array($forum) && count($forum) > 0) {
-                $criteria_forum = ' AND t.forum_id IN (' . implode(',', array_keys($forum)) . ')';
+                $criteria_forum = ' AND t.forum_id IN ('.implode(',', array_keys($forum)).')';
             } elseif (!empty($forum)) {
-                $criteria_forum = ' AND t.forum_id =' . (int)$forum;
+                $criteria_forum = ' AND t.forum_id ='.(int)$forum;
             }
         }
 
-        $sql = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_topics') . ' t ' . $leftjoin;
-        $sql .= ' WHERE ' . $criteria_post . $criteria_forum . $criteria_extra . $criteria_approve;
+        $sql = 'SELECT COUNT(*) AS count FROM '.$this->db->prefix('newbb_topics').' t '.$leftjoin;
+        $sql .= ' WHERE '.$criteria_post.$criteria_forum.$criteria_extra.$criteria_approve;
         if (!$result = $this->db->query($sql)) {
             //xoops_error($this->db->error().'<br>'.$sql);
             return null;
@@ -572,7 +572,7 @@ 
             return true;
         }
 
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.user.php';
         if (newbbIsAdmin($forum)) {
             return true;
         }
@@ -673,7 +673,7 @@ 
                     "        OR parent_forum = forum_id";
         */
         $criteria = new \CriteriaCompo();
-        $criteria->add(new \Criteria('parent_forum', '(' . implode(', ', $forum_ids) . ')', 'NOT IN'), 'AND');
+        $criteria->add(new \Criteria('parent_forum', '('.implode(', ', $forum_ids).')', 'NOT IN'), 'AND');
         $criteria->add(new \Criteria('parent_forum', '`forum_id`', '='), 'OR');
         $b1 = $this->updateAll('parent_forum', 0, $criteria, true);
         // check cat_id orphan forums
@@ -683,7 +683,7 @@ 
             return false;
         }
         $criteria = new \CriteriaCompo();
-        $criteria->add(new \Criteria('cat_id', '(' . implode(', ', $cat_ids) . ')', 'NOT IN'), 'AND');
+        $criteria->add(new \Criteria('cat_id', '('.implode(', ', $cat_ids).')', 'NOT IN'), 'AND');
         $b2 = $this->updateAll('cat_id', $cat_ids[0], $criteria, true);
 
         return ($b1 && $b2);
@@ -717,7 +717,7 @@ 
         if (!$object->getVar('forum_id')) {
             return false;
         }
-        $sql = 'SELECT MAX(post_id) AS last_post, COUNT(*) AS total FROM ' . $this->db->prefix('newbb_posts') . ' AS p LEFT JOIN  ' . $this->db->prefix('newbb_topics') . ' AS t ON p.topic_id=t.topic_id WHERE p.approved=1 AND t.approved=1 AND p.forum_id = ' . $object->getVar('forum_id');
+        $sql = 'SELECT MAX(post_id) AS last_post, COUNT(*) AS total FROM '.$this->db->prefix('newbb_posts').' AS p LEFT JOIN  '.$this->db->prefix('newbb_topics').' AS t ON p.topic_id=t.topic_id WHERE p.approved=1 AND t.approved=1 AND p.forum_id = '.$object->getVar('forum_id');
 
         if ($result = $this->db->query($sql)) {
             $last_post = 0;
@@ -734,7 +734,7 @@ 
             }
         }
 
-        $sql = 'SELECT COUNT(*) AS total FROM ' . $this->db->prefix('newbb_topics') . ' WHERE approved=1 AND forum_id = ' . $object->getVar('forum_id');
+        $sql = 'SELECT COUNT(*) AS total FROM '.$this->db->prefix('newbb_topics').' WHERE approved=1 AND forum_id = '.$object->getVar('forum_id');
         if ($result = $this->db->query($sql)) {
             if ($row = $this->db->fetchArray($result)) {
                 if ($object->getVar('forum_topics') !== $row['total']) {
@@ -776,7 +776,7 @@ 
         if (!$forums_id) {
             return $stats;
         }
-        $sql = '    SELECT forum_posts AS posts, forum_topics AS topics, forum_id AS id' . '    FROM ' . $this->table . '    WHERE forum_id IN (' . implode(', ', $forums_id) . ')';
+        $sql = '    SELECT forum_posts AS posts, forum_topics AS topics, forum_id AS id'.'    FROM '.$this->table.'    WHERE forum_id IN ('.implode(', ', $forums_id).')';
         if (!$result = $this->db->query($sql)) {
             return $stats;
         }
@@ -821,7 +821,7 @@ 
             if (!empty($length_title_index)) {
                 $tags_post[] = 'subject';
             }
-            $posts = $postHandler->getAll(new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN'), $tags_post, false);
+            $posts = $postHandler->getAll(new \Criteria('post_id', '('.implode(', ', $posts).')', 'IN'), $tags_post, false);
         }
 
         // Get topic/post stats per forum
@@ -836,7 +836,7 @@ 
         $topics = [];
 
         foreach (array_keys($forums) as $id) {
-            $forum =& $forums[$id];
+            $forum = & $forums[$id];
 
             if (!$forum['forum_last_post_id']) {
                 continue;
@@ -868,7 +868,7 @@ 
         $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
 
         foreach (array_keys($forums) as $id) {
-            $forum =& $forums[$id];
+            $forum = & $forums[$id];
 
             $_forum_data                 = [];
             $_forum_data['forum_order']  = $forum['forum_order'];
@@ -891,7 +891,7 @@ 
 
             // irmtfan change if/endif to if{} method
             if ($post_id = $forum['forum_last_post_id']) {
-                $post                               =& $posts[$post_id];
+                $post                               = & $posts[$post_id];
                 $_forum_data['forum_lastpost_id']   = $post_id;
                 $_forum_data['forum_lastpost_time'] = newbbFormatTimestamp($post['post_time']);
                 if (!empty($users_linked[$post['uid']])) {
@@ -947,7 +947,7 @@ 
         }
         $forumsObject = $this->getByPermission($cat_id, $perm_string, $tags);
 
-        require_once __DIR__ . '/tree.php';
+        require_once __DIR__.'/tree.php';
         $forums_structured = [];
         foreach (array_keys($forumsObject) as $key) {
             $forums_structured[$forumsObject[$key]->getVar('cat_id')][$key] = $forumsObject[$key];
@@ -983,10 +983,10 @@ 
         }
         $forumsObject = $this->getByPermission($cat_id, $perm_string, $tags);
 
-        require_once __DIR__ . '/tree.php';
+        require_once __DIR__.'/tree.php';
         $forums_structured = [];
         foreach (array_keys($forumsObject) as $key) {
-            $forumObject                                             =& $forumsObject[$key];
+            $forumObject                                             = & $forumsObject[$key];
             $forums_structured[$forumObject->getVar('cat_id')][$key] = $forumsObject[$key];
         }
         foreach (array_keys($forums_structured) as $cid) {
@@ -1013,7 +1013,7 @@ 
         if (!$parents = newbbGetParentForum($object->getVar('forum_id'))) {
             return $ret;
         }
-        $parents_list = $this->getList(new \Criteria('forum_id', '(' . implode(', ', $parents) . ')', 'IN'));
+        $parents_list = $this->getList(new \Criteria('forum_id', '('.implode(', ', $parents).')', 'IN'));
         foreach ($parents as $key => $id) {
             $ret[] = ['forum_id' => $id, 'forum_name' => $parents_list[$id]];
         }

class/Topic.php

Spacing +4 added lines, -4 removed lines

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

class/OnlineHandler.php

Indentation +12 added lines, -12 removed lines

@@ -252,18 +252,18 @@
         $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 ) )';
+                . $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;

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once __DIR__ . '/../include/functions.config.php';
+require_once __DIR__.'/../include/functions.config.php';
 
 /**
  * Class OnlineHandler
@@ -96,8 +96,8 @@ 
      */
     public function render(\Smarty $xoopsTpl)
     {
-        require_once __DIR__ . '/../include/functions.render.php';
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.render.php';
+        require_once __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 __DIR__ . '/../include/functions.render.php';
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.render.php';
+        require_once __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;
@@ -229,15 +229,15 @@ 
 
         $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;

class/ReadForumHandler.php

Spacing +1 added lines, -1 removed lines

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

polls.php

Indentation +18 added lines, -18 removed lines

@@ -119,12 +119,12 @@ 
             $classOption  = $classPoll . 'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
             $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
-                                                                                                          . XOOPS_URL
-                                                                                                          . '/userinfo.php?uid='
-                                                                                                          . $GLOBALS['xoopsUser']->getVar('uid')
-                                                                                                          . "'>"
-                                                                                                          . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
-                                                                                                          . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
+                                                                                                            . XOOPS_URL
+                                                                                                            . '/userinfo.php?uid='
+                                                                                                            . $GLOBALS['xoopsUser']->getVar('uid')
+                                                                                                            . "'>"
+                                                                                                            . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
+                                                                                                            . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
             $poll_form->addElement($author_label);
             $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
             $poll_form->addElement($question_text);
@@ -154,12 +154,12 @@ 
                 $color_select->addOptionArray($barcolor_array);
                 $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . XOOPS_URL
-                                                      . '/modules/'
-                                                      . $GLOBALS['xoopsModuleConfig']['poll_module']
-                                                      . '/assets/images/colorbars/'
-                                                      . $current_bar
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
+                                                        . XOOPS_URL
+                                                        . '/modules/'
+                                                        . $GLOBALS['xoopsModuleConfig']['poll_module']
+                                                        . '/assets/images/colorbars/'
+                                                        . $current_bar
+                                                        . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
                 if (!next($barcolor_array)) {
@@ -228,8 +228,8 @@ 
                 $color_select->addOptionArray($barcolor_array);
                 $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                                                        . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+                                                        . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
                 unset($color_select, $color_label);
@@ -518,8 +518,8 @@ 
                 $color_select->addOptionArray($barcolor_array);
                 $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                                                        . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
+                                                        . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
                 unset($color_select, $color_label, $option_text);
@@ -652,9 +652,9 @@ 
         $expire_text = new \XoopsFormText(
             _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
             _MD_NEWBB_POLL_EXPIREDAT,
-                                                                                                                                                                                                                     formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
+                                                                                                                                                                                                                        formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
         ) . '</small>',
-                                         'end_time',
+                                            'end_time',
             20,
             19,
             formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')

Switch Indentation +574 added lines, -574 removed lines

@@ -109,213 +109,377 @@ 
     }
 }
 switch ($op) {
-    case 'add':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
-            $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classOption  = $classPoll . 'Option';
-            $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
-                                                                                                          . XOOPS_URL
-                                                                                                          . '/userinfo.php?uid='
-                                                                                                          . $GLOBALS['xoopsUser']->getVar('uid')
-                                                                                                          . "'>"
-                                                                                                          . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
-                                                                                                          . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
-            $poll_form->addElement($author_label);
-            $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
-            $poll_form->addElement($question_text);
-            $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description');
-            $poll_form->addElement($desc_tarea);
-            $currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
-            $endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
-            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
-            $poll_form->addElement($expire_text);
+        case 'add':
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
+                $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
+            // old xoopspoll or umfrage or any clone from them
+            } else {
+                $classOption  = $classPoll . 'Option';
+                $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
+                $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
+                                                                                                              . XOOPS_URL
+                                                                                                              . '/userinfo.php?uid='
+                                                                                                              . $GLOBALS['xoopsUser']->getVar('uid')
+                                                                                                              . "'>"
+                                                                                                              . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
+                                                                                                              . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
+                $poll_form->addElement($author_label);
+                $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
+                $poll_form->addElement($question_text);
+                $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description');
+                $poll_form->addElement($desc_tarea);
+                $currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
+                $endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
+                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
+                $poll_form->addElement($expire_text);
 
-            $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
-            $poll_form->addElement($weight_text);
-
-            $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', 0);
-            $poll_form->addElement($multi_yn);
-
-            $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1);
-            $poll_form->addElement($notify_yn);
-
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
-            for ($i = 0; $i < 10; ++$i) {
-                $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
-                $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
-                $option_tray->addElement($option_text);
-                $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . XOOPS_URL
-                                                      . '/modules/'
-                                                      . $GLOBALS['xoopsModuleConfig']['poll_module']
-                                                      . '/assets/images/colorbars/'
-                                                      . $current_bar
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                if (!next($barcolor_array)) {
-                    reset($barcolor_array);
+                $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
+                $poll_form->addElement($weight_text);
+
+                $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', 0);
+                $poll_form->addElement($multi_yn);
+
+                $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1);
+                $poll_form->addElement($notify_yn);
+
+                $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+                $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+                for ($i = 0; $i < 10; ++$i) {
+                    $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
+                    $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
+                    $option_tray->addElement($option_text);
+                    $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
+                    $color_select->addOptionArray($barcolor_array);
+                    $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
+                    $color_label = new \XoopsFormLabel('', "<img src='"
+                                                          . XOOPS_URL
+                                                          . '/modules/'
+                                                          . $GLOBALS['xoopsModuleConfig']['poll_module']
+                                                          . '/assets/images/colorbars/'
+                                                          . $current_bar
+                                                          . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
+                    $option_tray->addElement($color_select);
+                    $option_tray->addElement($color_label);
+                    if (!next($barcolor_array)) {
+                        reset($barcolor_array);
+                    }
+                    unset($color_select, $color_label);
                 }
-                unset($color_select, $color_label);
+                $poll_form->addElement($option_tray);
+
+                $poll_form->addElement(new \XoopsFormHidden('op', 'save'));
+                $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+                $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+                $poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
+                $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+                echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
+                $poll_form->display();
             }
-            $poll_form->addElement($option_tray);
-
-            $poll_form->addElement(new \XoopsFormHidden('op', 'save'));
-            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-            $poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
-            $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
-            $poll_form->display();
-        }
-        break; // op: add
+            break; // op: add
 
-    case 'edit':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
-            $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classOption  = $classPoll . 'Option';
-            $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
-            $poll_form->addElement($author_label);
-            $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
-            $poll_form->addElement($question_text);
-            $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description', $pollObject->getVar('description', 'E'));
-            $poll_form->addElement($desc_tarea);
-            $date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
-            if (!$pollObject->hasExpired()) {
-                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
-                $poll_form->addElement($expire_text);
+        case 'edit':
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
+                $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
+            // old xoopspoll or umfrage or any clone from them
             } else {
-                // irmtfan full URL - add topic_id
-                $restart_label = new \XoopsFormLabel(
-                    _MD_NEWBB_POLL_EXPIRATION,
-                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
-                );
-                $poll_form->addElement($restart_label);
-            }
-            $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, $pollObject->getVar('weight'));
-            $poll_form->addElement($weight_text);
-            $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
-            $poll_form->addElement($multi_yn);
-            $options_arr  =& $classOption::getAllByPollId($poll_id);
-            $notify_value = 1;
-            if (0 !== $pollObject->getVar('mail_status')) {
-                $notify_value = 0;
-            }
-            $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', $notify_value);
-            $poll_form->addElement($notify_yn);
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/"));
-            $i              = 0;
-            foreach ($options_arr as $option) {
-                /** @var \XoopsPoll $option */
-                $option_tray->addElement(new \XoopsFormText('', 'option_text[]', 50, 255, $option->getVar('option_text')));
-                $option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
-                $color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                unset($color_select, $color_label);
-                ++$i;
+                $classOption  = $classPoll . 'Option';
+                $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
+                $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
+                $poll_form->addElement($author_label);
+                $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
+                $poll_form->addElement($question_text);
+                $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description', $pollObject->getVar('description', 'E'));
+                $poll_form->addElement($desc_tarea);
+                $date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
+                if (!$pollObject->hasExpired()) {
+                    $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
+                    $poll_form->addElement($expire_text);
+                } else {
+                    // irmtfan full URL - add topic_id
+                    $restart_label = new \XoopsFormLabel(
+                        _MD_NEWBB_POLL_EXPIRATION,
+                                                        sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
+                    );
+                    $poll_form->addElement($restart_label);
+                }
+                $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, $pollObject->getVar('weight'));
+                $poll_form->addElement($weight_text);
+                $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
+                $poll_form->addElement($multi_yn);
+                $options_arr  =& $classOption::getAllByPollId($poll_id);
+                $notify_value = 1;
+                if (0 !== $pollObject->getVar('mail_status')) {
+                    $notify_value = 0;
+                }
+                $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', $notify_value);
+                $poll_form->addElement($notify_yn);
+                $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+                $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/"));
+                $i              = 0;
+                foreach ($options_arr as $option) {
+                    /** @var \XoopsPoll $option */
+                    $option_tray->addElement(new \XoopsFormText('', 'option_text[]', 50, 255, $option->getVar('option_text')));
+                    $option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
+                    $color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
+                    $color_select->addOptionArray($barcolor_array);
+                    $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                    $color_label = new \XoopsFormLabel('', "<img src='"
+                                                          . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+                                                          . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                    $option_tray->addElement($color_select);
+                    $option_tray->addElement($color_label);
+                    unset($color_select, $color_label);
+                    ++$i;
+                }
+                // irmtfan full URL
+                $more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
+                $option_tray->addElement($more_label);
+                $poll_form->addElement($option_tray);
+                $poll_form->addElement(new \XoopsFormHidden('op', 'update'));
+                $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+                $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+                $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+
+                echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+                $poll_form->display();
             }
-            // irmtfan full URL
-            $more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
-            $option_tray->addElement($more_label);
-            $poll_form->addElement($option_tray);
-            $poll_form->addElement(new \XoopsFormHidden('op', 'update'));
-            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-            $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+            break; // op: edit
 
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-            $poll_form->display();
-        }
-        break; // op: edit
+        case 'save':
+            // old xoopspoll or umfrage or any clone from them
+            if ($pollModuleHandler->getVar('version') < 140) {
+                // check security token
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                }
+                /*
+             * The option check should be done before submitting
+             */
+                $option_empty = true;
+                if (!Request::getString('option_text', '', 'POST')) {
+                    // irmtfan - issue with javascript:history.go(-1)
+                    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                }
+                $option_text = Request::getArray('option_text', '', 'POST');
+                foreach ($option_text as $optxt) {
+                    if ('' !== trim($optxt)) {
+                        $option_empty = false;
+                        break;
+                    }
+                }
+                if ($option_empty) {
+                    // irmtfan - issue with javascript:history.go(-1)
+                    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                }
+                $pollObject->setVar('question', Request::getString('question', '', 'POST'));
+                $pollObject->setVar('description', Request::getString('description', '', 'POST'));
+                $end_time = Request::getString('end_time', '', 'POST'); // (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
+                if ('' !== $end_time) {
+                    $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+                    $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+                } else {
+                    // if expiration date is not set, set it to 10 days from now
+                    $pollObject->setVar('end_time', time() + (86400 * 10));
+                }
 
-    case 'save':
-        // old xoopspoll or umfrage or any clone from them
-        if ($pollModuleHandler->getVar('version') < 140) {
+                $pollObject->setVar('display', 0);
+                $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
+                $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
+                $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
+                if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
+                    // if notify, set mail status to "not mailed"
+                    $pollObject->setVar('mail_status', POLL_NOTMAILED);
+                } else {
+                    // if not notify, set mail status to already "mailed"
+                    $pollObject->setVar('mail_status', POLL_MAILED);
+                }
+                $new_poll_id = $pollObject->store();
+                if (empty($new_poll_id)) {
+                    xoops_error($pollObject->getHtmlErrors);
+                    break;
+                }
+                $i            = 0;
+                $option_color = Request::getArray('option_color', null, 'POST');
+                $classOption  = $classPoll . 'Option';
+                foreach ($option_text as $optxt) {
+                    $optxt = trim($optxt);
+                    /** @var XoopspollOption $optionObject */
+                    $optionObject = new $classOption();
+                    if ('' !== $optxt) {
+                        $optionObject->setVar('option_text', $optxt);
+                        $optionObject->setVar('option_color', $option_color[$i]);
+                        $optionObject->setVar('poll_id', $new_poll_id);
+                        $optionObject->store();
+                    }
+                    ++$i;
+                }
+                // clear the template cache so changes take effect immediately
+                require_once $GLOBALS['xoops']->path('class/template.php');
+                xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+                xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+
+                // update topic to indicate it has a poll
+                $topicObject->setVar('topic_haspoll', 1);
+                $topicObject->setVar('poll_id', $new_poll_id);
+                $success = $topicHandler->insert($topicObject);
+                if (!$success) {
+                    xoops_error($topicHandler->getHtmlErrors());
+                } else {
+                    redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+                }
+                break;// op: save
+            }
+        // no break
+        case 'update':
             // check security token
             if (!$GLOBALS['xoopsSecurity']->check()) {
                 redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
             }
-            /*
-             * The option check should be done before submitting
-             */
-            $option_empty = true;
-            if (!Request::getString('option_text', '', 'POST')) {
-                // irmtfan - issue with javascript:history.go(-1)
+            /* make sure there's at least one option */
+            $option_text   = Request::getString('option_text', '', 'POST');
+            $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
+            $option_string = trim($option_string);
+            if ('' === $option_string) {
                 redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
             }
-            $option_text = Request::getArray('option_text', '', 'POST');
-            foreach ($option_text as $optxt) {
-                if ('' !== trim($optxt)) {
-                    $option_empty = false;
-                    break;
+
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                /** @var \XoopspollOptionHandler $xpOptHandler */
+                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                /** @var \XoopspollLogHandler $xpLogHandler */
+                $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+                //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
+                $classConstants   = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+                $notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
+                $currentTimestamp = time();
+                //$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
+                //                                                             : strtotime(Request::getString('xu_end_time', null, 'POST'));
+                $xuEndTimestamp = strtotime(Request::getString('xu_end_time', null, 'POST'));
+                $endTimestamp   = (!Request::getString('xu_end_time', null, 'POST')) ? ($currentTimestamp + $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
+                //$xuStartTimestamp = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_start_time', null, 'POST'))
+                //                                                             : strtotime(Request::getString('xu_start_time', null, 'POST'));
+                $xuStartTimestamp = strtotime(Request::getString('xu_start_time', null, 'POST'));
+                $startTimestamp   = (!Request::getString('xu_start_time', null, 'POST')) ? ($endTimestamp - $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
+
+                //  don't allow changing start time if there are votes in the log
+                if (($startTimestamp < $pollObject->getVar('start_time'))
+                    && ($xpLogHandler->getTotalVotesByPollId($poll_id) > 0)) {
+                    $startTimestamp = $pollObject->getVar('start_time'); //don't change start time
                 }
-            }
-            if ($option_empty) {
-                // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-            }
-            $pollObject->setVar('question', Request::getString('question', '', 'POST'));
-            $pollObject->setVar('description', Request::getString('description', '', 'POST'));
-            $end_time = Request::getString('end_time', '', 'POST'); // (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
-            if ('' !== $end_time) {
-                $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-                $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-            } else {
-                // if expiration date is not set, set it to 10 days from now
-                $pollObject->setVar('end_time', time() + (86400 * 10));
-            }
 
-            $pollObject->setVar('display', 0);
-            $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
-            $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
-            $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
-            if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
-                // if notify, set mail status to "not mailed"
-                $pollObject->setVar('mail_status', POLL_NOTMAILED);
+                $poll_vars = [
+                    'user_id'     => Request::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
+                    'question'    => Request::getString('question', null, 'POST'),
+                    'description' => Request::getText('description', null, 'POST'),
+                    'mail_status' => ($classConstants::NOTIFICATION_ENABLED == $notify) ? $classConstants::POLL_NOT_MAILED : $classConstants::POLL_MAILED,
+                    'mail_voter'  => Request::getInt('mail_voter', $classConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
+                    'start_time'  => $startTimestamp,
+                    'end_time'    => $endTimestamp,
+                    'display'     => Request::getInt('display', $classConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
+                    'visibility'  => Request::getInt('visibility', $classConstants::HIDE_NEVER, 'POST'),
+                    'weight'      => Request::getInt('weight', $classConstants::DEFAULT_WEIGHT, 'POST'),
+                    'multiple'    => Request::getInt('multiple', $classConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
+                    'multilimit'  => Request::getInt('multilimit', $classConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
+                    'anonymous'   => Request::getInt('anonymous', $classConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST')
+                ];
+                $pollObject->setVars($poll_vars);
+                $poll_id = $xpPollHandler->insert($pollObject);
+                if (!$poll_id) {
+                    $err = $pollObject->getHtmlErrors();
+                    exit($err);
+                }
+
+                // now get the options
+                $optionIdArray    = Request::getArray('option_id', [], 'POST');
+                $optionIdArray    = array_map('intval', $optionIdArray);
+                $optionTextArray  = Request::getArray('option_text', [], 'POST');
+                $optionColorArray = Request::getArray('option_color', [], 'POST');
+
+                foreach ($optionIdArray as $key => $oId) {
+                    if (!empty($oId) && ($optionObject = $xpOptHandler->get($oId))) {
+                        // existing option object so need to update it
+                        $optionTextArray[$key] = trim($optionTextArray[$key]);
+                        if ('' === $optionTextArray[$key]) {
+                            // want to delete this option
+                            if (false !== $xpOptHandler->delete($optionObject)) {
+                                // now remove it from the log
+                                $xpLogHandler->deleteByOptionId($optionObject->getVar('option_id'));
+                                //update vote count in poll
+                                $xpPollHandler->updateCount($pollObject);
+                            } else {
+                                xoops_error($xpLogHandler->getHtmlErrors());
+                                break;
+                            }
+                        } else {
+                            $optionObject->setVar('option_text', $optionTextArray[$key]);
+                            $optionObject->setVar('option_color', $optionColorArray[$key]);
+                            $optionObject->setVar('poll_id', $poll_id);
+                            $xpOptHandler->insert($optionObject);
+                        }
+                    } else {
+                        // new option object
+                        $optionObject          = $xpOptHandler->create();
+                        $optionTextArray[$key] = trim($optionTextArray[$key]);
+                        if ('' !== $optionTextArray[$key]) { // ignore if text is empty
+                            $optionObject->setVar('option_text', $optionTextArray[$key]);
+                            $optionObject->setVar('option_color', $optionColorArray[$key]);
+                            $optionObject->setVar('poll_id', $poll_id);
+                            $xpOptHandler->insert($optionObject);
+                        }
+                        unset($optionObject);
+                    }
+                }
+                // old xoopspoll or umfrage or any clone from them
             } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', POLL_MAILED);
-            }
-            $new_poll_id = $pollObject->store();
-            if (empty($new_poll_id)) {
-                xoops_error($pollObject->getHtmlErrors);
-                break;
-            }
-            $i            = 0;
-            $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            foreach ($option_text as $optxt) {
-                $optxt = trim($optxt);
-                /** @var XoopspollOption $optionObject */
-                $optionObject = new $classOption();
-                if ('' !== $optxt) {
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->setVar('poll_id', $new_poll_id);
-                    $optionObject->store();
+                $pollObject->setVar('question', Request::getString('question', '', 'POST'));
+                $pollObject->setVar('description', Request::getString('description', '', 'POST'));
+
+                $end_time = Request::getString('end_time', '', 'POST');
+                if ('' !== $end_time) {
+                    $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+                    $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
                 }
-                ++$i;
+                $pollObject->setVar('display', 0);
+                $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
+                $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
+                $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
+                if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
+                    // if notify, set mail status to "not mailed"
+                    $pollObject->setVar('mail_status', POLL_NOTMAILED);
+                } else {
+                    // if not notify, set mail status to already "mailed"
+                    $pollObject->setVar('mail_status', POLL_MAILED);
+                }
+
+                if (!$pollObject->store()) {
+                    xoops_error($pollObject->getHtmlErrors);
+                    break;
+                }
+                $i            = 0;
+                $option_id    = Request::getArray('option_id', null, 'POST');
+                $option_color = Request::getArray('option_color', null, 'POST');
+                $classOption  = $classPoll . 'Option';
+                $classLog     = $classPoll . 'Log';
+                foreach ($option_id as $opid) {
+                    $optionObject    = new $classOption($opid);
+                    $option_text[$i] = trim($option_text[$i]);
+                    if ('' !== $option_text[$i]) {
+                        $optionObject->setVar('option_text', $option_text[$i]);
+                        $optionObject->setVar('option_color', $option_color[$i]);
+                        $optionObject->store();
+                    } else {
+                        if (false !== $optionObject->delete()) {
+                            $classLog::deleteByOptionId($option->getVar('option_id'));
+                        }
+                    }
+                    ++$i;
+                }
+                $pollObject->updateCount();
             }
             // clear the template cache so changes take effect immediately
             require_once $GLOBALS['xoops']->path('class/template.php');
@@ -324,433 +488,269 @@ 
 
             // update topic to indicate it has a poll
             $topicObject->setVar('topic_haspoll', 1);
-            $topicObject->setVar('poll_id', $new_poll_id);
+            $topicObject->setVar('poll_id', $pollObject->getVar('poll_id'));
             $success = $topicHandler->insert($topicObject);
             if (!$success) {
                 xoops_error($topicHandler->getHtmlErrors());
             } else {
                 redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
             }
-            break;// op: save
-        }
-    // no break
-    case 'update':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        /* make sure there's at least one option */
-        $option_text   = Request::getString('option_text', '', 'POST');
-        $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
-        $option_string = trim($option_string);
-        if ('' === $option_string) {
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-        }
-
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            /** @var \XoopspollOptionHandler $xpOptHandler */
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            /** @var \XoopspollLogHandler $xpLogHandler */
-            $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-            //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
-            $classConstants   = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
-            $notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
-            $currentTimestamp = time();
-            //$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
-            //                                                             : strtotime(Request::getString('xu_end_time', null, 'POST'));
-            $xuEndTimestamp = strtotime(Request::getString('xu_end_time', null, 'POST'));
-            $endTimestamp   = (!Request::getString('xu_end_time', null, 'POST')) ? ($currentTimestamp + $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
-            //$xuStartTimestamp = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_start_time', null, 'POST'))
-            //                                                             : strtotime(Request::getString('xu_start_time', null, 'POST'));
-            $xuStartTimestamp = strtotime(Request::getString('xu_start_time', null, 'POST'));
-            $startTimestamp   = (!Request::getString('xu_start_time', null, 'POST')) ? ($endTimestamp - $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
-
-            //  don't allow changing start time if there are votes in the log
-            if (($startTimestamp < $pollObject->getVar('start_time'))
-                && ($xpLogHandler->getTotalVotesByPollId($poll_id) > 0)) {
-                $startTimestamp = $pollObject->getVar('start_time'); //don't change start time
+            break;// op: save | update
+
+        case 'addmore':
+            $question = $pollObject->getVar('question');
+            unset($pollObject);
+            $poll_form = new \XoopsThemeForm(_MD_NEWBB_POLL_ADDMORE, 'poll_form', 'polls.php', 'post', true);
+            $poll_form->addElement(new \XoopsFormLabel(_MD_NEWBB_POLL_POLLQUESTION, $question));
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                $option_tray  = $xpOptHandler->renderOptionFormTray($poll_id);
+            // old xoopspoll or umfrage or any clone from them
+            } else {
+                $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+                $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+                for ($i = 0; $i < 10; ++$i) {
+                    $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
+                    $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
+                    $option_tray->addElement($option_text);
+                    $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
+                    $color_select->addOptionArray($barcolor_array);
+                    $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                    $color_label = new \XoopsFormLabel('', "<img src='"
+                                                          . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
+                                                          . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                    $option_tray->addElement($color_select);
+                    $option_tray->addElement($color_label);
+                    unset($color_select, $color_label, $option_text);
+                    if (!next($barcolor_array)) {
+                        reset($barcolor_array);
+                    }
+                }
             }
+            $poll_form->addElement($option_tray);
+            $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+            $poll_form->addElement(new \XoopsFormHidden('op', 'savemore'));
+            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
 
-            $poll_vars = [
-                'user_id'     => Request::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
-                'question'    => Request::getString('question', null, 'POST'),
-                'description' => Request::getText('description', null, 'POST'),
-                'mail_status' => ($classConstants::NOTIFICATION_ENABLED == $notify) ? $classConstants::POLL_NOT_MAILED : $classConstants::POLL_MAILED,
-                'mail_voter'  => Request::getInt('mail_voter', $classConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
-                'start_time'  => $startTimestamp,
-                'end_time'    => $endTimestamp,
-                'display'     => Request::getInt('display', $classConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
-                'visibility'  => Request::getInt('visibility', $classConstants::HIDE_NEVER, 'POST'),
-                'weight'      => Request::getInt('weight', $classConstants::DEFAULT_WEIGHT, 'POST'),
-                'multiple'    => Request::getInt('multiple', $classConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
-                'multilimit'  => Request::getInt('multilimit', $classConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
-                'anonymous'   => Request::getInt('anonymous', $classConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST')
-            ];
-            $pollObject->setVars($poll_vars);
-            $poll_id = $xpPollHandler->insert($pollObject);
-            if (!$poll_id) {
-                $err = $pollObject->getHtmlErrors();
-                exit($err);
+            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+            $poll_form->display();
+            break;
+
+        case 'savemore':
+            // check security token
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
             }
 
-            // now get the options
-            $optionIdArray    = Request::getArray('option_id', [], 'POST');
-            $optionIdArray    = array_map('intval', $optionIdArray);
-            $optionTextArray  = Request::getArray('option_text', [], 'POST');
-            $optionColorArray = Request::getArray('option_color', [], 'POST');
-
-            foreach ($optionIdArray as $key => $oId) {
-                if (!empty($oId) && ($optionObject = $xpOptHandler->get($oId))) {
-                    // existing option object so need to update it
-                    $optionTextArray[$key] = trim($optionTextArray[$key]);
-                    if ('' === $optionTextArray[$key]) {
-                        // want to delete this option
-                        if (false !== $xpOptHandler->delete($optionObject)) {
-                            // now remove it from the log
-                            $xpLogHandler->deleteByOptionId($optionObject->getVar('option_id'));
-                            //update vote count in poll
-                            $xpPollHandler->updateCount($pollObject);
-                        } else {
-                            xoops_error($xpLogHandler->getHtmlErrors());
-                            break;
-                        }
-                    } else {
-                        $optionObject->setVar('option_text', $optionTextArray[$key]);
-                        $optionObject->setVar('option_color', $optionColorArray[$key]);
+            $option_text   = Request::getString('option_text', '', 'POST');
+            $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
+            $option_string = trim($option_string);
+            if ('' === $option_string) {
+                // irmtfan - issue with javascript:history.go(-1)
+                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            }
+            $i            = 0;
+            $option_color = Request::getArray('option_color', null, 'POST');
+            foreach ($option_text as $optxt) {
+                $optxt = trim($optxt);
+                if ('' !== $optxt) {
+                    // new xoopspoll module
+                    if ($pollModuleHandler->getVar('version') >= 140) {
+                        $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                        $optionObject = $xpOptHandler->create();
+                        $optionObject->setVar('option_text', $optxt);
                         $optionObject->setVar('poll_id', $poll_id);
+                        $optionObject->setVar('option_color', $option_color[$i]);
                         $xpOptHandler->insert($optionObject);
-                    }
-                } else {
-                    // new option object
-                    $optionObject          = $xpOptHandler->create();
-                    $optionTextArray[$key] = trim($optionTextArray[$key]);
-                    if ('' !== $optionTextArray[$key]) { // ignore if text is empty
-                        $optionObject->setVar('option_text', $optionTextArray[$key]);
-                        $optionObject->setVar('option_color', $optionColorArray[$key]);
+                    // old xoopspoll or umfrage or any clone from them
+                    } else {
+                        $classOption  = $classPoll . 'Option';
+                        $optionObject = new $classOption();
+                        $optionObject->setVar('option_text', $optxt);
                         $optionObject->setVar('poll_id', $poll_id);
-                        $xpOptHandler->insert($optionObject);
+                        $optionObject->setVar('option_color', $option_color[$i]);
+                        $optionObject->store();
                     }
                     unset($optionObject);
                 }
+                ++$i;
             }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            $pollObject->setVar('question', Request::getString('question', '', 'POST'));
-            $pollObject->setVar('description', Request::getString('description', '', 'POST'));
+            require_once $GLOBALS['xoops']->path('class/template.php');
+            xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+            xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+            redirect_header("polls.php?op=edit&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+            break;
 
-            $end_time = Request::getString('end_time', '', 'POST');
-            if ('' !== $end_time) {
-                $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-                $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-            }
-            $pollObject->setVar('display', 0);
-            $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
-            $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
-            $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
-            if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
-                // if notify, set mail status to "not mailed"
-                $pollObject->setVar('mail_status', POLL_NOTMAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', POLL_MAILED);
-            }
+        case 'delete':
+            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+            xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
+            break;
 
-            if (!$pollObject->store()) {
-                xoops_error($pollObject->getHtmlErrors);
-                break;
+        case 'delete_ok':
+            // check security token
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
             }
-            $i            = 0;
-            $option_id    = Request::getArray('option_id', null, 'POST');
-            $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            $classLog     = $classPoll . 'Log';
-            foreach ($option_id as $opid) {
-                $optionObject    = new $classOption($opid);
-                $option_text[$i] = trim($option_text[$i]);
-                if ('' !== $option_text[$i]) {
-                    $optionObject->setVar('option_text', $option_text[$i]);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->store();
+            //try and delete the poll
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                $status = $xpPollHandler->delete($pollObject);
+                if (false !== $status) {
+                    $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                    $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+                    $xpOptHandler->deleteByPollId($poll_id);
+                    $xpLogHandler->deleteByPollId($poll_id);
                 } else {
-                    if (false !== $optionObject->delete()) {
-                        $classLog::deleteByOptionId($option->getVar('option_id'));
-                    }
-                }
-                ++$i;
-            }
-            $pollObject->updateCount();
-        }
-        // clear the template cache so changes take effect immediately
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-
-        // update topic to indicate it has a poll
-        $topicObject->setVar('topic_haspoll', 1);
-        $topicObject->setVar('poll_id', $pollObject->getVar('poll_id'));
-        $success = $topicHandler->insert($topicObject);
-        if (!$success) {
-            xoops_error($topicHandler->getHtmlErrors());
-        } else {
-            redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-        }
-        break;// op: save | update
-
-    case 'addmore':
-        $question = $pollObject->getVar('question');
-        unset($pollObject);
-        $poll_form = new \XoopsThemeForm(_MD_NEWBB_POLL_ADDMORE, 'poll_form', 'polls.php', 'post', true);
-        $poll_form->addElement(new \XoopsFormLabel(_MD_NEWBB_POLL_POLLQUESTION, $question));
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            $option_tray  = $xpOptHandler->renderOptionFormTray($poll_id);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
-            for ($i = 0; $i < 10; ++$i) {
-                $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
-                $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
-                $option_tray->addElement($option_text);
-                $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                unset($color_select, $color_label, $option_text);
-                if (!next($barcolor_array)) {
-                    reset($barcolor_array);
+                    $msg = $xpPollHandler->getHtmlErrors();
                 }
-            }
-        }
-        $poll_form->addElement($option_tray);
-        $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-        $poll_form->addElement(new \XoopsFormHidden('op', 'savemore'));
-        $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-        $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        $poll_form->display();
-        break;
-
-    case 'savemore':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-
-        $option_text   = Request::getString('option_text', '', 'POST');
-        $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
-        $option_string = trim($option_string);
-        if ('' === $option_string) {
-            // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-        }
-        $i            = 0;
-        $option_color = Request::getArray('option_color', null, 'POST');
-        foreach ($option_text as $optxt) {
-            $optxt = trim($optxt);
-            if ('' !== $optxt) {
-                // new xoopspoll module
-                if ($pollModuleHandler->getVar('version') >= 140) {
-                    $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                    $optionObject = $xpOptHandler->create();
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('poll_id', $poll_id);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $xpOptHandler->insert($optionObject);
                 // old xoopspoll or umfrage or any clone from them
+            } else {
+                $status      = $pollObject->delete();
+                $classOption = $classPoll . 'Option';
+                $classLog    = $classPoll . 'Log';
+                if (false !== $status) {
+                    $classOption::deleteByPollId($poll_id);
+                    $classLog::deleteByPollId($poll_id);
                 } else {
-                    $classOption  = $classPoll . 'Option';
-                    $optionObject = new $classOption();
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('poll_id', $poll_id);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->store();
+                    $msg = $pollObject->getHtmlErrors();
                 }
-                unset($optionObject);
             }
-            ++$i;
-        }
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header("polls.php?op=edit&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'delete':
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
-        break;
-
-    case 'delete_ok':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        //try and delete the poll
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $status = $xpPollHandler->delete($pollObject);
             if (false !== $status) {
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                $xpOptHandler->deleteByPollId($poll_id);
-                $xpLogHandler->deleteByPollId($poll_id);
+                require_once $GLOBALS['xoops']->path('class/template.php');
+                xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
+                xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+                // delete comments for this poll
+                xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id);
+
+                $topicObject->setVar('votes', 0); // not sure why we want to clear votes too... but I left it alone
+                $topicObject->setVar('topic_haspoll', 0);
+                $topicObject->setVar('poll_id', 0);
+                $success = $topicHandler->insert($topicObject);
+                if (!$success) {
+                    xoops_error($topicHandler->getHtmlErrors());
+                    break;
+                }
             } else {
-                $msg = $xpPollHandler->getHtmlErrors();
+                xoops_error($msg);
+                break;
             }
+            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+            break;
+
+        case 'restart':
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+                $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
             // old xoopspoll or umfrage or any clone from them
-        } else {
-            $status      = $pollObject->delete();
-            $classOption = $classPoll . 'Option';
-            $classLog    = $classPoll . 'Log';
-            if (false !== $status) {
-                $classOption::deleteByPollId($poll_id);
-                $classLog::deleteByPollId($poll_id);
             } else {
-                $msg = $pollObject->getHtmlErrors();
+                $default_poll_duration = (86400 * 10);
             }
-        }
-        if (false !== $status) {
-            require_once $GLOBALS['xoops']->path('class/template.php');
-            xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
-            xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-            // delete comments for this poll
-            xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id);
+            $poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
+            $expire_text = new \XoopsFormText(
+                _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
+                _MD_NEWBB_POLL_EXPIREDAT,
+                                                                                                                                                                                                                         formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
+            ) . '</small>',
+                                             'end_time',
+                20,
+                19,
+                formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')
+            );
+            $poll_form->addElement($expire_text);
+            $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1));
+            $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_RESET, 'reset', 0));
+            $poll_form->addElement(new \XoopsFormHidden('op', 'restart_ok'));
+            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+            $poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
 
-            $topicObject->setVar('votes', 0); // not sure why we want to clear votes too... but I left it alone
-            $topicObject->setVar('topic_haspoll', 0);
-            $topicObject->setVar('poll_id', 0);
-            $success = $topicHandler->insert($topicObject);
-            if (!$success) {
-                xoops_error($topicHandler->getHtmlErrors());
-                break;
-            }
-        } else {
-            xoops_error($msg);
+            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+            $poll_form->display();
             break;
-        }
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'restart':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
-            $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $default_poll_duration = (86400 * 10);
-        }
-        $poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
-        $expire_text = new \XoopsFormText(
-            _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
-            _MD_NEWBB_POLL_EXPIREDAT,
-                                                                                                                                                                                                                     formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
-        ) . '</small>',
-                                         'end_time',
-            20,
-            19,
-            formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')
-        );
-        $poll_form->addElement($expire_text);
-        $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1));
-        $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_RESET, 'reset', 0));
-        $poll_form->addElement(new \XoopsFormHidden('op', 'restart_ok'));
-        $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-        $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-        $poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
-
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        $poll_form->display();
-        break;
-
-    case 'restart_ok':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
 
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
-            $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
-            $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
-            $poll_mailed           = $classConstants::POLL_MAILED;
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $default_poll_duration = (86400 * 10);
-            $poll_not_mailed       = POLL_NOTMAILED;
-            $poll_mailed           = POLL_MAILED;
-        }
+        case 'restart_ok':
+            // check security token
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
 
-        $end_time = !Request::getInt('end_time', 0, 'POST');
-        if (0 !== $end_time) {
-            $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-            $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-        } else {
-            $pollObject->setVar('end_time', time() + $default_poll_duration);
-        }
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+                $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
+                $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
+                $poll_mailed           = $classConstants::POLL_MAILED;
+            // old xoopspoll or umfrage or any clone from them
+            } else {
+                $default_poll_duration = (86400 * 10);
+                $poll_not_mailed       = POLL_NOTMAILED;
+                $poll_mailed           = POLL_MAILED;
+            }
 
-        $isNotify = Request::getInt('notify', 0, 'POST');
-        if (!empty($isNotify) && ($end_time > time())) {
-            // if notify, set mail status to "not mailed"
-            $pollObject->setVar('mail_status', $poll_not_mailed);
-        } else {
-            // if not notify, set mail status to already "mailed"
-            $pollObject->setVar('mail_status', $poll_mailed);
-        }
+            $end_time = !Request::getInt('end_time', 0, 'POST');
+            if (0 !== $end_time) {
+                $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+                $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+            } else {
+                $pollObject->setVar('end_time', time() + $default_poll_duration);
+            }
 
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            if (!$xpPollHandler->insert($pollObject)) {  // update the poll
-                xoops_error($pollObject->getHtmlErrors());
-                exit();
+            $isNotify = Request::getInt('notify', 0, 'POST');
+            if (!empty($isNotify) && ($end_time > time())) {
+                // if notify, set mail status to "not mailed"
+                $pollObject->setVar('mail_status', $poll_not_mailed);
+            } else {
+                // if not notify, set mail status to already "mailed"
+                $pollObject->setVar('mail_status', $poll_mailed);
             }
-            if (Request::getInt('reset', 0, 'POST')) { // reset all vote/voter counters
-                /** @var \XoopspollOptionHandler $xpOptHandler */
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                /** @var \XoopspollLogHandler $xpLogHandler */
-                $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                $xpLogHandler->deleteByPollId($poll_id);
-                $xpOptHandler->resetCountByPollId($poll_id);
-                $xpPollHandler->updateCount($pollObject);
+
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                if (!$xpPollHandler->insert($pollObject)) {  // update the poll
+                    xoops_error($pollObject->getHtmlErrors());
+                    exit();
+                }
+                if (Request::getInt('reset', 0, 'POST')) { // reset all vote/voter counters
+                    /** @var \XoopspollOptionHandler $xpOptHandler */
+                    $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                    /** @var \XoopspollLogHandler $xpLogHandler */
+                    $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+                    $xpLogHandler->deleteByPollId($poll_id);
+                    $xpOptHandler->resetCountByPollId($poll_id);
+                    $xpPollHandler->updateCount($pollObject);
+                }
+                // old xoopspoll or umfrage or any clone from them
+            } else {
+                if (!$pollObject->store()) { // update the poll
+                    xoops_error($pollObject->getHtmlErrors());
+                    exit();
+                }
+                if (Request::getInt('reset', 0, 'POST')) { // reset all logs
+                    $classOption = $classPoll . 'Option';
+                    $classLog    = $classPoll . 'Log';
+                    $classLog::deleteByPollId($poll_id);
+                    $classOption::resetCountByPollId($poll_id);
+                    $pollObject->updateCount();
+                }
             }
+            require_once $GLOBALS['xoops']->path('class/template.php');
+            xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
+            xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+            break;
+
+        case 'log':
+            // new xoopspoll module
+            if ($pollModuleHandler->getVar('version') >= 140) {
+                redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/main.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
             // old xoopspoll or umfrage or any clone from them
-        } else {
-            if (!$pollObject->store()) { // update the poll
-                xoops_error($pollObject->getHtmlErrors());
-                exit();
-            }
-            if (Request::getInt('reset', 0, 'POST')) { // reset all logs
-                $classOption = $classPoll . 'Option';
-                $classLog    = $classPoll . 'Log';
-                $classLog::deleteByPollId($poll_id);
-                $classOption::resetCountByPollId($poll_id);
-                $pollObject->updateCount();
+            } else {
+                redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/index.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
             }
-        }
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'log':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/main.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/index.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
-        }
-        break;
+            break;
 } // switch
 
 // irmtfan move to footer.php

Spacing +48 added lines, -48 removed lines

@@ -21,7 +21,7 @@ 
 
 // rewrite by irmtfan and zyspec to accept xoopspoll 1.4 and all old xoopspoll and umfrage versions and all clones
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 require_once $GLOBALS['xoops']->path('class/xoopslists.php');
 require_once $GLOBALS['xoops']->path('class/xoopsblock.php');
@@ -54,18 +54,18 @@ 
 if (is_object($topicObject)) {
     $forum_id = $topicObject->getVar('forum_id');
 } else {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR . ': ' . _MD_NEWBB_FORUMNOEXIST);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR.': '._MD_NEWBB_FORUMNOEXIST);
 }
 // forum access permission
 /** @var Newbb\ForumHandler $forumHandler */
 $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject  = $forumHandler->get($forum_id);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 // topic view permission
 if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-    redirect_header('viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+    redirect_header('viewforum.php?forum='.$forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
@@ -82,7 +82,7 @@ 
         $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
         // old xoopspoll or umfrage or any clone from them
     } else {
-        include $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+        include $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/include/constants.php');
         $classPoll  = $topicObject->loadOldPoll();
         $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
     }
@@ -112,11 +112,11 @@ 
     case 'add':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_CREATNEWPOLL."</h4>\n";
             $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
         // old xoopspoll or umfrage or any clone from them
         } else {
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
             $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
                                                                                                           . XOOPS_URL
@@ -132,7 +132,7 @@ 
             $poll_form->addElement($desc_tarea);
             $currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
             $endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
-            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
+            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime).'</small>', 'end_time', 30, 19, $endtime);
             $poll_form->addElement($expire_text);
 
             $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
@@ -145,14 +145,14 @@ 
             $poll_form->addElement($notify_yn);
 
             $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars/'));
             for ($i = 0; $i < 10; ++$i) {
                 $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
                 $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
                 $option_tray->addElement($option_text);
                 $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/".$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars", "", "'.XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
                                                       . XOOPS_URL
                                                       . '/modules/'
@@ -174,7 +174,7 @@ 
             $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
             $poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
             $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
+            echo '<h4>'._MD_NEWBB_POLL_POLLCONF.'</h4>';
             $poll_form->display();
         }
         break; // op: add
@@ -182,13 +182,13 @@ 
     case 'edit':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_EDITPOLL."</h4>\n";
             $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
         // old xoopspoll or umfrage or any clone from them
         } else {
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
+            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='".XOOPS_URL.'/userinfo.php?uid='.$pollObject->getVar('user_id')."'>".newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']).'</a>');
             $poll_form->addElement($author_label);
             $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
             $poll_form->addElement($question_text);
@@ -196,13 +196,13 @@ 
             $poll_form->addElement($desc_tarea);
             $date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
             if (!$pollObject->hasExpired()) {
-                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
+                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')).'</small>', 'end_time', 20, 19, $date);
                 $poll_form->addElement($expire_text);
             } else {
                 // irmtfan full URL - add topic_id
                 $restart_label = new \XoopsFormLabel(
                     _MD_NEWBB_POLL_EXPIRATION,
-                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
+                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date)."<br><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>"._MD_NEWBB_POLL_RESTART.'</a>'
                 );
                 $poll_form->addElement($restart_label);
             }
@@ -210,7 +210,7 @@ 
             $poll_form->addElement($weight_text);
             $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
             $poll_form->addElement($multi_yn);
-            $options_arr  =& $classOption::getAllByPollId($poll_id);
+            $options_arr  = & $classOption::getAllByPollId($poll_id);
             $notify_value = 1;
             if (0 !== $pollObject->getVar('mail_status')) {
                 $notify_value = 0;
@@ -226,9 +226,9 @@ 
                 $option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
                 $color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[".$i."]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"".XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/".$option->getVar('option_color', 'E'))
                                                       . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
@@ -236,7 +236,7 @@ 
                 ++$i;
             }
             // irmtfan full URL
-            $more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
+            $more_label = new \XoopsFormLabel('', "<br><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>"._MD_NEWBB_POLL_ADDMORE.'</a>');
             $option_tray->addElement($more_label);
             $poll_form->addElement($option_tray);
             $poll_form->addElement(new \XoopsFormHidden('op', 'update'));
@@ -244,7 +244,7 @@ 
             $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
             $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
 
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
             $poll_form->display();
         }
         break; // op: edit
@@ -262,7 +262,7 @@ 
             $option_empty = true;
             if (!Request::getString('option_text', '', 'POST')) {
                 // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
             }
             $option_text = Request::getArray('option_text', '', 'POST');
             foreach ($option_text as $optxt) {
@@ -273,7 +273,7 @@ 
             }
             if ($option_empty) {
                 // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
             }
             $pollObject->setVar('question', Request::getString('question', '', 'POST'));
             $pollObject->setVar('description', Request::getString('description', '', 'POST'));
@@ -304,7 +304,7 @@ 
             }
             $i            = 0;
             $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             foreach ($option_text as $optxt) {
                 $optxt = trim($optxt);
                 /** @var XoopspollOption $optionObject */
@@ -331,7 +331,7 @@ 
             } else {
                 redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
             }
-            break;// op: save
+            break; // op: save
         }
     // no break
     case 'update':
@@ -344,7 +344,7 @@ 
         $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
         $option_string = trim($option_string);
         if ('' === $option_string) {
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
         }
 
         // new xoopspoll module
@@ -354,7 +354,7 @@ 
             /** @var \XoopspollLogHandler $xpLogHandler */
             $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
             //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
-            $classConstants   = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+            $classConstants   = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Constants';
             $notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
             $currentTimestamp = time();
             //$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
@@ -463,8 +463,8 @@ 
             $i            = 0;
             $option_id    = Request::getArray('option_id', null, 'POST');
             $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            $classLog     = $classPoll . 'Log';
+            $classOption  = $classPoll.'Option';
+            $classLog     = $classPoll.'Log';
             foreach ($option_id as $opid) {
                 $optionObject    = new $classOption($opid);
                 $option_text[$i] = trim($option_text[$i]);
@@ -495,7 +495,7 @@ 
         } else {
             redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
         }
-        break;// op: save | update
+        break; // op: save | update
 
     case 'addmore':
         $question = $pollObject->getVar('question');
@@ -509,14 +509,14 @@ 
         // old xoopspoll or umfrage or any clone from them
         } else {
             $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars/'));
             for ($i = 0; $i < 10; ++$i) {
                 $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
                 $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
                 $option_tray->addElement($option_text);
                 $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"".XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
                                                       . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
                                                       . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
@@ -534,7 +534,7 @@ 
         $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
         $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
 
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         $poll_form->display();
         break;
 
@@ -549,7 +549,7 @@ 
         $option_string = trim($option_string);
         if ('' === $option_string) {
             // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
         }
         $i            = 0;
         $option_color = Request::getArray('option_color', null, 'POST');
@@ -566,7 +566,7 @@ 
                     $xpOptHandler->insert($optionObject);
                 // old xoopspoll or umfrage or any clone from them
                 } else {
-                    $classOption  = $classPoll . 'Option';
+                    $classOption  = $classPoll.'Option';
                     $optionObject = new $classOption();
                     $optionObject->setVar('option_text', $optxt);
                     $optionObject->setVar('poll_id', $poll_id);
@@ -584,7 +584,7 @@ 
         break;
 
     case 'delete':
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
         break;
 
@@ -608,8 +608,8 @@ 
             // old xoopspoll or umfrage or any clone from them
         } else {
             $status      = $pollObject->delete();
-            $classOption = $classPoll . 'Option';
-            $classLog    = $classPoll . 'Log';
+            $classOption = $classPoll.'Option';
+            $classLog    = $classPoll.'Log';
             if (false !== $status) {
                 $classOption::deleteByPollId($poll_id);
                 $classLog::deleteByPollId($poll_id);
@@ -636,13 +636,13 @@ 
             xoops_error($msg);
             break;
         }
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
         break;
 
     case 'restart':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Constants';
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
         // old xoopspoll or umfrage or any clone from them
         } else {
@@ -650,10 +650,10 @@ 
         }
         $poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
         $expire_text = new \XoopsFormText(
-            _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
+            _MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')).'<br>'.sprintf(
             _MD_NEWBB_POLL_EXPIREDAT,
                                                                                                                                                                                                                      formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
-        ) . '</small>',
+        ).'</small>',
                                          'end_time',
             20,
             19,
@@ -667,7 +667,7 @@ 
         $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
         $poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
 
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         $poll_form->display();
         break;
 
@@ -679,7 +679,7 @@ 
 
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Constants';
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
             $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
             $poll_mailed           = $classConstants::POLL_MAILED;
@@ -729,8 +729,8 @@ 
                 exit();
             }
             if (Request::getInt('reset', 0, 'POST')) { // reset all logs
-                $classOption = $classPoll . 'Option';
-                $classLog    = $classPoll . 'Log';
+                $classOption = $classPoll.'Option';
+                $classLog    = $classPoll.'Log';
                 $classLog::deleteByPollId($poll_id);
                 $classOption::resetCountByPollId($poll_id);
                 $pollObject->updateCount();
@@ -739,7 +739,7 @@ 
         require_once $GLOBALS['xoops']->path('class/template.php');
         xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
         xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
         break;
 
     case 'log':
@@ -754,5 +754,5 @@ 
 } // switch
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

index.php

Indentation +7 added lines, -7 removed lines

@@ -220,9 +220,9 @@ 
 $xoopsTpl->assign('notifyicon', $category_icon);
 
 $xoopsTpl->assign([
-                      'index_title' => sprintf(_MD_NEWBB_WELCOME, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
-                      'index_desc'  => _MD_NEWBB_TOSTART
-                  ]);
+                        'index_title' => sprintf(_MD_NEWBB_WELCOME, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
+                        'index_desc'  => _MD_NEWBB_TOSTART
+                    ]);
 
 /* display user stats */
 if (!empty($GLOBALS['xoopsModuleConfig']['statistik_enabled'])) {
@@ -280,10 +280,10 @@ 
     $xoopsTpl->assign('rss_button', newbbDisplayImage('rss', 'RSS feed'));
 }
 $xoopsTpl->assign([
-                      'img_forum_new' => newbbDisplayImage('forum_new', _MD_NEWBB_NEWPOSTS),
-                      'img_forum'     => newbbDisplayImage('forum', _MD_NEWBB_NONEWPOSTS),
-                      'img_subforum'  => newbbDisplayImage('subforum')
-                  ]);
+                        'img_forum_new' => newbbDisplayImage('forum_new', _MD_NEWBB_NEWPOSTS),
+                        'img_forum'     => newbbDisplayImage('forum', _MD_NEWBB_NONEWPOSTS),
+                        'img_subforum'  => newbbDisplayImage('subforum')
+                    ]);
 
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Spacing +28 added lines, -28 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* deal with marks */
 if (Request::getInt('mark_read', 0)) {
@@ -23,13 +23,13 @@ 
         $markvalue  = 0;
         $markresult = _MD_NEWBB_MARK_UNREAD;
     }
-    require_once __DIR__ . '/include/functions.read.php';
+    require_once __DIR__.'/include/functions.read.php';
     newbbSetReadForum($markvalue);
-    $url = XOOPS_URL . '/modules/newbb/index.php';
-    redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED . ' ' . $markresult);
+    $url = XOOPS_URL.'/modules/newbb/index.php';
+    redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED.' '.$markresult);
 }
 
-$viewcat = Request::getInt('cat', 0, 'GET');//TODO mb check if this is GET or POST?
+$viewcat = Request::getInt('cat', 0, 'GET'); //TODO mb check if this is GET or POST?
 ///** @var Newbb\CategoryHandler $categoryHandler */
 //$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
 
@@ -44,7 +44,7 @@ 
         $categories[$viewcat] = $categoryObject->getValues();
     }
     $forum_index_title = sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
-    $xoops_pagetitle   = $categoryObject->getVar('cat_title') . ' [' . $xoopsModule->getVar('name') . ']';
+    $xoops_pagetitle   = $categoryObject->getVar('cat_title').' ['.$xoopsModule->getVar('name').']';
 }
 
 if (0 === count($categories)) {
@@ -57,12 +57,12 @@ 
 //$xoopsOption['xoops_module_header'] = $xoops_module_header;
 // irmtfan include header.php after defining $xoopsOption['template_main']
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.render.php';
 /* rss feed */
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/rss.php" />
+    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
@@ -89,8 +89,8 @@ 
 
 if (!empty($forums_allowed)) {
     $crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
-    $crit_top->add(new \Criteria('cat_id', '(' . implode(', ', array_keys($categories)) . ')', 'IN'));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+    $crit_top->add(new \Criteria('cat_id', '('.implode(', ', array_keys($categories)).')', 'IN'));
+    $crit_top->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
     $forums_top = $forumHandler->getIds($crit_top);
 }
 
@@ -98,8 +98,8 @@ 
 if ('hidden' === $GLOBALS['xoopsModuleConfig']['subforum_display'] || 0 === count($forums_top)) {
     $forums_sub = [];
 } else {
-    $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top) . ')', 'IN'));
-    $crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+    $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '('.implode(', ', $forums_top).')', 'IN'));
+    $crit_sub->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
     $forums_sub = $forumHandler->getIds($crit_sub);
 }
 
@@ -111,17 +111,17 @@ 
 $newposts         = 0;
 $deleteposts      = 0;
 if (0 !== count($forums_available)) {
-    $crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
+    $crit_forum = new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN');
     $crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
     $crit_forum->setOrder('ASC');
     $forums       = $forumHandler->getAll($crit_forum, null, false);
     $newtopics    = $forumHandler->getTopicCount($forums, 0, 'pending');
     $deletetopics = $forumHandler->getTopicCount($forums, 0, 'deleted');
     $forums_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']);
-    $crit         = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+    $crit         = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN'));
     $crit->add(new \Criteria('approved', '-1'));
     $deleteposts = $postHandler->getCount($crit);
-    $crit        = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+    $crit        = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN'));
     $crit->add(new \Criteria('approved', '0'));
     $newposts = $postHandler->getCount($crit);
 }
@@ -168,15 +168,15 @@ 
     $forums = [];
     $onecat = $categories[$id];
 
-    $cat_element_id = 'cat_' . $onecat['cat_id'];
+    $cat_element_id = 'cat_'.$onecat['cat_id'];
     $expand         = (count($toggles) > 0) ? (in_array($cat_element_id, $toggles) ? false : true) : true;
     // START irmtfan to improve newbbDisplayImage
     if ($expand) {
-        $cat_display      = 'block';        //irmtfan move semicolon
+        $cat_display      = 'block'; //irmtfan move semicolon
         $cat_icon_display = 'minus';
         $cat_alt          = _MD_NEWBB_HIDE;
     } else {
-        $cat_display      = 'none';        //irmtfan move semicolon
+        $cat_display      = 'none'; //irmtfan move semicolon
         $cat_icon_display = 'plus';
         $cat_alt          = _MD_NEWBB_SEE;
     }
@@ -199,7 +199,7 @@ 
     $cat_image = '';
     $cat_image = $onecat['cat_image'];
     if ('' !== $cat_image && 'blank.gif' !== $cat_image && $cat_image) {
-        $cat_image = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/assets/images/category/' . $cat_image;
+        $cat_image = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/assets/images/category/'.$cat_image;
     }
     $category_array[] = [
         'cat_id'           => $onecat['cat_id'],
@@ -250,15 +250,15 @@ 
 $stats = $statsHandler->getStats(array_merge([0], $forums_available));
 $xoopsTpl->assign_by_ref('stats', $stats);
 $xoopsTpl->assign('subforum_display', $GLOBALS['xoopsModuleConfig']['subforum_display']);
-$xoopsTpl->assign('mark_read', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?mark_read=1');
-$xoopsTpl->assign('mark_unread', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?mark_read=2');
+$xoopsTpl->assign('mark_read', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/index.php?mark_read=1');
+$xoopsTpl->assign('mark_unread', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/index.php?mark_read=2');
 
-$xoopsTpl->assign('all_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=all');
-$xoopsTpl->assign('post_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewpost.php?status=all');
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewpost.php?status=new');
-$xoopsTpl->assign('digest_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=digest');
-$xoopsTpl->assign('unreplied_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=unreplied');
-$xoopsTpl->assign('unread_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=unread');
+$xoopsTpl->assign('all_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=all');
+$xoopsTpl->assign('post_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewpost.php?status=all');
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewpost.php?status=new');
+$xoopsTpl->assign('digest_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=digest');
+$xoopsTpl->assign('unreplied_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=unreplied');
+$xoopsTpl->assign('unread_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=unread');
 $xoopsTpl->assign('menumode', $menumode);
 $xoopsTpl->assign('menumode_other', $menumode_other);
 
@@ -286,5 +286,5 @@ 
                   ]);
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

blocks/list_topic.php

Spacing +17 added lines, -17 removed lines

@@ -20,16 +20,16 @@ 
 define('LIST_TOPIC_DEFINED', true);
 
 //require_once dirname(__DIR__) . '/include/functions.ini.php';
-require_once dirname(__DIR__) . '/class/TopicRenderer.php';
-require_once dirname(__DIR__) . '/footer.php'; // to include js/style files like validate function
+require_once dirname(__DIR__).'/class/TopicRenderer.php';
+require_once dirname(__DIR__).'/footer.php'; // to include js/style files like validate function
 
 xoops_loadLanguage('main', 'newbb');
 
-require_once __DIR__ . '/../include/functions.config.php';
-require_once __DIR__ . '/../include/functions.time.php';
-require_once __DIR__ . '/../include/functions.session.php';
-require_once __DIR__ . '/../include/functions.render.php';
-require_once __DIR__ . '/../include/functions.user.php';
+require_once __DIR__.'/../include/functions.config.php';
+require_once __DIR__.'/../include/functions.time.php';
+require_once __DIR__.'/../include/functions.session.php';
+require_once __DIR__.'/../include/functions.render.php';
+require_once __DIR__.'/../include/functions.user.php';
 
 // options[0] - Status in WHERE claus: all(by default), sticky, digest,lock, poll, voted, viewed, replied, read, (UN_) , active, pending, deleted (admin) (It is  multi-select)
 // options[1] - Uid in WHERE claus: uid of the topic poster : -1 - all users (by default)
@@ -59,7 +59,7 @@ 
     $topicRenderer->force = true; // force against static vars for parse
 
     $topicRenderer->is_multiple = true; // is it for multiple forums
-    $topicRenderer->config      =& $newbbConfig; // get all configs
+    $topicRenderer->config      = & $newbbConfig; // get all configs
     if (!empty($options[6])) {
         $topicRenderer->config['topics_per_page'] = (int)$options[6]; // number of topics (items) to display
     }
@@ -121,16 +121,16 @@ 
     $topicPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
     $topicPosterRadioEle->addOption((-1 !== $options[1]) ? $options[1] : 0, _SELECT); // if no user in selection box it select uid=0 anon users
     $topicPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[1]'); el.disabled=(this.id == 'options[1]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
-    $topicPosterSelectEle = new \XoopsFormSelectUser(_MB_NEWBB_AUTHOR, 'options[1]', true, explode(',', $options[1]), 5, true);// show $limit = 200 users when no user is selected;
-    $topicPosterEle       = new \XoopsFormLabel(_MB_NEWBB_AUTHOR, $topicPosterRadioEle->render() . $topicPosterSelectEle->render());
+    $topicPosterSelectEle = new \XoopsFormSelectUser(_MB_NEWBB_AUTHOR, 'options[1]', true, explode(',', $options[1]), 5, true); // show $limit = 200 users when no user is selected;
+    $topicPosterEle       = new \XoopsFormLabel(_MB_NEWBB_AUTHOR, $topicPosterRadioEle->render().$topicPosterSelectEle->render());
 
     // lastposter element
     $lastPosterRadioEle = new \XoopsFormRadio(_MD_NEWBB_POSTER, 'options[2]', $options[2]);
     $lastPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
     $lastPosterRadioEle->addOption((-1 !== $options[2]) ? $options[2] : 0, _SELECT); // if no user in selection box it select uid=1
     $lastPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[2]'); el.disabled=(this.id == 'options[2]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
-    $lastPosterSelectEle = new \XoopsFormSelectUser(_MD_NEWBB_POSTER, 'options[2]', true, explode(',', $options[2]), 5, true);// show $limit = 200 users when no user is selected;
-    $lastPosterEle       = new \XoopsFormLabel(_MD_NEWBB_POSTER, $lastPosterRadioEle->render() . $lastPosterSelectEle->render());
+    $lastPosterSelectEle = new \XoopsFormSelectUser(_MD_NEWBB_POSTER, 'options[2]', true, explode(',', $options[2]), 5, true); // show $limit = 200 users when no user is selected;
+    $lastPosterEle       = new \XoopsFormLabel(_MD_NEWBB_POSTER, $lastPosterRadioEle->render().$lastPosterSelectEle->render());
 
     // type element
     $types   = $topicRenderer->getTypes(); // get all available types in all forums
@@ -180,20 +180,20 @@ 
 
     //  forum element
     $optionsForum = explode(',', $options[12]);
-    require_once __DIR__ . '/../include/functions.forum.php';
+    require_once __DIR__.'/../include/functions.forum.php';
     /** @var Newbb\ForumHandler $forumHandler */
     $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
     //get forum Ids by values. parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums
     // Get accessible forums
     $accessForums = $forumHandler->getIdsByValues(array_map('intval', $optionsForum));
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
-    $forumSel     = "<select name=\"options[12][]\" multiple=\"multiple\" onchange = \"validate('options[12][]','select', true)\">";// if user dont select any it select "0"
-    $forumSel     .= '<option value="0" ';
+    $forumSel     = "<select name=\"options[12][]\" multiple=\"multiple\" onchange = \"validate('options[12][]','select', true)\">"; // if user dont select any it select "0"
+    $forumSel .= '<option value="0" ';
     if ($isAll) {
-        $forumSel     .= ' selected';
+        $forumSel .= ' selected';
         $accessForums = null; // just select _ALL option
     }
-    $forumSel .= '>' . _ALL . '</option>';
+    $forumSel .= '>'._ALL.'</option>';
     $forumSel .= newbbForumSelectBox($accessForums, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = false
     $forumSel .= '</select>';
     $forumEle = new \XoopsFormLabel(_MB_NEWBB_FORUMLIST, $forumSel);

action.post.php

Switch Indentation +161 added lines, -161 removed lines

@@ -46,179 +46,179 @@
 }
 
 switch ($op) {
-    case 'restore':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if ($postObject->getVar('topic_id') < 1) {
-                continue;
+        case 'restore':
+            $post_id = array_values($post_id);
+            sort($post_id);
+            $topics = [];
+            $forums = [];
+            foreach ($post_id as $post) {
+                $postObject = $postHandler->get($post);
+                if ($postObject->getVar('topic_id') < 1) {
+                    continue;
+                }
+
+                $postHandler->approve($postObject, true);
+                $topics[$postObject->getVar('topic_id')] = 1;
+                $forums[$postObject->getVar('forum_id')] = 1;
+                unset($postObject);
+            }
+            foreach (array_keys($topics) as $topic) {
+                $topicHandler->synchronization($topic);
+            }
+            foreach (array_keys($forums) as $forum) {
+                $forumHandler->synchronization($forum);
+            }
+            break;
+        case 'approve':
+            $post_id = array_values($post_id);
+            sort($post_id);
+            $topics      = [];
+            $forums      = [];
+            $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+            $postsObject = $postHandler->getObjects($criteria, true);
+            foreach ($post_id as $post) {
+                /** @var Newbb\Post $postObject */
+                $postObject = $postsObject[$post];
+                if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+                    continue;
+                }
+                $postHandler->approve($postObject);
+                $topics[$postObject->getVar('topic_id')] = $post;
+                $forums[$postObject->getVar('forum_id')] = 1;
+            }
+            foreach (array_keys($topics) as $topic) {
+                $topicHandler->synchronization($topic);
+            }
+            foreach (array_keys($forums) as $forum) {
+                $forumHandler->synchronization($forum);
             }
 
-            $postHandler->approve($postObject, true);
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'approve':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics      = [];
-        $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
-        $postsObject = $postHandler->getObjects($criteria, true);
-        foreach ($post_id as $post) {
-            /** @var Newbb\Post $postObject */
-            $postObject = $postsObject[$post];
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
+            if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+                break;
+            }
+
+            $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+            $topic_list     = $topicHandler->getList($criteria_topic, true);
+
+            $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+            $forum_list     = $forumHandler->getList($criteria_forum);
+
+            require_once __DIR__ . '/include/notification.inc.php';
+            /** @var \XoopsNotificationHandler $notificationHandler */
+            $notificationHandler = xoops_getHandler('notification');
+            foreach ($post_id as $post) {
+                $tags = [];
+                /** @var Newbb\Post[] $postsObject [$post] */
+                $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
+                $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
+                $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
+                $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
+                $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+                $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
+                $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
+                $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+                $tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
+                $tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
+                $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+                $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
             }
-            $postHandler->approve($postObject);
-            $topics[$postObject->getVar('topic_id')] = $post;
-            $forums[$postObject->getVar('forum_id')] = 1;
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-
-        if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
             break;
-        }
-
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
-        $topic_list     = $topicHandler->getList($criteria_topic, true);
-
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forum_list     = $forumHandler->getList($criteria_forum);
-
-        require_once __DIR__ . '/include/notification.inc.php';
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        foreach ($post_id as $post) {
-            $tags = [];
-            /** @var Newbb\Post[] $postsObject [$post] */
-            $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
-            $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-            $tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
-            $tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
-            $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
-        }
-        break;
-    case 'delete':
-        $post_id = array_values($post_id);
-        rsort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
+        case 'delete':
+            $post_id = array_values($post_id);
+            rsort($post_id);
+            $topics = [];
+            $forums = [];
+            foreach ($post_id as $post) {
+                $postObject = $postHandler->get($post);
+                if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+                    continue;
+                }
+                $topics[$postObject->getVar('topic_id')] = 1;
+                $forums[$postObject->getVar('forum_id')] = 1;
+                $postHandler->delete($postObject, true);
+                unset($postObject);
+            }
+            foreach (array_keys($topics) as $topic) {
+                $topicHandler->synchronization($topic);
+            }
+            foreach (array_keys($forums) as $forum) {
+                $forumHandler->synchronization($forum);
             }
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            $postHandler->delete($postObject, true);
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'split':
-        /** @var Newbb\Post $postObject */
-        $postObject = $postHandler->get($post_id);
-        if (0 === count($post_id) || $postObject->isTopic()) {
             break;
-        }
-        $topic_id = $postObject->getVar('topic_id');
-
-        $newtopic = $topicHandler->create();
-        $newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
-        $newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
-        $newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
-        $newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
-        $newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
-        $newtopic->setVar('approved', 1, true);
-        $topicHandler->insert($newtopic, true);
-        $new_topic_id = $newtopic->getVar('topic_id');
-
-        $pid = $postObject->getVar('pid');
-
-        $postObject->setVar('topic_id', $new_topic_id, true);
-        $postObject->setVar('pid', 0, true);
-        $postHandler->insert($postObject);
-
-        /* split a single post */
-        if (1 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('pid', $post_id));
-            $postHandler->updateAll('pid', $pid, $criteria, true);
-        /* split a post and its children posts */
-        } elseif (2 === $mode) {
-            require_once $GLOBALS['xoops']->path('class/xoopstree.php');
-            $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
-            $posts  = $mytree->getAllChildId($post_id);
-            if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
-                $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+        case 'split':
+            /** @var Newbb\Post $postObject */
+            $postObject = $postHandler->get($post_id);
+            if (0 === count($post_id) || $postObject->isTopic()) {
+                break;
             }
-            /* split a post and all posts coming after */
-        } elseif (3 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
-
-            unset($criteria);
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->identifierName = 'pid';
-            $posts                       = $postHandler->getList($criteria);
-
-            unset($criteria);
-            $post_update = [];
-            foreach ($posts as $postid => $pid) {
-                //                if (!in_array($pid, array_keys($posts))) {
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update[] = $pid;
+            $topic_id = $postObject->getVar('topic_id');
+
+            $newtopic = $topicHandler->create();
+            $newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
+            $newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
+            $newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
+            $newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
+            $newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
+            $newtopic->setVar('approved', 1, true);
+            $topicHandler->insert($newtopic, true);
+            $new_topic_id = $newtopic->getVar('topic_id');
+
+            $pid = $postObject->getVar('pid');
+
+            $postObject->setVar('topic_id', $new_topic_id, true);
+            $postObject->setVar('pid', 0, true);
+            $postHandler->insert($postObject);
+
+            /* split a single post */
+            if (1 === $mode) {
+                $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+                $criteria->add(new \Criteria('pid', $post_id));
+                $postHandler->updateAll('pid', $pid, $criteria, true);
+            /* split a post and its children posts */
+            } elseif (2 === $mode) {
+                require_once $GLOBALS['xoops']->path('class/xoopstree.php');
+                $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
+                $posts  = $mytree->getAllChildId($post_id);
+                if (count($posts) > 0) {
+                    $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+                    $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
                 }
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update2[] = $pid;
+                /* split a post and all posts coming after */
+            } elseif (3 === $mode) {
+                $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+                $criteria->add(new \Criteria('post_id', $post_id, '>'));
+                $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+
+                unset($criteria);
+                $criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
+                $criteria->add(new \Criteria('post_id', $post_id, '>'));
+                $postHandler->identifierName = 'pid';
+                $posts                       = $postHandler->getList($criteria);
+
+                unset($criteria);
+                $post_update = [];
+                foreach ($posts as $postid => $pid) {
+                    //                if (!in_array($pid, array_keys($posts))) {
+                    if (!array_key_exists($pid, $posts)) {
+                        $post_update[] = $pid;
+                    }
+                    if (!array_key_exists($pid, $posts)) {
+                        $post_update2[] = $pid;
+                    }
+                }
+                if (count($post_update)) {
+                    $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+                    $postHandler->updateAll('pid', $post_id, $criteria, true);
                 }
             }
-            if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
-                $postHandler->updateAll('pid', $post_id, $criteria, true);
-            }
-        }
 
-        $forum_id = $postObject->getVar('forum_id');
-        $topicHandler->synchronization($topic_id);
-        $topicHandler->synchronization($new_topic_id);
-        $sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
+            $forum_id = $postObject->getVar('forum_id');
+            $topicHandler->synchronization($topic_id);
+            $topicHandler->synchronization($new_topic_id);
+            $sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
+            $result = $GLOBALS['xoopsDB']->queryF($sql);
 
-        break;
+            break;
 }
 if (!empty($topic_id)) {
     redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $topic_id = Request::getInt('topic_id', 0, 'POST');
 $post_id  = Request::getArray('post_id', Request::getArray('post_id', [], 'POST'), 'GET');
@@ -42,7 +42,7 @@ 
 $isAdmin = newbbIsAdmin($forumObject);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 switch ($op) {
@@ -74,7 +74,7 @@ 
         sort($post_id);
         $topics      = [];
         $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+        $criteria    = new \Criteria('post_id', '('.implode(',', $post_id).')', 'IN');
         $postsObject = $postHandler->getObjects($criteria, true);
         foreach ($post_id as $post) {
             /** @var Newbb\Post $postObject */
@@ -97,23 +97,23 @@ 
             break;
         }
 
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+        $criteria_topic = new \Criteria('topic_id', '('.implode(',', array_keys($topics)).')', 'IN');
         $topic_list     = $topicHandler->getList($criteria_topic, true);
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forum_list     = $forumHandler->getList($criteria_forum);
 
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         /** @var \XoopsNotificationHandler $notificationHandler */
         $notificationHandler = xoops_getHandler('notification');
         foreach ($post_id as $post) {
             $tags = [];
             /** @var Newbb\Post[] $postsObject [$post] */
             $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&forum=' . $postsObject[$post]->getVar('forum_id');
+            $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postsObject[$post]->getVar('topic_id').'&forum='.$postsObject[$post]->getVar('forum_id');
             $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+            $tags['FORUM_URL']   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?forum='.$postsObject[$post]->getVar('forum_id');
+            $tags['POST_URL']    = $tags['THREAD_URL'].'#forumpost'.$post;
             $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
@@ -180,7 +180,7 @@ 
             $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
             $posts  = $mytree->getAllChildId($post_id);
             if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $posts).')', 'IN');
                 $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
             }
             /* split a post and all posts coming after */
@@ -207,7 +207,7 @@ 
                 }
             }
             if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $post_update).')', 'IN');
                 $postHandler->updateAll('pid', $post_id, $criteria, true);
             }
         }
@@ -221,12 +221,12 @@ 
         break;
 }
 if (!empty($topic_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
 } elseif (!empty($forum_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

ratethread.php

Spacing +8 added lines, -8 removed lines

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