mambax7 / altsys

xoops_trust_path/libs/altsys/class/MyBlocksAdminForICMS.class.php

Spacing +39 added lines, -39 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForICMS extends MyBlocksAdmin
 {
 
-    public $block_positions = array() ;
+    public $block_positions = array();
 
     public function MyBlocksAadminForICMS()
     {
@@ -14,14 +14,14 @@ 
 
     public function construct()
     {
-        parent::construct() ;
+        parent::construct();
 
-        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php' ;
-        $result = $this->db->query('SELECT id,pname,title FROM ' . $this->db->prefix('block_positions')) ;
+        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php';
+        $result = $this->db->query('SELECT id,pname,title FROM '.$this->db->prefix('block_positions'));
         while (list($id, $pname, $title) = $this->db->fetchRow($result)) {
-            $this->block_positions[ $id ] = defined($title) ? constant($title) : $title ;
+            $this->block_positions[$id] = defined($title) ? constant($title) : $title;
         }
-        $this->block_positions[ -1 ] = _NONE ;
+        $this->block_positions[ -1] = _NONE;
     }
 
 //HACK by domifara for php5.3+
@@ -31,7 +31,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForICMS();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -46,23 +46,23 @@ 
     // get selected targets
     if (is_array(@$block_data['bmodule'])) {
         // bmodule origined from request (preview etc.)
-        $selected_pages = $block_data['bmodule'] ;
+        $selected_pages = $block_data['bmodule'];
     } else {
         // origined from the table of `block_module_link`
-        $result = $this->db->query('SELECT module_id,page_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'") ;
+        $result = $this->db->query('SELECT module_id,page_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_pages = array();
         while (list($mid, $pid) = $this->db->fetchRow($result)) {
-            $selected_pages[] = (int)$mid . '-' . (int)$pid;
+            $selected_pages[] = (int)$mid.'-'.(int)$pid;
         }
     }
 
     $page_handler = xoops_gethandler('page');
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
-					".$page_handler->getPageSelOptions($selected_pages) . '
+					".$page_handler->getPageSelOptions($selected_pages).'
 				</select>';
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -73,19 +73,19 @@ 
     return "
 	<table>
 		<tr>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(3, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(4, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(5, $block_data) . "</td>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data) . '</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(3, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(4, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(5, $block_data)."</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data).'</td>
 		</tr>
 		<tr>
-			<td>' . $this->renderRadio4BlockPosition(6, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(7, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(8, $block_data) . "</td>
+			<td>' . $this->renderRadio4BlockPosition(6, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(7, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(8, $block_data)."</td>
 		</tr>
 		<tr>
-			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)) . '</td>
+			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)).'</td>
 		</tr>
 	</table>';
 }
@@ -96,19 +96,19 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $label4disp = htmlspecialchars($this->block_positions[ $target_side ], ENT_QUOTES) ;
+    $label4disp = htmlspecialchars($this->block_positions[$target_side], ENT_QUOTES);
 
     if ($current_side == $target_side) {
-        $checked = "checked='checked'" ;
+        $checked = "checked='checked'";
         $divstyle = $target_side == -1 ? 'disabled' : 'selected';
     } else {
         $checked = '';
         $divstyle = 'unselected';
     }
 
-    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>" ;
+    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>";
 }
 
 
@@ -117,28 +117,28 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $ret = '' ;
+    $ret = '';
     foreach ($this->block_positions as $target_side => $label) {
         if (in_array($target_side, $skip_sides)) {
-            continue ;
+            continue;
         }
 
-        $label4disp = htmlspecialchars($label, ENT_QUOTES) ;
+        $label4disp = htmlspecialchars($label, ENT_QUOTES);
 
         if ($current_side == $target_side) {
-            $checked = "checked='checked'" ;
+            $checked = "checked='checked'";
             $divstyle = $target_side == -1 ? 'disabled' : 'selected';
         } else {
             $checked = '';
             $divstyle = 'unselected';
         }
 
-        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>" ;
+        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>";
     }
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -146,16 +146,16 @@ 
 public function updateBlockModuleLink($bid, $bmodules)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('block_module_link') ;
+    $table = $this->db->prefix('block_module_link');
 
-    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid";
+    $this->db->query($sql);
     foreach ($bmodules as $mid) {
-        $regs = explode('-', $mid) ;
+        $regs = explode('-', $mid);
         $module_id = (int)(@$regs[0]);
         $page_id = (int)(@$regs[1]);
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)";
+        $this->db->query($sql);
     }
 }
 }

xoops_trust_path/libs/altsys/class/MyBlocksAdminForX25.class.php

Spacing +103 added lines, -103 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForX25 extends MyBlocksAdmin
 {
@@ -12,9 +12,9 @@ 
 
     public function construct()
     {
-        parent::construct() ;
+        parent::construct();
 
-        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php' ;
+        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php';
     }
 
 //HACK by domifara for php5.3+
@@ -24,7 +24,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForX25();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -40,7 +40,7 @@ 
     $sseln = $ssel0 = $ssel1 = $ssel3 = $ssel4 = $ssel5 = $ssel7 = $ssel8 = $ssel9 = '';
     $scoln = $scol0 = $scol1 = $scol3 = $scol4 = $scol5 = $scol7 = $scol8 = $scol9 = 'unselected';
     $stextbox = 'unselected';
-    $value4extra_side = '' ;
+    $value4extra_side = '';
 
     if ($visible != 1) {
         $sseln = " checked='checked'";
@@ -50,39 +50,39 @@ 
         case XOOPS_SIDEBLOCK_LEFT :
             $ssel0 = " checked='checked'";
             $scol0 = 'selected';
-            break ;
+            break;
         case XOOPS_SIDEBLOCK_RIGHT :
             $ssel1 = " checked='checked'";
             $scol1 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_LEFT :
             $ssel3 = " checked='checked'";
             $scol3 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_RIGHT :
             $ssel4 = " checked='checked'";
             $scol4 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_CENTER :
             $ssel5 = " checked='checked'";
             $scol5 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOMLEFT :
             $ssel7 = " checked='checked'";
             $scol7 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOMRIGHT :
             $ssel8 = " checked='checked'";
             $scol8 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOM :
             $ssel9 = " checked='checked'";
             $scol9 = 'selected';
-            break ;
+            break;
         default :
-            $value4extra_side = $side ;
+            $value4extra_side = $side;
             $stextbox = 'selected';
-            break ;
+            break;
     }
     }
 
@@ -143,7 +143,7 @@ 
 				<div class='blockposition $scoln'>
 					<input type='radio' name='sides[$bid]' value='-1' class='blockposition' $sseln onclick='document.getElementById(\"extra_side_$bid\").value=-1;' />
 				</div>
-                <div style='float:"._GLOBAL_LEFT.";'>"._NONE . '</div>
+                <div style='float:"._GLOBAL_LEFT.";'>"._NONE.'</div>
 			</td>
 		</tr>
 	</table>
@@ -155,53 +155,53 @@ 
         $bid = (int)$bid;
 
 //HACK by domifara
-    $block = new XoopsBlock($bid) ;
+    $block = new XoopsBlock($bid);
 
-        if (! $block->getVar('bid')) {
+        if (!$block->getVar('bid')) {
             // new defaults
-        $bid = 0 ;
-            $mode = 'new' ;
-            $block->setVar('mid', 0) ;
-            $block->setVar('block_type', 'C') ;
+        $bid = 0;
+            $mode = 'new';
+            $block->setVar('mid', 0);
+            $block->setVar('block_type', 'C');
         }
 
         switch ($mode) {
         case 'clone' :
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
-            $next_op = 'clone_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE;
+            $next_op = 'clone_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM);
+            break;
         case 'new' :
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
-            $next_op = 'new_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW;
+            $next_op = 'new_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM);
+            break;
         case 'edit' :
         default :
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
-            $next_op = 'edit_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT;
+            $next_op = 'edit_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM);
+            break;
     }
 
-        $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
-        $block_template =& $block->getVar('template', 'n') ;
-        $block_template_tplset = '' ;
+        $is_custom = in_array($block->getVar('block_type'), array('C', 'E')) ? true : false;
+        $block_template = & $block->getVar('template', 'n');
+        $block_template_tplset = '';
 
-        if (! $is_custom && $block_template) {
+        if (!$is_custom && $block_template) {
             // find template of the block
         $tplfile_handler = xoops_gethandler('tplfile');
-            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template) ;
-            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default' ;
+            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template);
+            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default';
         }
 //HACK by domifara
 /*
@@ -210,41 +210,41 @@ 
     }
 */
     $block_data = $this->preview_request + array(
-        'bid' => $bid ,
-        'name' => $block->getVar('name', 'n') ,
-        'title' => $block->getVar('title', 'n') ,
+        'bid' => $bid,
+        'name' => $block->getVar('name', 'n'),
+        'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-        'template' => $block_template ,
-        'template_tplset' => $block_template_tplset ,
-        'options' => $block->getVar('options') ,
-        'content' => $block->getVar('content', 'n') ,
-        'is_custom' => $is_custom ,
-        'type' => $block->getVar('block_type') ,
+        'template' => $block_template,
+        'template_tplset' => $block_template_tplset,
+        'options' => $block->getVar('options'),
+        'content' => $block->getVar('content', 'n'),
+        'is_custom' => $is_custom,
+        'type' => $block->getVar('block_type'),
         'ctype' => $block->getVar('c_type')
-    ) ;
+    );
 
         $block4assign = array(
-        'name_raw' => $block_data['name'] ,
-        'title_raw' => $block_data['title'] ,
-        'content_raw' => $block_data['content'] ,
-        'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data) ,
-        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data) ,
-        'cell_options' => $this->renderCell4BlockOptions($block_data) ,
+        'name_raw' => $block_data['name'],
+        'title_raw' => $block_data['title'],
+        'content_raw' => $block_data['content'],
+        'cell_position' => $this->renderCell4BlockPosition($block_data),
+        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data),
+        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data),
+        'cell_options' => $this->renderCell4BlockOptions($block_data),
         'content_preview' => $this->previewContent($block_data)
-    ) + $block_data ;
+    ) + $block_data;
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-        $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+        $tpl = new D3Tpl();
 //dhtml
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-        if ($block_data['ctype']=='H' || empty($block_data['ctype'])) {
-            $editor_configs=array();
+        if ($block_data['ctype'] == 'H' || empty($block_data['ctype'])) {
+            $editor_configs = array();
             $editor_configs['name']   = 'content_block';
             $editor_configs['value']  = $block_data['content'];
             $editor_configs['rows']   = 20;
@@ -254,12 +254,12 @@ 
             $editor_configs['editor'] = xoops_getModuleOption('blocks_editor', 'system');
             $form                     = new XoopsFormEditor('', 'textarea_content', $editor_configs);
             $rendered = $form->render();
-            $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ;
+            $tpl->assign('altsys_x25_dhtmltextarea', $rendered);
         } else {
             $form = new XoopsFormDhtmlTextArea('', 'textarea_content', $block_data['content'], 80, 20);
             $rendered = $form->render();
-            $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array( '<textarea', '</textarea><br />' ), array( '</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">' ), $rendered) . '</div>' ;
-            $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ;
+            $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array('<textarea', '</textarea><br />'), array('</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">'), $rendered).'</div>';
+            $tpl->assign('altsys_x25_dhtmltextarea', $rendered);
         }
 
         $tpl->assign(array(
@@ -274,91 +274,91 @@ 
         'submit_button' => $button_value,
         'common_fck_installed' => file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'),
         'gticket_hidden' => $GLOBALS['xoopsGTicket']->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
+    ));
 //HACK by domifara
-    $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html') ;
+    $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html');
 
-        return ;
+        return;
     }
     public function fetchRequest4Block($bid)
     {
         $bid = (int)$bid;
-        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
         if (@$_POST['extra_sides'][$bid] > 0) {
             $_POST['sides'][$bid] = (int)$_POST['extra_sides'][$bid];
         }
 
         if (@$_POST['sides'][$bid] < 0) {
-            $visible = 0 ;
-            $_POST['sides'][$bid] = -1 ;
+            $visible = 0;
+            $_POST['sides'][$bid] = -1;
         } else {
-            $visible = 1 ;
+            $visible = 1;
         }
 
         return array(
-        'bid' => $bid ,
+        'bid' => $bid,
             'side' => (int)(@$_POST['sides'][$bid]),
             'weight' => (int)(@$_POST['weights'][$bid]),
-        'visible' => $visible ,
-        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]) ,
-        'content' => $myts->stripSlashesGPC(@$_POST['textarea_content']) ,
-        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]) ,
+        'visible' => $visible,
+        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]),
+        'content' => $myts->stripSlashesGPC(@$_POST['textarea_content']),
+        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]),
             'bcachetime' => (int)(@$_POST['bcachetimes'][$bid]),
-        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array( 0 ) ,
-        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array() ,
+        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array(0),
+        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array(),
         'options' => is_array(@$_POST['options'][$bid]) ? $_POST['options'][$bid] : array()
-    ) ;
+    );
     }
 
     public function previewContent($block_data)
     {
         $bid = (int)$block_data['bid'];
 
-        if (! $block_data['is_custom']) {
-            return '' ;
+        if (!$block_data['is_custom']) {
+            return '';
         }
         if (empty($this->preview_request)) {
-            return '' ;
+            return '';
         }
 
 //HACK by domifara
 //TODO : need no hook block at this
-    $block = new XoopsBlock($bid) ;
+    $block = new XoopsBlock($bid);
 
         if ($block->getVar('mid')) {
-            return '' ;
+            return '';
         }
 
-        $block->setVar('title', $block_data['title']) ;
-        $block->setVar('content', $block_data['content']) ;
+        $block->setVar('title', $block_data['title']);
+        $block->setVar('content', $block_data['content']);
 
-        restore_error_handler() ;
-        $original_level = error_reporting(E_ALL) ;
+        restore_error_handler();
+        $original_level = error_reporting(E_ALL);
 
 //	$ret = $block->getContent( 'S' , $block_data['ctype'] ) ;
 
     $c_type = $block_data['ctype'];
         if ($c_type == 'H') {
-            $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
         } elseif ($c_type == 'P') {
             ob_start();
             echo eval($block->getVar('content', 'N'));
             $content = ob_get_contents();
             ob_end_clean();
-            $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
+            $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
         } elseif ($c_type == 'S') {
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+            $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
             $ret = $myts->displayTarea($content, 1, 1);
         } else {
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+            $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
             $ret = $myts->displayTarea($content, 1, 0);
         }
 
-        error_reporting($original_level) ;
+        error_reporting($original_level);
 
-        return $ret ;
+        return $ret;
     }
 }

xoops_trust_path/libs/altsys/class/MyBlocksAdmin.class.php

Spacing +353 added lines, -353 removed lines

@@ -4,16 +4,16 @@ 
 class MyBlocksAdmin
 {
 
-    public $db ;
-    public $lang ;
-    public $cachetime_options = array() ;
-    public $ctype_options = array() ;
-    public $type_options = array() ;
-    public $target_mid = 0 ;
-    public $target_dirname = '' ;
-    public $target_mname = '' ;
-    public $block_configs = array() ;
-    public $preview_request = array() ;
+    public $db;
+    public $lang;
+    public $cachetime_options = array();
+    public $ctype_options = array();
+    public $type_options = array();
+    public $target_mid = 0;
+    public $target_dirname = '';
+    public $target_mname = '';
+    public $block_configs = array();
+    public $preview_request = array();
 
     public function MyBlocksAadmin()
     {
@@ -22,37 +22,37 @@ 
 
     public function construct()
     {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection() ;
-        $this->lang = @$GLOBALS['xoopsConfig']['language'] ;
+        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+        $this->lang = @$GLOBALS['xoopsConfig']['language'];
 
         $this->cachetime_options = 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 ,
+        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
     );
 
         $this->ctype_options = array(
-        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML ,
-        'T' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE ,
-        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ,
+        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML,
+        'T' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE,
+        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE,
         'P' => _MD_A_MYBLOCKSADMIN_CTYPE_PHP
-    ) ;
+    );
 
         $this->type_options = array(
-        'C' => 'custom block' ,
-        'E' => 'cloned custom block' ,
-        'M' => 'module\'s block' ,
-        'D' => 'cloned module\'s block' ,
+        'C' => 'custom block',
+        'E' => 'cloned custom block',
+        'M' => 'module\'s block',
+        'D' => 'cloned module\'s block',
         'S' => 'system block'
-    ) ;
+    );
     }
 
 //HACK by domifara for php5.3+
@@ -61,8 +61,8 @@ 
 {
     static $instance;
     if (!isset($instance)) {
-        $instance = new MyBlocksAdmin() ;
-        $instance->construct() ;
+        $instance = new MyBlocksAdmin();
+        $instance->construct();
     }
     return $instance;
 }
@@ -72,11 +72,11 @@ 
 public function checkPermission()
 {
     // only groups have 'module_admin' of 'altsys' can do that.
-    $module_handler = xoops_gethandler('module') ;
-    $module =& $module_handler->getByDirname('altsys') ;
-    $moduleperm_handler = xoops_gethandler('groupperm') ;
-    if (! is_object(@$GLOBALS['xoopsUser']) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
-        die('only admin of altsys can access this area') ;
+    $module_handler = xoops_gethandler('module');
+    $module = & $module_handler->getByDirname('altsys');
+    $moduleperm_handler = xoops_gethandler('groupperm');
+    if (!is_object(@$GLOBALS['xoopsUser']) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
+        die('only admin of altsys can access this area');
     }
 }
 
@@ -87,52 +87,52 @@ 
     if ($xoopsModule->getVar('dirname') == 'altsys') {
         // set target_module if specified by $_GET['dirname']
         $module_handler = xoops_gethandler('module');
-        if (! empty($_GET['dirname'])) {
-            $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']) ;
-            $target_module =& $module_handler->getByDirname($dirname) ;
+        if (!empty($_GET['dirname'])) {
+            $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']);
+            $target_module = & $module_handler->getByDirname($dirname);
         }
 
         if (is_object(@$target_module)) {
             // module's blocks
-            $this->target_mid = $target_module->getVar('mid') ;
-            $this->target_mname = $target_module->getVar('name') . ' ' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0) ;
-            $this->target_dirname = $target_module->getVar('dirname') ;
-            $modinfo = $target_module->getInfo() ;
+            $this->target_mid = $target_module->getVar('mid');
+            $this->target_mname = $target_module->getVar('name').' '.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
+            $this->target_dirname = $target_module->getVar('dirname');
+            $modinfo = $target_module->getInfo();
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN') ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, $this->target_mname) ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, $this->target_mname);
         } else {
             // custom blocks
-            $this->target_mid = 0 ;
-            $this->target_mname = _MI_ALTSYS_MENU_CUSTOMBLOCKS ;
-            $this->target_dirname = '__CustomBlocks__' ;
+            $this->target_mid = 0;
+            $this->target_mname = _MI_ALTSYS_MENU_CUSTOMBLOCKS;
+            $this->target_dirname = '__CustomBlocks__';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN') ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS') ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS');
         }
     } else {
         // myblocksadmin as a library
-        $this->target_mid = $xoopsModule->getVar('mid') ;
-        $this->target_mname = $xoopsModule->getVar('name') . ' ' . sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0) ;
-        $this->target_dirname = $xoopsModule->getVar('dirname') ;
-        $mod_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname') ;
-        $modinfo = $xoopsModule->getInfo() ;
-        $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $this->target_mname) ;
-        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN) ;
+        $this->target_mid = $xoopsModule->getVar('mid');
+        $this->target_mname = $xoopsModule->getVar('name').' '.sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0);
+        $this->target_dirname = $xoopsModule->getVar('dirname');
+        $mod_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname');
+        $modinfo = $xoopsModule->getInfo();
+        $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $this->target_mname);
+        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN);
     }
 
     // read xoops_version.php of the target
-    $this->block_configs = $this->get_block_configs() ;
+    $this->block_configs = $this->get_block_configs();
     }
 
 
 // virtual
 public function canEdit($block)
 {
-    return true ;
+    return true;
 }
 
 
@@ -141,9 +141,9 @@ 
 {
     // can delete if it is a cloned block
     if ($block->getVar('block_type') == 'D' || $block->getVar('block_type') == 'C') {
-        return true ;
+        return true;
     } else {
-        return false ;
+        return false;
     }
 }
 
@@ -156,23 +156,23 @@ 
 {
     // can clone link if it is marked as cloneable block
     if ($block->getVar('block_type') == 'D' || $block->getVar('block_type') == 'C') {
-        return 2 ;
+        return 2;
     } else {
         // $modversion['blocks'][n]['can_clone']
         foreach ($this->block_configs as $bconf) {
             if ($block->getVar('show_func') == @$bconf['show_func'] && $block->getVar('func_file') == @$bconf['file'] && (empty($bconf['template']) || $block->getVar('template') == @$bconf['template'])) {
-                if (! empty($bconf['can_clone'])) {
-                    return 2 ;
+                if (!empty($bconf['can_clone'])) {
+                    return 2;
                 }
             }
         }
     }
 
-    if (! empty($GLOBALS['altsysModuleConfig']['enable_force_clone'])) {
-        return 1 ;
+    if (!empty($GLOBALS['altsysModuleConfig']['enable_force_clone'])) {
+        return 1;
     }
 
-    return 0 ;
+    return 0;
 }
 
 
@@ -185,12 +185,12 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
-    return $block->getOptions() ;
+    return $block->getOptions();
 }
 
 
@@ -203,16 +203,16 @@ 
     // get selected targets
     if (is_array(@$block_data['bmodule'])) {
         // bmodule origined from request (preview etc.)
-        $selected_mids = $block_data['bmodule'] ;
+        $selected_mids = $block_data['bmodule'];
     } else {
         // origined from the table of `block_module_link`
-        $result = $this->db->query('SELECT module_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'") ;
+        $result = $this->db->query('SELECT module_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_mids = array();
         while (list($selected_mid) = $this->db->fetchRow($result)) {
             $selected_mids[] = (int)$selected_mid;
         }
         if (empty($selected_mids)) {
-            $selected_mids = array( 0 ) ;
+            $selected_mids = array(0);
         } // all pages
     }
 
@@ -221,25 +221,25 @@ 
     $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
     $criteria->add(new Criteria('isactive', 1));
     $module_list = $module_handler->getList($criteria);
-    $module_list= array( -1 => _MD_A_MYBLOCKSADMIN_TOPPAGE , 0 => _MD_A_MYBLOCKSADMIN_ALLPAGES ) + $module_list ;
+    $module_list = array( -1 => _MD_A_MYBLOCKSADMIN_TOPPAGE, 0 => _MD_A_MYBLOCKSADMIN_ALLPAGES ) + $module_list;
 
     // build options
-    $module_options = '' ;
+    $module_options = '';
     foreach ($module_list as $mid => $mname) {
-        $mname = htmlspecialchars($mname) ;
+        $mname = htmlspecialchars($mname);
         if (in_array($mid, $selected_mids)) {
-            $module_options .= "<option value='$mid' selected='selected'>$mname</option>\n" ;
+            $module_options .= "<option value='$mid' selected='selected'>$mname</option>\n";
         } else {
-            $module_options .= "<option value='$mid'>$mname</option>\n" ;
+            $module_options .= "<option value='$mid'>$mname</option>\n";
         }
     }
 
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
 					$module_options
-				</select>" ;
+				</select>";
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -252,41 +252,41 @@ 
     // get selected targets
     if (is_array(@$block_data['bgroup'])) {
         // bgroup origined from request (preview etc.)
-        $selected_gids = $block_data['bgroup'] ;
+        $selected_gids = $block_data['bgroup'];
     } else {
         // origined from the table of `group_perm`
-        $result = $this->db->query('SELECT gperm_groupid FROM ' . $this->db->prefix('group_permission') . " WHERE gperm_itemid='$bid' AND gperm_name='block_read'") ;
+        $result = $this->db->query('SELECT gperm_groupid FROM '.$this->db->prefix('group_permission')." WHERE gperm_itemid='$bid' AND gperm_name='block_read'");
         $selected_gids = array();
         while (list($selected_gid) = $this->db->fetchRow($result)) {
             $selected_gids[] = (int)$selected_gid;
         }
         if ($bid == 0 && empty($selected_gids)) {
-            $selected_gids = $GLOBALS['xoopsUser']->getGroups() ;
+            $selected_gids = $GLOBALS['xoopsUser']->getGroups();
         }
     }
 
     // get all targets
     $group_handler = xoops_gethandler('group');
-    $groups = $group_handler->getObjects() ;
+    $groups = $group_handler->getObjects();
 
     // build options
-    $group_options = '' ;
+    $group_options = '';
     foreach ($groups as $group) {
-        $gid = $group->getVar('groupid') ;
-        $gname = $group->getVar('name', 's') ;
+        $gid = $group->getVar('groupid');
+        $gname = $group->getVar('name', 's');
         if (in_array($gid, $selected_gids)) {
-            $group_options .= "<option value='$gid' selected='selected'>$gname</option>\n" ;
+            $group_options .= "<option value='$gid' selected='selected'>$gname</option>\n";
         } else {
-            $group_options .= "<option value='$gid'>$gname</option>\n" ;
+            $group_options .= "<option value='$gid'>$gname</option>\n";
         }
     }
 
     $ret = "
 				<select name='bgroups[$bid][]' size='5' multiple='multiple'>
 					$group_options
-				</select>" ;
+				</select>";
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -301,7 +301,7 @@ 
     $sseln = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = '';
     $scoln = $scol0 = $scol1 = $scol2 = $scol3 = $scol4 = 'unselected';
     $stextbox = 'unselected';
-    $value4extra_side = '' ;
+    $value4extra_side = '';
 
     if ($visible != 1) {
         $sseln = " checked='checked'";
@@ -311,27 +311,27 @@ 
         case XOOPS_SIDEBLOCK_LEFT :
             $ssel0 = " checked='checked'";
             $scol0 = 'selected';
-            break ;
+            break;
         case XOOPS_SIDEBLOCK_RIGHT :
             $ssel1 = " checked='checked'";
             $scol1 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_LEFT :
             $ssel2 = " checked='checked'";
             $scol2 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_RIGHT :
             $ssel4 = " checked='checked'";
             $scol4 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_CENTER :
             $ssel3 = " checked='checked'";
             $scol3 = 'selected';
-            break ;
+            break;
         default :
-            $value4extra_side = $side ;
+            $value4extra_side = $side;
             $stextbox = 'selected';
-            break ;
+            break;
     }
     }
 
@@ -361,7 +361,7 @@ 
 				<div class='blockposition $scoln'>
 					<input type='radio' name='sides[$bid]' value='-1' class='blockposition' $sseln onclick='document.getElementById(\"extra_side_$bid\").value=-1;' />
 				</div>
-                <div style='float:"._GLOBAL_LEFT.";'>"._NONE . '</div>
+                <div style='float:"._GLOBAL_LEFT.";'>"._NONE.'</div>
     ';
 }
 
@@ -369,58 +369,58 @@ 
 // public
 public function list_blocks()
 {
-    global $xoopsGTicket ;
+    global $xoopsGTicket;
 
     // main query
-    $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight" ;
-    $result = $this->db->query($sql) ;
-    $block_arr = array() ;
+    $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+    $result = $this->db->query($sql);
+    $block_arr = array();
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler = xoops_gethandler('block');//add
+        $handler = xoops_gethandler('block'); //add
     }
     while ($myrow = $this->db->fetchArray($result)) {
 
 //HACK by domifara
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $block_one =& $handler->create(false) ;
+            $block_one = & $handler->create(false);
             $block_one->assignVars($myrow);
-            $block_arr[] =& $block_one ;
+            $block_arr[] = & $block_one;
         } else {
-            $block_arr[] = new XoopsBlock($myrow) ;
+            $block_arr[] = new XoopsBlock($myrow);
         }
     }
     if (empty($block_arr)) {
-        return ;
+        return;
     }
 
     // blocks rendering loop
-    $blocks4assign = array() ;
+    $blocks4assign = array();
     foreach ($block_arr as $i => $block) {
         $block_data = array(
             'bid' => (int)$block->getVar('bid'),
-            'name' => $block->getVar('name', 'n') ,
-            'title' => $block->getVar('title', 'n') ,
+            'name' => $block->getVar('name', 'n'),
+            'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-            'can_edit' => $this->canEdit($block) ,
-            'can_delete' => $this->canDelete($block) ,
+            'can_edit' => $this->canEdit($block),
+            'can_delete' => $this->canDelete($block),
             'can_clone' => $this->canClone($block)
-        ) ;
+        );
         $blocks4assign[] = array(
-            'name_raw' => $block_data['name'] ,
-            'title_raw' => $block_data['title'] ,
-            'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-            'cell_module_link' =>  $this->renderCell4BlockModuleLink($block_data) ,
+            'name_raw' => $block_data['name'],
+            'title_raw' => $block_data['title'],
+            'cell_position' => $this->renderCell4BlockPosition($block_data),
+            'cell_module_link' =>  $this->renderCell4BlockModuleLink($block_data),
             'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data)
-        ) + $block_data ;
+        ) + $block_data;
     }
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-    $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+    $tpl = new D3Tpl();
     $tpl->assign(array(
         'target_mid' => $this->target_mid,
         'target_dirname' => $this->target_dirname,
@@ -429,22 +429,22 @@ 
         'cachetime_options' => $this->cachetime_options,
         'blocks' => $blocks4assign,
         'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
-    $tpl->display('db:altsys_main_myblocksadmin_list.html') ;
+    ));
+    $tpl->display('db:altsys_main_myblocksadmin_list.html');
 }
 
 
     public function get_block_configs()
     {
         if ($this->target_mid <= 0) {
-            return array() ;
+            return array();
         }
-        include XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php' ;
+        include XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php';
 
         if (empty($modversion['blocks'])) {
-            return array() ;
+            return array();
         } else {
-            return $modversion['blocks'] ;
+            return $modversion['blocks'];
         }
     }
 
@@ -452,51 +452,51 @@ 
     public function list_groups()
     {
         // query for getting blocks
-    $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight" ;
-        $result = $this->db->query($sql) ;
-        $block_arr = array() ;
+    $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+        $result = $this->db->query($sql);
+        $block_arr = array();
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler = xoops_gethandler('block');//add
+        $handler = xoops_gethandler('block'); //add
     }
         while ($myrow = $this->db->fetchArray($result)) {
             //HACK by domifara
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $block_one =& $handler->create(false) ;
+            $block_one = & $handler->create(false);
             $block_one->assignVars($myrow);
-            $block_arr[] =& $block_one ;
+            $block_arr[] = & $block_one;
         } else {
-            $block_arr[] = new XoopsBlock($myrow) ;
+            $block_arr[] = new XoopsBlock($myrow);
         }
         }
 
-        $item_list = array() ;
+        $item_list = array();
         foreach (array_keys($block_arr) as $i) {
-            $item_list[ $block_arr[$i]->getVar('bid') ] = $block_arr[$i]->getVar('title') ;
+            $item_list[$block_arr[$i]->getVar('bid')] = $block_arr[$i]->getVar('title');
         }
 
-        $form = new MyXoopsGroupPermForm(_MD_A_MYBLOCKSADMIN_PERMFORM, 1, 'block_read', '') ;
+        $form = new MyXoopsGroupPermForm(_MD_A_MYBLOCKSADMIN_PERMFORM, 1, 'block_read', '');
     // skip system (TODO)
     if ($this->target_mid > 1) {
-        $form->addAppendix('module_admin', $this->target_mid, $this->target_mname . ' ' . _MD_A_MYBLOCKSADMIN_PERM_MADMIN) ;
-        $form->addAppendix('module_read', $this->target_mid, $this->target_mname .' ' . _MD_A_MYBLOCKSADMIN_PERM_MREAD) ;
+        $form->addAppendix('module_admin', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MADMIN);
+        $form->addAppendix('module_read', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MREAD);
     }
         foreach ($item_list as $item_id => $item_name) {
-            $form->addItem($item_id, $item_name) ;
+            $form->addItem($item_id, $item_name);
         }
-        echo $form->render() ;
+        echo $form->render();
     }
 
 
-    public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options=array())
+    public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options = array())
     {
         global $xoopsConfig;
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
         $block = new XoopsBlock($bid);
     }
@@ -515,10 +515,10 @@ 
         }
         $block->setVar('bcachetime', $bcachetime);
         if (is_array($options) && count($options) > 0) {
-            $block->setVar('options', implode('|', $options)) ;
+            $block->setVar('options', implode('|', $options));
         }
         if ($block->getVar('block_type') == 'C') {
-            $name = $this->get_blockname_from_ctype($block->getVar('c_type')) ;
+            $name = $this->get_blockname_from_ctype($block->getVar('c_type'));
             $block->setVar('name', $name);
         }
         $msg = _MD_A_MYBLOCKSADMIN_DBUPDATED;
@@ -542,7 +542,7 @@ 
         } else {
             $msg = 'Failed update of block. ID:'.$bid;
         }
-        return $msg ;
+        return $msg;
     }
 
 
@@ -550,14 +550,14 @@ 
 public function updateBlockModuleLink($bid, $bmodules)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('block_module_link') ;
+    $table = $this->db->prefix('block_module_link');
 
-    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid";
+    $this->db->query($sql);
     foreach ($bmodules as $mid) {
         $mid = (int)$mid;
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`) VALUES ($bid,$mid)" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`block_id`,`module_id`) VALUES ($bid,$mid)";
+        $this->db->query($sql);
     }
 }
 
@@ -566,83 +566,83 @@ 
 public function updateBlockReadGroupPerm($bid, $req_gids)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('group_permission') ;
-    $req_gids = array_map('intval', $req_gids) ;
-    sort($req_gids) ;
+    $table = $this->db->prefix('group_permission');
+    $req_gids = array_map('intval', $req_gids);
+    sort($req_gids);
 
     // compare group ids from request and the records.
-    $sql = "SELECT `gperm_groupid` FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $result = $this->db->query($sql) ;
-    $db_gids = array() ;
+    $sql = "SELECT `gperm_groupid` FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $result = $this->db->query($sql);
+    $db_gids = array();
     while (list($gid) = $this->db->fetchRow($result)) {
-        $db_gids[] = $gid ;
+        $db_gids[] = $gid;
     }
-    $db_gids = array_map('intval', $db_gids) ;
-    sort($db_gids) ;
+    $db_gids = array_map('intval', $db_gids);
+    sort($db_gids);
 
     // if they are identical, just return (prevent increase of gperm_id)
     if (serialize($req_gids) == serialize($db_gids)) {
-        return ;
+        return;
     }
 
-    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $this->db->query($sql);
     foreach ($req_gids as $gid) {
         $gid = (int)$gid;
-        $sql = "INSERT INTO `$table` (`gperm_groupid`,`gperm_itemid`,`gperm_modid`,`gperm_name`) VALUES ($gid,$bid,1,'block_read')" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`gperm_groupid`,`gperm_itemid`,`gperm_modid`,`gperm_name`) VALUES ($gid,$bid,1,'block_read')";
+        $this->db->query($sql);
     }
 }
 
 
     public function do_order()
     {
-        $sides = is_array(@$_POST['sides']) ? $_POST['sides'] : array() ;
+        $sides = is_array(@$_POST['sides']) ? $_POST['sides'] : array();
         foreach (array_keys($sides) as $bid) {
-            $request = $this->fetchRequest4Block($bid) ;
+            $request = $this->fetchRequest4Block($bid);
 
         // update the block
-        $this->update_block($request['bid'], $request['side'], $request['weight'], $request['visible'], $request['title'], null, null, $request['bcachetime'], array()) ;
+        $this->update_block($request['bid'], $request['side'], $request['weight'], $request['visible'], $request['title'], null, null, $request['bcachetime'], array());
 
         // block_module_link update
-        $this->updateBlockModuleLink($bid, $request['bmodule']) ;
+        $this->updateBlockModuleLink($bid, $request['bmodule']);
 
         // group_permission update
-        $this->updateBlockReadGroupPerm($bid, $request['bgroup']) ;
+        $this->updateBlockReadGroupPerm($bid, $request['bgroup']);
         }
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 
     public function fetchRequest4Block($bid)
     {
         $bid = (int)$bid;
-        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
         if (@$_POST['extra_sides'][$bid] > 0) {
             $_POST['sides'][$bid] = (int)$_POST['extra_sides'][$bid];
         }
 
         if (@$_POST['sides'][$bid] < 0) {
-            $visible = 0 ;
-            $_POST['sides'][$bid] = -1 ;
+            $visible = 0;
+            $_POST['sides'][$bid] = -1;
         } else {
-            $visible = 1 ;
+            $visible = 1;
         }
 
         return array(
-        'bid' => $bid ,
+        'bid' => $bid,
             'side' => (int)(@$_POST['sides'][$bid]),
             'weight' => (int)(@$_POST['weights'][$bid]),
-        'visible' => $visible ,
-        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]) ,
-        'content' => $myts->stripSlashesGPC(@$_POST['contents'][$bid]) ,
-        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]) ,
+        'visible' => $visible,
+        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]),
+        'content' => $myts->stripSlashesGPC(@$_POST['contents'][$bid]),
+        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]),
             'bcachetime' => (int)(@$_POST['bcachetimes'][$bid]),
-        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array( 0 ) ,
-        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array() ,
+        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array(0),
+        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array(),
         'options' => is_array(@$_POST['options'][$bid]) ? $_POST['options'][$bid] : array()
-    ) ;
+    );
     }
 
 
@@ -653,30 +653,30 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! is_object($block)) {
-            die('Invalid bid') ;
+        if (!is_object($block)) {
+            die('Invalid bid');
         }
-        if (! $this->canDelete($block)) {
-            die('Cannot delete this block') ;
+        if (!$this->canDelete($block)) {
+            die('Cannot delete this block');
         }
         $this->do_deleteBlockReadGroupPerm($bid); //HACK add by domifara
-    $block->delete() ;
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+    $block->delete();
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 //HACK add by domifara
 public function do_deleteBlockReadGroupPerm($bid)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('group_permission') ;
-    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $this->db->query($sql) ;
+    $table = $this->db->prefix('group_permission');
+    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $this->db->query($sql);
 }
 
     public function form_delete($bid)
@@ -687,24 +687,24 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! is_object($block)) {
-            die('Invalid bid') ;
+        if (!is_object($block)) {
+            die('Invalid bid');
         }
-        if (! $this->canDelete($block)) {
-            die('Cannot delete this block') ;
+        if (!$this->canDelete($block)) {
+            die('Cannot delete this block');
         }
 
     // breadcrumbs
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-        $breadcrumbsObj->appendPath('', _DELETE) ;
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+        $breadcrumbsObj->appendPath('', _DELETE);
 
-        xoops_confirm(array( 'op' => 'delete_ok' ) + $GLOBALS['xoopsGTicket']->getTicketArray(__LINE__, 1800, 'myblocksadmin'), "?mode=admin&amp;lib=altsys&amp;page=myblocksadmin&amp;dirname=$this->target_dirname&amp;bid=$bid", sprintf(_MD_A_MYBLOCKSADMIN_FMT_REMOVEBLOCK, $block->getVar('title'))) ;
+        xoops_confirm(array('op' => 'delete_ok') + $GLOBALS['xoopsGTicket']->getTicketArray(__LINE__, 1800, 'myblocksadmin'), "?mode=admin&amp;lib=altsys&amp;page=myblocksadmin&amp;dirname=$this->target_dirname&amp;bid=$bid", sprintf(_MD_A_MYBLOCKSADMIN_FMT_REMOVEBLOCK, $block->getVar('title')));
     }
 
 
@@ -712,30 +712,30 @@ 
     {
         $bid = (int)$bid;
 
-        $request = $this->fetchRequest4Block($bid) ;
+        $request = $this->fetchRequest4Block($bid);
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! $block->getVar('bid')) {
-            die('Invalid bid') ;
+        if (!$block->getVar('bid')) {
+            die('Invalid bid');
         }
-        if (! $this->canClone($block)) {
-            die('Invalid block_type') ;
+        if (!$this->canClone($block)) {
+            die('Invalid block_type');
         }
 
         if (empty($_POST['options'])) {
-            $options = array() ;
+            $options = array();
         } elseif (is_array($_POST['options'])) {
-            $options = $_POST['options'] ;
+            $options = $_POST['options'];
         } else {
-            $options = explode('|', $_POST['options']) ;
+            $options = explode('|', $_POST['options']);
         }
 
     // for backward compatibility
@@ -743,46 +743,46 @@ 
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $cblock =& $handler->create(false) ;
+        $cblock = & $handler->create(false);
     } else {
-        $cblock = new XoopsBlock() ;
+        $cblock = new XoopsBlock();
     }
 
         foreach ($block->vars as $k => $v) {
-            $cblock->assignVar($k, $v['value']) ;
+            $cblock->assignVar($k, $v['value']);
         }
         $cblock->setNew();
         $cblock->setVar('bid', 0);
         $cblock->setVar('block_type', $block->getVar('block_type') == 'C' ? 'C' : 'D');
-        $cblock->setVar('func_num', $this->find_func_num_vacancy($block->getVar('mid'))) ;
+        $cblock->setVar('func_num', $this->find_func_num_vacancy($block->getVar('mid')));
     // store the block into DB as a new one
-    $newbid = $cblock->store() ;
-        if (! $newbid) {
-            return $cblock->getHtmlErrors() ;
+    $newbid = $cblock->store();
+        if (!$newbid) {
+            return $cblock->getHtmlErrors();
         }
 
     // update the block by the request
-    $this->update_block($newbid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array()) ;
+    $this->update_block($newbid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array());
 
     // block_module_link update
-    $this->updateBlockModuleLink($newbid, $request['bmodule']) ;
+    $this->updateBlockModuleLink($newbid, $request['bmodule']);
 
     // group_permission update
-    $this->updateBlockReadGroupPerm($newbid, $request['bgroup']) ;
+    $this->updateBlockReadGroupPerm($newbid, $request['bgroup']);
 
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 
     public function find_func_num_vacancy($mid)
     {
-        $func_num = 256 ;
+        $func_num = 256;
         do {
-            $func_num -- ;
-            list($count) = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM ' . $this->db->prefix('newblocks') . ' WHERE mid=' . (int)$mid . ' AND func_num=' . $func_num)) ;
-        } while ($count > 0) ;
+            $func_num--;
+            list($count) = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM '.$this->db->prefix('newblocks').' WHERE mid='.(int)$mid.' AND func_num='.$func_num));
+        } while ($count > 0);
 
-        return $func_num > 128 ? $func_num : 255 ;
+        return $func_num > 128 ? $func_num : 255;
     }
 
 
@@ -796,36 +796,36 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $new_block =& $handler->create(false) ;
+        $new_block = & $handler->create(false);
     } else {
-        $new_block = new XoopsBlock() ;
+        $new_block = new XoopsBlock();
     }
 
-            $new_block->setNew() ;
-            $new_block->setVar('name', $this->get_blockname_from_ctype('C')) ;
-            $new_block->setVar('block_type', 'C') ;
-            $new_block->setVar('func_num', 0) ;
-            $bid = $new_block->store() ;
-            $request = $this->fetchRequest4Block(0) ;
+            $new_block->setNew();
+            $new_block->setVar('name', $this->get_blockname_from_ctype('C'));
+            $new_block->setVar('block_type', 'C');
+            $new_block->setVar('func_num', 0);
+            $bid = $new_block->store();
+            $request = $this->fetchRequest4Block(0);
         // permission copy
         foreach ($GLOBALS['xoopsUser']->getGroups() as $gid) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
+            $sql = 'INSERT INTO '.$this->db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
             $this->db->query($sql);
         }
         } else {
-            $request = $this->fetchRequest4Block($bid) ;
+            $request = $this->fetchRequest4Block($bid);
         }
 
     // update the block by the request
-    $msg = $this->update_block($bid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array()) ;
+    $msg = $this->update_block($bid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array());
 
     // block_module_link update
-    $this->updateBlockModuleLink($bid, $request['bmodule']) ;
+    $this->updateBlockModuleLink($bid, $request['bmodule']);
 
     // group_permission update
-    $this->updateBlockReadGroupPerm($bid, $request['bgroup']) ;
+    $this->updateBlockReadGroupPerm($bid, $request['bgroup']);
 
-        return $msg ;
+        return $msg;
     }
 
 
@@ -836,57 +836,57 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! $block->getVar('bid')) {
+        if (!$block->getVar('bid')) {
             // new defaults
-        $bid = 0 ;
-            $mode = 'new' ;
-            $block->setVar('mid', 0) ;
-            $block->setVar('block_type', 'C') ;
+        $bid = 0;
+            $mode = 'new';
+            $block->setVar('mid', 0);
+            $block->setVar('block_type', 'C');
         }
 
         switch ($mode) {
         case 'clone' :
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
-            $next_op = 'clone_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE;
+            $next_op = 'clone_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM);
+            break;
         case 'new' :
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
-            $next_op = 'new_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW;
+            $next_op = 'new_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM);
+            break;
         case 'edit' :
         default :
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
-            $next_op = 'edit_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT;
+            $next_op = 'edit_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM);
+            break;
     }
 
-        $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
-        $block_template =& $block->getVar('template', 'n') ;
-        $block_template_tplset = '' ;
+        $is_custom = in_array($block->getVar('block_type'), array('C', 'E')) ? true : false;
+        $block_template = & $block->getVar('template', 'n');
+        $block_template_tplset = '';
 
-        if (! $is_custom && $block_template) {
+        if (!$is_custom && $block_template) {
             // find template of the block
         $tplfile_handler = xoops_gethandler('tplfile');
-            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template) ;
-            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default' ;
+            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template);
+            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default';
         }
 //HACK by domifara
 /*
@@ -895,43 +895,43 @@ 
     }
 */
     $block_data = $this->preview_request + array(
-        'bid' => $bid ,
-        'name' => $block->getVar('name', 'n') ,
-        'title' => $block->getVar('title', 'n') ,
+        'bid' => $bid,
+        'name' => $block->getVar('name', 'n'),
+        'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-        'template' => $block_template ,
-        'template_tplset' => $block_template_tplset ,
-        'options' => $block->getVar('options') ,
-        'content' => $block->getVar('content', 'n') ,
-        'is_custom' => $is_custom ,
-        'type' => $block->getVar('block_type') ,
+        'template' => $block_template,
+        'template_tplset' => $block_template_tplset,
+        'options' => $block->getVar('options'),
+        'content' => $block->getVar('content', 'n'),
+        'is_custom' => $is_custom,
+        'type' => $block->getVar('block_type'),
         'ctype' => $block->getVar('c_type')
-    ) ;
+    );
 
         $block4assign = array(
-        'name_raw' => $block_data['name'] ,
-        'title_raw' => $block_data['title'] ,
-        'content_raw' => $block_data['content'] ,
-        'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data) ,
-        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data) ,
-        'cell_options' => $this->renderCell4BlockOptions($block_data) ,
+        'name_raw' => $block_data['name'],
+        'title_raw' => $block_data['title'],
+        'content_raw' => $block_data['content'],
+        'cell_position' => $this->renderCell4BlockPosition($block_data),
+        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data),
+        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data),
+        'cell_options' => $this->renderCell4BlockOptions($block_data),
         'content_preview' => $this->previewContent($block_data)
-    ) + $block_data ;
+    ) + $block_data;
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-        $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+        $tpl = new D3Tpl();
 
     //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $tpl->assign('xoops_cube_legacy', true) ;
+        $tpl->assign('xoops_cube_legacy', true);
         include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     } else {
-        $tpl->assign('xoops_cube_legacy', false) ;
+        $tpl->assign('xoops_cube_legacy', false);
     }
 
         $tpl->assign(array(
@@ -946,14 +946,14 @@ 
         'submit_button' => $button_value,
         'common_fck_installed' => $this->checkFck(),
         'gticket_hidden' => $GLOBALS['xoopsGTicket']->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
+    ));
 
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.html') ;
+            $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.html');
         } else {
-            $tpl->display('db:altsys_main_myblocksadmin_edit.html') ;
+            $tpl->display('db:altsys_main_myblocksadmin_edit.html');
         }
-        return ;
+        return;
     }
 
     public function checkFck()
@@ -965,16 +965,16 @@ 
     {
         $bid = (int)$block_data['bid'];
 
-        if (! $block_data['is_custom']) {
-            return '' ;
+        if (!$block_data['is_custom']) {
+            return '';
         }
         if (empty($this->preview_request)) {
-            return '' ;
+            return '';
         }
 
 //HACK by domifara
 //TODO : need no hook block at this
-    $block = new XoopsBlock($bid) ;
+    $block = new XoopsBlock($bid);
 /*
     $handler = xoops_gethandler('block');
     $block =& $handler->create(false) ;
@@ -982,68 +982,68 @@ 
 */
 
     if ($block->getVar('mid')) {
-        return '' ;
+        return '';
     }
 
-        $block->setVar('title', $block_data['title']) ;
-        $block->setVar('content', $block_data['content']) ;
+        $block->setVar('title', $block_data['title']);
+        $block->setVar('content', $block_data['content']);
 
-        restore_error_handler() ;
-        $original_level = error_reporting(E_ALL) ;
-        $ret =& $block->getContent('S', $block_data['ctype']) ;
-        error_reporting($original_level) ;
+        restore_error_handler();
+        $original_level = error_reporting(E_ALL);
+        $ret = & $block->getContent('S', $block_data['ctype']);
+        error_reporting($original_level);
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function get_blockname_from_ctype($bctype)
     {
         $ctypes = array(
-        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML ,
-        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ,
-        'N' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE ,
+        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML,
+        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE,
+        'N' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE,
         'P' => _MD_A_MYBLOCKSADMIN_CTYPE_PHP
-    ) ;
+    );
 
-        return isset($ctypes[$bctype]) ? $ctypes[$bctype] : _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ;
+        return isset($ctypes[$bctype]) ? $ctypes[$bctype] : _MD_A_MYBLOCKSADMIN_CTYPE_SMILE;
     }
 
 
     public function processPost()
     {
         // Ticket Check
-    if (! $GLOBALS['xoopsGTicket']->check(true, 'myblocksadmin')) {
+    if (!$GLOBALS['xoopsGTicket']->check(true, 'myblocksadmin')) {
         redirect_header(XOOPS_URL.'/', 3, $GLOBALS['xoopsGTicket']->getErrors());
     }
 
-        $msg = '' ;
+        $msg = '';
         $bid = (int)(@$_GET['bid']);
-        if (! empty($_POST['preview'])) {
+        if (!empty($_POST['preview'])) {
             // preview
-        $this->preview_request = $this->fetchRequest4Block($bid) ;
-            $_GET['op'] = str_replace('_ok', '', @$_POST['op']) ;
-            return ; // continue ;
+        $this->preview_request = $this->fetchRequest4Block($bid);
+            $_GET['op'] = str_replace('_ok', '', @$_POST['op']);
+            return; // continue ;
         } elseif (@$_POST['op'] == 'order') {
             // order ok
-        $msg = $this->do_order() ;
+        $msg = $this->do_order();
         } elseif (@$_POST['op'] == 'delete_ok') {
             // delete ok
-        $msg = $this->do_delete($bid) ;
+        $msg = $this->do_delete($bid);
         } elseif (@$_POST['op'] == 'clone_ok') {
             // clone ok
-        $msg = $this->do_clone($bid) ;
+        $msg = $this->do_clone($bid);
         } elseif (@$_POST['op'] == 'edit_ok' || @$_POST['op'] == 'new_ok') {
             // edit ok
-        $msg = $this->do_edit($bid) ;
-        } elseif (! empty($_POST['submit'])) {
+        $msg = $this->do_edit($bid);
+        } elseif (!empty($_POST['submit'])) {
             // update module_admin,module_read,block_read
-        include dirname(__DIR__).'/include/mygroupperm.php' ;
-            $msg = _MD_A_MYBLOCKSADMIN_PERMUPDATED ;
+        include dirname(__DIR__).'/include/mygroupperm.php';
+            $msg = _MD_A_MYBLOCKSADMIN_PERMUPDATED;
         }
 
-        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, 1, $msg) ;
-        exit ;
+        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, 1, $msg);
+        exit;
     }
 
 
@@ -1052,22 +1052,22 @@ 
         $bid = (int)(@$_GET['bid']);
         switch (@$_GET['op']) {
         case 'clone' :
-            $this->form_edit($bid, 'clone') ;
-            break ;
+            $this->form_edit($bid, 'clone');
+            break;
         case 'new' :
         case 'edit' :
-            $this->form_edit($bid, 'edit') ;
-            break ;
+            $this->form_edit($bid, 'edit');
+            break;
         case 'delete' :
-            $this->form_delete($bid) ;
-            break ;
+            $this->form_delete($bid);
+            break;
         case 'list' :
         default :
             // the first form (blocks)
-            $this->list_blocks() ;
+            $this->list_blocks();
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
+            $this->list_groups();
+            break;
     }
     }
 }

xoops_trust_path/libs/altsys/mylangadmin.php

Spacing +114 added lines, -114 removed lines

@@ -5,170 +5,170 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/lang_functions.php' ;
-include_once __DIR__.'/class/D3LanguageManager.class.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/lang_functions.php';
+include_once __DIR__.'/class/D3LanguageManager.class.php';
 
 
 // only groups have 'module_admin' of 'altsys' can do that.
-$module_handler = xoops_gethandler('module') ;
-$module =& $module_handler->getByDirname('altsys') ;
-if (! is_object($module)) {
-    die('install altsys') ;
+$module_handler = xoops_gethandler('module');
+$module = & $module_handler->getByDirname('altsys');
+if (!is_object($module)) {
+    die('install altsys');
 }
-$moduleperm_handler = xoops_gethandler('groupperm') ;
-if (! is_object(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
-    die('only admin of altsys can access this area') ;
+$moduleperm_handler = xoops_gethandler('groupperm');
+if (!is_object(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 
 // initials
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
-$langman =& D3LanguageManager::getInstance() ;
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+$langman = & D3LanguageManager::getInstance();
 
 // language file of this controller
-altsys_include_language_file('mylangadmin') ;
+altsys_include_language_file('mylangadmin');
 
 // check $xoopsModule
-if (! is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM) ;
+if (!is_object($xoopsModule)) {
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // set target_module if specified by $_GET['dirname']
 $module_handler = xoops_gethandler('module');
-if (! empty($_GET['dirname'])) {
-    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']) ;
-    $target_module =& $module_handler->getByDirname($dirname) ;
+if (!empty($_GET['dirname'])) {
+    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']);
+    $target_module = & $module_handler->getByDirname($dirname);
 }
 
-if (! empty($target_module) && is_object($target_module)) {
+if (!empty($target_module) && is_object($target_module)) {
     // specified by dirname (for langadmin as an independent module)
-    $target_mid = $target_module->getVar('mid') ;
-    $target_dirname = $target_module->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $target_module->getVar('name') . '&nbsp;' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0) ;
+    $target_mid = $target_module->getVar('mid');
+    $target_dirname = $target_module->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $target_module->getVar('name').'&nbsp;'.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
     //$query4redirect = '?dirname='.urlencode(strip_tags($_GET['dirname'])) ;
 } else {
     // not specified by dirname (for 3rd party modules as mylangadmin)
-    $target_mid = $xoopsModule->getVar('mid') ;
-    $target_dirname = $xoopsModule->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $xoopsModule->getVar('name') ;
+    $target_mid = $xoopsModule->getVar('mid');
+    $target_dirname = $xoopsModule->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $xoopsModule->getVar('name');
     //$query4redirect = '' ;
 }
 
 // basic GET variables
-$target_lang = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['target_lang']) ;
+$target_lang = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['target_lang']);
 if (empty($target_lang)) {
-    $target_lang = $GLOBALS['xoopsConfig']['language'] ;
+    $target_lang = $GLOBALS['xoopsConfig']['language'];
 }
-$target_lang4sql = addslashes($target_lang) ;
-$target_file = preg_replace('/[^0-9a-zA-Z_.-]/', '', @$_GET['target_file']) ;
+$target_lang4sql = addslashes($target_lang);
+$target_file = preg_replace('/[^0-9a-zA-Z_.-]/', '', @$_GET['target_file']);
 if (empty($target_file)) {
-    $target_file = 'main.php' ;
+    $target_file = 'main.php';
 }
 
 // get $target_trustdirname
-$mytrustdirname = '' ;
+$mytrustdirname = '';
 if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php')) {
-    require XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php' ;
+    require XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php';
 }
-$target_trustdirname = $mytrustdirname ;
+$target_trustdirname = $mytrustdirname;
 
 // get base directory
 if (empty($target_trustdirname)) {
     // conventinal module
-    $base_dir = XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/language' ;
+    $base_dir = XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/language';
 } else {
     // D3 module
-    $base_dir = XOOPS_TRUST_PATH.'/modules/'.$target_trustdirname.'/language' ;
+    $base_dir = XOOPS_TRUST_PATH.'/modules/'.$target_trustdirname.'/language';
 }
 
 // make list of language and check $target_lang
-$languages = array() ;
-$languages4disp = array() ;
-if (! is_dir($base_dir)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODNOLANGUAGE) ;
+$languages = array();
+$languages4disp = array();
+if (!is_dir($base_dir)) {
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODNOLANGUAGE);
 }
-$dh = opendir($base_dir) ;
+$dh = opendir($base_dir);
 if ($dh) {
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if (is_dir("$base_dir/$file")) {
-            list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='" . addslashes($file) . "'")) ;
-            $languages[] = $file ;
-            $languages4disp[] = $file . " ($count)" ;
+            list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='".addslashes($file)."'"));
+            $languages[] = $file;
+            $languages4disp[] = $file." ($count)";
         }
     }
 }
-closedir($dh) ;
-if (! in_array($target_lang, $languages)) {
-    $target_lang = $languages[0] ;
+closedir($dh);
+if (!in_array($target_lang, $languages)) {
+    $target_lang = $languages[0];
 }
 
 // get base directory seleced language
-$lang_base_dir = $base_dir.'/'.$target_lang ;
-if (! is_dir($lang_base_dir)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODLANGINCOMPATIBLE) ;
+$lang_base_dir = $base_dir.'/'.$target_lang;
+if (!is_dir($lang_base_dir)) {
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODLANGINCOMPATIBLE);
 }
 
 // make list of files and check $target_file
-$lang_files = array() ;
-$dh = opendir($lang_base_dir) ;
+$lang_files = array();
+$dh = opendir($lang_base_dir);
 if ($dh) {
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if ($file == 'index.html') {
-            continue ;
+            continue;
         }
     //if( $file == 'modinfo.php' ) continue ; // TODO(?)
     //if( $file == 'global.php' ) continue ; // TODO(?)
     if (is_file("$lang_base_dir/$file")) {
-        $lang_files[] = $file ;
+        $lang_files[] = $file;
     }
     }
 }
-closedir($dh) ;
+closedir($dh);
 if (empty($lang_files)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODEMPTYLANGDIR) ;
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODEMPTYLANGDIR);
 }
-if (! in_array($target_file, $lang_files)) {
-    $target_file = $lang_files[0] ;
+if (!in_array($target_file, $lang_files)) {
+    $target_file = $lang_files[0];
 }
 
 // get unique path of language_file
-$langfile_unique_path = "$lang_base_dir/$target_file" ;
+$langfile_unique_path = "$lang_base_dir/$target_file";
 
 // get constants defined by the target_file
-list($langfile_names, $constpref, $already_read) = altsys_mylangadmin_get_constant_names($langfile_unique_path, $target_dirname) ;
+list($langfile_names, $constpref, $already_read) = altsys_mylangadmin_get_constant_names($langfile_unique_path, $target_dirname);
 
 // get user_values should be overridden
-$langfile_constants = array() ;
+$langfile_constants = array();
 foreach ($langfile_names as $name) {
-    list($value) = $db->fetchRow($db->query('SELECT value FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='$target_lang4sql' AND name='" . addslashes($name) . "'")) ;
-    $langfile_constants[ $name ] = $value ;
+    list($value) = $db->fetchRow($db->query('SELECT value FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'"));
+    $langfile_constants[$name] = $value;
 }
 
 // constants defined in XOOPS_ROOT_PATH/my_language/(dirname)/...
 if ($langman->my_language) {
-    $mylang_unique_path = $langman->my_language.'/modules/'.$target_dirname.'/'.$target_lang.'/'.$target_file ;
-    $mylang_constants = array_map('htmlspecialchars', altsys_mylangadmin_get_constants_by_pcre($mylang_unique_path)) ;
+    $mylang_unique_path = $langman->my_language.'/modules/'.$target_dirname.'/'.$target_lang.'/'.$target_file;
+    $mylang_constants = array_map('htmlspecialchars', altsys_mylangadmin_get_constants_by_pcre($mylang_unique_path));
     foreach ($mylang_constants as $key => $val) {
-        if (! in_array($key, array_keys($langfile_constants))) {
-            $langfile_constants[ $key ] = null ;
-            define($key, _MYLANGADMIN_NOTE_ADDEDBYMYLANG) ;
+        if (!in_array($key, array_keys($langfile_constants))) {
+            $langfile_constants[$key] = null;
+            define($key, _MYLANGADMIN_NOTE_ADDEDBYMYLANG);
         }
     }
 } else {
-    $mylang_unique_path = '' ;
-    $mylang_constants = array() ;
+    $mylang_unique_path = '';
+    $mylang_constants = array();
 }
 
 
@@ -177,57 +177,57 @@ 
 //
 
 // Update language table and cache file
-if (! empty($_POST['do_update'])) {
+if (!empty($_POST['do_update'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check(true, 'altsys')) {
+    if (!$xoopsGTicket->check(true, 'altsys')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     // read original file
-    $file_contents = file_get_contents($langfile_unique_path) ;
+    $file_contents = file_get_contents($langfile_unique_path);
 
     // insert fingerprint of langfile_unique_path
-    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path) ;
-    $file_contents = str_replace('<?php', "<?php\nif(!defined('$langfile_fingerprint'))define('$langfile_fingerprint',1);", $file_contents) ;
+    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path);
+    $file_contents = str_replace('<?php', "<?php\nif(!defined('$langfile_fingerprint'))define('$langfile_fingerprint',1);", $file_contents);
 
     // constants loop
-    $overrides_counter = 0 ;
+    $overrides_counter = 0;
     foreach (array_reverse($langfile_names) as $name) {
-        $user_value = $myts->stripSlashesGPC(@$_POST[$name]) ;
-        $db->query('DELETE FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='$target_lang4sql' AND name='" . addslashes($name) . "'") ;
+        $user_value = $myts->stripSlashesGPC(@$_POST[$name]);
+        $db->query('DELETE FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'");
         if ($user_value !== '') {
-            $overrides_counter ++ ;
+            $overrides_counter++;
             // Update table
-            $db->query('INSERT INTO ' . $db->prefix('altsys_language_constants') . " (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','" . addslashes($name) . "','" . addslashes($user_value) . "')") ;
+            $db->query('INSERT INTO '.$db->prefix('altsys_language_constants')." (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','".addslashes($name)."','".addslashes($user_value)."')");
             // rewrite script for cache
             // comment-out the line of define()
             if (empty($constpref)) {
-                $from = '/.*define\s?\(\s*(["\'])'.preg_quote($name).'(\\1).*\;.*/' ;
+                $from = '/.*define\s?\(\s*(["\'])'.preg_quote($name).'(\\1).*\;.*/';
             } else {
-                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])'.preg_quote(substr($name, strlen($constpref))).'(\\1).*\;.*/' ;
+                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])'.preg_quote(substr($name, strlen($constpref))).'(\\1).*\;.*/';
             }
-            $to = '//$0'."\ndefine('".addslashes($name)."','".addslashes($user_value)."');" ;
-            $file_contents = preg_replace($from, $to, $file_contents) ;
+            $to = '//$0'."\ndefine('".addslashes($name)."','".addslashes($user_value)."');";
+            $file_contents = preg_replace($from, $to, $file_contents);
         }
     }
 
     // get the file name for caching
-    $cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang) ;
+    $cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang);
 
     // Create language cache file
     if ($overrides_counter > 0) {
-        $fp = fopen($cache_file_name, 'wb') ;
-        if (! $fp) {
-            die('Invalid Cache Directory. (Set XOOPS_TRUST_PATH/cache writable)') ;
+        $fp = fopen($cache_file_name, 'wb');
+        if (!$fp) {
+            die('Invalid Cache Directory. (Set XOOPS_TRUST_PATH/cache writable)');
         }
-        fwrite($fp, $file_contents) ;
-        fclose($fp) ;
+        fwrite($fp, $file_contents);
+        fclose($fp);
     } else {
-        unlink($cache_file_name) ;
+        unlink($cache_file_name);
     }
 
-    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname='.$target_dirname.'&target_lang='.rawurlencode($target_lang).'&target_file='.rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED) ;
-    exit ;
+    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname='.$target_dirname.'&target_lang='.rawurlencode($target_lang).'&target_file='.rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED);
+    exit;
 }
 
 
@@ -236,22 +236,22 @@ 
 //
 
 // check cache file
-$cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang) ;
-$cache_file_mtime = file_exists($cache_file_name) ? filemtime($cache_file_name) : 0 ;
+$cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang);
+$cache_file_mtime = file_exists($cache_file_name) ? filemtime($cache_file_name) : 0;
 
 // check core version and generate message to enable D3LanguageManager
 if (altsys_get_core_type() == ALTSYS_CORE_TYPE_XCL21) {
     // XoopsCube Legacy without preload
     if (class_exists('AltsysLangMgr_LanguageManager')) {
         // the preload enabled
-        $notice4disp = _MYLANGADMIN_MSG_D3LANGMANENABLED ;
+        $notice4disp = _MYLANGADMIN_MSG_D3LANGMANENABLED;
     } else {
         // the preload disabled
-        $notice4disp = sprintf(_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL, 'SetupAltsysLangMgr.class.php', 'XOOPS_ROOT_PATH/preload') ;
+        $notice4disp = sprintf(_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL, 'SetupAltsysLangMgr.class.php', 'XOOPS_ROOT_PATH/preload');
     }
 } else {
     // X2 core etc.
-    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2.'<br />' ;
+    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2.'<br />';
     $notice4disp .= '
 		<h4>include/common.php</h4>
 		<pre>
@@ -275,20 +275,20 @@ 
 //
 
 
-xoops_cp_header() ;
+xoops_cp_header();
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
 // breadcrumbs
-$breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+$breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
 if ($breadcrumbsObj->hasPaths()) {
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN) ;
-    $breadcrumbsObj->appendPath('', $target_mname) ;
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
+    $breadcrumbsObj->appendPath('', $target_mname);
 }
 
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'target_dirname' => $target_dirname,
     'target_mname' => $target_mname,
@@ -307,8 +307,8 @@ 
     'notice' => $notice4disp,
     'already_read' => $already_read,
     'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys')
-)) ;
-$tpl->display('db:altsys_main_mylangadmin.html') ;
+));
+$tpl->display('db:altsys_main_mylangadmin.html');
 
-xoops_cp_footer() ;
-exit ;
+xoops_cp_footer();
+exit;

xoops_trust_path/libs/altsys/include/autoupdate_from_module.inc.php

Spacing +16 added lines, -16 removed lines

@@ -1,45 +1,45 @@
 <?php
 
-if (! $xoopsConfig['theme_fromfile']) {
-    return ;
+if (!$xoopsConfig['theme_fromfile']) {
+    return;
 }
 
 // templates/ under modules
 // $tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
 
-if (! is_array(@$tplsadmin_autoupdate_dirnames)) {
-    return ;
+if (!is_array(@$tplsadmin_autoupdate_dirnames)) {
+    return;
 }
 
 foreach ($tplsadmin_autoupdate_dirnames as $dirname) {
-    $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname) ;
-    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates' ;
+    $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname);
+    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates';
 
     // modules
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
         while (($file = readdir($handler)) !== false) {
-            $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
+            $file_path = $tplsadmin_autoupdate_path.'/'.$file;
             if (is_file($file_path) && substr($file, -5) == '.html') {
                 $mtime = (int)(@filemtime($file_path));
-                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
+                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
                 if ($count <= 0) {
-                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
+                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }
             }
         }
     }
 
     // blocks
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/blocks/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/blocks/')) {
         while (($file = readdir($handler)) !== false) {
-            $file_path = $tplsadmin_autoupdate_path . '/blocks/' . $file ;
+            $file_path = $tplsadmin_autoupdate_path.'/blocks/'.$file;
             if (is_file($file_path) && substr($file, -5) == '.html') {
                 $mtime = (int)(@filemtime($file_path));
-                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
+                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
                 if ($count <= 0) {
-                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
+                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }
             }
         }

xoops_trust_path/libs/altsys/include/autoupdate_from_theme.inc.php

Spacing +8 added lines, -8 removed lines

@@ -1,21 +1,21 @@
 <?php
 
-if (! $xoopsConfig['theme_fromfile']) {
-    return ;
+if (!$xoopsConfig['theme_fromfile']) {
+    return;
 }
 
 // templates/ under the theme
-$tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
+$tplsadmin_autoupdate_path = XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/templates';
 
-if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
     while (($file = readdir($handler)) !== false) {
-        $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
+        $file_path = $tplsadmin_autoupdate_path.'/'.$file;
         if (is_file($file_path) && substr($file, -5) == '.html') {
             $mtime = (int)(@filemtime($file_path));
-            list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
+            list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
             if ($count <= 0) {
-                include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
+                include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
             }
         }
     }

xoops_trust_path/libs/altsys/include/altsys_functions.php

Spacing +56 added lines, -56 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 
-altsys_set_module_config() ;
+altsys_set_module_config();
 
 function altsys_set_module_config()
 {
-    global $altsysModuleConfig , $altsysModuleId ;
+    global $altsysModuleConfig, $altsysModuleId;
 
-    $module_handler = xoops_gethandler('module') ;
-    $module =& $module_handler->getByDirname('altsys') ;
+    $module_handler = xoops_gethandler('module');
+    $module = & $module_handler->getByDirname('altsys');
     if (is_object($module)) {
-        $config_handler = xoops_gethandler('config') ;
-        $altsysModuleConfig = $config_handler->getConfigList($module->getVar('mid')) ;
-        $altsysModuleId = $module->getVar('mid') ;
+        $config_handler = xoops_gethandler('config');
+        $altsysModuleConfig = $config_handler->getConfigList($module->getVar('mid'));
+        $altsysModuleId = $module->getVar('mid');
     } else {
-        $altsysModuleConfig = array() ;
-        $altsysModuleId = 0 ;
+        $altsysModuleConfig = array();
+        $altsysModuleId = 0;
     }
 
     // for RTL users
-    @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left') ;
-    @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right') ;
+    @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left');
+    @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right');
 }
 
 
 function altsys_include_mymenu()
 {
-    global $xoopsModule , $xoopsConfig , $mydirname , $mydirpath , $mytrustdirname , $mytrustdirpath , $mymenu_fake_uri ;
+    global $xoopsModule, $xoopsConfig, $mydirname, $mydirpath, $mytrustdirname, $mytrustdirpath, $mymenu_fake_uri;
 
     $mymenu_find_paths = array(
-        $mydirpath.'/admin/mymenu.php' ,
-        $mydirpath.'/mymenu.php' ,
-        $mytrustdirpath.'/admin/mymenu.php' ,
+        $mydirpath.'/admin/mymenu.php',
+        $mydirpath.'/mymenu.php',
+        $mytrustdirpath.'/admin/mymenu.php',
         $mytrustdirpath.'/mymenu.php'
-    ) ;
+    );
 
     foreach ($mymenu_find_paths as $mymenu_find_path) {
         if (file_exists($mymenu_find_path)) {
-            include $mymenu_find_path ;
-            include_once __DIR__.'/adminmenu_functions.php' ;
-            altsys_adminmenu_insert_mymenu($xoopsModule) ;
-            altsys_adminmenu_hack_ft() ;
-            break ;
+            include $mymenu_find_path;
+            include_once __DIR__.'/adminmenu_functions.php';
+            altsys_adminmenu_insert_mymenu($xoopsModule);
+            altsys_adminmenu_hack_ft();
+            break;
         }
     }
 }
@@ -48,58 +48,58 @@ 
 
 function altsys_include_language_file($type)
 {
-    $mylang = $GLOBALS['xoopsConfig']['language'] ;
+    $mylang = $GLOBALS['xoopsConfig']['language'];
 
     if (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
-        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php' ;
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
     } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
-        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php' ;
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
     } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
-        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php' ;
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
     } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
-        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php' ;
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php';
     }
 }
 
 
-define('ALTSYS_CORE_TYPE_X20', 1) ; // 2.0.0-2.0.13 and 2.0.x-JP
-define('ALTSYS_CORE_TYPE_X20S', 2) ; // 2.0.14- from xoops.org (Skalpa's S)
-define('ALTSYS_CORE_TYPE_ORE', 4) ; // ORETEKI by marijuana
-define('ALTSYS_CORE_TYPE_X22', 8) ; // 2.2 from xoops.org
-define('ALTSYS_CORE_TYPE_X23P', 10) ; // 2.3 from xoops.org (phppp's P)
-define('ALTSYS_CORE_TYPE_X25', 11) ; // 2.5 from xoops.org
-define('ALTSYS_CORE_TYPE_ICMS', 12) ; // ImpressCMS
-define('ALTSYS_CORE_TYPE_XCL21', 16) ; // XOOPS Cube 2.1 Legacy
+define('ALTSYS_CORE_TYPE_X20', 1); // 2.0.0-2.0.13 and 2.0.x-JP
+define('ALTSYS_CORE_TYPE_X20S', 2); // 2.0.14- from xoops.org (Skalpa's S)
+define('ALTSYS_CORE_TYPE_ORE', 4); // ORETEKI by marijuana
+define('ALTSYS_CORE_TYPE_X22', 8); // 2.2 from xoops.org
+define('ALTSYS_CORE_TYPE_X23P', 10); // 2.3 from xoops.org (phppp's P)
+define('ALTSYS_CORE_TYPE_X25', 11); // 2.5 from xoops.org
+define('ALTSYS_CORE_TYPE_ICMS', 12); // ImpressCMS
+define('ALTSYS_CORE_TYPE_XCL21', 16); // XOOPS Cube 2.1 Legacy
 
 function altsys_get_core_type()
 {
-    static $result = null ;
+    static $result = null;
 
     if (empty($result)) {
         if (defined('XOOPS_ORETEKI')) {
-            $result = ALTSYS_CORE_TYPE_ORE ;
+            $result = ALTSYS_CORE_TYPE_ORE;
         } elseif (defined('XOOPS_CUBE_LEGACY')) {
-            $result = ALTSYS_CORE_TYPE_XCL21 ;
+            $result = ALTSYS_CORE_TYPE_XCL21;
         } elseif (defined('ICMS_VERSION_NAME')) {
-            $result = ALTSYS_CORE_TYPE_ICMS ;
+            $result = ALTSYS_CORE_TYPE_ICMS;
         } elseif (strstr(XOOPS_VERSION, 'JP')) {
-            $result = ALTSYS_CORE_TYPE_X20 ;
+            $result = ALTSYS_CORE_TYPE_X20;
         } else {
-            $versions = array_map('intval', explode('.', preg_replace('/[^0-9.]/', '', XOOPS_VERSION))) ;
+            $versions = array_map('intval', explode('.', preg_replace('/[^0-9.]/', '', XOOPS_VERSION)));
             if ($versions[0] == 2 && $versions[1] == 2) {
-                $result = ALTSYS_CORE_TYPE_X22 ;
+                $result = ALTSYS_CORE_TYPE_X22;
             } elseif ($versions[0] == 2 && $versions[1] == 0 && $versions[2] > 13) {
-                $result = ALTSYS_CORE_TYPE_X20S ;
+                $result = ALTSYS_CORE_TYPE_X20S;
             } elseif ($versions[0] == 2 && $versions[1] >= 5) {
-                $result = ALTSYS_CORE_TYPE_X25 ;
+                $result = ALTSYS_CORE_TYPE_X25;
             } elseif ($versions[0] == 2 && $versions[1] > 2) {
-                $result = ALTSYS_CORE_TYPE_X23P ;
+                $result = ALTSYS_CORE_TYPE_X23P;
             } else {
-                $result = ALTSYS_CORE_TYPE_X20 ;
+                $result = ALTSYS_CORE_TYPE_X20;
             }
         }
     }
-    return $result ;
+    return $result;
 }
 
 
@@ -113,36 +113,36 @@ 
         case ALTSYS_CORE_TYPE_X23P :
         case ALTSYS_CORE_TYPE_ICMS :
         default :
-            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid ;
+            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid;
         case ALTSYS_CORE_TYPE_XCL21 :
-            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid ;
+            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid;
     }
 }
 
 
 function altsys_template_touch($tpl_id)
 {
-    if (in_array(altsys_get_core_type(), array( ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P, ALTSYS_CORE_TYPE_X25 ))) {
+    if (in_array(altsys_get_core_type(), array(ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P, ALTSYS_CORE_TYPE_X25))) {
         // need to delete all files under templates_c/
-        altsys_clear_templates_c() ;
+        altsys_clear_templates_c();
     } else {
         // just touch the template
-        xoops_template_touch($tpl_id) ;
+        xoops_template_touch($tpl_id);
     }
 }
 
 
 function altsys_clear_templates_c()
 {
-    $dh = opendir(XOOPS_COMPILE_PATH) ;
+    $dh = opendir(XOOPS_COMPILE_PATH);
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if (substr($file, -4) != '.php') {
-            continue ;
+            continue;
         }
-        @unlink(XOOPS_COMPILE_PATH.'/'.$file) ;
+        @unlink(XOOPS_COMPILE_PATH.'/'.$file);
     }
-    closedir($dh) ;
+    closedir($dh);
 }

xoops_trust_path/libs/altsys/include/admin_in_theme_header.inc.php

Spacing +47 added lines, -47 removed lines

@@ -29,7 +29,7 @@ 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php' ;
+require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php';
 include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
     $xoopsOption['theme_use_smarty'] = 1;
@@ -58,7 +58,7 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $xoopsblock =& $handler->create(false) ;
+        $xoopsblock = & $handler->create(false);
     } else {
         $xoopsblock = new XoopsBlock();
     }
@@ -68,46 +68,46 @@ 
     if (is_object($xoopsUser)) {
         $xoopsTpl->assign(array('xoops_isuser' => true, 'xoops_userid' => $xoopsUser->getVar('uid'), 'xoops_uname' => $xoopsUser->getVar('uname'), 'xoops_isadmin' => $xoopsUserIsAdmin));
         if (is_object(@$xoopsModule)) {
-            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
-                $module_handler = xoops_gethandler('module') ;
-                $target_module = $module_handler->get((int)$_GET['mod']) ;
+            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
+                $module_handler = xoops_gethandler('module');
+                $target_module = $module_handler->get((int)$_GET['mod']);
             } else {
-                $target_module =& $xoopsModule ;
+                $target_module = & $xoopsModule;
             }
 
             // set page title
             $xoopsTpl->assign(array('xoops_pagetitle' => $target_module->getVar('name'), 'xoops_modulename' => $target_module->getVar('name'), 'xoops_dirname' => $target_module->getVar('dirname')));
 
             // xoops_breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
             if ($breadcrumbsObj->hasPaths()) {
-                $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs() ;
+                $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs();
             } else {
-                $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname') ;
-                $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname') ;
-                $modinfo = $target_module->getInfo() ;
-                $xoops_breadcrumbs = array() ;
-                if (! empty($modinfo['hasMain'])) {
+                $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname');
+                $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname');
+                $modinfo = $target_module->getInfo();
+                $xoops_breadcrumbs = array();
+                if (!empty($modinfo['hasMain'])) {
                     $xoops_breadcrumbs[] = array(
-                        'url' => $mod_url.'/' ,
+                        'url' => $mod_url.'/',
                         'name' => sprintf(_MD_A_AINTHEME_FMT_PUBLICTOP, $target_module->getVar('name'))
-                    ) ;
+                    );
                 }
-                if (! empty($modinfo['adminindex'])) {
+                if (!empty($modinfo['adminindex'])) {
                     $xoops_breadcrumbs[] = array(
-                        'url' => $mod_url.'/'.$modinfo['adminindex'] ,
+                        'url' => $mod_url.'/'.$modinfo['adminindex'],
                         'name' => sprintf(_MD_A_AINTHEME_FMT_ADMINTOP, $target_module->getVar('name'))
-                    ) ;
+                    );
                 }
-                if (! empty($GLOBALS['altsysAdminPageTitle'])) {
-                    $xoops_breadcrumbs[] = array( 'name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES) ) ;
-                } elseif (! empty($modinfo['adminmenu'])) {
-                    @include $mod_path.'/'.$modinfo['adminmenu'] ;
+                if (!empty($GLOBALS['altsysAdminPageTitle'])) {
+                    $xoops_breadcrumbs[] = array('name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES));
+                } elseif (!empty($modinfo['adminmenu'])) {
+                    @include $mod_path.'/'.$modinfo['adminmenu'];
                     if (is_array(@$adminmenu)) {
                         foreach ($adminmenu as $eachmenu) {
                             if (strstr($_SERVER['REQUEST_URI'], $eachmenu['link'])) {
-                                $xoops_breadcrumbs[] = array( 'name' => $eachmenu['title'] ) ;
-                                break ;
+                                $xoops_breadcrumbs[] = array('name' => $eachmenu['title']);
+                                break;
                             }
                         }
                     }
@@ -116,21 +116,21 @@ 
 
             //$block_arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $target_module->getVar('mid'), false, XOOPS_BLOCK_VISIBLE);
         } else {
-            $xoopsTpl->assign(array( 'xoops_pagetitle' => _CPHOME )) ;
+            $xoopsTpl->assign(array('xoops_pagetitle' => _CPHOME));
             $xoops_breadcrumbs = array(
                 array(
-                    'url' => XOOPS_URL.'/admin.php' ,
+                    'url' => XOOPS_URL.'/admin.php',
                     'name' => _CPHOME
                 )
-            ) ;
+            );
         }
     } else {
-        exit ;
+        exit;
     }
 
     // get block_arr
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-    $sql = 'SELECT DISTINCT gperm_itemid FROM ' . $db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (" . implode(',', $xoopsUser->getGroups()) . ')';
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
+    $sql = 'SELECT DISTINCT gperm_itemid FROM '.$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (".implode(',', $xoopsUser->getGroups()).')';
     $result = $db->query($sql);
 
     $blockids = array();
@@ -138,30 +138,30 @@ 
         $blockids[] = (int)$blockid;
     }
 
-    global $block_arr , $i ; // for piCal :-)
-    $block_arr = array() ;
+    global $block_arr, $i; // for piCal :-)
+    $block_arr = array();
     if (!empty($blockids)) {
-        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id=' . (int)$altsysModuleId
-               . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
+        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id='.(int)$altsysModuleId
+               . ' AND b.bid IN ('.implode(',', $blockids).') ORDER BY b.weight,b.bid';
         $result = $db->query($sql);
         while ($myrow = $db->fetchArray($result)) {
 
 //HACK by domifara
             if (defined('XOOPS_CUBE_LEGACY')) {
-                $block =& $handler->create(false) ;
+                $block = & $handler->create(false);
                 $block->assignVars($myrow);
             } else {
-                $block = new XoopsBlock($myrow) ;
+                $block = new XoopsBlock($myrow);
             }
 
-            $block_arr[ $myrow['bid'] ] = $block ;
+            $block_arr[$myrow['bid']] = $block;
         }
     }
 
-    $adminmenublock_exists = false ;
+    $adminmenublock_exists = false;
     foreach (array_keys($block_arr) as $i) {
         if ($block_arr[$i]->getVar('show_func') == 'b_altsys_admin_menu_show') {
-            $adminmenublock_exists = true ;
+            $adminmenublock_exists = true;
         }
         $bcachetime = $block_arr[$i]->getVar('bcachetime');
         if (empty($bcachetime)) {
@@ -242,15 +242,15 @@ 
     }
 
     // FALLBACK inserting admin_menu_block in admin side
-    if (! $adminmenublock_exists) {
-        require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php' ;
-        $admin_menu_block = array( b_altsys_admin_menu_show(array( 'altsys' )) ) ;
-        $admin_menu_block[0]['title'] = 'Admin Menu' ;
-        $lblocks =& $xoopsTpl->get_template_vars('xoops_lblocks') ;
-        if (! is_array($lblocks)) {
-            $lblocks = array() ;
+    if (!$adminmenublock_exists) {
+        require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php';
+        $admin_menu_block = array(b_altsys_admin_menu_show(array('altsys')));
+        $admin_menu_block[0]['title'] = 'Admin Menu';
+        $lblocks = & $xoopsTpl->get_template_vars('xoops_lblocks');
+        if (!is_array($lblocks)) {
+            $lblocks = array();
         }
-        $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks)) ;
+        $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks));
     }
 
     //unset($block_arr);

xoops_trust_path/libs/altsys/include/adminmenu_functions.php

Spacing +132 added lines, -132 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-require_once dirname(__DIR__).'/class/altsysUtils.class.php' ;
+require_once dirname(__DIR__).'/class/altsysUtils.class.php';
 
-define('ALTSYS_ADMINMENU_FILE', XOOPS_CACHE_PATH.'/adminmenu.php') ;
-define('ALTSYS_ADMINMENU_HACK_NONE', 0) ;
-define('ALTSYS_ADMINMENU_HACK_2COL', 1) ;
-define('ALTSYS_ADMINMENU_HACK_NOIMG', 2) ;
-define('ALTSYS_ADMINMENU_HACK_XCSTY', 3) ;
+define('ALTSYS_ADMINMENU_FILE', XOOPS_CACHE_PATH.'/adminmenu.php');
+define('ALTSYS_ADMINMENU_HACK_NONE', 0);
+define('ALTSYS_ADMINMENU_HACK_2COL', 1);
+define('ALTSYS_ADMINMENU_HACK_NOIMG', 2);
+define('ALTSYS_ADMINMENU_HACK_XCSTY', 3);
 
 
 //
@@ -13,73 +13,73 @@ 
 //
 function altsys_adminmenu_insert_mymenu(&$module)
 {
-    global $altsysModuleConfig ;
+    global $altsysModuleConfig;
 
     if (empty($altsysModuleConfig['adminmenu_insert_mymenu'])) {
-        return ;
+        return;
     }
 
     if (altsys_get_core_type() < ALTSYS_CORE_TYPE_ORE) {
-        altsys_adminmenu_insert_mymenu_x20($module) ;
+        altsys_adminmenu_insert_mymenu_x20($module);
     }
 }
 
 function altsys_adminmenu_insert_mymenu_x20(&$module)
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
-    $dirname = $module->getVar('dirname') ;
-    $mid = $module->getVar('mid') ;
-    $anchor = '<!-- ALTSYS ANCHOR '.$dirname.' -->' ;
+    $dirname = $module->getVar('dirname');
+    $mid = $module->getVar('mid');
+    $anchor = '<!-- ALTSYS ANCHOR '.$dirname.' -->';
 
     // fetch popup_no
     if (empty($xoops_admin_menu_ft[$mid])) {
-        return ;
+        return;
     }
-    if (! preg_match('/popUpL(\d+)/', $xoops_admin_menu_ft[$mid], $regs)) {
-        return ;
+    if (!preg_match('/popUpL(\d+)/', $xoops_admin_menu_ft[$mid], $regs)) {
+        return;
     }
     $popup_no = (int)$regs[1];
 
     // replace
-    $search  = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mid.'\'' ;
-    $replace = $anchor.'<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences\'' ;
+    $search  = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mid.'\'';
+    $replace = $anchor.'<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences\'';
 
     // do replacement
-    $new_xoops_admin_menu_dv = preg_replace('#'.preg_quote($search).'#', $replace, $xoops_admin_menu_dv) ;
+    $new_xoops_admin_menu_dv = preg_replace('#'.preg_quote($search).'#', $replace, $xoops_admin_menu_dv);
 
     if ($xoops_admin_menu_dv == $new_xoops_admin_menu_dv) {
-        return ;
+        return;
     }
-    $xoops_admin_menu_dv = $new_xoops_admin_menu_dv ;
+    $xoops_admin_menu_dv = $new_xoops_admin_menu_dv;
 
-    $insert = '' ;
+    $insert = '';
 
     // insert blocksadmin
     if ($dirname != 'altsys') {
-        $blocksadmin_title = defined('_MD_A_MYMENU_MYBLOCKSADMIN') ? _MD_A_MYMENU_MYBLOCKSADMIN : 'blocksadmin' ;
-        $insert .= '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=myblocksadmin\'>'.$blocksadmin_title.'</a><br />'."\n" ;
+        $blocksadmin_title = defined('_MD_A_MYMENU_MYBLOCKSADMIN') ? _MD_A_MYMENU_MYBLOCKSADMIN : 'blocksadmin';
+        $insert .= '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=myblocksadmin\'>'.$blocksadmin_title.'</a><br />'."\n";
     }
 
     // insert tplsadmin
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_module='$dirname'")) ;
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
+    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_module='$dirname'"));
     if ($count > 0) {
-        $tplsadmin_title = defined('_MD_A_MYMENU_MYTPLSADMIN') ? _MD_A_MYMENU_MYTPLSADMIN : 'tplsadmin' ;
-        $insert = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin\'>'.$tplsadmin_title.'</a><br />'."\n".$insert ;
+        $tplsadmin_title = defined('_MD_A_MYMENU_MYTPLSADMIN') ? _MD_A_MYMENU_MYTPLSADMIN : 'tplsadmin';
+        $insert = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin\'>'.$tplsadmin_title.'</a><br />'."\n".$insert;
     }
 
     // do insertion
-    $xoops_admin_menu_dv = preg_replace('#'.preg_quote($anchor).'#', $anchor.$insert, $xoops_admin_menu_dv) ;
+    $xoops_admin_menu_dv = preg_replace('#'.preg_quote($anchor).'#', $anchor.$insert, $xoops_admin_menu_dv);
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked), 'altsys_adminmenu_dv_updated' => true )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked), 'altsys_adminmenu_dv_updated' => true));
 }
 
 //
@@ -87,184 +87,184 @@ 
 //
 function altsys_adminmenu_hack_ft()
 {
-    global $altsysModuleConfig ;
+    global $altsysModuleConfig;
 
     if (altsys_get_core_type() >= ALTSYS_CORE_TYPE_ORE) {
-        return ;
+        return;
     }
     if (empty($altsysModuleConfig['adminmenu_hack_ft'])) {
-        return ;
+        return;
     }
 
     if ($altsysModuleConfig['adminmenu_hack_ft'] == ALTSYS_ADMINMENU_HACK_2COL) {
-        altsys_adminmenu_hack_ft_2col_x20() ;
+        altsys_adminmenu_hack_ft_2col_x20();
     } elseif ($altsysModuleConfig['adminmenu_hack_ft'] == ALTSYS_ADMINMENU_HACK_NOIMG) {
-        altsys_adminmenu_hack_ft_noimg_x20() ;
+        altsys_adminmenu_hack_ft_noimg_x20();
     } elseif ($altsysModuleConfig['adminmenu_hack_ft'] == ALTSYS_ADMINMENU_HACK_XCSTY) {
-        altsys_adminmenu_hack_ft_xcsty_x20() ;
+        altsys_adminmenu_hack_ft_xcsty_x20();
     }
 }
 
 function altsys_adminmenu_hack_ft_2col_x20()
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
     // check previous hack
-    if (! empty($altsys_adminmenu_ft_hacked)) {
+    if (!empty($altsys_adminmenu_ft_hacked)) {
         if ($altsys_adminmenu_ft_hacked == ALTSYS_ADMINMENU_HACK_2COL) {
             // skip
-            return ;
+            return;
         } else {
             // rebuild adminmenu
-            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
-            xoops_module_write_admin_menu(xoops_module_get_admin_menu()) ;
+            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
+            xoops_module_write_admin_menu(xoops_module_get_admin_menu());
             // backup $xoops_admin_menu_dv
-            $backup_admin_menu_dv = $xoops_admin_menu_dv ;
+            $backup_admin_menu_dv = $xoops_admin_menu_dv;
             // include new adminmenu
-            include ALTSYS_ADMINMENU_FILE ;
+            include ALTSYS_ADMINMENU_FILE;
             // restore $xoops_admin_menu_dv
-            $xoops_admin_menu_dv = $backup_admin_menu_dv ;
+            $xoops_admin_menu_dv = $backup_admin_menu_dv;
         }
     }
 
-    $search  = ' alt=\'\' /></a><br />' ;
-    $replace_fmt = ' alt="%s" /></a>' ;
+    $search  = ' alt=\'\' /></a><br />';
+    $replace_fmt = ' alt="%s" /></a>';
 
-    $is_left = true ;
-    $module_handler = xoops_gethandler('module') ;
-    $mids = array_keys($xoops_admin_menu_ft) ;
-    $last_mid = $mids[count($mids) - 1 ] ;
+    $is_left = true;
+    $module_handler = xoops_gethandler('module');
+    $mids = array_keys($xoops_admin_menu_ft);
+    $last_mid = $mids[count($mids) - 1];
     foreach ($mids as $mid) {
-        $module = $module_handler->get($mid) ;
-        $new_menu_ft = preg_replace('#'.preg_quote($search).'#', sprintf($replace_fmt, $module->getVar('name')), $xoops_admin_menu_ft[$mid]) ;
+        $module = $module_handler->get($mid);
+        $new_menu_ft = preg_replace('#'.preg_quote($search).'#', sprintf($replace_fmt, $module->getVar('name')), $xoops_admin_menu_ft[$mid]);
         if ($is_left) {
             if ($mid == $last_mid) {
-                $xoops_admin_menu_ft[$mid] = $new_menu_ft . '</td><td>' ;
+                $xoops_admin_menu_ft[$mid] = $new_menu_ft.'</td><td>';
             } else {
-                $left_body = $new_menu_ft ;
-                $left_key = $mid ;
-                $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',85);', $xoops_admin_menu_ml[$mid]) ;
+                $left_body = $new_menu_ft;
+                $left_key = $mid;
+                $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',85);', $xoops_admin_menu_ml[$mid]);
             }
         } else {
-            $xoops_admin_menu_ft[$mid] = $left_body . '</td><td>' . $new_menu_ft ;
-            unset($xoops_admin_menu_ft[$left_key]) ;
-            $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',185);', $xoops_admin_menu_ml[$mid]) ;
+            $xoops_admin_menu_ft[$mid] = $left_body.'</td><td>'.$new_menu_ft;
+            unset($xoops_admin_menu_ft[$left_key]);
+            $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',185);', $xoops_admin_menu_ml[$mid]);
         }
-        $is_left = ! $is_left ;
+        $is_left = !$is_left;
     }
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL));
 }
 
 
 function altsys_adminmenu_hack_ft_noimg_x20()
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
     // check previous hack
-    if (! empty($altsys_adminmenu_ft_hacked)) {
+    if (!empty($altsys_adminmenu_ft_hacked)) {
         if ($altsys_adminmenu_ft_hacked == ALTSYS_ADMINMENU_HACK_NOIMG) {
             // skip
-            return ;
+            return;
         } else {
             // rebuild adminmenu
-            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
-            xoops_module_write_admin_menu(xoops_module_get_admin_menu()) ;
+            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
+            xoops_module_write_admin_menu(xoops_module_get_admin_menu());
             // backup $xoops_admin_menu_dv
-            $backup_admin_menu_dv = $xoops_admin_menu_dv ;
+            $backup_admin_menu_dv = $xoops_admin_menu_dv;
             // include new adminmenu
-            include ALTSYS_ADMINMENU_FILE ;
+            include ALTSYS_ADMINMENU_FILE;
             // restore $xoops_admin_menu_dv
-            $xoops_admin_menu_dv = $backup_admin_menu_dv ;
+            $xoops_admin_menu_dv = $backup_admin_menu_dv;
         }
     }
 
-    $module_handler = xoops_gethandler('module') ;
-    $mids = array_keys($xoops_admin_menu_ft) ;
+    $module_handler = xoops_gethandler('module');
+    $mids = array_keys($xoops_admin_menu_ft);
     foreach ($mids as $mid) {
-        $module = $module_handler->get($mid) ;
-        $xoops_admin_menu_ft[$mid] = preg_replace('/\<img src\=.*$/', $module->getVar('name').'</a>', $xoops_admin_menu_ft[$mid]) ;
-        $xoops_admin_menu_ft[$mid] = '<div style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'">'.$xoops_admin_menu_ft[$mid].'</div>' ;
-        $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',45);', $xoops_admin_menu_ml[$mid]) ;
+        $module = $module_handler->get($mid);
+        $xoops_admin_menu_ft[$mid] = preg_replace('/\<img src\=.*$/', $module->getVar('name').'</a>', $xoops_admin_menu_ft[$mid]);
+        $xoops_admin_menu_ft[$mid] = '<div style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'">'.$xoops_admin_menu_ft[$mid].'</div>';
+        $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',45);', $xoops_admin_menu_ml[$mid]);
     }
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG));
 }
 
 
 function altsys_adminmenu_hack_ft_xcsty_x20()
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
     // check previous hack
-    if (! empty($altsys_adminmenu_ft_hacked)) {
+    if (!empty($altsys_adminmenu_ft_hacked)) {
         if ($altsys_adminmenu_ft_hacked == ALTSYS_ADMINMENU_HACK_XCSTY && empty($altsys_adminmenu_dv_updated)) {
             // skip
-            return ;
+            return;
         } else {
             // rebuild adminmenu
-            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
-            $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb') ;
-            fwrite($fp, xoops_module_get_admin_menu()) ;
-            fclose($fp) ;
+            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
+            $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb');
+            fwrite($fp, xoops_module_get_admin_menu());
+            fclose($fp);
             // backup $xoops_admin_menu_dv
-            $backup_admin_menu_dv = $xoops_admin_menu_dv ;
+            $backup_admin_menu_dv = $xoops_admin_menu_dv;
             // include new adminmenu
-            include ALTSYS_ADMINMENU_FILE ;
+            include ALTSYS_ADMINMENU_FILE;
             // restore $xoops_admin_menu_dv
-            $xoops_admin_menu_dv = $backup_admin_menu_dv ;
+            $xoops_admin_menu_dv = $backup_admin_menu_dv;
         }
     }
 
-    $module_handler = xoops_gethandler('module') ;
-    $mids = array_keys($xoops_admin_menu_ft) ;
+    $module_handler = xoops_gethandler('module');
+    $mids = array_keys($xoops_admin_menu_ft);
     foreach ($mids as $mid) {
-        $module = $module_handler->get($mid) ;
-        $submenuitems = array() ;
+        $module = $module_handler->get($mid);
+        $submenuitems = array();
         if (preg_match('/popUpL\d+/', $xoops_admin_menu_ft[$mid], $regs)) {
-            $popup = $regs[0] ;
-            preg_match_all('#\<a href.*'.$popup.'\(\).*\</a>#U', $xoops_admin_menu_dv, $regs) ;
+            $popup = $regs[0];
+            preg_match_all('#\<a href.*'.$popup.'\(\).*\</a>#U', $xoops_admin_menu_dv, $regs);
             foreach ($regs[0] as $submenuitem) {
-                $submenuitems[] = str_replace($popup.'();', '', $submenuitem) ;
+                $submenuitems[] = str_replace($popup.'();', '', $submenuitem);
             }
         } else {
-            return ;
+            return;
         }
         // module icon
         if (preg_match('#\<img .*/\>#U', $xoops_admin_menu_ft[$mid], $regs)) {
-            $icon_img = str_replace("alt=''", 'alt="'.$module->getVar('name').'"', $regs[0]) ;
+            $icon_img = str_replace("alt=''", 'alt="'.$module->getVar('name').'"', $regs[0]);
         } else {
-            $icon_img = '' ;
+            $icon_img = '';
         }
         // version number
-        $icon_img .= '<span class="version" style="">' . sprintf('%.2f', $module->getVar('version') / 100.0) . '</span>' ;
-        $newline = preg_replace('/ onmouseover.*$/', '', $xoops_admin_menu_ft[$mid]) ;
-        $newline = "\n".'<!-- '.$popup.' --><div id="adminmenu_ft'.$mid.'" style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'"><a id="adminmenu_ftpoint'.$mid.'" href="javascript:void(0);" onclick="submenuToggle('.$mid.');">+</a> '.$newline.'>'.$module->getVar('name').'</a></div><div id="adminmenu_ftsub'.$mid.'" style="display:none;"><ul>' ;
+        $icon_img .= '<span class="version" style="">'.sprintf('%.2f', $module->getVar('version') / 100.0).'</span>';
+        $newline = preg_replace('/ onmouseover.*$/', '', $xoops_admin_menu_ft[$mid]);
+        $newline = "\n".'<!-- '.$popup.' --><div id="adminmenu_ft'.$mid.'" style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'"><a id="adminmenu_ftpoint'.$mid.'" href="javascript:void(0);" onclick="submenuToggle('.$mid.');">+</a> '.$newline.'>'.$module->getVar('name').'</a></div><div id="adminmenu_ftsub'.$mid.'" style="display:none;"><ul>';
         foreach ($submenuitems as $submenuitem) {
-            $newline .= '<li>'.$submenuitem.'</li>' ;
+            $newline .= '<li>'.$submenuitem.'</li>';
         }
-        $newline .= '</ul>'.$icon_img.'</div>' ;
-        $xoops_admin_menu_ft[$mid] = $newline ;
+        $newline .= '</ul>'.$icon_img.'</div>';
+        $xoops_admin_menu_ft[$mid] = $newline;
     }
 
     $xoops_admin_menu_js = "
@@ -280,7 +280,7 @@ 
 	}" ;
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => array(), 'xoops_admin_menu_sd' => array(), 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => array(), 'xoops_admin_menu_sd' => array(), 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY));
 }
 
 
@@ -291,18 +291,18 @@ 
 function altsys_adminmenu_save_x20($xoops_admin_vars)
 {
     // variable definitions
-    ob_start() ;
-    echo "<?php\n// modified by altsys\nif( ! defined('XOOPS_ROOT_PATH') ) exit ;\n" ;
+    ob_start();
+    echo "<?php\n// modified by altsys\nif( ! defined('XOOPS_ROOT_PATH') ) exit ;\n";
     foreach ($xoops_admin_vars as $key => $val) {
-        echo '$' . $key . " = \n" ;
-        @var_export($val) ;
-        echo " ;\n" ;
+        echo '$'.$key." = \n";
+        @var_export($val);
+        echo " ;\n";
     }
-    $output = ob_get_contents() ;
-    ob_end_clean() ;
+    $output = ob_get_contents();
+    ob_end_clean();
 
     // embedding logics
-    if (in_array(@$xoops_admin_vars['altsys_adminmenu_ft_hacked'], array( ALTSYS_ADMINMENU_HACK_NOIMG, ALTSYS_ADMINMENU_HACK_XCSTY ))) {
+    if (in_array(@$xoops_admin_vars['altsys_adminmenu_ft_hacked'], array(ALTSYS_ADMINMENU_HACK_NOIMG, ALTSYS_ADMINMENU_HACK_XCSTY))) {
         $output .= '
 
 if( is_object( @$GLOBALS["xoopsModule"] ) && empty( $not_inside_cp_functions ) ) {
@@ -317,13 +317,13 @@ 
     }
 
     // termination
-    $output .= "\n\n?>" ;
+    $output .= "\n\n?>";
 
     // replace into XOOPS_URL
-    $output = str_replace(XOOPS_URL, "'.XOOPS_URL.'", $output) ;
+    $output = str_replace(XOOPS_URL, "'.XOOPS_URL.'", $output);
 
     // output
-    $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb') ;
-    fwrite($fp, $output) ;
-    fclose($fp) ;
+    $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb');
+    fwrite($fp, $output);
+    fclose($fp);
 }