Merge pull request #84 from mambax7/master

5.01 Beta 1

.gitattributes

@@ -5,13 +5,13 @@
 *.cs     diff=csharp
 
 # Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
+*.doc     diff=astextplain
+*.DOC     diff=astextplain
 *.docx diff=astextplain
 *.DOCX diff=astextplain
 *.dot  diff=astextplain
 *.DOT  diff=astextplain
 *.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.PDF     diff=astextplain
+*.rtf     diff=astextplain
+*.RTF     diff=astextplain

.scrutinizer.yml

@@ -9,14 +9,19 @@ build:
         # to install a specific release tag or branch instead.
         - git clone --depth=1 https://github.com/XOOPS/XoopsCore25
         - git clone --depth=1 https://github.com/mambax7/tag
+        - git clone --depth=1 https://github.com/mambax7/xoopspoll
+        - git clone --depth=1 https://github.com/mambax7/xlanguage
       project_setup:
         override: true
       tests:
         override:
-        - php-scrutinizer-run --enable-security-analysis
+          - php-scrutinizer-run --enable-security-analysis
+  environment:
+    php:
+      version: "7.2"
 filter:
   dependency_paths:
-  - XoopsCore25/*
-  - tag/*
-  - Xoopspoll
-
+    - XoopsCore25/*
+    - tag/*
+    - xoopspoll
+    - xlanguage

EXTRA/index.php

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

EXTRA/themes/index.php

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

EXTRA/themes/templates_fulldiv_opacity/blocks/index.php

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

EXTRA/themes/templates_fulldiv_opacity/css/index.php

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

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

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

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

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

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

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

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

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

EXTRA/themes/templates_fulldiv_opacity/images/index.php

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

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

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

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

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

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

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

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

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

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

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

EXTRA/themes/templates_fulldiv_opacity/index.php

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

EXTRA/themes/templates_fulldiv_opacity/js/index.php

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

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

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

EXTRA/themes/templates_fulldiv_opacity/js/language/english/newbb_validation.js

@@ -2,7 +2,7 @@
  * Newbb Javascript Validation functions
  *
  * @copyright       XOOPS Project (https://xoops.org)
- * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license         GNU GPL 2 (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
  * @module             newbb
  * @since           4.3
  * @author          irmtfan

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

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

EXTRA/themes/templates_fulldiv_opacity/newbb_edit_post.tpl

@@ -47,7 +47,7 @@
 <form name="<{$form_post.name}>" id="<{$form_post.name}>" action="<{$form_post.action}>" method="<{$form_post.method}>" <{$form_post.extra}> >
     <div class='outer'>
         <{foreach item=element from=$form_post.elements}>
-        <{if $element.hidden != true}>
+        <{if $element.hidden !== true}>
             <div class="edit_col1 head floatleft">
                 <div class="xoops-form-element-caption<{if $element.required}>-required<{/if}>"><span class="caption-text"><{$element.caption}></span><span class="caption-marker">*</span></div>
                 <{if $element.description != ''}>
@@ -60,7 +60,7 @@
         <{/foreach}>
     </div>
     <{foreach item=element from=$form_post.elements}>
-    <{if $element.hidden == true}>
+    <{if $element.hidden === true}>
         <{$element.body}>
         <div class="clear"></div>
     <{/if}>

EXTRA/themes/templates_fulldiv_opacity/newbb_notification_select.tpl

@@ -21,7 +21,7 @@
                         <div class="odd">
                             <{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" <{if $event.subscribed}>checked="checked"<{/if}> >
+                                <input type="checkbox" id="not_list[]" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked<{/if}> >
                         </div>
                         <div class="odd"><{$event.caption}></div>
                     </div>

EXTRA/themes/xbootstrap/index.php

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

EXTRA/themes/xbootstrap/modules/index.php

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

EXTRA/themes/xbootstrap/modules/newbb/index.php

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

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

@@ -22,19 +22,19 @@
 <div class="clear"></div>
 <br>
 
-<{if $disclaimer}>
+<{if $disclaimer|default:''}>
     <div class="confirmMsg"><{$disclaimer}></div>
     <div class="clear"></div>
     <br>
 <{/if}>
 
-<{if $error_message}>
+<{if $error_message|default:''}>
     <div class="errorMsg"><{$error_message}></div>
     <div class="clear"></div>
     <br>
 <{/if}>
 
-<{if $post_preview}>
+<{if $post_preview|default:''}>
     <table width='100%' class='outer' cellspacing='1'>
         <tr valign="top">
             <td class="head"><{$post_preview.subject}></td>
@@ -53,13 +53,13 @@
       method="<{$form_post.method}>" <{$form_post.extra}> >
     <table width='100%' class='outer' cellspacing='1'>
         <{foreach item=element from=$form_post.elements}>
-        <{if $element.hidden != true}>
+        <{if $element.hidden|default:false != true}>
             <tr valign="top">
                 <td class="head">
-                    <div class="xoops-form-element-caption<{if $element.required}>-required<{/if}>"><span
-                                class="caption-text"><{$element.caption}></span><span class="caption-marker">*</span>
+                    <div class="xoops-form-element-caption<{if $element.required|default:''}>-required<{/if}>"><span
+                                class="caption-text"><{$element.caption|default:''}></span><span class="caption-marker">*</span>
                     </div>
-                    <{if $element.description != ''}>
+                    <{if $element.description|default:'' != ''}>
                         <div class="xoops-form-element-help"><{$element.description}></div>
                     <{/if}>
                 </td>
@@ -69,7 +69,7 @@
         <{/foreach}>
     </table>
     <{foreach item=element from=$form_post.elements}>
-    <{if $element.hidden == true}>
+    <{if $element.hidden|default:false == true}>
         <{$element.body}>
     <{/if}>
     <{/foreach}>
@@ -78,7 +78,7 @@
 <div class="clear"></div>
 <br>
 
-<{if $posts_context}>
+<{if $posts_context|default:''}>
     <table width='100%' class='outer' cellspacing='1'>
         <{foreach item=post from=$posts_context}>
         <tr valign="top">

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

@@ -19,7 +19,7 @@
                         </a>
 
                         <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" title="<{$smarty.const._MD_NEWBB_TYPE_PENDING}>" class="btn btn-xs btn-primary">
-                            <{if $wait_new_topic}><span class="badge"><{$wait_new_topic}></span><{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}>
+                            <{if $wait_new_topic|default:''}><span class="badge"><{$wait_new_topic}></span><{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}>
                         </a>
 
                         <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" title="<{$smarty.const._MD_NEWBB_TYPE_DELETED}>" class="btn btn-xs btn-danger">
@@ -38,7 +38,7 @@
                         </a>
 
                         <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=pending#admin" title="<{$smarty.const._MD_NEWBB_TYPE_PENDING}>" class="btn btn-xs btn-primary">
-                            <{if $wait_new_post}>(<span style="color:#ff0000;"><{$wait_new_post}></span>)<{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}>
+                            <{if $wait_new_post|default:''}>(<span style="color:#ff0000;"><{$wait_new_post}></span>)<{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}>
                         </a>
 
                         <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=deleted#admin" title="<{$smarty.const._MD_NEWBB_TYPE_DELETED}>" class="btn btn-xs btn-primary">
@@ -140,13 +140,13 @@
                         <{foreach item=forum from=$category.forums}>
                         <div class="row newbb-list-foruns mb10">
                             <div class="col-sm-6 col-md-6">
-                                <{if $forum.subforum}>
-                                    <div class="<{if $forum.forum_read eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
-                                        <{$forum.forum_folder}>
+                                <{if $forum.subforum|default:false}>
+                                    <div class="<{if $forum.forum_read|default:0  eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
+                                        <{$forum.forum_folderforum_read|default:'' }>
                                     </div>
                                 <{else}>
-                                    <div class="<{if $forum.forum_read eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
-                                        <{$forum.forum_folder}>
+                                    <div class="<{if $forum.forum_read|default:0  eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
+                                        <{$forum.forum_folderforum_read|default:'' }>
                                     </div>
                                 <{/if}>
 
@@ -195,23 +195,23 @@
                             </div>
 
                             <div class="col-sm-1 col-md-1 text-center hidden-xs">
-                                <{if $stats[$forum.forum_id].topic.day}>
+                                <{if $stats[$forum.forum_id].topic.day|default:''}>
                                     <strong><{$stats[$forum.forum_id].topic.day}></strong>
                                     /
                                 <{/if}>
                                 <{$forum.forum_topics}>
                             </div>
 
                             <div class="col-sm-1 col-md-1 text-center hidden-xs">
-                                <{if $stats[$forum.forum_id].post.day}>
+                                <{if $stats[$forum.forum_id].post.day|default:''}>
                                     <strong><{$stats[$forum.forum_id].post.day}></strong>
                                     /
                                 <{/if}>
                                 <{$forum.forum_posts}>
                             </div>
 
                             <div class="col-sm-4 col-md-4 hidden-xs">
-                                <{if $forum.forum_lastpost_subject}>
+                                <{if $forum.forum_lastpost_subject|default:''}>
                                     <{$forum.forum_lastpost_time}> <{$smarty.const._MD_NEWBB_BY}> <{$forum.forum_lastpost_user}>
                                     <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
                                         <{$forum.forum_lastpost_subject}>
@@ -221,9 +221,9 @@
                                     <{$smarty.const._MD_NEWBB_NOTOPIC}>
                                 <{/if}>
 
-                                <{if $forum.subforum}>
+                                <{if $forum.subforum|default:false}>
                                     <{$smarty.const._MD_NEWBB_SUBFORUMS}><{$img_subforum}>
-                                    <{foreach item=subforum from=$forum.subforum}>
+                                    <{foreach item=subforum from=$forum.subforum|default:false}>
                                     [
                                     <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>
                                     ]

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

@@ -3,8 +3,7 @@
         <h4 class="txtcenter"><{$lang_activenotifications}>    </h4>
         <!-- irmtfan remove value=xoops_url -->
         <input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>">
-        <input type="hidden" name="XOOPS_TOKEN_REQUEST"
-               value="<{php}>echo $GLOBALS['xoopsSecurity']->createToken();<{/php}>">
+        <{securityToken}>
         <table class="outer">
             <tr>
                 <th colspan="3"><{$lang_notificationoptions}></th>
@@ -27,7 +26,7 @@
                             <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"
-                                   <{if $event.subscribed}>checked="checked"<{/if}> >
+                                   <{if $event.subscribed}>checked<{/if}> >
                         </td>
                         <td class="odd"><{$event.caption}></td>
                     </tr>

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

@@ -2,7 +2,7 @@
     <li><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$forumindex}></a></li>
     <li class="active"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._SR_SEARCH}></a></li>
 </ol>
-<{if $search_info}>
+<{if $search_info|default:''}>
     <{include file="db:newbb_searchresults.tpl" results=$results}>
 <{/if}>
 
@@ -50,7 +50,7 @@
                 <strong><{$smarty.const._MD_NEWBB_SELECT_STARTLAG}></strong>&nbsp;
             </td>
             <td class="even" title="<{$smarty.const._MD_NEWBB_SELECT_STARTLAG_DESC}>">
-                <input class="form-control" type="text" name="selectstartlag" value="<{$selectstartlag_select}>">
+                <input class="form-control" type="text" name="selectstartlag" value="<{$selectstartlag_select|default:''}>">
             </td>
         </tr>
         <tr>
@@ -59,11 +59,11 @@
         </tr>
         <tr>
             <td class="head" id="align_right"><strong><{$smarty.const._MD_NEWBB_SELECT_HTML}></strong>&nbsp;</td>
-            <td class="even"><{$selecthtml_radio}></td>
+            <td class="even"><{$selecthtml_radio|default:''}></td>
         </tr>
         <tr>
             <td class="head" id="align_right"><strong><{$smarty.const._MD_NEWBB_SELECT_EXCLUDE}></strong>&nbsp;</td>
-            <td class="even"><{$selectexclude_check_box}></td>
+            <td class="even"><{$selectexclude_check_box|default:''}></td>
         </tr>
         <!-- END irmtfan add select text options -->
         <!-- START irmtfan add show search -->

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

@@ -35,11 +35,11 @@
         <{/section}>
         <!-- end search results -->
 
-        <{if $search_next or $search_prev}>
+        <{if $search_next|default:'' or $search_prev|default:''}>
         <tr>
             <!-- irmtfan hardcode removed align="left" -->
-            <td colspan="2" class="align_left"><{$search_prev}> </td>
-            <td colspan="2" class="align_right"> <{$search_next}></td>
+            <td colspan="2" class="align_left"><{$search_prev|default:''}> </td>
+            <td colspan="2" class="align_right"> <{$search_next|default:''}></td>
         </tr>
         <{/if}>
         </tbody>