Skip to content

Commit d782d95

Browse files
zyspeczyspec
authored
Merge pull request #127 from mambax7/master
minor changes primarily focused on PHP8 compatibility
2 parents f619b07 + 6579b7e commit d782d95

File tree

83 files changed

+1341
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1341
-223
lines changed

‎EXTRA/themes/templates_fulldiv_opacity/newbb_edit_post.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<{if $element.hidden !== true}>
5151
<div class="edit_col1 head floatleft">
5252
<div class="xoops-form-element-caption<{if $element.required}>-required<{/if}>"><span class="caption-text"><{$element.caption}></span><span class="caption-marker">*</span></div>
53-
<{if $element.description != ''}>
53+
<{if $element.description|default:'' != ''}>
5454
<div class="xoops-form-element-help"><{$element.description}></div>
5555
<{/if}>
5656
</div>

‎EXTRA/themes/templates_fulldiv_opacity/newbb_rss.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<managingEditor><{$rss.channel_editor}></managingEditor>
1212
<webMaster><{$rss.channel_webmaster}></webMaster>
1313
<language><{$rss.channel_language}></language>
14-
<{if $rss.image_url != ""}>
14+
<{if $rss.image_url|default:'' != ''}>
1515
<image>
1616
<title><{$rss.image_title}></title>
1717
<url><{$rss.image_url}></url>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<div class="modal-dialog">
106106
<div class="modal-content">
107107
<div class="modal-header">
108-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
108+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
109109
<h4 class="modal-title" id="myModalLabel"><{$category.cat_title}></h4>
110110
</div>
111111
<div class="modal-body">
@@ -161,15 +161,15 @@
161161
</a>
162162
<{/if}>
163163
<!-- Forum description -->
164-
<{if $forum.forum_desc != ""}>
164+
<{if $forum.forum_desc|default:'' != ''}>
165165
<button class="btn btn-primary btn-xs pull-right" data-toggle="modal" data-target="#forumDesc-<{$forum.forum_id}>"><span
166166
class="glyphicon glyphicon-info-sign"></span></button>
167167
<div class="modal fade" id="forumDesc-<{$forum.forum_id}>" tabindex="-1" role="dialog" aria-labelledby="ForumDescription"
168168
aria-hidden="true">
169169
<div class="modal-dialog">
170170
<div class="modal-content">
171171
<div class="modal-header">
172-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
172+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
173173
<h4 class="modal-title" id="ForumDescription"><{$smarty.const.THEME_FORUM_DESC}>: <{$category.cat_title}>
174174
- <{$forum.forum_name}></h4>
175175
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<{$topic_post.poster.link}>
88

99
<{if $topic_post.poster.uid|default:'' gt -1}>
10-
<{if $topic_post.poster.uid != 0}>
10+
<{if $topic_post.poster.uid|default:0 != 0}>
1111
<{if $topic_post.poster.avatar != "blank.gif"}>
1212
<img src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="<{$topic_post.poster.name}>" class="img-circle img-thumbnail">
1313
<{else}>

‎EXTRA/themes/xbootstrap/modules/newbb/newbb_viewforum_menu.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<{if $typeOptions}>
1616
<select class="form-control" name="type" id="type" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}">
17-
<option value=""><{$smarty.const._MD_NEWBB_NEWBB_TYPE}></option>
17+
<option value=""><{$smarty.const._MD_NEWBB_TYPE}></option>
1818
<{foreach item=opt from=$typeOptions}>
1919
<option value="<{$opt.link}>"><{$opt.title}></option>
2020
<{/foreach}>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<li><span class="label label-info"><{$smarty.const._MD_NEWBB_POSTS}>: <{$sforum.forum_posts}></span></li>
2626

2727
<!-- If subforum description -->
28-
<{if $sforum.forum_desc != ""}>
28+
<{if $sforum.forum_desc|default:'' != ''}>
2929
<li>
3030
<button class="btn btn-xs btn-info" data-toggle="modal" data-target="#subforum-<{$sforum.forum_id}>">
3131
<span class="glyphicon glyphicon-info-sign"></span>
@@ -55,7 +55,7 @@
5555
<div class="modal-dialog">
5656
<div class="modal-content">
5757
<div class="modal-header">
58-
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
58+
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&amp;times;</span><span class="sr-only">Close</span></button>
5959
<h4 class="modal-title"><{$sforum.forum_name}></h4>
6060
</div>
6161
<div class="modal-body">

‎admin/admin_cat_manager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/** @var CategoryHandler $categoryHandler */
2929

3030
require_once __DIR__ . '/admin_header.php';
31-
require_once dirname(__DIR__) . '/include/functions.render.php';
31+
require_once \dirname(__DIR__) . '/include/functions.render.php';
3232

3333
xoops_cp_header();
3434

‎admin/admin_forum_manager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
require_once __DIR__ . '/admin_header.php';
3434
require_once $GLOBALS['xoops']->path('class/xoopstree.php');
3535
require_once $GLOBALS['xoops']->path('class/pagenav.php');
36-
require_once dirname(__DIR__) . '/include/functions.forum.php';
37-
require_once dirname(__DIR__) . '/include/functions.render.php';
36+
require_once \dirname(__DIR__) . '/include/functions.forum.php';
37+
require_once \dirname(__DIR__) . '/include/functions.render.php';
3838

3939
$cacheHelper = new Cache('newbb');
4040
Utility::cleanCache();

‎admin/admin_forum_prune.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
$sform->addElement($days);
185185
// START irmtfan remove hardcode db access
186186
require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/footer.php'); // to include js files
187-
require_once dirname(__DIR__) . '/include/functions.forum.php';
187+
require_once \dirname(__DIR__) . '/include/functions.forum.php';
188188
$forumSelMulti = "<select name=\"forums[]\" multiple=\"multiple\" onfocus = \"validate('forums[]','select', false,true)\">"; // disable all categories
189189
$forumSelSingle = "<select name=\"store\" onfocus = \"validate('store','select', false,true)\">"; // disable all categories
190190
$forumSelBox = '<option value = 0 >-- ' . _AM_NEWBB_PERM_FORUMS . ' --</option>';

‎admin/admin_header.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
/** @var Admin $adminObject */
2727

2828
//require_once $GLOBALS['xoops']->path('include/cp_header.php');
29-
require_once dirname(__DIR__, 3) . '/include/cp_header.php';
29+
require_once \dirname(__DIR__, 3) . '/include/cp_header.php';
3030
require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php');
3131
require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/functions.user.php');
3232
require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/functions.render.php');
3333
//require_once $GLOBALS['xoops']->path('Frameworks/art/functions.php');
3434
//require_once $GLOBALS['xoops']->path('Frameworks/art/functions.admin.php');
3535

36-
require_once dirname(__DIR__) . '/include/common.php';
36+
require_once \dirname(__DIR__) . '/include/common.php';
3737

3838
$helper = Helper::getInstance();
3939

0 commit comments

Comments
 (0)