Skip to content

Commit 43a46b5

Browse files
mambax7mambax7
committed
fixes of class names
1 parent 76124ed commit 43a46b5

23 files changed

Lines changed: 58 additions & 36 deletions

‎_archive/class/AddFiles.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function getFormAddFiles($action = false)
109109
$form = new \XoopsThemeForm($title, 'addfilesform', $action, 'post', true);
110110
$form->setExtra('enctype="multipart/form-data"');
111111

112-
$modules = $this->helper->getHandler('modules')->getObjects(null);
112+
$modules = $this->helper->getHandler('Modules')->getObjects(null);
113113
$modulesSelect = new \XoopsFormSelect(_AM_MODULEBUILDER_ADDFILES_MODULES, 'file_mid', $this->getVar('file_mid'));
114114
$modulesSelect->addOption('', _AM_MODULEBUILDER_ADDFILES_MODULE_SELECT);
115115
foreach ($modules as $mod) {
@@ -147,7 +147,7 @@ public function getAddFilesValues($keys = null, $format = null, $maxDepth = null
147147
$ret = $this->getValues($keys, $format, $maxDepth);
148148
// Values
149149
$ret['id'] = $this->getVar('file_id');
150-
$ret['mid'] = $this->helper->getHandler('modules')->get($this->getVar('file_mid'))->getVar('mod_name');
150+
$ret['mid'] = $this->helper->getHandler('Modules')->get($this->getVar('file_mid'))->getVar('mod_name');
151151
$ret['name'] = $this->getVar('file_name');
152152
$ret['extension'] = $this->getVar('file_extension');
153153
$ret['infolder'] = $this->getVar('file_infolder');

‎_archive/class/Files/User/UserObjects.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function getUrlFileSetVar($moduleDirname, $tableName, $fieldName)
166166
\${$tableName}Obj->setVar('{$fieldName}', formatUrl(\$_REQUEST['{$fieldName}']));\n
167167
// Set Var {$fieldName}
168168
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
169-
\$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}';
169+
\$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/Files/{$tableName}';
170170
\$uploader = new \XoopsMediaUploader(\$uploaddir, \$helper->getConfig('mimetypes_file'),
171171
\$helper->getConfig('maxsize_file'), null, null);
172172
if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) {
@@ -264,7 +264,7 @@ public function getUploadFileSetVar($moduleDirname, $tableName, $fieldName)
264264
$ret = <<<EOT
265265
// Set Var {$fieldName}
266266
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
267-
\$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}';
267+
\$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/Files/{$tableName}';
268268
\$uploader = new \XoopsMediaUploader(\$uploaddir, \$helper->getConfig('mimetypes_file'),
269269
\$helper->getConfig('maxsize_file'), null, null);
270270
if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) {

‎admin/building.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
}
6363
}
6464
// Structure
65-
// include_once TDMC_CLASS_PATH . '/files/Architecture.php';
65+
// include_once TDMC_CLASS_PATH . '/Files/Architecture.php';
6666
$handler = Modulebuilder\Files\CreateArchitecture::getInstance();
6767
// Creation of the structure of folders and files
6868
$baseArchitecture = $handler->setBaseFoldersFiles($moduleObj);

‎admin/index.php‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
* @author Txmod Xoops http://www.txmodxoops.org
2222
*
2323
*/
24+
25+
use XoopsModules\Modulebuilder\Common;
26+
2427
$GLOBALS['xoopsOption']['template_main'] = 'modulebuilder_index.tpl';
2528

2629
include __DIR__ . '/header.php';
@@ -47,12 +50,25 @@
4750
];
4851

4952
// Uploads Folders Created
53+
//foreach (array_keys($folder) as $i) {
54+
// $utility::createFolder($folder[$i]);
55+
// $adminObject->addConfigBoxLine($folder[$i], 'folder');
56+
// $adminObject->addConfigBoxLine([$folder[$i], '777'], 'chmod');
57+
//}
58+
59+
//------ check Upload Folders ---------------
60+
61+
$adminObject->addConfigBoxLine('');
62+
$redirectFile = $_SERVER['SCRIPT_NAME'];
63+
5064
foreach (array_keys($folder) as $i) {
51-
$utility::createFolder($folder[$i]);
52-
$adminObject->addConfigBoxLine($folder[$i], 'folder');
53-
$adminObject->addConfigBoxLine([$folder[$i], '777'], 'chmod');
65+
$adminObject->addConfigBoxLine(Common\DirectoryChecker::getDirectoryStatus($folder[$i], 0777, $redirectFile));
5466
}
5567

68+
//foreach ($pathArray as $path) {
69+
// $adminObject->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path['dir'], $path['perm'], $languageConstants, $path['action']));
70+
//}
71+
5672

5773
$adminObject->displayNavigation(basename(__FILE__));
5874

‎class/Building.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getForm($action = false)
6262
xoops_load('XoopsFormLoader');
6363
$form = new \XoopsThemeForm(_AM_MODULEBUILDER_ADMIN_CONST, 'buildform', $action, 'post', true);
6464
$form->setExtra('enctype="multipart/form-data"');
65-
$moduleObj = $helper->getHandler('modules')->getObjects(null);
65+
$moduleObj = $helper->getHandler('Modules')->getObjects(null);
6666
$mod_select = new \XoopsFormSelect(_AM_MODULEBUILDER_CONST_MODULES, 'mod_id', 'mod_id');
6767
$mod_select->addOption('', _AM_MODULEBUILDER_BUILD_MODSELOPT);
6868
foreach ($moduleObj as $mod) {

‎class/Common/DirectoryChecker.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class DirectoryChecker
4545
*/
4646
public static function getDirectoryStatus($path, $mode = 0777, $redirectFile = null)
4747
{
48-
global $pathIcon16;
48+
$pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
4949

5050
if (empty($path)) {
5151
return false;

‎class/Common/FileChecker.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class FileChecker
4444
*/
4545
public static function getFileStatus($file_path, $original_file_path = null, $redirectFile)
4646
{
47-
global $pathIcon16;
47+
$pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
4848

4949
if (empty($file_path)) {
5050
return false;

‎class/Files/Classes/ClassFiles.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private function getClassObject($module, $table, $fields)
180180
$fieldName = $fields[$f]->getVar('field_name');
181181
$fieldElement = $fields[$f]->getVar('field_element');
182182
$fieldInForm[] = $fields[$f]->getVar('field_inform');
183-
$fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);
183+
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
184184
$fieldElementId[] = $fieldElements->getVar('fieldelement_id');
185185
$rpFieldName = $this->getRightString($fieldName);
186186
if (in_array(5, $fieldElementId)) {
@@ -430,7 +430,7 @@ private function getValuesInObject($moduleDirname, $table, $fields)
430430
$getValues .= $xc->getXcFormatTimeStamp("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", 'm', "\t\t");
431431
break;
432432
default:
433-
$fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);
433+
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
434434
$fieldElementTid = $fieldElements->getVar('fieldelement_tid');
435435
if ((int)$fieldElementTid > 0 ) {
436436
$fieldElementMid = $fieldElements->getVar('fieldelement_mid');
@@ -517,7 +517,7 @@ private function getOptionsCheck($table)
517517
$fieldName = $fields[$f]->getVar('field_name');
518518
$fieldElement = $fields[$f]->getVar('field_element');
519519

520-
$fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);
520+
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
521521
$fieldElementId = $fieldElements->getVar('fieldelement_id');
522522
$rpFieldName = $this->getRightString($fieldName);
523523
if (5 == $fieldElementId) {

‎class/Files/Classes/ClassFormElements.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ private function getXoopsFormTable($language,$fieldName, $fieldElement, $require
797797

798798
$t = "\t\t";
799799
$ret = '';
800-
$fElement = $tc->getHandler('fieldelements')->get($fieldElement);
800+
$fElement = $tc->getHandler('Fieldelements')->get($fieldElement);
801801
$rpFieldelementName = mb_strtolower(str_replace('Table : ', '', $fElement->getVar('fieldelement_name')));
802802
$ret .= $pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t);
803803
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
@@ -910,7 +910,7 @@ public function renderElements()
910910
$language = $languageFunct . mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
911911
$required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : '';
912912

913-
$fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);
913+
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
914914
$fieldElementId[] = $fieldElements->getVar('fieldelement_id');
915915

916916
if (1 == $fieldInForm) {
@@ -994,7 +994,7 @@ public function renderElements()
994994
break;
995995
}
996996

997-
$fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);
997+
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
998998
$fieldElementTid = $fieldElements->getVar('fieldelement_tid');
999999
if ((int)$fieldElementTid > 0 ) {
10001000
if ((1 == $fieldParent) || 1 == $table->getVar('table_category')) {

‎class/Files/Classes/ClassHandlerFiles.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ private function getClassByCategory($moduleDirname, $tableName, $tableFieldName,
233233
$pc = Modulebuilder\Files\CreatePhpCode::getInstance();
234234
$xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
235235
$ucfTableName = ucfirst($tableName);
236-
$fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);
236+
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
237237
$fieldElementName = $fieldElements->getVar('fieldelement_name');
238238
$fieldNameDesc = ucfirst(mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)));
239239
$topicTableName = str_replace(': ', '', $fieldNameDesc);
@@ -354,7 +354,7 @@ public function render()
354354
}
355355
$fieldElement = $fields[$f]->getVar('field_element');
356356

357-
$fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);
357+
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
358358
$fieldElementId[] = $fieldElements->getVar('fieldelement_id');
359359
}
360360
$namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]);

0 commit comments

Comments
 (0)