Skip to content

Commit 41984e2

Browse files
mambax7mambax7
authored
Merge pull request #64 from mambax7/master
5.0 Final merge
2 parents 22f6555 + fe7ae8b commit 41984e2

File tree

444 files changed

+17074
-12142
lines changed

Some content is hidden

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

444 files changed

+17074
-12142
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
*~
33
\#*
44
*.bak
5-
.idea/
5+

‎.htaccess‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
RewriteEngine on
2-
RewriteRule ^newbb/([a-z]+)-([0-9]+)(/(.+))? modules/newbb/seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
2+
#.htaccess located in XOOPS_PATH. For SEO Links
3+
#RewriteRule ^modules/newbb/([a-z]+)-([0-9]+)(/(.+))? modules/newbb/seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
4+
#.htaccess located in modules/newbb. For SEO Links
5+
#RewriteRule ^([a-z]+)-([0-9]+)(/(.+))? seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
6+
37
#RewriteRule ^(.*)$ $1 [L]

‎.scrutinizer.yml‎

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,22 @@
1-
checks:
2-
php:
3-
code_rating: true
4-
variable_existence: true
5-
useless_calls: true
6-
use_statement_alias_conflict: true
7-
unused_variables: true
8-
unused_properties: true
9-
unused_parameters: true
10-
unused_methods: true
11-
unreachable_code: true
12-
sql_injection_vulnerabilities: true
13-
security_vulnerabilities: true
14-
precedence_mistakes: true
15-
precedence_in_conditions: true
16-
parameter_non_unique: true
17-
no_property_on_interface: true
18-
no_non_implemented_abstract_methods: true
19-
deprecated_code_usage: true
20-
closure_use_not_conflicting: true
21-
closure_use_modifiable: true
22-
avoid_useless_overridden_methods: true
23-
avoid_conflicting_incrementers: true
24-
assignment_of_null_return: true
25-
verify_property_names: true
26-
verify_argument_usable_as_reference: true
27-
verify_access_scope_valid: true
28-
use_self_instead_of_fqcn: true
29-
too_many_arguments: true
30-
single_namespace_per_use: true
31-
return_doc_comment_if_not_inferrable: true
32-
return_doc_comments: true
33-
require_scope_for_methods: true
34-
require_scope_for_properties: true
35-
require_php_tag_first: true
36-
require_braces_around_control_structures: true
37-
psr2_control_structure_declaration: true
38-
psr2_switch_declaration: true
39-
psr2_class_declaration: true
40-
no_eval: true
41-
no_else_if_statements: true
42-
avoid_corrupting_byteorder_marks: true
43-
argument_type_checks: true
44-
php5_style_constructor: true
45-
parameter_doc_comments: true
46-
no_duplicate_arguments: true
47-
missing_arguments: true
48-
instanceof_class_exists: true
49-
foreach_traversable: true
50-
no_unnecessary_function_call_in_for_loop: true
1+
# language: php
2+
build:
3+
nodes:
4+
tests: true
5+
analysis:
6+
dependencies:
7+
after:
8+
# The following installs the most recent XOOPS CMS version, you might want
9+
# to install a specific release tag or branch instead.
10+
- git clone --depth=1 https://github.com/XOOPS/XoopsCore25
11+
- git clone --depth=1 https://github.com/mambax7/tag
12+
project_setup:
13+
override: true
14+
tests:
15+
override:
16+
- php-scrutinizer-run --enable-security-analysis
17+
filter:
18+
dependency_paths:
19+
- XoopsCore25/*
20+
- tag/*
21+
- Xoopspoll
22+

templates_fulldiv_opacity/blocks/index.html renamed to EXTRA/index.html

File renamed without changes.

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

File renamed without changes.

templates_fulldiv_opacity/images/language/index.html renamed to EXTRA/themes/templates_fulldiv_opacity/blocks/index.html

File renamed without changes.

templates_fulldiv_opacity/blocks/newbb_block.tpl renamed to EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block.tpl

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,41 @@
88
<div class="_col_end"><{$smarty.const._MB_NEWBB_LPOST}></div>
99
<div class="clear"></div>
1010
</div>
11+
1112
<{foreach item=topic from=$block.topics}>
12-
<div class="align_center <{cycle values="even,odd"}>">
13-
<div class="block_full_forum floatleft left"><a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a>
13+
<div class="align_center <{cycle values="even,odd"}>">
14+
<div class="block_full_forum floatleft left"><a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a></div>
15+
<div class="block_full_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
16+
<div class="block_full_reply floatleft"><{$topic.replies}></div>
17+
<div class="block_full_view floatleft"><{$topic.views}></div>
18+
<div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
19+
<div class="clear"></div>
1420
</div>
15-
<div class="block_full_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
16-
<div class="block_full_reply floatleft"><{$topic.replies}></div>
17-
<div class="block_full_view floatleft"><{$topic.views}></div>
18-
<div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
19-
<div class="clear"></div>
20-
</div>
21-
<{/foreach}>
21+
<{/foreach}>
2222

2323
<{elseif $block.disp_mode == 1}>
24+
2425
<div class="head align_center">
2526
<div class="block_compact_topic floatleft"><{$smarty.const._MB_NEWBB_TOPIC}></div>
2627
<div class="block_compact_reply floatleft"><{$smarty.const._MB_NEWBB_RPLS}></div>
2728
<div class="_col_end"><{$smarty.const._MB_NEWBB_LPOST}></div>
2829
<div class="clear"></div>
2930
</div>
3031
<{foreach item=topic from=$block.topics}>
31-
<div class="<{cycle values="even,odd"}>">
32-
<div class="block_compact_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a>
32+
<div class="<{cycle values="even,odd"}>">
33+
<div class="block_compact_topic floatleft left"><a href="<{$topic.seo_topic_url}>"><{$topic.title}></a></div>
34+
<div class="block_compact_reply floatleft left"><{$topic.replies}></div>
35+
<div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
36+
<div class="clear"></div>
3337
</div>
34-
<div class="block_compact_reply floatleft left"><{$topic.replies}></div>
35-
<div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}>&nbsp;<a href="<{$topic.seo_url}>"><{$topic.topic_page_jump}></a></div>
36-
<div class="clear"></div>
37-
</div>
38-
<{/foreach}>
38+
<{/foreach}>
3939
<{elseif $block.disp_mode == 2}>
4040
<{foreach item=topic from=$block.topics}>
41-
<div class="<{cycle values="even,odd"}>">
42-
<div><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
43-
<div class="clear"></div>
44-
</div>
45-
<{/foreach}>
41+
<div class="<{cycle values="even,odd"}>">
42+
<div><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
43+
<div class="clear"></div>
44+
</div>
45+
<{/foreach}>
4646
<{/if}>
4747
</div>
4848
<div class="clear"></div>

templates_fulldiv_opacity/blocks/newbb_block_author.tpl renamed to EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block_author.tpl

File renamed without changes.

templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl renamed to EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block_list_topic.tpl

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,9 @@
4444
<div class="<{cycle values="even,odd"}> border">
4545
<div class="<{$block_topic}> floatleft left">
4646
<{if $block.headers.approve}>
47-
<{if $topic.approve eq 1}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=active#admin" target="_self"
48-
title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a><{/if}>
49-
<{if $topic.approve eq 0}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=pending#admin" target="_self"
50-
title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a><{/if}>
51-
<{if $topic.approve eq -1}><a href="<{$xoops_url}>/modules/newbb/<{$topic.topic_link}>&status=deleted#admin" target="_self"
52-
title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a><{/if}>
47+
<{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}>
48+
<{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}>
49+
<{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}>
5350
<br>
5451
<{/if}>
5552
<{if $block.headers.read}><{$topic.topic_folder}><{/if}>
@@ -113,17 +110,17 @@
113110
<div class="floatright right">
114111
<a href="<{$xoops_url}>/modules/newbb/viewpost.php"><{$smarty.const._MB_NEWBB_ALLPOSTS}></a> |
115112
<a href="<{$xoops_url}>/modules/newbb/list.topic.php"><{$smarty.const._MB_NEWBB_ALLTOPICS}></a> |
116-
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unread"><{$smarty.const._MD_UNREAD}></a> |
113+
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unread"><{$smarty.const._MD_NEWBB_UNREAD}></a> |
117114
<{if $block.headers.replies}>
118-
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unreplied"><{$smarty.const._MD_UNREPLIED}></a>
115+
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=unreplied"><{$smarty.const._MD_NEWBB_UNREPLIED}></a>
119116
|
120117
<{/if}>
121118
<{if $block.headers.votes}>
122-
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=voted"><{$smarty.const._MD_VOTED}></a>
119+
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=voted"><{$smarty.const._MD_NEWBB_VOTED}></a>
123120
|
124121
<{/if}>
125122
<{if $block.headers.poll}>
126-
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=poll"><{$smarty.const._MD_POLL_POLL}></a>
123+
<a href="<{$xoops_url}>/modules/newbb/list.topic.php?status=poll"><{$smarty.const._MD_NEWBB_POLL_POLL}></a>
127124
|
128125
<{/if}>
129126
<a href="<{$xoops_url}>/modules/newbb"><{$smarty.const._MB_NEWBB_VSTFRMS}></a>

‎EXTRA/themes/templates_fulldiv_opacity/blocks/newbb_block_post.tpl‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<div class="outer forum_block_<{$block.disp_mode}>">
2+
<{if $block.disp_mode == 0}>
3+
<div class="head align_center">
4+
<div class="block_full_forum floatleft"><{$smarty.const._MB_NEWBB_FORUM}></div>
5+
<div class="block_full_topic floatleft"><{$smarty.const._MB_NEWBB_TITLE}></div>
6+
<div class="_col_end"><{$smarty.const._MB_NEWBB_AUTHOR}></div>
7+
<div class="clear"></div>
8+
</div>
9+
<{foreach item=topic from=$block.topics}>
10+
<div class="<{cycle values="even,odd"}>">
11+
<div class="block_full_forum floatleft left"><a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a></div>
12+
<div class="block_full_topic floatleft left"><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
13+
<div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}></div>
14+
<div class="clear"></div>
15+
</div>
16+
<{/foreach}>
17+
<{elseif $block.disp_mode == 1}>
18+
<div class="head align_center">
19+
<div class="block_compact_topic floatleft"><{$smarty.const._MB_NEWBB_TOPIC}></div>
20+
<div class="_col_end"><{$smarty.const._MB_NEWBB_AUTHOR}></div>
21+
<div class="clear"></div>
22+
</div>
23+
<{foreach item=topic from=$block.topics}>
24+
<div class="<{cycle values="even,odd"}>">
25+
<div class="block_compact_topic floatleft left"><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
26+
<div class="_col_end right"><{$topic.time}><br><{$topic.topic_poster}></div>
27+
<div class="clear"></div>
28+
</div>
29+
<{/foreach}>
30+
<{elseif $block.disp_mode == 2}>
31+
<{foreach item=topic from=$block.topics}>
32+
<div class="<{cycle values="even,odd"}>">
33+
<div><a href="<{$topic.seo_url}>"><{$topic.title}></a></div>
34+
<div class="clear"></div>
35+
</div>
36+
<{/foreach}>
37+
<{else}>
38+
<div>
39+
<{foreach item=topic from=$block.topics}>
40+
<div><strong><a href="<{$topic.seo_url}>"><{$topic.title}></a></strong></div>
41+
<div>
42+
<a href="<{$topic.seo_forum_url}>"><{$topic.forum_name}></a> |
43+
<{$topic.topic_poster}> | <{$topic.time}>
44+
</div>
45+
<div class="post_text"><{$topic.post_text}></div>
46+
<{/foreach}>
47+
</div>
48+
<{/if}>
49+
</div>
50+
<div class="clear"></div>
51+
<{if $block.indexNav}>
52+
<div class="pagenav">
53+
<a href="<{$block.seo_top_allposts}>"><{$smarty.const._MB_NEWBB_ALLPOSTS}></a> |
54+
<a href="<{$block.seo_top_allforums}>"><{$smarty.const._MB_NEWBB_VSTFRMS}></a>
55+
</div>
56+
<{/if}>

0 commit comments

Comments
 (0)