Skip to content

Commit 139b5ba

Browse files
mambax7mambax7
committed
cosmetics, Xmf\Request
1 parent 9d38ccd commit 139b5ba

184 files changed

Lines changed: 847 additions & 769 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ php:
99
- 7.3
1010
- 7.4
1111
env:
12-
- DB=mysql
12+
- DB=mysql
1313

1414
before_script:
1515
- mysql -e 'create database tdmcreate_settings'

‎admin/addfiles.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*
2121
* @author Txmod Xoops <support@txmodxoops.org>
2222
*
23-
* @version $Id: 1.59 addfiles.php 11297 2013-03-24 10:58:10Z timgno $
2423
*/
2524
$GLOBALS['xoopsOption']['template_main'] = 'tdmcreate_addfiles.tpl';
2625

@@ -93,18 +92,18 @@
9392
// Form file save
9493
$addfilesObj->setVars(
9594
[
96-
'file_mid' => $_POST['file_mid'],
97-
'file_name' => $_POST['file_name'],
98-
'file_extension' => $_POST['file_extension'],
99-
'file_infolder' => $_POST['file_infolder'],
95+
'file_mid' => \Xmf\Request::getString('file_mid', '', 'POST'),
96+
'file_name' => \Xmf\Request::getString('file_name', '', 'POST'),
97+
'file_extension' => \Xmf\Request::getString('file_extension', '', 'POST'),
98+
'file_infolder' => \Xmf\Request::getString('file_infolder', '', 'POST'),
10099
]
101100
);
102101

103102
if ($helper->getHandler('Addfiles')->insert($addfilesObj)) {
104103
if ($addfilesObj->isNew()) {
105-
redirect_header('addfiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_CREATED_OK, $_POST['file_name']));
104+
redirect_header('addfiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_CREATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
106105
} else {
107-
redirect_header('addfiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_UPDATED_OK, $_POST['file_name']));
106+
redirect_header('addfiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_UPDATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
108107
}
109108
}
110109

@@ -137,7 +136,7 @@
137136
$GLOBALS['xoopsTpl']->assign('error', $addfilesObj->getHtmlErrors());
138137
}
139138
} else {
140-
xoops_confirm(['ok' => 1, 'file_id' => $fileId, 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORM_SURE_DELETE, $addfilesObj->getVar('file_name')));
139+
xoops_confirm(['ok' => 1, 'file_id' => $fileId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORM_SURE_DELETE, $addfilesObj->getVar('file_name')));
141140
}
142141
break;
143142
}

‎admin/building.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
*
2222
* @author Txmod Xoops http://www.txmodxoops.org
2323
*
24-
* @version $Id: building.php 12258 2014-01-02 09:33:29Z timgno $
2524
*/
2625
$GLOBALS['xoopsOption']['template_main'] = 'tdmcreate_building.tpl';
2726

‎admin/fields.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
*
3030
* @author Txmod Xoops http://www.txmodxoops.org
3131
*
32-
* @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
3332
*/
3433
$GLOBALS['xoopsOption']['template_main'] = 'tdmcreate_fields.tpl';
3534

@@ -230,7 +229,7 @@
230229
echo $tablesObj->getHtmlErrors();
231230
}
232231
} else {
233-
xoops_confirm(['ok' => 1, 'field_tid' => $fieldTid, 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name')));
232+
xoops_confirm(['ok' => 1, 'field_tid' => $fieldTid, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name')));
234233
}
235234
break;
236235
case 'display':

‎admin/footer.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*
2121
* @author Txmod Xoops http://www.txmodxoops.org
2222
*
23-
* @version $Id: footer.php 12207 2013-10-23 02:46:52Z beckmi $
2423
*/
2524
$pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
2625

‎admin/header.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*
2020
* @author Txmod Xoops http://www.txmodxoops.org
2121
*
22-
* @version $Id: header.php 12258 2014-01-02 09:33:29Z timgno $
2322
*/
2423
include dirname(__DIR__) . '/preloads/autoloader.php';
2524

‎admin/index.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*
2121
* @author Txmod Xoops http://www.txmodxoops.org
2222
*
23-
* @version $Id: index.php 11084 2013-02-23 15:44:20Z timgno $
2423
*/
2524
$GLOBALS['xoopsOption']['template_main'] = 'tdmcreate_index.tpl';
2625

‎admin/logo.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
*
2222
* @author Txmod Xoops <support@txmodxoops.org>
2323
*
24-
* @version $Id: 1.59 logo.php 11297 2013-03-24 10:58:10Z timgno $
2524
*/
2625
include __DIR__ . '/header.php';
2726
$funct = \Xmf\Request::getString('funct', '', 'GET');

‎admin/menu.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*
2121
* @author Txmod Xoops http://www.txmodxoops.org
2222
*
23-
* @version $Id: menu.php 11084 2013-02-23 15:44:20Z timgno $
2423
*/
2524
include dirname(__DIR__) . '/preloads/autoloader.php';
2625

‎admin/modules.php‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*
2121
* @author Txmod Xoops <support@txmodxoops.org>
2222
*
23-
* @version $Id: 1.59 modules.php 11297 2013-03-24 10:58:10Z timgno $
2423
*/
2524
$GLOBALS['xoopsOption']['template_main'] = 'tdmcreate_modules.tpl';
2625

@@ -66,6 +65,7 @@
6665
} else {
6766
$GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_MODULES);
6867
}
68+
6969
break;
7070
case 'new':
7171
// Define main template
@@ -88,29 +88,29 @@
8888
} else {
8989
$modulesObj = $helper->getHandler('Modules')->create();
9090
}
91-
$moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', mb_strtolower($_POST['mod_dirname']));
91+
$moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', mb_strtolower(\Xmf\Request::getString('mod_dirname', '', 'POST')));
9292
//Form module save
9393
$modulesObj->setVars(
9494
[
95-
'mod_name' => $_POST['mod_name'],
95+
'mod_name' => \Xmf\Request::getString('mod_name', '', 'POST'),
9696
'mod_dirname' => $moduleDirname,
97-
'mod_version' => $_POST['mod_version'],
98-
'mod_since' => $_POST['mod_since'],
99-
'mod_min_php' => $_POST['mod_min_php'],
100-
'mod_min_xoops' => $_POST['mod_min_xoops'],
101-
'mod_min_admin' => $_POST['mod_min_admin'],
102-
'mod_min_mysql' => $_POST['mod_min_mysql'],
103-
'mod_description' => $_POST['mod_description'],
104-
'mod_author' => $_POST['mod_author'],
105-
'mod_author_mail' => $_POST['mod_author_mail'],
106-
'mod_author_website_url' => $_POST['mod_author_website_url'],
107-
'mod_author_website_name' => $_POST['mod_author_website_name'],
108-
'mod_credits' => $_POST['mod_credits'],
109-
'mod_license' => $_POST['mod_license'],
110-
'mod_release_info' => $_POST['mod_release_info'],
111-
'mod_release_file' => $_POST['mod_release_file'],
112-
'mod_manual' => $_POST['mod_manual'],
113-
'mod_manual_file' => $_POST['mod_manual_file'],
97+
'mod_version' => \Xmf\Request::getString('mod_version', '', 'POST'),
98+
'mod_since' => \Xmf\Request::getString('mod_since', '', 'POST'),
99+
'mod_min_php' => \Xmf\Request::getString('mod_min_php', '', 'POST'),
100+
'mod_min_xoops' => \Xmf\Request::getString('mod_min_xoops', '', 'POST'),
101+
'mod_min_admin' => \Xmf\Request::getString('mod_min_admin', '', 'POST'),
102+
'mod_min_mysql' => \Xmf\Request::getString('mod_min_mysql', '', 'POST'),
103+
'mod_description' => \Xmf\Request::getString('mod_description', '', 'POST'),
104+
'mod_author' => \Xmf\Request::getString('mod_author', '', 'POST'),
105+
'mod_author_mail' => \Xmf\Request::getString('mod_author_mail', '', 'POST'),
106+
'mod_author_website_url' => \Xmf\Request::getString('mod_author_website_url', '', 'POST'),
107+
'mod_author_website_name' => \Xmf\Request::getString('mod_author_website_name', '', 'POST'),
108+
'mod_credits' => \Xmf\Request::getString('mod_credits', '', 'POST'),
109+
'mod_license' => \Xmf\Request::getString('mod_license', '', 'POST'),
110+
'mod_release_info' => \Xmf\Request::getString('mod_release_info', '', 'POST'),
111+
'mod_release_file' => \Xmf\Request::getString('mod_release_file', '', 'POST'),
112+
'mod_manual' => \Xmf\Request::getString('mod_manual', '', 'POST'),
113+
'mod_manual_file' => \Xmf\Request::getString('mod_manual_file', '', 'POST'),
114114
]
115115
);
116116
//Form mod_image
@@ -127,21 +127,21 @@
127127
$modulesObj->setVar('mod_image', $uploader->getSavedFileName());
128128
}
129129
} else {
130-
$modulesObj->setVar('mod_image', $_POST['mod_image']);
130+
$modulesObj->setVar('mod_image', \Xmf\Request::getString('mod_image', '', 'POST'));
131131
}
132132
//Form module save
133133
$modulesObj->setVars(
134134
[
135-
'mod_demo_site_url' => $_POST['mod_demo_site_url'],
136-
'mod_demo_site_name' => $_POST['mod_demo_site_name'],
137-
'mod_support_url' => $_POST['mod_support_url'],
138-
'mod_support_name' => $_POST['mod_support_name'],
139-
'mod_website_url' => $_POST['mod_website_url'],
140-
'mod_website_name' => $_POST['mod_website_name'],
141-
'mod_release' => $_POST['mod_release'],
142-
'mod_status' => $_POST['mod_status'],
143-
'mod_donations' => $_POST['mod_donations'],
144-
'mod_subversion' => $_POST['mod_subversion'],
135+
'mod_demo_site_url' => \Xmf\Request::getString('mod_demo_site_url', '', 'POST'),
136+
'mod_demo_site_name' => \Xmf\Request::getString('mod_demo_site_name', '', 'POST'),
137+
'mod_support_url' => \Xmf\Request::getString('mod_support_url', '', 'POST'),
138+
'mod_support_name' => \Xmf\Request::getString('mod_support_name', '', 'POST'),
139+
'mod_website_url' => \Xmf\Request::getString('mod_website_url', '', 'POST'),
140+
'mod_website_name' => \Xmf\Request::getString('mod_website_name', '', 'POST'),
141+
'mod_release' => \Xmf\Request::getString('mod_release', '', 'POST'),
142+
'mod_status' => \Xmf\Request::getString('mod_status', '', 'POST'),
143+
'mod_donations' => \Xmf\Request::getString('mod_donations', '', 'POST'),
144+
'mod_subversion' => \Xmf\Request::getString('mod_subversion', '', 'POST'),
145145
]
146146
);
147147
$moduleOption = \Xmf\Request::getArray('module_option', []);
@@ -156,9 +156,9 @@
156156

157157
if ($helper->getHandler('Modules')->insert($modulesObj)) {
158158
if ($modulesObj->isNew()) {
159-
redirect_header('tables.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_CREATED_OK, $_POST['mod_name']));
159+
redirect_header('tables.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_CREATED_OK, \Xmf\Request::getString('mod_name', '', 'POST')));
160160
} else {
161-
redirect_header('modules.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_UPDATED_OK, $_POST['mod_name']));
161+
redirect_header('modules.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_UPDATED_OK, \Xmf\Request::getString('mod_name', '', 'POST')));
162162
}
163163
}
164164

@@ -191,8 +191,9 @@
191191
$GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors());
192192
}
193193
} else {
194-
xoops_confirm(['ok' => 1, 'mod_id' => $modId, 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $modulesObj->getVar('mod_name')));
194+
xoops_confirm(['ok' => 1, 'mod_id' => $modId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORMSUREDEL, $modulesObj->getVar('mod_name')));
195195
}
196+
196197
break;
197198
case 'display':
198199
$modFieldArray = ['admin', 'user', 'blocks', 'search', 'comments', 'notifications', 'permissions'];
@@ -214,3 +215,4 @@
214215
}
215216

216217
include __DIR__ . '/footer.php';
218+

0 commit comments

Comments
 (0)