XoopsModules25x / tools

modules/tools/admin/header.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     /**
      * @param        $currentoption
      * @param string $breadcrumb
-     * @return bool
+     * @return false|null
      */
     function loadModuleAdminMenu($currentoption, $breadcrumb = '')
     {

Spacing +12 added lines, -12 removed lines

@@ -16,14 +16,14 @@ 
  * @author          Susheng Yang <ezskyyoung@gmail.com>
  */
 
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
 }
 
-if (!@ require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php'):
+if (!@ require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php'):
 
     /**
      * @param        $currentoption
@@ -37,18 +37,18 @@ 
         }
 
         $breadcrumb  = empty($breadcrumb) ? $adminmenu[$currentoption]['title'] : $breadcrumb;
-        $module_link = XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/';
-        $image_link  = XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/images';
+        $module_link = XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname').'/';
+        $image_link  = XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname').'/images';
 
         $adminMenu_text = '
     <style type="text/css">
     <!--
     #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0;}
-    #buttonbar { float:left; width:100%; background: #e7e7e7 url("' . $image_link . '/modadminbg.gif") repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px;}
+    #buttonbar { float:left; width:100%; background: #e7e7e7 url("' . $image_link.'/modadminbg.gif") repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px;}
     #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
     #buttonbar li { display:inline; margin:0; padding:0; }
-    #buttonbar a { float:left; background:url("' . $image_link . '/left_both.gif") no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
-    #buttonbar a span { float:left; display:block; background:url("' . $image_link . '/right_both.gif") no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
+    #buttonbar a { float:left; background:url("' . $image_link.'/left_both.gif") no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
+    #buttonbar a span { float:left; display:block; background:url("' . $image_link.'/right_both.gif") no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
     /* Commented Backslash Hack hides rule from IE5-Mac \*/
     #buttonbar a span {float:none;}
     /* End IE5-Mac hack */
@@ -63,10 +63,10 @@ 
      <table style="width: 100%; padding: 0; " cellspacing="0">
          <tr>
              <td style="width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;">
-                 <a href="../index.php">' . $GLOBALS['xoopsModule']->getVar('name') . '</a>
+                 <a href="../index.php">' . $GLOBALS['xoopsModule']->getVar('name').'</a>
              </td>
              <td style="width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;">
-                 <strong>' . $GLOBALS['xoopsModule']->getVar('name') . '</strong>&nbsp;' . $breadcrumb . '
+                 <strong>' . $GLOBALS['xoopsModule']->getVar('name').'</strong>&nbsp;'.$breadcrumb.'
              </td>
          </tr>
      </table>
@@ -75,9 +75,9 @@ 
      <ul>
     ';
         foreach (array_keys($adminObject) as $key) {
-            $adminMenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>') . '<a href="' . $module_link . $adminmenu[$key]['link'] . '"><span>' . $adminmenu[$key]['title'] . '</span></a></li>';
+            $adminMenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>').'<a href="'.$module_link.$adminmenu[$key]['link'].'"><span>'.$adminmenu[$key]['title'].'</span></a></li>';
         }
-        $adminMenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $GLOBALS['xoopsModule']->getVar('mid') . '"><span>' . _PREFERENCES . '</span></a></li>';
+        $adminMenu_text .= '<li><a href="'.XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$GLOBALS['xoopsModule']->getVar('mid').'"><span>'._PREFERENCES.'</span></a></li>';
         $adminMenu_text .= '
      </ul>
     </div>

class/smarty/xoops_plugins/function.xoBlk.php

Spacing +3 added lines, -3 removed lines

@@ -27,18 +27,18 @@
     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'];
+    $tplName = 'db:'.$params['template'];
     $params['cacheid'] = isset($params['cacheid']) ? $params['cacheid'] : 'xoBlk_'.md5(var_export($params, true));
     if (!isset($params['cachetime']) || !$smarty->is_cached($tplName, $params['cacheid'])) {
         $myBlock = array(

class/smarty/xoops_plugins/block.xoBlkTpl.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     </div>
 <{/xoBlkTpl}>
 */
-function smarty_block_xoBlkTpl ($params, $content, $smarty, &$repeat) {
+function smarty_block_xoBlkTpl($params, $content, $smarty, &$repeat) {
     static $old_block;
     /** @var Smarty $smarty */
     if (empty($content)) {
@@ -44,7 +44,7 @@ 
             $var = $xoBlk->buildBlock();
         }
         if (isset($params['cachetime'])) {
-            XoopsCache::write($cache_key, $var, (int)$params['cachetime']);
+            XoopsCache::write($cache_key, $var, (int) $params['cachetime']);
         }
         $old_block = $smarty->get_template_vars('block');
         $smarty->assign('block', $var);

modules/tools/include/blockform.php

Indentation +16 added lines, -16 removed lines

@@ -29,26 +29,26 @@
 
 $cache_select = new XoopsFormSelect(_AM_TOOLS_BC_BCACHETIME, 'bcachetime', $block_data['bcachetime']);
 $cache_select->addOptionArray(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
-                              ));
+                                    '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
+                                ));
 $form->addElement($cache_select);
 
 $cachemodel_select = new XoopsFormSelect(_AM_TOOLS_BC_BCACHEMODEL, 'bcachemodel', $block_data['bcachemodel']);
 $cachemodel_select->addOptionArray(array(
-                                       '0' => _AM_TOOLS_BC_GLOBAL,
-                                       '1' => _AM_TOOLS_BC_GROUP,
-                                       '2' => _AM_TOOLS_BC_USER
-                                   ));
+                                        '0' => _AM_TOOLS_BC_GLOBAL,
+                                        '1' => _AM_TOOLS_BC_GROUP,
+                                        '2' => _AM_TOOLS_BC_USER
+                                    ));
 $form->addElement($cachemodel_select);
 
 $form->addElement(new XoopsFormHidden('bid', $block_data['bid']));

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@
  * @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 ($block_data['edit_form'] !== false) {
     $form->addElement(new XoopsFormLabel(_AM_TOOLS_BC_OPTIONS, $block_data['edit_form']));

modules/tools/class/blockscall.php

Spacing +6 added lines, -6 removed lines

@@ -55,13 +55,13 @@
         if (!$edit_func) {
             return false;
         }
-        if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file'))) {
-            if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/blocks.php')) {
-                require_once XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/blocks.php';
-            } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/language/english/blocks.php')) {
-                require_once XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/language/english/blocks.php';
+        if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'))) {
+            if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/'.$xoopsConfig['language'].'/blocks.php')) {
+                require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/'.$xoopsConfig['language'].'/blocks.php';
+            } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/english/blocks.php')) {
+                require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/english/blocks.php';
             }
-            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) {

modules/tools/xoops_version.php

Spacing +3 added lines, -3 removed lines

@@ -46,12 +46,12 @@
 // database tables, not applicable for this module
 $modversion['sqlfile']['mysql'] = 'sql/sql.sql';
 $modversion['tables']           = array(
-    $moduleDirName . '_' . 'blocks',
+    $moduleDirName.'_'.'blocks',
 );
 
 // Admin things, not applicable for this module
-$modversion['system_menu']         = 1;
-$modversion['hasAdmin']   = 1;
+$modversion['system_menu'] = 1;
+$modversion['hasAdmin'] = 1;
 // Main Menu
 $modversion['hasMain'] = 0;
 

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

Spacing +14 added lines, -14 removed lines

@@ -17,8 +17,8 @@ 
  */
 
 
-include __DIR__ . '/header.php';
-$GLOBALS['xoopsOption']['template_main']   = 'tools_admin_blockscall.tpl';
+include __DIR__.'/header.php';
+$GLOBALS['xoopsOption']['template_main'] = 'tools_admin_blockscall.tpl';
 xoops_cp_header();
 //loadModuleAdminMenu(2, '');
 
@@ -56,7 +56,7 @@ 
             '604800'  => _WEEK,
             '2592000' => _MONTH
         );
-        $cachemodel      = array('0' => _AM_TOOLS_BC_GLOBAL, '1' => _AM_TOOLS_BC_GROUP, '2' => _AM_TOOLS_BC_USER);
+        $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']];
@@ -76,7 +76,7 @@ 
         unset($criteria);
         $generator_list[-1] = _AM_TOOLS_BC_ALLTYPES;
         ksort($generator_list);
-        $selgen = isset($_GET['selgen']) ? (int)$_GET['selgen'] : -1;
+        $selgen = isset($_GET['selgen']) ? (int) $_GET['selgen'] : -1;
 
         //get blocks
         $criteria = new CriteriaCompo(new Criteria('mid', 0, '!='));
@@ -95,7 +95,7 @@ 
         $xoopsTpl->assign('selgen', $selgen);
         $xoopsTpl->assign('modules', $generator_list);
         $xoopsTpl->assign('blocks', $blocks_array);
-        $GLOBALS['xoopsOption']['template_main']= 'tools_admin_blockscall_new.tpl';
+        $GLOBALS['xoopsOption']['template_main'] = 'tools_admin_blockscall_new.tpl';
 //        xoops_cp_header();
         break;
 
@@ -142,12 +142,12 @@ 
 
     case 'edit':
 
-        $blocksCallObj          = $blocksCallHandler->get($_GET['bid']);
+        $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'] : '';
+        $cachetime   = $block_data['bcachetime'] != 0 ? ' cachetime='.$block_data['bcachetime'] : '';
         if ($cachetime) {
             switch ($block_data['bcachemodel']) {
                 case 0:
@@ -169,16 +169,16 @@ 
 {$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;
 
-        include __DIR__ . '/../include/blockform.php';
+        include __DIR__.'/../include/blockform.php';
 
         $xoopsTpl->assign('xoBlkTpl', $xoblktpl);
         $xoopsTpl->assign('xoblk', $xoblk);
 
-        $GLOBALS['xoopsOption']['template_main']= 'tools_admin_blockscall_edit.tpl';
+        $GLOBALS['xoopsOption']['template_main'] = 'tools_admin_blockscall_edit.tpl';
 //        xoops_cp_header();
         break;
 
@@ -216,8 +216,8 @@ 
 
     case 'edittpl':
         $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);
-        $block_data     = $blocksCallObj->getValues(null, 'n');
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        $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));
@@ -247,6 +247,6 @@ 
         break;
 }
 //xoops_cp_header();
-$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);
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

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

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
  * @author          Susheng Yang <ezskyyoung@gmail.com>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 xoops_cp_header();
 
 //loadModuleAdminMenu(1, '');
@@ -25,7 +25,7 @@ 
 switch ($op) {
     default:
     case 'index':
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        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(
@@ -33,7 +33,7 @@ 
             'updatesmartycache'   => _AM_TOOLS_UPDATESMARTYCACHE,
             'updatesmartycompile' => _AM_TOOLS_UPDATESMARTYCOMPILE
         );
-        $checkbox         = new XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
+        $checkbox = new XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
         $checkbox->addOptionArray($checkbox_options);
         $form->addElement($checkbox);
         $form->addElement(new XoopsFormHidden('op', 'updatecache'));
@@ -44,7 +44,7 @@ 
     case 'updatecache':
         if ($_REQUEST['step'] == 1) {
             $options  = implode('_', $_REQUEST['options']);
-            $url      = XOOPS_URL . "/modules/tools/admin/index.php?op=updatecache&step=2&options={$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;">
@@ -65,18 +65,18 @@ 
             $options = explode('_', $_REQUEST['options']);
             foreach ($options as $k) {
                 if ($k === 'updatexoopscache') {
-                    $d = XOOPS_VAR_PATH . '/caches/xoops_cache';
+                    $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';
+                    $d = XOOPS_VAR_PATH.'/caches/smarty_cache';
                     updatecache($d, 'html');
                     updatecache($d, 'tmp');
                 }
                 if ($k === 'updatesmartycompile') {
-                    $d = XOOPS_VAR_PATH . '/caches/smarty_compile';
+                    $d = XOOPS_VAR_PATH.'/caches/smarty_compile';
                     updatecache($d, 'php');
                 }
             }
@@ -97,10 +97,10 @@ 
     $d = dir($cacheDir);
     while (false !== ($entry = $d->read())) {
         if (preg_match("/.*\.{$type}$/", $entry)) {
-            unlink($cacheDir . '/' . $entry);
+            unlink($cacheDir.'/'.$entry);
         }
     }
     $d->close();
 }
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';