XoopsModules25x / tools

modules/tools/admin/about.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
  * @license      GNU GPL 2 or later (https://www.gnu.org/licenses/gpl-2.0.html)

  * @author       XOOPS Development Team

  */

-require_once __DIR__ . '/admin_header.php';

+require_once __DIR__.'/admin_header.php';

 xoops_cp_header();

 

 /** @var Admin $adminObject */

@@ -22,4 +22,4 @@ 
 $adminObject::setPaypal('xoopsfoundation@gmail.com');

 $adminObject->displayAbout(false);

 

-require_once __DIR__ . '/admin_footer.php';

+require_once __DIR__.'/admin_footer.php';

modules/tools/admin/menu.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 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 @@ 
 $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 @@ 
 $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_;

modules/tools/admin/blockscall.php

Switch Indentation +179 added lines, -179 removed lines

@@ -31,135 +31,135 @@ 
 $op                = $_REQUEST['op'] ?? 'list';

 $blocksCallHandler = $helper->getHandler('BlocksCall');

 switch ($op) {

-    default:

-    case 'list':

-        /** @var \XoopsModuleHandler $moduleHandler */

-        $moduleHandler   = xoops_getHandler('module');

-        $criteria        = new \Criteria('isactive', 1);

-        $generator_list  = $moduleHandler->getList($criteria);

-        $fields          = [

-            'bid',

-            'mid',

-            'name',

-            'title',

-            'desciption',

-            'bcachetime',

-            'bcachemodel',

-            'last_modified',

-        ];

-        $blockscall_data = $blocksCallHandler->getAll(null, $fields, false, false);

-        $cachetime       = [

-            '0'       => _NOCACHE,

-            '30'      => sprintf(_SECONDS, 30),

-            '60'      => _MINUTE,

-            '300'     => sprintf(_MINUTES, 5),

-            '1800'    => sprintf(_MINUTES, 30),

-            '3600'    => _HOUR,

-            '18000'   => sprintf(_HOURS, 5),

-            '86400'   => _DAY,

-            '259200'  => sprintf(_DAYS, 3),

-            '604800'  => _WEEK,

-            '2592000' => _MONTH,

-        ];

-        $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']];

-            $blockscall_data[$k]['bcachemodel']   = $cachemodel[$v['bcachemodel']];

-            $blockscall_data[$k]['last_modified'] = formatTimestamp($v['last_modified']);

+default:

+case 'list':

+    /** @var \XoopsModuleHandler $moduleHandler */

+    $moduleHandler   = xoops_getHandler('module');

+    $criteria        = new \Criteria('isactive', 1);

+    $generator_list  = $moduleHandler->getList($criteria);

+    $fields          = [

+        'bid',

+        'mid',

+        'name',

+        'title',

+        'desciption',

+        'bcachetime',

+        'bcachemodel',

+        'last_modified',

+    ];

+    $blockscall_data = $blocksCallHandler->getAll(null, $fields, false, false);

+    $cachetime       = [

+        '0'       => _NOCACHE,

+        '30'      => sprintf(_SECONDS, 30),

+        '60'      => _MINUTE,

+        '300'     => sprintf(_MINUTES, 5),

+        '1800'    => sprintf(_MINUTES, 30),

+        '3600'    => _HOUR,

+        '18000'   => sprintf(_HOURS, 5),

+        '86400'   => _DAY,

+        '259200'  => sprintf(_DAYS, 3),

+        '604800'  => _WEEK,

+        '2592000' => _MONTH,

+    ];

+    $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']];

+        $blockscall_data[$k]['bcachemodel']   = $cachemodel[$v['bcachemodel']];

+        $blockscall_data[$k]['last_modified'] = formatTimestamp($v['last_modified']);

+    }

+    $template_main = 'tools_admin_blockscall.tpl';

+    $xoopsTpl->assign('bc_data', $blockscall_data);

+    break;

+case 'new':

+    // Modules for blocks to be visible in

+    /** @var \XoopsModuleHandler $moduleHandler */

+    $moduleHandler  = xoops_getHandler('module');

+    $criteria       = new \Criteria('isactive', 1);

+    $generator_list = $moduleHandler->getList($criteria);

+    unset($criteria);

+    $generator_list[-1] = _AM_TOOLS_BC_ALLTYPES;

+    ksort($generator_list);

+    $selgen = Request::getInt('selgen', -1, 'GET');

+

+    //get blocks

+    $criteria = new \CriteriaCompo(new \Criteria('mid', 0, '!='));

+    if (-1 != $selgen) {

+        $criteria->add(new \Criteria('mid', $selgen));

+    }

+    $fields        = ['bid', 'mid', 'name', 'title'];

+    $blocksHandler = $helper->getHandler('XoopsBlock');

+    $blocks_array  = $blocksHandler->getAll($criteria, $fields, false, false);

+    foreach ($blocks_array as $k => $v) {

+        $blocks_array[$k]['mname'] = $generator_list[$v['mid']] ?? 'Not active';

+    }

+    unset($criteria);

+

+    $xoopsTpl->assign('selgen', $selgen);

+    $xoopsTpl->assign('moduleslist', $generator_list);

+    $xoopsTpl->assign('blocks', $blocks_array);

+    $template_main = 'tools_admin_blockscall_new.tpl';

+    break;

+case 'create':

+

+    $blocksHandler = $helper->getHandler('XoopsBlock');

+    $block_obj     = $blocksHandler->get($_GET['bid']);

+    $o_block       = $block_obj->getValues();

+

+    if ('' != $o_block['template']) {

+        /** @var \XoopsTplfileHandler $tplfileHandler */

+        $tplfileHandler = xoops_getHandler('tplfile');

+        $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $o_block['bid'], '', '', true);

+        if (count($btemplate) > 0) {

+            $tpl_source = $btemplate[0]->getVar('tpl_source', 'n');

+        } else {

+            $btemplate2 = $tplfileHandler->find('default', 'block', $o_block['bid'], '', '', true);

+            if (count($btemplate2) > 0) {

+                $tpl_source = $btemplate2[0]->getVar('tpl_source', 'n');

+            }

         }

-        $template_main = 'tools_admin_blockscall.tpl';

-        $xoopsTpl->assign('bc_data', $blockscall_data);

+    }

+

+    $blocksCallObj = $blocksCallHandler->create();

+    $blocksCallObj->setVar('bid', $o_block['bid']);

+    $blocksCallObj->setVar('mid', $o_block['mid']);

+    $blocksCallObj->setVar('options', $o_block['options']);

+    $blocksCallObj->setVar('name', $o_block['name']);

+    $blocksCallObj->setVar('title', $o_block['title']);

+    $blocksCallObj->setVar('content', $o_block['content']);

+    $blocksCallObj->setVar('dirname', $o_block['dirname']);

+    $blocksCallObj->setVar('func_file', $o_block['func_file']);

+    $blocksCallObj->setVar('show_func', $o_block['show_func']);

+    $blocksCallObj->setVar('edit_func', $o_block['edit_func']);

+    $blocksCallObj->setVar('template', $o_block['template']);

+    $blocksCallObj->setVar('tpl_content', $tpl_source);

+    $blocksCallObj->setVar('bcachetime', $o_block['bcachetime']);

+    $blocksCallObj->setVar('last_modified', time());

+    if ($blocksCallHandler->insert($blocksCallObj)) {

+        redirect_header("blockscall.php?op=edit&bid={$blocksCallObj->getVar('bid')}", 3, sprintf(_AM_TOOLS_BC_CREATESUCCESS, $blocksCallObj->getVar('name')));

+    }

+

+    break;

+case 'edit':

+

+    $blocksCallObj           = $blocksCallHandler->get($_GET['bid']);

+    $block_data              = $blocksCallObj->getValues(null, 'n');

+    $block_data['edit_form'] = $blocksCallObj->getOptions();

+

+    $blockoption = !empty($block_data['options']) ? "options=\"{$block_data['options']}\"" : '';

+    $cachetime   = 0 != $block_data['bcachetime'] ? ' cachetime=' . $block_data['bcachetime'] : '';

+    if ($cachetime) {

+        switch ($block_data['bcachemodel']) {

+        case 0:

+        $cachemodel = ' cachemodel=global';

         break;

-    case 'new':

-        // Modules for blocks to be visible in

-        /** @var \XoopsModuleHandler $moduleHandler */

-        $moduleHandler  = xoops_getHandler('module');

-        $criteria       = new \Criteria('isactive', 1);

-        $generator_list = $moduleHandler->getList($criteria);

-        unset($criteria);

-        $generator_list[-1] = _AM_TOOLS_BC_ALLTYPES;

-        ksort($generator_list);

-        $selgen = Request::getInt('selgen', -1, 'GET');

-

-        //get blocks

-        $criteria = new \CriteriaCompo(new \Criteria('mid', 0, '!='));

-        if (-1 != $selgen) {

-            $criteria->add(new \Criteria('mid', $selgen));

-        }

-        $fields        = ['bid', 'mid', 'name', 'title'];

-        $blocksHandler = $helper->getHandler('XoopsBlock');

-        $blocks_array  = $blocksHandler->getAll($criteria, $fields, false, false);

-        foreach ($blocks_array as $k => $v) {

-            $blocks_array[$k]['mname'] = $generator_list[$v['mid']] ?? 'Not active';

-        }

-        unset($criteria);

-

-        $xoopsTpl->assign('selgen', $selgen);

-        $xoopsTpl->assign('moduleslist', $generator_list);

-        $xoopsTpl->assign('blocks', $blocks_array);

-        $template_main = 'tools_admin_blockscall_new.tpl';

+        case 1:

+        $cachemodel = ' cachemodel=$xoopsUser->getGroups()';

         break;

-    case 'create':

-

-        $blocksHandler = $helper->getHandler('XoopsBlock');

-        $block_obj     = $blocksHandler->get($_GET['bid']);

-        $o_block       = $block_obj->getValues();

-

-        if ('' != $o_block['template']) {

-            /** @var \XoopsTplfileHandler $tplfileHandler */

-            $tplfileHandler = xoops_getHandler('tplfile');

-            $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $o_block['bid'], '', '', true);

-            if (count($btemplate) > 0) {

-                $tpl_source = $btemplate[0]->getVar('tpl_source', 'n');

-            } else {

-                $btemplate2 = $tplfileHandler->find('default', 'block', $o_block['bid'], '', '', true);

-                if (count($btemplate2) > 0) {

-                    $tpl_source = $btemplate2[0]->getVar('tpl_source', 'n');

-                }

-            }

-        }

-

-        $blocksCallObj = $blocksCallHandler->create();

-        $blocksCallObj->setVar('bid', $o_block['bid']);

-        $blocksCallObj->setVar('mid', $o_block['mid']);

-        $blocksCallObj->setVar('options', $o_block['options']);

-        $blocksCallObj->setVar('name', $o_block['name']);

-        $blocksCallObj->setVar('title', $o_block['title']);

-        $blocksCallObj->setVar('content', $o_block['content']);

-        $blocksCallObj->setVar('dirname', $o_block['dirname']);

-        $blocksCallObj->setVar('func_file', $o_block['func_file']);

-        $blocksCallObj->setVar('show_func', $o_block['show_func']);

-        $blocksCallObj->setVar('edit_func', $o_block['edit_func']);

-        $blocksCallObj->setVar('template', $o_block['template']);

-        $blocksCallObj->setVar('tpl_content', $tpl_source);

-        $blocksCallObj->setVar('bcachetime', $o_block['bcachetime']);

-        $blocksCallObj->setVar('last_modified', time());

-        if ($blocksCallHandler->insert($blocksCallObj)) {

-            redirect_header("blockscall.php?op=edit&bid={$blocksCallObj->getVar('bid')}", 3, sprintf(_AM_TOOLS_BC_CREATESUCCESS, $blocksCallObj->getVar('name')));

-        }

-

+        case 2:

+        $cachemodel = ' cachemodel=$xoopsUser';

         break;

-    case 'edit':

-

-        $blocksCallObj           = $blocksCallHandler->get($_GET['bid']);

-        $block_data              = $blocksCallObj->getValues(null, 'n');

-        $block_data['edit_form'] = $blocksCallObj->getOptions();

-

-        $blockoption = !empty($block_data['options']) ? "options=\"{$block_data['options']}\"" : '';

-        $cachetime   = 0 != $block_data['bcachetime'] ? ' cachetime=' . $block_data['bcachetime'] : '';

-        if ($cachetime) {

-            switch ($block_data['bcachemodel']) {

-                case 0:

-                    $cachemodel = ' cachemodel=global';

-                    break;

-                case 1:

-                    $cachemodel = ' cachemodel=$xoopsUser->getGroups()';

-                    break;

-                case 2:

-                    $cachemodel = ' cachemodel=$xoopsUser';

-                    break;

-            }

+        }

         } else {

             $cachemodel = '';

         }

@@ -181,67 +181,67 @@ 
         $template_main = 'tools_admin_blockscall_edit.tpl';

 

         break;

-    case 'save':

-        $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);

-        if (Request::hasVar('save', 'REQUEST') && 'blk' === $_REQUEST['save']) {

-            if (Request::hasVar('options', 'REQUEST')) {

-                $options       = $_REQUEST['options'];

-                $options_count = count($options);

-                if ($options_count > 0) {

-                    //Convert array values to comma-separated

-                    for ($i = 0; $i < $options_count; ++$i) {

-                        if (is_array($options[$i])) {

-                            $options[$i] = implode(',', $options[$i]);

-                        }

+case 'save':

+    $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);

+    if (Request::hasVar('save', 'REQUEST') && 'blk' === $_REQUEST['save']) {

+        if (Request::hasVar('options', 'REQUEST')) {

+            $options       = $_REQUEST['options'];

+            $options_count = count($options);

+            if ($options_count > 0) {

+                //Convert array values to comma-separated

+                for ($i = 0; $i < $options_count; ++$i) {

+                    if (is_array($options[$i])) {

+                        $options[$i] = implode(',', $options[$i]);

                     }

-                    $options = implode('|', $options);

-                    $blocksCallObj->setVar('options', $options);

                 }

+                $options = implode('|', $options);

+                $blocksCallObj->setVar('options', $options);

             }

-            $blocksCallObj->setVar('desciption', $_REQUEST['desc']);

-            $blocksCallObj->setVar('bcachetime', $_REQUEST['bcachetime']);

-            $blocksCallObj->setVar('bcachemodel', $_REQUEST['bcachemodel']);

-        } elseif (Request::hasVar('save', 'REQUEST') && 'tpl' === $_REQUEST['save']) {

-            $blocksCallObj->setVar('tpl_content', $_REQUEST['tpl_content']);

-        } else {

-            exit();

         }

-

-        $blocksCallObj->setVar('last_modified', time());

-        if ($blocksCallHandler->insert($blocksCallObj)) {

-            redirect_header("blockscall.php?op=edit&amp;bid={$blocksCallObj->getVar('bid')}", 3, sprintf(_AM_TOOLS_BC_SAVEDSUCCESS, $blocksCallObj->getVar('name')));

+        $blocksCallObj->setVar('desciption', $_REQUEST['desc']);

+        $blocksCallObj->setVar('bcachetime', $_REQUEST['bcachetime']);

+        $blocksCallObj->setVar('bcachemodel', $_REQUEST['bcachemodel']);

+    } elseif (Request::hasVar('save', 'REQUEST') && 'tpl' === $_REQUEST['save']) {

+        $blocksCallObj->setVar('tpl_content', $_REQUEST['tpl_content']);

+    } else {

+        exit();

+    }

+

+    $blocksCallObj->setVar('last_modified', time());

+    if ($blocksCallHandler->insert($blocksCallObj)) {

+        redirect_header("blockscall.php?op=edit&amp;bid={$blocksCallObj->getVar('bid')}", 3, sprintf(_AM_TOOLS_BC_SAVEDSUCCESS, $blocksCallObj->getVar('name')));

+    }

+    break;

+case 'edittpl':

+    $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);

+    $block_data    = $blocksCallObj->getValues(null, 'n');

+    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));

+    $form->addElement(new \XoopsFormHidden('bid', $block_data['bid']));

+    $form->addElement(new \XoopsFormHidden('op', 'save'));

+    $form->addElement(new \XoopsFormHidden('save', 'tpl'));

+    $buttonTray = new \XoopsFormElementTray('', '&nbsp;');

+    $buttonTray->addElement(new \XoopsFormButton('', 'submitblock', _SUBMIT, 'submit'));

+    $form->addElement($buttonTray);

+    $form->display();

+    break;

+case 'delete':

+    $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);

+    if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {

+        if (!$GLOBALS['xoopsSecurity']->check()) {

+            redirect_header('blockscall.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));

         }

-        break;

-    case 'edittpl':

-        $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);

-        $block_data    = $blocksCallObj->getValues(null, 'n');

-        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));

-        $form->addElement(new \XoopsFormHidden('bid', $block_data['bid']));

-        $form->addElement(new \XoopsFormHidden('op', 'save'));

-        $form->addElement(new \XoopsFormHidden('save', 'tpl'));

-        $buttonTray = new \XoopsFormElementTray('', '&nbsp;');

-        $buttonTray->addElement(new \XoopsFormButton('', 'submitblock', _SUBMIT, 'submit'));

-        $form->addElement($buttonTray);

-        $form->display();

-        break;

-    case 'delete':

-        $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);

-        if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {

-            if (!$GLOBALS['xoopsSecurity']->check()) {

-                redirect_header('blockscall.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));

-            }

-            if ($blocksCallHandler->delete($blocksCallObj)) {

-                redirect_header('blockscall.php', 3, _AM_TOOLS_BC_DELETEDSUCCESS);

-            } else {

-                echo $blocksCallObj->getHtmlErrors();

-            }

+        if ($blocksCallHandler->delete($blocksCallObj)) {

+            redirect_header('blockscall.php', 3, _AM_TOOLS_BC_DELETEDSUCCESS);

         } else {

-            xoops_confirm(['ok' => 1, 'id' => $_REQUEST['bid'], 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_TOOLS_BC_RUSUREDEL, $blocksCallObj->getVar('name')));

+            echo $blocksCallObj->getHtmlErrors();

         }

-        break;

+    } else {

+        xoops_confirm(['ok' => 1, 'id' => $_REQUEST['bid'], 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_TOOLS_BC_RUSUREDEL, $blocksCallObj->getVar('name')));

+    }

+    break;

 }

 $css = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/tools/templates/style.css">';

 $xoopsTpl->assign('css', $css);

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
 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 @@ 
             '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 @@ 
         $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 @@ 
 {$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 @@ 
     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 @@ 
         }

         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';

modules/tools/config/imageconfig.php

Spacing +9 added lines, -9 removed lines

@@ -6,8 +6,8 @@ 
 // 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 @@ 
 

 $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 @@ 
 

 $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 @@ 
 

 $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',

 ];

 

modules/tools/config/config.php

Spacing +16 added lines, -16 removed lines

@@ -20,33 +20,33 @@ 
 $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 @@ 
         //            '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>",

 ];

 

modules/tools/config/icons.php

Spacing +11 added lines, -11 removed lines

@@ -5,17 +5,17 @@
 $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'>",

     ],

 ];

modules/tools/config/paths.php

Spacing +10 added lines, -10 removed lines

@@ -6,20 +6,20 @@
 $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'

     ],

 ];

modules/tools/include/blockform.php

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@
  * @since           2.00
  * @author          Susheng Yang <ezskyyoung@gmail.com>
  */
-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']));

modules/tools/include/config.php

Spacing +14 added lines, -14 removed lines

@@ -20,26 +20,26 @@ 
 $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 @@ 
         //            '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>",

 ];