Skip to content

Commit 7301c55

Browse files
ggoffyggoffy
committed
rebuild blocks file
splitted CreateHtmlSmartycodes into CreateHtmlcode/CreateSmartycode for better handling
1 parent 7db2ad5 commit 7301c55

109 files changed

Lines changed: 3311 additions & 935 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.

class/Files/CreateHtmlSmartyCodes.php renamed to _archive/class/Files/CreateHtmlSmartyCodes.php

File renamed without changes.

‎class/Files/Admin/AdminHeader.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ private function getAdminHeader($moduleDirname)
104104
$ret .= $this->xc->getXcEqualsOperator('$sysPathIcon16 ', "'../' . {$sysicons16}");
105105
$ret .= $this->xc->getXcEqualsOperator('$sysPathIcon32 ', "'../' . {$sysicons32}");
106106
$ret .= $this->xc->getXcEqualsOperator('$pathModuleAdmin', $dirmoduleadmin);
107-
$ret .= $this->xc->getXcEqualsOperator('$modPathIcon16 ', $modicons16);
108-
$ret .= $this->xc->getXcEqualsOperator('$modPathIcon32 ', $modicons32);
107+
$ret .= $this->xc->getXcEqualsOperator('$modPathIcon16 ', "{$stuModuleDirname}_URL . '/' . {$modicons16} . '/'");
108+
$ret .= $this->xc->getXcEqualsOperator('$modPathIcon32 ', "{$stuModuleDirname}_URL . '/' . {$modicons32} . '/'");
109109
if (is_object($table) && '' != $table->getVar('table_name')) {
110110
$ret .= $this->pc->getBlankLine();
111111
$ret .= $this->pc->getPhpCodeCommentLine('Get instance of module');
@@ -122,11 +122,6 @@ private function getAdminHeader($moduleDirname)
122122
$template = $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/template', true, false, 'include', "\t");
123123
$template .= $this->xc->getXcEqualsOperator('$xoopsTpl', 'new \XoopsTpl()', null, false, "\t");
124124
$ret .= $this->pc->getPhpCodeConditions('!isset($xoopsTpl)', ' || ', '!is_object($xoopsTpl)', $template, false);
125-
$ret .= $this->pc->getPhpCodeCommentLine('System icons path');
126-
$ret .= $this->xc->getXcTplAssign('sysPathIcon16', '$sysPathIcon16');
127-
$ret .= $this->xc->getXcTplAssign('sysPathIcon32', '$sysPathIcon32');
128-
$ret .= $this->xc->getXcTplAssign('modPathIcon16', '$modPathIcon16');
129-
$ret .= $this->xc->getXcTplAssign('modPathIcon32', '$modPathIcon32');
130125
$ret .= $this->pc->getBlankLine();
131126
$ret .= $this->pc->getPhpCodeCommentLine('Load languages');
132127
$ret .= $this->xc->getXcLoadLanguage('admin');
@@ -141,6 +136,13 @@ private function getAdminHeader($moduleDirname)
141136
$ret .= $this->pc->getPhpCodeConditions($fileExists, '', '', $moduleadmin, $redirectHeader);
142137
$ret .= $this->pc->getBlankLine();
143138
$ret .= $this->xc->getXcCPHeader();
139+
$ret .= $this->pc->getBlankLine();
140+
$ret .= $this->pc->getPhpCodeCommentLine('System icons path');
141+
$ret .= $this->xc->getXcTplAssign('sysPathIcon16', '$sysPathIcon16');
142+
$ret .= $this->xc->getXcTplAssign('sysPathIcon32', '$sysPathIcon32');
143+
$ret .= $this->xc->getXcTplAssign('modPathIcon16', '$modPathIcon16');
144+
$ret .= $this->xc->getXcTplAssign('modPathIcon32', '$modPathIcon32');
145+
$ret .= $this->pc->getBlankLine();
144146
$ret .= $this->xc->getXcEqualsOperator('$adminObject', '\Xmf\Module\Admin::getInstance()');
145147
$ret .= $this->getSimpleString("\$style = {$stuModuleDirname}_URL . '/assets/css/admin/style.css';");
146148

‎class/Files/Admin/AdminIndex.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private function getAdminIndex($module)
121121
$ret .= $pc->getPhpCodeCommentLine('Upload Folders');
122122
$ret .= $xc->getXcEqualsOperator('$configurator', 'new Common\Configurator()');
123123
$cond = '$configurator->uploadFolders && is_array($configurator->uploadFolders)';
124-
$fe_action = $xc->getXcEqualsOperator('$folder[]', '$configurator->uploadFolders[$i]', '','', "\t");
124+
$fe_action = $xc->getXcEqualsOperator('$folder[]', '$configurator->uploadFolders[$i]', '','', "\t\t");
125125
$condIf = $pc->getPhpCodeForeach('configurator->uploadFolders', true, false, 'i', $fe_action, "\t");
126126
$ret .= $pc->getPhpCodeConditions($cond, '', '', $condIf, false);
127127

‎class/Files/Admin/AdminPermissions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private function getPermissionsBody($module, $language)
190190
$ret = $xc->getXcGetVar('moduleId', 'xoopsModule', 'mid');
191191
$ret .= $xc->getXcGroupPermForm('permform', '$formTitle', '$moduleId', '$permName', '$permDesc', "'admin/permissions.php'");
192192
$ret .= $xc->getXcEqualsOperator('$permFound', 'false');
193-
$foreach1 = $xc->getXcAddItem('permform', '$gPermId', '$gPermName', "\t");
193+
$foreach1 = $xc->getXcAddItem('permform', '$gPermId', '$gPermName', "\t\t");
194194
$if1 = $pc->getPhpCodeForeach('globalPerms', false, 'gPermId', 'gPermName', $foreach1, "\t");
195195
$if1 .= $xc->getXcTplAssign('form', '$permform->render()', true, "\t");
196196
$if1 .= $xc->getXcEqualsOperator('$permFound', 'true', null, false, "\t");
@@ -216,7 +216,7 @@ private function getPermissionsBody($module, $language)
216216
$if_count = $xc->getXcObjHandlerAll($tableName, $fieldMain, 0, 0, "\t\t");
217217
$getVar1 = $xc->getXcGetVar('', "{$tableName}All[\$i]", $fieldId, true);
218218
$getVar2 = $xc->getXcGetVar('', "{$tableName}All[\$i]", $fieldMain, true);
219-
$fe_content = $xc->getXcAddItem('permform', $getVar1, $getVar2, "\t");
219+
$fe_content = $xc->getXcAddItem('permform', $getVar1, $getVar2, "\t\t\t");
220220
$if_table = $xc->getXcObjHandlerCount($tableName, "\t");
221221
$if_count .= $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $fe_content, "\t\t");
222222
$if_count .= $xc->getXcTplAssign('form', '$permform->render()', true, "\t\t");

0 commit comments

Comments
 (0)