diff --git a/.gitattributes b/.gitattributes index bdb0cabc..0b7c43d4 100644 --- a/.gitattributes +++ b/.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 diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 9ea8109e..22ad2693 100644 --- a/.scrutinizer.yml +++ b/.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 diff --git a/EXTRA/index.html b/EXTRA/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/EXTRA/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/EXTRA/index.php b/EXTRA/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/index.php @@ -0,0 +1,2 @@ +history.go(-1); \ No newline at end of file diff --git a/EXTRA/themes/index.php b/EXTRA/themes/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/index.php @@ -0,0 +1,2 @@ +history.go(-1); \ No newline at end of file diff --git a/EXTRA/themes/templates_fulldiv_opacity/blocks/index.php b/EXTRA/themes/templates_fulldiv_opacity/blocks/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/blocks/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/css/index.php b/EXTRA/themes/templates_fulldiv_opacity/css/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/css/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/css/language/english/index.php b/EXTRA/themes/templates_fulldiv_opacity/css/language/english/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/css/language/english/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/css/language/index.php b/EXTRA/themes/templates_fulldiv_opacity/css/language/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/css/language/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/css/language/persian/index.php b/EXTRA/themes/templates_fulldiv_opacity/css/language/persian/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/css/language/persian/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/images/icon/index.php b/EXTRA/themes/templates_fulldiv_opacity/images/icon/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/images/icon/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/images/index.php b/EXTRA/themes/templates_fulldiv_opacity/images/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/images/index.php @@ -0,0 +1,2 @@ +history.go(-1); \ No newline at end of file diff --git a/EXTRA/themes/templates_fulldiv_opacity/images/language/english/index.php b/EXTRA/themes/templates_fulldiv_opacity/images/language/english/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/images/language/english/index.php @@ -0,0 +1,2 @@ +history.go(-1); \ No newline at end of file diff --git a/EXTRA/themes/templates_fulldiv_opacity/images/language/index.php b/EXTRA/themes/templates_fulldiv_opacity/images/language/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/images/language/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/images/language/persian/index.php b/EXTRA/themes/templates_fulldiv_opacity/images/language/persian/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/images/language/persian/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/images/mime/index.php b/EXTRA/themes/templates_fulldiv_opacity/images/mime/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/images/mime/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/images/rpg/index.php b/EXTRA/themes/templates_fulldiv_opacity/images/rpg/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/images/rpg/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/index.php b/EXTRA/themes/templates_fulldiv_opacity/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/js/index.php b/EXTRA/themes/templates_fulldiv_opacity/js/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/js/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/js/language/english/index.php b/EXTRA/themes/templates_fulldiv_opacity/js/language/english/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/js/language/english/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/templates_fulldiv_opacity/js/language/index.php b/EXTRA/themes/templates_fulldiv_opacity/js/language/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/templates_fulldiv_opacity/js/language/index.php @@ -0,0 +1,2 @@ +" id="<{$form_post.name}>" action="<{$form_post.action}>" method="<{$form_post.method}>" <{$form_post.extra}> >
<{foreach item=element from=$form_post.elements}> - <{if $element.hidden != true}> + <{if $element.hidden !== true}>
<{$element.caption}>*
<{if $element.description != ''}> @@ -60,7 +60,7 @@ <{/foreach}>
<{foreach item=element from=$form_post.elements}> - <{if $element.hidden == true}> + <{if $element.hidden === true}> <{$element.body}>
<{/if}> diff --git a/EXTRA/themes/templates_fulldiv_opacity/newbb_notification_select.tpl b/EXTRA/themes/templates_fulldiv_opacity/newbb_notification_select.tpl index dca8a168..9bab3484 100644 --- a/EXTRA/themes/templates_fulldiv_opacity/newbb_notification_select.tpl +++ b/EXTRA/themes/templates_fulldiv_opacity/newbb_notification_select.tpl @@ -21,7 +21,7 @@
<{counter assign=index}> - checked="checked"<{/if}> > + checked<{/if}> >
<{$event.caption}>
diff --git a/EXTRA/themes/xbootstrap/index.html b/EXTRA/themes/xbootstrap/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/EXTRA/themes/xbootstrap/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/EXTRA/themes/xbootstrap/index.php b/EXTRA/themes/xbootstrap/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/xbootstrap/index.php @@ -0,0 +1,2 @@ +history.go(-1); \ No newline at end of file diff --git a/EXTRA/themes/xbootstrap/modules/index.php b/EXTRA/themes/xbootstrap/modules/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/xbootstrap/modules/index.php @@ -0,0 +1,2 @@ +history.go(-1); diff --git a/EXTRA/themes/xbootstrap/modules/newbb/index.php b/EXTRA/themes/xbootstrap/modules/newbb/index.php new file mode 100644 index 00000000..6a505435 --- /dev/null +++ b/EXTRA/themes/xbootstrap/modules/newbb/index.php @@ -0,0 +1,2 @@ +
-<{if $disclaimer}> +<{if $disclaimer|default:''}>
<{$disclaimer}>

<{/if}> -<{if $error_message}> +<{if $error_message|default:''}>
<{$error_message}>

<{/if}> -<{if $post_preview}> +<{if $post_preview|default:''}> @@ -53,13 +53,13 @@ method="<{$form_post.method}>" <{$form_post.extra}> >
<{$post_preview.subject}>
<{foreach item=element from=$form_post.elements}> - <{if $element.hidden != true}> + <{if $element.hidden|default:false != true}> @@ -69,7 +69,7 @@ <{/foreach}>
-
<{$element.caption}>* +
<{$element.caption|default:''}>*
- <{if $element.description != ''}> + <{if $element.description|default:'' != ''}>
<{$element.description}>
<{/if}>
<{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 @@

-<{if $posts_context}> +<{if $posts_context|default:''}> <{foreach item=post from=$posts_context}> diff --git a/EXTRA/themes/xbootstrap/modules/newbb/newbb_index.tpl b/EXTRA/themes/xbootstrap/modules/newbb/newbb_index.tpl index c9433f14..ceb59a93 100644 --- a/EXTRA/themes/xbootstrap/modules/newbb/newbb_index.tpl +++ b/EXTRA/themes/xbootstrap/modules/newbb/newbb_index.tpl @@ -19,7 +19,7 @@ - <{if $wait_new_topic}><{$wait_new_topic}><{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}> + <{if $wait_new_topic|default:''}><{$wait_new_topic}><{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}> @@ -38,7 +38,7 @@ - <{if $wait_new_post}>(<{$wait_new_post}>)<{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}> + <{if $wait_new_post|default:''}>(<{$wait_new_post}>)<{/if}> <{$smarty.const._MD_NEWBB_TYPE_PENDING}> @@ -140,13 +140,13 @@ <{foreach item=forum from=$category.forums}>
- <{if $forum.subforum}> -
- <{$forum.forum_folder}> + <{if $forum.subforum|default:false}> +
+ <{$forum.forum_folderforum_read|default:'' }>
<{else}> -
- <{$forum.forum_folder}> +
+ <{$forum.forum_folderforum_read|default:'' }>
<{/if}> @@ -195,7 +195,7 @@
@@ -27,7 +26,7 @@ checked="checked"<{/if}> > + <{if $event.subscribed}>checked<{/if}> > diff --git a/EXTRA/themes/xbootstrap/modules/newbb/newbb_search.tpl b/EXTRA/themes/xbootstrap/modules/newbb/newbb_search.tpl index fb8ee230..fd653e9f 100644 --- a/EXTRA/themes/xbootstrap/modules/newbb/newbb_search.tpl +++ b/EXTRA/themes/xbootstrap/modules/newbb/newbb_search.tpl @@ -2,7 +2,7 @@
  • <{$forumindex}>
  • <{$smarty.const._SR_SEARCH}>
    • -<{if $search_info}> +<{if $search_info|default:''}> <{include file="db:newbb_searchresults.tpl" results=$results}> <{/if}> @@ -50,7 +50,7 @@ <{$smarty.const._MD_NEWBB_SELECT_STARTLAG}>  @@ -59,11 +59,11 @@ - + - + diff --git a/EXTRA/themes/xbootstrap/modules/newbb/newbb_searchresults.tpl b/EXTRA/themes/xbootstrap/modules/newbb/newbb_searchresults.tpl index c6879351..ef95ba48 100644 --- a/EXTRA/themes/xbootstrap/modules/newbb/newbb_searchresults.tpl +++ b/EXTRA/themes/xbootstrap/modules/newbb/newbb_searchresults.tpl @@ -35,11 +35,11 @@ <{/section}> - <{if $search_next or $search_prev}> + <{if $search_next|default:'' or $search_prev|default:''}> - - + + <{/if}> diff --git a/EXTRA/themes/xbootstrap/modules/newbb/newbb_thread.tpl b/EXTRA/themes/xbootstrap/modules/newbb/newbb_thread.tpl index 650aebdd..e296f7ef 100644 --- a/EXTRA/themes/xbootstrap/modules/newbb/newbb_thread.tpl +++ b/EXTRA/themes/xbootstrap/modules/newbb/newbb_thread.tpl @@ -1,12 +1,12 @@
    - <{if $forum_post_prefix === null }> + <{if $forum_post_prefix|default:'' === null }> <{assign var=forum_post_prefix value="forumpost"}>
    <{/if}>
    <{$topic_post.poster.link}> - <{if $topic_post.poster.uid gt -1}> + <{if $topic_post.poster.uid|default:'' gt -1}> <{if $topic_post.poster.uid != 0}> <{if $topic_post.poster.avatar != "blank.gif"}> <{$topic_post.poster.name}> @@ -77,7 +77,7 @@
  • IP: <{$topic_post.poster_ip}>
    • <{/if}> - <{if $topic_post.poster.uid gt 0}> + <{if $topic_post.poster.uid|default:'' gt 0}>
  • <{$smarty.const._MD_NEWBB_POSTEDON}><{$topic_post.post_date}>
    • <{/if}> @@ -89,7 +89,7 @@ <{$topic_post.post_title}> <{if $topic_post.post_id > 0}> - + #<{$topic_post.post_no}> <{/if}> diff --git a/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewall.tpl b/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewall.tpl index b63560b1..d1ab651f 100644 --- a/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewall.tpl +++ b/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewall.tpl @@ -1,9 +1,9 @@
    1. <{$smarty.const._MD_NEWBB_FORUMHOME}>
      2. - <{if $parent_forum}> + <{if $parent_forum|default:''}>
    2. <{$parent_name}>
    3. <{$forum_name}>
      4. - <{elseif $forum_name}> + <{elseif $forum_name|default:''}>
    4. <{$forum_name}>
      5. <{/if}> <{if $current}> @@ -81,7 +81,7 @@ <{/foreach}> - <{foreach item=filter from=$types}> + <{foreach item=filter from=$types|default:null}> <{/foreach}> @@ -146,7 +146,7 @@
    - <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> + <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''|replace:' //':'/'}>
    @@ -196,7 +196,7 @@ "> - + <{* irmtfan remove hardcoded html in URLs *}> - + <{* irmtfan hardcode removed align="right" *}> <{/foreach}> @@ -27,10 +27,10 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> - + <{* irmtfan hardcode removed align="right" *}> <{/foreach}> @@ -39,7 +39,7 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> <{/foreach}> @@ -49,9 +49,9 @@
    <{$lang_notificationoptions}> <{$event.caption}>
    - +
    <{$smarty.const._MD_NEWBB_SELECT_HTML}> <{$selecthtml_radio}><{$selecthtml_radio|default:''}>
    <{$smarty.const._MD_NEWBB_SELECT_EXCLUDE}> <{$selectexclude_check_box}><{$selectexclude_check_box|default:''}>
    <{$search_prev}> <{$search_next}><{$search_prev|default:''}> <{$search_next|default:''}>
    <{$topic.topic_icon}><{$topic.sticky}>
    <{$topic.digest}><{$topic.poll}>    		   - <{$topic.topic_title}><{$topic.attachment}> <{$topic.topic_page_jump}> + <{$topic.topic_title}><{$topic.attachment|default:''}> <{$topic.topic_page_jump}>
    <{$headers.publish.title}>: <{$topic.topic_time}> @@ -243,7 +243,7 @@ <{if $pagenav}> -
    <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> +
    <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''|replace:' //':'/'}>

    <{/if}> diff --git a/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewforum.tpl b/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewforum.tpl index 949b12a4..4ded45ea 100644 --- a/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewforum.tpl +++ b/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewforum.tpl @@ -27,7 +27,7 @@ <{/if}> <{/if}> - <{if $forum_topictype}><{$forum_topictype}><{/if}> + <{if $forum_topictype|default:''}><{$forum_topictype}><{/if}> <{if $forum_topicstatus}> <{$forum_topicstatus}> @@ -41,7 +41,7 @@ - <{if $subforum}> + <{if $subforum|default:''}> <{include file="db:newbb_viewforum_subforum.tpl"}> <{/if}>
    @@ -173,7 +173,7 @@ <{$topic.topic_title}> - +<{* <{$topic.attachment}> <{$topic.topic_page_jump}> *}>
    <{$topic.topic_time}>
    diff --git a/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewtopic.tpl b/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewtopic.tpl index a4cb24be..ed0ccc38 100644 --- a/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewtopic.tpl +++ b/EXTRA/themes/xbootstrap/modules/newbb/newbb_viewtopic.tpl @@ -14,7 +14,7 @@
  • <{$topic_title|strip_tags}> <{if $topicstatus}><{$topicstatus}><{/if}>
    • - <{if $tagbar}> + <{if $tagbar|default:false}>
    <{include file="db:tag_bar.tpl"}>
    @@ -44,29 +44,29 @@ <{/if}>
    - <{if $viewer_level gt 1}> -
    - <{if $mode gt 1}> -
    - <{$smarty.const._ALL}>: - + - - | - <{$smarty.const._MD_NEWBB_TYPE_VIEW}> - <{else}> - <{$smarty.const._MD_NEWBB_TYPE_ADMIN}> | - <{$smarty.const._MD_NEWBB_TYPE_PENDING}> | - <{$smarty.const._MD_NEWBB_TYPE_DELETED}> - <{/if}> -
    + <{/if}> + + + | + <{$smarty.const._MD_NEWBB_TYPE_VIEW}> + <{else}> + <{$smarty.const._MD_NEWBB_TYPE_ADMIN}> | + <{$smarty.const._MD_NEWBB_TYPE_PENDING}> | + <{$smarty.const._MD_NEWBB_TYPE_DELETED}> + <{/if}> +
    <{/if}>
    <{$forum_page_nav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> @@ -74,7 +74,7 @@
    <{if $mode lte 1}> - <{if $topic_poll}> + <{if $topic_poll|default:''}> <{if $topic_pollresult}> <{include file="db:newbb_poll_results.tpl" poll=$poll}> <{else}> @@ -143,7 +143,7 @@ <{/foreach}> <{/if}> - <{if $adminpoll_actions|is_array && count($adminpoll_actions) > 0 }> + <{if $adminpoll_actions|default:null|is_array && count($adminpoll_actions) > 0 }> <{foreach item=actpoll from=$adminpoll_actions}> @@ -233,22 +233,22 @@ <{include file='db:newbb_notification_select.tpl'}> - + +<{* *}> + diff --git a/assets/css/index.php b/assets/css/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/css/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/assets/images/category/index.php b/assets/images/category/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/images/category/index.php @@ -0,0 +1,3 @@ +history.go(-1); \ No newline at end of file diff --git a/assets/images/filetypes/index.php b/assets/images/filetypes/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/images/filetypes/index.php @@ -0,0 +1,3 @@ +history.go(-1); \ No newline at end of file diff --git a/assets/images/icons/index.php b/assets/images/icons/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/images/icons/index.php @@ -0,0 +1,3 @@ +history.go(-1); \ No newline at end of file diff --git a/assets/images/index.php b/assets/images/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/images/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/assets/images/menu/index.php b/assets/images/menu/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/images/menu/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/assets/index.php b/assets/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/assets/js/index.php b/assets/js/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/assets/js/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/blocks/index.php b/blocks/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/blocks/index.php @@ -0,0 +1,3 @@ +, irmtfan * @author The Persian Xoops Support Site * @since 4.3 * @package module::newbb */ -use XoopsModules\Newbb; +use XoopsModules\Newbb\{Helper, + TopicRenderer +}; -// defined('XOOPS_ROOT_PATH') || die('Restricted access'); +/** @var Helper $helper */ if (defined('LIST_TOPIC_DEFINED')) { return; @@ -53,7 +55,7 @@ function newbb_list_topic_show($options) { $newbbConfig = newbbLoadConfig(); // load all newbb configs - $topicRenderer = new Newbb\TopicRenderer(); + $topicRenderer = new TopicRenderer(); $topicRenderer->userlevel = $GLOBALS['xoopsUserIsAdmin'] ? 2 : is_object($GLOBALS['xoopsUser']); // Vistitor's level: 0 - anonymous; 1 - user; 2 - moderator or admin $topicRenderer->force = true; // force against static vars for parse @@ -71,22 +73,24 @@ function newbb_list_topic_show($options) // set and parse values: // forum: parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums - $topicRenderer->setVars([ - 'status' => $optionsStatus, - 'uid' => $options[1], - 'lastposter' => $options[2], - 'type' => $options[3], - 'sort' => $options[4], - 'order' => $options[5], - 'since' => $options[7], - 'forum' => $optionsForum, - ]); + $topicRenderer->setVars( + [ + 'status' => $optionsStatus, + 'uid' => $options[1], + 'lastposter' => $options[2], + 'type' => $options[3], + 'sort' => $options[4], + 'order' => $options[5], + 'since' => $options[7], + 'forum' => $optionsForum, + ] + ); $block = []; // headers to display in block $block['headers'] = $topicRenderer->getHeader($options[8]); // render a list of topics using all above criterias - list($block['topics'], $block['sticky']) = $topicRenderer->renderTopics(); + [$block['topics'], $block['sticky']] = $topicRenderer->renderTopics(); // show index navigation $block['indexNav'] = !empty($options[9]); @@ -105,7 +109,7 @@ function newbb_list_topic_edit($options) // $form = new \XoopsBlockForm(); //reserve for 2.6 $form = new \XoopsThemeForm(_MB_NEWBB_DISPLAYMODE_DESC, 'list_topic', ''); - $topicRenderer = new Newbb\TopicRenderer(); + $topicRenderer = new TopicRenderer(); $topicRenderer->userlevel = 2; // 2 - moderator or admin // status element @@ -182,10 +186,10 @@ function newbb_list_topic_edit($options) $optionsForum = explode(',', $options[12]); require_once dirname(__DIR__) . '/include/functions.forum.php'; /** @var Newbb\ForumHandler $forumHandler */ - $forumHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Forum'); + $forumHandler = Helper::getInstance()->getHandler('Forum'); //get forum Ids by values. parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums // Get accessible forums - $accessForums = $forumHandler->getIdsByValues(array_map('intval', $optionsForum)); + $accessForums = $forumHandler->getIdsByValues(array_map('\intval', $optionsForum)); $isAll = (0 === count($optionsForum) || empty($optionsForum[0])); $forumSel = "'; $form .= '
    <{$topic.forum_name}> <{$topic.title}> <{$topic.replies}> <{$topic.views}><{$topic.time}>
    <{$topic.topic_poster}> <{$topic.topic_page_jump}>
    <{$topic.title}> <{$topic.replies}><{$topic.time}>
    <{$topic.topic_poster}> <{$topic.topic_page_jump}>
    <{$topic.title}>
    <{if $block.indexNav}> - + <{* irmtfan hardcode removed style="text-align:right; padding: 5px;" *}>
    - + <{* irmtfan remove hardcoded html in URLs *}> <{$smarty.const._MB_NEWBB_ALLPOSTS}> | <{$smarty.const._MB_NEWBB_ALLTOPICS}> | <{$smarty.const._MB_NEWBB_VSTFRMS}> diff --git a/templates/blocks/newbb_block_author.tpl b/templates/blocks/newbb_block_author.tpl index 06e27d1e..4d6d4e73 100644 --- a/templates/blocks/newbb_block_author.tpl +++ b/templates/blocks/newbb_block_author.tpl @@ -24,7 +24,7 @@ <{if $block.indexNav}> - + <{* irmtfan hardcode removed style="text-align:right; padding: 5px;" *}>
    <{$smarty.const._MB_NEWBB_VSTFRMS}>
    diff --git a/templates/blocks/newbb_block_list_topic.tpl b/templates/blocks/newbb_block_list_topic.tpl index ef89d62a..67e7d290 100644 --- a/templates/blocks/newbb_block_list_topic.tpl +++ b/templates/blocks/newbb_block_list_topic.tpl @@ -1,8 +1,8 @@ - - - -<{assign var=minwidth value=200}> -<{assign var=topicwidth value=100}> +<{* a new block template for newbb *}> +<{* all classes can be found in xoops.css *}> +<{* define your desired width here *}> +<{assign var=minwidth value=200}> <{* minimum block minwidth property *}> +<{assign var=topicwidth value=100}> <{* maximum topic width property *}> <{if $block.headers.forum}> <{assign var=minwidth value=$minwidth+50}> @@ -23,7 +23,7 @@ <{assign var=minwidth value=$minwidth+100}> <{assign var=topicwidth value=$topicwidth-20}> <{/if}> -<{assign var=block_topic value=$topicwidth}> +<{assign var=block_topic value=$topicwidth}> <{* block topic width after reduction above *}>
    <{$block.headers.topic}>
    @@ -39,7 +39,7 @@
    <{$block.headers.lastpost}>
    - + <{* start forum topic *}> <{foreach name=loop item=topic from=$block.topics}>
    border">
    @@ -102,11 +102,11 @@
    <{/foreach}> - + <{* end forum topic *}>
    <{if $block.indexNav}> - + <{* a sample of pagenav. you can create your own! *}>
    <{$smarty.const._MB_NEWBB_ALLPOSTS}> | <{$smarty.const._MB_NEWBB_ALLTOPICS}> | diff --git a/templates/blocks/newbb_block_post.tpl b/templates/blocks/newbb_block_post.tpl index 98b7544e..b20f8314 100644 --- a/templates/blocks/newbb_block_post.tpl +++ b/templates/blocks/newbb_block_post.tpl @@ -7,10 +7,10 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> <{$topic.forum_name}> <{$topic.title}> - + <{* irmtfan hardcode removed align="right" *}> <{$topic.time}>
    <{$topic.topic_poster}> <{/foreach}> @@ -22,9 +22,9 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> <{$topic.title}> - + <{* irmtfan hardcode removed align="right" *}> <{$topic.time}>
    <{$topic.topic_poster}> <{/foreach}> @@ -33,7 +33,7 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> <{$topic.title}> <{/foreach}> @@ -56,9 +56,9 @@ <{if $block.indexNav}> - + <{* irmtfan hardcode removed style="text-align:right; padding: 5px;" *}>
    - + <{* irmtfan remove hardcoded html in URLs *}> <{$smarty.const._MB_NEWBB_ALLPOSTS}> | <{$smarty.const._MB_NEWBB_VSTFRMS}>
    diff --git a/templates/blocks/newbb_block_text.tpl b/templates/blocks/newbb_block_text.tpl index c7da9736..1775b25f 100644 --- a/templates/blocks/newbb_block_text.tpl +++ b/templates/blocks/newbb_block_text.tpl @@ -8,7 +8,7 @@ <{/foreach}> <{if $block.indexNav}> - +<{* irmtfan hardcode removed style="text-align:right; padding: 5px;" *}>
    <{$smarty.const._MB_NEWBB_ALLPOSTS}> | <{$smarty.const._MB_NEWBB_VSTFRMS}> diff --git a/templates/blocks/newbb_block_topic.tpl b/templates/blocks/newbb_block_topic.tpl index a666d53a..e18fabc1 100644 --- a/templates/blocks/newbb_block_topic.tpl +++ b/templates/blocks/newbb_block_topic.tpl @@ -10,12 +10,12 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> <{$topic.forum_name}> <{$topic.title}> <{$topic.replies}> <{$topic.views}> - + <{* irmtfan hardcode removed align="right" *}> <{$topic.time}>
    <{$topic.topic_poster}> <{/foreach}> @@ -27,9 +27,9 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> <{$topic.title}> - + <{* irmtfan hardcode removed align="right" *}> <{$topic.time}>
    <{$topic.topic_poster}> <{/foreach}> @@ -38,7 +38,7 @@ <{foreach item=topic from=$block.topics}> "> - + <{* irmtfan remove hardcoded html in URLs *}> <{$topic.title}> <{/foreach}> @@ -48,9 +48,9 @@ <{if $block.indexNav}> - + <{* irmtfan hardcode removed style="text-align:right; padding: 5px;" *}>
    - + <{* irmtfan remove hardcoded html in URLs *}> <{$smarty.const._MB_NEWBB_ALLTOPICS}> | <{$smarty.const._MB_NEWBB_VSTFRMS}>
    diff --git a/templates/css/index.html b/templates/css/index.html deleted file mode 100644 index 2c5cdd3f..00000000 --- a/templates/css/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/css/index.php b/templates/css/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/css/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/css/language/english/index.php b/templates/css/language/english/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/css/language/english/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/css/language/index.php b/templates/css/language/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/css/language/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/css/language/persian/index.php b/templates/css/language/persian/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/css/language/persian/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/images/icon/index.php b/templates/images/icon/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/icon/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/images/index.php b/templates/images/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/index.php @@ -0,0 +1,3 @@ +history.go(-1); \ No newline at end of file diff --git a/templates/images/language/english/index.php b/templates/images/language/english/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/language/english/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/images/language/german/index.php b/templates/images/language/german/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/language/german/index.php @@ -0,0 +1,3 @@ +history.go(-1); \ No newline at end of file diff --git a/templates/images/language/index.php b/templates/images/language/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/language/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/images/language/persian/index.php b/templates/images/language/persian/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/language/persian/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/images/mime/index.php b/templates/images/mime/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/mime/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/images/rpg/index.php b/templates/images/rpg/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/images/rpg/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/index.php b/templates/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/js/index.php b/templates/js/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/js/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/js/language/english/index.php b/templates/js/language/english/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/js/language/english/index.php @@ -0,0 +1,3 @@ +history.go(-1); diff --git a/templates/js/language/index.php b/templates/js/language/index.php new file mode 100644 index 00000000..2ea9b7d9 --- /dev/null +++ b/templates/js/language/index.php @@ -0,0 +1,3 @@ +

    <{$lang_forum_index}>

    - + <{* irmtfan hardcode removed align="left" *}>
    <{$smarty.const._MD_NEWBB_FORUMINDEX}> » @@ -52,7 +52,7 @@
    > <{foreach item=element from=$form_post.elements}> - <{if $element.hidden != true}> + <{if $element.hidden !== true}>
    <{$element.caption}>*
    @@ -66,7 +66,7 @@ <{/foreach}>
    <{foreach item=element from=$form_post.elements}> - <{if $element.hidden == true}> + <{if $element.hidden === true}> <{$element.body}> <{/if}> <{/foreach}> diff --git a/templates/newbb_index.tpl b/templates/newbb_index.tpl index 395ebe10..e987136e 100644 --- a/templates/newbb_index.tpl +++ b/templates/newbb_index.tpl @@ -1,8 +1,8 @@
    - + <{* irmtfan hardcode remove style="float: left;" *}>

    <{$index_title}>

    - + <{* irmtfan hardcode remove align="left" *}>
    <{$index_desc}>
    @@ -11,35 +11,35 @@ <{if $viewer_level gt 1}>
    -
    -  <{$smarty.const._MD_NEWBB_ADMINCP}>  -
    -
    - <{$smarty.const._MD_NEWBB_TOPIC}>: - <{$smarty.const._MD_NEWBB_TYPE_ADMIN}> | - <{if $wait_new_topic}>( - <{$wait_new_topic}> - ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_PENDING}> | - <{if $delete_topic}>( - <{$delete_topic}> - ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_DELETED}>
    - <{$smarty.const._MD_NEWBB_POST2}>: - <{$smarty.const._MD_NEWBB_TYPE_ADMIN}> | - <{if $wait_new_post}>( - <{$wait_new_post}> - ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_PENDING}> | - <{if $delete_post}>( - <{$delete_post}> - ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_DELETED}> -
    -
    - <{if $report_post}><{$report_post}><{/if}> -
    <{$smarty.const._MD_NEWBB_TYPE_SUSPEND}> | - <{$smarty.const._MD_NEWBB_ADMINCP}> +
    +  <{$smarty.const._MD_NEWBB_ADMINCP}>  +
    +
    + <{$smarty.const._MD_NEWBB_TOPIC}>: + <{$smarty.const._MD_NEWBB_TYPE_ADMIN}> | + <{if $wait_new_topic|default:''}>( + <{$wait_new_topic}> + ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_PENDING}> | + <{if $delete_topic}>( + <{$delete_topic}> + ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_DELETED}>
    + <{$smarty.const._MD_NEWBB_POST2}>: + <{$smarty.const._MD_NEWBB_TYPE_ADMIN}> | + <{if $wait_new_post}>( + <{$wait_new_post}> + ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_PENDING}> | + <{if $delete_post}>( + <{$delete_post}> + ) <{/if}><{$smarty.const._MD_NEWBB_TYPE_DELETED}> +
    +
    + <{if $report_post}><{$report_post}><{/if}> +
    <{$smarty.const._MD_NEWBB_TYPE_SUSPEND}> | + <{$smarty.const._MD_NEWBB_ADMINCP}> +
    +
    -
    -
    -
    + <{/if}>
    @@ -48,14 +48,14 @@

    - +<{* start forum categories *}>
    - + <{* start forum categories *}> <{foreach item=category from=$categories}> <{/if}> - + <{* irmtfan hardcode removed align="left" *}> <{if $category.cat_sponsor}> - + <{* irmtfan hardcode removed align="right" *}> <{/if}>
    - + <{* irmtfan simplify onclick method and use newbbDisplayImage(this.children[0] for IE7&8) - add alt and title" *}>
    <{$category.cat_displayImage}> @@ -64,30 +64,30 @@ <{if $category.cat_image}>
    		<{$category.cat_title}> <{$category.cat_title}> <{if $category.cat_description}>

    <{$category.cat_description}>

    <{/if}>

    <{$category.cat_sponsor.title}>

    - + <{* irmtfan move semicolon *}>
    <{if $category.forums}> <{if $subforum_display == "expand"}> - + <{* irmtfan hardcode removed align="left" *}> <{else}> - + <{* irmtfan hardcode removed align="left" *}> <{/if}> @@ -96,11 +96,11 @@ <{/if}> - + <{* start forums *}> <{if $subforum_display == "expand"}> <{foreach item=forum from=$category.forums}> - + <{* irmtfan add forum-read/forum-new smarty variable *}> - + <{* irmtfan hardcode removed align="right" *}> - <{if $forum.subforum}> + <{if $forum.subforum|default:false}> @@ -151,11 +151,11 @@ - <{foreach item=subforum from=$forum.subforum}> + <{foreach item=subforum from=$forum.subforum|default:null}> - - + <{* irmtfan add forum-read/forum-new smarty variable *}> + - + <{* irmtfan hardcode removed align="right" *}> - <{if $forum.subforum}> - - + <{if $forum.subforum|default:''}> + <{* irmtfan add forum-read/forum-new smarty variable *}> + <{else}> - + <{/if}> - + <{* irmtfan hardcode removed align="right" *}> - <{if $forum.subforum}> + <{if $forum.subforum|default:''}> - + <{* irmtfan hardcode removed align="left" *}> - - + <{* irmtfan add forum-read/forum-new smarty variable *}> + - + <{* irmtfan hardcode removed align="right" *}>
     <{$smarty.const._MD_NEWBB_FORUM}><{$smarty.const._MD_NEWBB_FORUM}><{$smarty.const._MD_NEWBB_TOPICS}>
    <{$forum.forum_folder}>
    @@ -127,14 +127,14 @@ <{if $stats[$forum.forum_id].post.day}><{$stats[$forum.forum_id].post.day}>/<{/if}> <{$forum.forum_posts}>
    		- <{if $forum.forum_lastpost_subject}> + <{if $forum.forum_lastpost_subject|default:''}> <{$forum.forum_lastpost_time}> <{$smarty.const._MD_NEWBB_BY}> <{$forum.forum_lastpost_user}>
    <{$forum.forum_lastpost_subject}>   - + <{* irmtfan remove icon_path *}> <{$forum.forum_lastpost_icon}> <{else}> @@ -142,7 +142,7 @@ <{/if}>
      <{$img_subforum}>    
     <{$subforum.forum_folder}><{$subforum.forum_folder|default:''}>
    <{$subforum.forum_name}> @@ -181,15 +181,15 @@ <{if $stats[$subforum.forum_id].post.day}><{$stats[$subforum.forum_id].post.day}>/<{/if}> <{$subforum.forum_posts}>
    		- <{if $subforum.forum_lastpost_subject}> + <{if $subforum.forum_lastpost_subject|default:''}> <{$subforum.forum_lastpost_time}> <{$smarty.const._MD_NEWBB_BY}> <{$subforum.forum_lastpost_user}>
    <{$subforum.forum_lastpost_subject}>   - + <{* irmtfan remove icon_path *}> <{$subforum.forum_lastpost_icon}> <{else}> @@ -205,11 +205,11 @@ <{foreach item=forum from=$category.forums}>
    <{$forum.forum_folder}><{$forum.forum_folder|default:''}><{$forum.forum_folder}><{$forum.forum_folder|default:''}>
    @@ -236,14 +236,14 @@ <{if $stats[$forum.forum_id].post.day}><{$stats[$forum.forum_id].post.day}>/<{/if}> <{$forum.forum_posts}>
    		- <{if $forum.forum_lastpost_subject}> + <{if $forum.forum_lastpost_subject|default:''}> <{$forum.forum_lastpost_time}> <{$smarty.const._MD_NEWBB_BY}> <{$forum.forum_lastpost_user}>
    <{$forum.forum_lastpost_subject}>   - + <{* irmtfan remove icon_path *}> <{$forum.forum_lastpost_icon}> <{else}> @@ -251,12 +251,12 @@ <{/if}>
    <{$smarty.const._MD_NEWBB_SUBFORUMS}> <{$img_subforum}>  - <{foreach item=subforum from=$forum.subforum}> + <{foreach item=subforum from=$forum.subforum|default:null}>  [ <{$subforum.forum_name}> ] @@ -270,8 +270,8 @@ <{foreach item=forum from=$category.forums}>
    <{$forum.forum_folder}><{$forum.forum_folder|default:''}>
    <{$forum.forum_name}> @@ -297,14 +297,14 @@ <{if $stats[$forum.forum_id].post.day}><{$stats[$forum.forum_id].post.day}>/<{/if}> <{$forum.forum_posts}>
    		- <{if $forum.forum_lastpost_subject}> + <{if $forum.forum_lastpost_subject|default:''}> <{$forum.forum_lastpost_time}> <{$smarty.const._MD_NEWBB_BY}> <{$forum.forum_lastpost_user}>
    <{$forum.forum_lastpost_subject}>   - + <{* irmtfan remove icon_path *}> <{$forum.forum_lastpost_icon}> <{else}> @@ -315,27 +315,27 @@ <{/foreach}> <{/if}> - + <{* end forums *}>

    <{/foreach}> - + <{* end forum categories *}>
    - +<{* irmtfan hardcode removed style="float: left; text-align: left;" *}>
    <{$img_forum_new}> = <{$smarty.const._MD_NEWBB_NEWPOSTS}>
    <{$img_forum}> = <{$smarty.const._MD_NEWBB_NONEWPOSTS}>

    - +<{* irmtfan hardcode removed style="float: right; text-align: right;" *}>
    - + <{* irmtfan remove name="submit" *}>
    [ <{$smarty.const._MD_NEWBB_ADVSEARCH}> ] @@ -361,19 +361,19 @@
    <{$currenttime}>
    - + <{* irmtfan add lastvisit smarty variable for all users *}> <{$lastvisit}>
    <{$smarty.const._MD_NEWBB_TOTALTOPICSC}> <{$stats[0].topic.total}> | <{$smarty.const._MD_NEWBB_TOTALPOSTSC}><{$stats[0].post.total}> <{if $stats[0].digest.total}> - | <{$smarty.const._MD_NEWBB_TOTALDIGESTSC}><{$stats[0].digest.total}> + | <{$smarty.const._MD_NEWBB_TOTALDIGESTSC}><{$stats[0].digest.total}> <{/if}> <{if $userstats}>

    - - <{*$userstats.lastvisit*}> + <{* irmtfan userstats.lastvisit should be removed because it is for anon users too *}> + <{* $userstats.lastvisit *}>
    <{$userstats.lastpost}> <{/if}> @@ -397,4 +397,4 @@ <{include file="db:newbb_online.tpl"}> <{/if}> <{include file='db:newbb_notification_select.tpl'}> - +<{* end module contents *}> diff --git a/templates/newbb_moderate.tpl b/templates/newbb_moderate.tpl index 14f2db71..99c7879d 100644 --- a/templates/newbb_moderate.tpl +++ b/templates/newbb_moderate.tpl @@ -59,7 +59,7 @@ > <{foreach item=element from=$suspend_form.elements}> - <{if $element.hidden != true}> + <{if $element.hidden !== true}>
    <{$element.caption}>*
    @@ -73,7 +73,7 @@ <{/foreach}>
    <{foreach item=element from=$suspend_form.elements}> - <{if $element.hidden == true}> + <{if $element.hidden === true}> <{$element.body}> <{/if}> <{/foreach}> diff --git a/templates/newbb_notification_select.tpl b/templates/newbb_notification_select.tpl index f57fd0df..394191a3 100644 --- a/templates/newbb_notification_select.tpl +++ b/templates/newbb_notification_select.tpl @@ -1,7 +1,7 @@ <{if $xoops_notification.show}>

    <{$lang_activenotifications}>

    - + <{* irmtfan remove value=xoops_url *}> <{securityToken}> @@ -22,7 +22,7 @@ diff --git a/templates/newbb_search.tpl b/templates/newbb_search.tpl index 9bed0cca..0f14436c 100644 --- a/templates/newbb_search.tpl +++ b/templates/newbb_search.tpl @@ -13,38 +13,38 @@ diff --git a/templates/newbb_searchresults.tpl b/templates/newbb_searchresults.tpl index 6ba15053..d3318699 100644 --- a/templates/newbb_searchresults.tpl +++ b/templates/newbb_searchresults.tpl @@ -11,17 +11,17 @@ - + <{* start search results *}> <{section name=i loop=$results}> - + <{* start each result *}> - + <{* irmtfan hardcode removed align="left" *}> - + <{* START irmtfan add show search *}> <{if $results[i].post_text }> @@ -32,10 +32,10 @@ <{/if}> - - + <{* END irmtfan add show search *}> + <{* end each result *}> <{/section}> - + <{* end search results *}>
    <{counter assign=index}> - checked="checked"<{/if}> > + checked<{/if}> > <{$event.caption}>
    - + <{* irmtfan hardcode removed align="right" *}> - + <{* irmtfan add value="$search_term" *}> - + <{* irmtfan hardcode removed align="right" add $andor_selection_box *}> - + <{* irmtfan hardcode removed align="right" *}> - + <{* irmtfan hardcode removed align="right" add $searchin_radio *}> - + <{* irmtfan hardcode removed align="right" add value="$author_select" *}> - + <{* irmtfan hardcode removed align="right" add $sortby_selection_box *}> - + <{* irmtfan hardcode removed align="right" *}> @@ -56,18 +56,18 @@ - + <{* START irmtfan add show search *}> <{if $search_rule}> - + <{* irmtfan hardcode removed align="right" *}> <{/if}> - + <{* irmtfan hardcode removed align="right" *}> - + <{* irmtfan remove name="submit" *}>
    <{$smarty.const._SR_KEYWORDS}> 
    <{$smarty.const._SR_TYPE}>  <{$andor_selection_box}>
    <{$smarty.const._MD_NEWBB_FORUMC}>  <{$forum_selection_box}>
    <{$smarty.const._SR_SEARCHIN}>  <{$searchin_radio}>
    <{$smarty.const._MD_NEWBB_AUTHOR}> 
    <{$smarty.const._MD_NEWBB_SORTBY}>  <{$sortby_selection_box}>
    <{$smarty.const._MD_NEWBB_SINCE}>  <{$since_selection_box}>
    <{$smarty.const._MD_NEWBB_SHOWSEARCH}>  <{$show_search_radio}>
    <{$smarty.const._SR_SEARCHRULE}>  <{$search_rule}>
     
    		<{$smarty.const._MD_NEWBB_AUTHOR}> <{$smarty.const._MD_NEWBB_POSTTIME}>
    <{$results[i].forum_name}><{$results[i].title}> <{$results[i].poster}> <{$results[i].post_time}>
    @@ -44,7 +44,7 @@ - + <{* irmtfan hardcode removed align="left" *}> diff --git a/templates/newbb_thread.tpl b/templates/newbb_thread.tpl index a47f8520..56fa7d74 100644 --- a/templates/newbb_thread.tpl +++ b/templates/newbb_thread.tpl @@ -1,30 +1,30 @@ - +<{* START irmtfan assign forum_post_prefix smarty *}> <{if $forum_post_prefix === null }> - + <{* change the value to what you prefer. even value="" (no prefix) is acceptable *}> <{assign var=forum_post_prefix value="forumpost"}> - + <{* it is the first time then add id=0 for recognizoing top of the topic to scroll when $post_id=0 (just $topic_id in the URL) *}>
    <{/if}> - - + *}>
    <{$search_prev}> <{$search_next}>
    - + <{* irmtfan hardcode removed align="left" *}> - + <{* irmtfan hardcode removed align="left" *}> - + <{* irmtfan hardcode removed align="right" *}>
    <{$topic_post.poster.link}>
    <{$topic_post.post_title}>
    		 - + <{* irmtfan hardcode removed style="float: right;" *}>
    <{if $topic_post.post_id > 0}> - + <{* irmtfan add id for each post *}> #<{$topic_post.post_no}> <{/if}>
    @@ -34,30 +34,30 @@ <{if $topic_post.poster.uid gt -1}>     		<{if $topic_post.poster.uid != 0}> - + <{* START hacked by irmtfan rank_title -> rank.title *}>
    <{if $topic_post.poster.rank.title !=""}> <{$topic_post.poster.rank.title}>
    <{$topic_post.poster.rank.title}><{/if}>
    - + <{* END hacked by irmtfan *}> <{if $topic_post.poster.avatar != "blank.gif"}>
    <{else}> - + <{* irmtfan remove icon_path *}>
    <{$anonym_avatar}> <{/if}>
    <{if $infobox.show}> - + <{* irmtfan simplify onclick method (this.children[0] for IE7&8) - remove hardcode style="padding:2px;" *}> <{$infobox.displayImage}> - + <{* irmtfan move semicolon *}>
    <{$smarty.const._MD_NEWBB_JOINED}>:
    <{$topic_post.poster.regdate}>
    <{$smarty.const._US_LASTLOGIN}> :
    <{$topic_post.poster.last_login}>
    - + <{* irmtfan add last_login *}> <{if $topic_post.poster.from}>
    <{$smarty.const._MD_NEWBB_FROM}> <{$topic_post.poster.from}>
    <{/if}> @@ -102,7 +102,7 @@ <{/if}>

    - + <{* irmtfan hardcode removed style="float: right; padding: 5px; margin-top: 10px;" *}>
    <{if $topic_post.poster_ip}> IP: @@ -115,9 +115,9 @@ <{if $topic_post.post_edit}>

    - + <{* irmtfan hardcode removed style="float: right; padding: 5px; margin-top: 10px; border:1px solid #000;" *}>
    - + <{* irmtfan hardcode removed *}> <{$topic_post.post_edit}>
    <{/if}> @@ -132,7 +132,7 @@ <{/if}> <{if $topic_post.post_signature}>
    - + <{* irmtfan hardcode removed hardcode ____________________
    *}> <{$topic_post.post_signature}>
    <{/if}> @@ -143,19 +143,19 @@
    		- + <{* irmtfan removed hardcode style="text-align:left;" *}> - + <{* irmtfan removed hardcode style="text-align:right;" *}>
     <{$p_up}>  <{if $topic_post.thread_action}> <{foreach item=btn from=$topic_post.thread_action}> - + <{* irmtfan add alt key *}> target="<{$btn.target}>"<{/if}>> <{$btn.image}>  <{/foreach}> <{/if}> - + <{* irmtfan if the post is not advertise *}> <{if $mode gt 1 && $topic_post.poster.uid gt -1}> <{$smarty.const._MD_NEWBB_SPLIT_ONE}> | @@ -167,12 +167,12 @@ <{else}> <{if $topic_post.thread_buttons}> <{foreach item=btn from=$topic_post.thread_buttons}> - + <{* irmtfan add alt key *}> <{$btn.image}> <{/foreach}> <{/if}> <{/if}> - + <{* <{$p_up}> *}>
    diff --git a/templates/newbb_viewall.tpl b/templates/newbb_viewall.tpl index 7ee6a8f4..75689c46 100644 --- a/templates/newbb_viewall.tpl +++ b/templates/newbb_viewall.tpl @@ -1,15 +1,15 @@

    <{$forum_index_title}>

    - + <{* irmtfan hardcode removed align="left" *}>
    <{$smarty.const._MD_NEWBB_FORUMHOME}> - <{if $parent_forum}> + <{if $parent_forum|default:''}> » <{$parent_name}> » <{$forum_name}> - <{elseif $forum_name}> + <{elseif $forum_name|default:''}> » <{$forum_name}> <{/if}> @@ -26,7 +26,7 @@ <{/if}> <{if $viewer_level gt 1}> - + <{* irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" *}>
    @@ -79,13 +79,13 @@ - + <{* irmtfan add a separator *}> <{foreach item=filter from=$filters}> <{/foreach}> - <{foreach item=filter from=$types}> + <{foreach item=filter from=$types|default:null}> <{/foreach}> @@ -134,9 +134,9 @@
    <{/if}>
    - + <{* irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" *}>
    - <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> + <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> <{* irmtfan to solve nested forms and id="xo-pagenav" issue *}>
    @@ -144,7 +144,7 @@
    - + <{* irmtfan hardcode removed align="left" *}> - + <{* start forum topic *}> <{foreach name=loop item=topic from=$topics}> "> - + <{* irmtfan add topic-read/topic-new smarty variable *}> - + <{* irmtfan add sticky, digest, poll *}> - + <{* irmtfan remove topic_link hardcode and add topic_excerpt *}> - + <{* irmtfan hardcode removed align="left" *}> - + <{* irmtfan hardcode removed align="right" *}> <{/foreach}> - + <{* end forum topic *}> <{if $mode gt 1}> @@ -222,22 +222,22 @@ <{$selection.since}>  <{foreach item=hidval key=hidvar from=$selection.vars}> <{if $hidval && $hidvar neq "sort" && $hidvar neq "order" && $hidvar neq "since"}> - + <{* irmtfan correct name="$hidvar" *}> <{/if}> <{/foreach}> - + <{* irmtfan remove name="refresh" *}> <{/strip}>
    <{if $mode gt 1}> @@ -162,28 +162,28 @@ <{$headers.lastpost.title}>
    <{if $mode gt 1}> <{else}> - + <{* irmtfan add lock *}> <{$topic.topic_folder}><{$topic.lock}> <{/if}> <{$topic.topic_icon}><{$topic.sticky}>
    <{$topic.digest}><{$topic.poll}>    		  - - <{$topic.topic_title}><{$topic.attachment}> <{$topic.topic_page_jump}> - + <{/if}> *}> + <{$topic.topic_title}><{$topic.attachment|default:''}> <{$topic.topic_page_jump}> + <{* irmtfan add topic publish time and rating *}>
    <{$headers.publish.title}>: <{$topic.topic_time}> @@ -195,18 +195,18 @@ <{/if}>     		<{$topic.topic_forum_link}> <{$topic.topic_replies}> <{$topic.topic_poster}> <{$topic.topic_views}><{$topic.topic_last_posttime}>
    <{$smarty.const._MD_NEWBB_BY}> <{$topic.topic_last_poster}>  <{$topic.topic_page_jump_icon}>
    - +<{* end forum main table *}> <{if $pagenav}> - -
    <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}>
    + <{* irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" *}> +
    <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> <{* irmtfan to solve nested forms and id="xo-pagenav" issue *}>

    <{/if}>
    @@ -251,13 +251,13 @@ <{$img_digest}> = <{$smarty.const._MD_NEWBB_TOPICDIGEST}>
    <{$img_poll}> = <{$smarty.const._MD_NEWBB_TOPICHASPOLL}> - + <{* irmtfan hardcode removed style="float: right; text-align: right;" *}>
    <{foreach item=hidval key=hidvar from=$search}> <{if $hidval }> - + <{* irmtfan correct name="$hidvar" *}> <{/if}> <{/foreach}> @@ -265,7 +265,7 @@ [<{$smarty.const._MD_NEWBB_ADVSEARCH}>]

    - + <{* START irmtfan add forum selection box *}> <{if $forum_jumpbox }>
    <{$selection.forum}>  @@ -279,7 +279,7 @@
    <{$forum_jumpbox}> <{/if}> - + <{* END irmtfan add forum selection box *}>
    @@ -287,4 +287,4 @@ <{if $online}><{include file="db:newbb_online.tpl"}><{/if}> <{include file='db:newbb_notification_select.tpl'}> - +<{* end module contents *}> diff --git a/templates/newbb_viewforum.tpl b/templates/newbb_viewforum.tpl index 79de96ed..faad24db 100644 --- a/templates/newbb_viewforum.tpl +++ b/templates/newbb_viewforum.tpl @@ -83,16 +83,16 @@
    <{include file="db:newbb_viewforum_menu.tpl"}>
    - + <{* irmtfan hardcode removed style="float: right; text-align:right;" *}>
    - <{$forum_pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> + <{$forum_pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> <{* irmtfan to solve nested forms and id="xo-pagenav" issue *}>

    - + <{* irmtfan hardcode removed align="left" *}> - + <{* irmtfan _MD_NEWBB_POSTER to _MD_NEWBB_TOPICPOSTER *}> @@ -111,7 +111,7 @@ <{if $rating_enable}> <{/if}> - + <{* irmtfan _MD_NEWBB_DATE to _MD_NEWBB_LASTPOSTTIME *}> @@ -126,7 +126,7 @@ <{/if}> - + <{* start forum topic *}>
    <{$smarty.const._MD_NEWBB_FORUMDESCRIPTION}> <{$forumDescription}>
    <{foreach name=loop item=topic from=$topics}> @@ -142,7 +142,7 @@ <{/if}> "> - + <{* irmtfan add topic-read/topic-new smarty variable *}> <{/if}> - + <{* irmtfan hardcode removed align="right" *}> <{/foreach}> - + <{* end forum topic *}> <{if $mode gt 1}> @@ -207,14 +207,14 @@ <{$smarty.const._MD_NEWBB_SORTEDBY}> <{$forum_selection_sort}> <{$forum_selection_order}> <{$forum_selection_since}>  - + <{* irmtfan remove name="submit" *}> <{/strip}>
    <{if $mode gt 1}> @@ -103,7 +103,7 @@ <{/if}>  <{$smarty.const._MD_NEWBB_TOPICS}><{$smarty.const._MD_NEWBB_TOPICPOSTER}> <{$smarty.const._MD_NEWBB_TOPICTIME}> <{$smarty.const._MD_NEWBB_REPLIES}><{$smarty.const._MD_NEWBB_RATINGS}><{$smarty.const._MD_NEWBB_LASTPOSTTIME}>
    <{if $mode gt 1}> @@ -183,16 +183,16 @@ <{if $rating_enable}> <{$topic.rating_img}><{$topic.topic_last_posttime}>
    - + <{* irmtfan add $smarty.const._MD_NEWBB_BY *}> <{$smarty.const._MD_NEWBB_BY}> <{$topic.topic_last_poster}>  <{$topic.topic_page_jump_icon}>
    - +<{* end forum main table *}>
    @@ -223,7 +223,7 @@ <{$forum_addpoll}> <{$forum_post_or_register}>
    - <{$forum_pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> + <{$forum_pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> <{* irmtfan to solve nested forms and id="xo-pagenav" issue *}>
    @@ -231,7 +231,7 @@

    - + <{* irmtfan hardcode style="float: left; text-align: left;" *}>
    <{$img_newposts}> = <{$smarty.const._MD_NEWBB_NEWPOSTS}> (<{$img_hotnewposts}> = <{$smarty.const._MD_NEWBB_MORETHAN}>)
    <{$img_folder}> = <{$smarty.const._MD_NEWBB_NONEWPOSTS}> (<{$img_hotfolder}> = <{$smarty.const._MD_NEWBB_MORETHAN2}>)
    @@ -240,7 +240,7 @@ <{$img_digest}> = <{$smarty.const._MD_NEWBB_TOPICDIGEST}>
    <{$img_poll}> = <{$smarty.const._MD_NEWBB_TOPICHASPOLL}>
    - + <{* irmtfan hardcode removed style="float: right; text-align:right;" *}>
    @@ -270,7 +270,7 @@
    - + <{* irmtfan hardcode removed style="float: left; *}>
    <{foreach item=perm from=$permission_table}>
    <{$perm}>
    @@ -285,4 +285,4 @@ <{/if}> <{include file='db:newbb_notification_select.tpl'}> - +<{* end module contents *}> diff --git a/templates/newbb_viewforum_subforum.tpl b/templates/newbb_viewforum_subforum.tpl index 2d71276d..d3bc91db 100644 --- a/templates/newbb_viewforum_subforum.tpl +++ b/templates/newbb_viewforum_subforum.tpl @@ -1,12 +1,12 @@ - + <{* irmtfan hardcode removed align="left" *}> - + <{* start subforums *}> <{foreach item=sforum from=$subforum}> @@ -25,14 +25,14 @@
    <{$sforum.forum_posts}> <{$smarty.const._MD_NEWBB_POSTS}> - + <{* irmtfan hardcode removed align="right" *}> <{/foreach}> - + <{* end subforums *}>
     <{$smarty.const._MD_NEWBB_SUBFORUMS}>   <{$smarty.const._MD_NEWBB_LASTPOST}>
    <{$sforum.forum_folder}> <{if $sforum.forum_lastpost_subject}> <{$sforum.forum_lastpost_time}> <{$smarty.const._MD_NEWBB_BY}> <{$sforum.forum_lastpost_user}>
    <{$sforum.forum_lastpost_subject}>   - + <{* irmtfan removed icon_path *}> <{$sforum.forum_lastpost_icon}> <{else}> @@ -41,5 +41,5 @@
    diff --git a/templates/newbb_viewpost.tpl b/templates/newbb_viewpost.tpl index 9743c1e0..d0386b46 100644 --- a/templates/newbb_viewpost.tpl +++ b/templates/newbb_viewpost.tpl @@ -1,7 +1,7 @@

    <{$lang_forum_index}>

    - + <{* irmtfan hardcode removed align="left" *}>
    <{$smarty.const._MD_NEWBB_FORUMHOME}> <{if $parent_forum}> @@ -21,7 +21,7 @@ <{if $viewer_level gt 1}>
    <{if $mode gt 1}> - + <{* irmtfan mistype forum_posts_admin => form_posts_admin *}> <{$smarty.const._ALL}>:
    - + <{* irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" *}>
    - <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> + <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> <{* irmtfan to solve nested forms and id="xo-pagenav" issue *}>
    @@ -91,7 +91,7 @@ <{foreach item=post from=$posts}> <{include file="db:newbb_thread.tpl" topic_post=$post}> - +<{* irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" *}>
    <{$smarty.const._MD_NEWBB_VIEWTOPIC}> <{if !$forum_name }> @@ -110,14 +110,14 @@
    - + <{* irmtfan hardcode removed style="float: left; text-align:left;" *}>
    - + <{* irmtfan add up button *}> <{$p_up}><{$smarty.const._MD_NEWBB_TOP}>
    - + <{* irmtfan hardcode removed style="float: right; text-align:right;" *}>
    - <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> + <{$pagenav|replace:'form':'div'|replace:'id="xo-pagenav"':''}> <{* irmtfan to solve nested forms and id="xo-pagenav" issue *}>
    @@ -125,7 +125,7 @@

    - + <{* irmtfan hardcode removed style="float: left; text-align: left;" *}>
    @@ -136,7 +136,7 @@ [<{$smarty.const._MD_NEWBB_ADVSEARCH}>]
    - + <{* irmtfan hardcode removed style="float: right; text-align: right;" *}>
    <{$forum_jumpbox}>
    @@ -148,4 +148,4 @@ <{include file="db:newbb_online.tpl"}> <{/if}> <{include file='db:newbb_notification_select.tpl'}> - +<{* end module contents *}> diff --git a/templates/newbb_viewtopic.tpl b/templates/newbb_viewtopic.tpl index a924687f..d9f09752 100644 --- a/templates/newbb_viewtopic.tpl +++ b/templates/newbb_viewtopic.tpl @@ -49,35 +49,69 @@

    <{/if}> +<{* only for login user // *}> +<{if $viewer_level gt 0}> -<{if $viewer_level gt 1}> - <{*irmtfan hardcode removed style="float: right; text-align: right;" *}> -
    - <{if $mode gt 1}> - <{*irmtfan mistype forum_posts_admin => form_posts_admin - action="topicmanager.php" => action="action.post.php" *}> -
    - <{$smarty.const._ALL}>: - <{*irmtfan mistype mode => op *}> - - - | - <{$smarty.const._MD_NEWBB_TYPE_VIEW}> - <{else}> - <{$smarty.const._MD_NEWBB_TYPE_ADMIN}> | - <{$smarty.const._MD_NEWBB_TYPE_PENDING}> | - <{$smarty.const._MD_NEWBB_TYPE_DELETED}> - <{/if}> + <{* modal for rate // *}> + + + <{* modal for quickreply // *}> + + + <{* fix bottom navbar // *}> + -
    <{/if}> + + + +

    <{* irmtfan add to not show polls in admin mode *}> diff --git a/topicmanager.php b/topicmanager.php index f9bd8040..bddb25c8 100644 --- a/topicmanager.php +++ b/topicmanager.php @@ -6,8 +6,8 @@ // // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// Copyright (c) 2000-2016 XOOPS.org // -// // +// Copyright (c) 2000-2020 XOOPS.org // +// // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // @@ -304,7 +304,8 @@ $statsHandler->update($topicObject->getVar('forum_id'), 'digest'); // /** @var Newbb\UserstatsHandler $userstatsHandler */ // $userstatsHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Userstats'); - if ($user_stat = $userstatsHandler->get($topicObject->getVar('topic_poster'))) { + $user_stat = $userstatsHandler->get($topicObject->getVar('topic_poster')); + if ($user_stat) { $z = $user_stat->getVar('user_digests') + 1; $user_stat->setVar('user_digests', (int)$z); $userstatsHandler->insert($user_stat); @@ -326,7 +327,7 @@ } } else { // No submit $mode = Request::getString('mode', '', 'GET'); //$_GET['mode']; - echo ""; + echo ""; echo ""; echo "
    "; echo ""; diff --git a/update_type.php b/update_type.php index d6e6db04..6e922ed1 100644 --- a/update_type.php +++ b/update_type.php @@ -1,9 +1,10 @@ * @since 4.00 * @package module::newbb @@ -25,7 +26,8 @@ $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp')); $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp')); -if (!$GLOBALS['xoopsDB']->queryF(' +if (!$GLOBALS['xoopsDB']->queryF( + ' CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . " ( `type_id` SMALLINT(4) UNSIGNED NOT NULL AUTO_INCREMENT, `type_name` VARCHAR(64) NOT NULL DEFAULT '', @@ -34,11 +36,13 @@ PRIMARY KEY (`type_id`) ) ENGINE=MyISAM; - ")) { + " +)) { exit('Can not create tmp table for `bb_type_tmp`'); } -if (!$GLOBALS['xoopsDB']->queryF(' +if (!$GLOBALS['xoopsDB']->queryF( + ' CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . " ( `tf_id` MEDIUMINT(4) UNSIGNED NOT NULL AUTO_INCREMENT, `type_id` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', @@ -49,23 +53,26 @@ KEY `forum_id` (`forum_id`), KEY `type_order` (`type_order`) ) ENGINE=MyISAM; - ")) { + " +)) { $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp')); exit('Can not create tmp table for `bb_type_forum_tmp`'); } //$typeHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Type'); -$subjectpres = array_filter(array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['subject_prefix']))); +$subjectpres = array_filter(array_map('\trim', explode(',', $GLOBALS['xoopsModuleConfig']['subject_prefix']))); $types = []; $order = 1; foreach ($subjectpres as $subjectpre) { if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) { - if (!$GLOBALS['xoopsDB']->queryF(' + if (!$GLOBALS['xoopsDB']->queryF( + ' INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . ' (`type_name`, `type_color`) VALUES (' . $GLOBALS['xoopsDB']->quoteString($matches[2]) . ', ' . $GLOBALS['xoopsDB']->quoteString($matches[1]) . ') - ')) { + ' + )) { xoops_error("Can not add type of `{$matches[2]}`"); continue; } @@ -80,7 +87,8 @@ ///** @var Newbb\ForumHandler $forumHandler */ //$forumHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Forum'); -if ($forums_type = $forumHandler->getIds(new \Criteria('allow_subject_prefix', 1))) { +$forums_type = $forumHandler->getIds(new \Criteria('allow_subject_prefix', 1)); +if ($forums_type) { foreach ($forums_type as $forum_id) { $type_query = []; foreach ($types as $key => $order) { @@ -98,4 +106,4 @@ exit('No type item to update'); } -die('update succeeded'); +exit('update succeeded'); diff --git a/view.tag.php b/view.tag.php index 4c523e2c..07bbf2b6 100644 --- a/view.tag.php +++ b/view.tag.php @@ -1,9 +1,10 @@ * @since 4.00 * @package module::newbb diff --git a/viewforum.php b/viewforum.php index cb4ccc00..e7abd7ee 100644 --- a/viewforum.php +++ b/viewforum.php @@ -3,7 +3,7 @@ * NewBB 5.0x, the forum module for XOOPS project * * @copyright XOOPS Project (https://xoops.org) - * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) + * @license GNU GPL 2 or later (https://www.gnu.org/licenses/gpl-2.0.html) * @author Taiwen Jiang (phppp or D.J.) * @since 4.00 * @package module::newbb @@ -46,21 +46,29 @@ $forum_id = Request::getInt('forum', 0, 'GET'); $type = Request::getInt('type', 0, 'GET'); $status = (Request::getString('status', '', 'GET') - && in_array(Request::getString('status', '', 'GET'), [ - 'active', - 'pending', - 'deleted', - 'digest', - 'unreplied', - 'unread', - ], true)) ? Request::getString('status', '', 'GET') : ''; + && in_array( + Request::getString('status', '', 'GET'), + [ + 'active', + 'pending', + 'deleted', + 'digest', + 'unreplied', + 'unread', + ], + true + )) ? Request::getString('status', '', 'GET') : ''; $mode = (Request::getString('status', '', 'GET') - && in_array(Request::getString('status', '', 'GET'), [ - 'active', - 'pending', - 'deleted', - ], true)) ? 2 : Request::getInt('mode', 0, 'GET'); + && in_array( + Request::getString('status', '', 'GET'), + [ + 'active', + 'pending', + 'deleted', + ], + true + )) ? 2 : Request::getInt('mode', 0, 'GET'); ///** @var Newbb\ForumHandler $forumHandler */ //$forumHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Forum'); @@ -84,9 +92,12 @@ require_once __DIR__ . '/include/functions.render.php'; if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) { - $xoopsTpl->assign('xoops_module_header', ' + $xoopsTpl->assign( + 'xoops_module_header', + ' - ' . @$xoopsTpl->get_template_vars('xoops_module_header')); + ' . @$xoopsTpl->get_template_vars('xoops_module_header') + ); } $forumDescription = $forumObject->getVar('forum_desc'); $xoopsTpl->assign('forumDescription', $forumDescription); @@ -142,7 +153,8 @@ $criteria->add(new \Criteria('forum_id', '(' . implode(', ', $forumHandler->getIdsByPermission('access')) . ')', 'IN')); $criteria->setSort('forum_order'); -if ($forums = $forumHandler->getAll($criteria, null, false)) { +$forums = $forumHandler->getAll($criteria, null, false); +if ($forums) { $subforum_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']); $subforum = array_values($subforum_array[$forum_id]); unset($subforum_array); @@ -204,11 +216,17 @@ $xoopsTpl->assign('h_reply_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_replies&order=" . (('t.topic_replies' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC')); $xoopsTpl->assign('h_poster_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_poster&order=" . (('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC')); $xoopsTpl->assign('h_views_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_views&order=" . (('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC')); -$xoopsTpl->assign('h_rating_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.rating&order=" . (('t.rating' === $sort - && 'DESC' === $order) ? 'ASC' : 'DESC')); // irmtfan t.topic_ratings to t.rating +$xoopsTpl->assign( + 'h_rating_link', + XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.rating&order=" . (('t.rating' === $sort + && 'DESC' === $order) ? 'ASC' : 'DESC') +); // irmtfan t.topic_ratings to t.rating $xoopsTpl->assign('h_date_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_last_post_id&order=" . (('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC')); -$xoopsTpl->assign('h_publish_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_id&order=" . (('t.topic_id' === $sort - && 'DESC' === $order) ? 'ASC' : 'DESC')); +$xoopsTpl->assign( + 'h_publish_link', + XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_id&order=" . (('t.topic_id' === $sort + && 'DESC' === $order) ? 'ASC' : 'DESC') +); $xoopsTpl->assign('forum_since', $since); // For $since in search.php // irmtfan - if no since it should be 0 @@ -222,7 +240,7 @@ } $criteria_topic['excerpt'] = $GLOBALS['xoopsModuleConfig']['post_excerpt']; -list($allTopics, $sticky) = $forumHandler->getAllTopics($forumObject, $criteria_topic); +[$allTopics, $sticky] = $forumHandler->getAllTopics($forumObject, $criteria_topic); $xoopsTpl->assign_by_ref('topics', $allTopics); $xoopsTpl->assign('sticky', $sticky); @@ -251,7 +269,8 @@ //$typeHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Type'); $typeOptions = null; $types = []; -if ($types = $typeHandler->getByForum($forum_id)) { +$types = $typeHandler->getByForum($forum_id); +if ($types) { $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"]; foreach ($types as $key => $item) { $typeOptions[] = [ diff --git a/viewpost.php b/viewpost.php index ed46651a..7e1c7c6d 100644 --- a/viewpost.php +++ b/viewpost.php @@ -2,8 +2,8 @@ // // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// Copyright (c) 2000-2016 XOOPS.org // -// // +// Copyright (c) 2000-2020 XOOPS.org // +// // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // @@ -30,7 +30,9 @@ // ------------------------------------------------------------------------ // use Xmf\Request; -use XoopsModules\Newbb; +use XoopsModules\Newbb\{ + UserHandler +}; require_once __DIR__ . '/header.php'; @@ -203,14 +205,20 @@ $xoopsTpl->assign('forum_id', $forumObject->getVar('forum_id')); // irmtfan new method if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) { - $xoopsTpl->assign('xoops_module_header', ' + $xoopsTpl->assign( + 'xoops_module_header', + ' - ' . @$xoopsTpl->get_template_vars('xoops_module_header')); + ' . @$xoopsTpl->get_template_vars('xoops_module_header') + ); } } elseif (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) { - $xoopsTpl->assign('xoops_module_header', ' + $xoopsTpl->assign( + 'xoops_module_header', + ' - ' . @$xoopsTpl->get_template_vars('xoops_module_header')); + ' . @$xoopsTpl->get_template_vars('xoops_module_header') + ); } // irmtfan remove and move to footer.php //$xoopsTpl->assign('xoops_module_header', $xoops_module_header); @@ -219,7 +227,7 @@ $xoopsTpl->assign('anonym_avatar', newbbDisplayImage('anonym')); $userid_array = []; if (count($poster_array) > 0) { - /** @var \XoopsMembershipHandler $memberHandler */ + /** @var \XoopsMemberHandler $memberHandler */ $memberHandler = xoops_getHandler('member'); $userid_array = array_keys($poster_array); $user_criteria = '(' . implode(',', $userid_array) . ')'; @@ -233,7 +241,7 @@ if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) { if (!empty($user_criteria)) { - // /** @var Newbb\OnlineHandler $onlineHandler */ + /** @var Newbb\OnlineHandler $onlineHandler */ // $onlineHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Online'); $onlineHandler->init($forum_id); } @@ -243,7 +251,8 @@ if (count($userid_array) > 0) { // require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/user.php'); - $userHandler = new Newbb\UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']); + /** @var UserHandler $userHandler */ + $userHandler = new UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']); $userHandler->users = $users; $userHandler->online = $online; $viewtopic_users = $userHandler->getUsers(); @@ -259,15 +268,16 @@ $post = $posts[$id]; $post_title = $post->getVar('subject'); - if ($posticon = $post->getVar('icon')) { + $posticon = $post->getVar('icon'); + if ($posticon) { $post_image = ''; } else { $post_image = ''; } $poster = [ 'uid' => 0, - 'name' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']), - 'link' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']), + 'name' => $post->getVar('poster_name') ?: htmlspecialchars($GLOBALS['xoopsConfig']['anonymous']), + 'link' => $post->getVar('poster_name') ?: htmlspecialchars($GLOBALS['xoopsConfig']['anonymous']), ]; if ($post->getVar('uid') > 0 && isset($viewtopic_users[$post->getVar('uid')])) { $poster = $viewtopic_users[$post->getVar('uid')]; @@ -337,24 +347,27 @@ } $thread_action = []; - $xoopsTpl->append('posts', [ - 'post_id' => $post->getVar('post_id'), - 'topic_id' => $post->getVar('topic_id'), - 'forum_id' => $post->getVar('forum_id'), - 'post_date' => newbbFormatTimestamp($post->getVar('post_time')), - 'post_image' => $post_image, - 'post_title' => $post_title, - 'post_text' => $post_text, - 'post_attachment' => $post_attachment, - 'post_edit' => $post->displayPostEdit(), - 'post_no' => $start + $pn, - 'post_signature' => $post->getVar('attachsig') ? @$poster['signature'] : '', - // 'poster_ip' => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($post->getVar('poster_ip')) : '', - 'poster_ip' => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $post->getVar('poster_ip') : '', - 'thread_action' => $thread_action, - 'thread_buttons' => $thread_buttons, - 'poster' => $poster, - ]); + $xoopsTpl->append( + 'posts', + [ + 'post_id' => $post->getVar('post_id'), + 'topic_id' => $post->getVar('topic_id'), + 'forum_id' => $post->getVar('forum_id'), + 'post_date' => newbbFormatTimestamp($post->getVar('post_time')), + 'post_image' => $post_image, + 'post_title' => $post_title, + 'post_text' => $post_text, + 'post_attachment' => $post_attachment, + 'post_edit' => $post->displayPostEdit(), + 'post_no' => $start + $pn, + 'post_signature' => $post->getVar('attachsig') ? @$poster['signature'] : '', + // 'poster_ip' => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($post->getVar('poster_ip')) : '', + 'poster_ip' => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $post->getVar('poster_ip') : '', + 'thread_action' => $thread_action, + 'thread_buttons' => $thread_buttons, + 'poster' => $poster, + ] + ); unset($thread_buttons, $poster); } diff --git a/viewtopic.php b/viewtopic.php index 18438412..b1230c37 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -2,8 +2,8 @@ // // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// Copyright (c) 2000-2016 XOOPS.org // -// // +// Copyright (c) 2000-2020 XOOPS.org // +// // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // @@ -31,8 +31,11 @@ // irmtfan enhance include use Xmf\Request; -use XoopsModules\Newbb; +use XoopsModules\Newbb\{ + UserHandler +}; use XoopsModules\Xoopspoll; +use XoopsModules\Xoopspoll\Helper; require_once __DIR__ . '/header.php'; $xoopsLogger->startTime('newBB_viewtopic'); @@ -166,9 +169,12 @@ //$xoopsTpl->assign('xoops_module_header', $xoops_module_header); // irmtfan new method if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) { - $xoopsTpl->assign('xoops_module_header', ' + $xoopsTpl->assign( + 'xoops_module_header', + ' - ' . @$xoopsTpl->get_template_vars('xoops_module_header')); + ' . @$xoopsTpl->get_template_vars('xoops_module_header') + ); } if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) { @@ -208,13 +214,15 @@ $xoopsTpl->assign('infobox', $infobox); // END irmtfan improve infobox -$xoopsTpl->assign([ - 'topic_title' => '' . $topicObject->getFullTitle() . '', - 'forum_name' => $forumObject->getVar('forum_name'), - 'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC, - 'lang_prevtopic' => _MD_NEWBB_PREVTOPIC, - 'topic_status' => $topicObject->getVar('topic_status'), - ]); +$xoopsTpl->assign( + [ + 'topic_title' => '' . $topicObject->getFullTitle() . '', + 'forum_name' => $forumObject->getVar('forum_name'), + 'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC, + 'lang_prevtopic' => _MD_NEWBB_PREVTOPIC, + 'topic_status' => $topicObject->getVar('topic_status'), + ] +); //$categoryHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Category'); $categoryObject = $categoryHandler->get($forumObject->getVar('cat_id'), ['cat_title']); @@ -274,7 +282,8 @@ $viewtopic_users = []; if ($userid_array && is_array($userid_array)) { // require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/user.php'); - $userHandler = new Newbb\UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']); + /** @var UserHandler $userHandler */ + $userHandler = new UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']); $userHandler->users = $users; $userHandler->online = $online; $viewtopic_users = $userHandler->getUsers(); @@ -498,7 +507,9 @@ if ($pollVote || $pollAdd) { $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']); // new xoopspoll module - if ($pollModuleHandler->getVar('version') >= 140) { + if ($pollModuleHandler->getVar('version') >= 201) { + $classPoll = new Xoopspoll\Poll(); + } elseif ($pollModuleHandler->getVar('version') >= 140) { // xoops_load('renderer', $GLOBALS['xoopsModuleConfig']['poll_module']); xoops_loadLanguage('main', $GLOBALS['xoopsModuleConfig']['poll_module']); // old xoopspoll or umfrage or any clone from them @@ -511,9 +522,9 @@ $xoopsTpl->assign('topic_poll', 1); $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0; // new xoopspoll module - if ($pollModuleHandler->getVar('version') >= 140) { - $xpollHandler = \XoopsModules\Xoopspoll\Helper::getInstance()->getHandler('Poll'); - /** @var \XoopsPoll $pollObject */ + if ($pollModuleHandler->getVar('version') >= 201) { + $xpollHandler = Helper::getInstance()->getHandler('Poll'); + /** @var Xoopspoll\Poll $pollObject */ $pollObject = $xpollHandler->get($poll_id); if (is_object($pollObject)) { /* check to see if user has rights to view the results */ @@ -526,21 +537,22 @@ $configHandler = xoops_getHandler('config'); $xp_config = $configHandler->getConfigsByCat(0, $pollModuleHandler->getVar('mid')); - $GLOBALS['xoopsTpl']->assign([ - 'is_visible' => $isVisible, - 'visible_message' => $visibleMsg, - 'disp_votes' => $xp_config['disp_vote_nums'], - 'lang_vote' => constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'), - 'lang_results' => constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'), - 'back_link' => '', - ]); + $GLOBALS['xoopsTpl']->assign( + [ + 'is_visible' => $isVisible, + 'visible_message' => $visibleMsg, + 'disp_votes' => $xp_config['disp_vote_nums'], + 'lang_vote' => constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'), + 'lang_results' => constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'), + 'back_link' => '', + ] + ); $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer'; - /** @var \XoopsModules\Xoopspoll\Renderer $renderer */ - $renderer = new $classRenderer($pollObject); + $renderer = new Xoopspoll\Renderer($pollObject); // check to see if user has voted, show form if not, otherwise get results for form /** @var \XoopsModules\Xoopspoll\LogHandler $logHandler */ - $logHandler = \XoopsModules\Xoopspoll\Helper::getInstance()->getHandler('Log'); + $logHandler = Helper::getInstance()->getHandler('Log'); if ($pollObject->isAllowedToVote() && (!$logHandler->hasVoted($poll_id, xoops_getenv('REMOTE_ADDR'), $uid))) { $myTpl = new \XoopsTpl(); @@ -556,9 +568,9 @@ } // old xoopspoll or umfrage or any clone from them } else { - $pollObject = new $classPoll($poll_id); - $classRenderer = $classPoll . 'Renderer'; - $renderer = new $classRenderer($pollObject); + $pollObject = new $classPoll($poll_id); + // $classRenderer = $classPoll . 'Renderer'; + $renderer = new Xoopspoll\Renderer($pollObject); $xoopsTpl->assign('lang_alreadyvoted2', _PL_ALREADYVOTED2); $xoopsTpl->assign('has_ended', $pollObject->getVar('end_time') < time() ? 1 : 0); // umfrage has polltype @@ -684,19 +696,21 @@ $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id)); } -$xoopsTpl->assign([ - 'lang_forum_index' => sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)), - 'lang_from' => _MD_NEWBB_FROM, - 'lang_joined' => _MD_NEWBB_JOINED, - 'lang_posts' => _MD_NEWBB_POSTS, - 'lang_poster' => _MD_NEWBB_POSTER, - 'lang_thread' => _MD_NEWBB_THREAD, - 'lang_edit' => _EDIT, - 'lang_delete' => _DELETE, - 'lang_reply' => _REPLY, - 'lang_postedon' => _MD_NEWBB_POSTEDON, - 'lang_groups' => _MD_NEWBB_GROUPS, - ]); +$xoopsTpl->assign( + [ + 'lang_forum_index' => sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)), + 'lang_from' => _MD_NEWBB_FROM, + 'lang_joined' => _MD_NEWBB_JOINED, + 'lang_posts' => _MD_NEWBB_POSTS, + 'lang_poster' => _MD_NEWBB_POSTER, + 'lang_thread' => _MD_NEWBB_THREAD, + 'lang_edit' => _EDIT, + 'lang_delete' => _DELETE, + 'lang_reply' => _REPLY, + 'lang_postedon' => _MD_NEWBB_POSTEDON, + 'lang_groups' => _MD_NEWBB_GROUPS, + ] +); $viewmode_options = []; if ('DESC' === $order) { @@ -734,6 +748,7 @@ unset($viewmode_options); $xoopsTpl->assign('menumode', $menumode); $xoopsTpl->assign('menumode_other', $menumode_other); +$xoopsTpl->assign('facebookstyle', $helper->getConfig('facebookstyle')); // START irmtfan add verifyUser to quick reply //check banning @@ -744,8 +759,9 @@ // END irmtfan add verifyUser to quick reply $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/post.php', 'post', true); if (!is_object($GLOBALS['xoopsUser'])) { - //$configHandler = xoops_getHandler('config'); - $user_tray = new \XoopsFormElementTray(_MD_NEWBB_ACCOUNT); + ///** @var \XoopsConfigHandler $configHandler */ + $configHandler = xoops_getHandler('config'); + $user_tray = new \XoopsFormElementTray(_MD_NEWBB_ACCOUNT); $user_tray->addElement(new \XoopsFormText(_MD_NEWBB_NAME, 'uname', 26, 255)); $user_tray->addElement(new \XoopsFormPassword(_MD_NEWBB_PASSWORD, 'pass', 10, 32)); $login_checkbox = new \XoopsFormCheckBox('', 'login', 1); @@ -821,7 +837,7 @@ $xoopsTpl->assign('quickreply', ['show' => 0]); } -if ($GLOBALS['xoopsModuleConfig']['do_tag'] && class_exists('TagFormTag') +if ($GLOBALS['xoopsModuleConfig']['do_tag'] && class_exists('TagFormTag') && @require $GLOBALS['xoops']->path('modules/tag/include/tagbar.php')) { $xoopsTpl->assign('tagbar', tagBar($topicObject->getVar('topic_tags', 'n'))); } diff --git a/votepolls.php b/votepolls.php index f63d13bf..d57175d7 100644 --- a/votepolls.php +++ b/votepolls.php @@ -2,8 +2,8 @@ // // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// Copyright (c) 2000-2016 XOOPS.org // -// // +// Copyright (c) 2000-2020 XOOPS.org // +// // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // @@ -27,13 +27,15 @@ use Xmf\Request; use XoopsModules\Xoopspoll; +use XoopsModules\Xoopspoll\Constants; +use XoopsModules\Xoopspoll\Utility; require_once __DIR__ . '/header.php'; $poll_id = Request::getInt('poll_id', Request::getInt('poll_id', 0, 'POST'), 'GET'); $topic_id = Request::getInt('topic_id', Request::getInt('topic_id', 0, 'POST'), 'GET'); $forum = Request::getInt('forum', Request::getInt('forum', 0, 'POST'), 'GET'); -///** @var Newbb\TopicHandler $topicHandler */ +/** @var Newbb\TopicHandler $topicHandler */ //$topicHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Topic'); $topicObject = $topicHandler->get($topic_id); if (!$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'vote')) { @@ -70,13 +72,13 @@ $mail_author = false; // new xoopspoll module -if ($pollModuleHandler->getVar('version') >= 140) { - $classConstants = \XoopsModules\Xoopspoll\Constants; +if ($pollModuleHandler->getVar('version') >= 201) { + // $classConstants = \XoopsModules\Xoopspoll\Constants; if (is_object($pollObject)) { if ($pollObject->getVar('multiple')) { $optionId = Request::getInt('option_id', 0, 'POST'); $optionId = (array)$optionId; // type cast to make sure it's an array - $optionId = array_map('intval', $optionId); // make sure values are integers + $optionId = array_map('\intval', $optionId); // make sure values are integers } else { $optionId = Request::getInt('option_id', 0, 'POST'); } @@ -98,7 +100,7 @@ $msg = constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_THANKSFORVOTE'); } else { /* there was a problem registering the vote */ - redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR')); + redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), Constants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR')); } } else { $msg = constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ALREADYVOTED'); @@ -106,8 +108,7 @@ /* set anon user vote (and the time they voted) */ if (!is_object($GLOBALS['xoopsUser'])) { xoops_load('pollUtility', $GLOBALS['xoopsModuleConfig']['poll_module']); - /** @var \XoopsModules\Xoopspoll\Utility $classPollUtility */ - $classPollUtility = new \XoopsModules\Xoopspoll\Utility(); + $classPollUtility = new Utility(); $classPollUtility::setVoteCookie($poll_id, $voteTime, 0); } } else { @@ -121,9 +122,9 @@ $msg = constant('_MD_' . mb_strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ERROR_INVALID_POLLID'); } if (null !== $url) { - redirect_header($url, $classConstants::REDIRECT_DELAY_MEDIUM, $msg); + redirect_header($url, Constants::REDIRECT_DELAY_MEDIUM, $msg); } else { - redirect_header($GLOBALS['xoops']->buildUrl('viewtopic.php', ['topic_id' => $topic_id]), $classConstants::REDIRECT_DELAY_MEDIUM, $msg); + redirect_header($GLOBALS['xoops']->buildUrl('viewtopic.php', ['topic_id' => $topic_id]), Constants::REDIRECT_DELAY_MEDIUM, $msg); } // old xoopspoll or umfrage or any clone from them } else { @@ -139,16 +140,14 @@ $msg = _PL_THANKSFORVOTE; setcookie("newbb_polls[{$poll_id}]", 1); } + } elseif ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'))) { + $msg = _PL_ALREADYVOTED; + setcookie("newbb_polls[{$poll_id}]", 1); } else { - if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'))) { - $msg = _PL_ALREADYVOTED; - setcookie("newbb_polls[{$poll_id}]", 1); - } else { - $pollObject->vote(Request::getInt('option_id', 0, 'POST'), Request::getString('REMOTE_ADDR', '', 'SERVER')); - $pollObject->updateCount(); - $msg = _PL_THANKSFORVOTE; - setcookie("newbb_polls[{$poll_id}]", 1); - } + $pollObject->vote(Request::getInt('option_id', 0, 'POST'), Request::getString('REMOTE_ADDR', '', 'SERVER')); + $pollObject->updateCount(); + $msg = _PL_THANKSFORVOTE; + setcookie("newbb_polls[{$poll_id}]", 1); } } // irmtfan - simple url diff --git a/xoops_version.php b/xoops_version.php index 69cb136f..17e5c03f 100644 --- a/xoops_version.php +++ b/xoops_version.php @@ -1,9 +1,10 @@ * @since 4.00 * @package module::newbb @@ -13,9 +14,9 @@ $moduleDirName = basename(__DIR__); $modversion = [ - 'version' => 5.00, - 'module_status' => 'Final', - 'release_date' => '2019/05/07', + 'version' => 5.01, + 'module_status' => 'Beta 1', + 'release_date' => '2021/01/26', 'name' => _MI_NEWBB_NAME, 'description' => _MI_NEWBB_DESC, 'help' => 'page=help', @@ -29,8 +30,8 @@ 'author_email' => '', 'module_website_url' => 'www.xoops.org/', 'module_website_name' => 'XOOPS', - 'min_php' => '5.5', - 'min_xoops' => '2.5.9', + 'min_php' => '7.2', + 'min_xoops' => '2.5.10', 'min_admin' => '1.2', 'min_db' => ['mysql' => '5.5'], 'modicons16' => 'assets/images/icons/16', @@ -730,6 +731,15 @@ 'default' => 0, ]; +$modversion['config'][] = [ + 'name' => 'facebookstyle', + 'title' => '_MI_NEWBB_FACEBOOK_STYLE_RATING', + 'description' => '_MI_NEWBB_FACEBOOK_STYLE_RATING_DESC', + 'formtype' => 'yesno', + 'valuetype' => 'int', + 'default' => 0, +]; + // Notification $modversion['notification'] = []; $modversion['hasNotification'] = 1;