mambax7 / newbb5

include/search.inc.php

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
     $criteriaPost = new \CriteriaCompo();
     $criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts
 
-    $forum_list = [];// get forum lists just for forum names
+    $forum_list = []; // get forum lists just for forum names
     if (count($validForums) > 0) {
         $criteriaPermissions = new \CriteriaCompo();
-        $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
-        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
+        $criteriaPermissions->add(new \Criteria('p.forum_id', '('.implode(',', $validForums).')', 'IN'), 'AND');
+        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '('.implode(', ', $validForums).')', 'IN'), 'forum_name', false);
     }
 
     if (is_numeric($userid) && 0 !== $userid) {
@@ -68,7 +68,7 @@ 
     } elseif (is_array($userid) && count($userid) > 0) {
         $userid       = array_map('intval', $userid);
         $criteriaUser = new \CriteriaCompo();
-        $criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
+        $criteriaUser->add(new \Criteria('p.uid', '('.implode(',', $userid).')', 'IN'), 'OR');
     }
 
     $count = 0;
@@ -80,7 +80,7 @@ 
         $criteriaKeywords = new \CriteriaCompo();
         foreach ($queryarray as $queryTerm) {
             $termCriteria  = new \CriteriaCompo();
-            $queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%';
+            $queryTermLike = '%'.$xoopsDB->escape($queryTerm).'%';
             if ('title' === $searchin || 'both' === $searchin) {
                 $termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR');
             }
@@ -90,7 +90,7 @@ 
             $criteriaKeywords->add($termCriteria, $andor);
         }
         // add highlight keywords to post links
-        $highlightKey = '&keywords=' . implode(' ', $queryarray);
+        $highlightKey = '&keywords='.implode(' ', $queryarray);
         $highlightKey = str_replace(' ', '+', $highlightKey);
     }
     $criteria = new \CriteriaCompo();
@@ -131,14 +131,14 @@ 
         $post                  = $posts[$id];
         $post_data             = $post->getPostBody();
         $ret[$i]['topic_id']   = $post->getVar('topic_id');
-        $ret[$i]['link']       = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key
+        $ret[$i]['link']       = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post->getVar('post_id').$highlightKey; // add highlight key
         $ret[$i]['title']      = $post_data['subject'];
         $ret[$i]['time']       = $post_data['date'];
         $ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']);
-        $ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id');
+        $ret[$i]['forum_link'] = XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$post->getVar('forum_id');
         $ret[$i]['post_text']  = $post_data['text'];
         $ret[$i]['uid']        = $post->getVar('uid');
-        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author'];
+        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$ret[$i]['uid'].'">'.$post_data['author'].'</a>' : $post_data['author'];
         ++$i;
     }
 

Indentation +106 added lines, -106 removed lines

@@ -28,119 +28,119 @@
  * @return array
  */
 function newbb_search(
-    $queryarray,
-    $andor,
-    $limit,
-    $offset,
-    $userid,
-    $forums = 0,
-    $sortby = 0,
-    $searchin = 'both',
-    CriteriaCompo $criteriaExtra = null
+	$queryarray,
+	$andor,
+	$limit,
+	$offset,
+	$userid,
+	$forums = 0,
+	$sortby = 0,
+	$searchin = 'both',
+	CriteriaCompo $criteriaExtra = null
 ) {
-    global $myts, $xoopsDB;
-    // irmtfan - in XOOPSCORE/search.php $GLOBALS['xoopsModuleConfig'] is not set
-    if (!isset($GLOBALS['xoopsModuleConfig'])) {
-        $GLOBALS['xoopsModuleConfig'] = newbbLoadConfig();
-    }
-    // irmtfan - in XOOPSCORE/search.php $xoopsModule is not set
-    if (!is_object($GLOBALS['xoopsModule']) && is_object($GLOBALS['module'])
-        && 'newbb' === $GLOBALS['module']->getVar('dirname')) {
-        $GLOBALS['xoopsModule'] = $GLOBALS['module'];
-    }
-    /** @var Newbb\ForumHandler $forumHandler */
-    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    $validForums  = $forumHandler->getIdsByValues($forums); // can we use view permission? $forumHandler->getIdsByValues($forums, "view")
+	global $myts, $xoopsDB;
+	// irmtfan - in XOOPSCORE/search.php $GLOBALS['xoopsModuleConfig'] is not set
+	if (!isset($GLOBALS['xoopsModuleConfig'])) {
+		$GLOBALS['xoopsModuleConfig'] = newbbLoadConfig();
+	}
+	// irmtfan - in XOOPSCORE/search.php $xoopsModule is not set
+	if (!is_object($GLOBALS['xoopsModule']) && is_object($GLOBALS['module'])
+		&& 'newbb' === $GLOBALS['module']->getVar('dirname')) {
+		$GLOBALS['xoopsModule'] = $GLOBALS['module'];
+	}
+	/** @var Newbb\ForumHandler $forumHandler */
+	$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	$validForums  = $forumHandler->getIdsByValues($forums); // can we use view permission? $forumHandler->getIdsByValues($forums, "view")
 
-    $criteriaPost = new \CriteriaCompo();
-    $criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts
+	$criteriaPost = new \CriteriaCompo();
+	$criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts
 
-    $forum_list = [];// get forum lists just for forum names
-    if (count($validForums) > 0) {
-        $criteriaPermissions = new \CriteriaCompo();
-        $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
-        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
-    }
+	$forum_list = [];// get forum lists just for forum names
+	if (count($validForums) > 0) {
+		$criteriaPermissions = new \CriteriaCompo();
+		$criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
+		$forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
+	}
 
-    if (is_numeric($userid) && 0 !== $userid) {
-        $criteriaUser = new \CriteriaCompo();
-        $criteriaUser->add(new \Criteria('p.uid', $userid), 'OR');
-    } elseif (is_array($userid) && count($userid) > 0) {
-        $userid       = array_map('intval', $userid);
-        $criteriaUser = new \CriteriaCompo();
-        $criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
-    }
+	if (is_numeric($userid) && 0 !== $userid) {
+		$criteriaUser = new \CriteriaCompo();
+		$criteriaUser->add(new \Criteria('p.uid', $userid), 'OR');
+	} elseif (is_array($userid) && count($userid) > 0) {
+		$userid       = array_map('intval', $userid);
+		$criteriaUser = new \CriteriaCompo();
+		$criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
+	}
 
-    $count = 0;
-    if (is_array($queryarray)) {
-        $count = count($queryarray);
-    }
-    $highlightKey = '';
-    if ($count > 0) {
-        $criteriaKeywords = new \CriteriaCompo();
-        foreach ($queryarray as $queryTerm) {
-            $termCriteria  = new \CriteriaCompo();
-            $queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%';
-            if ('title' === $searchin || 'both' === $searchin) {
-                $termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR');
-            }
-            if ('text' === $searchin || 'both' === $searchin) {
-                $termCriteria->add(new \Criteria('t.post_text', $queryTermLike, 'LIKE'), 'OR');
-            }
-            $criteriaKeywords->add($termCriteria, $andor);
-        }
-        // add highlight keywords to post links
-        $highlightKey = '&keywords=' . implode(' ', $queryarray);
-        $highlightKey = str_replace(' ', '+', $highlightKey);
-    }
-    $criteria = new \CriteriaCompo();
-    $criteria->add($criteriaPost, 'AND');
-    if (null !== $criteriaPermissions) {
-        $criteria->add($criteriaPermissions, 'AND');
-    }
-    if (isset($criteriaUser)) {
-        $criteria->add($criteriaUser, 'AND');
-    }
-    if (isset($criteriaKeywords)) {
-        $criteria->add($criteriaKeywords, 'AND');
-    }
-    if (isset($criteriaExtra)) {
-        $criteria->add($criteriaExtra, 'AND');
-    }
-    //$criteria->setLimit($limit); // no need for this
-    //$criteria->setStart($offset); // no need for this
+	$count = 0;
+	if (is_array($queryarray)) {
+		$count = count($queryarray);
+	}
+	$highlightKey = '';
+	if ($count > 0) {
+		$criteriaKeywords = new \CriteriaCompo();
+		foreach ($queryarray as $queryTerm) {
+			$termCriteria  = new \CriteriaCompo();
+			$queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%';
+			if ('title' === $searchin || 'both' === $searchin) {
+				$termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR');
+			}
+			if ('text' === $searchin || 'both' === $searchin) {
+				$termCriteria->add(new \Criteria('t.post_text', $queryTermLike, 'LIKE'), 'OR');
+			}
+			$criteriaKeywords->add($termCriteria, $andor);
+		}
+		// add highlight keywords to post links
+		$highlightKey = '&keywords=' . implode(' ', $queryarray);
+		$highlightKey = str_replace(' ', '+', $highlightKey);
+	}
+	$criteria = new \CriteriaCompo();
+	$criteria->add($criteriaPost, 'AND');
+	if (null !== $criteriaPermissions) {
+		$criteria->add($criteriaPermissions, 'AND');
+	}
+	if (isset($criteriaUser)) {
+		$criteria->add($criteriaUser, 'AND');
+	}
+	if (isset($criteriaKeywords)) {
+		$criteria->add($criteriaKeywords, 'AND');
+	}
+	if (isset($criteriaExtra)) {
+		$criteria->add($criteriaExtra, 'AND');
+	}
+	//$criteria->setLimit($limit); // no need for this
+	//$criteria->setStart($offset); // no need for this
 
-    if (empty($sortby)) {
-        $sortby = 'p.post_time';
-    }
-    $criteria->setSort($sortby);
-    $order = 'ASC';
-    if ('p.post_time' === $sortby) {
-        $order = 'DESC';
-    }
-    $criteria->setOrder($order);
+	if (empty($sortby)) {
+		$sortby = 'p.post_time';
+	}
+	$criteria->setSort($sortby);
+	$order = 'ASC';
+	if ('p.post_time' === $sortby) {
+		$order = 'DESC';
+	}
+	$criteria->setOrder($order);
 
-    /** @var Newbb\PostHandler $postHandler */
-    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-    $posts       = $postHandler->getPostsByLimit($criteria, $limit, $offset);
+	/** @var Newbb\PostHandler $postHandler */
+	$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+	$posts       = $postHandler->getPostsByLimit($criteria, $limit, $offset);
 
-    $ret = [];
-    $i   = 0;
-    foreach (array_keys($posts) as $id) {
-        /** @var Newbb\Post $post */
-        $post                  = $posts[$id];
-        $post_data             = $post->getPostBody();
-        $ret[$i]['topic_id']   = $post->getVar('topic_id');
-        $ret[$i]['link']       = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key
-        $ret[$i]['title']      = $post_data['subject'];
-        $ret[$i]['time']       = $post_data['date'];
-        $ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']);
-        $ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id');
-        $ret[$i]['post_text']  = $post_data['text'];
-        $ret[$i]['uid']        = $post->getVar('uid');
-        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author'];
-        ++$i;
-    }
+	$ret = [];
+	$i   = 0;
+	foreach (array_keys($posts) as $id) {
+		/** @var Newbb\Post $post */
+		$post                  = $posts[$id];
+		$post_data             = $post->getPostBody();
+		$ret[$i]['topic_id']   = $post->getVar('topic_id');
+		$ret[$i]['link']       = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key
+		$ret[$i]['title']      = $post_data['subject'];
+		$ret[$i]['time']       = $post_data['date'];
+		$ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']);
+		$ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id');
+		$ret[$i]['post_text']  = $post_data['text'];
+		$ret[$i]['uid']        = $post->getVar('uid');
+		$ret[$i]['poster']     = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author'];
+		++$i;
+	}
 
-    return $ret;
+	return $ret;
 }

include/notification.inc.php

Spacing +9 added lines, -9 removed lines

@@ -54,42 +54,42 @@
 
         if ('forum' === $category) {
             // Assume we have a valid forum id
-            $sql = 'SELECT forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' WHERE forum_id = ' . $item_id;
+            $sql = 'SELECT forum_name FROM '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' WHERE forum_id = '.$item_id;
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERRORFORUM);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERRORFORUM);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['forum_name'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewforum.php?forum=' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewforum.php?forum='.$item_id;
 
             return $item;
         }
 
         if ('thread' === $category) {
             // Assume we have a valid topid id
-            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = ' . $item_id . ' LIMIT 1';
+            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' t, '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' f WHERE t.forum_id = f.forum_id AND t.topic_id = '.$item_id.' LIMIT 1';
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERROROCCURED);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['topic_title'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum=' . $result_array['forum_id'] . '&topic_id=' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewtopic.php?forum='.$result_array['forum_id'].'&topic_id='.$item_id;
 
             return $item;
         }
 
         if ('post' === $category) {
             // Assume we have a valid post id
-            $sql = 'SELECT subject,topic_id,forum_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
+            $sql = 'SELECT subject,topic_id,forum_id FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' WHERE post_id = '.$item_id.' LIMIT 1';
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERROROCCURED);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['subject'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum= ' . $result_array['forum_id'] . '&topic_id=' . $result_array['topic_id'] . '#forumpost' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewtopic.php?forum= '.$result_array['forum_id'].'&topic_id='.$result_array['topic_id'].'#forumpost'.$item_id;
 
             return $item;
         }

Indentation +54 added lines, -54 removed lines

@@ -31,67 +31,67 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.php');
 if (!defined('NEWBB_NOTIFY_ITEMINFO')) {
-    define('NEWBB_NOTIFY_ITEMINFO', 1);
+	define('NEWBB_NOTIFY_ITEMINFO', 1);
 
-    /**
-     * @param $category
-     * @param $item_id
-     * @return mixed
-     */
-    function newbb_notify_iteminfo($category, $item_id)
-    {
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $module        = $moduleHandler->getByDirname('newbb');
+	/**
+	 * @param $category
+	 * @param $item_id
+	 * @return mixed
+	 */
+	function newbb_notify_iteminfo($category, $item_id)
+	{
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$module        = $moduleHandler->getByDirname('newbb');
 
-        if ('global' === $category) {
-            $item['name'] = '';
-            $item['url']  = '';
+		if ('global' === $category) {
+			$item['name'] = '';
+			$item['url']  = '';
 
-            return $item;
-        }
-        $item_id = (int)$item_id;
+			return $item;
+		}
+		$item_id = (int)$item_id;
 
-        if ('forum' === $category) {
-            // Assume we have a valid forum id
-            $sql = 'SELECT forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' WHERE forum_id = ' . $item_id;
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERRORFORUM);
-            }
-            $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-            $item['name'] = $result_array['forum_name'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewforum.php?forum=' . $item_id;
+		if ('forum' === $category) {
+			// Assume we have a valid forum id
+			$sql = 'SELECT forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' WHERE forum_id = ' . $item_id;
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				// irmtfan full URL
+				redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERRORFORUM);
+			}
+			$result_array = $GLOBALS['xoopsDB']->fetchArray($result);
+			$item['name'] = $result_array['forum_name'];
+			$item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewforum.php?forum=' . $item_id;
 
-            return $item;
-        }
+			return $item;
+		}
 
-        if ('thread' === $category) {
-            // Assume we have a valid topid id
-            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = ' . $item_id . ' LIMIT 1';
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
-            }
-            $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-            $item['name'] = $result_array['topic_title'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum=' . $result_array['forum_id'] . '&topic_id=' . $item_id;
+		if ('thread' === $category) {
+			// Assume we have a valid topid id
+			$sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = ' . $item_id . ' LIMIT 1';
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				// irmtfan full URL
+				redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+			}
+			$result_array = $GLOBALS['xoopsDB']->fetchArray($result);
+			$item['name'] = $result_array['topic_title'];
+			$item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum=' . $result_array['forum_id'] . '&topic_id=' . $item_id;
 
-            return $item;
-        }
+			return $item;
+		}
 
-        if ('post' === $category) {
-            // Assume we have a valid post id
-            $sql = 'SELECT subject,topic_id,forum_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
-            }
-            $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-            $item['name'] = $result_array['subject'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum= ' . $result_array['forum_id'] . '&topic_id=' . $result_array['topic_id'] . '#forumpost' . $item_id;
+		if ('post' === $category) {
+			// Assume we have a valid post id
+			$sql = 'SELECT subject,topic_id,forum_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				// irmtfan full URL
+				redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+			}
+			$result_array = $GLOBALS['xoopsDB']->fetchArray($result);
+			$item['name'] = $result_array['subject'];
+			$item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum= ' . $result_array['forum_id'] . '&topic_id=' . $result_array['topic_id'] . '#forumpost' . $item_id;
 
-            return $item;
-        }
-    }
+			return $item;
+		}
+	}
 }

include/plugin.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 // MENU handler
 /* You could remove anyone by commenting out in order to disable it */
 $customConfig['valid_menumodes'] = [
-    0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
+    0 => _MD_NEWBB_MENU_SELECT, // for selectbox
     //1 => _MD_NEWBB_MENU_CLICK,    // for "click to expand"
     //2 => _MD_NEWBB_MENU_HOVER        // for "mouse hover to expand"
 ];

Indentation +3 added lines, -3 removed lines

@@ -74,9 +74,9 @@
 // MENU handler
 /* You could remove anyone by commenting out in order to disable it */
 $customConfig['valid_menumodes'] = [
-    0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
-    //1 => _MD_NEWBB_MENU_CLICK,    // for "click to expand"
-    //2 => _MD_NEWBB_MENU_HOVER        // for "mouse hover to expand"
+	0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
+	//1 => _MD_NEWBB_MENU_CLICK,    // for "click to expand"
+	//2 => _MD_NEWBB_MENU_HOVER        // for "mouse hover to expand"
 ];
 
 // view latest edit

include/plugin.dist.php

Spacing +2 added lines, -2 removed lines

@@ -72,8 +72,8 @@
 // MENU handler
 /* You could remove anyone by commenting out in order to disable it */
 $valid_menumodes = [
-    0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
-    1 => _MD_NEWBB_MENU_CLICK,    // for 'click to expand'
+    0 => _MD_NEWBB_MENU_SELECT, // for selectbox
+    1 => _MD_NEWBB_MENU_CLICK, // for 'click to expand'
     2 => _MD_NEWBB_MENU_HOVER        // for 'mouse hover to expand'
 ];
 

Indentation +3 added lines, -3 removed lines

@@ -72,9 +72,9 @@
 // MENU handler
 /* You could remove anyone by commenting out in order to disable it */
 $valid_menumodes = [
-    0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
-    1 => _MD_NEWBB_MENU_CLICK,    // for 'click to expand'
-    2 => _MD_NEWBB_MENU_HOVER        // for 'mouse hover to expand'
+	0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
+	1 => _MD_NEWBB_MENU_CLICK,    // for 'click to expand'
+	2 => _MD_NEWBB_MENU_HOVER        // for 'mouse hover to expand'
 ];
 
 return $customConfig;

include/functions.image.php

Spacing +27 added lines, -27 removed lines

@@ -39,24 +39,24 @@ 
     function newbbAttachmentImage($source)
     {
         $img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
-        $img_url    = XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'];
-        $thumb_path = $img_path . '/thumbs';
-        $thumb_url  = $img_url . '/thumbs';
+        $img_url    = XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['dir_attachments'];
+        $thumb_path = $img_path.'/thumbs';
+        $thumb_url  = $img_url.'/thumbs';
 
-        $thumb     = $thumb_path . '/' . $source;
-        $image     = $img_path . '/' . $source;
-        $thumb_url = $thumb_url . '/' . $source;
-        $image_url = $img_url . '/' . $source;
+        $thumb     = $thumb_path.'/'.$source;
+        $image     = $img_path.'/'.$source;
+        $thumb_url = $thumb_url.'/'.$source;
+        $image_url = $img_url.'/'.$source;
 
         $imginfo  = @getimagesize($image);
-        $img_info = (count($imginfo) > 0) ? $imginfo[0] . 'X' . $imginfo[1] . ' px' : '';
+        $img_info = (count($imginfo) > 0) ? $imginfo[0].'X'.$imginfo[1].' px' : '';
 
         if ($GLOBALS['xoopsModuleConfig']['max_image_width'] > 0
             && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0) {
             if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
                 || $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
                 //if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_img_width']) {
-                if (!file_exists($thumb_path . '/' . $source)) {
+                if (!file_exists($thumb_path.'/'.$source)) {
                     newbbCreateThumbnail($source, $GLOBALS['xoopsModuleConfig']['max_image_width']);
                 }
             }
@@ -65,28 +65,28 @@ 
                 || $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
                 $pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_width'];
                 $pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_width'] * ($imginfo[1] / $imginfo[0]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
             }
             // irmtfan to fix Undefined variable: pseudo_height
             if (!empty($pseudo_height) && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0
                 && $pseudo_height > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
                 $pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_height'];
                 $pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_height'] * ($imginfo[0] / $imginfo[1]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
             }
         }
 
         if (file_exists($thumb)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
             // $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '" />';
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
+            $attachmentImage .= '<img src="'.$image_url.'" '.$pseudo_size.' alt="'.$source.' '.$img_info.'" />';
             $attachmentImage .= '</a>';
         } elseif (!empty($pseudo_size)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
+            $attachmentImage .= '<img src="'.$image_url.'" '.$pseudo_size.' alt="'.$source.' '.$img_info.'" />';
             $attachmentImage .= '</a>';
         } elseif (file_exists($image)) {
-            $attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '" />';
+            $attachmentImage = '<img src="'.$image_url.'" alt="'.$source.' '.$img_info.'" />';
         } else {
             $attachmentImage = '';
         }
@@ -103,9 +103,9 @@ 
     {
         $cmd        = '';
         $img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
-        $thumb_path = $img_path . '/thumbs';
-        $src_file   = $img_path . '/' . $source;
-        $new_file   = $thumb_path . '/' . $source;
+        $thumb_path = $img_path.'/thumbs';
+        $src_file   = $img_path.'/'.$source;
+        $new_file   = $thumb_path.'/'.$source;
         //$imageLibs = newbb_getImageLibs();
 
         if (!filesize($src_file) || !is_readable($src_file)) {
@@ -131,14 +131,14 @@ 
         if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
             if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
                 $cur_dir     = __DIR__;
-                $src_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $src_file) . '"';
-                $new_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $new_file) . '"';
+                $src_file_im = '"'.$cur_dir.'\\'.str_replace('/', '\\', $src_file).'"';
+                $new_file_im = '"'.$cur_dir.'\\'.str_replace('/', '\\', $new_file).'"';
             } else {
                 $src_file_im = @escapeshellarg($src_file);
                 $new_file_im = @escapeshellarg($new_file);
             }
-            $path           = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
-            $magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
+            $path           = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'].'/';
+            $magick_command = $path.'convert -quality 85 -antialias -sample '.$newWidth.'x'.$newHeight.' '.$src_file_im.' +profile "*" '.str_replace('\\', '/', $new_file_im).'';
 
             @passthru($magick_command);
             if (file_exists($new_file)) {
@@ -147,13 +147,13 @@ 
         }
 
         if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-            $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
+            $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'].'/';
             if (preg_match("/\.png/", $source)) {
-                $cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
+                $cmd = $path."pngtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."pnmtopng > $new_file";
             } elseif (preg_match("/\.(jpg|jpeg)/", $source)) {
-                $cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
+                $cmd = $path."jpegtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."ppmtojpeg -quality=90 > $new_file";
             } elseif (preg_match("/\.gif/", $source)) {
-                $cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
+                $cmd = $path."giftopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ppmquant 256 | ".$path."ppmtogif > $new_file";
             }
 
             @exec($cmd, $output, $retval);

Indentation +188 added lines, -188 removed lines

@@ -30,192 +30,192 @@
 //  ------------------------------------------------------------------------ //
 
 if (!defined('NEWBB_FUNCTIONS_IMAGE')) {
-    define('NEWBB_FUNCTIONS_IMAGE', true);
-
-    /**
-     * @param $source
-     * @return string
-     */
-    function newbbAttachmentImage($source)
-    {
-        $img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
-        $img_url    = XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'];
-        $thumb_path = $img_path . '/thumbs';
-        $thumb_url  = $img_url . '/thumbs';
-
-        $thumb     = $thumb_path . '/' . $source;
-        $image     = $img_path . '/' . $source;
-        $thumb_url = $thumb_url . '/' . $source;
-        $image_url = $img_url . '/' . $source;
-
-        $imginfo  = @getimagesize($image);
-        $img_info = (count($imginfo) > 0) ? $imginfo[0] . 'X' . $imginfo[1] . ' px' : '';
-
-        if ($GLOBALS['xoopsModuleConfig']['max_image_width'] > 0
-            && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0) {
-            if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
-                || $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
-                //if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_img_width']) {
-                if (!file_exists($thumb_path . '/' . $source)) {
-                    newbbCreateThumbnail($source, $GLOBALS['xoopsModuleConfig']['max_image_width']);
-                }
-            }
-
-            if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
-                || $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
-                $pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_width'];
-                $pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_width'] * ($imginfo[1] / $imginfo[0]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
-            }
-            // irmtfan to fix Undefined variable: pseudo_height
-            if (!empty($pseudo_height) && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0
-                && $pseudo_height > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
-                $pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_height'];
-                $pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_height'] * ($imginfo[0] / $imginfo[1]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
-            }
-        }
-
-        if (file_exists($thumb)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
-            // $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '" />';
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
-            $attachmentImage .= '</a>';
-        } elseif (!empty($pseudo_size)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
-            $attachmentImage .= '</a>';
-        } elseif (file_exists($image)) {
-            $attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '" />';
-        } else {
-            $attachmentImage = '';
-        }
-
-        return $attachmentImage;
-    }
-
-    /**
-     * @param $source
-     * @param $thumb_width
-     * @return bool
-     */
-    function newbbCreateThumbnail($source, $thumb_width)
-    {
-        $cmd        = '';
-        $img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
-        $thumb_path = $img_path . '/thumbs';
-        $src_file   = $img_path . '/' . $source;
-        $new_file   = $thumb_path . '/' . $source;
-        //$imageLibs = newbb_getImageLibs();
-
-        if (!filesize($src_file) || !is_readable($src_file)) {
-            return false;
-        }
-
-        if (!is_dir($thumb_path) || !is_writable($thumb_path)) {
-            return false;
-        }
-
-        $imginfo = @getimagesize($src_file);
-
-        if (null === $imginfo) {
-            return false;
-        }
-        if ($imginfo[0] < $thumb_width) {
-            return false;
-        }
-
-        $newWidth  = (int)min($imginfo[0], $thumb_width);
-        $newHeight = (int)($imginfo[1] * $newWidth / $imginfo[0]);
-
-        if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-            if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
-                $cur_dir     = __DIR__;
-                $src_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $src_file) . '"';
-                $new_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $new_file) . '"';
-            } else {
-                $src_file_im = @escapeshellarg($src_file);
-                $new_file_im = @escapeshellarg($new_file);
-            }
-            $path           = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
-            $magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
-
-            @passthru($magick_command);
-            if (file_exists($new_file)) {
-                return true;
-            }
-        }
-
-        if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-            $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
-            if (preg_match("/\.png/", $source)) {
-                $cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
-            } elseif (preg_match("/\.(jpg|jpeg)/", $source)) {
-                $cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
-            } elseif (preg_match("/\.gif/", $source)) {
-                $cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
-            }
-
-            @exec($cmd, $output, $retval);
-            if (file_exists($new_file)) {
-                return true;
-            }
-        }
-
-        $type            = $imginfo[2];
-        $supported_types = [];
-
-        if (!extension_loaded('gd')) {
-            return false;
-        }
-        if (function_exists('imagegif')) {
-            $supported_types[] = 1;
-        }
-        if (function_exists('imagejpeg')) {
-            $supported_types[] = 2;
-        }
-        if (function_exists('imagepng')) {
-            $supported_types[] = 3;
-        }
-
-        $imageCreateFunction = function_exists('imagecreatetruecolor') ? 'imagecreatetruecolor' : 'imagecreate';
-
-        if (in_array($type, $supported_types)) {
-            switch ($type) {
-                case 1:
-                    if (!function_exists('imagecreatefromgif')) {
-                        return false;
-                    }
-                    $im     = imagecreatefromgif($src_file);
-                    $new_im = imagecreate($newWidth, $newHeight);
-                    imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
-                    imagegif($new_im, $new_file);
-                    imagedestroy($im);
-                    imagedestroy($new_im);
-                    break;
-                case 2:
-                    $im     = imagecreatefromjpeg($src_file);
-                    $new_im = $imageCreateFunction($newWidth, $newHeight);
-                    imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
-                    imagejpeg($new_im, $new_file, 90);
-                    imagedestroy($im);
-                    imagedestroy($new_im);
-                    break;
-                case 3:
-                    $im     = imagecreatefrompng($src_file);
-                    $new_im = $imageCreateFunction($newWidth, $newHeight);
-                    imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
-                    imagepng($new_im, $new_file);
-                    imagedestroy($im);
-                    imagedestroy($new_im);
-                    break;
-            }
-        }
-
-        if (file_exists($new_file)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	define('NEWBB_FUNCTIONS_IMAGE', true);
+
+	/**
+	 * @param $source
+	 * @return string
+	 */
+	function newbbAttachmentImage($source)
+	{
+		$img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
+		$img_url    = XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'];
+		$thumb_path = $img_path . '/thumbs';
+		$thumb_url  = $img_url . '/thumbs';
+
+		$thumb     = $thumb_path . '/' . $source;
+		$image     = $img_path . '/' . $source;
+		$thumb_url = $thumb_url . '/' . $source;
+		$image_url = $img_url . '/' . $source;
+
+		$imginfo  = @getimagesize($image);
+		$img_info = (count($imginfo) > 0) ? $imginfo[0] . 'X' . $imginfo[1] . ' px' : '';
+
+		if ($GLOBALS['xoopsModuleConfig']['max_image_width'] > 0
+			&& $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0) {
+			if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
+				|| $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
+				//if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_img_width']) {
+				if (!file_exists($thumb_path . '/' . $source)) {
+					newbbCreateThumbnail($source, $GLOBALS['xoopsModuleConfig']['max_image_width']);
+				}
+			}
+
+			if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
+				|| $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
+				$pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_width'];
+				$pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_width'] * ($imginfo[1] / $imginfo[0]);
+				$pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+			}
+			// irmtfan to fix Undefined variable: pseudo_height
+			if (!empty($pseudo_height) && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0
+				&& $pseudo_height > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
+				$pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_height'];
+				$pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_height'] * ($imginfo[0] / $imginfo[1]);
+				$pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+			}
+		}
+
+		if (file_exists($thumb)) {
+			$attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
+			// $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '" />';
+			$attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
+			$attachmentImage .= '</a>';
+		} elseif (!empty($pseudo_size)) {
+			$attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
+			$attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
+			$attachmentImage .= '</a>';
+		} elseif (file_exists($image)) {
+			$attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '" />';
+		} else {
+			$attachmentImage = '';
+		}
+
+		return $attachmentImage;
+	}
+
+	/**
+	 * @param $source
+	 * @param $thumb_width
+	 * @return bool
+	 */
+	function newbbCreateThumbnail($source, $thumb_width)
+	{
+		$cmd        = '';
+		$img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
+		$thumb_path = $img_path . '/thumbs';
+		$src_file   = $img_path . '/' . $source;
+		$new_file   = $thumb_path . '/' . $source;
+		//$imageLibs = newbb_getImageLibs();
+
+		if (!filesize($src_file) || !is_readable($src_file)) {
+			return false;
+		}
+
+		if (!is_dir($thumb_path) || !is_writable($thumb_path)) {
+			return false;
+		}
+
+		$imginfo = @getimagesize($src_file);
+
+		if (null === $imginfo) {
+			return false;
+		}
+		if ($imginfo[0] < $thumb_width) {
+			return false;
+		}
+
+		$newWidth  = (int)min($imginfo[0], $thumb_width);
+		$newHeight = (int)($imginfo[1] * $newWidth / $imginfo[0]);
+
+		if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+			if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
+				$cur_dir     = __DIR__;
+				$src_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $src_file) . '"';
+				$new_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $new_file) . '"';
+			} else {
+				$src_file_im = @escapeshellarg($src_file);
+				$new_file_im = @escapeshellarg($new_file);
+			}
+			$path           = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
+			$magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
+
+			@passthru($magick_command);
+			if (file_exists($new_file)) {
+				return true;
+			}
+		}
+
+		if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+			$path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
+			if (preg_match("/\.png/", $source)) {
+				$cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
+			} elseif (preg_match("/\.(jpg|jpeg)/", $source)) {
+				$cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
+			} elseif (preg_match("/\.gif/", $source)) {
+				$cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
+			}
+
+			@exec($cmd, $output, $retval);
+			if (file_exists($new_file)) {
+				return true;
+			}
+		}
+
+		$type            = $imginfo[2];
+		$supported_types = [];
+
+		if (!extension_loaded('gd')) {
+			return false;
+		}
+		if (function_exists('imagegif')) {
+			$supported_types[] = 1;
+		}
+		if (function_exists('imagejpeg')) {
+			$supported_types[] = 2;
+		}
+		if (function_exists('imagepng')) {
+			$supported_types[] = 3;
+		}
+
+		$imageCreateFunction = function_exists('imagecreatetruecolor') ? 'imagecreatetruecolor' : 'imagecreate';
+
+		if (in_array($type, $supported_types)) {
+			switch ($type) {
+				case 1:
+					if (!function_exists('imagecreatefromgif')) {
+						return false;
+					}
+					$im     = imagecreatefromgif($src_file);
+					$new_im = imagecreate($newWidth, $newHeight);
+					imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
+					imagegif($new_im, $new_file);
+					imagedestroy($im);
+					imagedestroy($new_im);
+					break;
+				case 2:
+					$im     = imagecreatefromjpeg($src_file);
+					$new_im = $imageCreateFunction($newWidth, $newHeight);
+					imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
+					imagejpeg($new_im, $new_file, 90);
+					imagedestroy($im);
+					imagedestroy($new_im);
+					break;
+				case 3:
+					$im     = imagecreatefrompng($src_file);
+					$new_im = $imageCreateFunction($newWidth, $newHeight);
+					imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
+					imagepng($new_im, $new_file);
+					imagedestroy($im);
+					imagedestroy($new_im);
+					break;
+			}
+		}
+
+		if (file_exists($new_file)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 }

include/functions.user.php

Spacing +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
         return $forum_moderators;
     }
 
-    $sql = 'SELECT forum_moderator FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums');
+    $sql = 'SELECT forum_moderator FROM '.$GLOBALS['xoopsDB']->prefix('newbb_forums');
     if ($result = $GLOBALS['xoopsDB']->query($sql)) {
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
             if (empty($myrow['forum_moderator'])) {

Indentation +141 added lines, -141 removed lines

@@ -29,10 +29,10 @@ 
  */
 function newbbGetUnameFromIds($uid, $usereal = 0, $linked = false)
 {
-    xoops_load('xoopsuserutility');
-    $ids = \XoopsUserUtility::getUnameFromIds($uid, $usereal, $linked);
+	xoops_load('xoopsuserutility');
+	$ids = \XoopsUserUtility::getUnameFromIds($uid, $usereal, $linked);
 
-    return $ids;
+	return $ids;
 }
 
 /**
@@ -43,9 +43,9 @@ 
  */
 function newbbGetUnameFromId($uid, $usereal = 0, $linked = false)
 {
-    xoops_load('xoopsuserutility');
+	xoops_load('xoopsuserutility');
 
-    return \XoopsUserUtility::getUnameFromId($uid, $usereal, $linked);
+	return \XoopsUserUtility::getUnameFromId($uid, $usereal, $linked);
 }
 
 /**
@@ -57,41 +57,41 @@ 
  */
 function newbbIsAdministrator($user = -1, $mid = 0)
 {
-    global $xoopsModule;
-
-    if (is_numeric($user) && -1 == $user) {
-        $user = $GLOBALS['xoopsUser'];
-    }
-    if (!is_object($user) && (int)$user < 1) {
-        return false;
-    }
-    $uid = is_object($user) ? $user->getVar('uid') : (int)$user;
-
-    if (!$mid) {
-        if (is_object($xoopsModule) && 'newbb' === $xoopsModule->getVar('dirname', 'n')) {
-            $mid = $xoopsModule->getVar('mid', 'n');
-        } else {
-            /** @var \XoopsModuleHandler $moduleHandler */
-            $moduleHandler = xoops_getHandler('module');
-            $newbb_module  = $moduleHandler->getByDirname('newbb');
-            $mid           = $newbb_module->getVar('mid', 'n');
-            unset($newbb_module);
-        }
-    }
-
-    if (is_object($xoopsModule) && is_object($GLOBALS['xoopsUser']) && $mid == $xoopsModule->getVar('mid', 'n')
-        && $uid == $GLOBALS['xoopsUser']->getVar('uid', 'n')) {
-        return $GLOBALS['xoopsUserIsAdmin'];
-    }
-
-    /** @var \XoopsMemberHandler $memberHandler */
-    $memberHandler = xoops_getHandler('member');
-    $groups        = $memberHandler->getGroupsByUser($uid);
-
-    /** @var \XoopsGroupPermHandler $grouppermHandler */
-    $grouppermHandler = xoops_getHandler('groupperm');
-
-    return $grouppermHandler->checkRight('module_admin', $mid, $groups);
+	global $xoopsModule;
+
+	if (is_numeric($user) && -1 == $user) {
+		$user = $GLOBALS['xoopsUser'];
+	}
+	if (!is_object($user) && (int)$user < 1) {
+		return false;
+	}
+	$uid = is_object($user) ? $user->getVar('uid') : (int)$user;
+
+	if (!$mid) {
+		if (is_object($xoopsModule) && 'newbb' === $xoopsModule->getVar('dirname', 'n')) {
+			$mid = $xoopsModule->getVar('mid', 'n');
+		} else {
+			/** @var \XoopsModuleHandler $moduleHandler */
+			$moduleHandler = xoops_getHandler('module');
+			$newbb_module  = $moduleHandler->getByDirname('newbb');
+			$mid           = $newbb_module->getVar('mid', 'n');
+			unset($newbb_module);
+		}
+	}
+
+	if (is_object($xoopsModule) && is_object($GLOBALS['xoopsUser']) && $mid == $xoopsModule->getVar('mid', 'n')
+		&& $uid == $GLOBALS['xoopsUser']->getVar('uid', 'n')) {
+		return $GLOBALS['xoopsUserIsAdmin'];
+	}
+
+	/** @var \XoopsMemberHandler $memberHandler */
+	$memberHandler = xoops_getHandler('member');
+	$groups        = $memberHandler->getGroupsByUser($uid);
+
+	/** @var \XoopsGroupPermHandler $grouppermHandler */
+	$grouppermHandler = xoops_getHandler('groupperm');
+
+	return $grouppermHandler->checkRight('module_admin', $mid, $groups);
 }
 
 /**
@@ -103,24 +103,24 @@ 
  */
 function newbbIsModerator(&$forum, $user = -1)
 {
-    if (!is_object($forum)) {
-        $forum_id = (int)$forum;
-        if (0 == $forum_id) {
-            return false;
-        }
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forum        = $forumHandler->get($forum_id);
-    }
-
-    if (is_numeric($user) && -1 == $user) {
-        $user = $GLOBALS['xoopsUser'];
-    }
-    if (!is_object($user) && (int)$user < 1) {
-        return false;
-    }
-    $uid = is_object($user) ? $user->getVar('uid', 'n') : (int)$user;
-
-    return in_array($uid, $forum->getVar('forum_moderator'), true);
+	if (!is_object($forum)) {
+		$forum_id = (int)$forum;
+		if (0 == $forum_id) {
+			return false;
+		}
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forum        = $forumHandler->get($forum_id);
+	}
+
+	if (is_numeric($user) && -1 == $user) {
+		$user = $GLOBALS['xoopsUser'];
+	}
+	if (!is_object($user) && (int)$user < 1) {
+		return false;
+	}
+	$uid = is_object($user) ? $user->getVar('uid', 'n') : (int)$user;
+
+	return in_array($uid, $forum->getVar('forum_moderator'), true);
 }
 
 /**
@@ -131,31 +131,31 @@ 
  */
 function newbbIsAdmin($forum = 0)
 {
-    global $xoopsModule;
-    static $_cachedModerators;
-
-    if (empty($forum)) {
-        return $GLOBALS['xoopsUserIsAdmin'];
-    }
-
-    if (!is_object($GLOBALS['xoopsUser'])) {
-        return false;
-    }
-
-    if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $xoopsModule->getVar('dirname')) {
-        return true;
-    }
-
-    $cache_id = is_object($forum) ? $forum->getVar('forum_id', 'n') : (int)$forum;
-    if (!isset($_cachedModerators[$cache_id])) {
-        if (!is_object($forum)) {
-            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-            $forum        = $forumHandler->get((int)$forum);
-        }
-        $_cachedModerators[$cache_id] = $forum->getVar('forum_moderator');
-    }
-
-    return in_array($GLOBALS['xoopsUser']->getVar('uid'), $_cachedModerators[$cache_id]);
+	global $xoopsModule;
+	static $_cachedModerators;
+
+	if (empty($forum)) {
+		return $GLOBALS['xoopsUserIsAdmin'];
+	}
+
+	if (!is_object($GLOBALS['xoopsUser'])) {
+		return false;
+	}
+
+	if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $xoopsModule->getVar('dirname')) {
+		return true;
+	}
+
+	$cache_id = is_object($forum) ? $forum->getVar('forum_id', 'n') : (int)$forum;
+	if (!isset($_cachedModerators[$cache_id])) {
+		if (!is_object($forum)) {
+			$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+			$forum        = $forumHandler->get((int)$forum);
+		}
+		$_cachedModerators[$cache_id] = $forum->getVar('forum_moderator');
+	}
+
+	return in_array($GLOBALS['xoopsUser']->getVar('uid'), $_cachedModerators[$cache_id]);
 }
 
 /* use hardcoded DB query to save queries */
@@ -165,47 +165,47 @@ 
  */
 function newbbIsModuleAdministrators(array $uid = [])
 {
-    global $xoopsModule;
-    $module_administrators = [];
-
-    //    $xoopsMembershipHandler = xoops_getHandler('membership');
-    //    $xoopsMembershipTable   = $xoopsMembershipHandler->table;
-
-    /** @var \XoopsMembershipHandler $xoopsMembershipHandler */
-    $xoopsMembershipHandler = xoops_getHandler('membership');
-    $xoopsMembershipTable   = $xoopsMembershipHandler->table;
-    /** @var \XoopsGroupPermHandler $xoopsGroupPermHandler */
-    $xoopsGroupPermHandler = xoops_getHandler('groupperm');
-    $xoopsGroupPermTable   = $xoopsGroupPermHandler->table;
-
-    if (!(bool)$uid) {
-        return $module_administrators;
-    }
-    $mid = $xoopsModule->getVar('mid');
-
-    $sql = 'SELECT COUNT(l.groupid) AS count, l.uid FROM '
-           . $xoopsMembershipTable
-           . ' AS l'
-           . ' LEFT JOIN '
-           . $xoopsGroupPermTable
-           . ' AS p ON p.gperm_groupid=l.groupid'
-           . ' WHERE l.uid IN ('
-           . implode(', ', array_map('intval', $uid))
-           . ')'
-           . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
-           . (int)$mid
-           . "'"
-           . ' GROUP BY l.uid';
-
-    if ($result = $GLOBALS['xoopsDB']->query($sql)) {
-        while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            if (!empty($myrow['count'])) {
-                $module_administrators[] = $myrow['uid'];
-            }
-        }
-    }
-
-    return $module_administrators;
+	global $xoopsModule;
+	$module_administrators = [];
+
+	//    $xoopsMembershipHandler = xoops_getHandler('membership');
+	//    $xoopsMembershipTable   = $xoopsMembershipHandler->table;
+
+	/** @var \XoopsMembershipHandler $xoopsMembershipHandler */
+	$xoopsMembershipHandler = xoops_getHandler('membership');
+	$xoopsMembershipTable   = $xoopsMembershipHandler->table;
+	/** @var \XoopsGroupPermHandler $xoopsGroupPermHandler */
+	$xoopsGroupPermHandler = xoops_getHandler('groupperm');
+	$xoopsGroupPermTable   = $xoopsGroupPermHandler->table;
+
+	if (!(bool)$uid) {
+		return $module_administrators;
+	}
+	$mid = $xoopsModule->getVar('mid');
+
+	$sql = 'SELECT COUNT(l.groupid) AS count, l.uid FROM '
+		   . $xoopsMembershipTable
+		   . ' AS l'
+		   . ' LEFT JOIN '
+		   . $xoopsGroupPermTable
+		   . ' AS p ON p.gperm_groupid=l.groupid'
+		   . ' WHERE l.uid IN ('
+		   . implode(', ', array_map('intval', $uid))
+		   . ')'
+		   . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
+		   . (int)$mid
+		   . "'"
+		   . ' GROUP BY l.uid';
+
+	if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+		while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			if (!empty($myrow['count'])) {
+				$module_administrators[] = $myrow['uid'];
+			}
+		}
+	}
+
+	return $module_administrators;
 }
 
 /* use hardcoded DB query to save queries */
@@ -216,22 +216,22 @@ 
  */
 function newbbIsForumModerators(array $uid = [], $mid = 0)
 {
-    $forum_moderators = [];
-
-    if (!(bool)$uid) {
-        return $forum_moderators;
-    }
-
-    $sql = 'SELECT forum_moderator FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums');
-    if ($result = $GLOBALS['xoopsDB']->query($sql)) {
-        while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            if (empty($myrow['forum_moderator'])) {
-                continue;
-            }
-            $forum_moderators = array_merge($forum_moderators, unserialize($myrow['forum_moderator']));
-        }
-    }
-
-    return array_unique($forum_moderators);
+	$forum_moderators = [];
+
+	if (!(bool)$uid) {
+		return $forum_moderators;
+	}
+
+	$sql = 'SELECT forum_moderator FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums');
+	if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+		while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			if (empty($myrow['forum_moderator'])) {
+				continue;
+			}
+			$forum_moderators = array_merge($forum_moderators, unserialize($myrow['forum_moderator']));
+		}
+	}
+
+	return array_unique($forum_moderators);
 }
 //ENDIF;

include/images.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 $forumImage['facebook'] = $forumImage['twitter'] = $forumImage['linkedin'] = $forumImage['googleplus'] = $forumImage['stumbleupon'] = $forumImage['friendfeed'] = $forumImage['digg'] = $forumImage['reddit'] = $forumImage['delicious'] = $forumImage['technorati'] = $forumImage['wong'] = $forumImage['anonym'] = $forumImage['more'] = $forumImage['less'] = 'icon';
 
 for ($i = 1; $i <= 5; ++$i) {
-    $forumImage['rate' . $i] = 'icon';
+    $forumImage['rate'.$i] = 'icon';
 }
 
 $forumImage['p_delete'] = $forumImage['p_reply'] = $forumImage['p_quote'] = $forumImage['p_edit'] = $forumImage['p_report'] =

Indentation +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 $forumImage['facebook'] = $forumImage['twitter'] = $forumImage['linkedin'] = $forumImage['googleplus'] = $forumImage['stumbleupon'] = $forumImage['friendfeed'] = $forumImage['digg'] = $forumImage['reddit'] = $forumImage['delicious'] = $forumImage['technorati'] = $forumImage['wong'] = $forumImage['anonym'] = $forumImage['more'] = $forumImage['less'] = 'icon';
 
 for ($i = 1; $i <= 5; ++$i) {
-    $forumImage['rate' . $i] = 'icon';
+	$forumImage['rate' . $i] = 'icon';
 }
 
 $forumImage['p_delete'] = $forumImage['p_reply'] = $forumImage['p_quote'] = $forumImage['p_edit'] = $forumImage['p_report'] =
@@ -61,7 +61,7 @@ 
 
 $forumImage['p_bann'] =
 
-    'language';
+	'language';
 
 /*
 $forumImage[''] = $forumImage['blank'] = $forumImage['icon']."blank";

admin/admin_footer.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 global $pathIcon32;
 if (!class_exists('\Xoops', false)) {
-    echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>\n";
+    echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"."    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"."  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n"."</div>\n";
 }
 
 xoops_cp_footer();

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 global $pathIcon32;
 
 if (!class_exists('\Xoops', false)) {
-    echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>\n";
+	echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>\n";
 }
 
 xoops_cp_footer();

include/form.forum.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
 // The forum instanciation
-$form_forum = new \XoopsThemeForm(_AM_NEWBB_EDITTHISFORUM . ' ' . $forumObject->getVar('forum_name'), 'form_forum', xoops_getenv('PHP_SELF'));
+$form_forum = new \XoopsThemeForm(_AM_NEWBB_EDITTHISFORUM.' '.$forumObject->getVar('forum_name'), 'form_forum', xoops_getenv('PHP_SELF'));
 
 // Forum name
 $form_forum->addElement(new \XoopsFormText(_AM_NEWBB_FORUMNAME, 'forum_name', 50, 80, $forumObject->getVar('forum_name', 'E')), true);
@@ -65,7 +65,7 @@ 
 $perm_checkbox = new \XoopsFormCheckBox('', 'perm_template', $forumObject->isNew());
 $perm_checkbox->addOption(1, _AM_NEWBB_PERM_TEMPLATEAPP);
 $perm_tray->addElement($perm_checkbox);
-$perm_tray->addElement(new \XoopsFormLabel('', '<a href="admin_permissions.php?action=template" rel="external" title="">' . _AM_NEWBB_PERM_TEMPLATE . '</a>'));
+$perm_tray->addElement(new \XoopsFormLabel('', '<a href="admin_permissions.php?action=template" rel="external" title="">'._AM_NEWBB_PERM_TEMPLATE.'</a>'));
 $form_forum->addElement($perm_tray);
 
 $form_forum->addElement(new \XoopsFormHidden('forum', $forumObject->getVar('forum_id')));

Indentation +2 added lines, -2 removed lines

@@ -19,9 +19,9 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 if (!is_object($forumObject)) {
-    xoops_error('forum object IS null');
+	xoops_error('forum object IS null');
 
-    return;
+	return;
 }
 
 require_once $GLOBALS['xoops']->path('class/xoopstree.php');