Skip to content

Commit 6b7a6d0

Browse files
txmodxoopstxmodxoops
authored
Merge pull request #133 from txmodxoops/dev
Fixes, updates & indentation
2 parents aa47946 + dd188e7 commit 6b7a6d0

120 files changed

Lines changed: 439 additions & 800 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.

‎admin/about.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
*
2222
* @version $Id: about.php 11084 2013-02-23 15:44:20Z timgno $
2323
*/
24-
include __DIR__ .'/header.php';
24+
include __DIR__.'/header.php';
2525
$templateMain = 'tdmcreate_about.tpl';
2626
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->displayNavigation('about.php'));
2727
$about = $adminMenu->renderAbout($adminMenu->setPaypal('7LFE862PGJN88'), false);
2828
$aboutRes = TDMCreate_MakeDonationForm($about);
2929
$GLOBALS['xoopsTpl']->assign('maintained', sprintf(_AM_TDMCREATE_MAINTAINED, $GLOBALS['xoopsModule']->getVar('name')));
3030
$GLOBALS['xoopsTpl']->assign('about', $aboutRes);
31-
include __DIR__ .'/footer.php';
31+
include __DIR__.'/footer.php';

‎admin/addfiles.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
*
2222
* @version $Id: 1.59 addfiles.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');
27-
//
27+
2828
$fileId = XoopsRequest::getInt('file_id');
29-
//
29+
3030
switch ($op) {
3131
case 'list':
3232
default:
@@ -140,4 +140,4 @@
140140
break;
141141
}
142142

143-
include __DIR__ .'/footer.php';
143+
include __DIR__.'/footer.php';

‎admin/building.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
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);
@@ -45,7 +45,7 @@
4545
$toDir = XOOPS_ROOT_PATH.'/modules/'.strtolower($moduleDirname);
4646
include_once TDMC_CLASS_PATH.'/building.php';
4747
if (isset($moduleDirname)) {
48-
// Clear this module if it's in repository
48+
// Clear this module if it's in repository
4949
$building = TDMCreateBuilding::getInstance();
5050
if (is_dir($fromDir)) {
5151
$building->clearDir($fromDir);
@@ -78,9 +78,9 @@
7878
$building = TDMCreateBuilding::getInstance();
7979
if (isset($moduleDirname)) {
8080
// Clear this module if it's in root/modules
81-
// Warning: If you have an older operating module with the same name,
82-
// it's good to make a copy in another safe folder,
83-
// otherwise it will be deleted irreversibly.
81+
// Warning: If you have an older operating module with the same name,
82+
// it's good to make a copy in another safe folder,
83+
// otherwise it will be deleted irreversibly.
8484
if (is_dir($fromDir)) {
8585
$building->clearDir($toDir);
8686
}
@@ -105,4 +105,4 @@
105105
$GLOBALS['xoopsTpl']->assign('form', $form->render());
106106
break;
107107
}
108-
include __DIR__ .'/footer.php';
108+
include __DIR__.'/footer.php';

‎admin/fields.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
2323
*/
24-
include __DIR__ .'/header.php';
24+
include __DIR__.'/header.php';
2525
// Recovered value of arguments op in the URL $
2626
$op = XoopsRequest::getString('op', 'list');
2727
// Get fields Variables
@@ -107,13 +107,13 @@
107107
$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');
108108
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
109109
// Form Add
110-
$fieldsObj = &$tdmcreate->getHandler('fields')->create();
110+
$fieldsObj = $tdmcreate->getHandler('fields')->create();
111111
$form = $fieldsObj->getFormNew($fieldMid, $fieldTid, $fieldNumb, $fieldName);
112112
$GLOBALS['xoopsTpl']->assign('form', $form->render());
113113
break;
114114

115115
case 'save':
116-
//
116+
117117
if (!$GLOBALS['xoopsSecurity']->check()) {
118118
redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
119119
}
@@ -124,9 +124,9 @@
124124
// Set Variables
125125
foreach ($_POST['field_id'] as $key => $value) {
126126
if (isset($value)) {
127-
$fieldsObj = &$fields->get($value);
127+
$fieldsObj = $fields->get($value);
128128
} else {
129-
$fieldsObj = &$fields->create();
129+
$fieldsObj = $fields->create();
130130
}
131131
$order = $fieldsObj->isNew() ? $fieldOrder : $_GET['field_order'][$key];
132132
// Set Data
@@ -159,7 +159,7 @@
159159
}
160160
unset($fieldOrder);
161161
// Get table name from field table id
162-
$tables = &$tdmcreate->getHandler('tables')->get($fieldTid);
162+
$tables = $tdmcreate->getHandler('tables')->get($fieldTid);
163163
$tableName = $tables->getVar('table_name');
164164
// Set field elements
165165
if ($fieldsObj->isNew()) {
@@ -169,7 +169,7 @@
169169
// Redirect to field.php if updated - (Needed code from table name by field_tid)
170170
redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_UPDATED_OK, $tableName));
171171
}
172-
//
172+
173173
$GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
174174
$form = $fieldsObj->getFormNew($fieldMid, $fieldTid);
175175
$GLOBALS['xoopsTpl']->assign('form', $form->render());
@@ -213,7 +213,7 @@
213213
break;
214214

215215
case 'delete':
216-
$tablesObj = &$tdmcreate->getHandler('tables')->get($fieldTid);
216+
$tablesObj = $tdmcreate->getHandler('tables')->get($fieldTid);
217217
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
218218
if (!$GLOBALS['xoopsSecurity']->check()) {
219219
redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -246,4 +246,4 @@
246246
}
247247
break;
248248
}
249-
include __DIR__ .'/footer.php';
249+
include __DIR__.'/footer.php';

‎admin/header.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
2-
32
/*
43
You may not change or alter any portion of this comment or credits
54
of supporting developers from this source code or any supporting source code
@@ -9,7 +8,7 @@
98
but WITHOUT ANY WARRANTY; without even the implied warranty of
109
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1110
*/
12-
use Xmf\Request;
11+
1312
/**
1413
* tdmcreate module.
1514
*
@@ -24,7 +23,7 @@
2423
*/
2524
include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
2625
include_once dirname(__DIR__).'/include/common.php';
27-
//
26+
2827
$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
2928
// Link System Icons
3029
$sysPathIcon16 = $GLOBALS['xoopsModule']->getInfo('sysicons16');
@@ -50,7 +49,6 @@
5049
// Load languages
5150
xoops_loadLanguage('admin', $thisDirname);
5251
xoops_loadLanguage('modinfo', $thisDirname);
53-
xoops_loadLanguage('main', $thisDirname);
5452

5553
xoops_cp_header();
5654
$adminMenu = \Xmf\Module\Admin::getInstance();

‎admin/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @version $Id: index.php 11084 2013-02-23 15:44:20Z timgno $
2323
*/
24-
include __DIR__ .'/header.php';
24+
include __DIR__.'/header.php';
2525
$countSettings = $tdmcreate->getHandler('settings')->getCount();
2626
$countModules = $tdmcreate->getHandler('modules')->getCount();
2727
$countTables = $tdmcreate->getHandler('tables')->getCount();
@@ -51,4 +51,4 @@
5151

5252
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->displayNavigation('index.php'));
5353
$GLOBALS['xoopsTpl']->assign('index', $adminMenu->renderIndex());
54-
include __DIR__ .'/footer.php';
54+
include __DIR__.'/footer.php';

‎admin/modules.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
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');
27-
//
27+
2828
$modId = XoopsRequest::getInt('mod_id');
29-
//
29+
3030
switch ($op) {
3131
case 'list':
3232
default:
@@ -83,9 +83,9 @@
8383
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
8484
}
8585
if (isset($modId)) {
86-
$modulesObj = &$tdmcreate->getHandler('modules')->get($modId);
86+
$modulesObj = $tdmcreate->getHandler('modules')->get($modId);
8787
} else {
88-
$modulesObj = &$tdmcreate->getHandler('modules')->create();
88+
$modulesObj = $tdmcreate->getHandler('modules')->create();
8989
}
9090
$moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['mod_dirname']));
9191
//Form module save
@@ -156,7 +156,7 @@
156156
}
157157

158158
$GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors());
159-
$form = &$modulesObj->getFormModules();
159+
$form = $modulesObj->getFormModules();
160160
$GLOBALS['xoopsTpl']->assign('form', $form->render());
161161
break;
162162

@@ -175,7 +175,7 @@
175175
break;
176176

177177
case 'delete':
178-
$modulesObj = &$tdmcreate->getHandler('modules')->get($modId);
178+
$modulesObj = $tdmcreate->getHandler('modules')->get($modId);
179179
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
180180
if (!$GLOBALS['xoopsSecurity']->check()) {
181181
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -209,4 +209,4 @@
209209
break;
210210
}
211211

212-
include __DIR__ .'/footer.php';
212+
include __DIR__.'/footer.php';

‎admin/morefiles.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
*
2222
* @version $Id: 1.59 morefiles.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');
27-
//
27+
2828
$fileId = XoopsRequest::getInt('file_id');
29-
//
29+
3030
switch ($op) {
3131
case 'list':
3232
default:
@@ -75,7 +75,7 @@
7575
$adminMenu->addItemButton(_AM_TDMCREATE_MORE_FILES_LIST, 'morefiles.php', 'list');
7676
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
7777

78-
$morefilesObj = &$tdmcreate->getHandler('morefiles')->create();
78+
$morefilesObj = $tdmcreate->getHandler('morefiles')->create();
7979
$form = $morefilesObj->getFormMoreFiles();
8080
$GLOBALS['xoopsTpl']->assign('form', $form->render());
8181
break;
@@ -85,9 +85,9 @@
8585
redirect_header('morefiles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
8686
}
8787
if (isset($fileId)) {
88-
$morefilesObj = &$tdmcreate->getHandler('morefiles')->get($fileId);
88+
$morefilesObj = $tdmcreate->getHandler('morefiles')->get($fileId);
8989
} else {
90-
$morefilesObj = &$tdmcreate->getHandler('morefiles')->create();
90+
$morefilesObj = $tdmcreate->getHandler('morefiles')->create();
9191
}
9292
// Form file save
9393
$morefilesObj->setVars(array(
@@ -105,7 +105,7 @@
105105
}
106106

107107
$GLOBALS['xoopsTpl']->assign('error', $morefilesObj->getHtmlErrors());
108-
$form = &$morefilesObj->getFormMoreFiles();
108+
$form = $morefilesObj->getFormMoreFiles();
109109
$GLOBALS['xoopsTpl']->assign('form', $form->render());
110110
break;
111111

@@ -124,7 +124,7 @@
124124
break;
125125

126126
case 'delete':
127-
$morefilesObj = &$tdmcreate->getHandler('morefiles')->get($fileId);
127+
$morefilesObj = $tdmcreate->getHandler('morefiles')->get($fileId);
128128
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
129129
if (!$GLOBALS['xoopsSecurity']->check()) {
130130
redirect_header('morefiles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -140,4 +140,4 @@
140140
break;
141141
}
142142

143-
include __DIR__ .'/footer.php';
143+
include __DIR__.'/footer.php';

‎admin/settings.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
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');
27-
//
27+
2828
$setId = XoopsRequest::getInt('set_id');
29-
//
29+
3030
switch ($op) {
3131
case 'list':
3232
default:
@@ -177,4 +177,4 @@
177177
}
178178
break;
179179
}
180-
include __DIR__ .'/footer.php';
180+
include __DIR__.'/footer.php';

0 commit comments

Comments
 (0)