mambax7 / newbb5

class/IconHandler.php

Indentation +180 added lines, -180 removed lines

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

Spacing +13 added lines, -13 removed lines

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

class/Report.php

Indentation +15 added lines, -15 removed lines

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

votepolls.php

Indentation +98 added lines, -98 removed lines

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

Spacing +11 added lines, -11 removed lines

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

viewforum.php

Indentation +125 added lines, -125 removed lines

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

Spacing +42 added lines, -42 removed lines

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

view.tag.php

Spacing +1 added lines, -1 removed lines

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

delete.php

Indentation +85 added lines, -85 removed lines

@@ -16,17 +16,17 @@ 
 $ok = Request::getInt('ok', 0, 'POST');
 
 foreach (['forum', 'topic_id', 'post_id', 'order', 'pid', 'act'] as $getint) {
-    ${$getint} = Request::getInt($getint, 0, 'POST');
+	${$getint} = Request::getInt($getint, 0, 'POST');
 }
 
 foreach (['forum', 'topic_id', 'post_id', 'order', 'pid', 'act'] as $getint) {
-    ${$getint} = !empty(${$getint}) ? ${$getint} : Request::getInt($getint, 0, 'GET');
+	${$getint} = !empty(${$getint}) ? ${$getint} : Request::getInt($getint, 0, 'GET');
 }
 //$viewmode = (isset($_GET['viewmode']) && $_GET['viewmode'] !== 'flat') ? 'thread' : 'flat';
 //$viewmode = ($viewmode) ? $viewmode: (isset($_POST['viewmode'])?$_POST['viewmode'] : 'flat');
 
 $viewmode = (Request::getString('viewmode', '', 'GET')
-             && 'flat' !== Request::getString('viewmode', '', 'GET')) ? 'thread' : 'flat';
+			 && 'flat' !== Request::getString('viewmode', '', 'GET')) ? 'thread' : 'flat';
 $viewmode = $viewmode ?: (Request::getString('viewmode', '', 'POST') ?: 'flat');
 
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -37,21 +37,21 @@ 
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
 
 if (!empty($post_id)) {
-    $topic = $topicHandler->getByPost($post_id);
+	$topic = $topicHandler->getByPost($post_id);
 } else {
-    $topic = $topicHandler->get($topic_id);
+	$topic = $topicHandler->get($topic_id);
 }
 $topic_id = $topic->getVar('topic_id');
 if (!$topic_id) {
-    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
+	$redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 $forum       = $topic->getVar('forum_id');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $isAdmin = newbbIsAdmin($forumObject);
@@ -62,95 +62,95 @@ 
 $topic_status = $topic->getVar('topic_status');
 if (($postObject->checkIdentity() || $isAdmin) && $topicHandler->getPermission($topic->getVar('forum_id'), $topic_status, 'delete')) {
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
 }
 
 if (!$isAdmin && !$postObject->checkTimelimit('delete_timelimit')) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 
 if ($ok) {
-    $isDeleteOne = (1 === $ok);
-    if ($postObject->isTopic() && 0 == $topic->getVar('topic_replies')) {
-        $isDeleteOne = false;
-    }
-    if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
-        //$postHandler->emptyTopic($postObject);
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
-    } else {
-        if (Request::getString('post_text', '', 'POST')) {
-            //send a message
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $senduser      = $memberHandler->getUser($postObject->getVar('uid'));
-            if ($senduser->getVar('notify_method') > 0) {
-                $xoopsMailer = xoops_getMailer();
-                $xoopsMailer->reset();
-                if (1 == $senduser->getVar('notify_method')) {
-                    $xoopsMailer->usePM();
-                } else {
-                    $xoopsMailer->useMail();
-                }
-                $xoopsMailer->setHTML(true);
-                $xoopsMailer->setToUsers($senduser);
-                $xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
-                $xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
-                $forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
-                if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-                    $forenurl = seo_urls($forenurl);
-                }
-                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
-                $body = $myts->nl2Br($body);
-                $xoopsMailer->setBody($body);
-                $xoopsMailer->send();
-            }
-        }
-        $postHandler->delete($postObject, $isDeleteOne);
-        $forumHandler->synchronization($forum);
-        $topicHandler->synchronization($topic_id);
-        //        /** @var Newbb\StatsHandler $statsHandler */
-        //        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-        $statsHandler->reset();
-    }
+	$isDeleteOne = (1 === $ok);
+	if ($postObject->isTopic() && 0 == $topic->getVar('topic_replies')) {
+		$isDeleteOne = false;
+	}
+	if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
+		//$postHandler->emptyTopic($postObject);
+		redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
+	} else {
+		if (Request::getString('post_text', '', 'POST')) {
+			//send a message
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$senduser      = $memberHandler->getUser($postObject->getVar('uid'));
+			if ($senduser->getVar('notify_method') > 0) {
+				$xoopsMailer = xoops_getMailer();
+				$xoopsMailer->reset();
+				if (1 == $senduser->getVar('notify_method')) {
+					$xoopsMailer->usePM();
+				} else {
+					$xoopsMailer->useMail();
+				}
+				$xoopsMailer->setHTML(true);
+				$xoopsMailer->setToUsers($senduser);
+				$xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
+				$xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
+				$forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
+				if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+					$forenurl = seo_urls($forenurl);
+				}
+				$body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
+				$body = $myts->nl2Br($body);
+				$xoopsMailer->setBody($body);
+				$xoopsMailer->send();
+			}
+		}
+		$postHandler->delete($postObject, $isDeleteOne);
+		$forumHandler->synchronization($forum);
+		$topicHandler->synchronization($topic_id);
+		//        /** @var Newbb\StatsHandler $statsHandler */
+		//        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+		$statsHandler->reset();
+	}
 
-    //$postObject->loadFilters('delete');
-    if ($isDeleteOne) {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
-    } else {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
-    }
+	//$postObject->loadFilters('delete');
+	if ($isDeleteOne) {
+		redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
+	} else {
+		redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
+	}
 } else {
-    require_once $GLOBALS['xoops']->path('header.php');
-    //xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
-    echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
+	require_once $GLOBALS['xoops']->path('header.php');
+	//xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
+	echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
           <form method="post" action="' . XOOPS_URL . '/modules/newbb/delete.php">';
-    echo _MD_NEWBB_DELEDEDMSG . '<br>';
-    echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
-    echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="order" value="' . htmlspecialchars($order, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="ok" value="1" />';
-    echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-    echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
+	echo _MD_NEWBB_DELEDEDMSG . '<br>';
+	echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
+	echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="order" value="' . htmlspecialchars($order, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="ok" value="1" />';
+	echo $GLOBALS['xoopsSecurity']->getTokenHTML();
+	echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
           <input type="button" name="confirm_back" value="' . _CANCEL . '" onclick="history.go(-1);" title="' . _CANCEL . '" />
           </form>
           </div>';
-    if ($isAdmin) {
-        xoops_confirm([
-                          'post_id'  => $post_id,
-                          'viewmode' => $viewmode,
-                          'order'    => $order,
-                          'forum'    => $forum,
-                          'topic_id' => $topic_id,
-                          'ok'       => 99
-                      ], 'delete.php', _MD_NEWBB_DEL_RELATED);
-    }
-    require_once $GLOBALS['xoops']->path('footer.php');
+	if ($isAdmin) {
+		xoops_confirm([
+						  'post_id'  => $post_id,
+						  'viewmode' => $viewmode,
+						  'order'    => $order,
+						  'forum'    => $forum,
+						  'topic_id' => $topic_id,
+						  'ok'       => 99
+					  ], 'delete.php', _MD_NEWBB_DEL_RELATED);
+	}
+	require_once $GLOBALS['xoops']->path('footer.php');
 }

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $ok = Request::getInt('ok', 0, 'POST');
 
@@ -43,15 +43,15 @@ 
 }
 $topic_id = $topic->getVar('topic_id');
 if (!$topic_id) {
-    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum='.$forum;
+    $redirect = XOOPS_URL.'/modules/newbb/'.$redirect;
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 $forum       = $topic->getVar('forum_id');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $isAdmin = newbbIsAdmin($forumObject);
@@ -62,11 +62,11 @@ 
 $topic_status = $topic->getVar('topic_status');
 if (($postObject->checkIdentity() || $isAdmin) && $topicHandler->getPermission($topic->getVar('forum_id'), $topic_status, 'delete')) {
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
 }
 
 if (!$isAdmin && !$postObject->checkTimelimit('delete_timelimit')) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -82,7 +82,7 @@ 
     }
     if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
         //$postHandler->emptyTopic($postObject);
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
     } else {
         if (Request::getString('post_text', '', 'POST')) {
             //send a message
@@ -101,11 +101,11 @@ 
                 $xoopsMailer->setToUsers($senduser);
                 $xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
                 $xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
-                $forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
+                $forenurl = '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postObject->getVar('topic_id').'">'.$postObject->getVar('subject').'</a>';
                 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
                     $forenurl = seo_urls($forenurl);
                 }
-                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
+                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL.'/');
                 $body = $myts->nl2Br($body);
                 $xoopsMailer->setBody($body);
                 $xoopsMailer->send();
@@ -121,25 +121,25 @@ 
 
     //$postObject->loadFilters('delete');
     if ($isDeleteOne) {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
     } else {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
     }
 } else {
     require_once $GLOBALS['xoops']->path('header.php');
     //xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
-    echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
-          <form method="post" action="' . XOOPS_URL . '/modules/newbb/delete.php">';
-    echo _MD_NEWBB_DELEDEDMSG . '<br>';
+    echo '<div class="confirmMsg">'._MD_NEWBB_DEL_ONE.'<br>
+          <form method="post" action="' . XOOPS_URL.'/modules/newbb/delete.php">';
+    echo _MD_NEWBB_DELEDEDMSG.'<br>';
     echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
-    echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="order" value="' . htmlspecialchars($order, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5) . '" />';
+    echo '<input type="hidden" name="post_id" value="'.htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="order" value="'.htmlspecialchars($order, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="forum" value="'.htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="topic_id" value="'.htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5).'" />';
     echo '<input type="hidden" name="ok" value="1" />';
     echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-    echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
-          <input type="button" name="confirm_back" value="' . _CANCEL . '" onclick="history.go(-1);" title="' . _CANCEL . '" />
+    echo '<input type="submit" name="confirm_submit" value="'._SUBMIT.'" title="'._SUBMIT.'"/>
+          <input type="button" name="confirm_back" value="' . _CANCEL.'" onclick="history.go(-1);" title="'._CANCEL.'" />
           </form>
           </div>';
     if ($isAdmin) {

polls.php

Indentation +685 added lines, -685 removed lines

@@ -30,17 +30,17 @@ 
 xoops_load('XoopsLocal');
 $op      = 'add';
 $goodOps = [
-    'add',
-    'save',
-    'edit',
-    'update',
-    'addmore',
-    'savemore',
-    'delete',
-    'delete_ok',
-    'restart',
-    'restart_ok',
-    'log'
+	'add',
+	'save',
+	'edit',
+	'update',
+	'addmore',
+	'savemore',
+	'delete',
+	'delete_ok',
+	'restart',
+	'restart_ok',
+	'log'
 ];
 $op      = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'add';
 $op      = (!in_array($op, $goodOps)) ? 'add' : $op;
@@ -54,705 +54,705 @@ 
 $topicObject  = $topicHandler->get($topic_id);
 // topic exist
 if (is_object($topicObject)) {
-    $forum_id = $topicObject->getVar('forum_id');
+	$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']);
 if (is_object($pollModuleHandler) && $pollModuleHandler->getVar('isactive')) {
-    // new xoopspoll module
-    if ($pollModuleHandler->getVar('version') >= 140) {
-        xoops_load('constants', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        xoops_load('pollUtility', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        xoops_load('request', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        xoops_loadLanguage('admin', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        /** @var Xoopspoll\PollHandler $xpPollHandler */
-        $xpPollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
-        /** @var \XoopsPoll $pollObject */
-        $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
-        // old xoopspoll or umfrage or any clone from them
-    } else {
-        require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
-        $classPoll  = $topicObject->loadOldPoll();
-        $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
-    }
+	// new xoopspoll module
+	if ($pollModuleHandler->getVar('version') >= 140) {
+		xoops_load('constants', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		xoops_load('pollUtility', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		xoops_load('request', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		xoops_loadLanguage('admin', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		/** @var Xoopspoll\PollHandler $xpPollHandler */
+		$xpPollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
+		/** @var \XoopsPoll $pollObject */
+		$pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
+		// old xoopspoll or umfrage or any clone from them
+	} else {
+		require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+		$classPoll  = $topicObject->loadOldPoll();
+		$pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
+	}
 } else {
-    // irmtfan - issue with javascript:history.go(-1)
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_POLLMODULE_ERROR);
+	// irmtfan - issue with javascript:history.go(-1)
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_POLLMODULE_ERROR);
 }
 // include header
 require_once $GLOBALS['xoops']->path('header.php');
 
 // no admin user permission
 if (is_object($GLOBALS['xoopsUser']) && !newbbIsAdmin($forumObject)) {
-    $perm = false;
-    if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'addpoll')) {
-        if (('add' === $op || 'save' === $op || 'update' === $op) && !$topicObject->getVar('topic_haspoll')
-            && ($GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster'))) {
-            $perm = true;
-        } elseif (!empty($poll_id) && ($GLOBALS['xoopsUser']->getVar('uid') == $pollObject->getVar('user_id'))) {
-            $perm = true;
-        }
-    }
-    if (!$perm) {
-        redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _NOPERM);
-    }
+	$perm = false;
+	if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'addpoll')) {
+		if (('add' === $op || 'save' === $op || 'update' === $op) && !$topicObject->getVar('topic_haspoll')
+			&& ($GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster'))) {
+			$perm = true;
+		} elseif (!empty($poll_id) && ($GLOBALS['xoopsUser']->getVar('uid') == $pollObject->getVar('user_id'))) {
+			$perm = true;
+		}
+	}
+	if (!$perm) {
+		redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _NOPERM);
+	}
 }
 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);
-
-            $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);
-            }
-            $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
-
-    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);
-            } 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();
-        }
-        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()));
-            }
-            /*
+	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);
+				}
+				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();
+		}
+		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);
+			} 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();
+		}
+		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));
-            }
-
-            $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', Xoopspoll\Constants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', Xoopspoll\Constants::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 Xoopspoll\Option $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()));
-        }
-        /* 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 Xoopspoll\OptionHandler $xpOptHandler */
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            /** @var Xoopspoll\LogHandler $xpLogHandler */
-            $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-            //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
-            $classConstants   = new XoopsModules\Xoopspoll\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
-            }
-
-            $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 {
-            $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));
-            }
-            $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', $classConstants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', $classConstants::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');
-        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);
-                }
-            }
-        }
-        $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 {
-                    $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();
-                }
-                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);
-            } else {
-                $msg = $xpPollHandler->getHtmlErrors();
-            }
-            // 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();
-            }
-        }
-        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);
-
-            $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);
-            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   = new XoopsModules\Xoopspoll\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   = new XoopsModules\Xoopspoll\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       = Xoopspoll\Constants::POLL_NOT_MAILED;
-            $poll_mailed           = Xoopspoll\Constants::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);
-        }
-
-        $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);
-        }
-
-        // 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 Xoopspoll\OptionHandler $xpOptHandler */
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                /** @var Xoopspoll\LogHandler $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 {
-            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;
+			$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));
+			}
+
+			$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', Xoopspoll\Constants::POLL_NOT_MAILED);
+			} else {
+				// if not notify, set mail status to already "mailed"
+				$pollObject->setVar('mail_status', Xoopspoll\Constants::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 Xoopspoll\Option $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()));
+		}
+		/* 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 Xoopspoll\OptionHandler $xpOptHandler */
+			$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+			/** @var Xoopspoll\LogHandler $xpLogHandler */
+			$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+			//            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
+			$classConstants   = new XoopsModules\Xoopspoll\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
+			}
+
+			$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 {
+			$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));
+			}
+			$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', $classConstants::POLL_NOT_MAILED);
+			} else {
+				// if not notify, set mail status to already "mailed"
+				$pollObject->setVar('mail_status', $classConstants::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');
+		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);
+				}
+			}
+		}
+		$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 {
+					$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();
+				}
+				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);
+			} else {
+				$msg = $xpPollHandler->getHtmlErrors();
+			}
+			// 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();
+			}
+		}
+		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);
+
+			$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);
+			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   = new XoopsModules\Xoopspoll\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   = new XoopsModules\Xoopspoll\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       = Xoopspoll\Constants::POLL_NOT_MAILED;
+			$poll_mailed           = Xoopspoll\Constants::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);
+		}
+
+		$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);
+		}
+
+		// 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 Xoopspoll\OptionHandler $xpOptHandler */
+				$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+				/** @var Xoopspoll\LogHandler $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 {
+			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;
 } // switch
 
 // irmtfan move to footer.php

Switch Indentation +640 added lines, -640 removed lines

@@ -111,648 +111,648 @@
     }
 }
 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);
-
-            $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);
-            }
-            $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
-
-    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);
-            } 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();
-        }
-        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()));
-            }
-            /*
+    	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);
+                	}
+                	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();
+        	}
+        	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);
+            	} 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();
+        	}
+        	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));
-            }
-
-            $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', Xoopspoll\Constants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', Xoopspoll\Constants::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 Xoopspoll\Option $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()));
-        }
-        /* 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 Xoopspoll\OptionHandler $xpOptHandler */
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            /** @var Xoopspoll\LogHandler $xpLogHandler */
-            $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-            //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
-            $classConstants   = new XoopsModules\Xoopspoll\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
-            }
-
-            $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 {
-            $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));
-            }
-            $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', $classConstants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', $classConstants::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');
-        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);
-                }
-            }
-        }
-        $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 {
-                    $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();
-                }
-                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);
-            } else {
-                $msg = $xpPollHandler->getHtmlErrors();
-            }
-            // 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();
-            }
-        }
-        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);
-
-            $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);
-            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   = new XoopsModules\Xoopspoll\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   = new XoopsModules\Xoopspoll\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       = Xoopspoll\Constants::POLL_NOT_MAILED;
-            $poll_mailed           = Xoopspoll\Constants::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);
-        }
-
-        $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);
-        }
-
-        // 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 Xoopspoll\OptionHandler $xpOptHandler */
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                /** @var Xoopspoll\LogHandler $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 {
-            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;
+            	$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));
+            	}
+
+            	$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', Xoopspoll\Constants::POLL_NOT_MAILED);
+            	} else {
+                	// if not notify, set mail status to already "mailed"
+                	$pollObject->setVar('mail_status', Xoopspoll\Constants::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 Xoopspoll\Option $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()));
+        	}
+        	/* 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 Xoopspoll\OptionHandler $xpOptHandler */
+            	$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+            	/** @var Xoopspoll\LogHandler $xpLogHandler */
+            	$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+            	//            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
+            	$classConstants   = new XoopsModules\Xoopspoll\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
+            	}
+
+            	$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 {
+            	$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));
+            	}
+            	$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', $classConstants::POLL_NOT_MAILED);
+            	} else {
+                	// if not notify, set mail status to already "mailed"
+                	$pollObject->setVar('mail_status', $classConstants::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');
+        	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);
+                	}
+            	}
+        	}
+        	$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 {
+                    	$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();
+                	}
+                	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);
+            	} else {
+                	$msg = $xpPollHandler->getHtmlErrors();
+            	}
+            	// 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();
+            	}
+        	}
+        	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);
+
+            	$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);
+            	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   = new XoopsModules\Xoopspoll\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   = new XoopsModules\Xoopspoll\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       = Xoopspoll\Constants::POLL_NOT_MAILED;
+            	$poll_mailed           = Xoopspoll\Constants::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);
+        	}
+
+        	$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);
+        	}
+
+        	// 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 Xoopspoll\OptionHandler $xpOptHandler */
+                	$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                	/** @var Xoopspoll\LogHandler $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 {
+            	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;
 } // switch
 
 // irmtfan move to footer.php

Spacing +47 added lines, -47 removed lines

@@ -23,7 +23,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');
@@ -56,18 +56,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']);
@@ -84,7 +84,7 @@ 
         $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
         // old xoopspoll or umfrage or any clone from them
     } else {
-        require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+        require_once $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/include/constants.php');
         $classPoll  = $topicObject->loadOldPoll();
         $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
     }
@@ -114,11 +114,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
@@ -134,7 +134,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);
@@ -147,14 +147,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/'
@@ -176,7 +176,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
@@ -184,13 +184,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);
@@ -198,13 +198,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);
             }
@@ -212,7 +212,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;
@@ -228,9 +228,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);
@@ -238,7 +238,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'));
@@ -246,7 +246,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
@@ -264,7 +264,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) {
@@ -275,7 +275,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'));
@@ -306,7 +306,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 Xoopspoll\Option $optionObject */
@@ -333,7 +333,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':
@@ -346,7 +346,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
@@ -465,8 +465,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]);
@@ -497,7 +497,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');
@@ -511,14 +511,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>");
@@ -536,7 +536,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;
 
@@ -551,7 +551,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');
@@ -568,7 +568,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);
@@ -586,7 +586,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;
 
@@ -610,8 +610,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);
@@ -638,13 +638,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   = new XoopsModules\Xoopspoll\Constants();
+            $classConstants = new XoopsModules\Xoopspoll\Constants();
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
         // old xoopspoll or umfrage or any clone from them
         } else {
@@ -652,10 +652,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,
@@ -669,7 +669,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;
 
@@ -681,7 +681,7 @@ 
 
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
+            $classConstants = new XoopsModules\Xoopspoll\Constants();
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
             $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
             $poll_mailed           = $classConstants::POLL_MAILED;
@@ -731,8 +731,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();
@@ -741,7 +741,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':
@@ -756,5 +756,5 @@ 
 } // switch
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

footer.php

Indentation +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
 xoops_load('XoopsLists');
 $allfiles = \XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($js_rel_path));
 foreach ($allfiles as $jsfile) {
-    if ('js' === strtolower(pathinfo($jsfile, PATHINFO_EXTENSION))) {
-        $xoTheme->addScript($js_rel_path . '/' . $jsfile);
-    }
+	if ('js' === strtolower(pathinfo($jsfile, PATHINFO_EXTENSION))) {
+		$xoTheme->addScript($js_rel_path . '/' . $jsfile);
+	}
 }
 global $forumCookie;  // for $forumCookie["prefix"] revert last change - use global instead of include
 // add toggle script

Spacing +6 added lines, -6 removed lines

@@ -25,23 +25,23 @@
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.render.php');
 $iconHandler = newbbGetIconHandler();
 //  get css rel path from setted language
-$css_rel_path = $iconHandler->getPath('language/' . $GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'css');
+$css_rel_path = $iconHandler->getPath('language/'.$GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'css');
 // add local stylesheet
 /** @var xos_opal_Theme $xoTheme */
-$xoTheme->addStylesheet($css_rel_path . '/style.css');
+$xoTheme->addStylesheet($css_rel_path.'/style.css');
 
 //  get js rel path from setted language
-$js_rel_path = $iconHandler->getPath('language/' . $GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'js');
+$js_rel_path = $iconHandler->getPath('language/'.$GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'js');
 // add all local js files inside js directory
 xoops_load('XoopsLists');
 $allfiles = \XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($js_rel_path));
 foreach ($allfiles as $jsfile) {
     if ('js' === strtolower(pathinfo($jsfile, PATHINFO_EXTENSION))) {
-        $xoTheme->addScript($js_rel_path . '/' . $jsfile);
+        $xoTheme->addScript($js_rel_path.'/'.$jsfile);
     }
 }
-global $forumCookie;  // for $forumCookie["prefix"] revert last change - use global instead of include
+global $forumCookie; // for $forumCookie["prefix"] revert last change - use global instead of include
 // add toggle script
 //$toggle_script = "var toggle_cookie=\"" . $forumCookie['prefix'] . 'G' . '\';';
-$toggle_script = 'var toggle_cookie="' . $forumCookie['prefix'] . 'G";';
+$toggle_script = 'var toggle_cookie="'.$forumCookie['prefix'].'G";';
 $xoTheme->addScript(null, ['type' => 'text/javascript'], $toggle_script);

moderate.php

Indentation +129 added lines, -129 removed lines

@@ -21,75 +21,75 @@ 
 $forum_id     = Request::getInt('forum', 0);
 $isAdmin      = newbbIsAdmin($forum_id);
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 $is_administrator = $GLOBALS['xoopsUserIsAdmin'];
 ///** @var Newbb\ModerateHandler $moderateHandler */
 //$moderateHandler = Newbb\Helper::getInstance()->getHandler('Moderate');
 
 if (Request::hasVar('submit', 'POST') && Request::getInt('expire', 0, 'POST')) {
-    $ipWithMask = '';
-    if (0 == $forum_userid) {
-        $ipWithMask = Request::getString('ip', null, 'POST');
-        $mask       = '';
-        $ipParts    = explode('/', $ipWithMask);
-        $ip         = new \Xmf\IPAddress($ipParts[0]);
-        if (false === $ip->asReadable()) {
-            $ipWithMask = '';
-        } else {
-            $ipWithMask = $ip->asReadable();
-            $mask       = empty($ipParts[1]) ? 0 : (int)$ipParts[1];
-            $mask       = ($mask > ((4 === $ip->ipVersion()) ? 32 : 128) || $mask < 8) ? '' : $mask;
-            $ipWithMask .= empty($mask) ? '' : '/' . $mask;
-        }
-    }
-
-    $mod_end  = time() + Request::getInt('expire', 0, 'POST') * 3600 * 24;
-    $mod_desc = Request::getString('desc', '', 'POST');
-
-    $moderateObject = $moderateHandler->create();
-    $moderateObject->setVar('uid', $forum_userid);
-    $moderateObject->setVar('ip', $ipWithMask);
-    $moderateObject->setVar('forum_id', $forum_id);
-    $moderateObject->setVar('mod_start', time());
-    $moderateObject->setVar('mod_end', $mod_end);
-    $moderateObject->setVar('mod_desc', $mod_desc);
-    $res = $moderateHandler->insert($moderateObject);
-
-    redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+	$ipWithMask = '';
+	if (0 == $forum_userid) {
+		$ipWithMask = Request::getString('ip', null, 'POST');
+		$mask       = '';
+		$ipParts    = explode('/', $ipWithMask);
+		$ip         = new \Xmf\IPAddress($ipParts[0]);
+		if (false === $ip->asReadable()) {
+			$ipWithMask = '';
+		} else {
+			$ipWithMask = $ip->asReadable();
+			$mask       = empty($ipParts[1]) ? 0 : (int)$ipParts[1];
+			$mask       = ($mask > ((4 === $ip->ipVersion()) ? 32 : 128) || $mask < 8) ? '' : $mask;
+			$ipWithMask .= empty($mask) ? '' : '/' . $mask;
+		}
+	}
+
+	$mod_end  = time() + Request::getInt('expire', 0, 'POST') * 3600 * 24;
+	$mod_desc = Request::getString('desc', '', 'POST');
+
+	$moderateObject = $moderateHandler->create();
+	$moderateObject->setVar('uid', $forum_userid);
+	$moderateObject->setVar('ip', $ipWithMask);
+	$moderateObject->setVar('forum_id', $forum_id);
+	$moderateObject->setVar('mod_start', time());
+	$moderateObject->setVar('mod_end', $mod_end);
+	$moderateObject->setVar('mod_desc', $mod_desc);
+	$res = $moderateHandler->insert($moderateObject);
+
+	redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
 } elseif (Request::hasVar('del')) {
-    $moderateObject = $moderateHandler->get(Request::getInt('del', 0, 'GET'));
-    if ($is_administrator || $moderateObject->getVar('forum_id') == $forum_id) {
-        $moderateHandler->delete($moderateObject, true);
-        redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
-    }
+	$moderateObject = $moderateHandler->get(Request::getInt('del', 0, 'GET'));
+	if ($is_administrator || $moderateObject->getVar('forum_id') == $forum_id) {
+		$moderateHandler->delete($moderateObject, true);
+		redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+	}
 }
 
 $start    = Request::getInt('start', 0, 'GET');
 $sortname = Request::getString('sort', '', 'GET');
 
 switch ($sortname) {
-    case 'uid':
-        $sort  = 'uid ASC, ip';
-        $order = 'ASC';
-        break;
-    case 'start':
-        $sort  = 'mod_start';
-        $order = 'ASC';
-        break;
-    case 'expire':
-        $sort  = 'mod_end';
-        $order = 'DESC';
-        break;
-    default:
-        $sort  = 'forum_id ASC, uid ASC, ip';
-        $order = 'ASC';
-        break;
+	case 'uid':
+		$sort  = 'uid ASC, ip';
+		$order = 'ASC';
+		break;
+	case 'start':
+		$sort  = 'mod_start';
+		$order = 'ASC';
+		break;
+	case 'expire':
+		$sort  = 'mod_end';
+		$order = 'DESC';
+		break;
+	default:
+		$sort  = 'forum_id ASC, uid ASC, ip';
+		$order = 'ASC';
+		break;
 }
 // show all bans for module admin - for moderator just show its forum_id bans
 $criteria = new \CriteriaCompo();
 if (!$is_administrator) {
-    $criteria->add(new \Criteria('forum_id', $forum_id, '='));
+	$criteria->add(new \Criteria('forum_id', $forum_id, '='));
 }
 $criteria->setLimit($GLOBALS['xoopsModuleConfig']['topics_per_page']);
 $criteria->setStart($start);
@@ -100,75 +100,75 @@ 
 
 $url = 'moderate.php';
 if ($forum_id) {
-    $url .= '?forum=' . $forum_id;
+	$url .= '?forum=' . $forum_id;
 }
 $xoopsTpl->assign('moderate_url', $url);
 
 if (!empty($moderate_count)) {
-    $_users = [];
-    foreach (array_keys($moderateObjects) as $id) {
-        $_users[$moderateObjects[$id]->getVar('uid')] = 1;
-    }
-    $users = newbbGetUnameFromIds(array_keys($_users), $GLOBALS['xoopsModuleConfig']['show_realname'], true);
-
-    $columnHeaders ['uid']    = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=uid',
-        'header' => _MD_NEWBB_SUSPEND_UID,
-        'title'  => _MD_NEWBB_SUSPEND_UID,
-    ];
-    $columnHeaders ['start']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=start',
-        'header' => _MD_NEWBB_SUSPEND_START,
-        'title'  => _MD_NEWBB_SUSPEND_START,
-    ];
-    $columnHeaders['expire']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=expire',
-        'header' => _MD_NEWBB_SUSPEND_EXPIRE,
-        'title'  => _MD_NEWBB_SUSPEND_EXPIRE,
-    ];
-    $columnHeaders['forum']   = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=forum',
-        'header' => _MD_NEWBB_SUSPEND_SCOPE,
-        'title'  => _MD_NEWBB_SUSPEND_SCOPE,
-    ];
-    $columnHeaders['desc']    = [
-        'url'    => false,
-        'header' => _MD_NEWBB_SUSPEND_DESC,
-        'title'  => _MD_NEWBB_SUSPEND_DESC,
-    ];
-    $columnHeaders['options'] = [
-        'url'    => false,
-        'header' => _DELETE,
-        'title'  => _DELETE,
-    ];
-    $xoopsTpl->assign('columnHeaders', $columnHeaders);
-
-    //    /** @var Newbb\ForumHandler $forumHandler */
-    //    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    $forum_list = $forumHandler->getAll(null, ['forum_name'], false);
-
-    $columnRows = [];
-    foreach (array_keys($moderateObjects) as $id) {
-        // for anon, show ip instead
-        $row['uid']     = ($moderateObjects[$id]->getVar('uid') ? (isset($users[$moderateObjects[$id]->getVar('uid')]) ? $users[$moderateObjects[$id]->getVar('uid')] : $moderateObjects[$id]->getVar('uid')) : $moderateObjects[$id]->getVar('ip'));
-        $row['start']   = formatTimestamp($moderateObjects[$id]->getVar('mod_start'));
-        $row['expire']  = formatTimestamp($moderateObjects[$id]->getVar('mod_end'));
-        $row['forum']   = ($moderateObjects[$id]->getVar('forum_id') ? $forum_list[$moderateObjects[$id]->getVar('forum_id')]['forum_name'] : _ALL);
-        $row['desc']    = ($moderateObjects[$id]->getVar('mod_desc') ?: _NONE);
-        $row['options'] = (($is_administrator
-                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum=' . $forum_id . '&amp;del=' . $moderateObjects[$id]->getVar('mod_id') . '">' . _DELETE . '</a>' : '');
-        $columnRows[]   = $row;
-    }
-    $xoopsTpl->assign('columnRows', $columnRows);
-
-    if ($moderate_count > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
-        require_once $GLOBALS['xoops']->path('class/pagenav.php');
-        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum=' . $forum_id . '&amp;sort=' . $sortname);
-        //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-        //    $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
-        //}
-        $xoopsTpl->assign('moderate_page_nav', $nav->renderNav());
-    }
+	$_users = [];
+	foreach (array_keys($moderateObjects) as $id) {
+		$_users[$moderateObjects[$id]->getVar('uid')] = 1;
+	}
+	$users = newbbGetUnameFromIds(array_keys($_users), $GLOBALS['xoopsModuleConfig']['show_realname'], true);
+
+	$columnHeaders ['uid']    = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=uid',
+		'header' => _MD_NEWBB_SUSPEND_UID,
+		'title'  => _MD_NEWBB_SUSPEND_UID,
+	];
+	$columnHeaders ['start']  = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=start',
+		'header' => _MD_NEWBB_SUSPEND_START,
+		'title'  => _MD_NEWBB_SUSPEND_START,
+	];
+	$columnHeaders['expire']  = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=expire',
+		'header' => _MD_NEWBB_SUSPEND_EXPIRE,
+		'title'  => _MD_NEWBB_SUSPEND_EXPIRE,
+	];
+	$columnHeaders['forum']   = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=forum',
+		'header' => _MD_NEWBB_SUSPEND_SCOPE,
+		'title'  => _MD_NEWBB_SUSPEND_SCOPE,
+	];
+	$columnHeaders['desc']    = [
+		'url'    => false,
+		'header' => _MD_NEWBB_SUSPEND_DESC,
+		'title'  => _MD_NEWBB_SUSPEND_DESC,
+	];
+	$columnHeaders['options'] = [
+		'url'    => false,
+		'header' => _DELETE,
+		'title'  => _DELETE,
+	];
+	$xoopsTpl->assign('columnHeaders', $columnHeaders);
+
+	//    /** @var Newbb\ForumHandler $forumHandler */
+	//    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	$forum_list = $forumHandler->getAll(null, ['forum_name'], false);
+
+	$columnRows = [];
+	foreach (array_keys($moderateObjects) as $id) {
+		// for anon, show ip instead
+		$row['uid']     = ($moderateObjects[$id]->getVar('uid') ? (isset($users[$moderateObjects[$id]->getVar('uid')]) ? $users[$moderateObjects[$id]->getVar('uid')] : $moderateObjects[$id]->getVar('uid')) : $moderateObjects[$id]->getVar('ip'));
+		$row['start']   = formatTimestamp($moderateObjects[$id]->getVar('mod_start'));
+		$row['expire']  = formatTimestamp($moderateObjects[$id]->getVar('mod_end'));
+		$row['forum']   = ($moderateObjects[$id]->getVar('forum_id') ? $forum_list[$moderateObjects[$id]->getVar('forum_id')]['forum_name'] : _ALL);
+		$row['desc']    = ($moderateObjects[$id]->getVar('mod_desc') ?: _NONE);
+		$row['options'] = (($is_administrator
+							|| $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum=' . $forum_id . '&amp;del=' . $moderateObjects[$id]->getVar('mod_id') . '">' . _DELETE . '</a>' : '');
+		$columnRows[]   = $row;
+	}
+	$xoopsTpl->assign('columnRows', $columnRows);
+
+	if ($moderate_count > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
+		require_once $GLOBALS['xoops']->path('class/pagenav.php');
+		$nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum=' . $forum_id . '&amp;sort=' . $sortname);
+		//if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+		//    $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
+		//}
+		$xoopsTpl->assign('moderate_page_nav', $nav->renderNav());
+	}
 }
 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
@@ -179,19 +179,19 @@ 
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DESC, 'desc', 50, 255));
 require_once __DIR__ . '/include/functions.forum.php';
 if (newbbIsAdmin()) {
-    $forumSel = '<select name="forum">';// if user doesn't select, default is "0" all forums
-    $forumSel .= '<option value="0"';
-    if (0 == $forum_id) {
-        $forumSel .= ' selected';
-    }
-    $forumSel                         .= '>' . _ALL . '</option>';
-    $forumSel                         .= newbbForumSelectBox($forum_id, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = true
-    $forumSel                         .= '</select>';
-    $forumEle                         = new \XoopsFormLabel(_MD_NEWBB_SELFORUM, $forumSel);
-    $forumEle->customValidationCode[] = 'if (document.suspend.forum.value < 0) {return false;} ';
-    $forum_form->addElement($forumEle);
+	$forumSel = '<select name="forum">';// if user doesn't select, default is "0" all forums
+	$forumSel .= '<option value="0"';
+	if (0 == $forum_id) {
+		$forumSel .= ' selected';
+	}
+	$forumSel                         .= '>' . _ALL . '</option>';
+	$forumSel                         .= newbbForumSelectBox($forum_id, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = true
+	$forumSel                         .= '</select>';
+	$forumEle                         = new \XoopsFormLabel(_MD_NEWBB_SELFORUM, $forumSel);
+	$forumEle->customValidationCode[] = 'if (document.suspend.forum.value < 0) {return false;} ';
+	$forum_form->addElement($forumEle);
 } else {
-    $forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
+	$forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
 }
 $forum_form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 $forum_form->assign($xoopsTpl);

Spacing +19 added lines, -19 removed lines

@@ -11,7 +11,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoTheme, $xoopsTpl;
 $GLOBALS['xoopsOption']['template_main'] = 'newbb_moderate.tpl';
@@ -21,7 +21,7 @@ 
 $forum_id     = Request::getInt('forum', 0);
 $isAdmin      = newbbIsAdmin($forum_id);
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 $is_administrator = $GLOBALS['xoopsUserIsAdmin'];
 ///** @var Newbb\ModerateHandler $moderateHandler */
@@ -40,7 +40,7 @@ 
             $ipWithMask = $ip->asReadable();
             $mask       = empty($ipParts[1]) ? 0 : (int)$ipParts[1];
             $mask       = ($mask > ((4 === $ip->ipVersion()) ? 32 : 128) || $mask < 8) ? '' : $mask;
-            $ipWithMask .= empty($mask) ? '' : '/' . $mask;
+            $ipWithMask .= empty($mask) ? '' : '/'.$mask;
         }
     }
 
@@ -100,7 +100,7 @@ 
 
 $url = 'moderate.php';
 if ($forum_id) {
-    $url .= '?forum=' . $forum_id;
+    $url .= '?forum='.$forum_id;
 }
 $xoopsTpl->assign('moderate_url', $url);
 
@@ -111,27 +111,27 @@ 
     }
     $users = newbbGetUnameFromIds(array_keys($_users), $GLOBALS['xoopsModuleConfig']['show_realname'], true);
 
-    $columnHeaders ['uid']    = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=uid',
+    $columnHeaders ['uid'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=uid',
         'header' => _MD_NEWBB_SUSPEND_UID,
         'title'  => _MD_NEWBB_SUSPEND_UID,
     ];
-    $columnHeaders ['start']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=start',
+    $columnHeaders ['start'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=start',
         'header' => _MD_NEWBB_SUSPEND_START,
         'title'  => _MD_NEWBB_SUSPEND_START,
     ];
-    $columnHeaders['expire']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=expire',
+    $columnHeaders['expire'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=expire',
         'header' => _MD_NEWBB_SUSPEND_EXPIRE,
         'title'  => _MD_NEWBB_SUSPEND_EXPIRE,
     ];
-    $columnHeaders['forum']   = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=forum',
+    $columnHeaders['forum'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=forum',
         'header' => _MD_NEWBB_SUSPEND_SCOPE,
         'title'  => _MD_NEWBB_SUSPEND_SCOPE,
     ];
-    $columnHeaders['desc']    = [
+    $columnHeaders['desc'] = [
         'url'    => false,
         'header' => _MD_NEWBB_SUSPEND_DESC,
         'title'  => _MD_NEWBB_SUSPEND_DESC,
@@ -156,14 +156,14 @@ 
         $row['forum']   = ($moderateObjects[$id]->getVar('forum_id') ? $forum_list[$moderateObjects[$id]->getVar('forum_id')]['forum_name'] : _ALL);
         $row['desc']    = ($moderateObjects[$id]->getVar('mod_desc') ?: _NONE);
         $row['options'] = (($is_administrator
-                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum=' . $forum_id . '&amp;del=' . $moderateObjects[$id]->getVar('mod_id') . '">' . _DELETE . '</a>' : '');
+                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum='.$forum_id.'&amp;del='.$moderateObjects[$id]->getVar('mod_id').'">'._DELETE.'</a>' : '');
         $columnRows[]   = $row;
     }
     $xoopsTpl->assign('columnRows', $columnRows);
 
     if ($moderate_count > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
         require_once $GLOBALS['xoops']->path('class/pagenav.php');
-        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum=' . $forum_id . '&amp;sort=' . $sortname);
+        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum='.$forum_id.'&amp;sort='.$sortname);
         //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
         //    $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
         //}
@@ -177,14 +177,14 @@ 
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_IP, 'ip', 50, 50));
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DURATION, 'expire', 20, 25, '5'), true);
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DESC, 'desc', 50, 255));
-require_once __DIR__ . '/include/functions.forum.php';
+require_once __DIR__.'/include/functions.forum.php';
 if (newbbIsAdmin()) {
-    $forumSel = '<select name="forum">';// if user doesn't select, default is "0" all forums
+    $forumSel = '<select name="forum">'; // if user doesn't select, default is "0" all forums
     $forumSel .= '<option value="0"';
     if (0 == $forum_id) {
         $forumSel .= ' selected';
     }
-    $forumSel                         .= '>' . _ALL . '</option>';
+    $forumSel                         .= '>'._ALL.'</option>';
     $forumSel                         .= newbbForumSelectBox($forum_id, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = true
     $forumSel                         .= '</select>';
     $forumEle                         = new \XoopsFormLabel(_MD_NEWBB_SELFORUM, $forumSel);
@@ -196,5 +196,5 @@ 
 $forum_form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 $forum_form->assign($xoopsTpl);
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');