XoopsModules25x / tools

modules/tools/admin/header.php

Indentation +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 

 

 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {

-	include_once XOOPS_ROOT_PATH . "/class/template.php";

-	$xoopsTpl = new XoopsTpl();

+    include_once XOOPS_ROOT_PATH . "/class/template.php";

+    $xoopsTpl = new XoopsTpl();

 }

 

 IF (!@ include_once XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php"):

modules/tools/admin/blockscall.php

Indentation +109 added lines, -109 removed lines

@@ -26,25 +26,25 @@ 
 switch($op) {
 default:
 case "list":
-	$module_handler =& xoops_gethandler('module');
+    $module_handler =& xoops_gethandler('module');
     $criteria = new Criteria('isactive', 1);
     $generator_list = $module_handler->getList($criteria);
-	$fields = array("bid","mid","name","title","desciption","bcachetime","bcachemodel","last_modified");
-	$blockscall_data = $blockscall_handler->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']);
-	}
-	$template_main = "tools_admin_blockscall.html";
-	$xoopsTpl->assign("bc_data",$blockscall_data);
-	break;
+    $fields = array("bid","mid","name","title","desciption","bcachetime","bcachemodel","last_modified");
+    $blockscall_data = $blockscall_handler->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']);
+    }
+    $template_main = "tools_admin_blockscall.html";
+    $xoopsTpl->assign("bc_data",$blockscall_data);
+    break;
 case "new":
     // Modules for blocks to be visible in
-	$module_handler =& xoops_gethandler('module');
+    $module_handler =& xoops_gethandler('module');
     $criteria = new Criteria('isactive', 1);
     $generator_list = $module_handler->getList($criteria);
     unset($criteria);
@@ -55,42 +55,42 @@ 
     //get blocks
     $criteria = new CriteriaCompo(new Criteria("mid",0,"!="));
     if($selgen != -1){
-    	$criteria->add(new Criteria("mid",$selgen));
+        $criteria->add(new Criteria("mid",$selgen));
+    }
+    $fields = array("bid","mid","name","title");
+    $blocks_handler = xoops_getmodulehandler("xoopsblock");
+    $blocks_array = $blocks_handler->getAll($criteria,$fields,false ,false);
+    foreach ($blocks_array as $k=>$v){
+        $blocks_array[$k]['mname'] = $generator_list[$v['mid']];
     }
-	$fields = array("bid","mid","name","title");
-	$blocks_handler = xoops_getmodulehandler("xoopsblock");
-	$blocks_array = $blocks_handler->getAll($criteria,$fields,false ,false);
-	foreach ($blocks_array as $k=>$v){
-		$blocks_array[$k]['mname'] = $generator_list[$v['mid']];
-	}
-	unset($criteria);
+    unset($criteria);
 	
     $xoopsTpl->assign("selgen",$selgen);
-	$xoopsTpl->assign("modules",$generator_list);
-	$xoopsTpl->assign("blocks",$blocks_array);
-	$template_main = "tools_admin_blockscall_new.html";
-	break;
+    $xoopsTpl->assign("modules",$generator_list);
+    $xoopsTpl->assign("blocks",$blocks_array);
+    $template_main = "tools_admin_blockscall_new.html";
+    break;
 	
 case "create":
 	
-	$blocks_handler = xoops_getmodulehandler("xoopsblock");
-	$block_obj = $blocks_handler->get($_GET['bid']);
-	$o_block = $block_obj->getValues();
+    $blocks_handler = xoops_getmodulehandler("xoopsblock");
+    $block_obj = $blocks_handler->get($_GET['bid']);
+    $o_block = $block_obj->getValues();
 	
     if ($o_block['template'] != '') {
-	    $tplfile_handler =& xoops_gethandler('tplfile');
-	    $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $o_block['bid'],'','',true);
-	    if (count($btemplate) > 0) {
-	 	$tpl_source = $btemplate[0]->getVar('tpl_source','n');
-	    } else {
-	        $btemplate2 = $tplfile_handler->find('default', 'block', $o_block['bid'],'','',true);
-	        if (count($btemplate2) > 0) {
-			$tpl_source = $btemplate2[0]->getVar('tpl_source','n');
-	        }
-	    }
+        $tplfile_handler =& xoops_gethandler('tplfile');
+        $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $o_block['bid'],'','',true);
+        if (count($btemplate) > 0) {
+            $tpl_source = $btemplate[0]->getVar('tpl_source','n');
+        } else {
+            $btemplate2 = $tplfile_handler->find('default', 'block', $o_block['bid'],'','',true);
+            if (count($btemplate2) > 0) {
+            $tpl_source = $btemplate2[0]->getVar('tpl_source','n');
+            }
+        }
     }
 	
-	$blockscall_obj =& $blockscall_handler->create();
+    $blockscall_obj =& $blockscall_handler->create();
     $blockscall_obj->setVar('bid', $o_block['bid']);
     $blockscall_obj->setVar('mid', $o_block['mid']);
     $blockscall_obj->setVar('options', $o_block['options']);
@@ -109,98 +109,98 @@ 
         redirect_header("blockscall.php?op=edit&bid={$blockscall_obj->getVar('bid')}", 3, sprintf(_AM_TOOLS_BC_CREATESUCCESS, $blockscall_obj->getVar('name')));
     }
 	
-	break;
+    break;
 	
 case "edit":
 	
-	$blockscall_obj = $blockscall_handler->get($_GET['bid']);
-	$block_data = $blockscall_obj->getValues(null,'n');
-	$block_data['edit_form'] = $blockscall_obj->getOptions();
+    $blockscall_obj = $blockscall_handler->get($_GET['bid']);
+    $block_data = $blockscall_obj->getValues(null,'n');
+    $block_data['edit_form'] = $blockscall_obj->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 ="";
-	}
+    $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 ="";
+    }
 
-	$xoblktpl =<<<EOF
+    $xoblktpl =<<<EOF
 <{xoBlkTpl module="{$block_data['dirname']}" file="{$block_data['func_file']}" show_func="{$block_data['show_func']}" {$blockoption}$cachetime$cachemodel}>
 {$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 "../include/blockform.php";
+    include "../include/blockform.php";
 
-	$xoopsTpl->assign("xoblktpl",$xoblktpl);
-	$xoopsTpl->assign("xoblk",$xoblk);
+    $xoopsTpl->assign("xoblktpl",$xoblktpl);
+    $xoopsTpl->assign("xoblk",$xoblk);
 
-	$template_main = "tools_admin_blockscall_edit.html";
+    $template_main = "tools_admin_blockscall_edit.html";
 	
-	break;
+    break;
 
 case "save":
-	$blockscall_obj =& $blockscall_handler->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);
-	            $blockscall_obj->setVar('options', $options);
-	        }
-	    }
-	    $blockscall_obj->setVar('desciption', $_REQUEST['desc']);
-	    $blockscall_obj->setVar('bcachetime', $_REQUEST['bcachetime']);
-	    $blockscall_obj->setVar('bcachemodel', $_REQUEST['bcachemodel']);
-	}elseif(isset($_REQUEST['save']) && $_REQUEST['save']=="tpl") {
-		$blockscall_obj->setVar('tpl_content', $_REQUEST['tpl_content']);
-	}else {
-		exit();
-	}
+    $blockscall_obj =& $blockscall_handler->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);
+                $blockscall_obj->setVar('options', $options);
+            }
+        }
+        $blockscall_obj->setVar('desciption', $_REQUEST['desc']);
+        $blockscall_obj->setVar('bcachetime', $_REQUEST['bcachetime']);
+        $blockscall_obj->setVar('bcachemodel', $_REQUEST['bcachemodel']);
+    }elseif(isset($_REQUEST['save']) && $_REQUEST['save']=="tpl") {
+        $blockscall_obj->setVar('tpl_content', $_REQUEST['tpl_content']);
+    }else {
+        exit();
+    }
 
     
     $blockscall_obj->setVar('last_modified', time());
     if ($blockscall_handler->insert($blockscall_obj)) {
         redirect_header("blockscall.php?op=edit&amp;bid={$blockscall_obj->getVar('bid')}", 3, sprintf(_AM_TOOLS_BC_SAVEDSUCCESS, $blockscall_obj->getVar('name')));
     }
-	break;
+    break;
 	
 case "edittpl":
-	$blockscall_obj =& $blockscall_handler->get($_REQUEST['bid']);
-	$block_data = $blockscall_obj->getValues(null,'n');
-	include_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;
+    $blockscall_obj =& $blockscall_handler->get($_REQUEST['bid']);
+    $block_data = $blockscall_obj->getValues(null,'n');
+    include_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":
     $blockscall_obj =& $blockscall_handler->get($_REQUEST['bid']);
@@ -216,7 +216,7 @@ 
     } else {
         xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['bid'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TOOLS_BC_RUSUREDEL, $blockscall_obj->getVar('name')));
     }
-	break;
+    break;
 }
 $css = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/tools/templates/style.css" />';
 $xoopsTpl->assign('css', $css);

modules/tools/admin/index.php

Indentation +50 added lines, -50 removed lines

@@ -26,28 +26,28 @@ 
 switch($op) {

 default:

 case "index":

-	include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";

-	$form = new XoopsThemeForm(_MI_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;

+    include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";

+    $form = new XoopsThemeForm(_MI_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

+    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="../images/loader.gif" />

     <p>{$updating}</P>

@@ -61,41 +61,41 @@ 
 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");

-			}

-	}

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

-	}

+    redirect_header('index.php', 3, _AM_TOOLS_UPDATECACHESUCCESS);

+    }

 

-	break;

+    break;

 

 }

 

 function updatecache($cacheDir,$type){

-	$d = dir($cacheDir);

-	while (false !== ($entry = $d->read())) {

-		if(preg_match("/.*\.{$type}$/", $entry)) {

-			unlink($cacheDir .'/'.$entry);

-		}

-	}

-	$d->close();

+    $d = dir($cacheDir);

+    while (false !== ($entry = $d->read())) {

+        if(preg_match("/.*\.{$type}$/", $entry)) {

+            unlink($cacheDir .'/'.$entry);

+        }

+    }

+    $d->close();

 }

 include 'footer.php';

 ?>
\ No newline at end of file

modules/tools/class/blockscall.php

Indentation +17 added lines, -17 removed lines

@@ -26,20 +26,20 @@ 
     {
 
         $this->initVar('bid', XOBJ_DTYPE_INT, null, true);
-		$this->initVar('mid', XOBJ_DTYPE_INT);
-		$this->initVar('options', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('name', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('title', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('desciption', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('dirname', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('func_file', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('show_func', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('edit_func', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('template', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tpl_content', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('bcachetime', XOBJ_DTYPE_INT);
-		$this->initVar('bcachemodel', XOBJ_DTYPE_INT);
-		$this->initVar('last_modified', XOBJ_DTYPE_INT);
+        $this->initVar('mid', XOBJ_DTYPE_INT);
+        $this->initVar('options', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('name', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('title', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('desciption', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('dirname', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('func_file', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('show_func', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('edit_func', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('template', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tpl_content', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('bcachetime', XOBJ_DTYPE_INT);
+        $this->initVar('bcachemodel', XOBJ_DTYPE_INT);
+        $this->initVar('last_modified', XOBJ_DTYPE_INT);
 
     }
     
@@ -49,9 +49,9 @@ 
     }
     
     /**
-    * gets html form for editting block options
-    *
-    */
+     * gets html form for editting block options
+     *
+     */
     function getOptions()
     {
         global $xoopsConfig;