@@ -50,19 +50,19 @@ discard block |
||
50 | 50 | //define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash |
51 | 51 | |
52 | 52 | if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) { |
53 | - define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__))); |
|
54 | - define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
55 | - define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
56 | - define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/'); |
|
57 | - define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/'); |
|
58 | - define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images'); |
|
59 | - define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/'); |
|
60 | - define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/'); |
|
61 | - define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php'); |
|
62 | - define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png'); |
|
63 | - define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
64 | - define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
65 | - define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1); |
|
53 | + define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__))); |
|
54 | + define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
55 | + define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
56 | + define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/'); |
|
57 | + define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/'); |
|
58 | + define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images'); |
|
59 | + define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/'); |
|
60 | + define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/'); |
|
61 | + define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php'); |
|
62 | + define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png'); |
|
63 | + define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
64 | + define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
65 | + define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
@@ -133,15 +133,15 @@ discard block |
||
133 | 133 | //$pathModIcon32 = $helper->getModule()->getInfo('modicons32'); |
134 | 134 | |
135 | 135 | $icons = [ |
136 | - 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>", |
|
137 | - 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>", |
|
138 | - 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>", |
|
139 | - 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>", |
|
140 | - 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>", |
|
141 | - 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>", |
|
142 | - 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>", |
|
143 | - '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>", |
|
144 | - '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>", |
|
136 | + 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>", |
|
137 | + 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>", |
|
138 | + 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>", |
|
139 | + 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>", |
|
140 | + 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>", |
|
141 | + 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>", |
|
142 | + 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>", |
|
143 | + '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>", |
|
144 | + '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>", |
|
145 | 145 | ]; |
146 | 146 | |
147 | 147 | $debug = false; |
@@ -150,16 +150,16 @@ discard block |
||
150 | 150 | $myts = \MyTextSanitizer::getInstance(); |
151 | 151 | |
152 | 152 | if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) { |
153 | - require_once $GLOBALS['xoops']->path('class/template.php'); |
|
154 | - $GLOBALS['xoopsTpl'] = new \XoopsTpl(); |
|
153 | + require_once $GLOBALS['xoops']->path('class/template.php'); |
|
154 | + $GLOBALS['xoopsTpl'] = new \XoopsTpl(); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | $GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName); |
158 | 158 | // Local icons path |
159 | 159 | if (is_object($helper->getModule())) { |
160 | - $pathModIcon16 = $helper->getModule()->getInfo('modicons16'); |
|
161 | - $pathModIcon32 = $helper->getModule()->getInfo('modicons32'); |
|
160 | + $pathModIcon16 = $helper->getModule()->getInfo('modicons16'); |
|
161 | + $pathModIcon32 = $helper->getModule()->getInfo('modicons32'); |
|
162 | 162 | |
163 | - $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16); |
|
164 | - $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32); |
|
163 | + $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16); |
|
164 | + $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32); |
|
165 | 165 | } |
@@ -23,10 +23,10 @@ discard block |
||
23 | 23 | use XoopsModules\Newbb; |
24 | 24 | |
25 | 25 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
26 | -require_once dirname(__DIR__) . '/preloads/autoloader.php'; |
|
26 | +require_once dirname(__DIR__).'/preloads/autoloader.php'; |
|
27 | 27 | |
28 | 28 | $moduleDirName = basename(dirname(__DIR__)); |
29 | -$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName |
|
29 | +$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName |
|
30 | 30 | |
31 | 31 | /** @var \XoopsDatabase $db */ |
32 | 32 | /** @var Newbb\Helper $helper */ |
@@ -49,20 +49,20 @@ discard block |
||
49 | 49 | //define('NEWBB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash |
50 | 50 | //define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash |
51 | 51 | |
52 | -if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) { |
|
53 | - define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__))); |
|
54 | - define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
55 | - define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
56 | - define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/'); |
|
57 | - define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/'); |
|
58 | - define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images'); |
|
59 | - define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/'); |
|
60 | - define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/'); |
|
61 | - define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php'); |
|
62 | - define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png'); |
|
63 | - define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
64 | - define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
65 | - define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1); |
|
52 | +if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) { |
|
53 | + define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__))); |
|
54 | + define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/'); |
|
55 | + define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/'); |
|
56 | + define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/'); |
|
57 | + define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/'); |
|
58 | + define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images'); |
|
59 | + define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/'); |
|
60 | + define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/'); |
|
61 | + define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php'); |
|
62 | + define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png'); |
|
63 | + define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash |
|
64 | + define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash |
|
65 | + define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
@@ -133,15 +133,15 @@ discard block |
||
133 | 133 | //$pathModIcon32 = $helper->getModule()->getInfo('modicons32'); |
134 | 134 | |
135 | 135 | $icons = [ |
136 | - 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>", |
|
137 | - 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>", |
|
138 | - 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>", |
|
139 | - 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>", |
|
140 | - 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>", |
|
141 | - 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>", |
|
142 | - 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>", |
|
143 | - '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>", |
|
144 | - '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>", |
|
136 | + 'edit' => "<img src='".$pathIcon16."/edit.png' alt="._EDIT."' align='middle'>", |
|
137 | + 'delete' => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>", |
|
138 | + 'clone' => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>", |
|
139 | + 'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>", |
|
140 | + 'print' => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>", |
|
141 | + 'pdf' => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>", |
|
142 | + 'add' => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>", |
|
143 | + '0' => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>", |
|
144 | + '1' => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>", |
|
145 | 145 | ]; |
146 | 146 | |
147 | 147 | $debug = false; |
@@ -154,12 +154,12 @@ discard block |
||
154 | 154 | $GLOBALS['xoopsTpl'] = new \XoopsTpl(); |
155 | 155 | } |
156 | 156 | |
157 | -$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName); |
|
157 | +$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName); |
|
158 | 158 | // Local icons path |
159 | 159 | if (is_object($helper->getModule())) { |
160 | 160 | $pathModIcon16 = $helper->getModule()->getInfo('modicons16'); |
161 | 161 | $pathModIcon32 = $helper->getModule()->getInfo('modicons32'); |
162 | 162 | |
163 | - $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16); |
|
163 | + $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16); |
|
164 | 164 | $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32); |
165 | 165 | } |
@@ -30,20 +30,20 @@ discard block |
||
30 | 30 | */ |
31 | 31 | function xoops_module_pre_install_newbb(\XoopsModule $module) |
32 | 32 | { |
33 | - require_once dirname(__DIR__) . '/preloads/autoloader.php'; |
|
34 | - /** @var Newbb\Utility $utility */ |
|
35 | - $utility = new \XoopsModules\Newbb\Utility(); |
|
36 | - $xoopsSuccess = $utility::checkVerXoops($module); |
|
37 | - $phpSuccess = $utility::checkVerPhp($module); |
|
33 | + require_once dirname(__DIR__) . '/preloads/autoloader.php'; |
|
34 | + /** @var Newbb\Utility $utility */ |
|
35 | + $utility = new \XoopsModules\Newbb\Utility(); |
|
36 | + $xoopsSuccess = $utility::checkVerXoops($module); |
|
37 | + $phpSuccess = $utility::checkVerPhp($module); |
|
38 | 38 | |
39 | - if (false !== $xoopsSuccess && false !== $phpSuccess) { |
|
40 | - $moduleTables =& $module->getInfo('tables'); |
|
41 | - foreach ($moduleTables as $table) { |
|
42 | - $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';'); |
|
43 | - } |
|
44 | - } |
|
39 | + if (false !== $xoopsSuccess && false !== $phpSuccess) { |
|
40 | + $moduleTables =& $module->getInfo('tables'); |
|
41 | + foreach ($moduleTables as $table) { |
|
42 | + $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';'); |
|
43 | + } |
|
44 | + } |
|
45 | 45 | |
46 | - return $xoopsSuccess && $phpSuccess; |
|
46 | + return $xoopsSuccess && $phpSuccess; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
@@ -55,50 +55,50 @@ discard block |
||
55 | 55 | */ |
56 | 56 | function xoops_module_install_newbb(\XoopsModule $module) |
57 | 57 | { |
58 | - require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; |
|
59 | - require_once dirname(__DIR__) . '/include/config.php'; |
|
58 | + require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; |
|
59 | + require_once dirname(__DIR__) . '/include/config.php'; |
|
60 | 60 | |
61 | - $moduleDirName = basename(dirname(__DIR__)); |
|
61 | + $moduleDirName = basename(dirname(__DIR__)); |
|
62 | 62 | |
63 | - /** @var Newbb\Helper $helper */ |
|
64 | - $helper = Newbb\Helper::getInstance(); |
|
65 | - $utility = new Newbb\Utility(); |
|
66 | - $configurator = new Newbb\Common\Configurator(); |
|
67 | - // Load language files |
|
68 | - $helper->loadLanguage('admin'); |
|
69 | - $helper->loadLanguage('modinfo'); |
|
63 | + /** @var Newbb\Helper $helper */ |
|
64 | + $helper = Newbb\Helper::getInstance(); |
|
65 | + $utility = new Newbb\Utility(); |
|
66 | + $configurator = new Newbb\Common\Configurator(); |
|
67 | + // Load language files |
|
68 | + $helper->loadLanguage('admin'); |
|
69 | + $helper->loadLanguage('modinfo'); |
|
70 | 70 | |
71 | - // default Permission Settings ---------------------- |
|
72 | - global $xoopsModule, $xoopsDB; |
|
73 | - $moduleId = $xoopsModule->getVar('mid'); |
|
74 | - $moduleId2 = $helper->getModule()->mid(); |
|
75 | - $grouppermHandler = xoops_getHandler('groupperm'); |
|
76 | - // access rights ------------------------------------------ |
|
77 | - $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
78 | - $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
79 | - $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
80 | - $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId); |
|
81 | - $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId); |
|
71 | + // default Permission Settings ---------------------- |
|
72 | + global $xoopsModule, $xoopsDB; |
|
73 | + $moduleId = $xoopsModule->getVar('mid'); |
|
74 | + $moduleId2 = $helper->getModule()->mid(); |
|
75 | + $grouppermHandler = xoops_getHandler('groupperm'); |
|
76 | + // access rights ------------------------------------------ |
|
77 | + $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
78 | + $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
79 | + $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
80 | + $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId); |
|
81 | + $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId); |
|
82 | 82 | |
83 | - // --- CREATE FOLDERS --------------- |
|
84 | - if (count($configurator->uploadFolders) > 0) { |
|
85 | - // foreach (array_keys($GLOBALS['uploadFolders']) as $i) { |
|
86 | - foreach (array_keys($configurator->uploadFolders) as $i) { |
|
87 | - $utility::createFolder($configurator->uploadFolders[$i]); |
|
88 | - } |
|
89 | - } |
|
83 | + // --- CREATE FOLDERS --------------- |
|
84 | + if (count($configurator->uploadFolders) > 0) { |
|
85 | + // foreach (array_keys($GLOBALS['uploadFolders']) as $i) { |
|
86 | + foreach (array_keys($configurator->uploadFolders) as $i) { |
|
87 | + $utility::createFolder($configurator->uploadFolders[$i]); |
|
88 | + } |
|
89 | + } |
|
90 | 90 | |
91 | - // --- COPY blank.png FILES --------------- |
|
92 | - if (count($configurator->copyBlankFiles) > 0) { |
|
93 | - $file = dirname(__DIR__) . '/assets/images/blank.png'; |
|
94 | - foreach (array_keys($configurator->copyBlankFiles) as $i) { |
|
95 | - $dest = $configurator->copyBlankFiles[$i] . '/blank.png'; |
|
96 | - $utility::copyFile($file, $dest); |
|
97 | - } |
|
98 | - } |
|
99 | - //delete .html entries from the tpl table |
|
100 | - $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'"; |
|
101 | - $xoopsDB->queryF($sql); |
|
91 | + // --- COPY blank.png FILES --------------- |
|
92 | + if (count($configurator->copyBlankFiles) > 0) { |
|
93 | + $file = dirname(__DIR__) . '/assets/images/blank.png'; |
|
94 | + foreach (array_keys($configurator->copyBlankFiles) as $i) { |
|
95 | + $dest = $configurator->copyBlankFiles[$i] . '/blank.png'; |
|
96 | + $utility::copyFile($file, $dest); |
|
97 | + } |
|
98 | + } |
|
99 | + //delete .html entries from the tpl table |
|
100 | + $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'"; |
|
101 | + $xoopsDB->queryF($sql); |
|
102 | 102 | |
103 | - return true; |
|
103 | + return true; |
|
104 | 104 | } |
@@ -30,16 +30,16 @@ discard block |
||
30 | 30 | */ |
31 | 31 | function xoops_module_pre_install_newbb(\XoopsModule $module) |
32 | 32 | { |
33 | - require_once dirname(__DIR__) . '/preloads/autoloader.php'; |
|
33 | + require_once dirname(__DIR__).'/preloads/autoloader.php'; |
|
34 | 34 | /** @var Newbb\Utility $utility */ |
35 | 35 | $utility = new \XoopsModules\Newbb\Utility(); |
36 | 36 | $xoopsSuccess = $utility::checkVerXoops($module); |
37 | 37 | $phpSuccess = $utility::checkVerPhp($module); |
38 | 38 | |
39 | 39 | if (false !== $xoopsSuccess && false !== $phpSuccess) { |
40 | - $moduleTables =& $module->getInfo('tables'); |
|
40 | + $moduleTables = & $module->getInfo('tables'); |
|
41 | 41 | foreach ($moduleTables as $table) { |
42 | - $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';'); |
|
42 | + $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';'); |
|
43 | 43 | } |
44 | 44 | } |
45 | 45 | |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | */ |
56 | 56 | function xoops_module_install_newbb(\XoopsModule $module) |
57 | 57 | { |
58 | - require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; |
|
59 | - require_once dirname(__DIR__) . '/include/config.php'; |
|
58 | + require_once dirname(dirname(dirname(__DIR__))).'/mainfile.php'; |
|
59 | + require_once dirname(__DIR__).'/include/config.php'; |
|
60 | 60 | |
61 | 61 | $moduleDirName = basename(dirname(__DIR__)); |
62 | 62 | |
@@ -74,11 +74,11 @@ discard block |
||
74 | 74 | $moduleId2 = $helper->getModule()->mid(); |
75 | 75 | $grouppermHandler = xoops_getHandler('groupperm'); |
76 | 76 | // access rights ------------------------------------------ |
77 | - $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
78 | - $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
79 | - $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
80 | - $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId); |
|
81 | - $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId); |
|
77 | + $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
78 | + $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
79 | + $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
80 | + $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId); |
|
81 | + $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId); |
|
82 | 82 | |
83 | 83 | // --- CREATE FOLDERS --------------- |
84 | 84 | if (count($configurator->uploadFolders) > 0) { |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | |
91 | 91 | // --- COPY blank.png FILES --------------- |
92 | 92 | if (count($configurator->copyBlankFiles) > 0) { |
93 | - $file = dirname(__DIR__) . '/assets/images/blank.png'; |
|
93 | + $file = dirname(__DIR__).'/assets/images/blank.png'; |
|
94 | 94 | foreach (array_keys($configurator->copyBlankFiles) as $i) { |
95 | - $dest = $configurator->copyBlankFiles[$i] . '/blank.png'; |
|
95 | + $dest = $configurator->copyBlankFiles[$i].'/blank.png'; |
|
96 | 96 | $utility::copyFile($file, $dest); |
97 | 97 | } |
98 | 98 | } |
99 | 99 | //delete .html entries from the tpl table |
100 | - $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'"; |
|
100 | + $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'"; |
|
101 | 101 | $xoopsDB->queryF($sql); |
102 | 102 | |
103 | 103 | return true; |
@@ -28,119 +28,119 @@ |
||
28 | 28 | * @return array |
29 | 29 | */ |
30 | 30 | function newbb_search( |
31 | - $queryarray, |
|
32 | - $andor, |
|
33 | - $limit, |
|
34 | - $offset, |
|
35 | - $userid, |
|
36 | - $forums = 0, |
|
37 | - $sortby = 0, |
|
38 | - $searchin = 'both', |
|
39 | - CriteriaCompo $criteriaExtra = null |
|
31 | + $queryarray, |
|
32 | + $andor, |
|
33 | + $limit, |
|
34 | + $offset, |
|
35 | + $userid, |
|
36 | + $forums = 0, |
|
37 | + $sortby = 0, |
|
38 | + $searchin = 'both', |
|
39 | + CriteriaCompo $criteriaExtra = null |
|
40 | 40 | ) { |
41 | - global $myts, $xoopsDB; |
|
42 | - // irmtfan - in XOOPSCORE/search.php $GLOBALS['xoopsModuleConfig'] is not set |
|
43 | - if (!isset($GLOBALS['xoopsModuleConfig'])) { |
|
44 | - $GLOBALS['xoopsModuleConfig'] = newbbLoadConfig(); |
|
45 | - } |
|
46 | - // irmtfan - in XOOPSCORE/search.php $xoopsModule is not set |
|
47 | - if (!is_object($GLOBALS['xoopsModule']) && is_object($GLOBALS['module']) |
|
48 | - && 'newbb' === $GLOBALS['module']->getVar('dirname')) { |
|
49 | - $GLOBALS['xoopsModule'] = $GLOBALS['module']; |
|
50 | - } |
|
51 | - /** @var Newbb\ForumHandler $forumHandler */ |
|
52 | - $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum'); |
|
53 | - $validForums = $forumHandler->getIdsByValues($forums); // can we use view permission? $forumHandler->getIdsByValues($forums, "view") |
|
41 | + global $myts, $xoopsDB; |
|
42 | + // irmtfan - in XOOPSCORE/search.php $GLOBALS['xoopsModuleConfig'] is not set |
|
43 | + if (!isset($GLOBALS['xoopsModuleConfig'])) { |
|
44 | + $GLOBALS['xoopsModuleConfig'] = newbbLoadConfig(); |
|
45 | + } |
|
46 | + // irmtfan - in XOOPSCORE/search.php $xoopsModule is not set |
|
47 | + if (!is_object($GLOBALS['xoopsModule']) && is_object($GLOBALS['module']) |
|
48 | + && 'newbb' === $GLOBALS['module']->getVar('dirname')) { |
|
49 | + $GLOBALS['xoopsModule'] = $GLOBALS['module']; |
|
50 | + } |
|
51 | + /** @var Newbb\ForumHandler $forumHandler */ |
|
52 | + $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum'); |
|
53 | + $validForums = $forumHandler->getIdsByValues($forums); // can we use view permission? $forumHandler->getIdsByValues($forums, "view") |
|
54 | 54 | |
55 | - $criteriaPost = new \CriteriaCompo(); |
|
56 | - $criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts |
|
55 | + $criteriaPost = new \CriteriaCompo(); |
|
56 | + $criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts |
|
57 | 57 | |
58 | - $forum_list = [];// get forum lists just for forum names |
|
59 | - if (count($validForums) > 0) { |
|
60 | - $criteriaPermissions = new \CriteriaCompo(); |
|
61 | - $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND'); |
|
62 | - $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false); |
|
63 | - } |
|
58 | + $forum_list = [];// get forum lists just for forum names |
|
59 | + if (count($validForums) > 0) { |
|
60 | + $criteriaPermissions = new \CriteriaCompo(); |
|
61 | + $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND'); |
|
62 | + $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false); |
|
63 | + } |
|
64 | 64 | |
65 | - if (is_numeric($userid) && 0 !== $userid) { |
|
66 | - $criteriaUser = new \CriteriaCompo(); |
|
67 | - $criteriaUser->add(new \Criteria('p.uid', $userid), 'OR'); |
|
68 | - } elseif (is_array($userid) && count($userid) > 0) { |
|
69 | - $userid = array_map('intval', $userid); |
|
70 | - $criteriaUser = new \CriteriaCompo(); |
|
71 | - $criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR'); |
|
72 | - } |
|
65 | + if (is_numeric($userid) && 0 !== $userid) { |
|
66 | + $criteriaUser = new \CriteriaCompo(); |
|
67 | + $criteriaUser->add(new \Criteria('p.uid', $userid), 'OR'); |
|
68 | + } elseif (is_array($userid) && count($userid) > 0) { |
|
69 | + $userid = array_map('intval', $userid); |
|
70 | + $criteriaUser = new \CriteriaCompo(); |
|
71 | + $criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR'); |
|
72 | + } |
|
73 | 73 | |
74 | - $count = 0; |
|
75 | - if (is_array($queryarray)) { |
|
76 | - $count = count($queryarray); |
|
77 | - } |
|
78 | - $highlightKey = ''; |
|
79 | - if ($count > 0) { |
|
80 | - $criteriaKeywords = new \CriteriaCompo(); |
|
81 | - foreach ($queryarray as $queryTerm) { |
|
82 | - $termCriteria = new \CriteriaCompo(); |
|
83 | - $queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%'; |
|
84 | - if ('title' === $searchin || 'both' === $searchin) { |
|
85 | - $termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR'); |
|
86 | - } |
|
87 | - if ('text' === $searchin || 'both' === $searchin) { |
|
88 | - $termCriteria->add(new \Criteria('t.post_text', $queryTermLike, 'LIKE'), 'OR'); |
|
89 | - } |
|
90 | - $criteriaKeywords->add($termCriteria, $andor); |
|
91 | - } |
|
92 | - // add highlight keywords to post links |
|
93 | - $highlightKey = '&keywords=' . implode(' ', $queryarray); |
|
94 | - $highlightKey = str_replace(' ', '+', $highlightKey); |
|
95 | - } |
|
96 | - $criteria = new \CriteriaCompo(); |
|
97 | - $criteria->add($criteriaPost, 'AND'); |
|
98 | - if (isset($criteriaPermissions)) { |
|
99 | - $criteria->add($criteriaPermissions, 'AND'); |
|
100 | - } |
|
101 | - if (isset($criteriaUser)) { |
|
102 | - $criteria->add($criteriaUser, 'AND'); |
|
103 | - } |
|
104 | - if (isset($criteriaKeywords)) { |
|
105 | - $criteria->add($criteriaKeywords, 'AND'); |
|
106 | - } |
|
107 | - if (isset($criteriaExtra)) { |
|
108 | - $criteria->add($criteriaExtra, 'AND'); |
|
109 | - } |
|
110 | - //$criteria->setLimit($limit); // no need for this |
|
111 | - //$criteria->setStart($offset); // no need for this |
|
74 | + $count = 0; |
|
75 | + if (is_array($queryarray)) { |
|
76 | + $count = count($queryarray); |
|
77 | + } |
|
78 | + $highlightKey = ''; |
|
79 | + if ($count > 0) { |
|
80 | + $criteriaKeywords = new \CriteriaCompo(); |
|
81 | + foreach ($queryarray as $queryTerm) { |
|
82 | + $termCriteria = new \CriteriaCompo(); |
|
83 | + $queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%'; |
|
84 | + if ('title' === $searchin || 'both' === $searchin) { |
|
85 | + $termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR'); |
|
86 | + } |
|
87 | + if ('text' === $searchin || 'both' === $searchin) { |
|
88 | + $termCriteria->add(new \Criteria('t.post_text', $queryTermLike, 'LIKE'), 'OR'); |
|
89 | + } |
|
90 | + $criteriaKeywords->add($termCriteria, $andor); |
|
91 | + } |
|
92 | + // add highlight keywords to post links |
|
93 | + $highlightKey = '&keywords=' . implode(' ', $queryarray); |
|
94 | + $highlightKey = str_replace(' ', '+', $highlightKey); |
|
95 | + } |
|
96 | + $criteria = new \CriteriaCompo(); |
|
97 | + $criteria->add($criteriaPost, 'AND'); |
|
98 | + if (isset($criteriaPermissions)) { |
|
99 | + $criteria->add($criteriaPermissions, 'AND'); |
|
100 | + } |
|
101 | + if (isset($criteriaUser)) { |
|
102 | + $criteria->add($criteriaUser, 'AND'); |
|
103 | + } |
|
104 | + if (isset($criteriaKeywords)) { |
|
105 | + $criteria->add($criteriaKeywords, 'AND'); |
|
106 | + } |
|
107 | + if (isset($criteriaExtra)) { |
|
108 | + $criteria->add($criteriaExtra, 'AND'); |
|
109 | + } |
|
110 | + //$criteria->setLimit($limit); // no need for this |
|
111 | + //$criteria->setStart($offset); // no need for this |
|
112 | 112 | |
113 | - if (empty($sortby)) { |
|
114 | - $sortby = 'p.post_time'; |
|
115 | - } |
|
116 | - $criteria->setSort($sortby); |
|
117 | - $order = 'ASC'; |
|
118 | - if ('p.post_time' === $sortby) { |
|
119 | - $order = 'DESC'; |
|
120 | - } |
|
121 | - $criteria->setOrder($order); |
|
113 | + if (empty($sortby)) { |
|
114 | + $sortby = 'p.post_time'; |
|
115 | + } |
|
116 | + $criteria->setSort($sortby); |
|
117 | + $order = 'ASC'; |
|
118 | + if ('p.post_time' === $sortby) { |
|
119 | + $order = 'DESC'; |
|
120 | + } |
|
121 | + $criteria->setOrder($order); |
|
122 | 122 | |
123 | - /** @var Newbb\PostHandler $postHandler */ |
|
124 | - $postHandler = Newbb\Helper::getInstance()->getHandler('Post'); |
|
125 | - $posts = $postHandler->getPostsByLimit($criteria, $limit, $offset); |
|
123 | + /** @var Newbb\PostHandler $postHandler */ |
|
124 | + $postHandler = Newbb\Helper::getInstance()->getHandler('Post'); |
|
125 | + $posts = $postHandler->getPostsByLimit($criteria, $limit, $offset); |
|
126 | 126 | |
127 | - $ret = []; |
|
128 | - $i = 0; |
|
129 | - foreach (array_keys($posts) as $id) { |
|
130 | - /** @var Newbb\Post $post */ |
|
131 | - $post = $posts[$id]; |
|
132 | - $post_data = $post->getPostBody(); |
|
133 | - $ret[$i]['topic_id'] = $post->getVar('topic_id'); |
|
134 | - $ret[$i]['link'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key |
|
135 | - $ret[$i]['title'] = $post_data['subject']; |
|
136 | - $ret[$i]['time'] = $post_data['date']; |
|
137 | - $ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']); |
|
138 | - $ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id'); |
|
139 | - $ret[$i]['post_text'] = $post_data['text']; |
|
140 | - $ret[$i]['uid'] = $post->getVar('uid'); |
|
141 | - $ret[$i]['poster'] = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author']; |
|
142 | - ++$i; |
|
143 | - } |
|
127 | + $ret = []; |
|
128 | + $i = 0; |
|
129 | + foreach (array_keys($posts) as $id) { |
|
130 | + /** @var Newbb\Post $post */ |
|
131 | + $post = $posts[$id]; |
|
132 | + $post_data = $post->getPostBody(); |
|
133 | + $ret[$i]['topic_id'] = $post->getVar('topic_id'); |
|
134 | + $ret[$i]['link'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key |
|
135 | + $ret[$i]['title'] = $post_data['subject']; |
|
136 | + $ret[$i]['time'] = $post_data['date']; |
|
137 | + $ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']); |
|
138 | + $ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id'); |
|
139 | + $ret[$i]['post_text'] = $post_data['text']; |
|
140 | + $ret[$i]['uid'] = $post->getVar('uid'); |
|
141 | + $ret[$i]['poster'] = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author']; |
|
142 | + ++$i; |
|
143 | + } |
|
144 | 144 | |
145 | - return $ret; |
|
145 | + return $ret; |
|
146 | 146 | } |
@@ -30,69 +30,69 @@ discard block |
||
30 | 30 | |
31 | 31 | //check banning |
32 | 32 | $moderated_id = (is_object($GLOBALS['xoopsUser']) |
33 | - && $GLOBALS['xoopsUser']->uid() > 0) ? $GLOBALS['xoopsUser']->uid() : 0; |
|
33 | + && $GLOBALS['xoopsUser']->uid() > 0) ? $GLOBALS['xoopsUser']->uid() : 0; |
|
34 | 34 | $moderated_ip = Request::getString('REMOTE_ADDR', '', 'SERVER'); |
35 | 35 | $moderated_forum = $forumObject->getVar('forum_id'); |
36 | 36 | /** @var Newbb\ModerateHandler $moderateHandler */ |
37 | 37 | $moderateHandler = Newbb\Helper::getInstance()->getHandler('Moderate'); |
38 | 38 | if (!$moderateHandler->verifyUser($moderated_id, '', $moderated_forum)) { |
39 | - $criteria = new \CriteriaCompo(); |
|
40 | - $criteria->add(new \Criteria('uid', $moderated_id, '=')); |
|
41 | - $criteria->setSort('mod_end'); |
|
42 | - $criteria->setOrder('DESC'); |
|
43 | - $mod = $moderateHandler->getObjects($criteria, false, false); |
|
44 | - $tage = ($mod[0]['mod_end'] - $mod[0]['mod_start']) / 60 / 60 / 24; |
|
45 | - $msg = $myts->displayTarea(sprintf(_MD_NEWBB_SUSPEND_TEXT, newbbGetUnameFromId($moderated_id), (int)$tage, $mod[0]['mod_desc'], formatTimestamp($mod[0]['mod_end'])), 1); |
|
46 | - xoops_error($msg, _MD_NEWBB_SUSPEND_NOACCESS); |
|
47 | - require_once $GLOBALS['xoops']->path('footer.php'); |
|
48 | - exit(); |
|
39 | + $criteria = new \CriteriaCompo(); |
|
40 | + $criteria->add(new \Criteria('uid', $moderated_id, '=')); |
|
41 | + $criteria->setSort('mod_end'); |
|
42 | + $criteria->setOrder('DESC'); |
|
43 | + $mod = $moderateHandler->getObjects($criteria, false, false); |
|
44 | + $tage = ($mod[0]['mod_end'] - $mod[0]['mod_start']) / 60 / 60 / 24; |
|
45 | + $msg = $myts->displayTarea(sprintf(_MD_NEWBB_SUSPEND_TEXT, newbbGetUnameFromId($moderated_id), (int)$tage, $mod[0]['mod_desc'], formatTimestamp($mod[0]['mod_end'])), 1); |
|
46 | + xoops_error($msg, _MD_NEWBB_SUSPEND_NOACCESS); |
|
47 | + require_once $GLOBALS['xoops']->path('footer.php'); |
|
48 | + exit(); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | $xoopsTpl->assign('category', ['id' => $forumObject->getVar('cat_id'), 'title' => $categoryObject->getVar('cat_title')]); |
52 | 52 | $xoopsTpl->assign('parentforum', $forumHandler->getParents($forumObject)); |
53 | 53 | $xoopsTpl->assign([ |
54 | - 'forum_id' => $forumObject->getVar('forum_id'), |
|
55 | - 'forum_name' => $forumObject->getVar('forum_name') |
|
56 | - ]); |
|
54 | + 'forum_id' => $forumObject->getVar('forum_id'), |
|
55 | + 'forum_name' => $forumObject->getVar('forum_name') |
|
56 | + ]); |
|
57 | 57 | |
58 | 58 | if (!is_object($topicObject)) { |
59 | - $topicObject = $topicHandler->create(); |
|
59 | + $topicObject = $topicHandler->create(); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $editby = false; |
63 | 63 | if ($topicObject->isNew()) { |
64 | - $form_title = _MD_NEWBB_POSTNEW; |
|
64 | + $form_title = _MD_NEWBB_POSTNEW; |
|
65 | 65 | } elseif ($postObject->isNew()) { |
66 | - if (empty($postParentObject)) { |
|
67 | - $postParentObject = $postHandler->get($pid); |
|
68 | - } |
|
69 | - $form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>'; |
|
66 | + if (empty($postParentObject)) { |
|
67 | + $postParentObject = $postHandler->get($pid); |
|
68 | + } |
|
69 | + $form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>'; |
|
70 | 70 | } else { |
71 | - $form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>'; |
|
72 | - $editby = true; |
|
71 | + $form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>'; |
|
72 | + $editby = true; |
|
73 | 73 | } |
74 | 74 | $xoopsTpl->assign('form_title', $form_title); |
75 | 75 | |
76 | 76 | foreach ([ |
77 | - 'start', |
|
78 | - 'topic_id', |
|
79 | - 'post_id', |
|
80 | - 'pid', |
|
81 | - 'isreply', |
|
82 | - 'isedit', |
|
83 | - 'contents_preview' |
|
84 | - ] as $getint) { |
|
85 | - ${$getint} = Request::getInt($getint, (!empty(${$getint}) ? ${$getint} : 0), 'GET'); // isset($_GET[$getint]) ? (int)($_GET[$getint]) : ((!empty(${$getint})) ? ${$getint} : 0); |
|
77 | + 'start', |
|
78 | + 'topic_id', |
|
79 | + 'post_id', |
|
80 | + 'pid', |
|
81 | + 'isreply', |
|
82 | + 'isedit', |
|
83 | + 'contents_preview' |
|
84 | + ] as $getint) { |
|
85 | + ${$getint} = Request::getInt($getint, (!empty(${$getint}) ? ${$getint} : 0), 'GET'); // isset($_GET[$getint]) ? (int)($_GET[$getint]) : ((!empty(${$getint})) ? ${$getint} : 0); |
|
86 | 86 | } |
87 | 87 | foreach ([ |
88 | - 'order', |
|
89 | - 'viewmode', |
|
90 | - 'hidden', |
|
91 | - 'newbb_form', |
|
92 | - 'icon', |
|
93 | - 'op' |
|
94 | - ] as $getstr) { |
|
95 | - ${$getstr} = Request::getString($getstr, (!empty(${$getstr}) ? ${$getstr} : ''), 'GET'); //isset($_GET[$getstr]) ? $_GET[$getstr] : ((!empty(${$getstr})) ? ${$getstr} : ''); |
|
88 | + 'order', |
|
89 | + 'viewmode', |
|
90 | + 'hidden', |
|
91 | + 'newbb_form', |
|
92 | + 'icon', |
|
93 | + 'op' |
|
94 | + ] as $getstr) { |
|
95 | + ${$getstr} = Request::getString($getstr, (!empty(${$getstr}) ? ${$getstr} : ''), 'GET'); //isset($_GET[$getstr]) ? $_GET[$getstr] : ((!empty(${$getstr})) ? ${$getstr} : ''); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** @var Newbb\TopicHandler $topicHandler */ |
@@ -105,30 +105,30 @@ discard block |
||
105 | 105 | $forum_form->setExtra('enctype="multipart/form-data"'); |
106 | 106 | |
107 | 107 | if ($editby) { |
108 | - $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_EDITEDMSG, 'editwhy', 60, 100, '')); |
|
108 | + $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_EDITEDMSG, 'editwhy', 60, 100, '')); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0; |
112 | 112 | if (newbbIsAdmin($forumObject) |
113 | - || ($topicHandler->getPermission($forumObject, $topic_status, 'type') |
|
114 | - && (0 == $topic_id |
|
115 | - || $uid == $topicHandler->get(@$topic_id, 'topic_poster')))) { |
|
116 | - $type_id = $topicHandler->get(@$topic_id, 'type_id'); |
|
117 | - /** @var Newbb\TypeHandler $typeHandler */ |
|
118 | - $typeHandler = Newbb\Helper::getInstance()->getHandler('Type'); |
|
119 | - $types = $typeHandler->getByForum($forumObject->getVar('forum_id')); |
|
120 | - if (!empty($types)) { |
|
121 | - $type_element = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'type_id', $type_id); |
|
122 | - //$type_element = new \XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id); |
|
123 | - $type_element->addOption(0, _NONE); |
|
124 | - foreach ($types as $key => $type) { |
|
125 | - //$value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>"; |
|
126 | - $type_element->addOption($key, $type['type_name']); |
|
127 | - } |
|
128 | - $forum_form->addElement($type_element); |
|
129 | - } else { |
|
130 | - $forum_form->addElement(new \XoopsFormHidden('type_id', 0)); |
|
131 | - } |
|
113 | + || ($topicHandler->getPermission($forumObject, $topic_status, 'type') |
|
114 | + && (0 == $topic_id |
|
115 | + || $uid == $topicHandler->get(@$topic_id, 'topic_poster')))) { |
|
116 | + $type_id = $topicHandler->get(@$topic_id, 'type_id'); |
|
117 | + /** @var Newbb\TypeHandler $typeHandler */ |
|
118 | + $typeHandler = Newbb\Helper::getInstance()->getHandler('Type'); |
|
119 | + $types = $typeHandler->getByForum($forumObject->getVar('forum_id')); |
|
120 | + if (!empty($types)) { |
|
121 | + $type_element = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'type_id', $type_id); |
|
122 | + //$type_element = new \XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id); |
|
123 | + $type_element->addOption(0, _NONE); |
|
124 | + foreach ($types as $key => $type) { |
|
125 | + //$value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>"; |
|
126 | + $type_element->addOption($key, $type['type_name']); |
|
127 | + } |
|
128 | + $forum_form->addElement($type_element); |
|
129 | + } else { |
|
130 | + $forum_form->addElement(new \XoopsFormHidden('type_id', 0)); |
|
131 | + } |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | $subject_form = new \XoopsFormText(_MD_NEWBB_SUBJECTC, 'subject', 60, 100, $subject); |
@@ -136,32 +136,32 @@ discard block |
||
136 | 136 | $forum_form->addElement($subject_form, true); |
137 | 137 | |
138 | 138 | if (!is_object($GLOBALS['xoopsUser'])) { |
139 | - $required = !empty($GLOBALS['xoopsModuleConfig']['require_name']); |
|
140 | - $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_NAMEMAIL, 'poster_name', 60, 255, (!empty($isedit) && !empty($poster_name)) ? $poster_name : ''), $required); |
|
139 | + $required = !empty($GLOBALS['xoopsModuleConfig']['require_name']); |
|
140 | + $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_NAMEMAIL, 'poster_name', 60, 255, (!empty($isedit) && !empty($poster_name)) ? $poster_name : ''), $required); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | $icons_radio = new \XoopsFormRadio(_MD_NEWBB_MESSAGEICON, 'icon', $icon); |
144 | 144 | $subject_icons = \XoopsLists::getSubjectsList(); |
145 | 145 | foreach ($subject_icons as $iconfile) { |
146 | - $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />'); |
|
146 | + $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />'); |
|
147 | 147 | } |
148 | 148 | $forum_form->addElement($icons_radio); |
149 | 149 | |
150 | 150 | $nohtml = !$topicHandler->getPermission($forumObject, $topic_status, 'html'); |
151 | 151 | |
152 | 152 | if (Request::getString('editor', '', 'POST')) { |
153 | - $editor = trim(Request::getString('editor', '', 'POST')); |
|
154 | - newbbSetCookie('editor', $editor); |
|
153 | + $editor = trim(Request::getString('editor', '', 'POST')); |
|
154 | + newbbSetCookie('editor', $editor); |
|
155 | 155 | } elseif (!$editor = newbbGetCookie('editor')) { |
156 | - if (empty($editor)) { |
|
157 | - $editor = @ $GLOBALS['xoopsModuleConfig']['editor_default']; |
|
158 | - } |
|
156 | + if (empty($editor)) { |
|
157 | + $editor = @ $GLOBALS['xoopsModuleConfig']['editor_default']; |
|
158 | + } |
|
159 | 159 | } |
160 | 160 | if (count(@$GLOBALS['xoopsModuleConfig']['editor_allowed']) > 0) { |
161 | - if (!in_array($editor, $GLOBALS['xoopsModuleConfig']['editor_allowed'])) { |
|
162 | - $editor = $GLOBALS['xoopsModuleConfig']['editor_allowed'][0]; |
|
163 | - newbbSetCookie('editor', $editor); |
|
164 | - } |
|
161 | + if (!in_array($editor, $GLOBALS['xoopsModuleConfig']['editor_allowed'])) { |
|
162 | + $editor = $GLOBALS['xoopsModuleConfig']['editor_allowed'][0]; |
|
163 | + newbbSetCookie('editor', $editor); |
|
164 | + } |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | $forum_form->addElement(new \XoopsFormSelectEditor($forum_form, 'editor', $editor, $nohtml, @$GLOBALS['xoopsModuleConfig']['editor_allowed'][0])); |
@@ -178,31 +178,31 @@ discard block |
||
178 | 178 | $forum_form->addElement($_editor, true); |
179 | 179 | |
180 | 180 | if (!empty($GLOBALS['xoopsModuleConfig']['do_tag']) && (empty($postObject) || $postObject->isTopic())) { |
181 | - $topic_tags = ''; |
|
182 | - if (Request::getString('topic_tags', '', 'POST')) { |
|
183 | - $topic_tags = $myts->htmlSpecialChars(Request::getString('topic_tags', '', 'POST')); |
|
184 | - } elseif (!empty($topic_id)) { |
|
185 | - $topic_tags = $topicHandler->get($topic_id, 'topic_tags'); |
|
186 | - } |
|
187 | - if (xoops_load('formtag', 'tag') && class_exists('TagFormTag')) { |
|
188 | - $forum_form->addElement(new TagFormTag('topic_tags', 60, 255, $topic_tags)); |
|
189 | - } |
|
181 | + $topic_tags = ''; |
|
182 | + if (Request::getString('topic_tags', '', 'POST')) { |
|
183 | + $topic_tags = $myts->htmlSpecialChars(Request::getString('topic_tags', '', 'POST')); |
|
184 | + } elseif (!empty($topic_id)) { |
|
185 | + $topic_tags = $topicHandler->get($topic_id, 'topic_tags'); |
|
186 | + } |
|
187 | + if (xoops_load('formtag', 'tag') && class_exists('TagFormTag')) { |
|
188 | + $forum_form->addElement(new TagFormTag('topic_tags', 60, 255, $topic_tags)); |
|
189 | + } |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | $options_tray = new \XoopsFormElementTray(_MD_NEWBB_OPTIONS, '<br>'); |
193 | 193 | if (is_object($GLOBALS['xoopsUser']) && 1 == $GLOBALS['xoopsModuleConfig']['allow_user_anonymous']) { |
194 | - $noname = (!empty($isedit) && is_object($postObject) && 0 == $postObject->getVar('uid')) ? 1 : 0; |
|
195 | - $noname_checkbox = new \XoopsFormCheckBox('', 'noname', $noname); |
|
196 | - $noname_checkbox->addOption(1, _MD_NEWBB_POSTANONLY); |
|
197 | - $options_tray->addElement($noname_checkbox); |
|
194 | + $noname = (!empty($isedit) && is_object($postObject) && 0 == $postObject->getVar('uid')) ? 1 : 0; |
|
195 | + $noname_checkbox = new \XoopsFormCheckBox('', 'noname', $noname); |
|
196 | + $noname_checkbox->addOption(1, _MD_NEWBB_POSTANONLY); |
|
197 | + $options_tray->addElement($noname_checkbox); |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | if (!$nohtml) { |
201 | - $html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $dohtml); |
|
202 | - $html_checkbox->addOption(1, _MD_NEWBB_DOHTML); |
|
203 | - $options_tray->addElement($html_checkbox); |
|
201 | + $html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $dohtml); |
|
202 | + $html_checkbox->addOption(1, _MD_NEWBB_DOHTML); |
|
203 | + $options_tray->addElement($html_checkbox); |
|
204 | 204 | } else { |
205 | - $forum_form->addElement(new \XoopsFormHidden('dohtml', 0)); |
|
205 | + $forum_form->addElement(new \XoopsFormHidden('dohtml', 0)); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | $smiley_checkbox = new \XoopsFormCheckBox('', 'dosmiley', $dosmiley); |
@@ -214,99 +214,99 @@ discard block |
||
214 | 214 | $options_tray->addElement($xcode_checkbox); |
215 | 215 | |
216 | 216 | if (!$nohtml) { |
217 | - $br_checkbox = new \XoopsFormCheckBox('', 'dobr', $dobr); |
|
218 | - $br_checkbox->addOption(1, _MD_NEWBB_DOBR); |
|
219 | - $options_tray->addElement($br_checkbox); |
|
217 | + $br_checkbox = new \XoopsFormCheckBox('', 'dobr', $dobr); |
|
218 | + $br_checkbox->addOption(1, _MD_NEWBB_DOBR); |
|
219 | + $options_tray->addElement($br_checkbox); |
|
220 | 220 | } else { |
221 | - $forum_form->addElement(new \XoopsFormHidden('dobr', 1)); |
|
221 | + $forum_form->addElement(new \XoopsFormHidden('dobr', 1)); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | if (is_object($GLOBALS['xoopsUser']) && $topicHandler->getPermission($forumObject, $topic_status, 'signature')) { |
225 | - $attachsig_checkbox = new \XoopsFormCheckBox('', 'attachsig', $attachsig); |
|
226 | - $attachsig_checkbox->addOption(1, _MD_NEWBB_ATTACHSIG); |
|
227 | - $options_tray->addElement($attachsig_checkbox); |
|
225 | + $attachsig_checkbox = new \XoopsFormCheckBox('', 'attachsig', $attachsig); |
|
226 | + $attachsig_checkbox->addOption(1, _MD_NEWBB_ATTACHSIG); |
|
227 | + $options_tray->addElement($attachsig_checkbox); |
|
228 | 228 | } |
229 | 229 | $notify = 0; |
230 | 230 | if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsModuleConfig']['notification_enabled']) { |
231 | - if (!empty($notify)) { |
|
232 | - // If 'notify' set, use that value (e.g. preview or upload) |
|
233 | - //$notify = 1; |
|
234 | - } else { |
|
235 | - // Otherwise, check previous subscribed status... |
|
236 | - /** @var \XoopsNotificationHandler $notificationHandler */ |
|
237 | - $notificationHandler = xoops_getHandler('notification'); |
|
238 | - if (!empty($topic_id) |
|
239 | - && $notificationHandler->isSubscribed('thread', $topic_id, 'new_post', $xoopsModule->getVar('mid'), $GLOBALS['xoopsUser']->getVar('uid'))) { |
|
240 | - $notify = 1; |
|
241 | - } |
|
242 | - } |
|
243 | - |
|
244 | - $notify_checkbox = new \XoopsFormCheckBox('', 'notify', $notify); |
|
245 | - $notify_checkbox->addOption(1, _MD_NEWBB_NEWPOSTNOTIFY); |
|
246 | - $options_tray->addElement($notify_checkbox); |
|
231 | + if (!empty($notify)) { |
|
232 | + // If 'notify' set, use that value (e.g. preview or upload) |
|
233 | + //$notify = 1; |
|
234 | + } else { |
|
235 | + // Otherwise, check previous subscribed status... |
|
236 | + /** @var \XoopsNotificationHandler $notificationHandler */ |
|
237 | + $notificationHandler = xoops_getHandler('notification'); |
|
238 | + if (!empty($topic_id) |
|
239 | + && $notificationHandler->isSubscribed('thread', $topic_id, 'new_post', $xoopsModule->getVar('mid'), $GLOBALS['xoopsUser']->getVar('uid'))) { |
|
240 | + $notify = 1; |
|
241 | + } |
|
242 | + } |
|
243 | + |
|
244 | + $notify_checkbox = new \XoopsFormCheckBox('', 'notify', $notify); |
|
245 | + $notify_checkbox->addOption(1, _MD_NEWBB_NEWPOSTNOTIFY); |
|
246 | + $options_tray->addElement($notify_checkbox); |
|
247 | 247 | } |
248 | 248 | $forum_form->addElement($options_tray); |
249 | 249 | |
250 | 250 | if ($topicHandler->getPermission($forumObject, $topic_status, 'attach')) { |
251 | - $upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT); |
|
252 | - $upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024)); |
|
253 | - $upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit')); |
|
254 | - $upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; ')); |
|
255 | - $extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext'))); |
|
256 | - $extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions; |
|
257 | - $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions)); |
|
258 | - $upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width']))); |
|
259 | - $forum_form->addElement($upload_tray); |
|
251 | + $upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT); |
|
252 | + $upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024)); |
|
253 | + $upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit')); |
|
254 | + $upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; ')); |
|
255 | + $extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext'))); |
|
256 | + $extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions; |
|
257 | + $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions)); |
|
258 | + $upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width']))); |
|
259 | + $forum_form->addElement($upload_tray); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | if (!empty($attachments) && is_array($attachments) && count($attachments)) { |
263 | - $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]'); |
|
264 | - foreach ($attachments as $key => $attachment) { |
|
265 | - $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>'; |
|
266 | - $delete_attach_checkbox->addOption($key, $attach); |
|
267 | - } |
|
268 | - $forum_form->addElement($delete_attach_checkbox); |
|
269 | - unset($delete_attach_checkbox); |
|
263 | + $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]'); |
|
264 | + foreach ($attachments as $key => $attachment) { |
|
265 | + $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>'; |
|
266 | + $delete_attach_checkbox->addOption($key, $attach); |
|
267 | + } |
|
268 | + $forum_form->addElement($delete_attach_checkbox); |
|
269 | + unset($delete_attach_checkbox); |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | if (!empty($attachments_tmp) && is_array($attachments_tmp) && count($attachments_tmp)) { |
273 | - $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]'); |
|
274 | - $url_prefix = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH); |
|
275 | - foreach ($attachments_tmp as $key => $attachment) { |
|
276 | - $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>'; |
|
277 | - $delete_attach_checkbox->addOption($key, $attach); |
|
278 | - } |
|
279 | - $forum_form->addElement($delete_attach_checkbox); |
|
280 | - unset($delete_attach_checkbox); |
|
281 | - $attachments_tmp = base64_encode(serialize($attachments_tmp)); |
|
282 | - $forum_form->addElement(new \XoopsFormHidden('attachments_tmp', $attachments_tmp)); |
|
273 | + $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]'); |
|
274 | + $url_prefix = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH); |
|
275 | + foreach ($attachments_tmp as $key => $attachment) { |
|
276 | + $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>'; |
|
277 | + $delete_attach_checkbox->addOption($key, $attach); |
|
278 | + } |
|
279 | + $forum_form->addElement($delete_attach_checkbox); |
|
280 | + unset($delete_attach_checkbox); |
|
281 | + $attachments_tmp = base64_encode(serialize($attachments_tmp)); |
|
282 | + $forum_form->addElement(new \XoopsFormHidden('attachments_tmp', $attachments_tmp)); |
|
283 | 283 | } |
284 | 284 | $radiobox = null; |
285 | 285 | if ($GLOBALS['xoopsModuleConfig']['enable_karma'] || $GLOBALS['xoopsModuleConfig']['allow_require_reply']) { |
286 | - $view_require = $require_reply ? 'require_reply' : ($post_karma ? 'require_karma' : 'require_null'); |
|
287 | - $radiobox = new \XoopsFormRadio(_MD_NEWBB_VIEW_REQUIRE, 'view_require', $view_require); |
|
288 | - if ($GLOBALS['xoopsModuleConfig']['allow_require_reply']) { |
|
289 | - $radiobox->addOption('require_reply', _MD_NEWBB_REQUIRE_REPLY); |
|
290 | - } |
|
291 | - if ($GLOBALS['xoopsModuleConfig']['enable_karma']) { |
|
292 | - $karmas = array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['karma_options'])); |
|
293 | - if (count($karmas) > 1) { |
|
294 | - foreach ($karmas as $karma) { |
|
295 | - $karma_array[(string)$karma] = (int)$karma; |
|
296 | - } |
|
297 | - $karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma); |
|
298 | - $karma_select->addOptionArray($karma_array); |
|
299 | - $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render()); |
|
300 | - } |
|
301 | - } |
|
302 | - $radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL); |
|
286 | + $view_require = $require_reply ? 'require_reply' : ($post_karma ? 'require_karma' : 'require_null'); |
|
287 | + $radiobox = new \XoopsFormRadio(_MD_NEWBB_VIEW_REQUIRE, 'view_require', $view_require); |
|
288 | + if ($GLOBALS['xoopsModuleConfig']['allow_require_reply']) { |
|
289 | + $radiobox->addOption('require_reply', _MD_NEWBB_REQUIRE_REPLY); |
|
290 | + } |
|
291 | + if ($GLOBALS['xoopsModuleConfig']['enable_karma']) { |
|
292 | + $karmas = array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['karma_options'])); |
|
293 | + if (count($karmas) > 1) { |
|
294 | + foreach ($karmas as $karma) { |
|
295 | + $karma_array[(string)$karma] = (int)$karma; |
|
296 | + } |
|
297 | + $karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma); |
|
298 | + $karma_select->addOptionArray($karma_array); |
|
299 | + $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render()); |
|
300 | + } |
|
301 | + } |
|
302 | + $radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL); |
|
303 | 303 | } |
304 | 304 | if (null !== $radiobox) { |
305 | - $forum_form->addElement($radiobox); |
|
305 | + $forum_form->addElement($radiobox); |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | if (empty($uid)) { |
309 | - $forum_form->addElement(new \XoopsFormCaptcha()); |
|
309 | + $forum_form->addElement(new \XoopsFormCaptcha()); |
|
310 | 310 | } |
311 | 311 | |
312 | 312 | $forum_form->addElement(new \XoopsFormHidden('pid', @$pid)); |
@@ -327,20 +327,20 @@ discard block |
||
327 | 327 | |
328 | 328 | $cancel_button = new \XoopsFormButton('', 'cancel', _CANCEL, 'button'); |
329 | 329 | if (!empty($topic_id)) { |
330 | - $extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id; |
|
330 | + $extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id; |
|
331 | 331 | } else { |
332 | - $extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id'); |
|
332 | + $extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id'); |
|
333 | 333 | } |
334 | 334 | $cancel_button->setExtra("onclick='location=\"" . $extra . "\"'"); |
335 | 335 | $cancel_button->setExtra("tabindex='6'"); |
336 | 336 | |
337 | 337 | if (!empty($isreply) && !empty($hidden)) { |
338 | - $forum_form->addElement(new \XoopsFormHidden('hidden', $hidden)); |
|
338 | + $forum_form->addElement(new \XoopsFormHidden('hidden', $hidden)); |
|
339 | 339 | |
340 | - $quote_button = new \XoopsFormButton('', 'quote', _MD_NEWBB_QUOTE, 'button'); |
|
341 | - $quote_button->setExtra("onclick='xoopsGetElementById(\"message\").value=xoopsGetElementById(\"message\").value+ xoopsGetElementById(\"hidden\").value;xoopsGetElementById(\"hidden\").value=\"\";'"); |
|
342 | - $quote_button->setExtra("tabindex='4'"); |
|
343 | - $button_tray->addElement($quote_button); |
|
340 | + $quote_button = new \XoopsFormButton('', 'quote', _MD_NEWBB_QUOTE, 'button'); |
|
341 | + $quote_button->setExtra("onclick='xoopsGetElementById(\"message\").value=xoopsGetElementById(\"message\").value+ xoopsGetElementById(\"hidden\").value;xoopsGetElementById(\"hidden\").value=\"\";'"); |
|
342 | + $quote_button->setExtra("tabindex='4'"); |
|
343 | + $button_tray->addElement($quote_button); |
|
344 | 344 | } |
345 | 345 | |
346 | 346 | $preview_button = new \XoopsFormButton('', 'btn_preview', _PREVIEW, 'button'); |
@@ -17,146 +17,146 @@ |
||
17 | 17 | define('NEWBB_FUNCTIONS_RENDER_LOADED', true); |
18 | 18 | |
19 | 19 | if (!defined('NEWBB_FUNCTIONS_RENDER')) { |
20 | - define('NEWBB_FUNCTIONS_RENDER', 1); |
|
20 | + define('NEWBB_FUNCTIONS_RENDER', 1); |
|
21 | 21 | |
22 | - /* |
|
22 | + /* |
|
23 | 23 | * Sorry, we have to use the stupid solution unless there is an option in MyTextSanitizer:: htmlspecialchars(); |
24 | 24 | */ |
25 | - /** |
|
26 | - * @param $text |
|
27 | - * @return mixed |
|
28 | - */ |
|
29 | - function newbbHtmlspecialchars(&$text) |
|
30 | - { |
|
31 | - return preg_replace(['/&/i', '/ /i'], ['&', '&nbsp;'], htmlspecialchars($text, ENT_QUOTES | ENT_HTML5)); |
|
32 | - } |
|
33 | - |
|
34 | - /** |
|
35 | - * @param $text |
|
36 | - * @param int $html |
|
37 | - * @param int $smiley |
|
38 | - * @param int $xcode |
|
39 | - * @param int $image |
|
40 | - * @param int $br |
|
41 | - * @return mixed |
|
42 | - */ |
|
43 | - function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1) |
|
44 | - { |
|
45 | - global $myts; |
|
46 | - |
|
47 | - if (1 !== $html) { |
|
48 | - // html not allowed |
|
49 | - $text = newbbHtmlspecialchars($text); |
|
50 | - } |
|
51 | - $text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18) |
|
52 | - $text = $myts->makeClickable($text); |
|
53 | - if (0 !== $smiley) { |
|
54 | - // process smiley |
|
55 | - $text = $myts->smiley($text); |
|
56 | - } |
|
57 | - if (0 !== $xcode) { |
|
58 | - // decode xcode |
|
59 | - if (0 !== $image) { |
|
60 | - // image allowed |
|
61 | - $text = $myts->xoopsCodeDecode($text); |
|
62 | - } else { |
|
63 | - // image not allowed |
|
64 | - $text = $myts->xoopsCodeDecode($text, 0); |
|
65 | - } |
|
66 | - } |
|
67 | - if (0 !== $br) { |
|
68 | - $text = $myts->nl2Br($text); |
|
69 | - } |
|
70 | - $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) |
|
71 | - |
|
72 | - return $text; |
|
73 | - } |
|
74 | - |
|
75 | - /** |
|
76 | - * @param $document |
|
77 | - * @return string |
|
78 | - */ |
|
79 | - function newbbHtml2text($document) |
|
80 | - { |
|
81 | - $text = strip_tags($document); |
|
82 | - |
|
83 | - return $text; |
|
84 | - } |
|
85 | - |
|
86 | - /** |
|
87 | - * Display forrum button |
|
88 | - * |
|
89 | - * @param $link |
|
90 | - * @param $button |
|
91 | - * @param string $alt alt message |
|
92 | - * @param boolean $asImage true for image mode; false for text mode |
|
93 | - * @param string $extra extra attribute for the button |
|
94 | - * @return mixed |
|
95 | - * @internal param string $image image/button name, without extension |
|
96 | - */ |
|
97 | - function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'") |
|
98 | - { |
|
99 | - $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />"; |
|
100 | - if (empty($asImage)) { |
|
101 | - $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>'; |
|
102 | - } |
|
103 | - |
|
104 | - return $button; |
|
105 | - } |
|
106 | - |
|
107 | - /** |
|
108 | - * Display forrum images |
|
109 | - * |
|
110 | - * @param string $image image name, without extension |
|
111 | - * @param string $alt alt message |
|
112 | - * @param boolean $display true for return image anchor; faulse for assign to $xoopsTpl |
|
113 | - * @param string $extra extra attribute for the image |
|
114 | - * @return mixed |
|
115 | - */ |
|
116 | - function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'") |
|
117 | - { |
|
118 | - $iconHandler = newbbGetIconHandler(); |
|
119 | - // START hacked by irmtfan |
|
120 | - // to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set |
|
121 | - |
|
122 | - if (2 == func_num_args()) { |
|
123 | - // overall setting |
|
124 | - if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) { |
|
125 | - $display = false; |
|
126 | - } |
|
127 | - // if set for each link => overwrite $display |
|
128 | - if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) { |
|
129 | - $display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]); |
|
130 | - } |
|
131 | - } |
|
132 | - // END hacked by irmtfan |
|
133 | - if (empty($display)) { |
|
134 | - return $iconHandler->assignImage($image, $alt, $extra); |
|
135 | - } else { |
|
136 | - return $iconHandler->getImage($image, $alt, $extra); |
|
137 | - } |
|
138 | - } |
|
139 | - |
|
140 | - /** |
|
141 | - * @return Newbb\IconHandler |
|
142 | - */ |
|
143 | - function newbbGetIconHandler() |
|
144 | - { |
|
145 | - global $xoTheme; |
|
146 | - static $iconHandler; |
|
147 | - |
|
148 | - if (isset($iconHandler)) { |
|
149 | - return $iconHandler; |
|
150 | - } |
|
25 | + /** |
|
26 | + * @param $text |
|
27 | + * @return mixed |
|
28 | + */ |
|
29 | + function newbbHtmlspecialchars(&$text) |
|
30 | + { |
|
31 | + return preg_replace(['/&/i', '/ /i'], ['&', '&nbsp;'], htmlspecialchars($text, ENT_QUOTES | ENT_HTML5)); |
|
32 | + } |
|
33 | + |
|
34 | + /** |
|
35 | + * @param $text |
|
36 | + * @param int $html |
|
37 | + * @param int $smiley |
|
38 | + * @param int $xcode |
|
39 | + * @param int $image |
|
40 | + * @param int $br |
|
41 | + * @return mixed |
|
42 | + */ |
|
43 | + function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1) |
|
44 | + { |
|
45 | + global $myts; |
|
46 | + |
|
47 | + if (1 !== $html) { |
|
48 | + // html not allowed |
|
49 | + $text = newbbHtmlspecialchars($text); |
|
50 | + } |
|
51 | + $text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18) |
|
52 | + $text = $myts->makeClickable($text); |
|
53 | + if (0 !== $smiley) { |
|
54 | + // process smiley |
|
55 | + $text = $myts->smiley($text); |
|
56 | + } |
|
57 | + if (0 !== $xcode) { |
|
58 | + // decode xcode |
|
59 | + if (0 !== $image) { |
|
60 | + // image allowed |
|
61 | + $text = $myts->xoopsCodeDecode($text); |
|
62 | + } else { |
|
63 | + // image not allowed |
|
64 | + $text = $myts->xoopsCodeDecode($text, 0); |
|
65 | + } |
|
66 | + } |
|
67 | + if (0 !== $br) { |
|
68 | + $text = $myts->nl2Br($text); |
|
69 | + } |
|
70 | + $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) |
|
71 | + |
|
72 | + return $text; |
|
73 | + } |
|
74 | + |
|
75 | + /** |
|
76 | + * @param $document |
|
77 | + * @return string |
|
78 | + */ |
|
79 | + function newbbHtml2text($document) |
|
80 | + { |
|
81 | + $text = strip_tags($document); |
|
82 | + |
|
83 | + return $text; |
|
84 | + } |
|
85 | + |
|
86 | + /** |
|
87 | + * Display forrum button |
|
88 | + * |
|
89 | + * @param $link |
|
90 | + * @param $button |
|
91 | + * @param string $alt alt message |
|
92 | + * @param boolean $asImage true for image mode; false for text mode |
|
93 | + * @param string $extra extra attribute for the button |
|
94 | + * @return mixed |
|
95 | + * @internal param string $image image/button name, without extension |
|
96 | + */ |
|
97 | + function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'") |
|
98 | + { |
|
99 | + $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />"; |
|
100 | + if (empty($asImage)) { |
|
101 | + $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>'; |
|
102 | + } |
|
103 | + |
|
104 | + return $button; |
|
105 | + } |
|
106 | + |
|
107 | + /** |
|
108 | + * Display forrum images |
|
109 | + * |
|
110 | + * @param string $image image name, without extension |
|
111 | + * @param string $alt alt message |
|
112 | + * @param boolean $display true for return image anchor; faulse for assign to $xoopsTpl |
|
113 | + * @param string $extra extra attribute for the image |
|
114 | + * @return mixed |
|
115 | + */ |
|
116 | + function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'") |
|
117 | + { |
|
118 | + $iconHandler = newbbGetIconHandler(); |
|
119 | + // START hacked by irmtfan |
|
120 | + // to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set |
|
121 | + |
|
122 | + if (2 == func_num_args()) { |
|
123 | + // overall setting |
|
124 | + if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) { |
|
125 | + $display = false; |
|
126 | + } |
|
127 | + // if set for each link => overwrite $display |
|
128 | + if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) { |
|
129 | + $display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]); |
|
130 | + } |
|
131 | + } |
|
132 | + // END hacked by irmtfan |
|
133 | + if (empty($display)) { |
|
134 | + return $iconHandler->assignImage($image, $alt, $extra); |
|
135 | + } else { |
|
136 | + return $iconHandler->getImage($image, $alt, $extra); |
|
137 | + } |
|
138 | + } |
|
139 | + |
|
140 | + /** |
|
141 | + * @return Newbb\IconHandler |
|
142 | + */ |
|
143 | + function newbbGetIconHandler() |
|
144 | + { |
|
145 | + global $xoTheme; |
|
146 | + static $iconHandler; |
|
147 | + |
|
148 | + if (isset($iconHandler)) { |
|
149 | + return $iconHandler; |
|
150 | + } |
|
151 | 151 | |
152 | 152 | // if (!class_exists('IconHandler')) { |
153 | 153 | // require_once dirname(__DIR__) . '/class/icon.php'; |
154 | 154 | // } |
155 | 155 | |
156 | - $iconHandler = Newbb\IconHandler::getInstance(); |
|
157 | - $iconHandler->template = $xoTheme->template; |
|
158 | - $iconHandler->init($GLOBALS['xoopsConfig']['language']); |
|
156 | + $iconHandler = Newbb\IconHandler::getInstance(); |
|
157 | + $iconHandler->template = $xoTheme->template; |
|
158 | + $iconHandler->init($GLOBALS['xoopsConfig']['language']); |
|
159 | 159 | |
160 | - return $iconHandler; |
|
161 | - } |
|
160 | + return $iconHandler; |
|
161 | + } |
|
162 | 162 | } |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
15 | 15 | |
16 | -defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php'; |
|
16 | +defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php'; |
|
17 | 17 | define('NEWBB_FUNCTIONS_RENDER_LOADED', true); |
18 | 18 | |
19 | 19 | if (!defined('NEWBB_FUNCTIONS_RENDER')) { |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | if (0 !== $br) { |
68 | 68 | $text = $myts->nl2Br($text); |
69 | 69 | } |
70 | - $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) |
|
70 | + $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) |
|
71 | 71 | |
72 | 72 | return $text; |
73 | 73 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | { |
99 | 99 | $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />"; |
100 | 100 | if (empty($asImage)) { |
101 | - $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>'; |
|
101 | + $button = "<a href='{$link}' title='{$alt}' {$extra}>".newbbDisplayImage($button, $alt, true).'</a>'; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | return $button; |
@@ -17,34 +17,34 @@ |
||
17 | 17 | define('NEWBB_FUNCTIONS_WELCOME_LOADED', true); |
18 | 18 | |
19 | 19 | if (!defined('NEWBB_FUNCTIONS_WELCOME')) { |
20 | - define('NEWBB_FUNCTIONS_WELCOME', true); |
|
21 | - |
|
22 | - /** |
|
23 | - * @return bool |
|
24 | - */ |
|
25 | - function newbbWelcome() |
|
26 | - { |
|
27 | - global $forumObject; |
|
28 | - $ret = ''; |
|
29 | - |
|
30 | - $forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum']; |
|
31 | - if (!$forumId) { |
|
32 | - return false; |
|
33 | - } |
|
34 | - /** @var Newbb\ForumHandler $forumHandler */ |
|
35 | - $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum'); |
|
36 | - $forumObject = $forumHandler->get($forumId); |
|
37 | - if (!$forumObject || !$forumHandler->getPermission($forumObject)) { |
|
38 | - unset($forumObject); |
|
39 | - |
|
40 | - return false; |
|
41 | - } |
|
42 | - |
|
43 | - require_once __DIR__ . '/functions.welcome.inc.php'; |
|
44 | - unset($forumObject); |
|
45 | - |
|
46 | - return $ret; |
|
47 | - } |
|
48 | - |
|
49 | - newbbWelcome(); |
|
20 | + define('NEWBB_FUNCTIONS_WELCOME', true); |
|
21 | + |
|
22 | + /** |
|
23 | + * @return bool |
|
24 | + */ |
|
25 | + function newbbWelcome() |
|
26 | + { |
|
27 | + global $forumObject; |
|
28 | + $ret = ''; |
|
29 | + |
|
30 | + $forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum']; |
|
31 | + if (!$forumId) { |
|
32 | + return false; |
|
33 | + } |
|
34 | + /** @var Newbb\ForumHandler $forumHandler */ |
|
35 | + $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum'); |
|
36 | + $forumObject = $forumHandler->get($forumId); |
|
37 | + if (!$forumObject || !$forumHandler->getPermission($forumObject)) { |
|
38 | + unset($forumObject); |
|
39 | + |
|
40 | + return false; |
|
41 | + } |
|
42 | + |
|
43 | + require_once __DIR__ . '/functions.welcome.inc.php'; |
|
44 | + unset($forumObject); |
|
45 | + |
|
46 | + return $ret; |
|
47 | + } |
|
48 | + |
|
49 | + newbbWelcome(); |
|
50 | 50 | } |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
15 | 15 | |
16 | -defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php'; |
|
16 | +defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php'; |
|
17 | 17 | define('NEWBB_FUNCTIONS_WELCOME_LOADED', true); |
18 | 18 | |
19 | 19 | if (!defined('NEWBB_FUNCTIONS_WELCOME')) { |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | return false; |
41 | 41 | } |
42 | 42 | |
43 | - require_once __DIR__ . '/functions.welcome.inc.php'; |
|
43 | + require_once __DIR__.'/functions.welcome.inc.php'; |
|
44 | 44 | unset($forumObject); |
45 | 45 | |
46 | 46 | return $ret; |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | |
20 | 20 | function xoops_module_pre_uninstall_newbb(\XoopsModule $module) |
21 | 21 | { |
22 | - // Do some synchronization |
|
23 | - return true; |
|
22 | + // Do some synchronization |
|
23 | + return true; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -32,36 +32,36 @@ discard block |
||
32 | 32 | */ |
33 | 33 | function xoops_module_uninstall_newbb(\XoopsModule $module) |
34 | 34 | { |
35 | - // return true; |
|
35 | + // return true; |
|
36 | 36 | |
37 | - $moduleDirName = basename(dirname(__DIR__)); |
|
38 | - $moduleDirNameUpper = strtoupper($moduleDirName); |
|
39 | - /** @var \XoopsModules\Newbb\Helper $helper */ |
|
40 | - $helper = \XoopsModules\Newbb\Helper::getInstance(); |
|
37 | + $moduleDirName = basename(dirname(__DIR__)); |
|
38 | + $moduleDirNameUpper = strtoupper($moduleDirName); |
|
39 | + /** @var \XoopsModules\Newbb\Helper $helper */ |
|
40 | + $helper = \XoopsModules\Newbb\Helper::getInstance(); |
|
41 | 41 | |
42 | - /** @var Newbb\Utility $utility */ |
|
43 | - $utility = new \XoopsModules\Newbb\Utility(); |
|
42 | + /** @var Newbb\Utility $utility */ |
|
43 | + $utility = new \XoopsModules\Newbb\Utility(); |
|
44 | 44 | |
45 | - $success = true; |
|
46 | - $helper->loadLanguage('admin'); |
|
45 | + $success = true; |
|
46 | + $helper->loadLanguage('admin'); |
|
47 | 47 | |
48 | - //------------------------------------------------------------------ |
|
49 | - // Remove uploads folder (and all subfolders) if they exist |
|
50 | - //------------------------------------------------------------------ |
|
48 | + //------------------------------------------------------------------ |
|
49 | + // Remove uploads folder (and all subfolders) if they exist |
|
50 | + //------------------------------------------------------------------ |
|
51 | 51 | |
52 | - $old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")]; |
|
53 | - foreach ($old_directories as $old_dir) { |
|
54 | - $dirInfo = new \SplFileInfo($old_dir); |
|
55 | - if ($dirInfo->isDir()) { |
|
56 | - // The directory exists so delete it |
|
57 | - if (false === $utility::rrmdir($old_dir)) { |
|
58 | - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir)); |
|
59 | - $success = false; |
|
60 | - } |
|
61 | - } |
|
62 | - unset($dirInfo); |
|
63 | - } |
|
64 | - /* |
|
52 | + $old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")]; |
|
53 | + foreach ($old_directories as $old_dir) { |
|
54 | + $dirInfo = new \SplFileInfo($old_dir); |
|
55 | + if ($dirInfo->isDir()) { |
|
56 | + // The directory exists so delete it |
|
57 | + if (false === $utility::rrmdir($old_dir)) { |
|
58 | + $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir)); |
|
59 | + $success = false; |
|
60 | + } |
|
61 | + } |
|
62 | + unset($dirInfo); |
|
63 | + } |
|
64 | + /* |
|
65 | 65 | //------------ START ---------------- |
66 | 66 | //------------------------------------------------------------------ |
67 | 67 | // Remove xsitemap.xml from XOOPS root folder if it exists |
@@ -75,6 +75,6 @@ discard block |
||
75 | 75 | // return $success && $delOk; // use this if you're using this routine |
76 | 76 | */ |
77 | 77 | |
78 | - return $success; |
|
79 | - //------------ END ---------------- |
|
78 | + return $success; |
|
79 | + //------------ END ---------------- |
|
80 | 80 | } |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | { |
35 | 35 | // return true; |
36 | 36 | |
37 | - $moduleDirName = basename(dirname(__DIR__)); |
|
38 | - $moduleDirNameUpper = strtoupper($moduleDirName); |
|
37 | + $moduleDirName = basename(dirname(__DIR__)); |
|
38 | + $moduleDirNameUpper = strtoupper($moduleDirName); |
|
39 | 39 | /** @var \XoopsModules\Newbb\Helper $helper */ |
40 | 40 | $helper = \XoopsModules\Newbb\Helper::getInstance(); |
41 | 41 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | if ($dirInfo->isDir()) { |
56 | 56 | // The directory exists so delete it |
57 | 57 | if (false === $utility::rrmdir($old_dir)) { |
58 | - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir)); |
|
58 | + $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir)); |
|
59 | 59 | $success = false; |
60 | 60 | } |
61 | 61 | } |
@@ -17,101 +17,101 @@ |
||
17 | 17 | define('NEWBB_FUNCTIONS_SESSION_LOADED', true); |
18 | 18 | |
19 | 19 | if (!defined('NEWBB_FUNCTIONS_SESSION')) { |
20 | - define('NEWBB_FUNCTIONS_SESSION', 1); |
|
20 | + define('NEWBB_FUNCTIONS_SESSION', 1); |
|
21 | 21 | |
22 | - /* |
|
22 | + /* |
|
23 | 23 | * Currently the newbb session/cookie handlers are limited to: |
24 | 24 | * -- one dimension |
25 | 25 | * -- "," and "|" are preserved |
26 | 26 | * |
27 | 27 | */ |
28 | - /** |
|
29 | - * @param $name |
|
30 | - * @param string|array $string |
|
31 | - */ |
|
32 | - function newbbSetSession($name, $string = '') |
|
33 | - { |
|
34 | - if (is_array($string)) { |
|
35 | - $value = []; |
|
36 | - foreach ($string as $key => $val) { |
|
37 | - $value[] = $key . '|' . $val; |
|
38 | - } |
|
39 | - $string = implode(',', $value); |
|
40 | - } |
|
41 | - $_SESSION['newbb_' . $name] = $string; |
|
42 | - } |
|
28 | + /** |
|
29 | + * @param $name |
|
30 | + * @param string|array $string |
|
31 | + */ |
|
32 | + function newbbSetSession($name, $string = '') |
|
33 | + { |
|
34 | + if (is_array($string)) { |
|
35 | + $value = []; |
|
36 | + foreach ($string as $key => $val) { |
|
37 | + $value[] = $key . '|' . $val; |
|
38 | + } |
|
39 | + $string = implode(',', $value); |
|
40 | + } |
|
41 | + $_SESSION['newbb_' . $name] = $string; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param $name |
|
46 | - * @param bool $isArray |
|
47 | - * @return array|bool |
|
48 | - */ |
|
49 | - function newbbGetSession($name, $isArray = false) |
|
50 | - { |
|
51 | - $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false; |
|
52 | - if ($isArray) { |
|
53 | - $_value = $value ? explode(',', $value) : []; |
|
54 | - $value = []; |
|
55 | - if (count($_value) > 0) { |
|
56 | - foreach ($_value as $string) { |
|
57 | - $key = substr($string, 0, strpos($string, '|')); |
|
58 | - $val = substr($string, strpos($string, '|') + 1); |
|
59 | - $value[$key] = $val; |
|
60 | - } |
|
61 | - } |
|
62 | - unset($_value); |
|
63 | - } |
|
44 | + /** |
|
45 | + * @param $name |
|
46 | + * @param bool $isArray |
|
47 | + * @return array|bool |
|
48 | + */ |
|
49 | + function newbbGetSession($name, $isArray = false) |
|
50 | + { |
|
51 | + $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false; |
|
52 | + if ($isArray) { |
|
53 | + $_value = $value ? explode(',', $value) : []; |
|
54 | + $value = []; |
|
55 | + if (count($_value) > 0) { |
|
56 | + foreach ($_value as $string) { |
|
57 | + $key = substr($string, 0, strpos($string, '|')); |
|
58 | + $val = substr($string, strpos($string, '|') + 1); |
|
59 | + $value[$key] = $val; |
|
60 | + } |
|
61 | + } |
|
62 | + unset($_value); |
|
63 | + } |
|
64 | 64 | |
65 | - return $value; |
|
66 | - } |
|
65 | + return $value; |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param $name |
|
70 | - * @param string|array $string |
|
71 | - * @param int $expire |
|
72 | - */ |
|
73 | - function newbbSetCookie($name, $string = '', $expire = 0) |
|
74 | - { |
|
75 | - global $forumCookie; |
|
76 | - if (is_array($string)) { |
|
77 | - $value = []; |
|
78 | - foreach ($string as $key => $val) { |
|
79 | - $value[] = $key . '|' . $val; |
|
80 | - } |
|
81 | - $string = implode(',', $value); |
|
82 | - } |
|
83 | - setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']); |
|
84 | - } |
|
68 | + /** |
|
69 | + * @param $name |
|
70 | + * @param string|array $string |
|
71 | + * @param int $expire |
|
72 | + */ |
|
73 | + function newbbSetCookie($name, $string = '', $expire = 0) |
|
74 | + { |
|
75 | + global $forumCookie; |
|
76 | + if (is_array($string)) { |
|
77 | + $value = []; |
|
78 | + foreach ($string as $key => $val) { |
|
79 | + $value[] = $key . '|' . $val; |
|
80 | + } |
|
81 | + $string = implode(',', $value); |
|
82 | + } |
|
83 | + setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']); |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * @param $name |
|
88 | - * @param bool $isArray |
|
89 | - * @return array|null |
|
90 | - */ |
|
91 | - function newbbGetCookie($name, $isArray = false) |
|
92 | - { |
|
93 | - global $forumCookie; |
|
94 | - // $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null; |
|
95 | - $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE'); |
|
86 | + /** |
|
87 | + * @param $name |
|
88 | + * @param bool $isArray |
|
89 | + * @return array|null |
|
90 | + */ |
|
91 | + function newbbGetCookie($name, $isArray = false) |
|
92 | + { |
|
93 | + global $forumCookie; |
|
94 | + // $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null; |
|
95 | + $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE'); |
|
96 | 96 | |
97 | - if ($isArray) { |
|
98 | - $_value = $value ? explode(',', $value) : []; |
|
99 | - $value = []; |
|
100 | - if (count($_value) > 0) { |
|
101 | - foreach ($_value as $string) { |
|
102 | - $sep = strpos($string, '|'); |
|
103 | - if (false === $sep) { |
|
104 | - $value[] = $string; |
|
105 | - } else { |
|
106 | - $key = substr($string, 0, $sep); |
|
107 | - $val = substr($string, $sep + 1); |
|
108 | - $value[$key] = $val; |
|
109 | - } |
|
110 | - } |
|
111 | - } |
|
112 | - unset($_value); |
|
113 | - } |
|
97 | + if ($isArray) { |
|
98 | + $_value = $value ? explode(',', $value) : []; |
|
99 | + $value = []; |
|
100 | + if (count($_value) > 0) { |
|
101 | + foreach ($_value as $string) { |
|
102 | + $sep = strpos($string, '|'); |
|
103 | + if (false === $sep) { |
|
104 | + $value[] = $string; |
|
105 | + } else { |
|
106 | + $key = substr($string, 0, $sep); |
|
107 | + $val = substr($string, $sep + 1); |
|
108 | + $value[$key] = $val; |
|
109 | + } |
|
110 | + } |
|
111 | + } |
|
112 | + unset($_value); |
|
113 | + } |
|
114 | 114 | |
115 | - return $value; |
|
116 | - } |
|
115 | + return $value; |
|
116 | + } |
|
117 | 117 | } |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
15 | 15 | |
16 | -defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php'; |
|
16 | +defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php'; |
|
17 | 17 | define('NEWBB_FUNCTIONS_SESSION_LOADED', true); |
18 | 18 | |
19 | 19 | if (!defined('NEWBB_FUNCTIONS_SESSION')) { |
@@ -34,11 +34,11 @@ discard block |
||
34 | 34 | if (is_array($string)) { |
35 | 35 | $value = []; |
36 | 36 | foreach ($string as $key => $val) { |
37 | - $value[] = $key . '|' . $val; |
|
37 | + $value[] = $key.'|'.$val; |
|
38 | 38 | } |
39 | 39 | $string = implode(',', $value); |
40 | 40 | } |
41 | - $_SESSION['newbb_' . $name] = $string; |
|
41 | + $_SESSION['newbb_'.$name] = $string; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | function newbbGetSession($name, $isArray = false) |
50 | 50 | { |
51 | - $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false; |
|
51 | + $value = !empty($_SESSION['newbb_'.$name]) ? $_SESSION['newbb_'.$name] : false; |
|
52 | 52 | if ($isArray) { |
53 | 53 | $_value = $value ? explode(',', $value) : []; |
54 | 54 | $value = []; |
@@ -76,11 +76,11 @@ discard block |
||
76 | 76 | if (is_array($string)) { |
77 | 77 | $value = []; |
78 | 78 | foreach ($string as $key => $val) { |
79 | - $value[] = $key . '|' . $val; |
|
79 | + $value[] = $key.'|'.$val; |
|
80 | 80 | } |
81 | 81 | $string = implode(',', $value); |
82 | 82 | } |
83 | - setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']); |
|
83 | + setcookie($forumCookie['prefix'].$name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | { |
93 | 93 | global $forumCookie; |
94 | 94 | // $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null; |
95 | - $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE'); |
|
95 | + $value = Request::getString($forumCookie['prefix'].$name, null, 'COOKIE'); |
|
96 | 96 | |
97 | 97 | if ($isArray) { |
98 | 98 | $_value = $value ? explode(',', $value) : []; |
@@ -15,35 +15,35 @@ |
||
15 | 15 | define('NEWBB_FUNCTIONS_TOPIC_LOADED', true); |
16 | 16 | |
17 | 17 | if (!defined('NEWBB_FUNCTIONS_TOPIC')) { |
18 | - define('NEWBB_FUNCTIONS_TOPIC', 1); |
|
18 | + define('NEWBB_FUNCTIONS_TOPIC', 1); |
|
19 | 19 | |
20 | - /** |
|
21 | - * Create full title of a topic |
|
22 | - * |
|
23 | - * the title is composed of [type_name] if type_id is greater than 0 plus topic Title |
|
24 | - * @param $topicTitle |
|
25 | - * @param null $prefixName |
|
26 | - * @param null $prefixColor |
|
27 | - * @return string |
|
28 | - */ |
|
29 | - function newbbGetTopicTitle($topicTitle, $prefixName = null, $prefixColor = null) |
|
30 | - { |
|
31 | - return getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null); |
|
32 | - } |
|
20 | + /** |
|
21 | + * Create full title of a topic |
|
22 | + * |
|
23 | + * the title is composed of [type_name] if type_id is greater than 0 plus topic Title |
|
24 | + * @param $topicTitle |
|
25 | + * @param null $prefixName |
|
26 | + * @param null $prefixColor |
|
27 | + * @return string |
|
28 | + */ |
|
29 | + function newbbGetTopicTitle($topicTitle, $prefixName = null, $prefixColor = null) |
|
30 | + { |
|
31 | + return getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * @param $topicTitle |
|
36 | - * @param null $prefixName |
|
37 | - * @param null $prefixColor |
|
38 | - * @return string |
|
39 | - */ |
|
40 | - function getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null) |
|
41 | - { |
|
42 | - if (empty($prefixName)) { |
|
43 | - return $topicTitle; |
|
44 | - } |
|
45 | - $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] '; |
|
34 | + /** |
|
35 | + * @param $topicTitle |
|
36 | + * @param null $prefixName |
|
37 | + * @param null $prefixColor |
|
38 | + * @return string |
|
39 | + */ |
|
40 | + function getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null) |
|
41 | + { |
|
42 | + if (empty($prefixName)) { |
|
43 | + return $topicTitle; |
|
44 | + } |
|
45 | + $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] '; |
|
46 | 46 | |
47 | - return $topicPrefix . $topicTitle; |
|
48 | - } |
|
47 | + return $topicPrefix . $topicTitle; |
|
48 | + } |
|
49 | 49 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
13 | 13 | |
14 | -defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php'; |
|
14 | +defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php'; |
|
15 | 15 | define('NEWBB_FUNCTIONS_TOPIC_LOADED', true); |
16 | 16 | |
17 | 17 | if (!defined('NEWBB_FUNCTIONS_TOPIC')) { |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | if (empty($prefixName)) { |
43 | 43 | return $topicTitle; |
44 | 44 | } |
45 | - $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] '; |
|
45 | + $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: '.$prefixColor.';">['.$prefixName.']</em> ' : '['.$prefixName.'] '; |
|
46 | 46 | |
47 | - return $topicPrefix . $topicTitle; |
|
47 | + return $topicPrefix.$topicTitle; |
|
48 | 48 | } |
49 | 49 | } |