Inspection of "Merge pull request #3 from mambax7/master" - XoopsModules25x/tools - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 2f6fab...c5b9c9 )

by Goffy

created 2021-06-20 14:10 UTC

Status

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
 use Xmf\Module\Admin;
 use XoopsModules\Tools;
 
-include dirname(__DIR__) . '/preloads/autoloader.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 
 /** @var Tools\Helper $helper */
 
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
 $helper->loadLanguage('feedback');
 
 $pathIcon32 = Admin::menuIconPath('');
-$pathModIcon32 = XOOPS_URL .   '/modules/' . $moduleDirName . '/assets/images/icons/32/';
+$pathModIcon32 = XOOPS_URL.'/modules/'.$moduleDirName.'/assets/images/icons/32/';
 if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
     $pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
 }
@@ -39,25 +39,25 @@  discard block
 block discarded – undo
 $adminmenu[] = [
     'title' => _MI_TOOLS_MENU_HOME,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TOOLS_INDEX,
     'link'  => 'admin/main.php',
-    'icon'  => $pathIcon32 . '/update.png',
+    'icon'  => $pathIcon32.'/update.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TOOLS_BLOCKS,
     'link'  => 'admin/blockscall.php',
-    'icon'  => $pathIcon32 . '/manage.png',
+    'icon'  => $pathIcon32.'/manage.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TOOLS_MENU_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
 ];
 
 //$adminmenu[3]['title'] = _FOO_MI_;

Please login to merge, or discard this patch.

modules/tools/admin/blockscall.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 use Xmf\Request;
 /** @var Helper $helper */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 //loadModuleAdminMenu(2, '');
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
             '604800'  => _WEEK,
             '2592000' => _MONTH,
         ];
-        $cachemodel      = ['0' => _AM_TOOLS_BC_GLOBAL, '1' => _AM_TOOLS_BC_GROUP, '2' => _AM_TOOLS_BC_USER];
+        $cachemodel = ['0' => _AM_TOOLS_BC_GLOBAL, '1' => _AM_TOOLS_BC_GROUP, '2' => _AM_TOOLS_BC_USER];
         foreach ($blockscall_data as $k => $v) {
             $blockscall_data[$k]['mname']         = $generator_list[$v['mid']] ?? 'Not active';
             $blockscall_data[$k]['bcachetime']    = $cachetime[$v['bcachetime']];
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
         $block_data['edit_form'] = $blocksCallObj->getOptions();
 
         $blockoption = !empty($block_data['options']) ? "options=\"{$block_data['options']}\"" : '';
-        $cachetime   = 0 != $block_data['bcachetime'] ? ' cachetime=' . $block_data['bcachetime'] : '';
+        $cachetime   = 0 != $block_data['bcachetime'] ? ' cachetime='.$block_data['bcachetime'] : '';
         if ($cachetime) {
             switch ($block_data['bcachemodel']) {
                 case 0:
@@ -169,11 +169,11 @@  discard block
 block discarded – undo
 {$block_data['tpl_content']}
 <{/xoBlkTpl}>
 EOF;
-        $xoblk    = <<<EOF
+        $xoblk = <<<EOF
 <{xoBlk module="{$block_data['dirname']}" file="{$block_data['func_file']}" show_func="{$block_data['show_func']}" $blockoption template="{$block_data['template']}"$cachetime$cachemodel}>
 EOF;
 
-        require dirname(__DIR__) . '/include/blockform.php';
+        require dirname(__DIR__).'/include/blockform.php';
 
         $xoopsTpl->assign('xoblktpl', $xoblktpl);
         $xoopsTpl->assign('xoblk', $xoblk);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
     case 'edittpl':
         $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);
         $block_data    = $blocksCallObj->getValues(null, 'n');
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new \XoopsThemeForm(_AM_TOOLS_BC_EDITTPL, 'form', 'blockscall.php', 'post', true);
         $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_BLOCK, $block_data['name']));
         $form->addElement(new \XoopsFormTextArea(_AM_TOOLS_BC_TPLSOURCES, 'tpl_content', $block_data['tpl_content'], 10, 80));
@@ -243,6 +243,6 @@  discard block
 block discarded – undo
         }
         break;
 }
-$css = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/tools/templates/style.css">';
+$css = '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/tools/templates/style.css">';
 $xoopsTpl->assign('css', $css);
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Please login to merge, or discard this patch.

modules/tools/config/imageconfig.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -6,8 +6,8 @@  discard block
 block discarded – undo
 // extra module configs
 $modversion['config'][] = [
     'name'        => 'imageConfigs',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC',
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'head',
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
 
 $modversion['config'][] = [
     'name'        => 'imageWidth',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 1200,
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
 
 $modversion['config'][] = [
     'name'        => 'imageHeight',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 800,
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
 
 $modversion['config'][] = [
     'name'        => 'imageUploadPath',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'uploads/' . $modversion['dirname'] . '/images',
+    'default'     => 'uploads/'.$modversion['dirname'].'/images',
 ];
 

Please login to merge, or discard this patch.

modules/tools/config/config.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -20,33 +20,33 @@  discard block
 block discarded – undo
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
-return (object)[
-    'name'           => $moduleDirNameUpper . ' Module Configurator',
+return (object) [
+    'name'           => $moduleDirNameUpper.' Module Configurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 
     'copyTestFolders' => [
         [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
         ],
         //            [
         //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
@@ -83,6 +83,6 @@  discard block
 block discarded – undo
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
     ],
     'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
+                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
 ];
 

Please login to merge, or discard this patch.

modules/tools/config/icons.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -5,17 +5,17 @@
 block discarded – undo
 $pathIcon16    = Admin::iconUrl('', 16);
 $moduleDirName = \basename(\dirname(__DIR__));
 
-return (object)[
-    'name'  => mb_strtoupper($moduleDirName) . ' IconConfigurator',
+return (object) [
+    'name'  => mb_strtoupper($moduleDirName).' IconConfigurator',
     'icons' => [
-        'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-        'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-        'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-        'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-        'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-        'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-        'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-        '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-        '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+        'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+        'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+        'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+        'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+        'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+        'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+        'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+        '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+        '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
     ],
 ];

Please login to merge, or discard this patch.

modules/tools/config/paths.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -6,20 +6,20 @@
 block discarded – undo
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
-return (object)[
-    'name'          => mb_strtoupper($moduleDirName) . ' PathConfigurator',
+return (object) [
+    'name'          => mb_strtoupper($moduleDirName).' PathConfigurator',
     'paths'         => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 ];

Please login to merge, or discard this patch.

modules/tools/include/blockform.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -16,12 +16,12 @@
 block discarded – undo
  * @since           2.00
  * @author          Susheng Yang <[email protected]>
  */
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-$form = new \XoopsForm(_EDIT . _AM_TOOLS_BC_BLOCK, 'form', 'blockscall.php', 'post', true);
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+$form = new \XoopsForm(_EDIT._AM_TOOLS_BC_BLOCK, 'form', 'blockscall.php', 'post', true);
 $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_NAME, $block_data['name']));
 $form->addElement(new \XoopsFormText(_AM_TOOLS_BC_DESCRIPTION, 'desc', 60, 255, $block_data['desciption']));
 if ('' != $block_data['template']) {
-    $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_CONTENT, '<a href="blockscall.php?op=edittpl&amp;bid=' . $block_data['bid'] . '">' . _AM_TOOLS_BC_EDITTPL . '</a>'));
+    $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_CONTENT, '<a href="blockscall.php?op=edittpl&amp;bid='.$block_data['bid'].'">'._AM_TOOLS_BC_EDITTPL.'</a>'));
 }
 if (false !== $block_data['edit_form']) {
     $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_OPTIONS, $block_data['edit_form']));

Please login to merge, or discard this patch.

modules/tools/include/common.php 1 patch

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -18,7 +18,7 @@  discard block
 block discarded – undo
 use Xmf\Module\Admin;
 use XoopsModules\Tools;
 
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -37,20 +37,20 @@  discard block
 block discarded – undo
 //$categoryHandler     = new Tools\CategoryHandler($db);
 //$downloadHandler     = new Tools\DownloadHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', 16);
@@ -59,15 +59,15 @@  discard block
 block discarded – undo
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

Please login to merge, or discard this patch.

modules/tools/include/config.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -20,26 +20,26 @@  discard block
 block discarded – undo
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
-return (object)[
-    'name'           => $moduleDirNameUpper . ' Module Configurator',
+return (object) [
+    'name'           => $moduleDirNameUpper.' Module Configurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 
@@ -79,5 +79,5 @@  discard block
 block discarded – undo
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
     ],
     'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
+                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
 ];

Please login to merge, or discard this patch.

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	use Xmf\Module\Admin;
20	20	use XoopsModules\Tools;
21	21
22		-include dirname(__DIR__) . '/preloads/autoloader.php';
	22	+include dirname(__DIR__).'/preloads/autoloader.php';
23	23
24	24	/** @var Tools\Helper $helper */
25	25
		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	$helper->loadLanguage('feedback');
32	32
33	33	$pathIcon32 = Admin::menuIconPath('');
34		-$pathModIcon32 = XOOPS_URL . '/modules/' . $moduleDirName . '/assets/images/icons/32/';
	34	+$pathModIcon32 = XOOPS_URL.'/modules/'.$moduleDirName.'/assets/images/icons/32/';
35	35	if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
36	36	$pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
37	37	}
		@@ -39,25 +39,25 @@ discard block
		block discarded – undo
39	39	$adminmenu[] = [
40	40	'title' => _MI_TOOLS_MENU_HOME,
41	41	'link' => 'admin/index.php',
42		- 'icon' => $pathIcon32 . '/home.png',
	42	+ 'icon' => $pathIcon32.'/home.png',
43	43	];
44	44
45	45	$adminmenu[] = [
46	46	'title' => _MI_TOOLS_INDEX,
47	47	'link' => 'admin/main.php',
48		- 'icon' => $pathIcon32 . '/update.png',
	48	+ 'icon' => $pathIcon32.'/update.png',
49	49	];
50	50
51	51	$adminmenu[] = [
52	52	'title' => _MI_TOOLS_BLOCKS,
53	53	'link' => 'admin/blockscall.php',
54		- 'icon' => $pathIcon32 . '/manage.png',
	54	+ 'icon' => $pathIcon32.'/manage.png',
55	55	];
56	56
57	57	$adminmenu[] = [
58	58	'title' => _MI_TOOLS_MENU_ABOUT,
59	59	'link' => 'admin/about.php',
60		- 'icon' => $pathIcon32 . '/about.png',
	60	+ 'icon' => $pathIcon32.'/about.png',
61	61	];
62	62
63	63	//$adminmenu[3]['title'] = _FOO_MI_;

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	use Xmf\Request;
22	22	/** @var Helper $helper */
23	23
24		-require_once __DIR__ . '/admin_header.php';
	24	+require_once __DIR__.'/admin_header.php';
25	25	xoops_cp_header();
26	26
27	27	//loadModuleAdminMenu(2, '');
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	'604800' => _WEEK,
62	62	'2592000' => _MONTH,
63	63	];
64		- $cachemodel = ['0' => _AM_TOOLS_BC_GLOBAL, '1' => _AM_TOOLS_BC_GROUP, '2' => _AM_TOOLS_BC_USER];
	64	+ $cachemodel = ['0' => _AM_TOOLS_BC_GLOBAL, '1' => _AM_TOOLS_BC_GROUP, '2' => _AM_TOOLS_BC_USER];
65	65	foreach ($blockscall_data as $k => $v) {
66	66	$blockscall_data[$k]['mname'] = $generator_list[$v['mid']] ?? 'Not active';
67	67	$blockscall_data[$k]['bcachetime'] = $cachetime[$v['bcachetime']];
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	$block_data['edit_form'] = $blocksCallObj->getOptions();
148	148
149	149	$blockoption = !empty($block_data['options']) ? "options=\"{$block_data['options']}\"" : '';
150		- $cachetime = 0 != $block_data['bcachetime'] ? ' cachetime=' . $block_data['bcachetime'] : '';
	150	+ $cachetime = 0 != $block_data['bcachetime'] ? ' cachetime='.$block_data['bcachetime'] : '';
151	151	if ($cachetime) {
152	152	switch ($block_data['bcachemodel']) {
153	153	case 0:
		@@ -169,11 +169,11 @@ discard block
		block discarded – undo
169	169	{$block_data['tpl_content']}
170	170	<{/xoBlkTpl}>
171	171	EOF;
172		- $xoblk = <<<EOF
	172	+ $xoblk = <<<EOF
173	173	<{xoBlk module="{$block_data['dirname']}" file="{$block_data['func_file']}" show_func="{$block_data['show_func']}" $blockoption template="{$block_data['template']}"$cachetime$cachemodel}>
174	174	EOF;
175	175
176		- require dirname(__DIR__) . '/include/blockform.php';
	176	+ require dirname(__DIR__).'/include/blockform.php';
177	177
178	178	$xoopsTpl->assign('xoblktpl', $xoblktpl);
179	179	$xoopsTpl->assign('xoblk', $xoblk);
		@@ -215,7 +215,7 @@ discard block
		block discarded – undo
215	215	case 'edittpl':
216	216	$blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);
217	217	$block_data = $blocksCallObj->getValues(null, 'n');
218		- require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
	218	+ require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
219	219	$form = new \XoopsThemeForm(_AM_TOOLS_BC_EDITTPL, 'form', 'blockscall.php', 'post', true);
220	220	$form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_BLOCK, $block_data['name']));
221	221	$form->addElement(new \XoopsFormTextArea(_AM_TOOLS_BC_TPLSOURCES, 'tpl_content', $block_data['tpl_content'], 10, 80));
		@@ -243,6 +243,6 @@ discard block
		block discarded – undo
243	243	}
244	244	break;
245	245	}
246		-$css = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/tools/templates/style.css">';
	246	+$css = '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/tools/templates/style.css">';
247	247	$xoopsTpl->assign('css', $css);
248		-require_once __DIR__ . '/admin_footer.php';
	248	+require_once __DIR__.'/admin_footer.php';

		@@ -6,8 +6,8 @@ discard block
		block discarded – undo
6	6	// extra module configs
7	7	$modversion['config'][] = [
8	8	'name' => 'imageConfigs',
9		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
10		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
	9	+ 'title' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG',
	10	+ 'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC',
11	11	'formtype' => 'line_break',
12	12	'valuetype' => 'textbox',
13	13	'default' => 'head',
		@@ -15,8 +15,8 @@ discard block
		block discarded – undo
15	15
16	16	$modversion['config'][] = [
17	17	'name' => 'imageWidth',
18		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
19		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
	18	+ 'title' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH',
	19	+ 'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC',
20	20	'formtype' => 'textbox',
21	21	'valuetype' => 'int',
22	22	'default' => 1200,
		@@ -24,8 +24,8 @@ discard block
		block discarded – undo
24	24
25	25	$modversion['config'][] = [
26	26	'name' => 'imageHeight',
27		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
28		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
	27	+ 'title' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT',
	28	+ 'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC',
29	29	'formtype' => 'textbox',
30	30	'valuetype' => 'int',
31	31	'default' => 800,
		@@ -33,10 +33,10 @@ discard block
		block discarded – undo
33	33
34	34	$modversion['config'][] = [
35	35	'name' => 'imageUploadPath',
36		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
37		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
	36	+ 'title' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH',
	37	+ 'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC',
38	38	'formtype' => 'textbox',
39	39	'valuetype' => 'text',
40		- 'default' => 'uploads/' . $modversion['dirname'] . '/images',
	40	+ 'default' => 'uploads/'.$modversion['dirname'].'/images',
41	41	];
42	42

		@@ -20,33 +20,33 @@ discard block
		block discarded – undo
20	20	$moduleDirName = \basename(\dirname(__DIR__));
21	21	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
22	22
23		-return (object)[
24		- 'name' => $moduleDirNameUpper . ' Module Configurator',
	23	+return (object) [
	24	+ 'name' => $moduleDirNameUpper.' Module Configurator',
25	25	'paths' => [
26	26	'dirname' => $moduleDirName,
27		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
28		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
29		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
30		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
31		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	27	+ 'admin' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
	28	+ 'modPath' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
	29	+ 'modUrl' => XOOPS_URL.'/modules/'.$moduleDirName,
	30	+ 'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	31	+ 'uploadUrl' => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
32	32	],
33	33	'uploadFolders' => [
34		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
35		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
36		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	34	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	35	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
	36	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
37	37	//XOOPS_UPLOAD_PATH . '/flags'
38	38	],
39	39	'copyBlankFiles' => [
40		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
41		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
42		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	40	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	41	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
	42	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
43	43	//XOOPS_UPLOAD_PATH . '/flags'
44	44	],
45	45
46	46	'copyTestFolders' => [
47	47	[
48		- XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
49		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	48	+ XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
	49	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
50	50	],
51	51	// [
52	52	// XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
		@@ -83,6 +83,6 @@ discard block
		block discarded – undo
83	83	// 'totalsubmitted' => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
84	84	],
85	85	'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
86		- <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
	86	+ <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
87	87	];
88	88

		@@ -5,17 +5,17 @@
		block discarded – undo
5	5	$pathIcon16 = Admin::iconUrl('', 16);
6	6	$moduleDirName = \basename(\dirname(__DIR__));
7	7
8		-return (object)[
9		- 'name' => mb_strtoupper($moduleDirName) . ' IconConfigurator',
	8	+return (object) [
	9	+ 'name' => mb_strtoupper($moduleDirName).' IconConfigurator',
10	10	'icons' => [
11		- 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>",
12		- 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
13		- 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
14		- 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
15		- 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
16		- 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
17		- 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
18		- '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
19		- '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
	11	+ 'edit' => "<img src='".$pathIcon16."/edit.png' alt="._EDIT."' align='middle'>",
	12	+ 'delete' => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
	13	+ 'clone' => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
	14	+ 'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
	15	+ 'print' => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
	16	+ 'pdf' => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
	17	+ 'add' => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
	18	+ '0' => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
	19	+ '1' => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
20	20	],
21	21	];

		@@ -6,20 +6,20 @@
		block discarded – undo
6	6	$moduleDirName = \basename(\dirname(__DIR__));
7	7	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
8	8
9		-return (object)[
10		- 'name' => mb_strtoupper($moduleDirName) . ' PathConfigurator',
	9	+return (object) [
	10	+ 'name' => mb_strtoupper($moduleDirName).' PathConfigurator',
11	11	'paths' => [
12	12	'dirname' => $moduleDirName,
13		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
14		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
15		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
16		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
17		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	13	+ 'admin' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
	14	+ 'modPath' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
	15	+ 'modUrl' => XOOPS_URL.'/modules/'.$moduleDirName,
	16	+ 'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	17	+ 'uploadUrl' => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
18	18	],
19	19	'uploadFolders' => [
20		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
21		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
22		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	20	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	21	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
	22	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
23	23	//XOOPS_UPLOAD_PATH . '/flags'
24	24	],
25	25	];

		@@ -16,12 +16,12 @@
		block discarded – undo
16	16	* @since 2.00
17	17	* @author Susheng Yang <[email protected]>
18	18	*/
19		-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
20		-$form = new \XoopsForm(_EDIT . _AM_TOOLS_BC_BLOCK, 'form', 'blockscall.php', 'post', true);
	19	+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
	20	+$form = new \XoopsForm(_EDIT._AM_TOOLS_BC_BLOCK, 'form', 'blockscall.php', 'post', true);
21	21	$form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_NAME, $block_data['name']));
22	22	$form->addElement(new \XoopsFormText(_AM_TOOLS_BC_DESCRIPTION, 'desc', 60, 255, $block_data['desciption']));
23	23	if ('' != $block_data['template']) {
24		- $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_CONTENT, '<a href="blockscall.php?op=edittpl&bid=' . $block_data['bid'] . '">' . _AM_TOOLS_BC_EDITTPL . '</a>'));
	24	+ $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_CONTENT, '<a href="blockscall.php?op=edittpl&bid='.$block_data['bid'].'">'._AM_TOOLS_BC_EDITTPL.'</a>'));
25	25	}
26	26	if (false !== $block_data['edit_form']) {
27	27	$form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_OPTIONS, $block_data['edit_form']));

		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	use Xmf\Module\Admin;
19	19	use XoopsModules\Tools;
20	20
21		-require_once dirname(__DIR__) . '/preloads/autoloader.php';
	21	+require_once dirname(__DIR__).'/preloads/autoloader.php';
22	22
23	23	$moduleDirName = \basename(\dirname(__DIR__));
24	24	$moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
		@@ -37,20 +37,20 @@ discard block
		block discarded – undo
37	37	//$categoryHandler = new Tools\CategoryHandler($db);
38	38	//$downloadHandler = new Tools\DownloadHandler($db);
39	39
40		-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
41		- define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
42		- define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
43		- define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
44		- define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
45		- define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
46		- define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
47		- define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
48		- define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
49		- define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
50		- define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
51		- define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
52		- define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
53		- define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
	40	+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
	41	+ define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
	42	+ define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
	43	+ define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
	44	+ define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
	45	+ define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
	46	+ define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
	47	+ define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
	48	+ define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
	49	+ define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
	50	+ define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
	51	+ define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
	52	+ define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
	53	+ define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
54	54	}
55	55
56	56	$pathIcon16 = Admin::iconUrl('', 16);
		@@ -59,15 +59,15 @@ discard block
		block discarded – undo
59	59	//$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
60	60
61	61	$icons = [
62		- 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>",
63		- 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
64		- 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
65		- 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
66		- 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
67		- 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
68		- 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
69		- '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
70		- '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
	62	+ 'edit' => "<img src='".$pathIcon16."/edit.png' alt="._EDIT."' align='middle'>",
	63	+ 'delete' => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
	64	+ 'clone' => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
	65	+ 'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
	66	+ 'print' => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
	67	+ 'pdf' => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
	68	+ 'add' => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
	69	+ '0' => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
	70	+ '1' => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
71	71	];
72	72
73	73	$debug = false;
		@@ -80,12 +80,12 @@ discard block
		block discarded – undo
80	80	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
81	81	}
82	82
83		-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
	83	+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
84	84	// Local icons path
85	85	if (is_object($helper->getModule())) {
86	86	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
87	87	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
88	88
89		- $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
	89	+ $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
90	90	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
91	91	}

		@@ -20,26 +20,26 @@ discard block
		block discarded – undo
20	20	$moduleDirName = \basename(\dirname(__DIR__));
21	21	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
22	22
23		-return (object)[
24		- 'name' => $moduleDirNameUpper . ' Module Configurator',
	23	+return (object) [
	24	+ 'name' => $moduleDirNameUpper.' Module Configurator',
25	25	'paths' => [
26	26	'dirname' => $moduleDirName,
27		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
28		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
29		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
30		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
31		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	27	+ 'admin' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
	28	+ 'modPath' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
	29	+ 'modUrl' => XOOPS_URL.'/modules/'.$moduleDirName,
	30	+ 'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	31	+ 'uploadUrl' => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
32	32	],
33	33	'uploadFolders' => [
34		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
35		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
36		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	34	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	35	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
	36	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
37	37	//XOOPS_UPLOAD_PATH . '/flags'
38	38	],
39	39	'copyBlankFiles' => [
40		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
41		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
42		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	40	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	41	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
	42	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
43	43	//XOOPS_UPLOAD_PATH . '/flags'
44	44	],
45	45
		@@ -79,5 +79,5 @@ discard block
		block discarded – undo
79	79	// 'totalsubmitted' => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
80	80	],
81	81	'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
82		- <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
	82	+ <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
83	83	];

XoopsModules25x / tools

Push — master ( 2f6fab...c5b9c9 )

Status

Category

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch