From 0f2e4691ee850e6a2b3eb16e9d0b576400440705 Mon Sep 17 00:00:00 2001 From: mambax7 Date: Sun, 25 Mar 2018 01:04:44 -0400 Subject: [PATCH 1/7] 4.33 Final --- language/english/main.php | 1 + xoops_version.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/language/english/main.php b/language/english/main.php index 2977c54a..482943d7 100644 --- a/language/english/main.php +++ b/language/english/main.php @@ -22,6 +22,7 @@ define('_MD_ALL_FORUM_MARKED', 'All forums marked'); define('_MD_ALL_TOPIC_MARKED', 'All topics marked'); define('_MD_BOARD_DISCLAIMER', 'Forum Disclaimer'); +define('_MD_POSTEDON', 'Posted on: '); //index.php define('_MD_ADMINCP', 'Admin Panel'); define('_MD_FORUM', 'Forum'); diff --git a/xoops_version.php b/xoops_version.php index 51e89e08..f50874e8 100644 --- a/xoops_version.php +++ b/xoops_version.php @@ -11,7 +11,7 @@ $modversion['version'] = 4.33; $modversion['module_status'] = 'Final'; -$modversion['release_date'] = '2016/11/27'; +$modversion['release_date'] = '2018/03/24'; $modversion['name'] = _MI_NEWBB_NAME; $modversion['description'] = _MI_NEWBB_DESC; $modversion['credits'] = 'NewBB 2 developed by Marko Schmuck (predator) / D.J. (phppp) / Alfred(dhcst)'; From 508c415b4ebb968c7daaf4617c18c23822ac12b9 Mon Sep 17 00:00:00 2001 From: mambax7 Date: Sun, 25 Mar 2018 01:13:31 -0400 Subject: [PATCH 2/7] https://github.com/XoopsModules25x/newbb/issues/49 --- language/english/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/english/main.php b/language/english/main.php index 482943d7..469872cc 100644 --- a/language/english/main.php +++ b/language/english/main.php @@ -252,7 +252,7 @@ define('_MD_REGISTER', 'Register'); define('_MD_SUBJECTC', 'Subject:'); define('_MD_MESSAGEICON', 'Message Icon:'); -define('_MD_MESSAGEC', 'Message:'); +//define('_MD_MESSAGEC', 'Message:'); define('_MD_ALLOWEDHTML', 'Allowed HTML:'); define('_MD_OPTIONS', 'Options:'); define('_MD_POSTANONLY', 'Post Anonymously'); From a2f9a86d785131d6ff01256800afbeb83a17ce37 Mon Sep 17 00:00:00 2001 From: mambax7 Date: Sun, 25 Mar 2018 02:27:29 -0400 Subject: [PATCH 3/7] assignment in condition --- action.post.php | 18 +- action.topic.php | 10 +- admin/admin_cat_manager.php | 2 +- admin/admin_digest.php | 2 +- admin/admin_forum_manager.php | 6 +- admin/admin_forum_prune.php | 18 +- admin/admin_forum_reorder.php | 10 +- admin/admin_groupmod.php | 6 +- admin/admin_permissions.php | 36 +- admin/admin_report.php | 4 +- admin/admin_synchronization.php | 4 +- admin/admin_type_manager.php | 16 +- admin/index.php | 6 +- admin/menu.php | 52 +-- blocks/list_topic.php | 6 +- blocks/newbb_block.php | 36 +- class/category.php | 2 +- class/digest.php | 16 +- class/forum.php | 102 +++--- class/icon.php | 6 +- class/moderate.php | 10 +- class/newbbtree.php | 8 +- class/online.php | 36 +- class/permission.category.php | 4 +- class/permission.forum.php | 11 +- class/permission.php | 18 +- class/plugin/userlog.php | 10 +- class/plugins/plugin.tag.php | 8 +- class/post.php | 48 +-- class/read.php | 8 +- class/readforum.php | 4 +- class/readtopic.php | 6 +- class/report.php | 10 +- class/stats.php | 24 +- class/topic.php | 20 +- class/topic.renderer.php | 188 +++++----- class/tree.php | 22 +- class/type.php | 20 +- class/uploader.php | 4 +- class/user.php | 48 +-- class/userstats.php | 2 +- class/utilities.php | 2 +- class/xmlrss.php | 10 +- delete.php | 8 +- docs/changelog.txt | 7 +- edit.php | 14 +- footer.php | 2 +- header.php | 6 +- include/config.php | 4 +- include/form.post.php | 18 +- include/functions.forum.php | 8 +- include/functions.image.php | 2 +- include/functions.recon.php | 8 +- include/functions.render.php | 2 +- include/functions.session.php | 12 +- include/functions.text.php | 2 +- include/functions.user.php | 12 +- include/functions.welcome.inc.php | 14 +- include/module.php | 16 +- include/module.v220.php | 6 +- include/module.v400.php | 10 +- include/plugin.dist.php | 8 +- include/plugin.php | 8 +- include/search.inc.php | 4 +- include/sitemap.plugin.php | 24 +- index.php | 38 +- list.topic.php | 2 +- makepdf.php | 10 +- moderate.php | 4 +- newtopic.php | 4 +- polls.php | 20 +- post.php | 28 +- ratethread.php | 2 +- reply.php | 16 +- report.php | 4 +- rss.php | 8 +- search.php | 24 +- seo.php | 6 +- seo_url.php | 28 +- templates/blocks/newbb_block.tpl | 6 +- templates/blocks/newbb_block_author.tpl | 4 +- templates/blocks/newbb_block_list_topic.tpl | 2 +- templates/blocks/newbb_block_post.tpl | 8 +- templates/blocks/newbb_block_text.tpl | 2 +- templates/blocks/newbb_block_topic.tpl | 6 +- templates/newbb_edit_post.tpl | 8 +- templates/newbb_index.tpl | 12 +- templates/newbb_online.tpl | 2 +- templates/newbb_poll_results.tpl | 2 +- templates/newbb_poll_view.tpl | 2 +- templates/newbb_rss.tpl | 2 +- templates/newbb_thread.tpl | 6 +- templates/newbb_viewall.tpl | 2 +- templates/newbb_viewforum.tpl | 6 +- templates/newbb_viewforum_menu.tpl | 2 +- templates/newbb_viewforum_subforum.tpl | 2 +- templates/newbb_viewpost.tpl | 4 +- templates/newbb_viewtopic.tpl | 16 +- .../blocks/newbb_block.tpl | 6 +- .../blocks/newbb_block_author.tpl | 4 +- .../blocks/newbb_block_list_topic.tpl | 2 +- .../blocks/newbb_block_post.tpl | 8 +- .../blocks/newbb_block_text.tpl | 2 +- .../blocks/newbb_block_topic.tpl | 6 +- templates_fulldiv_opacity/newbb_edit_post.tpl | 8 +- templates_fulldiv_opacity/newbb_index.tpl | 8 +- templates_fulldiv_opacity/newbb_online.tpl | 2 +- .../newbb_poll_results.tpl | 2 +- templates_fulldiv_opacity/newbb_poll_view.tpl | 2 +- templates_fulldiv_opacity/newbb_rss.tpl | 2 +- templates_fulldiv_opacity/newbb_thread.tpl | 6 +- templates_fulldiv_opacity/newbb_viewall.tpl | 2 +- templates_fulldiv_opacity/newbb_viewforum.tpl | 6 +- .../newbb_viewforum_menu.tpl | 2 +- .../newbb_viewforum_subforum.tpl | 2 +- templates_fulldiv_opacity/newbb_viewpost.tpl | 6 +- templates_fulldiv_opacity/newbb_viewtopic.tpl | 16 +- topicmanager.php | 18 +- update_type.php | 4 +- viewforum.php | 34 +- viewpost.php | 50 +-- viewtopic.php | 147 ++++---- votepolls.php | 4 +- xoops_version.php | 326 +++++++++--------- 124 files changed, 1023 insertions(+), 1014 deletions(-) diff --git a/action.post.php b/action.post.php index 27f56667..f1592e7e 100644 --- a/action.post.php +++ b/action.post.php @@ -15,7 +15,7 @@ $uid = XoopsRequest::getInt('uid', 0, 'GET'); $op = XoopsRequest::getCmd('op', XoopsRequest::getCmd('op', '', 'POST'), 'GET'); -$op = in_array($op, array('approve', 'delete', 'restore', 'split'), true) ? $op : ''; +$op = in_array($op, ['approve', 'delete', 'restore', 'split'], true) ? $op : ''; $mode = XoopsRequest::getInt('mode', 1, 'GET'); if (0 === count($post_id) || 0 === count($op)) { @@ -43,8 +43,8 @@ case 'restore': $post_id = array_values($post_id); sort($post_id); - $topics = array(); - $forums = array(); + $topics = []; + $forums = []; foreach ($post_id as $post) { $post_obj = $postHandler->get($post); if ($post_obj->getVar('topic_id') < 1) { @@ -65,8 +65,8 @@ case 'approve': $post_id = array_values($post_id); sort($post_id); - $topics = array(); - $forums = array(); + $topics = []; + $forums = []; $criteria = new Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN'); $posts_obj = $postHandler->getObjects($criteria, true); foreach ($post_id as $post) { @@ -98,7 +98,7 @@ include_once __DIR__ . '/include/notification.inc.php'; $notificationHandler = xoops_getHandler('notification'); foreach ($post_id as $post) { - $tags = array(); + $tags = []; $tags['THREAD_NAME'] = $topic_list[$posts_obj[$post]->getVar('topic_id')]; $tags['THREAD_URL'] = XOOPS_URL . '/modules/' @@ -122,8 +122,8 @@ case 'delete': $post_id = array_values($post_id); rsort($post_id); - $topics = array(); - $forums = array(); + $topics = []; + $forums = []; foreach ($post_id as $post) { $post_obj = $postHandler->get($post); if (!empty($topic_id) && $topic_id !== $post_obj->getVar('topic_id')) { @@ -191,7 +191,7 @@ $posts = $postHandler->getList($criteria); unset($criteria); - $post_update = array(); + $post_update = []; foreach ($posts as $postid => $pid) { // if (!in_array($pid, array_keys($posts))) { if (!array_key_exists($pid, $posts)) { diff --git a/action.topic.php b/action.topic.php index d1f98e04..86fc3f6c 100644 --- a/action.topic.php +++ b/action.topic.php @@ -14,7 +14,7 @@ $topic_id = XoopsRequest::getArray('topic_id', null, 'POST'); $op = XoopsRequest::getCmd('op', '', 'POST'); -$op = in_array($op, array('approve', 'delete', 'restore', 'move'), true) ? $op : ''; +$op = in_array($op, ['approve', 'delete', 'restore', 'move'], true) ? $op : ''; if (0 === count($topic_id) || 0 === count($op)) { // irmtfan - issue with javascript:history.go(-1) @@ -32,7 +32,7 @@ } switch ($op) { case 'restore': - $forums = array(); + $forums = []; $topics_obj = $topicHandler->getAll(new Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN')); foreach (array_keys($topics_obj) as $id) { $topic_obj =& $topics_obj[$id]; @@ -48,7 +48,7 @@ unset($topics_obj, $forums_obj); break; case 'approve': - $forums = array(); + $forums = []; $topics_obj = $topicHandler->getAll(new Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN')); foreach (array_keys($topics_obj) as $id) { $topic_obj =& $topics_obj[$id]; @@ -71,7 +71,7 @@ $notificationHandler = xoops_getHandler('notification'); foreach (array_keys($topics_obj) as $id) { $topic_obj =& $topics_obj[$id]; - $tags = array(); + $tags = []; $tags['THREAD_NAME'] = $topic_obj->getVar('topic_title'); $tags['THREAD_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topic_obj->getVar('forum_id'); $tags['FORUM_NAME'] = $forums_obj[$topic_obj->getVar('forum_id')]->getVar('forum_name'); @@ -92,7 +92,7 @@ unset($topics_obj, $forums_obj); break; case 'delete': - $forums = array(); + $forums = []; $topics_obj = $topicHandler->getAll(new Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN')); foreach (array_keys($topics_obj) as $id) { $topic_obj =& $topics_obj[$id]; diff --git a/admin/admin_cat_manager.php b/admin/admin_cat_manager.php index 829ccc07..c18af5af 100644 --- a/admin/admin_cat_manager.php +++ b/admin/admin_cat_manager.php @@ -123,7 +123,7 @@ function editCategory(XoopsObject $category_obj = null) case 'del': if (!XoopsRequest::getBool('confirm', '', 'POST')) { - xoops_confirm(array('op' => 'del', 'cat_id' => XoopsRequest::getInt('cat_id', 0, 'GET'), 'confirm' => 1), 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL); + xoops_confirm(['op' => 'del', 'cat_id' => XoopsRequest::getInt('cat_id', 0, 'GET'), 'confirm' => 1], 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL); break; } else { $category_obj = $categoryHandler->create(false); diff --git a/admin/admin_digest.php b/admin/admin_digest.php index 70df3184..c706e0c6 100644 --- a/admin/admin_digest.php +++ b/admin/admin_digest.php @@ -66,7 +66,7 @@ echo "" . _DELETE . ''; echo ''; - $digests = array(); + $digests = []; $digestHandler = xoops_getModuleHandler('digest', 'newbb'); $digests = $digestHandler->getAllDigests($start, $limit); foreach ($digests as $digest) { diff --git a/admin/admin_forum_manager.php b/admin/admin_forum_manager.php index 6105bdcb..fd6afd35 100644 --- a/admin/admin_forum_manager.php +++ b/admin/admin_forum_manager.php @@ -152,13 +152,13 @@ $forum_obj->setVar('forum_name', XoopsRequest::getString('forum_name', '', 'POST')); $forum_obj->setVar('forum_desc', XoopsRequest::getString('forum_desc', '', 'POST')); $forum_obj->setVar('forum_order', XoopsRequest::getInt('forum_order', 0, 'POST')); - $forum_obj->setVar('forum_moderator', XoopsRequest::getArray('forum_moderator', array(), 'POST')); + $forum_obj->setVar('forum_moderator', XoopsRequest::getArray('forum_moderator', [], 'POST')); $forum_obj->setVar('parent_forum', XoopsRequest::getInt('parent_forum', 0, 'POST')); $forum_obj->setVar('attach_maxkb', XoopsRequest::getInt('attach_maxkb', 0, 'POST')); $forum_obj->setVar('attach_ext', XoopsRequest::getString('attach_ext', '', 'POST')); $forum_obj->setVar('hot_threshold', XoopsRequest::getInt('hot_threshold', 0, 'POST')); if (XoopsRequest::getInt('parent_forum', 0, 'POST')) { - $parent_obj = $forumHandler->get(XoopsRequest::getInt('parent_forum', 0, 'POST'), array('cat_id')); + $parent_obj = $forumHandler->get(XoopsRequest::getInt('parent_forum', 0, 'POST'), ['cat_id']); $_POST['cat_id'] = $parent_obj->getVar('cat_id'); } $forum_obj->setVar('cat_id', XoopsRequest::getInt('cat_id', 0, 'POST')); @@ -202,7 +202,7 @@ case 'del': if (1 !== XoopsRequest::getInt('confirm', 0, 'POST')) { - xoops_confirm(array('op' => 'del', 'forum' => XoopsRequest::getInt('forum', 0, 'GET'), 'confirm' => 1), 'admin_forum_manager.php', _AM_NEWBB_TWDAFAP); + xoops_confirm(['op' => 'del', 'forum' => XoopsRequest::getInt('forum', 0, 'GET'), 'confirm' => 1], 'admin_forum_manager.php', _AM_NEWBB_TWDAFAP); break; } else { $forum_obj = $forumHandler->get(XoopsRequest::getInt('forum', 0, 'POST')); diff --git a/admin/admin_forum_prune.php b/admin/admin_forum_prune.php index 74c1cffb..d7b31065 100644 --- a/admin/admin_forum_prune.php +++ b/admin/admin_forum_prune.php @@ -83,12 +83,12 @@ $sql .= ' AND p.post_time<= ' . $prune_ddays . ' '; // Ok now we have the sql query completed, go for topic_id's and posts_id's - $topics = array(); + $topics = []; if (!$result = $GLOBALS['xoopsDB']->query($sql)) { return _MD_ERROR; } // Dave_L code - while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) { + while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) { $topics[] = $row['topic_id']; } $topics_number = count($topics); @@ -98,12 +98,12 @@ if ('' !== $topic_list) { $sql = 'SELECT post_id FROM ' . $GLOBALS['xoopsDB']->prefix('bb_posts') . ' WHERE topic_id IN (' . $topic_list . ')'; - $posts = array(); + $posts = []; if (!$result = $GLOBALS['xoopsDB']->query($sql)) { return _MD_ERROR; } // Dave_L code - while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) { + while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) { $posts[] = $row['post_id']; } $posts_number = count($posts); @@ -172,7 +172,7 @@ // $result = $GLOBALS['xoopsDB']->query(); // Days selected by selbox (better error control :lol:) $days = new XoopsFormSelect(_AM_NEWBB_PRUNE_DAYS, 'days', null, 1, false); - $days->addOptionArray(array( + $days->addOptionArray([ 604800 => _AM_NEWBB_PRUNE_WEEK, 1209600 => _AM_NEWBB_PRUNE_2WEEKS, 2592000 => _AM_NEWBB_PRUNE_MONTH, @@ -180,7 +180,7 @@ 10368000 => _AM_NEWBB_PRUNE_4MONTH, 31536000 => _AM_NEWBB_PRUNE_YEAR, 63072000 => _AM_NEWBB_PRUNE_2YEARS - )); + ]); $sform->addElement($days); // START irmtfan remove hardcode db access include_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/footer.php'); // to include js files @@ -202,7 +202,7 @@ do { $checkbox->addOption($myrow['forum_id'], $myrow['forum_name']); $radiobox->addOption($myrow['forum_id'], $myrow['forum_name']); - } while ($myrow = $GLOBALS['xoopsDB']->fetchArray($result)); + } while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result); } else { echo "NO FORUMS"; } @@ -231,7 +231,7 @@ $sform->addElement($lock_confirmation); $hot_confirmation = new XoopsFormSelect(_AM_NEWBB_PRUNE_HOT, 'hot', null, 1, false); - $hot_confirmation->addOptionArray(array( + $hot_confirmation->addOptionArray([ '0' => 0, '5' => 5, '10' => 10, @@ -239,7 +239,7 @@ '20' => 20, '25' => 25, '30' => 30 - )); + ]); $sform->addElement($hot_confirmation); $sform->addElement(/*$radiobox*/ diff --git a/admin/admin_forum_reorder.php b/admin/admin_forum_reorder.php index 02a9a34e..7c6c06b6 100644 --- a/admin/admin_forum_reorder.php +++ b/admin/admin_forum_reorder.php @@ -53,10 +53,10 @@ redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_BOARDREORDER); } else { include_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/class/xoopsformloader.php'); - $orders = array(); - $cat_orders = array(); - $forum = array(); - $cat = array(); + $orders = []; + $cat_orders = []; + $forum = []; + $cat = []; xoops_cp_header(); echo '
'; @@ -77,7 +77,7 @@ $categoryHandler = xoops_getModuleHandler('category', 'newbb'); $criteriaCategory = new CriteriaCompo(new criteria('1', 1)); $criteriaCategory->setSort('cat_order'); - $categories = $categoryHandler->getAll($criteriaCategory, array('cat_id', 'cat_order', 'cat_title')); + $categories = $categoryHandler->getAll($criteriaCategory, ['cat_id', 'cat_order', 'cat_title']); $forums = $forumHandler->getTree(array_keys($categories), 0, 'all', '    '); foreach (array_keys($categories) as $c) { echo ''; diff --git a/admin/admin_groupmod.php b/admin/admin_groupmod.php index a185ef13..d2cc66d5 100644 --- a/admin/admin_groupmod.php +++ b/admin/admin_groupmod.php @@ -38,10 +38,10 @@ if (XoopsRequest::getString('submit', '', 'POST')) { $fgroups = XoopsRequest::getArray('group', '', 'POST');// !empty($_POST['group']) ? $_POST['group'] : ''; $fforum = XoopsRequest::getInt('forenid', 0, 'POST');// (int)($_POST['forenid']); - $fuser = array(); + $fuser = []; if ($fforum !== 0) { if ($fgroups !== '') { - $gg = array(); + $gg = []; foreach ($fgroups as $k) { $gg = $memberHandler->getUsersByGroup($k, false); foreach ($gg as $f) { @@ -72,7 +72,7 @@ $categoryHandler = xoops_getModuleHandler('category', 'newbb'); $criteriaCategory = new CriteriaCompo(new criteria('1', 1)); $criteriaCategory->setSort('cat_order'); -$categories = $categoryHandler->getAll($criteriaCategory, array('cat_id', 'cat_order', 'cat_title')); +$categories = $categoryHandler->getAll($criteriaCategory, ['cat_id', 'cat_order', 'cat_title']); $forums = $forumHandler->getTree(array_keys($categories), 0, 'all', '    '); echo ' <{$poll.question}> - <{foreachq item=option from=$poll.options}> + <{foreach item=option from=$poll.options}> <{*-- irmtfan hardcode removed align="left" --*}> <{$option.input}> diff --git a/templates/newbb_rss.tpl b/templates/newbb_rss.tpl index f563f75d..966db046 100644 --- a/templates/newbb_rss.tpl +++ b/templates/newbb_rss.tpl @@ -20,7 +20,7 @@ <{$rss.image_height}> <{/if}> - <{foreachq item=item from=$rss.items}> + <{foreach item=item from=$rss.items}> <{$item.title}> <{$item.link}> diff --git a/templates/newbb_thread.tpl b/templates/newbb_thread.tpl index 19719a65..5c412fd1 100644 --- a/templates/newbb_thread.tpl +++ b/templates/newbb_thread.tpl @@ -72,7 +72,7 @@ <{/if}> <{if $topic_post.poster.groups}>
<{$smarty.const._MD_GROUP}> - <{foreachq item=group from=$topic_post.poster.groups}>
<{$group}><{/foreach}> + <{foreach item=group from=$topic_post.poster.groups}>
<{$group}><{/foreach}>
<{/if}>
@@ -158,7 +158,7 @@ <{if $topic_post.thread_action}> - <{foreachq item=btn from=$topic_post.thread_action}> + <{foreach item=btn from=$topic_post.thread_action}> <{else}> <{if $topic_post.thread_buttons}> - <{foreachq item=btn from=$topic_post.thread_buttons}> + <{foreach item=btn from=$topic_post.thread_buttons}> <{$btn.image}> diff --git a/templates/newbb_viewall.tpl b/templates/newbb_viewall.tpl index 66faa04a..f72b3480 100644 --- a/templates/newbb_viewall.tpl +++ b/templates/newbb_viewall.tpl @@ -194,7 +194,7 @@ - <{foreachq name=loop item=topic from=$topics}> + <{foreach name=loop item=topic from=$topics}> "> diff --git a/templates/newbb_viewforum.tpl b/templates/newbb_viewforum.tpl index 6c67e3cc..3e13f5c1 100644 --- a/templates/newbb_viewforum.tpl +++ b/templates/newbb_viewforum.tpl @@ -7,7 +7,7 @@ » <{$category.title}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> » <{$forum.forum_name}> <{/foreach}> @@ -145,7 +145,7 @@ - <{foreachq name=loop item=topic from=$topics}> + <{foreach name=loop item=topic from=$topics}> <{if $topic.stick AND $smarty.foreach.loop.iteration == $sticky+1}> @@ -293,7 +293,7 @@
- <{foreachq item=perm from=$permission_table}> + <{foreach item=perm from=$permission_table}>
<{$perm}>
<{/foreach}>
diff --git a/templates/newbb_viewforum_menu.tpl b/templates/newbb_viewforum_menu.tpl index ce90709d..939e2548 100644 --- a/templates/newbb_viewforum_menu.tpl +++ b/templates/newbb_viewforum_menu.tpl @@ -21,7 +21,7 @@ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" > - <{foreachq item=opt from=$typeOptions}> + <{foreach item=opt from=$typeOptions}> <{/foreach}> diff --git a/templates/newbb_viewforum_subforum.tpl b/templates/newbb_viewforum_subforum.tpl index 3b5bcd78..39202750 100644 --- a/templates/newbb_viewforum_subforum.tpl +++ b/templates/newbb_viewforum_subforum.tpl @@ -7,7 +7,7 @@ <{$smarty.const._MD_LASTPOST}> - <{foreachq item=sforum from=$subforum}> + <{foreach item=sforum from=$subforum}> <{$sforum.forum_folder}> diff --git a/templates/newbb_viewpost.tpl b/templates/newbb_viewpost.tpl index b7b6c84b..26df4abc 100644 --- a/templates/newbb_viewpost.tpl +++ b/templates/newbb_viewpost.tpl @@ -84,7 +84,7 @@ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}" > - <{foreachq item=act from=$viewmode_options}> + <{foreach item=act from=$viewmode_options}> <{/foreach}> @@ -99,7 +99,7 @@

-<{foreachq item=post from=$posts}> +<{foreach item=post from=$posts}> <{includeq file="db:newbb_thread.tpl" topic_post=$post}>
diff --git a/templates/newbb_viewtopic.tpl b/templates/newbb_viewtopic.tpl index e2a6413d..32b6d990 100644 --- a/templates/newbb_viewtopic.tpl +++ b/templates/newbb_viewtopic.tpl @@ -7,7 +7,7 @@ » <{$category.title}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> » <{$forum.forum_name}> <{/foreach}> @@ -31,7 +31,7 @@ <{if $online}>
<{$smarty.const._MD_BROWSING}>  - <{foreachq item=user from=$online.users}> + <{foreach item=user from=$online.users}> <{if $user.level eq 2}> <{$user.uname}> @@ -124,14 +124,14 @@ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"> <{if $viewer_level gt 1}> - <{foreachq item=act from=$admin_actions}> + <{foreach item=act from=$admin_actions}> <{/foreach}> <{/if}> <{if count($adminpoll_actions) > 0 }> - <{foreachq item=actpoll from=$adminpoll_actions}> + <{foreach item=actpoll from=$adminpoll_actions}> <{/foreach}> <{/if}> @@ -154,7 +154,7 @@ name="viewmode" id="viewmode" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"> - <{foreachq item=act from=$viewmode_options}> + <{foreach item=act from=$viewmode_options}> <{/foreach}> @@ -194,7 +194,7 @@ -<{foreachq item=topic_post from=$topic_posts}> +<{foreach item=topic_post from=$topic_posts}> <{includeq file="db:newbb_thread.tpl" topic_post=$topic_post mode=$mode}>

@@ -213,7 +213,7 @@ » <{$category.title}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> » <{$forum.forum_name}> <{/foreach}> @@ -272,7 +272,7 @@
- <{foreachq item=perm from=$permission_table}> + <{foreach item=perm from=$permission_table}>
<{$perm}>
<{/foreach}>
diff --git a/templates_fulldiv_opacity/blocks/newbb_block.tpl b/templates_fulldiv_opacity/blocks/newbb_block.tpl index 8295740d..ce48ab2f 100644 --- a/templates_fulldiv_opacity/blocks/newbb_block.tpl +++ b/templates_fulldiv_opacity/blocks/newbb_block.tpl @@ -8,7 +8,7 @@
<{$smarty.const._MB_NEWBB_LPOST}>
- <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
<{$topic.forum_name}>
@@ -27,7 +27,7 @@
<{$smarty.const._MB_NEWBB_LPOST}>
- <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
<{$topic.title}>
@@ -37,7 +37,7 @@
<{/foreach}> <{elseif $block.disp_mode == 2}> - <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
diff --git a/templates_fulldiv_opacity/blocks/newbb_block_author.tpl b/templates_fulldiv_opacity/blocks/newbb_block_author.tpl index 9708e962..90edb2a5 100644 --- a/templates_fulldiv_opacity/blocks/newbb_block_author.tpl +++ b/templates_fulldiv_opacity/blocks/newbb_block_author.tpl @@ -5,7 +5,7 @@
<{$smarty.const._MB_NEWBB_COUNT}>
- <{foreachq item=author key=uid from=$block.authors}> + <{foreach item=author key=uid from=$block.authors}>
">
<{$author.name}>
<{$author.count}>
@@ -13,7 +13,7 @@
<{/foreach}> <{elseif $block.disp_mode == 1}> - <{foreachq item=author key=uid from=$block.authors}> + <{foreach item=author key=uid from=$block.authors}>
">
<{$author.name}> <{$author.count}>
diff --git a/templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl b/templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl index 9e22eb80..4d7cf44e 100644 --- a/templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl +++ b/templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl @@ -40,7 +40,7 @@
- <{foreachq name=loop item=topic from=$block.topics}> + <{foreach name=loop item=topic from=$block.topics}>
border">
<{if $block.headers.approve}> diff --git a/templates_fulldiv_opacity/blocks/newbb_block_post.tpl b/templates_fulldiv_opacity/blocks/newbb_block_post.tpl index cb602c40..aa07a749 100644 --- a/templates_fulldiv_opacity/blocks/newbb_block_post.tpl +++ b/templates_fulldiv_opacity/blocks/newbb_block_post.tpl @@ -6,7 +6,7 @@
<{$smarty.const._MB_NEWBB_AUTHOR}>
- <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
<{$topic.forum_name}>
@@ -21,7 +21,7 @@
<{$smarty.const._MB_NEWBB_AUTHOR}>
- <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
<{$topic.title}>
<{$topic.time}>
<{$topic.topic_poster}>
@@ -29,7 +29,7 @@
<{/foreach}> <{elseif $block.disp_mode == 2}> - <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
@@ -37,7 +37,7 @@ <{/foreach}> <{else}>
- <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
<{$topic.forum_name}> | diff --git a/templates_fulldiv_opacity/blocks/newbb_block_text.tpl b/templates_fulldiv_opacity/blocks/newbb_block_text.tpl index 897b7445..245304d2 100644 --- a/templates_fulldiv_opacity/blocks/newbb_block_text.tpl +++ b/templates_fulldiv_opacity/blocks/newbb_block_text.tpl @@ -1,4 +1,4 @@ -<{foreachq item=topic from=$block.topics}> +<{foreach item=topic from=$block.topics}>
<{$topic.title}> diff --git a/templates_fulldiv_opacity/blocks/newbb_block_topic.tpl b/templates_fulldiv_opacity/blocks/newbb_block_topic.tpl index 4d7e18cc..8e32c3db 100644 --- a/templates_fulldiv_opacity/blocks/newbb_block_topic.tpl +++ b/templates_fulldiv_opacity/blocks/newbb_block_topic.tpl @@ -8,7 +8,7 @@
<{$smarty.const._MB_NEWBB_AUTHOR}>
- <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
<{$topic.forum_name}>
@@ -25,7 +25,7 @@
<{$smarty.const._MB_NEWBB_AUTHOR}>
- <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
<{$topic.title}>
@@ -34,7 +34,7 @@
<{/foreach}> <{elseif $block.disp_mode == 2}> - <{foreachq item=topic from=$block.topics}> + <{foreach item=topic from=$block.topics}>
">
diff --git a/templates_fulldiv_opacity/newbb_edit_post.tpl b/templates_fulldiv_opacity/newbb_edit_post.tpl index aa9778db..b03267f8 100644 --- a/templates_fulldiv_opacity/newbb_edit_post.tpl +++ b/templates_fulldiv_opacity/newbb_edit_post.tpl @@ -6,7 +6,7 @@ » <{$category.title}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> »   <{$forum.forum_name}> @@ -47,7 +47,7 @@
>
- <{foreachq item=element from=$form_post.elements}> + <{foreach item=element from=$form_post.elements}> <{if $element.hidden != true}>
<{/foreach}>
- <{foreachq item=element from=$form_post.elements}> + <{foreach item=element from=$form_post.elements}> <{if $element.hidden == true}> <{$element.body}>
@@ -74,7 +74,7 @@ <{if $posts_context}>
- <{foreachq item=post from=$posts_context}> + <{foreach item=post from=$posts_context}>
<{$post.subject}>
"><{$post.meta}>

<{$post.content}> diff --git a/templates_fulldiv_opacity/newbb_index.tpl b/templates_fulldiv_opacity/newbb_index.tpl index f37dd9bb..e6ddc2c6 100644 --- a/templates_fulldiv_opacity/newbb_index.tpl +++ b/templates_fulldiv_opacity/newbb_index.tpl @@ -53,7 +53,7 @@
- <{foreachq item=category from=$categories}> + <{foreach item=category from=$categories}>
@@ -85,7 +85,7 @@
<{$smarty.const._MD_LASTPOST}>
- <{foreachq item=forum from=$category.forums}> + <{foreach item=forum from=$category.forums}>
<{$forum.forum_folder}>
@@ -108,7 +108,7 @@
<{if $forum.subforum && $subforum_display == "collapse"}>
<{$smarty.const._MD_SUBFORUMS}> <{$img_subforum}>  - <{foreachq item=subforum from=$forum.subforum}> + <{foreach item=subforum from=$forum.subforum}>  [<{$subforum.forum_name}>] <{/foreach}> @@ -156,7 +156,7 @@
 
 
- <{foreachq item=subforum from=$forum.subforum}> + <{foreach item=subforum from=$forum.subforum}>
 
diff --git a/templates_fulldiv_opacity/newbb_online.tpl b/templates_fulldiv_opacity/newbb_online.tpl index 2c9d77f2..50c23926 100644 --- a/templates_fulldiv_opacity/newbb_online.tpl +++ b/templates_fulldiv_opacity/newbb_online.tpl @@ -10,7 +10,7 @@ <{if $online.num_user}>
<{$online.num_user}> <{$smarty.const._MD_REGISTERED_USERS}> - <{foreachq item=user from=$online.users}> + <{foreach item=user from=$online.users}> <{if $user.level eq 2}> <{$user.uname}> diff --git a/templates_fulldiv_opacity/newbb_poll_results.tpl b/templates_fulldiv_opacity/newbb_poll_results.tpl index f06e6fd3..c602c1b1 100644 --- a/templates_fulldiv_opacity/newbb_poll_results.tpl +++ b/templates_fulldiv_opacity/newbb_poll_results.tpl @@ -10,7 +10,7 @@
- <{foreachq item=option from=$poll.options}> + <{foreach item=option from=$poll.options}>
<{$option.text}>
<{$option.image}> <{$option.percent}>
diff --git a/templates_fulldiv_opacity/newbb_poll_view.tpl b/templates_fulldiv_opacity/newbb_poll_view.tpl index abab2d97..7274ab4c 100644 --- a/templates_fulldiv_opacity/newbb_poll_view.tpl +++ b/templates_fulldiv_opacity/newbb_poll_view.tpl @@ -10,7 +10,7 @@ <{$poll.question}>
- <{foreachq item=option from=$poll.options}> + <{foreach item=option from=$poll.options}>
<{$option.input}>
<{$option.text}>
diff --git a/templates_fulldiv_opacity/newbb_rss.tpl b/templates_fulldiv_opacity/newbb_rss.tpl index 2765b995..48525cbf 100644 --- a/templates_fulldiv_opacity/newbb_rss.tpl +++ b/templates_fulldiv_opacity/newbb_rss.tpl @@ -20,7 +20,7 @@ <{$rss.image_height}> <{/if}> - <{foreachq item=item from=$rss.items}> + <{foreach item=item from=$rss.items}> <{$item.title}> <{$item.link}> diff --git a/templates_fulldiv_opacity/newbb_thread.tpl b/templates_fulldiv_opacity/newbb_thread.tpl index ad799ebd..488db4c9 100644 --- a/templates_fulldiv_opacity/newbb_thread.tpl +++ b/templates_fulldiv_opacity/newbb_thread.tpl @@ -54,7 +54,7 @@ <{if $topic_post.poster.groups}>
<{$smarty.const._MD_GROUP}> - <{foreachq item=group from=$topic_post.poster.groups}>
<{$group}><{/foreach}> + <{foreach item=group from=$topic_post.poster.groups}>
<{$group}><{/foreach}>
<{/if}>
@@ -125,7 +125,7 @@
<{if $topic_post.thread_action}> - <{foreachq item=btn from=$topic_post.thread_action}> + <{foreach item=btn from=$topic_post.thread_action}> target="<{$btn.target}>"<{/if}>> <{$btn.image}> <{/foreach}> @@ -149,7 +149,7 @@ value="<{$topic_post.post_id}>"/> <{else}> <{if $topic_post.thread_buttons}> - <{foreachq item=btn from=$topic_post.thread_buttons}> + <{foreach item=btn from=$topic_post.thread_buttons}> <{$btn.image}> <{/foreach}> diff --git a/templates_fulldiv_opacity/newbb_viewall.tpl b/templates_fulldiv_opacity/newbb_viewall.tpl index 5005c0e8..c6c20e42 100644 --- a/templates_fulldiv_opacity/newbb_viewall.tpl +++ b/templates_fulldiv_opacity/newbb_viewall.tpl @@ -172,7 +172,7 @@
- <{foreachq name=loop item=topic from=$topics}> + <{foreach name=loop item=topic from=$topics}>
">
<{$topic.topic_folder}><{$topic.lock}>
diff --git a/templates_fulldiv_opacity/newbb_viewforum.tpl b/templates_fulldiv_opacity/newbb_viewforum.tpl index 01ab2b9e..6e201d68 100644 --- a/templates_fulldiv_opacity/newbb_viewforum.tpl +++ b/templates_fulldiv_opacity/newbb_viewforum.tpl @@ -6,7 +6,7 @@ » <{$category.title}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> » <{$forum.forum_name}> <{/foreach}> @@ -140,7 +140,7 @@
- <{foreachq name=loop item=topic from=$topics}> + <{foreach name=loop item=topic from=$topics}> <{if $topic.stick AND $smarty.foreach.loop.iteration == $sticky+1}>
 
@@ -254,7 +254,7 @@
- <{foreachq item=perm from=$permission_table}> + <{foreach item=perm from=$permission_table}>
<{$perm}>
<{/foreach}>
diff --git a/templates_fulldiv_opacity/newbb_viewforum_menu.tpl b/templates_fulldiv_opacity/newbb_viewforum_menu.tpl index ce90709d..939e2548 100644 --- a/templates_fulldiv_opacity/newbb_viewforum_menu.tpl +++ b/templates_fulldiv_opacity/newbb_viewforum_menu.tpl @@ -21,7 +21,7 @@ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" > - <{foreachq item=opt from=$typeOptions}> + <{foreach item=opt from=$typeOptions}> <{/foreach}> diff --git a/templates_fulldiv_opacity/newbb_viewforum_subforum.tpl b/templates_fulldiv_opacity/newbb_viewforum_subforum.tpl index 24b0abfd..ac13f169 100644 --- a/templates_fulldiv_opacity/newbb_viewforum_subforum.tpl +++ b/templates_fulldiv_opacity/newbb_viewforum_subforum.tpl @@ -7,7 +7,7 @@
<{$smarty.const._MD_LASTPOST}>
- <{foreachq item=sforum from=$subforum}> + <{foreach item=sforum from=$subforum}>
<{$sforum.forum_folder}>
diff --git a/templates_fulldiv_opacity/newbb_viewpost.tpl b/templates_fulldiv_opacity/newbb_viewpost.tpl index 55875b53..8ac800dd 100644 --- a/templates_fulldiv_opacity/newbb_viewpost.tpl +++ b/templates_fulldiv_opacity/newbb_viewpost.tpl @@ -8,7 +8,7 @@ <{$category.title}> <{/if}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> » <{$forum.forum_name}> <{/foreach}> @@ -78,7 +78,7 @@ @@ -90,7 +90,7 @@


-<{foreachq item=post from=$posts}> +<{foreach item=post from=$posts}> <{includeq file="db:newbb_thread.tpl" topic_post=$post}>
<{$smarty.const._MD_VIEWTOPIC}> diff --git a/templates_fulldiv_opacity/newbb_viewtopic.tpl b/templates_fulldiv_opacity/newbb_viewtopic.tpl index 8a60882c..14ba00b2 100644 --- a/templates_fulldiv_opacity/newbb_viewtopic.tpl +++ b/templates_fulldiv_opacity/newbb_viewtopic.tpl @@ -6,7 +6,7 @@ » <{$category.title}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> » <{$forum.forum_name}> <{/foreach}> @@ -28,7 +28,7 @@ <{if $online}>
<{$smarty.const._MD_BROWSING}>  - <{foreachq item=user from=$online.users}> + <{foreach item=user from=$online.users}> <{if $user.level eq 2}> <{$user.uname}> @@ -112,13 +112,13 @@ - <{foreachq item=act from=$viewmode_options}> + <{foreach item=act from=$viewmode_options}> <{/foreach}> @@ -172,7 +172,7 @@
<{$smarty.const._MD_TOPICLOCK}>

<{/if}> -<{foreachq item=topic_post from=$topic_posts}> +<{foreach item=topic_post from=$topic_posts}> <{includeq file="db:newbb_thread.tpl" topic_post=$topic_post mode=$mode}>

@@ -190,7 +190,7 @@ » <{$category.title}> <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> + <{foreach item=forum from=$parentforum}> » <{$forum.forum_name}> <{/foreach}> @@ -243,7 +243,7 @@
- <{foreachq item=perm from=$permission_table}> + <{foreach item=perm from=$permission_table}>
<{$perm}>
<{/foreach}>
diff --git a/topicmanager.php b/topicmanager.php index 42ccc30c..c3127e49 100644 --- a/topicmanager.php +++ b/topicmanager.php @@ -31,17 +31,17 @@ include_once __DIR__ . '/header.php'; if (XoopsRequest::getString('submit', '', 'POST')) { - foreach (array('forum', 'newforum', 'newtopic') as $getint) { + foreach (['forum', 'newforum', 'newtopic'] as $getint) { ${$getint} = XoopsRequest::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]); } - foreach (array('topic_id') as $getint) { + foreach (['topic_id'] as $getint) { ${$getint} = XoopsRequest::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]); } if (!is_array($topic_id)) { - $topic_id = array($topic_id); + $topic_id = [$topic_id]; } } else { - foreach (array('forum', 'topic_id') as $getint) { + foreach (['forum', 'topic_id'] as $getint) { ${$getint} = XoopsRequest::getInt($getint, 0, 'GET');// (int)(@$_GET[$getint]); } } @@ -71,7 +71,7 @@ $onlineHandler->init($forum); } // irmtfan add restore to viewtopic -$action_array = array( +$action_array = [ 'merge', 'delete', 'restore', @@ -82,15 +82,15 @@ 'unsticky', 'digest', 'undigest' -); +]; foreach ($action_array as $_action) { - $action[$_action] = array( + $action[$_action] = [ 'name' => $_action, 'desc' => constant(strtoupper("_MD_DESC_{$_action}")), 'submit' => constant(strtoupper("_MD_{$_action}")), 'sql' => "topic_{$_action}=1", 'msg' => constant(strtoupper("_MD_TOPIC{$_action}")) - ); + ]; } $action['lock']['sql'] = 'topic_status = 1'; $action['unlock']['sql'] = 'topic_status = 0'; @@ -130,7 +130,7 @@ . '

'; } elseif ('restore' === $mode) { //$topicHandler = xoops_getModuleHandler('topic', 'newbb'); - $forums = array(); + $forums = []; $topics_obj = $topicHandler->getAll(new Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN')); foreach (array_keys($topics_obj) as $id) { $topic_obj =& $topics_obj[$id]; diff --git a/update_type.php b/update_type.php index ac262fca..0b024ac8 100644 --- a/update_type.php +++ b/update_type.php @@ -58,7 +58,7 @@ $typeHandler = xoops_getModuleHandler('type', 'newbb'); $subjectpres = array_filter(array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['subject_prefix']))); -$types = array(); +$types = []; $order = 1; foreach ($subjectpres as $subjectpre) { if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) { @@ -84,7 +84,7 @@ $forumHandler = xoops_getModuleHandler('forum', 'newbb'); if ($forums_type = $forumHandler->getIds(new Criteria('allow_subject_prefix', 1))) { foreach ($forums_type as $forum_id) { - $type_query = array(); + $type_query = []; foreach ($types as $key => $order) { $type_query[] = "({$key}, {$forum_id}, {$order})"; } diff --git a/viewforum.php b/viewforum.php index 8a5c1def..abc7d80e 100644 --- a/viewforum.php +++ b/viewforum.php @@ -19,8 +19,8 @@ /* * Build the page query */ -$query_vars = array('forum', 'type', 'status', 'sort', 'order', 'start', 'since'); -$query_array = array(); +$query_vars = ['forum', 'type', 'status', 'sort', 'order', 'start', 'since']; +$query_array = []; foreach ($query_vars as $var) { if (XoopsRequest::getString($var, '', 'GET')) { $query_array[$var] = "{$var}=" . XoopsRequest::getString($var, '', 'GET'); @@ -44,23 +44,23 @@ $forum_id = XoopsRequest::getInt('forum', 0, 'GET'); $type = XoopsRequest::getInt('type', 0, 'GET'); $status = (XoopsRequest::getString('status', '', 'GET') - && in_array(XoopsRequest::getString('status', '', 'GET'), array( + && in_array(XoopsRequest::getString('status', '', 'GET'), [ 'active', 'pending', 'deleted', 'digest', 'unreplied', 'unread' - ), true)) ? XoopsRequest::getString('status', '', + ], true)) ? XoopsRequest::getString('status', '', 'GET') : ''; // (!empty($_GET['status']) && in_array($_GET['status'], array("active", "pending", "deleted", "digest", "unreplied", "unread"))) ? $_GET['status'] : ''; // irmtfan add mode $mode = (XoopsRequest::getString('status', '', 'GET') - && in_array(XoopsRequest::getString('status', '', 'GET'), array( + && in_array(XoopsRequest::getString('status', '', 'GET'), [ 'active', 'pending', 'deleted' - ), true)) ? 2 : XoopsRequest::getInt('mode', 0, 'GET'); // (!empty($status) && in_array($status, array("active", "pending", "deleted"))) ? 2 : (!empty($_GET['mode']) ? (int)($_GET['mode']) : 0); + ], true)) ? 2 : XoopsRequest::getInt('mode', 0, 'GET'); // (!empty($status) && in_array($status, array("active", "pending", "deleted"))) ? 2 : (!empty($_GET['mode']) ? (int)($_GET['mode']) : 0); $forumHandler = xoops_getModuleHandler('forum', 'newbb'); $forum_obj = $forumHandler->get($forum_id); @@ -108,7 +108,7 @@ $xoopsTpl->assign('viewer_level', $isadmin ? 2 : is_object($GLOBALS['xoopsUser'])); /* Only admin has access to admin mode */ if (!$isadmin) { - $status = (!empty($status) && in_array($status, array('active', 'pending', 'deleted'), true)) ? '' : $status; + $status = (!empty($status) && in_array($status, ['active', 'pending', 'deleted'], true)) ? '' : $status; // irmtfan add mode $mode = 0; } @@ -116,7 +116,7 @@ $xoopsTpl->assign('mode', $mode); $xoopsTpl->assign('status', $status); if ($isadmin) { - $xoopsTpl->assign('forum_index_cpanel', array('link' => 'admin/index.php', 'name' => _MD_ADMINCP)); + $xoopsTpl->assign('forum_index_cpanel', ['link' => 'admin/index.php', 'name' => _MD_ADMINCP]); } if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) { @@ -158,15 +158,15 @@ } $categoryHandler = xoops_getModuleHandler('category'); -$category_obj = $categoryHandler->get($forum_obj->getVar('cat_id'), array('cat_title')); -$xoopsTpl->assign('category', array('id' => $forum_obj->getVar('cat_id'), 'title' => $category_obj->getVar('cat_title'))); +$category_obj = $categoryHandler->get($forum_obj->getVar('cat_id'), ['cat_title']); +$xoopsTpl->assign('category', ['id' => $forum_obj->getVar('cat_id'), 'title' => $category_obj->getVar('cat_title')]); $xoopsTpl->assign('forum_index_title', sprintf(_MD_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES))); $xoopsTpl->assign('forum_name', $forum_obj->getVar('forum_name')); $xoopsTpl->assign('forum_moderators', $forum_obj->dispForumModerators()); // irmtfan - add and edit: u.uname => t.topic_poster | t.topic_time => t.topic_id | "t.rating"=>_MD_RATINGS, | p.post_time => t.topic_last_post_id -$sel_sort_array = array( +$sel_sort_array = [ 't.topic_title' => _MD_TOPICTITLE, 't.topic_poster' => _MD_TOPICPOSTER, 't.topic_id' => _MD_TOPICTIME, @@ -174,7 +174,7 @@ 't.topic_views' => _MD_VIEWS, 't.rating' => _MD_RATINGS, 't.topic_last_post_id' => _MD_LASTPOSTTIME -); +]; if (!XoopsRequest::getString('sort', '', 'GET') || !array_key_exists(XoopsRequest::getString('sort', '', 'GET'), $sel_sort_array) ) { @@ -232,7 +232,7 @@ $startdate = empty($since) ? 0 : (time() - newbb_getSinceTime($since)); $start = XoopsRequest::getInt('start', 0, 'GET'); -$criteria_vars = array('startdate', 'start', 'sort', 'order', 'type', 'status', 'excerpt'); +$criteria_vars = ['startdate', 'start', 'sort', 'order', 'type', 'status', 'excerpt']; foreach ($criteria_vars as $var) { $criteria_topic[$var] = @${$var}; } @@ -265,14 +265,14 @@ unset($query_type); $typeHandler = xoops_getModuleHandler('type', 'newbb'); $typeOptions = null; -$types = array(); +$types = []; if ($types = $typeHandler->getByForum($forum_id)) { - $typeOptions[] = array('title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"); + $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"]; foreach ($types as $key => $item) { - $typeOptions[] = array( + $typeOptions[] = [ 'title' => $item['type_name'], 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}&type={$key}" - ); + ]; } } if ($type > 0) { diff --git a/viewpost.php b/viewpost.php index 16cdbc6f..f9641e3b 100644 --- a/viewpost.php +++ b/viewpost.php @@ -37,9 +37,9 @@ $uid = XoopsRequest::getInt('uid', 0, 'GET'); $status = (XoopsRequest::getString('status', '', 'GET') - && in_array(XoopsRequest::getString('status', '', 'GET'), array('active', 'pending', 'deleted', 'new', 'all', 'digest'), true)) ? XoopsRequest::getString('status', '', 'GET') : ''; + && in_array(XoopsRequest::getString('status', '', 'GET'), ['active', 'pending', 'deleted', 'new', 'all', 'digest'], true)) ? XoopsRequest::getString('status', '', 'GET') : ''; $mode = XoopsRequest::getInt('mode', 0, 'GET'); -$mode = (!empty($status) && in_array($status, array('active', 'pending', 'deleted'), true)) ? 2 : $mode; +$mode = (!empty($status) && in_array($status, ['active', 'pending', 'deleted'], true)) ? 2 : $mode; $forumHandler = xoops_getModuleHandler('forum', 'newbb'); $postHandler = xoops_getModuleHandler('post', 'newbb'); @@ -51,13 +51,13 @@ } else { $forum_obj = $forumHandler->get($forum_id); $forums[$forum_id] = $forum_obj; - $accessForums = array($forum_id); + $accessForums = [$forum_id]; $isadmin = newbb_isAdmin($forum_obj); } /* Only admin has access to admin mode */ if (!$isadmin && $mode === 2) { - $status = in_array($status, array('active', 'pending', 'deleted'), true) ? '' : $status; + $status = in_array($status, ['active', 'pending', 'deleted'], true) ? '' : $status; $mode = 0; } if ($mode) { @@ -115,7 +115,7 @@ $criteria_count->add(new Criteria('post_time', (int)$last_visit, '>')); // irmtfan add new criteria $criteria_post->add(new Criteria('p.post_time', (int)$last_visit, '>')); // irmtfan add new criteria // START irmtfan fix read_mode = 1 bugs - for all users (member and anon) - $topics = array(); + $topics = []; $topic_lastread = newbb_getcookie('LT', true); if (count($topic_lastread) > 0) { foreach ($topic_lastread as $id => $time) { @@ -144,7 +144,7 @@ $karmaHandler = xoops_getModuleHandler('karma', 'newbb'); $user_karma = $karmaHandler->getUserKarma(); -$valid_modes = array('flat', 'compact'); +$valid_modes = ['flat', 'compact']; $viewmode_cookie = newbb_getcookie('V'); if ('compact' === XoopsRequest::getString('viewmode', '', 'GET')) { @@ -157,7 +157,7 @@ $postCount = $postHandler->getPostCount($criteria_count, $join);// irmtfan add join for read_mode = 2 $posts = $postHandler->getPostsByLimit($criteria_post, $post_perpage, $start, $join);// irmtfan add join for read_mode = 2 -$poster_array = array(); +$poster_array = []; if (count($posts) > 0) { foreach (array_keys($posts) as $id) { $poster_array[$posts[$id]->getVar('uid')] = 1; @@ -183,11 +183,11 @@ redirect_header(XOOPS_URL . '/index.php', 2, _MD_NORIGHTTOACCESS); } if ($forum_obj->getVar('parent_forum')) { - $parent_forum_obj = $forumHandler->get($forum_obj->getVar('parent_forum'), array('forum_name')); - $parentforum = array( + $parent_forum_obj = $forumHandler->get($forum_obj->getVar('parent_forum'), ['forum_name']); + $parentforum = [ 'id' => $forum_obj->getVar('parent_forum'), 'name' => $parent_forum_obj->getVar('forum_name') - ); + ]; unset($parent_forum_obj); $xoopsTpl->assign_by_ref('parentforum', $parentforum); } @@ -223,7 +223,7 @@ $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle); // irmtfan - remove icon_path and use newbbDisplayImage $xoopsTpl->assign('anonym_avatar', newbbDisplayImage('anonym')); -$userid_array = array(); +$userid_array = []; if (count($poster_array) > 0) { $memberHandler = xoops_getHandler('member'); $userid_array = array_keys($poster_array); @@ -234,7 +234,7 @@ $users = null; } -$online = array(); +$online = []; if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) { if (!empty($user_criteria)) { @@ -243,7 +243,7 @@ } } -$viewtopic_users = array(); +$viewtopic_users = []; if (count($userid_array) > 0) { require $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/user.php'); @@ -255,7 +255,7 @@ $pn = 0; $topicHandler = xoops_getModuleHandler('topic', 'newbb'); -static $suspension = array(); +static $suspension = []; foreach (array_keys($posts) as $id) { ++$pn; @@ -267,11 +267,11 @@ } else { $post_image = ''; } - $poster = array( + $poster = [ 'uid' => 0, 'name' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']), 'link' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']) - ); + ]; if ($post->getVar('uid') > 0 && isset($viewtopic_users[$post->getVar('uid')])) { $poster = $viewtopic_users[$post->getVar('uid')]; } @@ -289,7 +289,7 @@ $post_attachment = $post->displayAttachment(); } - $thread_buttons = array(); + $thread_buttons = []; if ($GLOBALS['xoopsModuleConfig']['enable_permcheck']) { if (!isset($suspension[$post->getVar('forum_id')])) { @@ -376,9 +376,9 @@ . $post->getVar('topic_id'); $thread_buttons['report']['name'] = _MD_REPORT; } - $thread_action = array(); + $thread_action = []; - $xoopsTpl->append('posts', array( + $xoopsTpl->append('posts', [ 'post_id' => $post->getVar('post_id'), 'topic_id' => $post->getVar('topic_id'), 'forum_id' => $post->getVar('forum_id'), @@ -395,7 +395,7 @@ 'thread_action' => $thread_action, 'thread_buttons' => $thread_buttons, 'poster' => $poster - )); + ]); unset($thread_buttons, $poster); } @@ -467,17 +467,17 @@ $xoopsTpl->assign('unreplied_link', $unreplied_link); $xoopsTpl->assign('unread_link', $unread_link); -$viewmode_options = array(); +$viewmode_options = []; if ($order === 'DESC') { - $viewmode_options[] = array( + $viewmode_options[] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&order=ASC&forum=' . $forum_id, 'title' => _OLDESTFIRST - ); + ]; } else { - $viewmode_options[] = array( + $viewmode_options[] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&order=DESC&forum=' . $forum_id, 'title' => _NEWESTFIRST - ); + ]; } //$xoopsTpl->assign('viewmode_compact', ($viewmode=="compact")?1:0); diff --git a/viewtopic.php b/viewtopic.php index b1adff7a..32ea6ac7 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -36,8 +36,8 @@ xoops_loadLanguage('user'); // irmtfan add last_login /*Build the page query*/ -$query_vars = array('post_id', 'topic_id', 'status', 'order', 'start', 'move', 'mode'); -$query_array = array(); +$query_vars = ['post_id', 'topic_id', 'status', 'order', 'start', 'move', 'mode']; +$query_array = []; foreach ($query_vars as $var) { if (XoopsRequest::getString($var, '', 'GET')) { $query_array[$var] = "{$var}=" . XoopsRequest::getString($var, '', 'GET'); @@ -48,16 +48,16 @@ $forum_id = XoopsRequest::getInt('forum', 0, 'GET'); $read = (XoopsRequest::getString('read', '', 'GET') - && in_array(XoopsRequest::getString('read', '', 'GET'), array('new'), true)) ? XoopsRequest::getString('read', '', 'GET') : ''; + && in_array(XoopsRequest::getString('read', '', 'GET'), ['new'], true)) ? XoopsRequest::getString('read', '', 'GET') : ''; $topic_id = XoopsRequest::getInt('topic_id', 0, 'GET'); // isset($_GET['topic_id']) ? (int)($_GET['topic_id']) : 0; $post_id = XoopsRequest::getInt('post_id', 0, 'GET'); // !empty($_GET['post_id']) ? (int)($_GET['post_id']) : 0; $move = strtolower(XoopsRequest::getString('move', '', 'GET')); // isset($_GET['move']) ? strtolower($_GET['move']) : ''; $start = XoopsRequest::getInt('start', 0, 'GET'); // !empty($_GET['start']) ? (int)($_GET['start']) : 0; $status = (XoopsRequest::getString('status', '', 'GET') - && in_array(XoopsRequest::getString('status', '', 'GET'), array('active', 'pending', 'deleted'), true)) ? XoopsRequest::getString('status', '', 'GET') : ''; + && in_array(XoopsRequest::getString('status', '', 'GET'), ['active', 'pending', 'deleted'], true)) ? XoopsRequest::getString('status', '', 'GET') : ''; $mode = XoopsRequest::getInt('mode', (!empty($status) ? 2 : 0), 'GET'); // !empty($_GET['mode']) ? (int)($_GET['mode']) : (!empty($status) ? 2 : 0); $order = (XoopsRequest::getString('order', '', 'GET') - && in_array(XoopsRequest::getString('order', '', 'GET'), array('ASC', 'DESC'), true)) ? XoopsRequest::getString('order', '', 'GET') : ''; + && in_array(XoopsRequest::getString('order', '', 'GET'), ['ASC', 'DESC'], true)) ? XoopsRequest::getString('order', '', 'GET') : ''; if ($order === '') { if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isActive()) { @@ -149,7 +149,7 @@ //$viewmode = "flat"; $total_posts = $topicHandler->getPostCount($topic_obj, $status); -$postsArray = array(); +$postsArray = []; $postsArray = $topicHandler->getAllPosts($topic_obj, $order, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, $post_id, $status); //irmtfan - increment topic_views only if the topic is unread @@ -192,7 +192,7 @@ $xoopsTpl->assign('anonym_avatar', newbbDisplayImage('anonym')); // START irmtfan improve infobox -$infobox = array(); +$infobox = []; $infobox['show'] = (int)$GLOBALS['xoopsModuleConfig']['show_infobox']; //4.05 // irmtfan removed then define after array //$xoopsTpl->assign('infobox', $infobox); //4.05 @@ -200,10 +200,10 @@ if ($infobox['show'] > 0) { // irmtfan - remove icon_path and use newbbDisplayImage - $infobox['icon'] = array( + $infobox['icon'] = [ 'expand' => $iconHandler->getImageSource('less'), 'collapse' => $iconHandler->getImageSource('more') - ); + ]; if ($infobox['show'] == 1) { $infobox['style'] = 'none'; //irmtfan move semicolon $infobox['alt'] = _MD_NEWBB_SEEUSERDATA; @@ -218,7 +218,7 @@ $xoopsTpl->assign('infobox', $infobox); // END irmtfan improve infobox -$xoopsTpl->assign(array( +$xoopsTpl->assign([ 'topic_title' => 'getVar('dirname', 'n') . '/reply.php?topic_id=' . $topic_id . '"> ' . $t_reply . ''); } -$poster_array = array(); +$poster_array = []; $require_reply = false; foreach ($postsArray as $eachpost) { if ($eachpost->getVar('uid') > 0) { @@ -276,19 +276,19 @@ } } -$userid_array = array(); -$online = array(); -if (count($poster_array) > 0) { +$userid_array = []; +$online = []; +if (is_array($poster_array) && count($poster_array) > 0) { $memberHandler = xoops_getHandler('member'); $userid_array = array_keys($poster_array); $user_criteria = '(' . implode(',', $userid_array) . ')'; $users = $memberHandler->getUsers(new Criteria('uid', $user_criteria, 'IN'), true); } else { - $users = array(); + $users = []; } -$viewtopic_users = array(); -if (count($userid_array) > 0) { +$viewtopic_users = []; +if (is_array($userid_array) && count($userid_array) > 0) { require $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/user.php'); $userHandler = new NewbbUserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']); $userHandler->users = $users; @@ -300,7 +300,7 @@ if ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $require_reply) { if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) { $viewtopic_posters = newbb_getsession('t' . $topic_id, true); - if (!is_array($viewtopic_posters) || count($viewtopic_posters) === 0) { + if (!(is_array($viewtopic_posters) && count($viewtopic_posters) > 1)) { $viewtopic_posters = $topicHandler->getAllPosters($topic_obj); newbb_setsession('t' . $topic_id, $viewtopic_posters); } @@ -308,11 +308,11 @@ $viewtopic_posters = $topicHandler->getAllPosters($topic_obj); } } else { - $viewtopic_posters = array(); + $viewtopic_posters = []; } if ($GLOBALS['xoopsModuleConfig']['show_advertising']) { - $post_werbung = array( + $post_werbung = [ 'post_id' => 0, 'post_parent_id' => 0, 'post_date' => 0, @@ -327,17 +327,17 @@ 'thread_action' => '', 'thread_buttons' => '', 'mod_buttons' => '', - 'poster' => array( + 'poster' => [ 'uid' => -1, 'link' => _MD_ADVERTISING_USER, 'avatar' => 'avatars/blank.gif', 'regdate' => 0, 'last_login' => 0, - 'rank' => array('title' => '') - ), + 'rank' => ['title' => ''] + ], // irmtfan add last_login 'post_permalink' => '' - ); + ]; } $i = 0; @@ -352,7 +352,8 @@ } if ($total_posts > $GLOBALS['xoopsModuleConfig']['posts_per_page']) { - include $GLOBALS['xoops']->path('class/pagenav.php'); +// include $GLOBALS['xoops']->path('class/pagenav.php'); + xoops_load('pagenav'); $nav = new XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id=' . $topic_id . '&order=' . $order . '&status=' . $status . '&mode=' . $mode); @@ -394,7 +395,7 @@ $xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}"); -$admin_actions = array(); +$admin_actions = []; $ad_merge = ''; $ad_move = ''; $ad_delete = ''; @@ -410,67 +411,67 @@ // START irmtfan add restore to viewtopic // if the topic is active if ($topic_obj->getVar('approved') > 0) { - $admin_actions['merge'] = array( + $admin_actions['merge'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=merge&topic_id=' . $topic_id, 'name' => _MD_MERGETOPIC, 'image' => $ad_merge - ); - $admin_actions['move'] = array( + ]; + $admin_actions['move'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=move&topic_id=' . $topic_id, 'name' => _MD_MOVETOPIC, 'image' => $ad_move - ); - $admin_actions['delete'] = array( + ]; + $admin_actions['delete'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=delete&topic_id=' . $topic_id, 'name' => _MD_DELETETOPIC, 'image' => $ad_delete - ); + ]; if (!$topic_obj->getVar('topic_status')) { - $admin_actions['lock'] = array( + $admin_actions['lock'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=lock&topic_id=' . $topic_id, 'image' => $ad_lock, 'name' => _MD_LOCKTOPIC - ); + ]; } else { - $admin_actions['unlock'] = array( + $admin_actions['unlock'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unlock&topic_id=' . $topic_id, 'image' => $ad_unlock, 'name' => _MD_UNLOCKTOPIC - ); + ]; } if (!$topic_obj->getVar('topic_sticky')) { - $admin_actions['sticky'] = array( + $admin_actions['sticky'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=sticky&topic_id=' . $topic_id, 'image' => $ad_sticky, 'name' => _MD_STICKYTOPIC - ); + ]; } else { - $admin_actions['unsticky'] = array( + $admin_actions['unsticky'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unsticky&topic_id=' . $topic_id, 'image' => $ad_unsticky, 'name' => _MD_UNSTICKYTOPIC - ); + ]; } if (!$topic_obj->getVar('topic_digest')) { - $admin_actions['digest'] = array( + $admin_actions['digest'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=digest&topic_id=' . $topic_id, 'image' => $ad_digest, 'name' => _MD_DIGESTTOPIC - ); + ]; } else { - $admin_actions['undigest'] = array( + $admin_actions['undigest'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=undigest&topic_id=' . $topic_id, 'image' => $ad_undigest, 'name' => _MD_UNDIGESTTOPIC - ); + ]; } // if the topic is pending/deleted then restore/approve } else { - $admin_actions['restore'] = array( + $admin_actions['restore'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=restore&topic_id=' . $topic_id, 'name' => _MD_RESTORETOPIC, 'image' => $ad_restore - ); + ]; } // END irmtfan add restore to viewtopic @@ -541,14 +542,14 @@ $configHandler = xoops_getHandler('config'); $xp_config = $configHandler->getConfigsByCat(0, $pollModuleHandler->getVar('mid')); - $GLOBALS['xoopsTpl']->assign(array( + $GLOBALS['xoopsTpl']->assign([ 'is_visible' => $isVisible, 'visible_message' => $visibleMsg, 'disp_votes' => $xp_config['disp_vote_nums'], 'lang_vote' => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'), 'lang_results' => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'), 'back_link' => '' - )); + ]); $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer'; $renderer = new $classRenderer($poll_obj); // check to see if user has voted, show form if not, otherwise get results for form @@ -641,18 +642,18 @@ $poll_restart = ''; $poll_log = ''; - $adminpoll_actions = array(); - $adminpoll_actions['editpoll'] = array( + $adminpoll_actions = []; + $adminpoll_actions['editpoll'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=edit&poll_id=' . $topic_obj->getVar('poll_id') . '&topic_id=' . $topic_id, 'image' => $poll_edit, 'name' => _MD_EDITPOLL - ); - $adminpoll_actions['deletepoll'] = array( + ]; + $adminpoll_actions['deletepoll'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=delete&poll_id=' . $topic_obj->getVar('poll_id') . '&topic_id=' . $topic_id, 'image' => $poll_delete, 'name' => _MD_DELETEPOLL - ); - $adminpoll_actions['restartpoll'] = array( + ]; + $adminpoll_actions['restartpoll'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') @@ -664,8 +665,8 @@ . $forum_id, 'image' => $poll_restart, 'name' => _MD_RESTARTPOLL - ); - $adminpoll_actions['logpoll'] = array( + ]; + $adminpoll_actions['logpoll'] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') @@ -677,7 +678,7 @@ . $forum_id, 'image' => $poll_log, 'name' => _MD_POLL_VIEWLOG - ); + ]; $xoopsTpl->assign_by_ref('adminpoll_actions', $adminpoll_actions); } @@ -722,7 +723,7 @@ $xoopsTpl->assign('forum_jumpbox', newbb_make_jumpbox($forum_id)); } -$xoopsTpl->assign(array( +$xoopsTpl->assign([ 'lang_forum_index' => sprintf(_MD_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)), 'lang_from' => _MD_FROM, 'lang_joined' => _MD_JOINED, @@ -734,19 +735,19 @@ 'lang_reply' => _REPLY, 'lang_postedon' => _MD_NEWBB_POSTEDON, 'lang_groups' => _MD_GROUPS - )); + ]); -$viewmode_options = array(); +$viewmode_options = []; if ($order === 'DESC') { - $viewmode_options[] = array( + $viewmode_options[] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=ASC&status=$status&topic_id=' . $topic_id, 'title' => _OLDESTFIRST - ); + ]; } else { - $viewmode_options[] = array( + $viewmode_options[] = [ 'link' => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=DESC&status=$status&topic_id=' . $topic_id, 'title' => _NEWESTFIRST - ); + ]; } switch ($status) { @@ -798,7 +799,7 @@ //$quickform = ( !empty($GLOBALS['xoopsModuleConfig']["editor_default"]) ) ? $GLOBALS['xoopsModuleConfig']["editor_default"] : "textarea"; $quickform = (!empty($GLOBALS['xoopsModuleConfig']['editor_quick_default'])) ? $GLOBALS['xoopsModuleConfig']['editor_quick_default'] : 'textarea'; - $editor_configs = array(); + $editor_configs = []; $editor_configs ['name'] = 'message'; //$editor_configs [ "value" ] = $message ; $editor_configs ['rows'] = empty($GLOBALS['xoopsModuleConfig'] ['editor_rows']) ? 10 : $GLOBALS['xoopsModuleConfig'] ['editor_rows']; @@ -835,15 +836,15 @@ $toggles = newbb_getcookie('G', true); // START irmtfan improve quickreply smarty variable - add alt key to quick reply button - change $display to $style for more comprehension - add toggle $quickreply['expand'] - $quickreply = array(); + $quickreply = []; $qr_collapse = 't_qr'; $qr_expand = 't_qr_expand'; // change this - $quickreply['icon'] = array( + $quickreply['icon'] = [ 'expand' => $iconHandler->getImageSource($qr_expand), 'collapse' => $iconHandler->getImageSource($qr_collapse) - ); + ]; $quickreply['show'] = 1; // = !empty($GLOBALS['xoopsModuleConfig']['quickreply_enabled'] - $quickreply['expand'] = (count($toggles) > 0) ? (in_array('qr', $toggles, true) ? false : true) : true; + $quickreply['expand'] = (is_array($toggles) && count($toggles) > 0) ? (in_array('qr', $toggles, true) ? false : true) : true; if ($quickreply['expand']) { $quickreply['style'] = 'block'; //irmtfan move semicolon $quickreply_icon_display = $qr_expand; @@ -859,7 +860,7 @@ // END irmtfan improve quickreply smarty variable unset($forum_form); } else { - $xoopsTpl->assign('quickreply', array('show' => 0)); + $xoopsTpl->assign('quickreply', ['show' => 0]); } if ($GLOBALS['xoopsModuleConfig']['do_tag'] diff --git a/votepolls.php b/votepolls.php index 448ad676..ad1cf6ae 100644 --- a/votepolls.php +++ b/votepolls.php @@ -92,7 +92,7 @@ $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_THANKSFORVOTE'); } else { /* there was a problem registering the vote */ - redirect_header($GLOBALS['xoops']->buildUrl('index.php', array('poll_id' => $poll_id)), $classConstants::REDIRECT_DELAY_MEDIUM, + redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR')); } } else { @@ -117,7 +117,7 @@ if (null !== $url) { redirect_header($url, $classConstants::REDIRECT_DELAY_MEDIUM, $msg); } else { - redirect_header($GLOBALS['xoops']->buildUrl('viewtopic.php', array('topic_id' => $topic_id)), $classConstants::REDIRECT_DELAY_MEDIUM, $msg); + redirect_header($GLOBALS['xoops']->buildUrl('viewtopic.php', ['topic_id' => $topic_id]), $classConstants::REDIRECT_DELAY_MEDIUM, $msg); } // old xoopspoll or umfrage or any clone from them } else { diff --git a/xoops_version.php b/xoops_version.php index f50874e8..5bffd2fd 100644 --- a/xoops_version.php +++ b/xoops_version.php @@ -28,7 +28,7 @@ $modversion['min_php'] = '5.5'; $modversion['min_xoops'] = '2.5.8'; $modversion['min_admin'] = '1.2'; -$modversion['min_db'] = array('mysql' => '5.1'); +$modversion['min_db'] = ['mysql' => '5.1']; $modversion['system_menu'] = 1; $modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses/moduleadmin'; $modversion['sysicons16'] = 'Frameworks/moduleclasses/icons/16'; @@ -51,7 +51,7 @@ $modversion['sqlfile']['mysql'] = 'sql/mysql.sql'; // Tables created by sql file (without prefix!) -$modversion['tables'] = array( +$modversion['tables'] = [ 'bb_archive', 'bb_categories', 'bb_votedata', @@ -70,7 +70,7 @@ 'bb_type_forum', 'bb_stats', 'bb_user_stats' -); +]; // Admin things $modversion['hasAdmin'] = 1; @@ -87,26 +87,26 @@ $modversion['onUpdate'] = 'include/module.php'; // Templates -$modversion['templates'] = array( - - array('file' => 'newbb_index_menu.tpl', 'description' => ''), - array('file' => 'newbb_index.tpl', 'description' => ''), - array('file' => 'newbb_viewforum_subforum.tpl', 'description' => ''), - array('file' => 'newbb_viewforum_menu.tpl', 'description' => ''), - array('file' => 'newbb_viewforum.tpl', 'description' => ''), - array('file' => 'newbb_viewtopic.tpl', 'description' => ''), - array('file' => 'newbb_thread.tpl', 'description' => ''), - array('file' => 'newbb_edit_post.tpl', 'description' => ''), - array('file' => 'newbb_poll_results.tpl', 'description' => ''), - array('file' => 'newbb_poll_view.tpl', 'description' => ''), - array('file' => 'newbb_searchresults.tpl', 'description' => ''), - array('file' => 'newbb_search.tpl', 'description' => ''), - array('file' => 'newbb_viewall.tpl', 'description' => ''), - array('file' => 'newbb_viewpost.tpl', 'description' => ''), - array('file' => 'newbb_online.tpl', 'description' => ''), - array('file' => 'newbb_rss.tpl', 'description' => ''), - array('file' => 'newbb_notification_select.tpl', 'description' => '') -); +$modversion['templates'] = [ + + ['file' => 'newbb_index_menu.tpl', 'description' => ''], + ['file' => 'newbb_index.tpl', 'description' => ''], + ['file' => 'newbb_viewforum_subforum.tpl', 'description' => ''], + ['file' => 'newbb_viewforum_menu.tpl', 'description' => ''], + ['file' => 'newbb_viewforum.tpl', 'description' => ''], + ['file' => 'newbb_viewtopic.tpl', 'description' => ''], + ['file' => 'newbb_thread.tpl', 'description' => ''], + ['file' => 'newbb_edit_post.tpl', 'description' => ''], + ['file' => 'newbb_poll_results.tpl', 'description' => ''], + ['file' => 'newbb_poll_view.tpl', 'description' => ''], + ['file' => 'newbb_searchresults.tpl', 'description' => ''], + ['file' => 'newbb_search.tpl', 'description' => ''], + ['file' => 'newbb_viewall.tpl', 'description' => ''], + ['file' => 'newbb_viewpost.tpl', 'description' => ''], + ['file' => 'newbb_online.tpl', 'description' => ''], + ['file' => 'newbb_rss.tpl', 'description' => ''], + ['file' => 'newbb_notification_select.tpl', 'description' => ''] +]; // Blocks @@ -117,7 +117,7 @@ // options[4] - Display Navigator: 1 (by default), 0 (No) // options[5] - SelectedForumIDs: null for all -$modversion['blocks'][1] = array( +$modversion['blocks'][1] = [ 'file' => 'newbb_block.php', 'name' => _MI_NEWBB_BLOCK_TOPIC_POST, 'description' => 'It Will drop (use advance topic renderer block)', // irmtfan @@ -125,7 +125,7 @@ 'options' => 'time|5|360|0|1|0', 'edit_func' => 'b_newbb_edit', 'template' => 'newbb_block.tpl' -); +]; // options[0] - Citeria valid: time(by default), views, replies, digest, sticky // options[1] - NumberToDisplay: any positive integer @@ -135,7 +135,7 @@ // options[5] - Title Length : 0 - no limit // options[6] - SelectedForumIDs: null for all -$modversion['blocks'][] = array( +$modversion['blocks'][] = [ 'file' => 'newbb_block.php', 'name' => _MI_NEWBB_BLOCK_TOPIC, 'description' => 'It Will drop (use advance topic renderer block)', // irmtfan @@ -143,7 +143,7 @@ 'options' => 'time|5|0|0|1|0|0', 'edit_func' => 'b_newbb_topic_edit', 'template' => 'newbb_block_topic.tpl' -); +]; // options[0] - Citeria valid: title(by default), text // options[1] - NumberToDisplay: any positive integer @@ -153,7 +153,7 @@ // options[5] - Title/Text Length : 0 - no limit // options[6] - SelectedForumIDs: null for all -$modversion['blocks'][] = array( +$modversion['blocks'][] = [ 'file' => 'newbb_block.php', 'name' => _MI_NEWBB_BLOCK_POST, 'description' => 'Shows recent posts in the forums', @@ -161,7 +161,7 @@ 'options' => 'title|10|0|0|1|0|0', 'edit_func' => 'b_newbb_post_edit', 'template' => 'newbb_block_post.tpl' -); +]; // options[0] - Citeria valid: post(by default), topic, digest, sticky // options[1] - NumberToDisplay: any positive integer @@ -170,7 +170,7 @@ // options[4] - Display Navigator: 1 (by default), 0 (No) // options[5] - SelectedForumIDs: null for all -$modversion['blocks'][] = array( +$modversion['blocks'][] = [ 'file' => 'newbb_block.php', 'name' => _MI_NEWBB_BLOCK_AUTHOR, 'description' => 'Shows authors stats', @@ -178,7 +178,7 @@ 'options' => 'topic|5|0|0|1|0', 'edit_func' => 'b_newbb_author_edit', 'template' => 'newbb_block_author.tpl' -); +]; /* * $options: @@ -187,7 +187,7 @@ * $options[2] - max font size (px or %) * $options[3] - min font size (px or %) */ -$modversion['blocks'][] = array( +$modversion['blocks'][] = [ 'file' => 'newbb_block_tag.php', 'name' => _MI_NEWBB_BLOCK_TAG_CLOUD, 'description' => 'Show tag cloud', @@ -195,7 +195,7 @@ 'edit_func' => 'newbb_tag_block_cloud_edit', 'options' => '100|0|150|80', 'template' => 'newbb_tag_block_cloud.tpl' -); +]; /* * $options: @@ -203,7 +203,7 @@ * $options[1] - time duration, in days, 0 for all the time * $options[2] - sort: a - alphabet; c - count; t - time */ -$modversion['blocks'][] = array( +$modversion['blocks'][] = [ 'file' => 'newbb_block_tag.php', 'name' => _MI_NEWBB_BLOCK_TAG_TOP, 'description' => 'Show top tags', @@ -211,7 +211,7 @@ 'edit_func' => 'newbb_tag_block_top_edit', 'options' => '50|0|c', 'template' => 'newbb_tag_block_top.tpl' -); +]; // irmtfan START add list topic block // options[0] - Status in WHERE claus: all(by default), sticky, digest,lock, poll, voted, viewed, replied, read, (UN_) , active, pending, deleted (admin) (It is multi-select) // options[1] - Uid in WHERE claus: uid of the topic poster : -1 - all users (by default) @@ -227,7 +227,7 @@ // options[11] - Post text Length: 0 - dont show post text - 200 by default // options[12] - SelectedForumIDs: multi-select ngative values for categories and positive values for forums: null for all(by default) -$modversion['blocks'][] = array( +$modversion['blocks'][] = [ 'file' => 'list_topic.php', 'name' => _MI_NEWBB_BLOCK_LIST_TOPIC, 'description' => 'Shows a list of topics (advance renderer)', @@ -235,7 +235,7 @@ 'options' => 'all|-1|-1|0|lastpost|0|5|360|topic,forum,replies,lastpost,lastposttime,lastposter,lastpostmsgicon,publish|1|0|200|0', 'edit_func' => 'newbb_list_topic_edit', 'template' => 'newbb_block_list_topic.tpl' -); +]; // irmtfan END add list topic block // Search @@ -247,520 +247,520 @@ $modversion['use_smarty'] = 1; // Configs -$modversion['config'] = array(); +$modversion['config'] = []; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'do_rewrite', 'title' => '_MI_DO_REWRITE', 'description' => '_MI_DO_REWRITE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'pngforie_enabled', 'title' => '_MI_PNGFORIE_ENABLE', 'description' => '_MI_PNGFORIE_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'subforum_display', 'title' => '_MI_SUBFORUM_DISPLAY', 'description' => '_MI_SUBFORUM_DISPLAY_DESC', 'formtype' => 'select', 'valuetype' => 'text', - 'options' => array( + 'options' => [ _MI_SUBFORUM_EXPAND => 'expand', _MI_SUBFORUM_COLLAPSE => 'collapse', _MI_SUBFORUM_HIDDEN => 'hidden' - ), + ], 'default' => 'collapse' -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'post_excerpt', 'title' => '_MI_POST_EXCERPT', 'description' => '_MI_POST_EXCERPT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 100 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'topics_per_page', 'title' => '_MI_TOPICSPERPAGE', 'description' => '_MI_TOPICSPERPAGE_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 20 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'posts_per_page', 'title' => '_MI_POSTSPERPAGE', 'description' => '_MI_POSTSPERPAGE_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 10 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'pagenav_display', 'title' => '_MI_PAGENAV_DISPLAY', 'description' => '_MI_PAGENAV_DISPLAY_DESC', 'formtype' => 'select', 'valuetype' => 'text', - 'options' => array( + 'options' => [ _MI_PAGENAV_NUMBER => 'number', _MI_PAGENAV_IMAGE => 'image', _MI_PAGENAV_SELECT => 'select' - ), + ], 'default' => 'number' -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'cache_enabled', 'title' => '_MI_CACHE_ENABLE', 'description' => '_MI_CACHE_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'statistik_enabled', 'title' => '_MI_STATISTIK_ENABLE', 'description' => '_MI_STATISTIK_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'dir_attachments', 'title' => '_MI_DIR_ATTACHMENT', 'description' => '_MI_DIR_ATTACHMENT_DESC', 'formtype' => 'textbox', 'valuetype' => 'text', 'default' => 'uploads/newbb' -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'media_allowed', 'title' => '_MI_MEDIA_ENABLE', 'description' => '_MI_MEDIA_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'path_magick', 'title' => '_MI_PATH_MAGICK', 'description' => '_MI_PATH_MAGICK_DESC', 'formtype' => 'textbox', 'valuetype' => 'text', 'default' => '/usr/bin/X11' -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'path_netpbm', 'title' => '_MI_PATH_NETPBM', 'description' => '_MI_PATH_NETPBM_DESC', 'formtype' => 'textbox', 'valuetype' => 'text', 'default' => '/usr/bin' -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'image_lib', 'title' => '_MI_IMAGELIB', 'description' => '_MI_IMAGELIB_DESC', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 0, - 'options' => array( + 'options' => [ _MI_AUTO => 0, _MI_MAGICK => 1, _MI_NETPBM => 2, _MI_GD1 => 3, _MI_GD2 => 4 - ) -); + ] +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_userattach', 'title' => '_MI_USERATTACH_ENABLE', 'description' => '_MI_USERATTACH_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'max_img_width', 'title' => '_MI_MAX_IMG_WIDTH', 'description' => '_MI_MAX_IMG_WIDTH_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 800 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'max_img_height', 'title' => '_MI_MAX_IMG_HEIGHT', 'description' => '_MI_MAX_IMG_HEIGHT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 640 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'max_image_width', 'title' => '_MI_MAX_IMAGE_WIDTH', 'description' => '_MI_MAX_IMAGE_WIDTH_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 150 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'max_image_height', 'title' => '_MI_MAX_IMAGE_HEIGHT', 'description' => '_MI_MAX_IMAGE_HEIGHT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 150 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'wol_enabled', 'title' => '_MI_WOL_ENABLE', 'description' => '_MI_WOL_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'user_level', 'title' => '_MI_USERLEVEL', 'description' => '_MI_USERLEVEL_DESC', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 2, - 'options' => array( + 'options' => [ _MI_NULL => 0, _MI_TEXT => 1, _MI_GRAPHIC => 2 - ) -); + ] +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_realname', 'title' => '_MI_SHOW_REALNAME', 'description' => '_MI_SHOW_REALNAME_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'groupbar_enabled', 'title' => '_MI_GROUPBAR_ENABLE', 'description' => '_MI_GROUPBAR_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'rating_enabled', 'title' => '_MI_RATING_ENABLE', 'description' => '_MI_RATING_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'reportmod_enabled', 'title' => '_MI_REPORTMOD_ENABLE', 'description' => '_MI_REPORTMOD_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'quickreply_enabled', 'title' => '_MI_QUICKREPLY_ENABLE', 'description' => '_MI_QUICKREPLY_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'rss_enable', 'title' => '_MI_RSS_ENABLE', 'description' => '_MI_RSS_ENABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'rss_maxitems', 'title' => '_MI_RSS_MAX_ITEMS', 'description' => '', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 10 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'rss_maxdescription', 'title' => '_MI_RSS_MAX_DESCRIPTION', 'description' => '', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'rss_cachetime', 'title' => '_MI_RSS_CACHETIME', 'description' => '_MI_RSS_CACHETIME_DESCRIPTION', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 30 -); +]; // 4.05 -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_infobox', 'title' => '_MI_SHOW_INFOBOX', 'description' => '_MI_SHOW_INFOBOX_DESC', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 1, - 'options' => array( + 'options' => [ _MI_NEWBB_INFOBOX_NONE => 0, _MI_NEWBB_INFOBOX_HIDDEN => 1, _MI_NEWBB_INFOBOX_SHOW => 2 - ) -); + ] +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_sociallinks', 'title' => '_MI_SHOW_SOCIALLINKS', 'description' => '_MI_SHOW_SOCIALLINKS_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_advertising', 'title' => '_MI_ADVERTISING', 'description' => '_MI_ADVERTISING_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_jump', 'title' => '_MI_SHOW_JUMPBOX', 'description' => '_MI_JUMPBOXDESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_permissiontable', 'title' => '_MI_SHOW_PERMISSIONTABLE', 'description' => '_MI_SHOW_PERMISSIONTABLE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'email_digest', 'title' => '_MI_EMAIL_DIGEST', 'description' => '_MI_EMAIL_DIGEST_DESC', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 0, - 'options' => array( + 'options' => [ _MI_NEWBB_EMAIL_NONE => 0, _MI_NEWBB_EMAIL_DAILY => 1, _MI_NEWBB_EMAIL_WEEKLY => 2 - ) -); + ] +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'show_ip', 'title' => '_MI_SHOW_IP', 'description' => '_MI_SHOW_IP_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'enable_karma', 'title' => '_MI_ENABLE_KARMA', 'description' => '_MI_ENABLE_KARMA_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'karma_options', 'title' => '_MI_KARMA_OPTIONS', 'description' => '_MI_KARMA_OPTIONS_DESC', 'formtype' => 'textbox', 'valuetype' => 'text', 'default' => '0, 10, 50, 100, 500, 1000, 5000, 10000' -); +]; // irmtfan - add 365 = one year -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'since_options', 'title' => '_MI_SINCE_OPTIONS', 'description' => '_MI_SINCE_OPTIONS_DESC', 'formtype' => 'textbox', 'valuetype' => 'text', 'default' => '-1, -2, -6, -12, 0, 1, 2, 5, 10, 20, 30, 60, 100, 365' -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'since_default', 'title' => '_MI_SINCE_DEFAULT', 'description' => '_MI_SINCE_DEFAULT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'allow_user_anonymous', 'title' => '_MI_USER_ANONYMOUS', 'description' => '_MI_USER_ANONYMOUS_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'anonymous_prefix', 'title' => '_MI_ANONYMOUS_PRE', 'description' => '_MI_ANONYMOUS_PRE_DESC', 'formtype' => 'textbox', 'valuetype' => 'text', 'default' => $GLOBALS['xoopsConfig']['anonymous'] . '-' -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'allow_require_reply', 'title' => '_MI_REQUIRE_REPLY', 'description' => '_MI_REQUIRE_REPLY_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'edit_timelimit', 'title' => '_MI_EDIT_TIMELIMIT', 'description' => '_MI_EDIT_TIMELIMIT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 60 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'recordedit_timelimit', 'title' => '_MI_RECORDEDIT_TIMELIMIT', 'description' => '_MI_RECORDEDIT_TIMELIMIT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 15 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'delete_timelimit', 'title' => '_MI_DELETE_TIMELIMIT', 'description' => '_MI_DELETE_TIMELIMIT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 60 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'post_timelimit', 'title' => '_MI_POST_TIMELIMIT', 'description' => '_MI_POST_TIMELIMIT_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', 'default' => 30 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'enable_permcheck', 'title' => '_MI_PERMCHECK_ONDISPLAY', 'description' => '_MI_PERMCHECK_ONDISPLAY_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'enable_usermoderate', 'title' => '_MI_USERMODERATE', 'description' => '_MI_USERMODERATE_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0 -); +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'disc_show', 'title' => '_MI_SHOW_DIS', 'description' => '_MI_SHOW_DIS_DESC', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 0, - 'options' => array( + 'options' => [ _NONE => 0, _MI_POST => 1, _MI_REPLY => 2, _MI_OP_BOTH => 3 - ) -); + ] +]; -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'disclaimer', 'title' => '_MI_DISCLAIMER', 'description' => '_MI_DISCLAIMER_DESC', 'formtype' => 'textarea', 'valuetype' => 'text', 'default' => _MI_DISCLAIMER_TEXT -); +]; xoops_load('XoopsRequest'); -$forum_options = array(_NONE => 0); +$forum_options = [_NONE => 0]; if ($isModuleAction && 'update_ok' === XoopsRequest::getCmd('op', '', 'POST')) { $forumHandler = xoops_getModuleHandler('forum', 'newbb', true); - if ($forums = $forumHandler->getForumsByCategory(0, 'access', false, array('parent_forum', 'cat_id', 'forum_name'))) { + if ($forums = $forumHandler->getForumsByCategory(0, 'access', false, ['parent_forum', 'cat_id', 'forum_name'])) { foreach (array_keys($forums) as $c) { foreach (array_keys($forums[$c]) as $f) { $forum_options[$forums[$c][$f]['title']] = $f; @@ -775,7 +775,7 @@ unset($forums); } } -$modversion['config'][] = array( +$modversion['config'][] = [ 'name' => 'welcome_forum', 'title' => '_MI_WELCOMEFORUM', 'description' => '_MI_WELCOMEFORUM_DESC', @@ -783,9 +783,9 @@ 'valuetype' => 'int', 'default' => 0, 'options' => $forum_options -); +]; // START irmtfan add a poll_module config -$pollDirs = array(); +$pollDirs = []; $dir_def = 0; $formtype = 'select'; // if in install, update @@ -820,7 +820,7 @@ $criteria = new CriteriaCompo(); $criteria->add(new Criteria('conf_name', 'poll_module', '='), 'AND'); $criteria->add(new Criteria('conf_formtype', 'select', '='), 'AND'); // not hidden - $criteria->add(new Criteria('conf_id', '(' . implode(', ', XoopsRequest::getArray('conf_ids', array(), 'POST')) . ')', 'IN'), 'AND'); + $criteria->add(new Criteria('conf_id', '(' . implode(', ', XoopsRequest::getArray('conf_ids', [], 'POST')) . ')', 'IN'), 'AND'); $pollOptions = $hModConfig->getConfigs($criteria); $pollOptions = end($pollOptions); if (is_object($pollOptions) && $pollOptions->getVar('conf_value') !== '0') { @@ -853,7 +853,7 @@ // END irmtfan add a poll_module config // Notification -$modversion['notification'] = array(); +$modversion['notification'] = []; $modversion['hasNotification'] = 1; $modversion['notification']['lookup_file'] = 'include/notification.inc.php'; $modversion['notification']['lookup_func'] = 'newbb_notify_iteminfo'; From 895d566768c54c0621580a92874930c5bccfb428 Mon Sep 17 00:00:00 2001 From: mambax7 Date: Sun, 25 Mar 2018 02:28:09 -0400 Subject: [PATCH 4/7] Unnecessary double quotes --- admin/admin_cat_manager.php | 6 +-- admin/admin_forum_manager.php | 20 +++++----- admin/admin_permissions.php | 16 ++++---- admin/admin_report.php | 6 +-- admin/index.php | 6 +-- blocks/list_topic.php | 2 +- blocks/newbb_block.php | 72 +++++++++++++++++------------------ class/post.php | 2 +- class/topic.php | 2 +- delete.php | 4 +- footer.php | 2 +- include/form.post.php | 8 ++-- include/functions.topic.php | 2 +- polls.php | 2 +- search.php | 10 ++--- viewforum.php | 4 +- viewtopic.php | 4 +- 17 files changed, 84 insertions(+), 84 deletions(-) diff --git a/admin/admin_cat_manager.php b/admin/admin_cat_manager.php index c18af5af..1cd3e047 100644 --- a/admin/admin_cat_manager.php +++ b/admin/admin_cat_manager.php @@ -184,9 +184,9 @@ function editCategory(XoopsObject $category_obj = null) echo ''; foreach ($categories as $key => $onecat) { - $cat_edit_link = "getVar('cat_id') . "\">" . newbbDisplayImage('admin_edit', _EDIT) . ''; - $cat_del_link = "getVar('cat_id') . "\">" . newbbDisplayImage('admin_delete', _DELETE) . ''; - $cat_title_link = "getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . "\">" . $onecat->getVar('cat_title') . ''; + $cat_edit_link = '' . newbbDisplayImage('admin_edit', _EDIT) . ''; + $cat_del_link = '' . newbbDisplayImage('admin_delete', _DELETE) . ''; + $cat_title_link = '' . $onecat->getVar('cat_title') . ''; echo ""; echo '' . $cat_title_link . ''; diff --git a/admin/admin_forum_manager.php b/admin/admin_forum_manager.php index fd6afd35..564d133c 100644 --- a/admin/admin_forum_manager.php +++ b/admin/admin_forum_manager.php @@ -261,10 +261,10 @@ foreach (array_keys($categories) as $c) { $category = $categories[$c]; $cat_id = $c; - $cat_link = "getVar('dirname', 'n') . '/index.php?viewcat=' . $cat_id . "\">" . $category . ''; - $cat_edit_link = "" . newbbDisplayImage('admin_edit', _EDIT) . ''; - $cat_del_link = "" . newbbDisplayImage('admin_delete', _DELETE) . ''; - $forum_add_link = "" . newbbDisplayImage('new_forum') . ''; + $cat_link = '' . $category . ''; + $cat_edit_link = '' . newbbDisplayImage('admin_edit', _EDIT) . ''; + $cat_del_link = '' . newbbDisplayImage('admin_delete', _DELETE) . ''; + $forum_add_link = '' . newbbDisplayImage('new_forum') . ''; $echo .= ""; $echo .= "" . $cat_link . ''; $echo .= "" . $cat_edit_link . ''; @@ -279,12 +279,12 @@ $i = 0; foreach (array_keys($forums[$c]) as $f) { $forum = $forums[$c][$f]; - $f_link = $forum['prefix'] . "getVar('dirname', 'n') . '/viewforum.php?forum=' . $f . "\">" . $forum['forum_name'] . ''; - $f_edit_link = "" . newbbDisplayImage('admin_edit', _AM_NEWBB_EDIT) . ''; - $f_del_link = "" . newbbDisplayImage('admin_delete', _AM_NEWBB_DELETE) . ''; - $sf_add_link = "'; - $f_move_link = "" . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . ''; - $f_merge_link = "" . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . ''; + $f_link = $forum['prefix'] . '' . $forum['forum_name'] . ''; + $f_edit_link = '' . newbbDisplayImage('admin_edit', _AM_NEWBB_EDIT) . ''; + $f_del_link = '' . newbbDisplayImage('admin_delete', _AM_NEWBB_DELETE) . ''; + $sf_add_link = '' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . ''; + $f_move_link = '' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . ''; + $f_merge_link = '' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . ''; $class = (($i++) % 2) ? 'odd' : 'even'; $echo .= ""; diff --git a/admin/admin_permissions.php b/admin/admin_permissions.php index 2311204c..080ddbad 100644 --- a/admin/admin_permissions.php +++ b/admin/admin_permissions.php @@ -160,19 +160,19 @@ public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = []) { if ($option['id'] > 0) { $tree .= $prefix - . "
\n"; } else { - $tree .= $prefix . $option['name'] . "getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" />
\n"; + $tree .= $prefix . $option['name'] . '
\n"; } if (isset($option['children'])) { foreach ($option['children'] as $child) { diff --git a/admin/admin_report.php b/admin/admin_report.php index 48b57ec0..40710fb7 100644 --- a/admin/admin_report.php +++ b/admin/admin_report.php @@ -118,7 +118,7 @@ $reports = $reportHandler->getAllReports(0, 'ASC', $limit, $start, $process_result); foreach ($reports as $report) { - $post_link = "getVar('dirname') @@ -128,7 +128,7 @@ . $report['topic_id'] . '&forum=' . $report['forum_id'] - . "&viewmode=thread\" target=\"checkreport\">" + . '&viewmode=thread" target="checkreport">' . $myts->htmlSpecialChars($report['subject']) . ''; $checkbox = ''; @@ -146,7 +146,7 @@ echo '' . _AM_NEWBB_REPORTTEXT . ': ' . $myts->htmlSpecialChars($report['report_text']) . ''; $uid = (int)$report['reporter_uid']; $reporter_name = newbb_getUnameFromId($uid, $GLOBALS['xoopsModuleConfig']['show_realname']); - $reporter = (!empty($uid)) ? "" . $reporter_name . '
' : ''; + $reporter = !empty($uid) ? "" . $reporter_name . '
' : ''; echo "" . $reporter . long2ip($report['reporter_ip']) . ''; echo ''; diff --git a/admin/index.php b/admin/index.php index 6c84664a..f8bc0466 100644 --- a/admin/index.php +++ b/admin/index.php @@ -191,9 +191,9 @@ function newbb_getImageLibs() // START irmtfan better poll module display link and version - check if xoops poll module is available if ($isOK) { $pollLink = _AM_NEWBB_AVAILABLE . ': '; - $pollLink .= "getVar('dirname') . "/admin/index.php\""; - $pollLink .= " alt=\"" . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ") \""; - $pollLink .= " title=\"" . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ") \""; + $pollLink .= 'getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "'; + $pollLink .= ' title="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "'; $pollLink .= '>' . '(' . $xoopspoll->getVar('name') . ')'; } else { $pollLink = _AM_NEWBB_NOTAVAILABLE; diff --git a/blocks/list_topic.php b/blocks/list_topic.php index c948462f..07eaf0bf 100644 --- a/blocks/list_topic.php +++ b/blocks/list_topic.php @@ -184,7 +184,7 @@ function newbb_list_topic_edit($options) $accessForums = $forumHandler->getIdsByValues(array_map('intval', $optionsForum)); $isAll = (count($optionsForum) === 0 || empty($optionsForum[0])); $forumSel = ""; - $form .= "