Skip to content

Commit 4674d53

Browse files
ggoffyggoffy
authored
Merge pull request #143 from mambax7/master
cosmetics
2 parents 0c230a1 + 2029653 commit 4674d53

69 files changed

Lines changed: 2455 additions & 2511 deletions

Some content is hidden

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

‎admin/building.php‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
*
2222
* @version $Id: building.php 12258 2014-01-02 09:33:29Z timgno $
2323
*/
24-
include __DIR__.'/header.php';
24+
include __DIR__ . '/header.php';
2525
$op = XoopsRequest::getString('op', 'default');
2626
$mid = XoopsRequest::getInt('mod_id');
2727
$moduleObj = $tdmcreate->getHandler('modules')->get($mid);
28-
$cachePath = XOOPS_VAR_PATH.'/caches/tdmcreate_cache';
28+
$cachePath = XOOPS_VAR_PATH . '/caches/tdmcreate_cache';
2929
// Clear cache
30-
if (file_exists($cache = $cachePath.'/classpaths.cache')) {
30+
if (file_exists($cache = $cachePath . '/classpaths.cache')) {
3131
unlink($cache);
3232
}
33-
if (!file_exists($indexFile = $cachePath.'/index.html')) {
33+
if (!file_exists($indexFile = $cachePath . '/index.html')) {
3434
copy('index.html', $indexFile);
3535
}
3636
// Switch option
@@ -41,9 +41,9 @@
4141
// Get var module dirname
4242
$moduleDirname = $moduleObj->getVar('mod_dirname');
4343
// Directories for copy from to
44-
$fromDir = TDMC_UPLOAD_REPOSITORY_PATH.'/'.strtolower($moduleDirname);
45-
$toDir = XOOPS_ROOT_PATH.'/modules/'.strtolower($moduleDirname);
46-
include_once TDMC_CLASS_PATH.'/building.php';
44+
$fromDir = TDMC_UPLOAD_REPOSITORY_PATH . '/' . mb_strtolower($moduleDirname);
45+
$toDir = XOOPS_ROOT_PATH . '/modules/' . mb_strtolower($moduleDirname);
46+
include_once TDMC_CLASS_PATH . '/building.php';
4747
if (isset($moduleDirname)) {
4848
// Clear this module if it's in repository
4949
$building = TDMCreateBuilding::getInstance();
@@ -52,7 +52,7 @@
5252
}
5353
}
5454
// Structure
55-
include_once TDMC_CLASS_PATH.'/files/TDMCreateArchitecture.php';
55+
include_once TDMC_CLASS_PATH . '/files/TDMCreateArchitecture.php';
5656
$handler = TDMCreateArchitecture::getInstance();
5757
// Creation of the structure of folders and files
5858
$baseArchitecture = $handler->setBaseFoldersFiles($moduleObj);
@@ -88,7 +88,6 @@
8888
$building->copyDir($fromDir, $toDir);
8989
}
9090
break;
91-
9291
case 'default':
9392
default:
9493
$templateMain = 'tdmcreate_building.tpl';
@@ -99,10 +98,10 @@
9998
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES);
10099
}
101100
unset($nbModules);
102-
include_once TDMC_CLASS_PATH.'/building.php';
101+
include_once TDMC_CLASS_PATH . '/building.php';
103102
$building = TDMCreateBuilding::getInstance();
104103
$form = $building->getForm();
105104
$GLOBALS['xoopsTpl']->assign('form', $form->render());
106105
break;
107106
}
108-
include __DIR__.'/footer.php';
107+
include __DIR__ . '/footer.php';

‎admin/modules.php‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @version $Id: 1.59 modules.php 11297 2013-03-24 10:58:10Z timgno $
2323
*/
24-
include __DIR__.'/header.php';
24+
include __DIR__ . '/header.php';
2525
// Recovered value of argument op in the URL $
2626
$op = XoopsRequest::getString('op', 'list');
2727

@@ -41,7 +41,7 @@
4141
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
4242
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
4343
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
44-
$GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL.'/'.$modPathIcon16);
44+
$GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL . '/' . $modPathIcon16);
4545
$modulesCount = $tdmcreate->getHandler('modules')->getCountModules();
4646
$modulesAll = $tdmcreate->getHandler('modules')->getAllModules($start, $limit);
4747
// Redirect if there aren't modules
@@ -56,15 +56,14 @@
5656
unset($module);
5757
}
5858
if ($modulesCount > $limit) {
59-
include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
60-
$pagenav = new XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit='.$limit);
59+
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
60+
$pagenav = new XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
6161
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
6262
}
6363
} else {
6464
$GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_MODULES);
6565
}
6666
break;
67-
6867
case 'new':
6968
// Define main template
7069
$templateMain = 'tdmcreate_modules.tpl';
@@ -77,7 +76,6 @@
7776
$form = $modulesObj->getFormModules();
7877
$GLOBALS['xoopsTpl']->assign('form', $form->render());
7978
break;
80-
8179
case 'save':
8280
if (!$GLOBALS['xoopsSecurity']->check()) {
8381
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -87,7 +85,7 @@
8785
} else {
8886
$modulesObj = $tdmcreate->getHandler('modules')->create();
8987
}
90-
$moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['mod_dirname']));
88+
$moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', mb_strtolower($_POST['mod_dirname']));
9189
//Form module save
9290
$modulesObj->setVars([
9391
'mod_name' => $_POST['mod_name'],
@@ -111,18 +109,18 @@
111109
'mod_manual_file' => $_POST['mod_manual_file'],
112110
]);
113111
//Form mod_image
114-
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
112+
include_once XOOPS_ROOT_PATH . '/class/uploader.php';
115113
$uploader = new XoopsMediaUploader(
116114
TDMC_UPLOAD_IMGMOD_PATH,
117115
$tdmcreate->getConfig('mimetypes'),
118-
$tdmcreate->getConfig('maxsize'),
116+
$tdmcreate->getConfig('maxsize'),
119117
null,
120118
null
121119
);
122120
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
123121
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
124122
if (!$uploader->upload()) {
125-
$errors =& $uploader->getErrors();
123+
$errors = &$uploader->getErrors();
126124
redirect_header('javascript:history.go(-1)', 3, $errors);
127125
} else {
128126
$modulesObj->setVar('mod_image', $uploader->getSavedFileName());
@@ -146,14 +144,14 @@
146144
]
147145
);
148146
$moduleOption = XoopsRequest::getArray('module_option', []);
149-
$modulesObj->setVar('mod_admin', in_array('admin', $moduleOption));
150-
$modulesObj->setVar('mod_user', in_array('user', $moduleOption));
151-
$modulesObj->setVar('mod_blocks', in_array('blocks', $moduleOption));
152-
$modulesObj->setVar('mod_search', in_array('search', $moduleOption));
153-
$modulesObj->setVar('mod_comments', in_array('comments', $moduleOption));
154-
$modulesObj->setVar('mod_notifications', in_array('notifications', $moduleOption));
155-
$modulesObj->setVar('mod_permissions', in_array('permissions', $moduleOption));
156-
$modulesObj->setVar('mod_inroot_copy', in_array('inroot_copy', $moduleOption));
147+
$modulesObj->setVar('mod_admin', in_array('admin', $moduleOption, true));
148+
$modulesObj->setVar('mod_user', in_array('user', $moduleOption, true));
149+
$modulesObj->setVar('mod_blocks', in_array('blocks', $moduleOption, true));
150+
$modulesObj->setVar('mod_search', in_array('search', $moduleOption, true));
151+
$modulesObj->setVar('mod_comments', in_array('comments', $moduleOption, true));
152+
$modulesObj->setVar('mod_notifications', in_array('notifications', $moduleOption, true));
153+
$modulesObj->setVar('mod_permissions', in_array('permissions', $moduleOption, true));
154+
$modulesObj->setVar('mod_inroot_copy', in_array('inroot_copy', $moduleOption, true));
157155

158156
if ($tdmcreate->getHandler('modules')->insert($modulesObj)) {
159157
if ($modulesObj->isNew()) {
@@ -167,7 +165,6 @@
167165
$form = $modulesObj->getFormModules();
168166
$GLOBALS['xoopsTpl']->assign('form', $form->render());
169167
break;
170-
171168
case 'edit':
172169
// Define main template
173170
$templateMain = 'tdmcreate_modules.tpl';
@@ -181,7 +178,6 @@
181178
$form = $modulesObj->getFormModules();
182179
$GLOBALS['xoopsTpl']->assign('form', $form->render());
183180
break;
184-
185181
case 'delete':
186182
$modulesObj = $tdmcreate->getHandler('modules')->get($modId);
187183
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
@@ -197,16 +193,15 @@
197193
xoops_confirm(['ok' => 1, 'mod_id' => $modId, 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $modulesObj->getVar('mod_name')));
198194
}
199195
break;
200-
201196
case 'display':
202197
$modFieldArray = ['admin', 'user', 'blocks', 'search', 'comments', 'notifications', 'permissions'];
203198
$id = XoopsRequest::getInt('mod_id', 0, 'POST');
204199
if ($id > 0) {
205200
$modulesObj = $tdmcreate->getHandler('modules')->get($id);
206201
foreach ($modFieldArray as $moduleField) {
207-
if (isset($_POST['mod_'.$moduleField])) {
208-
$modField = $modulesObj->getVar('mod_'.$moduleField);
209-
$modulesObj->setVar('mod_'.$moduleField, !$modField);
202+
if (isset($_POST['mod_' . $moduleField])) {
203+
$modField = $modulesObj->getVar('mod_' . $moduleField);
204+
$modulesObj->setVar('mod_' . $moduleField, !$modField);
210205
}
211206
}
212207
if ($tdmcreate->getHandler('modules')->insert($modulesObj)) {
@@ -217,4 +212,4 @@
217212
break;
218213
}
219214

220-
include __DIR__.'/footer.php';
215+
include __DIR__ . '/footer.php';

‎admin/settings.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @version $Id: 1.59 settings.php 11297 2013-03-24 10:58:10Z timgno $
2323
*/
24-
include __DIR__.'/header.php';
24+
include __DIR__ . '/header.php';
2525
// Recovered value of argument op in the URL $
2626
$op = XoopsRequest::getString('op', 'list');
2727

@@ -41,7 +41,7 @@
4141
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
4242
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
4343
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
44-
$GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL.'/'.$modPathIcon16);
44+
$GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL . '/' . $modPathIcon16);
4545
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
4646
$settingsCount = $tdmcreate->getHandler('settings')->getCountSettings();
4747
$settingsAll = $tdmcreate->getHandler('settings')->getAllSettings($start, $limit);
@@ -53,8 +53,8 @@
5353
unset($setting);
5454
}
5555
if ($settingsCount > $limit) {
56-
include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
57-
$pagenav = new XoopsPageNav($settingsCount, $limit, $start, 'start', 'op=list&limit='.$limit);
56+
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
57+
$pagenav = new XoopsPageNav($settingsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
5858
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
5959
}
6060
} else {
@@ -82,7 +82,7 @@
8282
} else {
8383
$settingsObj = $tdmcreate->getHandler('settings')->create();
8484
}
85-
$setModuleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['set_dirname']));
85+
$setModuleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', mb_strtolower($_POST['set_dirname']));
8686
//Form module save
8787
$settingsObj->setVars([
8888
'set_name' => $_POST['set_name'],
@@ -123,14 +123,14 @@
123123
]
124124
);
125125
$settingOption = XoopsRequest::getArray('setting_option', []);
126-
$settingsObj->setVar('set_admin', in_array('admin', $settingOption));
127-
$settingsObj->setVar('set_user', in_array('user', $settingOption));
128-
$settingsObj->setVar('set_blocks', in_array('blocks', $settingOption));
129-
$settingsObj->setVar('set_search', in_array('search', $settingOption));
130-
$settingsObj->setVar('set_comments', in_array('comments', $settingOption));
131-
$settingsObj->setVar('set_notifications', in_array('notifications', $settingOption));
132-
$settingsObj->setVar('set_permissions', in_array('permissions', $settingOption));
133-
$settingsObj->setVar('set_inroot_copy', in_array('inroot', $settingOption));
126+
$settingsObj->setVar('set_admin', in_array('admin', $settingOption, true));
127+
$settingsObj->setVar('set_user', in_array('user', $settingOption, true));
128+
$settingsObj->setVar('set_blocks', in_array('blocks', $settingOption, true));
129+
$settingsObj->setVar('set_search', in_array('search', $settingOption, true));
130+
$settingsObj->setVar('set_comments', in_array('comments', $settingOption, true));
131+
$settingsObj->setVar('set_notifications', in_array('notifications', $settingOption, true));
132+
$settingsObj->setVar('set_permissions', in_array('permissions', $settingOption, true));
133+
$settingsObj->setVar('set_inroot_copy', in_array('inroot', $settingOption, true));
134134

135135
$settingsObj->setVar('set_type', $_POST['set_type']);
136136

@@ -180,4 +180,4 @@
180180
}
181181
break;
182182
}
183-
include __DIR__.'/footer.php';
183+
include __DIR__ . '/footer.php';

0 commit comments

Comments
 (0)