mambax7 / newbb5

newtopic.php

Indentation +17 added lines, -17 removed lines

@@ -14,14 +14,14 @@ 
 require_once __DIR__ . '/header.php';
 
 if (!$forum = Request::getString('forum', '', 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _NOPERM);
+	redirect_header(XOOPS_URL . '/index.php', 2, _NOPERM);
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
@@ -29,25 +29,25 @@ 
 $topicObject = $topicHandler->create();
 $topicObject->setVar('forum_id', $forum);
 if (!$topicHandler->getPermission($forumObject, 0, 'post')) {
-    /*
+	/*
      * Build the page query
      */
-    $query_vars  = ['forum', 'order', 'mode', 'viewmode'];
-    $query_array = [];
-    foreach ($query_vars as $var) {
-        if (Request::getString($var, '', 'GET')) {
-            $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
-        }
-    }
-    $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
-    unset($query_array);
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
+	$query_vars  = ['forum', 'order', 'mode', 'viewmode'];
+	$query_array = [];
+	foreach ($query_vars as $var) {
+		if (Request::getString($var, '', 'GET')) {
+			$query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+		}
+	}
+	$page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
+	unset($query_array);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
 }
 
 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);
 }
 
 $xoopsOption['template_main']                                        = 'newbb_edit_post.tpl';
@@ -55,7 +55,7 @@ 
 require_once $GLOBALS['xoops']->path('header.php');
 
 if (1 == $GLOBALS['xoopsModuleConfig']['disc_show'] || 3 == $GLOBALS['xoopsModuleConfig']['disc_show']) {
-    $xoopsTpl->assign('disclaimer', $GLOBALS['xoopsModuleConfig']['disclaimer']);
+	$xoopsTpl->assign('disclaimer', $GLOBALS['xoopsModuleConfig']['disclaimer']);
 }
 
 $subject       = '';

topicmanager.php

Indentation +295 added lines, -295 removed lines

@@ -35,25 +35,25 @@ 
 require_once __DIR__ . '/header.php';
 
 if (Request::getString('submit', '', 'POST')) {
-    foreach (['forum', 'newforum', 'newtopic'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
-    }
-    foreach (['topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
-    }
-    if (!is_array($topic_id)) {
-        $topic_id = [$topic_id];
-    }
+	foreach (['forum', 'newforum', 'newtopic'] as $getint) {
+		${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+	}
+	foreach (['topic_id'] as $getint) {
+		${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+	}
+	if (!is_array($topic_id)) {
+		$topic_id = [$topic_id];
+	}
 } else {
-    foreach (['forum', 'topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'GET');// (int)(@$_GET[$getint]);
-    }
+	foreach (['forum', 'topic_id'] as $getint) {
+		${$getint} = Request::getInt($getint, 0, 'GET');// (int)(@$_GET[$getint]);
+	}
 }
 
 if (empty($topic_id)) {
-    $redirect = empty($forum_id) ? 'index.php' : 'viewforum.php?forum={$forum}';
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum_id) ? 'index.php' : 'viewforum.php?forum={$forum}';
+	$redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
@@ -62,43 +62,43 @@ 
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 
 if (!$forum) {
-    /** @var Newbb\Topic $topicObject */
-    $topicObject = $topicHandler->get((int)$topic_id);
-    if (is_object($topicObject)) {
-        $forum = $topicObject->getVar('forum_id');
-    } else {
-        $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $topic_id;
-        redirect_header($redirect, 2, _MD_NEWBB_FORUMNOEXIST);
-    }
-    unset($topicObject);
+	/** @var Newbb\Topic $topicObject */
+	$topicObject = $topicHandler->get((int)$topic_id);
+	if (is_object($topicObject)) {
+		$forum = $topicObject->getVar('forum_id');
+	} else {
+		$redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $topic_id;
+		redirect_header($redirect, 2, _MD_NEWBB_FORUMNOEXIST);
+	}
+	unset($topicObject);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forum);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forum);
 }
 // irmtfan add restore to viewtopic
 $action_array = [
-    'merge',
-    'delete',
-    'restore',
-    'move',
-    'lock',
-    'unlock',
-    'sticky',
-    'unsticky',
-    'digest',
-    'undigest'
+	'merge',
+	'delete',
+	'restore',
+	'move',
+	'lock',
+	'unlock',
+	'sticky',
+	'unsticky',
+	'digest',
+	'undigest'
 ];
 foreach ($action_array as $_action) {
-    $action[$_action] = [
-        'name'   => $_action,
-        'desc'   => constant(strtoupper("_MD_NEWBB_DESC_{$_action}")),
-        'submit' => constant(strtoupper("_MD_NEWBB_{$_action}")),
-        'sql'    => "topic_{$_action}=1",
-        'msg'    => constant(strtoupper("_MD_NEWBB_TOPIC{$_action}"))
-    ];
+	$action[$_action] = [
+		'name'   => $_action,
+		'desc'   => constant(strtoupper("_MD_NEWBB_DESC_{$_action}")),
+		'submit' => constant(strtoupper("_MD_NEWBB_{$_action}")),
+		'sql'    => "topic_{$_action}=1",
+		'msg'    => constant(strtoupper("_MD_NEWBB_TOPIC{$_action}"))
+	];
 }
 $action['lock']['sql']     = 'topic_status = 1';
 $action['unlock']['sql']   = 'topic_status = 0';
@@ -112,269 +112,269 @@ 
 require_once $GLOBALS['xoops']->path('header.php');
 
 if (Request::getString('submit', '', 'POST')) {
-    $mode = Request::getString('mode', '', 'POST');// $_POST['mode'];
+	$mode = Request::getString('mode', '', 'POST');// $_POST['mode'];
 
-    if ('delete' === $mode) {
-        foreach ($topic_id as $tid) {
-            $topicObject = $topicHandler->get($tid);
-            $topicHandler->delete($topicObject, false);
-            // irmtfan - sync topic after delete
-            $topicHandler->synchronization($topicObject);
-            $forumHandler->synchronization($forum);
-            //$topicObject->loadFilters("delete");
-            //sync($topic_id, "topic");
-            //xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
-        }
-        // irmtfan full URL
-        echo $action[$mode]['msg'] . "<p><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_NEWBB_RETURNTOTHEFORUM . "</a></p><p><a href='index.php'>" . _MD_NEWBB_RETURNFORUMINDEX . '</a></p>';
-    } elseif ('restore' === $mode) {
-        //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            $topicObject = $topicsObject[$id];
-            $topicHandler->approve($topicObject);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
-        //irmtfan remove - no need to approve posts manually - see class/post.php approve function
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forumsObject   = $forumHandler->getAll($criteria_forum);
-        foreach (array_keys($forumsObject) as $id) {
-            $forumHandler->synchronization($forumsObject[$id]);
-        }
-        unset($topicsObject, $forumsObject);
-        // irmtfan add restore to viewtopic
-        $restoretopic_id = $topicObject->getVar('topic_id');
-        // irmtfan / missing in URL
-        echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$restoretopic_id'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
-    } elseif ('merge' === $mode) {
-        //        /** @var PostHandler $postHandler */
-        //        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-        //        /** @var Newbb\RateHandler $rateHandler */
-        //        $rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
+	if ('delete' === $mode) {
+		foreach ($topic_id as $tid) {
+			$topicObject = $topicHandler->get($tid);
+			$topicHandler->delete($topicObject, false);
+			// irmtfan - sync topic after delete
+			$topicHandler->synchronization($topicObject);
+			$forumHandler->synchronization($forum);
+			//$topicObject->loadFilters("delete");
+			//sync($topic_id, "topic");
+			//xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
+		}
+		// irmtfan full URL
+		echo $action[$mode]['msg'] . "<p><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_NEWBB_RETURNTOTHEFORUM . "</a></p><p><a href='index.php'>" . _MD_NEWBB_RETURNFORUMINDEX . '</a></p>';
+	} elseif ('restore' === $mode) {
+		//$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		$forums       = [];
+		$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+		foreach (array_keys($topicsObject) as $id) {
+			$topicObject = $topicsObject[$id];
+			$topicHandler->approve($topicObject);
+			$topicHandler->synchronization($topicObject);
+			$forums[$topicObject->getVar('forum_id')] = 1;
+		}
+		//irmtfan remove - no need to approve posts manually - see class/post.php approve function
+		$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+		$forumsObject   = $forumHandler->getAll($criteria_forum);
+		foreach (array_keys($forumsObject) as $id) {
+			$forumHandler->synchronization($forumsObject[$id]);
+		}
+		unset($topicsObject, $forumsObject);
+		// irmtfan add restore to viewtopic
+		$restoretopic_id = $topicObject->getVar('topic_id');
+		// irmtfan / missing in URL
+		echo $action[$mode]['msg']
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewtopic.php?topic_id=$restoretopic_id'>"
+			 . _MD_NEWBB_VIEWTHETOPIC
+			 . '</a></p>'
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewforum.php?forum=$forum'>"
+			 . _MD_NEWBB_RETURNTOTHEFORUM
+			 . '</a></p>'
+			 . "<p><a href='index.php'>"
+			 . _MD_NEWBB_RETURNFORUMINDEX
+			 . '</a></p>';
+	} elseif ('merge' === $mode) {
+		//        /** @var PostHandler $postHandler */
+		//        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+		//        /** @var Newbb\RateHandler $rateHandler */
+		//        $rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
 
-        foreach ($topic_id as $tid) {
-            $topicObject    = $topicHandler->get($tid);
-            $newtopicObject = $topicHandler->get($newtopic);
+		foreach ($topic_id as $tid) {
+			$topicObject    = $topicHandler->get($tid);
+			$newtopicObject = $topicHandler->get($newtopic);
 
-            /* return false if destination topic is not existing */
-            // irmtfan bug fix: the old topic will be deleted if user input a not exist new topic
-            if (!is_object($newtopicObject)) {
-                $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $tid;
-                redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
-            }
-            $criteria_topic = new \Criteria('topic_id', $tid);
-            $criteria       = new \CriteriaCompo($criteria_topic);
-            $criteria->add(new \Criteria('pid', 0));
-            // irmtfan OR change to this for less query?:
-            // $postHandler->updateAll("pid", $newtopicObject->getVar("topic_last_post_id"), $criteria, true);
-            $postHandler->updateAll('pid', $topicHandler->getTopPostId($newtopic), $criteria, true);
-            $postHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
-            // irmtfan update vote data instead of deleting them
-            $rateHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
+			/* return false if destination topic is not existing */
+			// irmtfan bug fix: the old topic will be deleted if user input a not exist new topic
+			if (!is_object($newtopicObject)) {
+				$redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $tid;
+				redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+			}
+			$criteria_topic = new \Criteria('topic_id', $tid);
+			$criteria       = new \CriteriaCompo($criteria_topic);
+			$criteria->add(new \Criteria('pid', 0));
+			// irmtfan OR change to this for less query?:
+			// $postHandler->updateAll("pid", $newtopicObject->getVar("topic_last_post_id"), $criteria, true);
+			$postHandler->updateAll('pid', $topicHandler->getTopPostId($newtopic), $criteria, true);
+			$postHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
+			// irmtfan update vote data instead of deleting them
+			$rateHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
 
-            $topic_views = $topicObject->getVar('topic_views') + $newtopicObject->getVar('topic_views');
-            // irmtfan better method to update topic_views in new topic
-            //$criteria_newtopic = new \Criteria('topic_id', $newtopic);
-            //$topicHandler->updateAll('topic_views', $topic_views, $criteria_newtopic, true);
-            $newtopicObject->setVar('topic_views', $topic_views);
-            // START irmtfan poll_module and rewrite the method
-            // irmtfan only move poll in old topic to new topic if new topic has not a poll
-            $poll_id = $topicObject->getVar('poll_id');
-            if ($poll_id > 0 && (0 == $newtopicObject->getVar('poll_id'))) {
-                $newtopicObject->setVar('topic_haspoll', 1);
-                $newtopicObject->setVar('poll_id', $poll_id);
-                $poll_id = 0;// set to not delete the poll
-                $topicObject->setVar('topic_haspoll', 0); // set to not delete the poll
-                $topicObject->setVar('poll_id', 0);// set to not delete the poll
-            }
-            //update and sync newtopic after merge
-            //$topicHandler->insert($newtopicObject, true);
-            $topicHandler->synchronization($newtopicObject); // very important: only use object
-            //sync newforum after merge
-            $newforum = $newtopicObject->getVar('forum_id');
-            $forumHandler->synchronization($newforum);
-            //hardcode remove force to delete old topic from database
-            //$topicHandler->delete($topicObject,true); // cannot use this
-            $topicHandler->deleteAll($criteria_topic, true); // $force = true
-            //delete poll if old topic had a poll
-            $topicObject->deletePoll($poll_id);
-            //sync forum after delete old topic
-            $forumHandler->synchronization($forum);
-            // END irmtfan poll_module and rewrite the method
-        }
-        echo $action[$mode]['msg']
-             . // irmtfan full URL
-             "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$newtopic'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
-    } elseif ('move' === $mode) {
-        if ($newforum > 0) {
-            $topic_id    = $topic_id[0];
-            $topicObject = $topicHandler->get($topic_id);
-            $topicObject->loadFilters('update');
-            $topicObject->setVar('forum_id', $newforum, true);
-            $topicHandler->insert($topicObject, true);
-            $topicObject->loadFilters('update');
+			$topic_views = $topicObject->getVar('topic_views') + $newtopicObject->getVar('topic_views');
+			// irmtfan better method to update topic_views in new topic
+			//$criteria_newtopic = new \Criteria('topic_id', $newtopic);
+			//$topicHandler->updateAll('topic_views', $topic_views, $criteria_newtopic, true);
+			$newtopicObject->setVar('topic_views', $topic_views);
+			// START irmtfan poll_module and rewrite the method
+			// irmtfan only move poll in old topic to new topic if new topic has not a poll
+			$poll_id = $topicObject->getVar('poll_id');
+			if ($poll_id > 0 && (0 == $newtopicObject->getVar('poll_id'))) {
+				$newtopicObject->setVar('topic_haspoll', 1);
+				$newtopicObject->setVar('poll_id', $poll_id);
+				$poll_id = 0;// set to not delete the poll
+				$topicObject->setVar('topic_haspoll', 0); // set to not delete the poll
+				$topicObject->setVar('poll_id', 0);// set to not delete the poll
+			}
+			//update and sync newtopic after merge
+			//$topicHandler->insert($newtopicObject, true);
+			$topicHandler->synchronization($newtopicObject); // very important: only use object
+			//sync newforum after merge
+			$newforum = $newtopicObject->getVar('forum_id');
+			$forumHandler->synchronization($newforum);
+			//hardcode remove force to delete old topic from database
+			//$topicHandler->delete($topicObject,true); // cannot use this
+			$topicHandler->deleteAll($criteria_topic, true); // $force = true
+			//delete poll if old topic had a poll
+			$topicObject->deletePoll($poll_id);
+			//sync forum after delete old topic
+			$forumHandler->synchronization($forum);
+			// END irmtfan poll_module and rewrite the method
+		}
+		echo $action[$mode]['msg']
+			 . // irmtfan full URL
+			 "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewtopic.php?topic_id=$newtopic'>"
+			 . _MD_NEWBB_VIEWTHETOPIC
+			 . '</a></p>'
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewforum.php?forum=$forum'>"
+			 . _MD_NEWBB_RETURNTOTHEFORUM
+			 . '</a></p>'
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/index.php'>"
+			 . _MD_NEWBB_RETURNFORUMINDEX
+			 . '</a></p>';
+	} elseif ('move' === $mode) {
+		if ($newforum > 0) {
+			$topic_id    = $topic_id[0];
+			$topicObject = $topicHandler->get($topic_id);
+			$topicObject->loadFilters('update');
+			$topicObject->setVar('forum_id', $newforum, true);
+			$topicHandler->insert($topicObject, true);
+			$topicObject->loadFilters('update');
 
-            $sql = sprintf('UPDATE "%s" SET forum_id = "%u" WHERE topic_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_posts'), $newforum, $topic_id);
-            if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
-                return false;
-            }
-            $forumHandler->synchronization($forum);
-            $forumHandler->synchronization($newforum);
-            // irmtfan full URL
-            echo $action[$mode]['msg']
-                 . "<p><a href='"
-                 . XOOPS_URL
-                 . '/modules/'
-                 . $xoopsModule->getVar('dirname')
-                 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
-                 . _MD_NEWBB_GOTONEWFORUM
-                 . "</a></p><p><a href='"
-                 . XOOPS_URL
-                 . "/modules/newbb/index.php'>"
-                 . _MD_NEWBB_RETURNFORUMINDEX
-                 . '</a></p>';
-        } else {
-            // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERRORFORUM);
-        }
-    } else {
-        $topic_id  = $topic_id[0];
-        $forum     = $topicHandler->get($topic_id, 'forum_id');
-        $forum_new = !empty($newtopic) ? $topicHandler->get($newtopic, 'forum_id') : 0;
+			$sql = sprintf('UPDATE "%s" SET forum_id = "%u" WHERE topic_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_posts'), $newforum, $topic_id);
+			if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
+				return false;
+			}
+			$forumHandler->synchronization($forum);
+			$forumHandler->synchronization($newforum);
+			// irmtfan full URL
+			echo $action[$mode]['msg']
+				 . "<p><a href='"
+				 . XOOPS_URL
+				 . '/modules/'
+				 . $xoopsModule->getVar('dirname')
+				 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
+				 . _MD_NEWBB_GOTONEWFORUM
+				 . "</a></p><p><a href='"
+				 . XOOPS_URL
+				 . "/modules/newbb/index.php'>"
+				 . _MD_NEWBB_RETURNFORUMINDEX
+				 . '</a></p>';
+		} else {
+			// irmtfan - issue with javascript:history.go(-1)
+			redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERRORFORUM);
+		}
+	} else {
+		$topic_id  = $topic_id[0];
+		$forum     = $topicHandler->get($topic_id, 'forum_id');
+		$forum_new = !empty($newtopic) ? $topicHandler->get($newtopic, 'forum_id') : 0;
 
-        if (!$forumHandler->getPermission($forum, 'moderate')
-            || (!empty($forum_new)
-                && !$forumHandler->getPermission($forum_new, 'reply'))        // The forum for the topic to be merged to
-            || (!empty($newforum) && !$forumHandler->getPermission($newforum, 'post')) // The forum to be moved to
-        ) {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
-        }
+		if (!$forumHandler->getPermission($forum, 'moderate')
+			|| (!empty($forum_new)
+				&& !$forumHandler->getPermission($forum_new, 'reply'))        // The forum for the topic to be merged to
+			|| (!empty($newforum) && !$forumHandler->getPermission($newforum, 'post')) // The forum to be moved to
+		) {
+			redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
+		}
 
-        if (!empty($action[$mode]['sql'])) {
-            $sql = sprintf('UPDATE `%s` SET ' . $action[$mode]['sql'] . ' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
-            if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK . '<br>sql: ' . $sql);
-            }
-        } else {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
-        }
-        if ('digest' === $mode && $GLOBALS['xoopsDB']->getAffectedRows()) {
-            $topicObject = $topicHandler->get($topic_id);
-            //            /** @var Newbb\StatsHandler $statsHandler */
-            //            $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-            $statsHandler->update($topicObject->getVar('forum_id'), 'digest');
-            //            /** @var Newbb\UserstatsHandler $userstatsHandler */
-            //            $userstatsHandler = Newbb\Helper::getInstance()->getHandler('Userstats');
-            if ($user_stat = $userstatsHandler->get($topicObject->getVar('topic_poster'))) {
-                $z = $user_stat->getVar('user_digests') + 1;
-                $user_stat->setVar('user_digests', (int)$z);
-                $userstatsHandler->insert($user_stat);
-            }
-        }
-        // irmtfan full URL
-        echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . "</a></p><p><a href='"
-             . XOOPS_URL
-             . "/modules/newbb/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
-    }
+		if (!empty($action[$mode]['sql'])) {
+			$sql = sprintf('UPDATE `%s` SET ' . $action[$mode]['sql'] . ' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
+			if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
+				redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK . '<br>sql: ' . $sql);
+			}
+		} else {
+			redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
+		}
+		if ('digest' === $mode && $GLOBALS['xoopsDB']->getAffectedRows()) {
+			$topicObject = $topicHandler->get($topic_id);
+			//            /** @var Newbb\StatsHandler $statsHandler */
+			//            $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+			$statsHandler->update($topicObject->getVar('forum_id'), 'digest');
+			//            /** @var Newbb\UserstatsHandler $userstatsHandler */
+			//            $userstatsHandler = Newbb\Helper::getInstance()->getHandler('Userstats');
+			if ($user_stat = $userstatsHandler->get($topicObject->getVar('topic_poster'))) {
+				$z = $user_stat->getVar('user_digests') + 1;
+				$user_stat->setVar('user_digests', (int)$z);
+				$userstatsHandler->insert($user_stat);
+			}
+		}
+		// irmtfan full URL
+		echo $action[$mode]['msg']
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
+			 . _MD_NEWBB_VIEWTHETOPIC
+			 . "</a></p><p><a href='"
+			 . XOOPS_URL
+			 . "/modules/newbb/viewforum.php?forum=$forum'>"
+			 . _MD_NEWBB_RETURNFORUMINDEX
+			 . '</a></p>';
+	}
 } else {  // No submit
-    $mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];
-    echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
-    echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
-    echo "<tr><td class='bg2'>";
-    echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
-    echo "<tr class='bg3' align='left'>";
-    echo "<td colspan='2' align='center'>" . $action[$mode]['desc'] . '</td></tr>';
+	$mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];
+	echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
+	echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
+	echo "<tr><td class='bg2'>";
+	echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
+	echo "<tr class='bg3' align='left'>";
+	echo "<td colspan='2' align='center'>" . $action[$mode]['desc'] . '</td></tr>';
 
-    if ('move' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
-        $box = '<select name="newforum" size="1">';
+	if ('move' === $mode) {
+		echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+		$box = '<select name="newforum" size="1">';
 
-        //        /** @var Newbb\CategoryHandler $categoryHandler */
-        //        $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-        $categories = $categoryHandler->getByPermission('access');
-        $forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
+		//        /** @var Newbb\CategoryHandler $categoryHandler */
+		//        $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+		$categories = $categoryHandler->getByPermission('access');
+		$forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
 
-        if (count($categories) > 0 && count($forums) > 0) {
-            foreach (array_keys($forums) as $key) {
-                /** @var Newbb\Category[] $categories */
-                $box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
-                foreach ($forums[$key] as $forumid => $_forum) {
-                    $box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
-                    if (!isset($_forum['sub'])) {
-                        continue;
-                    }
-                    foreach (array_keys($_forum['sub']) as $fid) {
-                        $box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
-                    }
-                }
-            }
-        } else {
-            $box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
-        }
-        unset($forums, $categories);
+		if (count($categories) > 0 && count($forums) > 0) {
+			foreach (array_keys($forums) as $key) {
+				/** @var Newbb\Category[] $categories */
+				$box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
+				foreach ($forums[$key] as $forumid => $_forum) {
+					$box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
+					if (!isset($_forum['sub'])) {
+						continue;
+					}
+					foreach (array_keys($_forum['sub']) as $fid) {
+						$box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
+					}
+				}
+			}
+		} else {
+			$box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
+		}
+		unset($forums, $categories);
 
-        echo $box;
-        echo '</select></td></tr>';
-    }
-    if ('merge' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MERGETOPICTO . '</td><td class="bg1">';
-        echo _MD_NEWBB_TOPIC . "&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
-        echo '</td></tr>';
-    }
-    echo '<tr class="bg3"><td colspan="2" align="center">';
-    echo "<input type='hidden' name='mode' value='" . $action[$mode]['name'] . "' />";
-    echo "<input type='hidden' name='topic_id' value='" . $topic_id . "' />";
-    echo "<input type='hidden' name='forum' value='" . $forum . "' />";
-    echo "<input type='submit' name='submit' value='" . $action[$mode]['submit'] . "' />";
-    echo '</td></tr></form></table></td></tr></table>';
+		echo $box;
+		echo '</select></td></tr>';
+	}
+	if ('merge' === $mode) {
+		echo '<tr><td class="bg3">' . _MD_NEWBB_MERGETOPICTO . '</td><td class="bg1">';
+		echo _MD_NEWBB_TOPIC . "&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
+		echo '</td></tr>';
+	}
+	echo '<tr class="bg3"><td colspan="2" align="center">';
+	echo "<input type='hidden' name='mode' value='" . $action[$mode]['name'] . "' />";
+	echo "<input type='hidden' name='topic_id' value='" . $topic_id . "' />";
+	echo "<input type='hidden' name='forum' value='" . $forum . "' />";
+	echo "<input type='submit' name='submit' value='" . $action[$mode]['submit'] . "' />";
+	echo '</td></tr></form></table></td></tr></table>';
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

class/GroupPermForm.php

Indentation +67 added lines, -67 removed lines

@@ -8,81 +8,81 @@
  */
 class GroupPermForm extends \XoopsGroupPermForm
 {
-    /**
-     * @param        $title
-     * @param        $modid
-     * @param        $permname
-     * @param        $permdesc
-     * @param string $url
-     */
+	/**
+	 * @param        $title
+	 * @param        $modid
+	 * @param        $permname
+	 * @param        $permdesc
+	 * @param string $url
+	 */
 
-    public function __construct($title, $modid, $permname, $permdesc, $url = '')
-    {
-        parent::__construct($title, $modid, $permname, $permdesc, $url);
-    }
+	public function __construct($title, $modid, $permname, $permdesc, $url = '')
+	{
+		parent::__construct($title, $modid, $permname, $permdesc, $url);
+	}
 
-    /**
-     * @param        $title
-     * @param        $modid
-     * @param        $permname
-     * @param        $permdesc
-     * @param string $url
-     */
+	/**
+	 * @param        $title
+	 * @param        $modid
+	 * @param        $permname
+	 * @param        $permdesc
+	 * @param string $url
+	 */
 
-    /*
+	/*
     public function newbb_XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url = "")
     {
 //        $this->XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url);
         self::__construct($title, $modid, $permname, $permdesc, $url);
     }
 */
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        // load all child ids for javascript codes
-        foreach (array_keys($this->_itemTree) as $item_id) {
-            $this->_itemTree[$item_id]['allchild'] = [];
-            $this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
-        }
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = xoops_getHandler('member');
-        $glist         = $memberHandler->getGroupList();
-        foreach (array_keys($glist) as $i) {
-            // get selected item id(s) for each group
-            $selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new Newbb\GroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
-            $ele->setOptionTree($this->_itemTree);
-            $this->addElement($ele);
-            unset($ele);
-        }
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $this->addElement($tray);
-        $ret      = '<br><strong>' . $this->getTitle() . '</strong><br>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
-        $elements = $this->getElements();
-        $hidden   = '';
-        foreach (array_keys($elements) as $i) {
-            if (!is_object($elements[$i])) {
-                $ret .= $elements[$i];
-            } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
-                if ('' !== $elements[$i]->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
-                }
-                $ret .= "</td>\n<td class='even' style='text-align:center;'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
-            } else {
-                $hidden .= $elements[$i]->render();
-            }
-        }
-        $ret .= "</table>$hidden</form>";
-        $ret .= $this->renderValidationJS(true);
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		// load all child ids for javascript codes
+		foreach (array_keys($this->_itemTree) as $item_id) {
+			$this->_itemTree[$item_id]['allchild'] = [];
+			$this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
+		}
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = xoops_getHandler('member');
+		$glist         = $memberHandler->getGroupList();
+		foreach (array_keys($glist) as $i) {
+			// get selected item id(s) for each group
+			$selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid);
+			$ele      = new Newbb\GroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+			$ele->setOptionTree($this->_itemTree);
+			$this->addElement($ele);
+			unset($ele);
+		}
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$this->addElement($tray);
+		$ret      = '<br><strong>' . $this->getTitle() . '</strong><br>' . $this->_permDesc . '<br>';
+		$ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+		$elements = $this->getElements();
+		$hidden   = '';
+		foreach (array_keys($elements) as $i) {
+			if (!is_object($elements[$i])) {
+				$ret .= $elements[$i];
+			} elseif (!$elements[$i]->isHidden()) {
+				$ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+				if ('' !== $elements[$i]->getDescription()) {
+					$ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+				}
+				$ret .= "</td>\n<td class='even' style='text-align:center;'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+			} else {
+				$hidden .= $elements[$i]->render();
+			}
+		}
+		$ret .= "</table>$hidden</form>";
+		$ret .= $this->renderValidationJS(true);
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

class/Userstats.php

Indentation +12 added lines, -12 removed lines

@@ -19,16 +19,16 @@
  */
 class Userstats extends \XoopsObject
 {
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->initVar('uid', XOBJ_DTYPE_INT);
-        $this->initVar('user_topics', XOBJ_DTYPE_INT);
-        $this->initVar('user_digests', XOBJ_DTYPE_INT);
-        $this->initVar('user_posts', XOBJ_DTYPE_INT);
-        $this->initVar('user_lastpost', XOBJ_DTYPE_INT);
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->initVar('uid', XOBJ_DTYPE_INT);
+		$this->initVar('user_topics', XOBJ_DTYPE_INT);
+		$this->initVar('user_digests', XOBJ_DTYPE_INT);
+		$this->initVar('user_posts', XOBJ_DTYPE_INT);
+		$this->initVar('user_lastpost', XOBJ_DTYPE_INT);
+	}
 }

class/PermissionCategoryHandler.php

Indentation +71 added lines, -71 removed lines

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

class/ReadHandler.php

Indentation +336 added lines, -336 removed lines

@@ -48,340 +48,340 @@
  */
 class ReadHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * Object type.
-     * <ul>
-     *  <li>forum</li>
-     *  <li>topic</li>
-     * </ul>
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * seconds records will persist.
-     * assigned from $GLOBALS['xoopsModuleConfig']["read_expire"]
-     * <ul>
-     *  <li>positive days = delete all read records exist in the tables before expire time // irmtfan add comment</li>
-     *  <li>0 = never expires // irmtfan change comment</li>
-     *  <li>-1 or any negative days = never records // irmtfan change comment</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $lifetime;
-
-    /**
-     * storage mode for records.
-     * assigned from $GLOBALS['xoopsModuleConfig']["read_mode"]
-     * <ul>
-     *  <li>0 = never records</li>
-     *  <li>1 = uses cookie</li>
-     *  <li>2 = stores in database</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $mode;
-
-    /**
-     * @param \XoopsDatabase     $db
-     * @param                    $type
-     */
-    public function __construct(\XoopsDatabase $db, $type)
-    {
-        $type = ('forum' === $type) ? 'forum' : 'topic';
-        parent::__construct($db, 'newbb_reads_' . $type, Read::class . $type, 'read_id', 'post_id');
-        $this->type  = $type;
-        $newbbConfig = newbbLoadConfig();
-        // irmtfan if read_expire = 0 dont clean
-        $this->lifetime = isset($newbbConfig['read_expire']) ? (int)$newbbConfig['read_expire'] * 24 * 3600 : 30 * 24 * 3600;
-        $this->mode     = isset($newbbConfig['read_mode']) ? $newbbConfig['read_mode'] : 2;
-    }
-
-    /**
-     * Clear garbage
-     *
-     * Delete all expired and duplicated records
-     */
-    // START irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
-    public function clearGarbage()
-    {
-        // irmtfan clear duplicaed rows
-        if (!$result = $this->clearDuplicate()) {
-            return false;
-        }
-
-        $sql = 'DELETE bb FROM ' . $this->table . ' AS bb' . ' LEFT JOIN ' . $this->table . ' AS aa ON bb.read_item = aa.read_item ' . ' WHERE aa.post_id > bb.post_id';
-        if (!$result = $this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-        // irmtfan if read_expire = 0 dont clean
-        if (empty($this->lifetime)) {
-            return true;
-        }
-        // irmtfan move here and rephrase
-        $expire = time() - (int)$this->lifetime;
-        $sql    = 'DELETE FROM ' . $this->table . ' WHERE read_time < ' . $expire;
-        if (!$result = $this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-
-        return true;
-    }
-
-    // END irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
-
-    /**
-     * @param                  $read_item
-     * @param  null            $uid
-     * @return bool|mixed|null
-     */
-    public function getRead($read_item, $uid = null)
-    {
-        if (empty($this->mode)) {
-            return null;
-        }
-        if (1 == $this->mode) {
-            return $this->getReadCookie($read_item);
-        }
-
-        return $this->getReadDb($read_item, $uid);
-    }
-
-    /**
-     * @param $item_id
-     * @return mixed
-     */
-    public function getReadCookie($item_id)
-    {
-        $cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
-        $cookie_var  = $item_id;
-        // irmtfan set true to return array
-        $lastview = newbbGetCookie($cookie_name, true);
-
-        return @$lastview[$cookie_var];
-    }
-
-    /**
-     * @param $read_item
-     * @param $uid
-     * @return bool|null
-     */
-    public function getReadDb($read_item, $uid)
-    {
-        if (empty($uid)) {
-            if (is_object($GLOBALS['xoopsUser'])) {
-                $uid = $GLOBALS['xoopsUser']->getVar('uid');
-            } else {
-                return false;
-            }
-        }
-        $sql = 'SELECT post_id ' . ' FROM ' . $this->table . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
-        if (!$result = $this->db->queryF($sql, 1)) {
-            return null;
-        }
-        list($post_id) = $this->db->fetchRow($result);
-
-        return $post_id;
-    }
-
-    /**
-     * @param                  $read_item
-     * @param                  $post_id
-     * @param  null            $uid
-     * @return bool|mixed|void
-     */
-    public function setRead($read_item, $post_id, $uid = null)
-    {
-        if (empty($this->mode)) {
-            return true;
-        }
-
-        if (1 == $this->mode) {
-            return $this->setReadCookie($read_item, $post_id);
-        }
-
-        return $this->setReadDb($read_item, $post_id, $uid);
-    }
-
-    /**
-     * @param $read_item
-     * @param $post_id
-     */
-    public function setReadCookie($read_item, $post_id)
-    {
-        $cookie_name          = ('forum' === $this->type) ? 'LF' : 'LT';
-        $lastview             = newbbGetCookie($cookie_name, true);
-        $lastview[$read_item] = time();
-        newbbSetCookie($cookie_name, $lastview);
-    }
-
-    /**
-     * @param $read_item
-     * @param $post_id
-     * @param $uid
-     * @return bool|mixed
-     */
-    public function setReadDb($read_item, $post_id, $uid)
-    {
-        if (empty($uid)) {
-            if (is_object($GLOBALS['xoopsUser'])) {
-                $uid = $GLOBALS['xoopsUser']->getVar('uid');
-            } else {
-                return false;
-            }
-        }
-
-        $sql = 'UPDATE ' . $this->table . ' SET post_id = ' . (int)$post_id . ',' . '     read_time =' . time() . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
-        if ($this->db->queryF($sql) && $this->db->getAffectedRows()) {
-            return true;
-        }
-        $object = $this->create();
-        $object->setVar('read_item', $read_item);
-        $object->setVar('post_id', $post_id);
-        $object->setVar('uid', $uid);
-        $object->setVar('read_time', time());
-
-        return parent::insert($object);
-    }
-
-    /**
-     * @param             $items
-     * @param  null       $uid
-     * @return array|null
-     */
-    public function isReadItems(&$items, $uid = null)
-    {
-        $ret = null;
-        if (empty($this->mode)) {
-            return $ret;
-        }
-
-        if (1 == $this->mode) {
-            $ret = $this->isReadItemsCookie($items);
-        } else {
-            $ret = $this->isReadItemsDb($items, $uid);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $items
-     * @return array
-     */
-    public function isReadItemsCookie(&$items)
-    {
-        $cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
-        $cookie_vars = newbbGetCookie($cookie_name, true);
-
-        $ret = [];
-        foreach ($items as $key => $last_update) {
-            $ret[$key] = (max(@$GLOBALS['last_visit'], @$cookie_vars[$key]) >= $last_update);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $items
-     * @param $uid
-     * @return array
-     */
-    public function isReadItemsDb(&$items, $uid)
-    {
-        $ret = [];
-        if (empty($items)) {
-            return $ret;
-        }
-
-        if (empty($uid)) {
-            if (is_object($GLOBALS['xoopsUser'])) {
-                $uid = $GLOBALS['xoopsUser']->getVar('uid');
-            } else {
-                return $ret;
-            }
-        }
-
-        $criteria = new \CriteriaCompo(new \Criteria('uid', $uid));
-        $criteria->add(new \Criteria('read_item', '(' . implode(', ', array_map('intval', array_keys($items))) . ')', 'IN'));
-        $itemsObject = $this->getAll($criteria, ['read_item', 'post_id']);
-
-        $items_list = [];
-        foreach (array_keys($itemsObject) as $key) {
-            $items_list[$itemsObject[$key]->getVar('read_item')] = $itemsObject[$key]->getVar('post_id');
-        }
-        unset($itemsObject);
-
-        foreach ($items as $key => $last_update) {
-            $ret[$key] = (@$items_list[$key] >= $last_update);
-        }
-
-        return $ret;
-    }
-
-    // START irmtfan add clear duplicated rows function
-
-    /**
-     * @return bool
-     */
-    public function clearDuplicate()
-    {
-        /**
-         * This is needed for the following query GROUP BY clauses to work in MySQL 5.7.
-         * This is a TEMPORARY fix. Needing this function is bad in the first place, but
-         * needing sloppy SQL to make it work is worse.
-         * @todo The schema itself should preclude the duplicates
-         */
-        $sql = "SET sql_mode=(SELECT REPLACE(@@sql_mode, 'ONLY_FULL_GROUP_BY', ''))";
-        $this->db->queryF($sql);
-
-        $sql = 'CREATE TABLE ' . $this->table . '_duplicate LIKE ' . $this->table . '; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql = 'INSERT ' . $this->table . '_duplicate SELECT * FROM ' . $this->table . ' GROUP BY read_item, uid; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql = 'RENAME TABLE ' . $this->table . ' TO ' . $this->table . '_with_duplicate; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql = 'RENAME TABLE ' . $this->table . '_duplicate TO ' . $this->table . '; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql    = 'SHOW INDEX FROM ' . $this->table . " WHERE KEY_NAME = 'read_item_uid'";
-        $result = $this->db->queryF($sql);
-        if (empty($result)) {
-            $sql .= 'ALTER TABLE ' . $this->table . ' ADD INDEX read_item_uid ( read_item, uid ); ';
-            if (!$result = $this->db->queryF($sql)) {
-                xoops_error($this->db->error() . '<br>' . $sql);
-
-                return false;
-            }
-        }
-        $sql = 'DROP TABLE ' . $this->table . '_with_duplicate; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-
-        return true;
-    }
-    // END irmtfan add clear duplicated rows function
+	/**
+	 * Object type.
+	 * <ul>
+	 *  <li>forum</li>
+	 *  <li>topic</li>
+	 * </ul>
+	 *
+	 * @var string
+	 */
+	public $type;
+
+	/**
+	 * seconds records will persist.
+	 * assigned from $GLOBALS['xoopsModuleConfig']["read_expire"]
+	 * <ul>
+	 *  <li>positive days = delete all read records exist in the tables before expire time // irmtfan add comment</li>
+	 *  <li>0 = never expires // irmtfan change comment</li>
+	 *  <li>-1 or any negative days = never records // irmtfan change comment</li>
+	 * </ul>
+	 *
+	 * @var integer
+	 */
+	public $lifetime;
+
+	/**
+	 * storage mode for records.
+	 * assigned from $GLOBALS['xoopsModuleConfig']["read_mode"]
+	 * <ul>
+	 *  <li>0 = never records</li>
+	 *  <li>1 = uses cookie</li>
+	 *  <li>2 = stores in database</li>
+	 * </ul>
+	 *
+	 * @var integer
+	 */
+	public $mode;
+
+	/**
+	 * @param \XoopsDatabase     $db
+	 * @param                    $type
+	 */
+	public function __construct(\XoopsDatabase $db, $type)
+	{
+		$type = ('forum' === $type) ? 'forum' : 'topic';
+		parent::__construct($db, 'newbb_reads_' . $type, Read::class . $type, 'read_id', 'post_id');
+		$this->type  = $type;
+		$newbbConfig = newbbLoadConfig();
+		// irmtfan if read_expire = 0 dont clean
+		$this->lifetime = isset($newbbConfig['read_expire']) ? (int)$newbbConfig['read_expire'] * 24 * 3600 : 30 * 24 * 3600;
+		$this->mode     = isset($newbbConfig['read_mode']) ? $newbbConfig['read_mode'] : 2;
+	}
+
+	/**
+	 * Clear garbage
+	 *
+	 * Delete all expired and duplicated records
+	 */
+	// START irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
+	public function clearGarbage()
+	{
+		// irmtfan clear duplicaed rows
+		if (!$result = $this->clearDuplicate()) {
+			return false;
+		}
+
+		$sql = 'DELETE bb FROM ' . $this->table . ' AS bb' . ' LEFT JOIN ' . $this->table . ' AS aa ON bb.read_item = aa.read_item ' . ' WHERE aa.post_id > bb.post_id';
+		if (!$result = $this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+		// irmtfan if read_expire = 0 dont clean
+		if (empty($this->lifetime)) {
+			return true;
+		}
+		// irmtfan move here and rephrase
+		$expire = time() - (int)$this->lifetime;
+		$sql    = 'DELETE FROM ' . $this->table . ' WHERE read_time < ' . $expire;
+		if (!$result = $this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+
+		return true;
+	}
+
+	// END irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
+
+	/**
+	 * @param                  $read_item
+	 * @param  null            $uid
+	 * @return bool|mixed|null
+	 */
+	public function getRead($read_item, $uid = null)
+	{
+		if (empty($this->mode)) {
+			return null;
+		}
+		if (1 == $this->mode) {
+			return $this->getReadCookie($read_item);
+		}
+
+		return $this->getReadDb($read_item, $uid);
+	}
+
+	/**
+	 * @param $item_id
+	 * @return mixed
+	 */
+	public function getReadCookie($item_id)
+	{
+		$cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
+		$cookie_var  = $item_id;
+		// irmtfan set true to return array
+		$lastview = newbbGetCookie($cookie_name, true);
+
+		return @$lastview[$cookie_var];
+	}
+
+	/**
+	 * @param $read_item
+	 * @param $uid
+	 * @return bool|null
+	 */
+	public function getReadDb($read_item, $uid)
+	{
+		if (empty($uid)) {
+			if (is_object($GLOBALS['xoopsUser'])) {
+				$uid = $GLOBALS['xoopsUser']->getVar('uid');
+			} else {
+				return false;
+			}
+		}
+		$sql = 'SELECT post_id ' . ' FROM ' . $this->table . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
+		if (!$result = $this->db->queryF($sql, 1)) {
+			return null;
+		}
+		list($post_id) = $this->db->fetchRow($result);
+
+		return $post_id;
+	}
+
+	/**
+	 * @param                  $read_item
+	 * @param                  $post_id
+	 * @param  null            $uid
+	 * @return bool|mixed|void
+	 */
+	public function setRead($read_item, $post_id, $uid = null)
+	{
+		if (empty($this->mode)) {
+			return true;
+		}
+
+		if (1 == $this->mode) {
+			return $this->setReadCookie($read_item, $post_id);
+		}
+
+		return $this->setReadDb($read_item, $post_id, $uid);
+	}
+
+	/**
+	 * @param $read_item
+	 * @param $post_id
+	 */
+	public function setReadCookie($read_item, $post_id)
+	{
+		$cookie_name          = ('forum' === $this->type) ? 'LF' : 'LT';
+		$lastview             = newbbGetCookie($cookie_name, true);
+		$lastview[$read_item] = time();
+		newbbSetCookie($cookie_name, $lastview);
+	}
+
+	/**
+	 * @param $read_item
+	 * @param $post_id
+	 * @param $uid
+	 * @return bool|mixed
+	 */
+	public function setReadDb($read_item, $post_id, $uid)
+	{
+		if (empty($uid)) {
+			if (is_object($GLOBALS['xoopsUser'])) {
+				$uid = $GLOBALS['xoopsUser']->getVar('uid');
+			} else {
+				return false;
+			}
+		}
+
+		$sql = 'UPDATE ' . $this->table . ' SET post_id = ' . (int)$post_id . ',' . '     read_time =' . time() . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
+		if ($this->db->queryF($sql) && $this->db->getAffectedRows()) {
+			return true;
+		}
+		$object = $this->create();
+		$object->setVar('read_item', $read_item);
+		$object->setVar('post_id', $post_id);
+		$object->setVar('uid', $uid);
+		$object->setVar('read_time', time());
+
+		return parent::insert($object);
+	}
+
+	/**
+	 * @param             $items
+	 * @param  null       $uid
+	 * @return array|null
+	 */
+	public function isReadItems(&$items, $uid = null)
+	{
+		$ret = null;
+		if (empty($this->mode)) {
+			return $ret;
+		}
+
+		if (1 == $this->mode) {
+			$ret = $this->isReadItemsCookie($items);
+		} else {
+			$ret = $this->isReadItemsDb($items, $uid);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $items
+	 * @return array
+	 */
+	public function isReadItemsCookie(&$items)
+	{
+		$cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
+		$cookie_vars = newbbGetCookie($cookie_name, true);
+
+		$ret = [];
+		foreach ($items as $key => $last_update) {
+			$ret[$key] = (max(@$GLOBALS['last_visit'], @$cookie_vars[$key]) >= $last_update);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $items
+	 * @param $uid
+	 * @return array
+	 */
+	public function isReadItemsDb(&$items, $uid)
+	{
+		$ret = [];
+		if (empty($items)) {
+			return $ret;
+		}
+
+		if (empty($uid)) {
+			if (is_object($GLOBALS['xoopsUser'])) {
+				$uid = $GLOBALS['xoopsUser']->getVar('uid');
+			} else {
+				return $ret;
+			}
+		}
+
+		$criteria = new \CriteriaCompo(new \Criteria('uid', $uid));
+		$criteria->add(new \Criteria('read_item', '(' . implode(', ', array_map('intval', array_keys($items))) . ')', 'IN'));
+		$itemsObject = $this->getAll($criteria, ['read_item', 'post_id']);
+
+		$items_list = [];
+		foreach (array_keys($itemsObject) as $key) {
+			$items_list[$itemsObject[$key]->getVar('read_item')] = $itemsObject[$key]->getVar('post_id');
+		}
+		unset($itemsObject);
+
+		foreach ($items as $key => $last_update) {
+			$ret[$key] = (@$items_list[$key] >= $last_update);
+		}
+
+		return $ret;
+	}
+
+	// START irmtfan add clear duplicated rows function
+
+	/**
+	 * @return bool
+	 */
+	public function clearDuplicate()
+	{
+		/**
+		 * This is needed for the following query GROUP BY clauses to work in MySQL 5.7.
+		 * This is a TEMPORARY fix. Needing this function is bad in the first place, but
+		 * needing sloppy SQL to make it work is worse.
+		 * @todo The schema itself should preclude the duplicates
+		 */
+		$sql = "SET sql_mode=(SELECT REPLACE(@@sql_mode, 'ONLY_FULL_GROUP_BY', ''))";
+		$this->db->queryF($sql);
+
+		$sql = 'CREATE TABLE ' . $this->table . '_duplicate LIKE ' . $this->table . '; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql = 'INSERT ' . $this->table . '_duplicate SELECT * FROM ' . $this->table . ' GROUP BY read_item, uid; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql = 'RENAME TABLE ' . $this->table . ' TO ' . $this->table . '_with_duplicate; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql = 'RENAME TABLE ' . $this->table . '_duplicate TO ' . $this->table . '; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql    = 'SHOW INDEX FROM ' . $this->table . " WHERE KEY_NAME = 'read_item_uid'";
+		$result = $this->db->queryF($sql);
+		if (empty($result)) {
+			$sql .= 'ALTER TABLE ' . $this->table . ' ADD INDEX read_item_uid ( read_item, uid ); ';
+			if (!$result = $this->db->queryF($sql)) {
+				xoops_error($this->db->error() . '<br>' . $sql);
+
+				return false;
+			}
+		}
+		$sql = 'DROP TABLE ' . $this->table . '_with_duplicate; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+
+		return true;
+	}
+	// END irmtfan add clear duplicated rows function
 }

class/Common/VersionChecks.php

Indentation +54 added lines, -54 removed lines

@@ -17,63 +17,63 @@
  */
 trait VersionChecks
 {
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @param null|string  $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @param null|string  $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper   = strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
 
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $success = true;
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$success = true;
 
-        if (version_compare($currentVer, $requiredVer, '<')) {
-            $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
-        }
+		if (version_compare($currentVer, $requiredVer, '<')) {
+			$success = false;
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module)
-    {
-        $moduleDirName = basename(dirname(__DIR__));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  = $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module)
+	{
+		$moduleDirName = basename(dirname(__DIR__));
+		$moduleDirNameUpper   = strtoupper($moduleDirName);
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  = $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

class/Common/Configurator.php

Indentation +28 added lines, -28 removed lines

@@ -27,35 +27,35 @@
  */
 class Configurator
 {
-    public $name;
-    public $paths           = [];
-    public $uploadFolders   = [];
-    public $copyBlankFiles  = [];
-    public $copyTestFolders = [];
-    public $templateFolders = [];
-    public $oldFiles        = [];
-    public $oldFolders      = [];
-    public $modCopyright;
+	public $name;
+	public $paths           = [];
+	public $uploadFolders   = [];
+	public $copyBlankFiles  = [];
+	public $copyTestFolders = [];
+	public $templateFolders = [];
+	public $oldFiles        = [];
+	public $oldFolders      = [];
+	public $modCopyright;
 
-    /**
-     * Configurator constructor.
-     */
-    public function __construct()
-    {
-        $moduleDirName = basename(dirname(__DIR__));
-        $capsDirName   = strtoupper($moduleDirName);
+	/**
+	 * Configurator constructor.
+	 */
+	public function __construct()
+	{
+		$moduleDirName = basename(dirname(__DIR__));
+		$capsDirName   = strtoupper($moduleDirName);
 
-        require_once  dirname(dirname(__DIR__)) . '/include/config.php';
-        $config = getConfig();
+		require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+		$config = getConfig();
 
-        $this->name            = $config->name;
-        $this->paths           = $config->paths;
-        $this->uploadFolders   = $config->uploadFolders;
-        $this->copyBlankFiles  = $config->copyBlankFiles;
-        $this->copyTestFolders = $config->copyTestFolders;
-        $this->templateFolders = $config->templateFolders;
-        $this->oldFiles        = $config->oldFiles;
-        $this->oldFolders      = $config->oldFolders;
-        $this->modCopyright    = $config->modCopyright;
-    }
+		$this->name            = $config->name;
+		$this->paths           = $config->paths;
+		$this->uploadFolders   = $config->uploadFolders;
+		$this->copyBlankFiles  = $config->copyBlankFiles;
+		$this->copyTestFolders = $config->copyTestFolders;
+		$this->templateFolders = $config->templateFolders;
+		$this->oldFiles        = $config->oldFiles;
+		$this->oldFolders      = $config->oldFolders;
+		$this->modCopyright    = $config->modCopyright;
+	}
 }

class/Common/FilesManagement.php

Indentation +225 added lines, -225 removed lines

@@ -17,229 +17,229 @@
  */
 trait FilesManagement
 {
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     *
-     * @return void
-     */
-    public static function createFolder($folder)
-    {
-        try {
-            if (!file_exists($folder)) {
-                if (!is_dir($folder) && !mkdir($folder) && !is_dir($folder)) {
-                    throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-                }
-
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-            }
-        } catch (\Exception $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
-
-    /**
-     * @param $file
-     * @param $folder
-     * @return bool
-     */
-    public static function copyFile($file, $folder)
-    {
-        return copy($file, $folder);
-    }
-
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst)
-    {
-        $dir = opendir($src);
-        //        @mkdir($dst);
-        if (!@mkdir($dst) && !is_dir($dst)) {
-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
-        }
-            while (false !== ($file = readdir($dir))) {
-                if (('.' !== $file) && ('..' !== $file)) {
-                    if (is_dir($src . '/' . $file)) {
-                        self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
-                    } else {
-                        copy($src . '/' . $file, $dst . '/' . $file);
-                    }
-                }
-            }
-        closedir($dir);
-    }
-
-    /**
-     *
-     * Remove files and (sub)directories
-     *
-     * @param string $src source directory to delete
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @return bool true on success
-     */
-    public static function deleteDirectory($src)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        $success = true;
-        // remove old files
-        $dirInfo = new \SplFileInfo($src);
-        // validate is a directory
-        if ($dirInfo->isDir()) {
-            $fileList = array_diff(scandir($src, SCANDIR_SORT_NONE), ['..', '.']);
-            foreach ($fileList as $k => $v) {
-                $fileInfo = new \SplFileInfo("{$src}/{$v}");
-                if ($fileInfo->isDir()) {
-                    // recursively handle subdirectories
-                    if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
-                        break;
-                    }
-                } else {
-                    // delete the file
-                    if (!($success = unlink($fileInfo->getRealPath()))) {
-                        break;
-                    }
-                }
-            }
-            // now delete this (sub)directory if all the files are gone
-            if ($success) {
-                $success = rmdir($dirInfo->getRealPath());
-            }
-        } else {
-            // input is not a valid directory
-            $success = false;
-        }
-        return $success;
-    }
-
-    /**
-     *
-     * Recursively remove directory
-     *
-     * @todo currently won't remove directories with hidden files, should it?
-     *
-     * @param string $src directory to remove (delete)
-     *
-     * @return bool true on success
-     */
-    public static function rrmdir($src)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        $success = true;
-
-        // Open the source directory to read in files
-        $iterator = new \DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                $filename = $fObj->getPathname();
-                $fObj     = null; // clear this iterator object to close the file
-                if (!unlink($filename)) {
-                    return false; // couldn't delete the file
-                }
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rrmdir($fObj->getPathname());
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-        return rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively move files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @return bool true on success
-     */
-    public static function rmove($src, $dest)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest) && !is_dir($dest)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new \DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-                //                rmdir($fObj->getPath()); // now delete the directory
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-        return rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively copy directories and files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @return bool true on success
-     */
-    public static function rcopy($src, $dest)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest) && !is_dir($dest)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new \DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            }
-        }
-        return true;
-    }
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 *
+	 * @return void
+	 */
+	public static function createFolder($folder)
+	{
+		try {
+			if (!file_exists($folder)) {
+				if (!is_dir($folder) && !mkdir($folder) && !is_dir($folder)) {
+					throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+				}
+
+				file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+			}
+		} catch (\Exception $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
+
+	/**
+	 * @param $file
+	 * @param $folder
+	 * @return bool
+	 */
+	public static function copyFile($file, $folder)
+	{
+		return copy($file, $folder);
+	}
+
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst)
+	{
+		$dir = opendir($src);
+		//        @mkdir($dst);
+		if (!@mkdir($dst) && !is_dir($dst)) {
+			throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
+		}
+			while (false !== ($file = readdir($dir))) {
+				if (('.' !== $file) && ('..' !== $file)) {
+					if (is_dir($src . '/' . $file)) {
+						self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+					} else {
+						copy($src . '/' . $file, $dst . '/' . $file);
+					}
+				}
+			}
+		closedir($dir);
+	}
+
+	/**
+	 *
+	 * Remove files and (sub)directories
+	 *
+	 * @param string $src source directory to delete
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @return bool true on success
+	 */
+	public static function deleteDirectory($src)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		$success = true;
+		// remove old files
+		$dirInfo = new \SplFileInfo($src);
+		// validate is a directory
+		if ($dirInfo->isDir()) {
+			$fileList = array_diff(scandir($src, SCANDIR_SORT_NONE), ['..', '.']);
+			foreach ($fileList as $k => $v) {
+				$fileInfo = new \SplFileInfo("{$src}/{$v}");
+				if ($fileInfo->isDir()) {
+					// recursively handle subdirectories
+					if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
+						break;
+					}
+				} else {
+					// delete the file
+					if (!($success = unlink($fileInfo->getRealPath()))) {
+						break;
+					}
+				}
+			}
+			// now delete this (sub)directory if all the files are gone
+			if ($success) {
+				$success = rmdir($dirInfo->getRealPath());
+			}
+		} else {
+			// input is not a valid directory
+			$success = false;
+		}
+		return $success;
+	}
+
+	/**
+	 *
+	 * Recursively remove directory
+	 *
+	 * @todo currently won't remove directories with hidden files, should it?
+	 *
+	 * @param string $src directory to remove (delete)
+	 *
+	 * @return bool true on success
+	 */
+	public static function rrmdir($src)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		$success = true;
+
+		// Open the source directory to read in files
+		$iterator = new \DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				$filename = $fObj->getPathname();
+				$fObj     = null; // clear this iterator object to close the file
+				if (!unlink($filename)) {
+					return false; // couldn't delete the file
+				}
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rrmdir($fObj->getPathname());
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+		return rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively move files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @return bool true on success
+	 */
+	public static function rmove($src, $dest)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!is_dir($dest) && !mkdir($dest) && !is_dir($dest)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new \DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+				//                rmdir($fObj->getPath()); // now delete the directory
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+		return rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively copy directories and files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @return bool true on success
+	 */
+	public static function rcopy($src, $dest)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof \XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!is_dir($dest) && !mkdir($dest) && !is_dir($dest)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new \DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			}
+		}
+		return true;
+	}
 }