Skip to content

Commit c6980fd

Browse files
committed
⚡ 🔨 🎨 D3Forum 2.31.2
1 parent cd2201a commit c6980fd

35 files changed

+1568
-1570
lines changed
Lines changed: 3 additions & 0 deletions
Loading

html/modules/d3forum/language/english/help/help.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33

44
<nav id="help-menu">
5-
<a href ="#help-forum-overview" class="ui-btn">Overview</a>
6-
<a href ="#help-forum-start" class="ui-btn">Get started</a>
7-
<a href ="#help-forum-permissions" class="ui-btn">Permissions</a>
8-
<a href ="#help-forum-advanced" class="ui-btn">Advanced</a>
9-
<a href ="#help-forum-history" class="ui-btn">History</a>
10-
<a href ="#help-forum-customize" class="ui-btn" title="Languages and Templates">Customization</a>
11-
<a href ="#help-forum-blocks" class="ui-btn">Blocks</a>
12-
<a href ="#help-forum-preferences" class="ui-btn">Preferences</a>
5+
<a href ="#help-forum-overview" class="button">Overview</a>
6+
<a href ="#help-forum-start" class="button">Get started</a>
7+
<a href ="#help-forum-permissions" class="button">Permissions</a>
8+
<a href ="#help-forum-advanced" class="button">Advanced</a>
9+
<a href ="#help-forum-history" class="button">History</a>
10+
<a href ="#help-forum-customize" class="button" title="Languages and Templates">Customization</a>
11+
<a href ="#help-forum-blocks" class="button">Blocks</a>
12+
<a href ="#help-forum-preferences" class="button">Preferences</a>
1313
</nav>
1414

1515

html/modules/d3forum/language/fr_utf8/help/help.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33

44
<nav id="help-menu">
5-
<a href ="#help-forum-overview" class="ui-btn">Overview</a>
6-
<a href ="#help-forum-start" class="ui-btn">Get started</a>
7-
<a href ="#help-forum-permissions" class="ui-btn">Permissions</a>
8-
<a href ="#help-forum-advanced" class="ui-btn">Advanced</a>
9-
<a href ="#help-forum-history" class="ui-btn">History</a>
10-
<a href ="#help-forum-customize" class="ui-btn" title="Languages and Templates">Customization</a>
11-
<a href ="#help-forum-blocks" class="ui-btn">Blocks</a>
12-
<a href ="#help-forum-preferences" class="ui-btn">Preferences</a>
5+
<a href ="#help-forum-overview" class="button">Overview</a>
6+
<a href ="#help-forum-start" class="button">Get started</a>
7+
<a href ="#help-forum-permissions" class="button">Permissions</a>
8+
<a href ="#help-forum-advanced" class="button">Advanced</a>
9+
<a href ="#help-forum-history" class="button">History</a>
10+
<a href ="#help-forum-customize" class="button" title="Languages and Templates">Customization</a>
11+
<a href ="#help-forum-blocks" class="button">Blocks</a>
12+
<a href ="#help-forum-preferences" class="button">Preferences</a>
1313
</nav>
1414

1515

html/modules/d3forum/language/ja_utf8/help/help.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33

44
<nav id="help-menu">
5-
<a href ="#help-forum-overview" class="ui-btn">Overview</a>
6-
<a href ="#help-forum-start" class="ui-btn">Get started</a>
7-
<a href ="#help-forum-permissions" class="ui-btn">Permissions</a>
8-
<a href ="#help-forum-advanced" class="ui-btn">Advanced</a>
9-
<a href ="#help-forum-history" class="ui-btn">History</a>
10-
<a href ="#help-forum-customize" class="ui-btn" title="Languages and Templates">Customization</a>
11-
<a href ="#help-forum-blocks" class="ui-btn">Blocks</a>
12-
<a href ="#help-forum-preferences" class="ui-btn">Preferences</a>
5+
<a href ="#help-forum-overview" class="button">Overview</a>
6+
<a href ="#help-forum-start" class="button">Get started</a>
7+
<a href ="#help-forum-permissions" class="button">Permissions</a>
8+
<a href ="#help-forum-advanced" class="button">Advanced</a>
9+
<a href ="#help-forum-history" class="button">History</a>
10+
<a href ="#help-forum-customize" class="button" title="Languages and Templates">Customization</a>
11+
<a href ="#help-forum-blocks" class="button">Blocks</a>
12+
<a href ="#help-forum-preferences" class="button">Preferences</a>
1313
</nav>
1414

1515

html/modules/d3forum/language/pt_utf8/help/help.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33

44
<nav id="help-menu">
5-
<a href ="#help-forum-overview" class="ui-btn">Overview</a>
6-
<a href ="#help-forum-start" class="ui-btn">Get started</a>
7-
<a href ="#help-forum-permissions" class="ui-btn">Permissions</a>
8-
<a href ="#help-forum-advanced" class="ui-btn">Advanced</a>
9-
<a href ="#help-forum-history" class="ui-btn">History</a>
10-
<a href ="#help-forum-customize" class="ui-btn" title="Languages and Templates">Customization</a>
11-
<a href ="#help-forum-blocks" class="ui-btn">Blocks</a>
12-
<a href ="#help-forum-preferences" class="ui-btn">Preferences</a>
5+
<a href ="#help-forum-overview" class="button">Overview</a>
6+
<a href ="#help-forum-start" class="button">Get started</a>
7+
<a href ="#help-forum-permissions" class="button">Permissions</a>
8+
<a href ="#help-forum-advanced" class="button">Advanced</a>
9+
<a href ="#help-forum-history" class="button">History</a>
10+
<a href ="#help-forum-customize" class="button" title="Languages and Templates">Customization</a>
11+
<a href ="#help-forum-blocks" class="button">Blocks</a>
12+
<a href ="#help-forum-preferences" class="button">Preferences</a>
1313
</nav>
1414

1515

xoops_trust_path/modules/d3forum/admin/mymenu.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@
9595

9696
$tpl = new D3Tpl();
9797

98-
$tpl->assign( [
98+
$tpl->assign(
99+
[
99100
'adminmenu' => $adminmenu,
100101
'dirname' => $dirname,
101102
]

xoops_trust_path/modules/d3forum/include/transact_functions.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,8 @@ function d3forum_transact_turnsolvedon_in_forum( $mydirname, $forum_id ) {
10221022

10231023
// return purified HTML
10241024
function d3forum_transact_htmlpurify( $text, $mydirname ) {
1025-
// if( substr( PHP_VERSION , 0 , 1 ) != 4 && file_exists( XOOPS_LIBRARY_PATH.'/htmlpurifier/library/HTMLPurifier.auto.php' ) ) {
1026-
require_once XOOPS_LIBRARY_PATH . '/htmlpurifier/library/HTMLPurifier.auto.php';
1025+
if( file_exists( LIBRARY_PATH.'/htmlpurifier/library/HTMLPurifier.auto.php' ) ) {
1026+
require_once LIBRARY_PATH . '/htmlpurifier/library/HTMLPurifier.auto.php';
10271027

10281028
$config = HTMLPurifier_Config::createDefault();
10291029

@@ -1054,6 +1054,7 @@ function d3forum_transact_htmlpurify( $text, $mydirname ) {
10541054
mb_substitute_character( $_substitute );
10551055
}
10561056

1057-
// }
1057+
}
1058+
10581059
return $text;
10591060
}
Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,49 @@
11
<?php
2-
// Syntax replace define with const v2.3.0 2021/05/15 @gigamaster XCL-PHP7
32

4-
const _MD_A_MYMENU_MYTPLSADMIN = 'Templates';
5-
const _MD_A_MYMENU_MYBLOCKSADMIN = 'Blocks Permissions';
6-
const _MD_A_MYMENU_MYPREFERENCES = 'Preferences';
3+
define( '_MD_A_MYMENU_MYTPLSADMIN' , 'Templates');
4+
define( '_MD_A_MYMENU_MYBLOCKSADMIN' , 'Blocks Permissions');
5+
define( '_MD_A_MYMENU_MYPREFERENCES' , 'Preferences');
76

87
// forum_access and category_access
9-
const _MD_A_D3FORUM_LABEL_SELECTFORUM = 'Select a forum';
10-
const _MD_A_D3FORUM_LABEL_SELECTCATEGORY = 'Select a category';
11-
const _MD_A_D3FORUM_H2_GROUPPERMS = 'Group Permissions';
12-
const _MD_A_D3FORUM_H2_USERPERMS = 'User Permissions';
13-
const _MD_A_D3FORUM_TH_CAN_READ = 'View';
14-
const _MD_A_D3FORUM_TH_CAN_POST = 'Post';
15-
const _MD_A_D3FORUM_TH_CAN_EDIT = 'Edit';
16-
const _MD_A_D3FORUM_TH_CAN_DELETE = 'Delete';
17-
const _MD_A_D3FORUM_TH_POST_AUTO_APPROVED = 'AutoApproval';
18-
const _MD_A_D3FORUM_TH_IS_MODERATOR = 'Moderator';
19-
const _MD_A_D3FORUM_TH_CAN_MAKEFORUM = 'Making forums';
20-
const _MD_A_D3FORUM_TH_UID = 'uid';
21-
const _MD_A_D3FORUM_TH_UNAME = 'uname';
22-
const _MD_A_D3FORUM_TH_GROUPNAME = 'groupname';
23-
const _MD_A_D3FORUM_NOTICE_ADDUSERS = 'Input either uid or uname.';
24-
const _MD_A_D3FORUM_ERR_CREATECATEGORYFIRST = 'Create a category first';
25-
const _MD_A_D3FORUM_ERR_CREATEFORUMFIRST = 'Create a forum first';
8+
define( '_MD_A_D3FORUM_LABEL_SELECTFORUM' , 'Select a forum');
9+
define( '_MD_A_D3FORUM_LABEL_SELECTCATEGORY' , 'Select a category');
10+
define( '_MD_A_D3FORUM_H2_GROUPPERMS' , 'Group Permissions');
11+
define( '_MD_A_D3FORUM_H2_USERPERMS' , 'User Permissions');
12+
define( '_MD_A_D3FORUM_TH_CAN_READ' , 'View');
13+
define( '_MD_A_D3FORUM_TH_CAN_POST' , 'Post');
14+
define( '_MD_A_D3FORUM_TH_CAN_EDIT' , 'Edit');
15+
define( '_MD_A_D3FORUM_TH_CAN_DELETE' , 'Delete');
16+
define( '_MD_A_D3FORUM_TH_POST_AUTO_APPROVED' , 'AutoApproval');
17+
define( '_MD_A_D3FORUM_TH_IS_MODERATOR' , 'Moderator');
18+
define( '_MD_A_D3FORUM_TH_CAN_MAKEFORUM' , 'Making forums');
19+
define( '_MD_A_D3FORUM_TH_UID' , 'uid');
20+
define( '_MD_A_D3FORUM_TH_UNAME' , 'uname');
21+
define( '_MD_A_D3FORUM_TH_GROUPNAME' , 'groupname');
22+
define( '_MD_A_D3FORUM_NOTICE_ADDUSERS' , 'Input either uid or uname.');
23+
define( '_MD_A_D3FORUM_ERR_CREATECATEGORYFIRST' , 'Create a category first');
24+
define( '_MD_A_D3FORUM_ERR_CREATEFORUMFIRST' , 'Create a forum first');
2625

2726
// advanced
28-
const _MD_A_D3FORUM_H2_SYNCALLTABLES = 'Synchronize redundant information';
29-
const _MD_A_D3FORUM_MAX_TOPIC_ID = 'Max topic id';
30-
const _MD_A_D3FORUM_LABEL_SYNCTOPICS_START = 'topic started from';
31-
const _MD_A_D3FORUM_LABEL_SYNCTOPICS_NUM = 'topics at once';
32-
const _MD_A_D3FORUM_BTN_DOSYNCTABLES = 'Synchronize';
33-
const _MD_A_D3FORUM_FMT_SYNCTOPICSDONE = '%s topics have been synchronized';
34-
const _MD_A_D3FORUM_MSG_SYNCTABLESDONE = 'Synchronized successfully';
35-
const _MD_A_D3FORUM_HELP_SYNCALLTABLES = 'Run this command to solve problems in the forum after "importing" external data from other modules.';
36-
const _MD_A_D3FORUM_H2_IMPORTFROM = 'Import from module';
37-
const _MD_A_D3FORUM_H2_COMIMPORTFROM = 'Import from Comment Management';
38-
const _MD_A_D3FORUM_LABEL_SELECTMODULE = 'Select a module';
39-
const _MD_A_D3FORUM_BTN_DOIMPORT = 'Import';
40-
const _MD_A_D3FORUM_CONFIRM_DOIMPORT = 'Are you sure?';
41-
const _MD_A_D3FORUM_MSG_IMPORTDONE = 'Imported successfully';
42-
const _MD_A_D3FORUM_MSG_COMIMPORTDONE = 'Default comments of the module are imported as comment-integration';
43-
const _MD_A_D3FORUM_ERR_INVALIDMID = 'You have specified a wrong module to be imported';
44-
const _MD_A_D3FORUM_ERR_SQLONIMPORT = 'Failed to import. You have to check the versions of each module.';
45-
const _MD_A_D3FORUM_HELP_IMPORTFROM = 'You can import from newbb1, xhnewbb, and other instances of d3forum. Beware, the copy is not perfect and requires you to check the permissions. Warning ! All data in this module will be lost when the import command is executed.';
46-
const _MD_A_D3FORUM_HELP_COMIMPORTFROM = 'Import the posts from <strong>Comment Management</strong> into D3Forum. You must also enable the <strong>comments-integration</strong> feature to import as d3forum posts. Then you can change the preferences, localization or translation, and customize the templates.';
27+
define( '_MD_A_D3FORUM_H2_SYNCALLTABLES' , 'Synchronize redundant information');
28+
define( '_MD_A_D3FORUM_MAX_TOPIC_ID' , 'Max topic id');
29+
define( '_MD_A_D3FORUM_LABEL_SYNCTOPICS_START' , 'topic started from');
30+
define( '_MD_A_D3FORUM_LABEL_SYNCTOPICS_NUM' , 'topics at once');
31+
define( '_MD_A_D3FORUM_BTN_DOSYNCTABLES' , 'Synchronize');
32+
define( '_MD_A_D3FORUM_FMT_SYNCTOPICSDONE' , '%s topics have been synchronized');
33+
define( '_MD_A_D3FORUM_MSG_SYNCTABLESDONE' , 'Synchronized successfully');
34+
define( '_MD_A_D3FORUM_HELP_SYNCALLTABLES' , 'Run this command to solve problems in the forum after "importing" external data from other modules.');
35+
define( '_MD_A_D3FORUM_H2_IMPORTFROM' , 'Import from module');
36+
define( '_MD_A_D3FORUM_H2_COMIMPORTFROM' , 'Import from Comment Management');
37+
define( '_MD_A_D3FORUM_LABEL_SELECTMODULE' , 'Select a module');
38+
define( '_MD_A_D3FORUM_BTN_DOIMPORT' , 'Import');
39+
define( '_MD_A_D3FORUM_CONFIRM_DOIMPORT' , 'Are you sure?');
40+
define( '_MD_A_D3FORUM_MSG_IMPORTDONE' , 'Imported successfully');
41+
define( '_MD_A_D3FORUM_MSG_COMIMPORTDONE' , 'Default comments of the module are imported as comment-integration');
42+
define( '_MD_A_D3FORUM_ERR_INVALIDMID' , 'You have specified a wrong module to be imported');
43+
define( '_MD_A_D3FORUM_ERR_SQLONIMPORT' , 'Failed to import. You have to check the versions of each module.');
44+
define( '_MD_A_D3FORUM_HELP_IMPORTFROM' , 'You can import from newbb1, xhnewbb, and other instances of d3forum. Beware, the copy is not perfect and requires you to check the permissions. Warning ! All data in this module will be lost when the import command is executed.');
45+
define( '_MD_A_D3FORUM_HELP_COMIMPORTFROM' , 'Import the posts from <strong>Comment Management</strong> into D3Forum. You must also enable the <strong>comments-integration</strong> feature to import as d3forum posts. Then you can change the preferences, localization or translation, and customize the templates.');
4746

4847
// post_histories
49-
const _MD_A_D3FORUM_H2_POSTHISTORIES = 'Revision History';
50-
const _MD_A_D3FORUM_LINK_REFERDELETED = 'Deleted';
48+
define( '_MD_A_D3FORUM_H2_POSTHISTORIES' , 'Revision History');
49+
define( '_MD_A_D3FORUM_LINK_REFERDELETED' , 'Deleted');
Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<?php
2-
// Syntax replace define with const v2.3.0 2021/05/15 @gigamaster XCL-PHP7
32

43
// definitions for editing blocks
5-
const _MB_D3FORUM_DISPLAY = 'Display %s items';
6-
const _MB_D3FORUM_DISPLAYF = 'Display in full size';
7-
const _MB_D3FORUM_MARKISUP = 'Marked topics are upper';
8-
const _MB_D3FORUM_ORDERRULE = 'Sorted by';
9-
const _MB_D3FORUM_CATLIMIT = 'Specify categories';
10-
const _MB_D3FORUM_FORUMLIMIT = 'Specify forums';
11-
const _MB_D3FORUM_CATLIMITDSC = "Set category's id separated by a comma. Note this specification is not applied recursively. Leave the fill blank for all categories, or `auto` for the current category.";
12-
const _MB_D3FORUM_FORUMLIMITDSC = 'Same as category specification';
13-
const _MB_D3FORUM_THISTEMPLATE = 'Template';
4+
define( '_MB_D3FORUM_DISPLAY' , 'Display %s items');
5+
define( '_MB_D3FORUM_DISPLAYF' , 'Display in full size');
6+
define( '_MB_D3FORUM_MARKISUP' , 'Marked topics are upper');
7+
define( '_MB_D3FORUM_ORDERRULE' , 'Sorted by');
8+
define( '_MB_D3FORUM_CATLIMIT' , 'Specify categories');
9+
define( '_MB_D3FORUM_FORUMLIMIT' , 'Specify forums');
10+
define( '_MB_D3FORUM_CATLIMITDSC' , "Set category's id separated by a comma. Note this specification is not applied recursively. Leave the fill blank for all categories, or `auto` for the current category.");
11+
define( '_MB_D3FORUM_FORUMLIMITDSC' , 'Same as category specification');
12+
define( '_MB_D3FORUM_THISTEMPLATE' , 'Template');
1413

15-
const _MB_D3FORUM_ORDERTIMED = 'Newest first';
16-
const _MB_D3FORUM_ORDERVIEWSD = 'Most viewed first';
17-
const _MB_D3FORUM_ORDERREPLIESD = 'Most commented first';
18-
const _MB_D3FORUM_ORDERVOTESD = 'Most voted first';
19-
const _MB_D3FORUM_ORDERPOINTSD = 'Most scored first';
20-
const _MB_D3FORUM_ORDERAVERAGED = 'Highest average scores first';
14+
define( '_MB_D3FORUM_ORDERTIMED' , 'Newest first');
15+
define( '_MB_D3FORUM_ORDERVIEWSD' , 'Most viewed first');
16+
define( '_MB_D3FORUM_ORDERREPLIESD' , 'Most commented first');
17+
define( '_MB_D3FORUM_ORDERVOTESD' , 'Most voted first');
18+
define( '_MB_D3FORUM_ORDERPOINTSD' , 'Most scored first');
19+
define( '_MB_D3FORUM_ORDERAVERAGED' , 'Highest average scores first');

0 commit comments

Comments
 (0)