XoopsModules25x / tools

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/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/preloads/core.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args)
     {
-        require_once __DIR__ . '/autoloader.php';
+        require_once __DIR__.'/autoloader.php';
     }
 }

modules/tools/preloads/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -4,12 +4,12 @@ 
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(
-    static function ($class) {
+    static function($class) {
         // project-specific namespace prefix
-        $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+        $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
         // base directory for the namespace prefix
-        $baseDir = dirname(__DIR__) . '/class/';
+        $baseDir = dirname(__DIR__).'/class/';
 
         // does the class use the namespace prefix?
         $len = mb_strlen($prefix);
@@ -24,7 +24,7 @@ 
         // replace the namespace prefix with the base directory, replace namespace
         // separators with directory separators in the relative class name, append
         // with .php
-        $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+        $file = $baseDir.str_replace('\\', '/', $relativeClass).'.php';
 
         // if the file exists, require it
         if (is_file($file)) {

modules/tools/class/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     {

         $ret = false;

 

-        $class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';

+        $class = __NAMESPACE__.'\\'.\ucfirst($name).'Handler';

         if (!\class_exists($class)) {

             throw new \RuntimeException("Class '$class' not found");

         }

modules/tools/class/BlocksCall.php

Spacing +2 added lines, -2 removed lines

@@ -49,10 +49,10 @@
         if (!$edit_func) {

             return false;

         }

-        if (is_file(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file'))) {

+        if (is_file(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'))) {

             xoops_loadLanguage('blocks', $this->getVar('dirname'));

 

-            require_once XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file');

+            require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');

             $options   = explode('|', $this->getVar('options'));

             $edit_form = $edit_func($options);

             if (!$edit_form) {

class/smarty/xoops_plugins/function.xoBlk.php

Doc Comments -16 removed lines

@@ -9,22 +9,6 @@
  * how to use
  * The following code inserted in the template
  *  
- * @param string $module module dirname
- * @param string $file  block function file
- * @param string $show_func show block function
- * @param string $options show block function's option
- * @param int $cachetime cachetime Unit for seconds
- * @param mixed $user Generate cache solution
-
-<{xoBlk 
-    module="ilog" 
-    file="ilog_block_tag.php" 
-    show_func="ilog_tag_block_cloud_show" 
-    options="100|0|150|80" 
-    template="ilog_tag_block_cloud.html" 
-    cachetime=10 
-    user=admin
-}>
 */
 function smarty_function_xoBlk( $params, $smarty )
 {

Spacing +4 added lines, -4 removed lines

@@ -26,19 +26,19 @@
     user=admin
 }>
 */
-function smarty_function_xoBlk( $params, $smarty )
+function smarty_function_xoBlk($params, $smarty)
 {
     /** @var Smarty $smarty */
     $old_caching = $smarty->caching;
     $old_cache_lifetime = $smarty->cache_lifetime;
     if (isset($params['cachetime'])) {
         $smarty->caching = 2;
-        $smarty->cache_lifetime = (int)$params['cachetime'];
+        $smarty->cache_lifetime = (int) $params['cachetime'];
     } else {
         $smarty->caching = 0;
     }
-    $tplName = 'db:' . $params['template'];
-    $params['cacheid'] = $params['cacheid'] ?? ('xoBlk_' . md5(var_export($params, true)));
+    $tplName = 'db:'.$params['template'];
+    $params['cacheid'] = $params['cacheid'] ?? ('xoBlk_'.md5(var_export($params, true)));
     if (!isset($params['cachetime']) || !$smarty->is_cached($tplName, $params['cacheid'])) {
         $myBlock = [
             'dirname' => $params['module'],

modules/tools/class/Common/SysUtility.php

Unused Use Statements -1 removed lines

@@ -30,7 +30,6 @@
 use MyTextSanitizer;
 use XoopsFormDhtmlTextArea;
 use XoopsFormEditor;
-use XoopsFormTextArea;
 use XoopsModules\Tools\{
     Helper
 };

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
     /**
      * Access the only instance of this class
- *
+     *
      * @return SysUtility
 *
      */

Spacing +17 added lines, -17 removed lines

@@ -80,7 +80,7 @@ 
         //$pathModIcon16 = XOOPS_URL . '/modules/' . $moduleDirName . '/' . $helper->getConfig('modicons16');
         $pathModIcon16 = $helper->url($helper->getModule()->getInfo('modicons16'));
 
-        $select_view = '<form name="form_switch" id="form_switch" action="' . Request::getString('REQUEST_URI', '', 'SERVER') . '" method="post"><span style="font-weight: bold;">' . $text . '</span>';
+        $select_view = '<form name="form_switch" id="form_switch" action="'.Request::getString('REQUEST_URI', '', 'SERVER').'" method="post"><span style="font-weight: bold;">'.$text.'</span>';
         //$sorts =  $sort ==  'asc' ? 'desc' : 'asc';
         if ($form_sort == $sort) {
             $sel1 = 'asc' === $order ? 'selasc.png' : 'asc.png';
@@ -89,8 +89,8 @@ 
             $sel1 = 'asc.png';
             $sel2 = 'desc.png';
         }
-        $select_view .= '  <a href="' . Request::getString('SCRIPT_NAME', '', 'SERVER') . '?start=' . $start . '&sort=' . $form_sort . '&order=asc"><img src="' . $pathModIcon16 . '/' . $sel1 . '" title="ASC" alt="ASC"></a>';
-        $select_view .= '<a href="' . Request::getString('SCRIPT_NAME', '', 'SERVER') . '?start=' . $start . '&sort=' . $form_sort . '&order=desc"><img src="' . $pathModIcon16 . '/' . $sel2 . '" title="DESC" alt="DESC"></a>';
+        $select_view .= '  <a href="'.Request::getString('SCRIPT_NAME', '', 'SERVER').'?start='.$start.'&sort='.$form_sort.'&order=asc"><img src="'.$pathModIcon16.'/'.$sel1.'" title="ASC" alt="ASC"></a>';
+        $select_view .= '<a href="'.Request::getString('SCRIPT_NAME', '', 'SERVER').'?start='.$start.'&sort='.$form_sort.'&order=desc"><img src="'.$pathModIcon16.'/'.$sel2.'" title="DESC" alt="DESC"></a>';
         $select_view .= '</form>';
 
         return $select_view;
@@ -105,10 +105,10 @@ 
     {
         $cat_sql = '';
         if (\is_array($cats) && !empty($cats)) {
-            $cat_sql = '(' . \current($cats);
+            $cat_sql = '('.\current($cats);
             \array_shift($cats);
             foreach ($cats as $cat) {
-                $cat_sql .= ',' . $cat;
+                $cat_sql .= ','.$cat;
             }
             $cat_sql .= ')';
         }
@@ -160,11 +160,11 @@ 
         //        WHERE TABLE_NAME = '" . $table . "' AND COLUMN_NAME = '" . $columnName . "'")
         //    || exit ($GLOBALS['xoopsDB']->error());
 
-        $sql    = 'SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = "' . $table . '" AND COLUMN_NAME = "' . $columnName . '"';
+        $sql    = 'SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = "'.$table.'" AND COLUMN_NAME = "'.$columnName.'"';
         $result = $GLOBALS['xoopsDB']->query($sql);
         if (!$result) {
 //            exit($GLOBALS['xoopsDB']->error());
-            $logger     = \XoopsLogger::getInstance();
+            $logger = \XoopsLogger::getInstance();
             $logger->handleError(\E_USER_WARNING, $sql, __FILE__, __LINE__);
             return false;
         }
@@ -185,7 +185,7 @@ 
     public static function cloneRecord($tableName, int $id_field, int $id)
     {
         $new_id = false;
-        $logger     = \XoopsLogger::getInstance();
+        $logger = \XoopsLogger::getInstance();
         $table  = $GLOBALS['xoopsDB']->prefix($tableName);
         // copy content of the record you wish to clone
         $sql       = "SELECT * FROM $table WHERE $id_field='$id' ";
@@ -198,7 +198,7 @@ 
         // set the auto-incremented id's value to blank.
         unset($tempTable[$id_field]);
         // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", \array_values($tempTable)) . "')";
+        $sql    = "INSERT INTO $table (".\implode(', ', \array_keys($tempTable)).") VALUES ('".\implode("', '", \array_values($tempTable))."')";
         $result = $GLOBALS['xoopsDB']->queryF($sql);
         if (!$result) {
 //            exit($GLOBALS['xoopsDB']->error());
@@ -229,11 +229,11 @@ 
         $openTags = [];
         if ($considerHtml) {
             // if the plain text is shorter than the maximum length, return the whole text
-            if (\mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+            if (\mb_strlen(\preg_replace('/<.*?'.'>/', '', $text)) <= $length) {
                 return $text;
             }
             // splits all html-tags to scanable lines
-            \preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
+            \preg_match_all('/(<.+?'.'>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
             $total_length = \mb_strlen($ending);
             //$openTags    = [];
             $truncate     = '';
@@ -251,7 +251,7 @@ 
                             unset($openTags[$pos]);
                         }
                         // if tag is an opening tag
-                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?'.'>$/s', $line_matchings[1], $tag_matchings)) {
                         // add tag to the beginning of $openTags list
                         \array_unshift($openTags, \mb_strtolower($tag_matchings[1]));
                     }
@@ -309,7 +309,7 @@ 
         if ($considerHtml) {
             // close all unclosed html-tags
             foreach ($openTags as $tag) {
-                $truncate .= '</' . $tag . '>';
+                $truncate .= '</'.$tag.'>';
             }
         }
 
@@ -380,7 +380,7 @@ 
             if (!@\mkdir($folder) && !\is_dir($folder)) {
                 throw new \RuntimeException(\sprintf('Unable to create the %s directory', $folder));
             }
-            file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+            file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
         }
@@ -394,9 +394,9 @@ 
     public static function tableExists(string $tablename): bool
     {
         $trace = \debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-        \trigger_error(__FUNCTION__ . " is deprecated, called from {$trace[0]['file']} line {$trace[0]['line']}");
+        \trigger_error(__FUNCTION__." is deprecated, called from {$trace[0]['file']} line {$trace[0]['line']}");
         $GLOBALS['xoopsLogger']->addDeprecated(
-            \basename(\dirname(__DIR__, 2)) . ' Module: ' . __FUNCTION__ . ' function is deprecated, please use Xmf\Database\Tables method(s) instead.' . " Called from {$trace[0]['file']}line {$trace[0]['line']}"
+            \basename(\dirname(__DIR__, 2)).' Module: '.__FUNCTION__.' function is deprecated, please use Xmf\Database\Tables method(s) instead.'." Called from {$trace[0]['file']}line {$trace[0]['line']}"
         );
         $result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
 
@@ -413,6 +413,6 @@ 
     public static function addField($field, $table)
     {
         global $xoopsDB;
-        return $xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field;");
+        return $xoopsDB->queryF('ALTER TABLE '.$table." ADD $field;");
     }
 }