Merge pull request #134 from mambax7/master

NewBB 5.1.0 Beta-6

.scrutinizer.yml

@@ -1,5 +1,7 @@
 # language: php
 build:
+  environment:
+    php: 8.0.11
   nodes:
     tests: true
     analysis:
@@ -16,9 +18,6 @@ build:
       tests:
         override:
           - php-scrutinizer-run --enable-security-analysis
-  environment:
-    php:
-      version: "7.2"
 filter:
   dependency_paths:
     - XoopsCore25/*

EXTRA/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/blocks/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/css/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/css/language/english/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/css/language/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/css/language/persian/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/images/icon/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/images/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/images/language/english/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/images/language/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/images/language/persian/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/images/mime/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/images/rpg/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/js/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/js/language/english/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/js/language/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/templates_fulldiv_opacity/newbb_index.tpl

@@ -221,7 +221,7 @@
             <{$rss_button}>
         </a>
         <br>
-        <span style="font-size:0.7em;"><a href="https://xoops.org">NewBB Version  <{$version/100}></a></span>
+        <span style="font-size:0.7em;"><a href="https://xoops.org">NewBB Version  <{$version}></a></span>
         <br>
     <{/if}>
 </div>

EXTRA/themes/templates_fulldiv_opacity/newbb_rss.tpl

@@ -5,7 +5,7 @@
     <link><{$rss.channel_link}></link>
     <description><{$rss.channel_desc}></description>
     <lastBuildDate><{$rss.channel_lastbuild}></lastBuildDate>
-    <docs>http://backend.userland.com/rss/</docs>
+    <docs>https://backend.userland.com/rss/</docs>
     <generator><{$rss.channel_generator}></generator>
     <category><{$rss.channel_category}></category>
     <managingEditor><{$rss.channel_editor}></managingEditor>

EXTRA/themes/templates_fulldiv_opacity/newbb_thread.tpl

@@ -85,7 +85,7 @@
             <div class="thread_poster_ip floatright">
                 <{if $topic_post.poster_ip}>
                     IP:
-                    <a href="http://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a>
+                    <a href="https://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a>
                 <{/if}>
             </div>
             <div class="clear"></div>

EXTRA/themes/templates_fulldiv_opacity/newbb_viewforum.tpl

@@ -222,7 +222,7 @@
             <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum_id}>" target="_blank" title="RSS FEED">
                 <{$rss_button}>
             </a>
-            <span style="font-size:0.7em;"><a href="https://xoops.org">NewBB Version <{$version/100}></a></span>
+            <span style="font-size:0.7em;"><a href="https://xoops.org">NewBB Version <{$version}></a></span>
             <div class="clear"></div>
         <{/if}>
         <{$forum_jumpbox}>

EXTRA/themes/xbootstrap/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/xbootstrap/modules/index.php

@@ -1,2 +1,2 @@
-<?php
+<?php declare(strict_types=1);
 header('HTTP/1.0 404 Not Found');

EXTRA/themes/xbootstrap/modules/newbb/newbb_index.tpl

@@ -105,7 +105,7 @@
                             <div class="modal-dialog">
                                 <div class="modal-content">
                                     <div class="modal-header">
-                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                                         <h4 class="modal-title" id="myModalLabel"><{$category.cat_title}></h4>
                                     </div>
                                     <div class="modal-body">
@@ -169,7 +169,7 @@
                                         <div class="modal-dialog">
                                             <div class="modal-content">
                                                 <div class="modal-header">
-                                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                                                     <h4 class="modal-title" id="ForumDescription"><{$smarty.const.THEME_FORUM_DESC}>: <{$category.cat_title}>
                                                         - <{$forum.forum_name}></h4>
                                                 </div>
@@ -274,17 +274,17 @@
 
                         <li><{$smarty.const._MD_NEWBB_TOTALTOPICSC}>
                             <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" title="<{$smarty.const._MD_NEWBB_ALL}>">
-                                <{$stats[0].topic.total}>
+                                <{$stats[0].topic.total|default:''}>
                             </a></li>
 
                         <li><{$smarty.const._MD_NEWBB_TOTALPOSTSC}>
                             <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php" title="<{$smarty.const._MD_NEWBB_ALLPOSTS}>">
-                                <{$stats[0].post.total}>
+                                <{$stats[0].post.total|default:''}>
                             </a></li>
                         <{if $stats[0].digest.total|default:''}>
                             <li><{$smarty.const._MD_NEWBB_TOTALDIGESTSC}>
                                 <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=digest" title="<{$smarty.const._MD_NEWBB_TOTALDIGESTSC}>">
-                                    <{$stats[0].digest.total}>
+                                    <{$stats[0].digest.total|default:''}>
                                 </a></li>
                         <{/if}>
 
@@ -322,7 +322,7 @@
             <{include file="db:newbb_online.tpl"}>
         <{/if}>
 
-        <a title="NewBB" href="https://xoops.org" class="btn btn-xs btn-success">NewBB Version <{$version/100}></a>
+        <a title="NewBB" href="https://xoops.org" class="btn btn-xs btn-success">NewBB Version <{$version}></a>
         <{if $rss_button}>
             <div class="text-right">
                 <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED">

EXTRA/themes/xbootstrap/modules/newbb/newbb_notification_select.tpl

@@ -25,7 +25,7 @@
                             <{counter assign=index}>
                             <input type="hidden" name="not_list[<{$index}>][params]"
                                    value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>">
-                            <input type="checkbox" id="not_list[]" name="not_list[<{$index}>][status]" value="1"
+                            <input type="checkbox" name="not_list[<{$index}>][status]" value="1"
                                    <{if $event.subscribed}>checked<{/if}> >
                         </td>
                         <td class="odd"><{$event.caption}></td>

EXTRA/themes/xbootstrap/modules/newbb/newbb_thread.tpl

@@ -21,7 +21,7 @@
                 </ul>
             <{/if}>
 
-                <{if $infobox.show}>
+                <{if $infobox.show|default:''}>
                     <a data-toggle="collapse" href="#<{$topic_post.post_id}>" title="<{$smarty.const.THEME_INFO}>" class="btn btn-primary btn-sm mb10"><span class="glyphicon glyphicon-info-sign"></span></a>
                     <div id="<{$topic_post.post_id}>" class="collapse">
                         <ul class="list-unstyled text-left">
@@ -55,7 +55,7 @@
                             </li>
                             <{/if}>
 
-                            <{if $topic_post.poster.level}>
+                            <{if $topic_post.poster.level|default:''}>
                                 <li><{$topic_post.poster.level}></li>
                             <{/if}>
 
@@ -74,7 +74,7 @@
 
         <ul class="list-unstyled">
             <{if $topic_post.poster_ip}>
-                <li>IP: <a href="http://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a></li>
+                <li>IP: <a href="https://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a></li>
             <{/if}>
 
             <{if $topic_post.poster.uid|default:'' gt 0}>
@@ -122,7 +122,7 @@
     <{if $topic_post.thread_action}>
         <{foreach item=btn from=$topic_post.thread_action}>
             <a href="<{$btn.link}>&amp;post_id=<{$topic_post.post_id}>" title="<{$btn.name}>" <{if $btn.target}>target="<{$btn.target}>"<{/if}>>
-                <{$btn.image}>
+                <{$btn.image|default:''}>
             </a>
         <{/foreach}>
     <{/if}>

EXTRA/themes/xbootstrap/modules/newbb/newbb_viewforum.tpl

@@ -173,7 +173,7 @@
             <{$topic.topic_title}>
         </a></div>
 
-<{*         <{$topic.attachment}> <{$topic.topic_page_jump}> *}>
+<{*         <{$topic.attachment|default:''}> <{$topic.topic_page_jump}> *}>
 
         <div class="col-md-2 visible-lg visible-md"><label class="label label-info"><span class="glyphicon glyphicon-user"></span> <{$topic.topic_poster}></label></div>
         <div class="col-md-2 visible-lg visible-md"><{$topic.topic_time}></div>
@@ -224,7 +224,7 @@
 
 <div class="row collapse" id="forum-info">
     <div class="col-sm-6 col-md-6">
-        <{foreach item=perm from=$permission_table}>
+        <{foreach item=perm from=$permission_table|default:''}>
             <{$perm}>
         <{/foreach}>
     </div>
@@ -245,7 +245,7 @@
     <{include file="db:newbb_online.tpl"}>
 <{/if}>
 
-<a title="NewBB" href="https://xoops.org" class="btn btn-xs btn-success">NewBB Version  <{$version/100}></a>
+<a title="NewBB" href="https://xoops.org" class="btn btn-xs btn-success">NewBB Version  <{$version}></a>
 <{if $rss_button}>
     <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum_id}>" target="_blank" title="RSS FEED">
         <{$rss_button}>

EXTRA/themes/xbootstrap/modules/newbb/newbb_viewforum_subforum.tpl

@@ -55,7 +55,7 @@
           <div class="modal-dialog">
             <div class="modal-content">
               <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&amp;times;</span><span class="sr-only">Close</span></button>
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
                 <h4 class="modal-title"><{$sforum.forum_name}></h4>
               </div>
               <div class="modal-body">

EXTRA/themes/xbootstrap/modules/newbb/newbb_viewpost.tpl

@@ -4,7 +4,7 @@
         <!-- irmtfan hardcode removed align="left" -->
         <hr class="align_left" width="50%" size="1">
         <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$smarty.const._MD_NEWBB_FORUMHOME}></a>
-        <{if $parent_forum}>
+        <{if $parent_forum|default:''}>
             <span class="delimiter">&raquo;</span>
             <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$parent_forum}>"><{$parent_name}></a>
             <span class="delimiter">&raquo;</span>
@@ -103,7 +103,7 @@
 <!-- irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" -->
 <div class="pagenav">
     <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$post.topic_id}>"><strong><{$smarty.const._MD_NEWBB_VIEWTOPIC}></strong></a>
-    <{if !$forum_name }>
+    <{if !$forum_name|default:'' }>
         |
         <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$post.forum_id}>"><strong><{$smarty.const._MD_NEWBB_VIEWFORUM}></strong></a>
     <{/if}>
@@ -153,7 +153,7 @@
 </div>
 <div class="clear"></div>
 <br>
-<{if $online}>
+<{if $online|default:''}>
     <br>
     <{include file="db:newbb_online.tpl"}>
 <{/if}>

EXTRA/themes/xbootstrap/modules/newbb/newbb_viewtopic.tpl

@@ -75,10 +75,10 @@
 
     <{if $mode lte 1}>
         <{if $topic_poll|default:''}>
-            <{if $topic_pollresult}>
-                <{include file="db:newbb_poll_results.tpl" poll=$poll}>
+            <{if $topic_pollresult|default:''}>
+                <{include file="db:newbb_poll_results.tpl" poll=$poll|default:''}>
             <{else}>
-                <{include file="db:newbb_poll_view.tpl" poll=$poll}>
+                <{include file="db:newbb_poll_view.tpl" poll=$poll|default:''}>
             <{/if}>
         <{/if}>
     <{/if}>

EXTRA/themes/xswatch4/modules/newbb/blocks/index.php

@@ -0,0 +1,2 @@
+<?php
+header("HTTP/1.0 404 Not Found");

EXTRA/themes/xswatch4/modules/newbb/blocks/newbb_block_author.tpl

@@ -0,0 +1,30 @@
+<table class="table table-hover" cellspacing="1">
+
+    <{if $block.disp_mode == 0}>
+        <tr>
+            <th><{$smarty.const._MB_NEWBB_AUTHOR}></th>
+            <th><{$smarty.const._MB_NEWBB_COUNT}></th>
+        </tr>
+        <{foreach item=author key=uid from=$block.authors}>
+        <tr>
+            <td><a href="<{$xoops_url}>/userinfo.php?uid=<{$uid}>"><{$author.name}></a></td>
+            <td align="center"><{$author.count}></td>
+        </tr>
+    <{/foreach}>
+
+    <{elseif $block.disp_mode == 1}>
+
+        <{foreach item=author key=uid from=$block.authors}>
+        <tr>
+            <td><a href="<{$xoops_url}>/userinfo.php?uid=<{$uid}>"><{$author.name}></a> <{$author.count}></td>
+        </tr>
+    <{/foreach}>
+
+    <{/if}>
+
+</table>
+<{if $block.indexNav}>
+    <div class="pagenav">
+        <a class="btn btn-secondary" href="<{$xoops_url}>/modules/newbb/"><{$smarty.const._MB_NEWBB_VSTFRMS}></a>
+    </div>
+<{/if}>