Merge pull request #64 from mambax7/master

5.0 Final merge

.gitignore

@@ -2,4 +2,4 @@
 *~
 \#*
 *.bak
-.idea/
+

.htaccess

@@ -1,3 +1,7 @@
 RewriteEngine on
-RewriteRule ^newbb/([a-z]+)-([0-9]+)(/(.+))? modules/newbb/seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
+#.htaccess located in XOOPS_PATH. For SEO Links
+#RewriteRule ^modules/newbb/([a-z]+)-([0-9]+)(/(.+))? modules/newbb/seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
+#.htaccess located in modules/newbb. For SEO Links
+#RewriteRule ^([a-z]+)-([0-9]+)(/(.+))? seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
+
 #RewriteRule ^(.*)$ $1 [L]

.scrutinizer.yml

@@ -1,50 +1,22 @@
-checks:
-    php:
-        code_rating: true
-        variable_existence: true
-        useless_calls: true
-        use_statement_alias_conflict: true
-        unused_variables: true
-        unused_properties: true
-        unused_parameters: true
-        unused_methods: true
-        unreachable_code: true
-        sql_injection_vulnerabilities: true
-        security_vulnerabilities: true
-        precedence_mistakes: true
-        precedence_in_conditions: true
-        parameter_non_unique: true
-        no_property_on_interface: true
-        no_non_implemented_abstract_methods: true
-        deprecated_code_usage: true
-        closure_use_not_conflicting: true
-        closure_use_modifiable: true
-        avoid_useless_overridden_methods: true
-        avoid_conflicting_incrementers: true
-        assignment_of_null_return: true
-        verify_property_names: true
-        verify_argument_usable_as_reference: true
-        verify_access_scope_valid: true
-        use_self_instead_of_fqcn: true
-        too_many_arguments: true
-        single_namespace_per_use: true
-        return_doc_comment_if_not_inferrable: true
-        return_doc_comments: true
-        require_scope_for_methods: true
-        require_scope_for_properties: true
-        require_php_tag_first: true
-        require_braces_around_control_structures: true
-        psr2_control_structure_declaration: true
-        psr2_switch_declaration: true
-        psr2_class_declaration: true
-        no_eval: true
-        no_else_if_statements: true
-        avoid_corrupting_byteorder_marks: true
-        argument_type_checks: true
-        php5_style_constructor: true
-        parameter_doc_comments: true
-        no_duplicate_arguments: true
-        missing_arguments: true
-        instanceof_class_exists: true
-        foreach_traversable: true
-        no_unnecessary_function_call_in_for_loop: true
+# language: php
+build:
+  nodes:
+    tests: true
+    analysis:
+      dependencies:
+        after:
+        # The following installs the most recent XOOPS CMS version, you might want
+        # 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
+      project_setup:
+        override: true
+      tests:
+        override:
+        - php-scrutinizer-run --enable-security-analysis
+filter:
+  dependency_paths:
+  - XoopsCore25/*
+  - tag/*
+  - Xoopspoll
+

templates_fulldiv_opacity/blocks/newbb_block.tpl → EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block.tpl

@@ -8,41 +8,41 @@
             <div class="_col_end"><{$smarty.const._MB_NEWBB_LPOST}></div>
             <div class="clear"></div>
         </div>
+
         <{foreach item=topic from=$block.topics}>
-        <div class="align_center <{cycle values="even,odd"}>">
-            <div class="block_full_forum floatleft left"><a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a>
+            <div class="align_center <{cycle values="even,odd"}>">
+                <div class="block_full_forum floatleft left"><a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a></div>
+                <div class="block_full_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
+                <div class="block_full_reply floatleft"><{$topic.replies}></div>
+                <div class="block_full_view floatleft"><{$topic.views}></div>
+                <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
+                <div class="clear"></div>
             </div>
-            <div class="block_full_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
-            <div class="block_full_reply floatleft"><{$topic.replies}></div>
-            <div class="block_full_view floatleft"><{$topic.views}></div>
-            <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
-            <div class="clear"></div>
-        </div>
-    <{/foreach}>
+        <{/foreach}>
 
     <{elseif $block.disp_mode == 1}>
+
         <div class="head align_center">
             <div class="block_compact_topic floatleft"><{$smarty.const._MB_NEWBB_TOPIC}></div>
             <div class="block_compact_reply floatleft"><{$smarty.const._MB_NEWBB_RPLS}></div>
             <div class="_col_end"><{$smarty.const._MB_NEWBB_LPOST}></div>
             <div class="clear"></div>
         </div>
         <{foreach item=topic from=$block.topics}>
-        <div class="<{cycle values="even,odd"}>">
-            <div class="block_compact_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a>
+            <div class="<{cycle values="even,odd"}>">
+                <div class="block_compact_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
+                <div class="block_compact_reply floatleft left"><{$topic.replies}></div>
+                <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
+                <div class="clear"></div>
             </div>
-            <div class="block_compact_reply floatleft left"><{$topic.replies}></div>
-            <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
-            <div class="clear"></div>
-        </div>
-    <{/foreach}>
+        <{/foreach}>
     <{elseif $block.disp_mode == 2}>
         <{foreach item=topic from=$block.topics}>
-        <div class="<{cycle values="even,odd"}>">
-            <div><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
-            <div class="clear"></div>
-        </div>
-    <{/foreach}>
+            <div class="<{cycle values="even,odd"}>">
+                <div><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
+                <div class="clear"></div>
+            </div>
+        <{/foreach}>
     <{/if}>
 </div>
 <div class="clear"></div>

templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl → EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl

@@ -44,12 +44,9 @@
     <div class="<{cycle values="even,odd"}> border">
         <div class="<{$block_topic}> floatleft left">
             <{if $block.headers.approve}>
-                <{if $topic.approve eq 1}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=active#admin" target="_self"
-                    title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a><{/if}>
-                <{if $topic.approve eq 0}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=pending#admin" target="_self"
-                    title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a><{/if}>
-                <{if $topic.approve eq -1}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=deleted#admin" target="_self"
-                    title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a><{/if}>
+                <{if $topic.approve eq 1}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=active#admin" target="_self" title="<{$smarty.const._MD_NEWBB_TYPE_ADMIN}>"><{$smarty.const._MD_NEWBB_TYPE_ADMIN}></a><{/if}>
+                <{if $topic.approve eq 0}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=pending#admin" target="_self" title="<{$smarty.const._MD_NEWBB_TYPE_PENDING}>"><{$smarty.const._MD_NEWBB_TYPE_PENDING}></a><{/if}>
+                <{if $topic.approve eq -1}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=deleted#admin" target="_self" title="<{$smarty.const._MD_NEWBB_TYPE_DELETED}>"><{$smarty.const._MD_NEWBB_TYPE_DELETED}></a><{/if}>
                 <br>
             <{/if}>
             <{if $block.headers.read}><{$topic.topic_folder}><{/if}>
@@ -113,17 +110,17 @@
     <div class="floatright right">
         <a href="<{$xoops_url}>/modules/newbb/viewpost.php"><{$smarty.const._MB_NEWBB_ALLPOSTS}></a> |
         <a href="<{$xoops_url}>/modules/newbb/list.topic.php"><{$smarty.const._MB_NEWBB_ALLTOPICS}></a> |
-        <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unread"><{$smarty.const._MD_UNREAD}></a> |
+        <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unread"><{$smarty.const._MD_NEWBB_UNREAD}></a> |
         <{if $block.headers.replies}>
-            <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unreplied"><{$smarty.const._MD_UNREPLIED}></a>
+            <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unreplied"><{$smarty.const._MD_NEWBB_UNREPLIED}></a>
             |
         <{/if}>
         <{if $block.headers.votes}>
-            <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=voted"><{$smarty.const._MD_VOTED}></a>
+            <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=voted"><{$smarty.const._MD_NEWBB_VOTED}></a>
             |
         <{/if}>
         <{if $block.headers.poll}>
-            <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=poll"><{$smarty.const._MD_POLL_POLL}></a>
+            <a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=poll"><{$smarty.const._MD_NEWBB_POLL_POLL}></a>
             |
         <{/if}>
         <a href="<{$xoops_url}>/modules/newbb"><{$smarty.const._MB_NEWBB_VSTFRMS}></a>

EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block_post.tpl

@@ -0,0 +1,56 @@
+<div class="outer forum_block_<{$block.disp_mode}>">
+<{if $block.disp_mode == 0}>
+    <div class="head align_center">
+        <div class="block_full_forum floatleft"><{$smarty.const._MB_NEWBB_FORUM}></div>
+        <div class="block_full_topic floatleft"><{$smarty.const._MB_NEWBB_TITLE}></div>
+        <div class="_col_end"><{$smarty.const._MB_NEWBB_AUTHOR}></div>
+        <div class="clear"></div>
+    </div>
+    <{foreach item=topic from=$block.topics}>
+        <div class="<{cycle values="even,odd"}>">
+            <div class="block_full_forum floatleft left"><a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a></div>
+            <div class="block_full_topic floatleft left"><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
+            <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}></div>
+            <div class="clear"></div>
+        </div>
+    <{/foreach}>
+    <{elseif $block.disp_mode == 1}>
+    <div class="head align_center">
+        <div class="block_compact_topic floatleft"><{$smarty.const._MB_NEWBB_TOPIC}></div>
+        <div class="_col_end"><{$smarty.const._MB_NEWBB_AUTHOR}></div>
+        <div class="clear"></div>
+    </div>
+    <{foreach item=topic from=$block.topics}>
+    <div class="<{cycle values="even,odd"}>">
+        <div class="block_compact_topic floatleft left"><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
+        <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}></div>
+        <div class="clear"></div>
+    </div>
+    <{/foreach}>
+ <{elseif $block.disp_mode == 2}>
+    <{foreach item=topic from=$block.topics}>
+    <div class="<{cycle values="even,odd"}>">
+        <div><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
+        <div class="clear"></div>
+    </div>
+    <{/foreach}>
+<{else}>
+    <div>
+        <{foreach item=topic from=$block.topics}>
+            <div><strong><a href="<{$topic.seo_url}>"><{$topic.title}></a></strong></div>
+            <div>
+                <a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a> |
+                <{$topic.topic_poster}> | <{$topic.time}>
+            </div>
+            <div class="post_text"><{$topic.post_text}></div>
+        <{/foreach}>
+    </div>
+  <{/if}>
+</div>
+<div class="clear"></div>
+<{if $block.indexNav}>
+    <div class="pagenav">
+        <a href="<{$block.seo_top_allposts}>"><{$smarty.const._MB_NEWBB_ALLPOSTS}></a> |
+        <a href="<{$block.seo_top_allforums}>"><{$smarty.const._MB_NEWBB_VSTFRMS}></a>
+    </div>
+<{/if}>

EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block_topic.tpl

@@ -0,0 +1,48 @@
+<div class="outer forum_block_<{$block.disp_mode}>">
+  <{if $block.disp_mode == 0}>
+  <div class="head align_center">
+    <div class="block_full_forum floatleft"><{$smarty.const._MB_NEWBB_FORUM}></div>
+    <div class="block_full_topic floatleft"><{$smarty.const._MB_NEWBB_TITLE}></div>
+    <div class="block_full_reply floatleft"><{$smarty.const._MB_NEWBB_RPLS}></div>
+    <div class="block_full_view floatleft"><{$smarty.const._MB_NEWBB_VIEWS}></div>
+    <div class="_col_end"><{$smarty.const._MB_NEWBB_AUTHOR}></div>
+    <div class="clear"></div>
+  </div>
+  <{foreach item=topic from=$block.topics}>
+  <div class="align_center <{cycle values="even,odd"}>">
+    <div class="block_full_forum floatleft left"><a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a></div>
+    <div class="block_full_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
+    <div class="block_full_reply floatleft"><{$topic.replies}></div>
+    <div class="block_full_view floatleft"><{$topic.views}></div>
+    <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}></div>
+    <div class="clear"></div>
+  </div>
+  <{/foreach}>
+  <{elseif $block.disp_mode == 1}>
+  <div class="head align_center">
+    <div class="block_compact_topic floatleft"><{$smarty.const._MB_NEWBB_TOPIC}></div>
+    <div class="_col_end"><{$smarty.const._MB_NEWBB_AUTHOR}></div>
+    <div class="clear"></div>
+  </div>
+  <{foreach item=topic from=$block.topics}>
+  <div class="<{cycle values="even,odd"}>">
+    <div class="block_compact_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
+    <div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}></div>
+    <div class="clear"></div>
+  </div>
+  <{/foreach}>
+  <{elseif $block.disp_mode == 2}>
+  <{foreach item=topic from=$block.topics}>
+  <div class="<{cycle values="even,odd"}>">
+    <div><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
+  </div>
+  <{/foreach}>
+  <{/if}>
+</div>
+<div class="clear"></div>
+<{if $block.indexNav}>
+    <div class="pagenav">
+        <a href="<{$block.seo_top_alltopics}>"><{$smarty.const._MB_NEWBB_ALLTOPICS}></a> |
+        <a href="<{$block.seo_top_allforums}>"><{$smarty.const._MB_NEWBB_VSTFRMS}></a>
+    </div>
+<{/if}>

EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_tag_block_cloud.tpl

@@ -0,0 +1 @@
+<{include file="db:tag_block_cloud.tpl"}>

EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_tag_block_top.tpl

@@ -0,0 +1 @@
+<{include file="db:tag_block_top.tpl"}>

templates_fulldiv_opacity/css/language/english/style.css → EXTRA/themes/templates_fulldiv_opacity/css/language/english/style.css

@@ -2,7 +2,7 @@
 
 .even, .odd, .head {
     padding: 5px;
-    border: 1px solid black;
+    border: 1px solid #000000;
 }
 
 /* div{
@@ -30,15 +30,22 @@
 }
 */
 .toggle_block, .toggle_none {
+    -moz-transition-property: all;
+    -moz-transition-duration: 1s;
+    -moz-transition-timing-function: ease-in-out;
+    -moz-transition-delay: 0s;
     -webkit-transition-property: all;
-    transition-property: all;
     -webkit-transition-duration: 1s;
-            transition-duration: 1s;
     -webkit-transition-timing-function: ease-in-out;
-            transition-timing-function: ease-in-out;
     -webkit-transition-delay: 0s;
-            transition-delay: 0s;
-    -webkit-transition: all 1s ease-in-out 0s;
+    -ms-transition-property: all;
+    -ms-transition-duration: 1s;
+    -ms-transition-timing-function: ease-in-out;
+    -ms-transition-delay: 0s;
+    -o-transition-property: all;
+    -o-transition-duration: 1s;
+    -o-transition-timing-function: ease-in-out;
+    -o-transition-delay: 0s;
     transition: all 1s ease-in-out 0s;
 }
 
@@ -561,13 +568,16 @@ find all image names in newbb/include/images.php
 */
 span.forum_icon.forum_button {
     background: #407DC7;
-    background-image: -webkit-linear-gradient(#407DC7, #4279B8);
-    background-image: linear-gradient(#407DC7, #4279B8);
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#407DC7), to(#4279B8));
+    background-image: -webkit-linear-gradient(top, #407DC7, #4279B8);
+    background-image: -moz-linear-gradient(top, #407DC7, #4279B8);
+    background-image: -ms-linear-gradient(top, #407DC7, #4279B8);
+    background-image: -o-linear-gradient(top, #407DC7, #4279B8);
     border-width: 1px;
-    color: white;
+    color: #ffffff;
     padding: 4px 4px;
-    text-shadow: 0 1px 0 gray;
-    border-color: white #A1C1E6 #2B4763 #A1C1E6;
+    text-shadow: 0 1px 0 #808080;
+    border-color: #ffffff #A1C1E6 #2B4763 #A1C1E6;
     border-style: solid;
     border-radius: 5px;
     box-shadow: 0 1px 7px #080808;
@@ -580,7 +590,7 @@ span.forum_icon.forum_button:hover {
 
 span.forum_icon.forum_button:active {
     box-shadow: inset 0 1px 7px #565656;
-    border-color: white #a1c1e6 black #a1c1e6;
+    border-color: #ffffff #a1c1e6 #000000 #a1c1e6;
     font-weight: normal;
 }
 

templates_fulldiv_opacity/css/language/persian/style.css → EXTRA/themes/templates_fulldiv_opacity/css/language/persian/style.css

@@ -80,9 +80,10 @@ table.userlevel {
 
 /* to mirror (flip) right left images for RTL */
 img#next, img#previous, img#admin_move, img#lastposticon, img#post, img#subforum {
+    -moz-transform: scaleX(-1);
+    -o-transform: scaleX(-1);
     -webkit-transform: scaleX(-1);
-            transform: scaleX(-1);
-    -webkit-filter: FlipH;
-            filter: FlipH;
+    transform: scaleX(-1);
+    filter: FlipH;
     -ms-filter: "FlipH";
 }

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

@@ -0,0 +1 @@
+<script>history.go(-1);</script>

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

@@ -0,0 +1 @@
+<script>history.go(-1);</script>