XoopsModules25x / tools

modules/tools/admin/blockscall.php

Switch Indentation +184 added lines, -184 removed lines

@@ -26,140 +26,140 @@ 
 /** @var XoopsPersistableObjectHandler $blocksCallHandler */
 $blocksCallHandler = xoops_getModuleHandler('blockscall');
 switch ($op) {
-    default:
-    case 'list':
-        /** @var XoopsModuleHandler $moduleHandler */
-        $moduleHandler   = xoops_getHandler('module');
-        $criteria        = new Criteria('isactive', 1);
-        $generator_list  = $moduleHandler->getList($criteria);
-        $fields          = array(
-            'bid',
-            'mid',
-            'name',
-            'title',
-            'desciption',
-            'bcachetime',
-            'bcachemodel',
-            'last_modified'
-        );
-        $blockscall_data = $blocksCallHandler->getAll(null, $fields, false, false);
-        $cachetime       = array(
-            '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      = array('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']];
-            $blockscall_data[$k]['bcachetime']    = $cachetime[$v['bcachetime']];
-            $blockscall_data[$k]['bcachemodel']   = $cachemodel[$v['bcachemodel']];
-            $blockscall_data[$k]['last_modified'] = formatTimestamp($v['last_modified']);
-        }
-    $GLOBALS['xoopsOption']['template_main'] = 'tools_admin_blockscall.tpl';
+default:
+case 'list':
+    /** @var XoopsModuleHandler $moduleHandler */
+    $moduleHandler   = xoops_getHandler('module');
+    $criteria        = new Criteria('isactive', 1);
+    $generator_list  = $moduleHandler->getList($criteria);
+    $fields          = array(
+        'bid',
+        'mid',
+        'name',
+        'title',
+        'desciption',
+        'bcachetime',
+        'bcachemodel',
+        'last_modified'
+    );
+    $blockscall_data = $blocksCallHandler->getAll(null, $fields, false, false);
+    $cachetime       = array(
+        '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      = array('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']];
+        $blockscall_data[$k]['bcachetime']    = $cachetime[$v['bcachetime']];
+        $blockscall_data[$k]['bcachemodel']   = $cachemodel[$v['bcachemodel']];
+        $blockscall_data[$k]['last_modified'] = formatTimestamp($v['last_modified']);
+    }
+$GLOBALS['xoopsOption']['template_main'] = 'tools_admin_blockscall.tpl';
 //    xoops_cp_header();
-        $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 = isset($_GET['selgen']) ? (int)$_GET['selgen'] : -1;
-
-        //get blocks
-        $criteria = new CriteriaCompo(new Criteria('mid', 0, '!='));
-        if ($selgen != -1) {
-            $criteria->add(new Criteria('mid', $selgen));
-        }
-        $fields        = array('bid', 'mid', 'name', 'title');
-        /** @var \XoopsObjectHandler $blocksHandler */
-        $blocksHandler = xoops_getModuleHandler('xoopsblock');
-        $blocks_array  = $blocksHandler->getAll($criteria, $fields, false, false);
-        foreach ($blocks_array as $k => $v) {
-            $blocks_array[$k]['mname'] = $generator_list[$v['mid']];
-        }
-        unset($criteria);
-
-        $xoopsTpl->assign('selgen', $selgen);
-        $xoopsTpl->assign('modules', $generator_list);
-        $xoopsTpl->assign('blocks', $blocks_array);
-        $GLOBALS['xoopsOption']['template_main']= 'tools_admin_blockscall_new.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 = isset($_GET['selgen']) ? (int)$_GET['selgen'] : -1;
+
+    //get blocks
+    $criteria = new CriteriaCompo(new Criteria('mid', 0, '!='));
+    if ($selgen != -1) {
+        $criteria->add(new Criteria('mid', $selgen));
+    }
+    $fields        = array('bid', 'mid', 'name', 'title');
+    /** @var \XoopsObjectHandler $blocksHandler */
+    $blocksHandler = xoops_getModuleHandler('xoopsblock');
+    $blocks_array  = $blocksHandler->getAll($criteria, $fields, false, false);
+    foreach ($blocks_array as $k => $v) {
+        $blocks_array[$k]['mname'] = $generator_list[$v['mid']];
+    }
+    unset($criteria);
+
+    $xoopsTpl->assign('selgen', $selgen);
+    $xoopsTpl->assign('modules', $generator_list);
+    $xoopsTpl->assign('blocks', $blocks_array);
+    $GLOBALS['xoopsOption']['template_main']= 'tools_admin_blockscall_new.tpl';
 //        xoops_cp_header();
-        break;
-
-    case 'create':
-
-        $blocksHandler = xoops_getModuleHandler('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');
-                }
-            }
-        }
+    break;
 
-        $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 'create':
 
-        break;
+    $blocksHandler = xoops_getModuleHandler('xoopsblock');
+    $block_obj     = $blocksHandler->get($_GET['bid']);
+    $o_block       = $block_obj->getValues();
 
-    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   = $block_data['bcachetime'] != 0 ? ' 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;
+    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')));
+    }
+
+    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   = $block_data['bcachetime'] != 0 ? ' 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 = '';
         }
@@ -182,69 +182,69 @@ 
 //        xoops_cp_header();
         break;
 
-    case 'save':
-        $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);
-        if (isset($_REQUEST['save']) && $_REQUEST['save'] === 'blk') {
-            if (isset($_REQUEST['options'])) {
-                $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 (isset($_REQUEST['save']) && $_REQUEST['save'] === 'blk') {
+        if (isset($_REQUEST['options'])) {
+            $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 (isset($_REQUEST['save']) && $_REQUEST['save'] === 'tpl') {
-            $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 (isset($_REQUEST['save']) && $_REQUEST['save'] === 'tpl') {
+        $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'));
+    $button_tray = new XoopsFormElementTray('', '&nbsp;');
+    $button_tray->addElement(new XoopsFormButton('', 'submitblock', _SUBMIT, 'submit'));
+    $form->addElement($button_tray);
+    $form->display();
+    break;
+
+case 'delete':
+    $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);
+    if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+        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'));
-        $button_tray = new XoopsFormElementTray('', '&nbsp;');
-        $button_tray->addElement(new XoopsFormButton('', 'submitblock', _SUBMIT, 'submit'));
-        $form->addElement($button_tray);
-        $form->display();
-        break;
-
-    case 'delete':
-        $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);
-        if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
-            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(array('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(array('ok' => 1, 'id' => $_REQUEST['bid'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TOOLS_BC_RUSUREDEL, $blocksCallObj->getVar('name')));
+    }
+    break;
 }
 //xoops_cp_header();
 $css = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/tools/templates/style.css" />';

modules/tools/admin/index.php

Switch Indentation +46 added lines, -46 removed lines

@@ -23,30 +23,30 @@ 
 
 $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'index';
 switch ($op) {
-    default:
-    case 'index':
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-        $form = new XoopsThemeForm(_AM_TOOLS_INDEX, 'updatecache', 'index.php', 'post', true);
-        $form->addElement(new XoopsFormLabel(_AM_TOOLS_TIP, _AM_TOOLS_TIPS));
-        $checkbox_options = array(
-            'updatexoopscache'    => _AM_TOOLS_UPDATEXOOPSCACHE,
-            'updatesmartycache'   => _AM_TOOLS_UPDATESMARTYCACHE,
-            'updatesmartycompile' => _AM_TOOLS_UPDATESMARTYCOMPILE
-        );
-        $checkbox         = new XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
-        $checkbox->addOptionArray($checkbox_options);
-        $form->addElement($checkbox);
-        $form->addElement(new XoopsFormHidden('op', 'updatecache'));
-        $form->addElement(new XoopsFormHidden('step', '1'));
-        $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $form->display();
-        break;
-    case 'updatecache':
-        if ($_REQUEST['step'] == 1) {
-            $options  = implode('_', $_REQUEST['options']);
-            $url      = XOOPS_URL . "/modules/tools/admin/index.php?op=updatecache&step=2&options={$options}";
-            $updating = _AM_TOOLS_UPDATING;
-            $msg      = <<<EOF
+default:
+case 'index':
+    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    $form = new XoopsThemeForm(_AM_TOOLS_INDEX, 'updatecache', 'index.php', 'post', true);
+    $form->addElement(new XoopsFormLabel(_AM_TOOLS_TIP, _AM_TOOLS_TIPS));
+    $checkbox_options = array(
+        'updatexoopscache'    => _AM_TOOLS_UPDATEXOOPSCACHE,
+        'updatesmartycache'   => _AM_TOOLS_UPDATESMARTYCACHE,
+        'updatesmartycompile' => _AM_TOOLS_UPDATESMARTYCOMPILE
+    );
+    $checkbox         = new XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
+    $checkbox->addOptionArray($checkbox_options);
+    $form->addElement($checkbox);
+    $form->addElement(new XoopsFormHidden('op', 'updatecache'));
+    $form->addElement(new XoopsFormHidden('step', '1'));
+    $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+    $form->display();
+    break;
+case 'updatecache':
+    if ($_REQUEST['step'] == 1) {
+        $options  = implode('_', $_REQUEST['options']);
+        $url      = XOOPS_URL . "/modules/tools/admin/index.php?op=updatecache&step=2&options={$options}";
+        $updating = _AM_TOOLS_UPDATING;
+        $msg      = <<<EOF
     <div class="loading" style="text-align:center;">
     <img src="../assets/images/loader.gif" />
     <p>{$updating}</P>
@@ -60,31 +60,31 @@ 
     <script type="text/JavaScript">setTimeout("redirect('{$url}');", 2000);</script>
 EOF;
 
-            echo $msg;
-        } elseif ($_REQUEST['step'] == 2) {
-            $options = explode('_', $_REQUEST['options']);
-            foreach ($options as $k) {
-                if ($k === 'updatexoopscache') {
-                    $d = XOOPS_VAR_PATH . '/caches/xoops_cache';
-                    updatecache($d, 'php');
-                    updatecache($d, 'html');
-                    updatecache($d, 'tmp');
-                }
-                if ($k === 'updatesmartycache') {
-                    $d = XOOPS_VAR_PATH . '/caches/smarty_cache';
-                    updatecache($d, 'html');
-                    updatecache($d, 'tmp');
-                }
-                if ($k === 'updatesmartycompile') {
-                    $d = XOOPS_VAR_PATH . '/caches/smarty_compile';
-                    updatecache($d, 'php');
-                }
+        echo $msg;
+    } elseif ($_REQUEST['step'] == 2) {
+        $options = explode('_', $_REQUEST['options']);
+        foreach ($options as $k) {
+            if ($k === 'updatexoopscache') {
+                $d = XOOPS_VAR_PATH . '/caches/xoops_cache';
+                updatecache($d, 'php');
+                updatecache($d, 'html');
+                updatecache($d, 'tmp');
+            }
+            if ($k === 'updatesmartycache') {
+                $d = XOOPS_VAR_PATH . '/caches/smarty_cache';
+                updatecache($d, 'html');
+                updatecache($d, 'tmp');
+            }
+            if ($k === 'updatesmartycompile') {
+                $d = XOOPS_VAR_PATH . '/caches/smarty_compile';
+                updatecache($d, 'php');
             }
-
-            redirect_header('index.php', 3, _AM_TOOLS_UPDATECACHESUCCESS);
         }
 
-        break;
+        redirect_header('index.php', 3, _AM_TOOLS_UPDATECACHESUCCESS);
+    }
+
+    break;
 
 }