mambax7 / altsys

xoops_trust_path/libs/altsys/class/altsysUtils.class.php

Doc Comments +3 added lines

@@ -1,6 +1,9 @@
 <?php
 class altsysUtils
 {
+    /**
+     * @param string $name
+     */
     public static function getDelegateCallbackClassNames($name, $doRegist = true)
     {
         $names = array();

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

Doc Comments +24 added lines

@@ -487,6 +487,12 @@ 
     }
 
 
+    /**
+     * @param integer $bside
+     * @param integer $bweight
+     * @param integer $bvisible
+     * @param integer $bcachetime
+     */
     public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options=array())
     {
         global $xoopsConfig;
@@ -645,6 +651,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_delete($bid)
     {
         $bid = (int)$bid;
@@ -670,6 +679,9 @@ 
     }
 
 //HACK add by domifara
+/**
+ * @param integer $bid
+ */
 public function do_deleteBlockReadGroupPerm($bid)
 {
     $bid = (int)$bid;
@@ -678,6 +690,9 @@ 
     $this->db->query($sql) ;
 }
 
+    /**
+     * @param integer $bid
+     */
     public function form_delete($bid)
     {
         $bid = (int)$bid;
@@ -707,6 +722,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_clone($bid)
     {
         $bid = (int)$bid;
@@ -785,6 +803,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_edit($bid)
     {
         $bid = (int)$bid;
@@ -828,6 +849,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function form_edit($bid, $mode = 'edit')
     {
         $bid = (int)$bid;

Switch Indentation +66 added lines, -66 removed lines

@@ -307,30 +307,30 @@ 
         $scoln = 'disabled';
     } else {
         switch ($side) {
-        case XOOPS_SIDEBLOCK_LEFT:
-            $ssel0 = " checked='checked'";
-            $scol0 = 'selected';
-            break ;
-        case XOOPS_SIDEBLOCK_RIGHT:
-            $ssel1 = " checked='checked'";
-            $scol1 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_LEFT:
-            $ssel2 = " checked='checked'";
-            $scol2 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_RIGHT:
-            $ssel4 = " checked='checked'";
-            $scol4 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_CENTER:
-            $ssel3 = " checked='checked'";
-            $scol3 = 'selected';
-            break ;
-        default:
-            $value4extra_side = $side ;
-            $stextbox = 'selected';
-            break ;
+            case XOOPS_SIDEBLOCK_LEFT:
+                $ssel0 = " checked='checked'";
+                $scol0 = 'selected';
+                break ;
+            case XOOPS_SIDEBLOCK_RIGHT:
+                $ssel1 = " checked='checked'";
+                $scol1 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_LEFT:
+                $ssel2 = " checked='checked'";
+                $scol2 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_RIGHT:
+                $ssel4 = " checked='checked'";
+                $scol4 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_CENTER:
+                $ssel3 = " checked='checked'";
+                $scol3 = 'selected';
+                break ;
+            default:
+                $value4extra_side = $side ;
+                $stextbox = 'selected';
+                break ;
     }
     }
 
@@ -850,31 +850,31 @@ 
         }
 
         switch ($mode) {
-        case 'clone':
-            $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 ;
-        case 'new':
-            $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 ;
-        case 'edit':
-        default:
-            $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 ;
+            case 'clone':
+                $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 ;
+            case 'new':
+                $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 ;
+            case 'edit':
+            default:
+                $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 ;
     }
 
         $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
@@ -1050,23 +1050,23 @@ 
     {
         $bid = (int)(@$_GET['bid']);
         switch (@$_GET['op']) {
-        case 'clone':
-            $this->form_edit($bid, 'clone') ;
-            break ;
-        case 'new':
-        case 'edit':
-            $this->form_edit($bid, 'edit') ;
-            break ;
-        case 'delete':
-            $this->form_delete($bid) ;
-            break ;
-        case 'list':
-        default:
-            // the first form (blocks)
-            $this->list_blocks() ;
-            // the second form (groups)
-            $this->list_groups() ;
-            break ;
+            case 'clone':
+                $this->form_edit($bid, 'clone') ;
+                break ;
+            case 'new':
+            case 'edit':
+                $this->form_edit($bid, 'edit') ;
+                break ;
+            case 'delete':
+                $this->form_delete($bid) ;
+                break ;
+            case 'list':
+            default:
+                // the first form (blocks)
+                $this->list_blocks() ;
+                // the second form (groups)
+                $this->list_groups() ;
+                break ;
     }
     }
 }

Spacing +353 added lines, -353 removed lines

@@ -3,16 +3,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()
     {
@@ -21,37 +21,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+
@@ -60,8 +60,8 @@ 
 {
     static $instance;
     if (!isset($instance)) {
-        $instance = new MyBlocksAdmin() ;
-        $instance->construct() ;
+        $instance = new MyBlocksAdmin();
+        $instance->construct();
     }
     return $instance;
 }
@@ -71,11 +71,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');
     }
 }
 
@@ -86,52 +86,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;
 }
 
 
@@ -140,9 +140,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;
     }
 }
 
@@ -155,23 +155,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;
 }
 
 
@@ -184,12 +184,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();
 }
 
 
@@ -202,16 +202,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
     }
 
@@ -220,25 +220,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;
 }
 
 
@@ -251,41 +251,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;
 }
 
 
@@ -300,7 +300,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'";
@@ -310,27 +310,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;
     }
     }
 
@@ -360,7 +360,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>
     ';
 }
 
@@ -368,58 +368,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,
@@ -428,22 +428,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'];
         }
     }
 
@@ -451,51 +451,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);
     }
@@ -514,10 +514,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;
@@ -541,7 +541,7 @@ 
         } else {
             $msg = 'Failed update of block. ID:'.$bid;
         }
-        return $msg ;
+        return $msg;
     }
 
 
@@ -549,14 +549,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);
     }
 }
 
@@ -565,83 +565,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()
-    ) ;
+    );
     }
 
 
@@ -652,30 +652,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)
@@ -686,24 +686,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')));
     }
 
 
@@ -711,30 +711,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
@@ -742,46 +742,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;
     }
 
 
@@ -795,36 +795,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;
     }
 
 
@@ -835,57 +835,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
 /*
@@ -894,43 +894,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(
@@ -945,14 +945,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()
@@ -964,16 +964,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) ;
@@ -981,68 +981,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;
     }
 
 
@@ -1051,22 +1051,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/class/MyBlocksAdminForICMS.class.php

Doc Comments +3 added lines

@@ -91,6 +91,9 @@
 
 
 // private
+/**
+ * @param integer $target_side
+ */
 public function renderRadio4BlockPosition($target_side, $block_data)
 {
     $bid = (int)$block_data['bid'];

Spacing +39 added lines, -39 removed lines

@@ -1,10 +1,10 @@ 
 <?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()
     {
@@ -13,14 +13,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+
@@ -30,7 +30,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForICMS();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -45,23 +45,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;
 }
 
 
@@ -72,19 +72,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>';
 }
@@ -95,19 +95,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>";
 }
 
 
@@ -116,28 +116,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;
 }
 
 
@@ -145,16 +145,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/MyBlocksAdminForX20S.class.php

Doc Comments +3 added lines

@@ -68,6 +68,9 @@
 
 
 // private
+/**
+ * @param integer $target_side
+ */
 public function renderRadio4BlockPosition($target_side, $block_data)
 {
     $bid = (int)$block_data['bid'];

xoops_trust_path/libs/altsys/include/Archive_Zip.php

Doc Comments +12 added lines, -6 removed lines

@@ -136,6 +136,9 @@ 
     */
 //HACK by domifara
 //  function Archive_Zip($p_zipname)
+    /**
+     * @param string $p_zipname
+     */
     public function __construct($p_zipname)
     {
 
@@ -176,7 +179,7 @@ 
     * @param  mixed  $p_filelist  The list of the files or folders to add.
     *                             It can be a string with filenames separated
     *                             by a comma, or an array of filenames.
-    * @param  mixed  $p_params  An array of variable parameters and values.
+    * @param  integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               an error code on error
     */
@@ -247,7 +250,7 @@ 
     * @param    mixed  $p_filelist  The list of the files or folders to add.
     *                               It can be a string with filenames separated
     *                               by a comma, or an array of filenames.
-    * @param    mixed  $p_params  An array of variable parameters and values.
+    * @param    integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
@@ -397,7 +400,7 @@ 
     *                            each entry extraction.
     *
     * @access public
-    * @param    mixed  $p_params  An array of variable parameters and values.
+    * @param    integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
@@ -512,7 +515,6 @@ 
     *    status : not_exist, ok
     *
     * @access public
-    * @param    mixed  $p_params  {Description}
     * @return mixed An array with the global properties or 0 on error.
     */
     public function properties()
@@ -996,6 +998,7 @@ 
   *
   * { Description }
   *
+  * @param string $p_mode
   */
   public function _openFd($p_mode)
   {
@@ -1565,6 +1568,7 @@ 
   *
   * { Description }
   *
+  * @param string $p_comment
   */
   public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
@@ -3140,8 +3144,6 @@ 
   *
   * { Description }
   *
-  * @param integer $p_error_code
-  * @param string $p_error_string
   */
   public function _check_parameters(&$p_params, $p_default)
   {
@@ -3371,6 +3373,8 @@ 
   * { Description }
   *
   * @param integer $p_mode
+  * @param integer $p_src
+  * @param integer $p_dest
   */
   public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
@@ -3432,6 +3436,8 @@ 
   *
   * { Description }
   *
+  * @param string $p_src
+  * @param string $p_dest
   */
   public function _tool_Rename($p_src, $p_dest)
   {

Spacing +107 added lines, -107 removed lines

@@ -106,24 +106,24 @@ 
     *
     * @var string Name of the Zip file
     */
-    public $_zipname='';
+    public $_zipname = '';
 
     /**
     * File descriptor of the opened Zip file.
     *
     * @var int Internal zip file descriptor
     */
-    public $_zip_fd=0;
+    public $_zip_fd = 0;
 
     /**
     * @var int last error code
     */
-    public $_error_code=1;
+    public $_error_code = 1;
 
     /**
     * @var string Last error description
     */
-    public $_error_string='';
+    public $_error_string = '';
 
     // {{{ constructor
     /**
@@ -144,7 +144,7 @@ 
           PEAR::loadExtension('zlib');
       }*/ // GIJ
       if (!extension_loaded('zlib')) {
-          die("The extension 'zlib' couldn't be found.\n". 'Please make sure your version of PHP was built ' .
+          die("The extension 'zlib' couldn't be found.\n".'Please make sure your version of PHP was built '.
               "with 'zlib' support.\n");
           return false;
       }
@@ -180,7 +180,7 @@ 
     * @return mixed An array of file description on success,
     *               an error code on error
     */
-    public function create($p_filelist, $p_params=0)
+    public function create($p_filelist, $p_params = 0)
     {
         $this->_errorReset();
 
@@ -251,7 +251,7 @@ 
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
-    public function add($p_filelist, $p_params=0)
+    public function add($p_filelist, $p_params = 0)
     {
         $this->_errorReset();
 
@@ -401,7 +401,7 @@ 
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
-    public function extract($p_params=0)
+    public function extract($p_params = 0)
     {
         $this->_errorReset();
 
@@ -671,7 +671,7 @@ 
     * @param  boolean $p_with_code  If true, gives the name and the int value.
     * @return string The error name.
     */
-    public function errorName($p_with_code=false)
+    public function errorName($p_with_code = false)
     {
         $v_const_list = get_defined_constants();
 
@@ -685,8 +685,8 @@ 
         }
 
         // ----- Search the name form the code value
-        $v_key=array_search($this->_error_code, $v_error_list, true);
-        if ($v_key!=false) {
+        $v_key = array_search($this->_error_code, $v_error_list, true);
+        if ($v_key != false) {
             $v_value = $v_key;
         } else {
             $v_value = 'NoName';
@@ -711,12 +711,12 @@ 
     *                         and the error code.
     * @return string The error description.
     */
-    public function errorInfo($p_full=false)
+    public function errorInfo($p_full = false)
     {
         if ($p_full) {
-            return($this->errorName(true) . ' : ' . $this->_error_string);
+            return($this->errorName(true).' : '.$this->_error_string);
         } else {
-            return($this->_error_string . ' [code ' . $this->_error_code . ']');
+            return($this->_error_string.' [code '.$this->_error_code.']');
         }
     }
     // }}}
@@ -749,7 +749,7 @@ 
   *
   * @param integer $p_level
   */
-  public function _checkFormat($p_level=0)
+  public function _checkFormat($p_level = 0)
   {
       $v_result = true;
 
@@ -800,7 +800,7 @@ 
   */
   public function _create($p_list, &$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
       $p_add_dir = $p_params['add_path'];
@@ -838,7 +838,7 @@ 
   */
   public function _add($p_list, &$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
       $p_add_dir = $p_params['add_path'];
@@ -852,7 +852,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         return $v_result;
     }
 
@@ -925,10 +925,10 @@ 
       }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i < count($v_header_list); $i++) {
+    for ($i = 0, $v_count = 0; $i < count($v_header_list); $i++) {
         // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
-          if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) {
+          if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
               fclose($v_zip_temp_fd);
               $this->_closeFd();
               @unlink($v_zip_temp_name);
@@ -947,7 +947,7 @@ 
     $v_comment = '';
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->_zip_fd)-$v_offset;
+    $v_size = @ftell($this->_zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->_writeCentralHeader($v_count
@@ -999,7 +999,7 @@ 
   */
   public function _openFd($p_mode)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if already open
     if ($this->_zip_fd != 0) {
@@ -1034,7 +1034,7 @@ 
   */
   public function _closeFd()
   {
-      $v_result=1;
+      $v_result = 1;
 
       if ($this->_zip_fd != 0) {
           @fclose($this->_zip_fd);
@@ -1068,7 +1068,7 @@ 
   public function _addList($p_list, &$p_result_list,
                     $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -1082,7 +1082,7 @@ 
     $v_offset = @ftell($this->_zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i < count($v_header_list); $i++) {
+    for ($i = 0, $v_count = 0; $i < count($v_header_list); $i++) {
         // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
           if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
@@ -1099,7 +1099,7 @@ 
     $v_comment = '';
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->_zip_fd)-$v_offset;
+    $v_size = @ftell($this->_zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->_writeCentralHeader($v_count, $v_size, $v_offset,
@@ -1139,14 +1139,14 @@ 
                         $p_add_dir, $p_remove_dir, $p_remove_all_dir,
                         &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = count($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<count($p_list)) && ($v_result==1); $j++) {
+    for ($j = 0; ($j < count($p_list)) && ($v_result == 1); $j++) {
         // ----- Recuperate the filename
       $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
 
@@ -1179,7 +1179,7 @@ 
 
         // ----- Look for path
         if ($p_filename != '.') {
-            $v_path = $p_filename . '/';
+            $v_path = $p_filename.'/';
         } else {
             $v_path = '';
         }
@@ -1238,7 +1238,7 @@ 
   */
   public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
       if ($p_filename == '') {
           // ----- Error log
@@ -1263,7 +1263,7 @@ 
 
         if ((substr($p_filename, 0, 2) == './') || (substr($p_remove_dir, 0, 2) == './')) {
             if ((substr($p_filename, 0, 2) == './') && (substr($p_remove_dir, 0, 2) != './')) {
-                $p_remove_dir = './' . $p_remove_dir;
+                $p_remove_dir = './'.$p_remove_dir;
             }
             if ((substr($p_filename, 0, 2) != './') && (substr($p_remove_dir, 0, 2) == './')) {
                 $p_remove_dir = substr($p_remove_dir, 2);
@@ -1287,7 +1287,7 @@ 
         if (substr($p_add_dir, -1) == '/') {
             $v_stored_filename = $p_add_dir.$v_stored_filename;
         } else {
-            $v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
+            $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
         }
     }
 
@@ -1322,7 +1322,7 @@ 
       $p_header['comment_len'] = 0;
       $p_header['disk'] = 0;
       $p_header['internal'] = 0;
-      $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
+      $p_header['external'] = (is_file($p_filename) ? 0xFE49FFE0 : 0x41FF0010);
       $p_header['offset'] = 0;
       $p_header['filename'] = $p_filename;
       $p_header['stored_filename'] = $v_stored_filename;
@@ -1418,7 +1418,7 @@ 
         $p_header['filename'] .= '/';
           $p_header['filename_len']++;
           $p_header['size'] = 0;
-          $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+          $p_header['external'] = 0x41FF0010; // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
@@ -1467,7 +1467,7 @@ 
   */
   public function _writeFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1478,8 +1478,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-      $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-      $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+      $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+      $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack('VvvvvvVVVvv', 0x04034b50, $p_header['version'], $p_header['flag'],
@@ -1517,7 +1517,7 @@ 
   */
   public function _writeCentralFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1525,8 +1525,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-      $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-      $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+      $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+      $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack('VvvvvvvVVVvvvvvVV', 0x02014b50, $p_header['version'], $p_header['version_extracted'],
@@ -1568,7 +1568,7 @@ 
   */
   public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Packed data
     $v_binary_data = pack('VvvvvVVv', 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
@@ -1600,7 +1600,7 @@ 
   */
   public function _list(&$p_list)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Open the zip file
     if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
@@ -1628,7 +1628,7 @@ 
       }
 
     // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++) {
+    for ($i = 0; $i < $v_central_dir['entries']; $i++) {
         // ----- Read the file header
       if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
           return $v_result;
@@ -1674,7 +1674,7 @@ 
   */
   public function _convertHeader2FileInfo($p_header, &$p_info)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Get the interesting attributes
     $p_info['filename'] = $p_header['filename'];
@@ -1683,7 +1683,7 @@ 
       $p_info['compressed_size'] = $p_header['compressed_size'];
       $p_info['mtime'] = $p_header['mtime'];
       $p_info['comment'] = $p_header['comment'];
-      $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+      $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
       $p_info['index'] = $p_header['index'];
       $p_info['status'] = $p_header['status'];
 
@@ -1716,7 +1716,7 @@ 
   */
   public function _extractByRule(&$p_file_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
       $p_path = $p_params['add_path'];
       $p_remove_path = $p_params['remove_path'];
@@ -1726,14 +1726,14 @@ 
     if (($p_path == '')
         || ((substr($p_path, 0, 1) != '/')
         && (substr($p_path, 0, 3) != '../') && (substr($p_path, 1, 2) != ':/'))) {
-        $p_path = './' . $p_path;
+        $p_path = './'.$p_path;
     }
 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != './') && ($p_path != '/')) {
         // ----- Look for the path end '/'
       while (substr($p_path, -1) == '/') {
-          $p_path = substr($p_path, 0, strlen($p_path)-1);
+          $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -1762,7 +1762,7 @@ 
 
     // ----- Read each entry
     $j_start = 0;
-      for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+      for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
           // ----- Read next Central dir entry
       @rewind($this->_zip_fd);
           if (@fseek($this->_zip_fd, $v_pos_entry)) {
@@ -1796,7 +1796,7 @@ 
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0;
+          for ($j = 0;
                   ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                && (!$v_extract);
                $j++) {
@@ -1838,15 +1838,15 @@ 
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
+          for ($j = $j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
+              if (($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i <= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
                   $v_extract = true;
               }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
+              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -1940,7 +1940,7 @@ 
   */
   public function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->_readFileHeader($v_header)) != 1) {
@@ -1980,7 +1980,7 @@ 
 
     // ----- Add the path
     if ($p_path != '') {
-        $p_entry['filename'] = $p_path . '/' . $p_entry['filename'];
+        $p_entry['filename'] = $p_path.'/'.$p_entry['filename'];
     }
 
     // ----- Look for pre-extract callback
@@ -2046,7 +2046,7 @@ 
 
     // ----- Check the directory availability and create it if necessary
     else {
-        if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+        if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
             $v_dir_to_check = $p_entry['filename'];
         } elseif (!strstr($p_entry['filename'], '/')) {
             $v_dir_to_check = '';
@@ -2070,7 +2070,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
 
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
@@ -2175,7 +2175,7 @@ 
   */
   public function _extractFileAsString(&$p_entry, &$p_string)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -2191,7 +2191,7 @@ 
     // ----- Trace
 
     // ----- Do the extraction (if not a folder)
-    if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+    if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
       if ($p_entry['compressed_size'] == $p_entry['size']) {
           // ----- Trace
@@ -2232,7 +2232,7 @@ 
   */
   public function _readFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
@@ -2257,7 +2257,7 @@ 
         $p_header['status'] = 'invalid_header';
 
       // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
 
       // ----- Return
       return Archive_Zip::errorCode();
@@ -2290,7 +2290,7 @@ 
           // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
           $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-          $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+          $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -2334,7 +2334,7 @@ 
   */
   public function _readCentralFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
@@ -2359,7 +2359,7 @@ 
         $p_header['status'] = 'invalid_header';
 
       // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
 
       // ----- Return
       return Archive_Zip::errorCode();
@@ -2396,7 +2396,7 @@ 
         // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
         $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-        $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+        $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -2440,7 +2440,7 @@ 
   */
   public function _readEndCentralDir(&$p_central_dir)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->_zipname);
@@ -2457,8 +2457,8 @@ 
     // in this case the end of central dir is at 22 bytes of the file end
     $v_found = 0;
       if ($v_size > 26) {
-          @fseek($this->_zip_fd, $v_size-22);
-          if (($v_pos = @ftell($this->_zip_fd)) != ($v_size-22)) {
+          @fseek($this->_zip_fd, $v_size - 22);
+          if (($v_pos = @ftell($this->_zip_fd)) != ($v_size - 22)) {
               $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
                          'Unable to seek back to the middle of the archive \''
                          .$this->_zipname.'\'');
@@ -2483,8 +2483,8 @@ 
       if ($v_maximum_size > $v_size) {
           $v_maximum_size = $v_size;
       }
-        @fseek($this->_zip_fd, $v_size-$v_maximum_size);
-        if (@ftell($this->_zip_fd) != ($v_size-$v_maximum_size)) {
+        @fseek($this->_zip_fd, $v_size - $v_maximum_size);
+        if (@ftell($this->_zip_fd) != ($v_size - $v_maximum_size)) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
                          'Unable to seek back to the middle of the archive \''
                          .$this->_zipname.'\'');
@@ -2570,11 +2570,11 @@ 
   */
   public function _deleteByRule(&$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         // ----- Return
       return $v_result;
     }
@@ -2605,7 +2605,7 @@ 
     // ----- Read each entry
     $v_header_list = array();
       $j_start = 0;
-      for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+      for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
 
       // ----- Read the file header
       $v_header_list[$v_nb_extracted] = array();
@@ -2629,7 +2629,7 @@ 
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0;
+          for ($j = 0;
                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                  && (!$v_found);
                $j++) {
@@ -2641,7 +2641,7 @@ 
                   if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
                       $v_found = true;
-                  } elseif ((($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                  } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -2677,19 +2677,19 @@ 
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start;
+          for ($j = $j_start;
                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
                  && (!$v_found);
                $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
-                  && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
+                  && ($i <= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
                   $v_found = true;
               }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
+              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -2722,7 +2722,7 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i < count($v_header_list); $i++) {
+        for ($i = 0; $i < count($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->_zip_fd);
@@ -2776,9 +2776,9 @@ 
         $v_offset = @ftell($v_temp_zip->_zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i < count($v_header_list); $i++) {
+        for ($i = 0; $i < count($v_header_list); $i++) {
             // ----- Create the file header
-            $v_result=$v_temp_zip->_writeCentralFileHeader($v_header_list[$i]);
+            $v_result = $v_temp_zip->_writeCentralFileHeader($v_header_list[$i]);
             if ($v_result != 1) {
                 // ----- Clean
                 $v_temp_zip->_closeFd();
@@ -2798,7 +2798,7 @@ 
         $v_comment = '';
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->_zip_fd)-$v_offset;
+        $v_size = @ftell($v_temp_zip->_zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         $v_result = $v_temp_zip->_writeCentralHeader(count($v_header_list),
@@ -2854,13 +2854,13 @@ 
   *
   * @param [type] $p_is_dir
   */
-  public function _dirCheck($p_dir, $p_is_dir=false)
+  public function _dirCheck($p_dir, $p_is_dir = false)
   {
       $v_result = 1;
 
     // ----- Remove the final '/'
     if ($p_is_dir && (substr($p_dir, -1) == '/')) {
-        $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+        $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
     }
 
     // ----- Check the directory availability
@@ -2908,7 +2908,7 @@ 
   */
   public function _merge(&$p_archive_to_add)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if the archive_to_add exists
     if (!is_file($p_archive_to_add->_zipname)) {
@@ -2925,7 +2925,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         return $v_result;
     }
 
@@ -2940,7 +2940,7 @@ 
     @rewind($this->_zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->_openFd('rb')) != 1) {
+    if (($v_result = $p_archive_to_add->_openFd('rb')) != 1) {
         $this->_closeFd();
         return $v_result;
     }
@@ -3020,7 +3020,7 @@ 
     $v_comment = '';
 
     // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -3086,7 +3086,7 @@ 
   */
   public function _duplicate($p_archive_filename)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename)) {
@@ -3099,7 +3099,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('wb')) != 1) {
+    if (($v_result = $this->_openFd('wb')) != 1) {
         // ----- Return
       return $v_result;
     }
@@ -3173,8 +3173,8 @@ 
     // ----- Check specific parameters
     $v_callback_list = array('callback_pre_add', 'callback_post_add',
                               'callback_pre_extract', 'callback_post_extract');
-      for ($i=0; $i < count($v_callback_list); $i++) {
-          $v_key=$v_callback_list[$i];
+      for ($i = 0; $i < count($v_callback_list); $i++) {
+          $v_key = $v_callback_list[$i];
           if (isset($p_params[$v_key]) && ($p_params[$v_key] != '')) {
               if (!function_exists($p_params[$v_key])) {
                   $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE,
@@ -3203,7 +3203,7 @@ 
   * @param integer $p_error_code
   * @param string $p_error_string
   */
-  public function _errorLog($p_error_code=0, $p_error_string='')
+  public function _errorLog($p_error_code = 0, $p_error_string = '')
   {
       $this->_error_code = $p_error_code;
       $this->_error_string = $p_error_string;
@@ -3250,7 +3250,7 @@ 
       $v_list = explode('/', $p_dir);
 
       // ----- Study directories from last to first
-      for ($i= count($v_list) - 1; $i >= 0; $i--) {
+      for ($i = count($v_list) - 1; $i >= 0; $i--) {
           // ----- Look for current path
         if ($v_list[$i] == '.') {
             // ----- Ignore this directory
@@ -3262,7 +3262,7 @@ 
             // ----- Ignore only the double '//' in path,
           // but not the first and last '/'
         } else {
-            $v_result = $v_list[$i].($i!=(count($v_list) - 1)? '/' . $v_result: '');
+            $v_result = $v_list[$i].($i != (count($v_list) - 1) ? '/'.$v_result : '');
         }
       }
     }
@@ -3372,11 +3372,11 @@ 
   *
   * @param integer $p_mode
   */
-  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
       $v_result = 1;
 
-      if ($p_mode==0) {
+      if ($p_mode == 0) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3384,7 +3384,7 @@ 
               @fwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==1) {
+      } elseif ($p_mode == 1) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3392,7 +3392,7 @@ 
               @fwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==2) {
+      } elseif ($p_mode == 2) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3400,7 +3400,7 @@ 
               @gzwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==3) {
+      } elseif ($p_mode == 3) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3471,13 +3471,13 @@ 
   *
   * @param [type] $p_remove_disk_letter
   */
-  public function _tool_TranslateWinPath($p_path, $p_remove_disk_letter=true)
+  public function _tool_TranslateWinPath($p_path, $p_remove_disk_letter = true)
   {
       if (stristr(php_uname(), 'windows')) {
           // ----- Look for potential disk letter
       if ($p_remove_disk_letter
           && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
+          $p_path = substr($p_path, $v_position + 1);
       }
       // ----- Change potential windows directory separator
       if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {

xoops_trust_path/libs/altsys/include/mygrouppermform.php

Doc Comments +10 added lines

@@ -70,6 +70,12 @@ 
      */
 //HACK by domifara
 //  public function MyXoopsGroupPermForm($title, $modid, $permname, $permdesc)
+    /**
+     * @param string $title
+     * @param integer $modid
+     * @param string $permname
+     * @param string $permdesc
+     */
     public function __construct($title, $modid, $permname, $permdesc)
     {
         //      $this->XoopsForm($title, 'groupperm_form', XOOPS_URL.'/modules/system/admin/groupperm.php', 'post'); GIJ
@@ -100,6 +106,9 @@ 
      * Add appendix
      *
      * @access public
+     * @param string $permName
+     * @param integer $itemId
+     * @param string $itemName
      */
     public function addAppendix($permName, $itemId, $itemName)
     {
@@ -239,6 +248,7 @@ 
 
     /**
      * Constructor
+     * @param string $name
      */
     public function __construct($caption, $name, $groupId, $values = null)
     {

Spacing +27 added lines, -27 removed lines

@@ -17,8 +17,8 @@ 
  * @author       XOOPS Development Team, Kazumi Ono (AKA onokazu)
  */
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
@@ -48,7 +48,7 @@ 
      * Tree structure of items
      * @var array
      */
-    public $_itemTree = array() ;
+    public $_itemTree = array();
     /**
      * Name of permission
      * @var string
@@ -63,7 +63,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -103,7 +103,7 @@ 
      */
     public function addAppendix($permName, $itemId, $itemName)
     {
-        $this->_appendix[] = array('permname'=>$permName,'itemid'=>$itemId,'itemname'=>$itemName,'selected'=>false);
+        $this->_appendix[] = array('permname'=>$permName, 'itemid'=>$itemId, 'itemname'=>$itemName, 'selected'=>false);
     }
 
     /**
@@ -137,7 +137,7 @@ 
      */
     public function render()
     {
-        global $xoopsGTicket ;
+        global $xoopsGTicket;
 
         // load all child ids for javascript codes
         foreach (array_keys($this->_itemTree) as $item_id) {
@@ -154,11 +154,11 @@ 
             $ele->setOptionTree($this->_itemTree);
 
             // GIJ start
-            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">') ;
+            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">');
             // GIJ_end
 
             foreach ($this->_appendix as $key => $append) {
-                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid) ;
+                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid);
             }
             $ele->setAppendix($this->_appendix);
             $this->addElement($ele);
@@ -168,11 +168,11 @@ 
         // GIJ start
         $jstray = new XoopsFormElementTray(' &nbsp; ');
         $jsuncheckbutton = new XoopsFormButton('', 'none', _NONE, 'button');
-        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"") ;
+        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"");
         $jscheckbutton = new XoopsFormButton('', 'all', _ALL, 'button');
-        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"") ;
-        $jstray->addElement($jsuncheckbutton) ;
-        $jstray->addElement($jscheckbutton) ;
+        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"");
+        $jstray->addElement($jsuncheckbutton);
+        $jstray->addElement($jscheckbutton);
         $this->addElement($jstray);
         // GIJ end
 
@@ -183,7 +183,7 @@ 
 
         $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
         $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $elements =& $this->getElements();
+        $elements = & $this->getElements();
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
@@ -199,7 +199,7 @@ 
                 $ret .= $elements[$i]->render();
             }
         }
-        $ret .= '</table>' . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin') . '</form>';
+        $ret .= '</table>'.$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin').'</form>';
         return $ret;
     }
 }
@@ -235,7 +235,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -285,7 +285,7 @@ 
      */
     public function setAppendix($appendix)
     {
-        $this->_appendix = $appendix ;
+        $this->_appendix = $appendix;
     }
 
     /**
@@ -296,7 +296,7 @@ 
      */
     public function render()
     {
-        $ret = '' ;
+        $ret = '';
 
         if (count($this->_appendix) > 0) {
             $ret .= '<table class="outer"><tr>';
@@ -306,11 +306,11 @@ 
                     $ret .= '</tr><tr>';
                     $cols = 1;
                 }
-                $checked = $append['selected'] ? 'checked="checked"' : '' ;
-                $name = 'perms['.$append['permname'].']' ;
-                $itemid = $append['itemid'] ;
-                $itemid = $append['itemid'] ;
-                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>" ;
+                $checked = $append['selected'] ? 'checked="checked"' : '';
+                $name = 'perms['.$append['permname'].']';
+                $itemid = $append['itemid'];
+                $itemid = $append['itemid'];
+                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>";
                 $cols++;
             }
             $ret .= '</tr></table>';
@@ -318,7 +318,7 @@ 
 
         $ret .= '<table class="outer"><tr>';
         $cols = 1;
-        if (! empty($this->_optionTree[0]['children'])) {
+        if (!empty($this->_optionTree[0]['children'])) {
             foreach ($this->_optionTree[0]['children'] as $topitem) {
                 if ($cols > 4) {
                     $ret .= '</tr><tr>';
@@ -346,8 +346,8 @@ 
      */
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
-        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . ']['
-                 . $option['id'] . "]\" onclick=\"";
+        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" id=\"".$this->getName().'[groups]['.$this->_groupId.']['
+                 . $option['id']."]\" onclick=\"";
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
@@ -367,8 +367,8 @@ 
         if (isset($this->_value) && in_array($option['id'], $this->_value)) {
             $tree .= ' checked="checked"';
         }
-        $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname]['
-                 . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
+        $tree .= ' />'.$option['name']."<input type=\"hidden\" name=\"".$this->getName().'[parents]['.$option['id']."]\" value=\"".implode(':', $parentIds)."\" /><input type=\"hidden\" name=\"".$this->getName().'[itemname]['
+                 . $option['id']."]\" value=\"".htmlspecialchars($option['name'])."\" /><br />\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);

xoops_trust_path/libs/altsys/compilehookadmin.php

Spacing +93 added lines, -93 removed lines

@@ -5,16 +5,16 @@ 
 //                       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' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 
 // this page can be called only from altsys
 // if( $xoopsModule->getVar('dirname') != 'altsys' ) die( 'this page can be called only from altsys' ) ;
 
 // language file
-altsys_include_language_file('compilehookadmin') ;
+altsys_include_language_file('compilehookadmin');
 
 //
 // DEFINITIONS
@@ -23,46 +23,46 @@ 
 $compile_hooks = array(
 
     'enclosebycomment' => array(
-        'pre' => '<!-- begin altsys_tplsadmin %s -->' ,
-        'post' => '<!-- end altsys_tplsadmin %s -->' ,
-        'success_msg' => _TPLSADMIN_FMT_MSG_ENCLOSEBYCOMMENT ,
-        'dt' => _TPLSADMIN_DT_ENCLOSEBYCOMMENT ,
-        'dd' => _TPLSADMIN_DD_ENCLOSEBYCOMMENT ,
-        'conf_msg' => _TPLSADMIN_CNF_ENCLOSEBYCOMMENT ,
+        'pre' => '<!-- begin altsys_tplsadmin %s -->',
+        'post' => '<!-- end altsys_tplsadmin %s -->',
+        'success_msg' => _TPLSADMIN_FMT_MSG_ENCLOSEBYCOMMENT,
+        'dt' => _TPLSADMIN_DT_ENCLOSEBYCOMMENT,
+        'dd' => _TPLSADMIN_DD_ENCLOSEBYCOMMENT,
+        'conf_msg' => _TPLSADMIN_CNF_ENCLOSEBYCOMMENT,
         'skip_theme' => true
-    ) ,
+    ),
 
     'enclosebybordereddiv' => array(
-        'pre' => '<div class="altsys_tplsadmin_frame" style="border:1px solid black;word-wrap:break-word;">' ,
-        'post' => '<br /><a href="'.XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=%1$s" style="color:red;">Edit:<br />%1$s</a></div>' ,
-        'success_msg' => _TPLSADMIN_FMT_MSG_ENCLOSEBYBORDEREDDIV ,
-        'dt' => _TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV ,
-        'dd' => _TPLSADMIN_DD_ENCLOSEBYBORDEREDDIV ,
-        'conf_msg' => _TPLSADMIN_CNF_ENCLOSEBYBORDEREDDIV ,
+        'pre' => '<div class="altsys_tplsadmin_frame" style="border:1px solid black;word-wrap:break-word;">',
+        'post' => '<br /><a href="'.XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=%1$s" style="color:red;">Edit:<br />%1$s</a></div>',
+        'success_msg' => _TPLSADMIN_FMT_MSG_ENCLOSEBYBORDEREDDIV,
+        'dt' => _TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV,
+        'dd' => _TPLSADMIN_DD_ENCLOSEBYBORDEREDDIV,
+        'conf_msg' => _TPLSADMIN_CNF_ENCLOSEBYBORDEREDDIV,
         'skip_theme' => true
-    ) ,
+    ),
 
     'hooksavevars' => array(
-        'pre' => '<?php include_once "'.XOOPS_TRUST_PATH.'/libs/altsys/include/compilehook.inc.php" ; tplsadmin_save_tplsvars(\'%s\',$this) ; ?>' ,
-        'post' => '' ,
-        'success_msg' => _TPLSADMIN_FMT_MSG_HOOKSAVEVARS ,
-        'dt' => _TPLSADMIN_DT_HOOKSAVEVARS ,
-        'dd' => _TPLSADMIN_DD_HOOKSAVEVARS ,
-        'conf_msg' => _TPLSADMIN_CNF_HOOKSAVEVARS ,
+        'pre' => '<?php include_once "'.XOOPS_TRUST_PATH.'/libs/altsys/include/compilehook.inc.php" ; tplsadmin_save_tplsvars(\'%s\',$this) ; ?>',
+        'post' => '',
+        'success_msg' => _TPLSADMIN_FMT_MSG_HOOKSAVEVARS,
+        'dt' => _TPLSADMIN_DT_HOOKSAVEVARS,
+        'dd' => _TPLSADMIN_DD_HOOKSAVEVARS,
+        'conf_msg' => _TPLSADMIN_CNF_HOOKSAVEVARS,
         'skip_theme' => false
-    ) ,
+    ),
 
     'removehooks' => array(
-        'pre' => '' ,
-        'post' => '' ,
-        'success_msg' => _TPLSADMIN_FMT_MSG_REMOVEHOOKS ,
-        'dt' => _TPLSADMIN_DT_REMOVEHOOKS ,
-        'dd' => _TPLSADMIN_DD_REMOVEHOOKS ,
-        'conf_msg' => _TPLSADMIN_CNF_REMOVEHOOKS ,
+        'pre' => '',
+        'post' => '',
+        'success_msg' => _TPLSADMIN_FMT_MSG_REMOVEHOOKS,
+        'dt' => _TPLSADMIN_DT_REMOVEHOOKS,
+        'dd' => _TPLSADMIN_DD_REMOVEHOOKS,
+        'conf_msg' => _TPLSADMIN_CNF_REMOVEHOOKS,
         'skip_theme' => false
     )
 
-) ;
+);
 
 
 //
@@ -70,115 +70,115 @@ 
 //
 
 // clearing files in templates_c/
-if (! empty($_POST['clearcache']) || ! empty($_POST['cleartplsvars'])) {
+if (!empty($_POST['clearcache']) || !empty($_POST['cleartplsvars'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
+    if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
         while (($file = readdir($handler)) !== false) {
-            if (! empty($_POST['clearcache'])) {
+            if (!empty($_POST['clearcache'])) {
                 // judging template cache '*.php'
                 if (substr($file, -4) !== '.php') {
-                    continue ;
+                    continue;
                 }
             } else {
                 // judging tplsvars cache 'tplsvars_*'
                 if (substr($file, 0, 9) !== 'tplsvars_') {
-                    continue ;
+                    continue;
                 }
             }
 
-            $file_path = XOOPS_COMPILE_PATH . '/' . $file ;
-            @unlink($file_path) ;
+            $file_path = XOOPS_COMPILE_PATH.'/'.$file;
+            @unlink($file_path);
         }
-        redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 1, _TPLSADMIN_MSG_CLEARCACHE) ;
-        exit ;
+        redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 1, _TPLSADMIN_MSG_CLEARCACHE);
+        exit;
     } else {
-        die('XOOPS_COMPILE_PATH cannot be opened') ;
+        die('XOOPS_COMPILE_PATH cannot be opened');
     }
 }
 
 // append hooking commands
 foreach ($compile_hooks as $command => $compile_hook) {
-    if (! empty($_POST[$command])) {
+    if (!empty($_POST[$command])) {
         // Ticket Check
-        if (! $xoopsGTicket->check()) {
+        if (!$xoopsGTicket->check()) {
             redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
         }
 
-        if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
-            $file_count = 0 ;
+        if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
+            $file_count = 0;
             while (($file = readdir($handler)) !== false) {
 
                 // skip /. /.. and hidden files
                 if ($file{0} == '.') {
-                    continue ;
+                    continue;
                 }
 
                 // skip if the extension is not .html.php
                 if (substr($file, -9) != '.html.php') {
-                    continue ;
+                    continue;
                 }
 
                 // skip theme.html when comment-mode or div-mode
                 if ($compile_hook['skip_theme'] && substr($file, -15) == '%theme.html.php') {
-                    $skip_mode = true ;
+                    $skip_mode = true;
                 } else {
-                    $skip_mode = false ;
+                    $skip_mode = false;
                 }
 
-                $file_path = XOOPS_COMPILE_PATH . '/' . $file ;
-                $file_bodies = file($file_path) ;
+                $file_path = XOOPS_COMPILE_PATH.'/'.$file;
+                $file_bodies = file($file_path);
 
                 // remove lines inserted by compilehookadmin
                 if (strstr($file_bodies[0], 'altsys')) {
-                    array_shift($file_bodies) ;
+                    array_shift($file_bodies);
                 }
-                if (strstr($file_bodies[count($file_bodies)-1], 'altsys')) {
-                    array_pop($file_bodies) ;
-                    $file_bodies[count($file_bodies)-1] = rtrim($file_bodies[count($file_bodies)-1]) ;
+                if (strstr($file_bodies[count($file_bodies) - 1], 'altsys')) {
+                    array_pop($file_bodies);
+                    $file_bodies[count($file_bodies) - 1] = rtrim($file_bodies[count($file_bodies) - 1]);
                 }
 
                 // get the name of the source template from Smarty's comment
                 if (preg_match('/compiled from (\S+)/', $file_bodies[1], $regs)) {
-                    $tpl_name = $regs[1] ;
+                    $tpl_name = $regs[1];
                 } else {
-                    $tpl_name = '__FILE__' ;
+                    $tpl_name = '__FILE__';
                 }
 
-                $fw = fopen($file_path, 'w') ;
+                $fw = fopen($file_path, 'w');
 
                 // insert "pre" command before the compiled cache
-                if ($compile_hook['pre'] && ! $skip_mode) {
-                    fwrite($fw, sprintf($compile_hook['pre'], htmlspecialchars($tpl_name, ENT_QUOTES)) . "\r\n") ;
+                if ($compile_hook['pre'] && !$skip_mode) {
+                    fwrite($fw, sprintf($compile_hook['pre'], htmlspecialchars($tpl_name, ENT_QUOTES))."\r\n");
                 }
 
                 // rest of template cache
                 foreach ($file_bodies as $line) {
-                    fwrite($fw, $line) ;
+                    fwrite($fw, $line);
                 }
 
                 // insert "post" command after the compiled cache
-                if ($compile_hook['post'] && ! $skip_mode) {
-                    fwrite($fw, "\r\n" . sprintf($compile_hook['post'], htmlspecialchars($tpl_name, ENT_QUOTES))) ;
+                if ($compile_hook['post'] && !$skip_mode) {
+                    fwrite($fw, "\r\n".sprintf($compile_hook['post'], htmlspecialchars($tpl_name, ENT_QUOTES)));
                 }
 
-                fclose($fw) ;
+                fclose($fw);
 
-                $file_count ++ ;
+                $file_count++;
             }
 
             if ($file_count > 0) {
-                redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf($compile_hook['success_msg'], $file_count)) ;
-                exit ;
+                redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf($compile_hook['success_msg'], $file_count));
+                exit;
             } else {
-                redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, _TPLSADMIN_MSG_CREATECOMPILECACHEFIRST) ;
-                exit ;
+                redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, _TPLSADMIN_MSG_CREATECOMPILECACHEFIRST);
+                exit;
             }
         } else {
-            die('XOOPS_COMPILE_PATH cannot be opened') ;
+            die('XOOPS_COMPILE_PATH cannot be opened');
         }
     }
 }
@@ -190,25 +190,25 @@ 
 //
 
 // count template vars & compiled caches
-$compiledcache_num = 0 ;
-$tplsvars_num = 0 ;
-if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
+$compiledcache_num = 0;
+$tplsvars_num = 0;
+if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
     while (($file = readdir($handler)) !== false) {
         if (strncmp($file, 'tplsvars_', 9) === 0) {
-            $tplsvars_num ++ ;
+            $tplsvars_num++;
         } elseif (substr($file, -4) === '.php') {
-            $compiledcache_num ++ ;
+            $compiledcache_num++;
         }
     }
 }
 
 // get tplsets
-$sql = 'SELECT tplset_name,COUNT(distinct tpl_file) FROM ' . $xoopsDB->prefix('tplset') . ' LEFT JOIN ' . $xoopsDB->prefix('tplfile') . " ON tplset_name=tpl_tplset GROUP BY tpl_tplset ORDER BY tpl_tplset='default' DESC,tpl_tplset" ;
+$sql = 'SELECT tplset_name,COUNT(distinct tpl_file) FROM '.$xoopsDB->prefix('tplset').' LEFT JOIN '.$xoopsDB->prefix('tplfile')." ON tplset_name=tpl_tplset GROUP BY tpl_tplset ORDER BY tpl_tplset='default' DESC,tpl_tplset";
 $srs = $xoopsDB->query($sql);
-$tplset_options = "<option value=''>----</option>\n" ;
+$tplset_options = "<option value=''>----</option>\n";
 while (list($tplset, $tpl_count) = $xoopsDB->fetchRow($srs)) {
-    $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES) ;
-    $tplset_options .= "<option value='$tplset4disp'>$tplset4disp ($tpl_count)</option>\n" ;
+    $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
+    $tplset_options .= "<option value='$tplset4disp'>$tplset4disp ($tpl_count)</option>\n";
 }
 
 
@@ -218,14 +218,14 @@ 
 // FORM STAGE
 //
 
-xoops_cp_header() ;
+xoops_cp_header();
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
 // breadcrumbs
-$breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=compilehookadmin', _MI_ALTSYS_MENU_COMPILEHOOKADMIN) ;
+$breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=compilehookadmin', _MI_ALTSYS_MENU_COMPILEHOOKADMIN);
 
 echo "
 	<style>
@@ -250,7 +250,7 @@ 
 				</dd>
 			</dl>
 		</p>
-	\n" ;
+	\n";
 }
 
 echo "
@@ -271,10 +271,10 @@ 
 		<p>
 			<dl>
 				<dt>
-                    "._TPLSADMIN_DT_GETTPLSVARSINFO_DW . '
+                    "._TPLSADMIN_DT_GETTPLSVARSINFO_DW.'
 				</dt>
 				<dd>
-                    ' . _TPLSADMIN_DD_GETTPLSVARSINFO_DW . "
+                    ' . _TPLSADMIN_DD_GETTPLSVARSINFO_DW."
 					<br />
 					<input type='submit' name='as_dw_extension_zip' value='zip' />
 					<input type='submit' name='as_dw_extension_tgz' value='tar.gz' />
@@ -287,10 +287,10 @@ 
 		<p>
 			<dl>
 				<dt>
-                    "._TPLSADMIN_DT_GETTEMPLATES . '
+                    "._TPLSADMIN_DT_GETTEMPLATES.'
 				</dt>
 				<dd>
-                    ' . _TPLSADMIN_DD_GETTEMPLATES . "
+                    ' . _TPLSADMIN_DD_GETTEMPLATES."
 					<br />
 					<select name='tplset'>$tplset_options</select>
 					<input type='submit' name='download_zip' value='zip' />
@@ -304,10 +304,10 @@ 
 		<p>
 			<dl>
 				<dt>
-                    "._TPLSADMIN_DT_PUTTEMPLATES . '
+                    "._TPLSADMIN_DT_PUTTEMPLATES.'
 				</dt>
 				<dd>
-                    ' . _TPLSADMIN_DD_PUTTEMPLATES . "
+                    ' . _TPLSADMIN_DD_PUTTEMPLATES."
 					<br />
 					<select name='tplset'>$tplset_options</select>
 					<input type='file' name='tplset_archive' size='60' />
@@ -319,4 +319,4 @@ 
 \n" ;
 
 
-xoops_cp_footer() ;
+xoops_cp_footer();

xoops_trust_path/libs/altsys/mymenusub/myblocksadmin.php

Spacing +23 added lines, -23 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-$core_type = altsys_get_core_type() ;
-$db = XoopsDatabaseFactory::getDatabaseConnection() ;
+$core_type = altsys_get_core_type();
+$db = XoopsDatabaseFactory::getDatabaseConnection();
 
-$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']) ;
+$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']);
 if ($current_dirname == '__CustomBlocks__') {
-    return ;
+    return;
 }
 
     $module_handler4menu = xoops_getHandler('module');
@@ -17,45 +17,45 @@ 
     //$criteria4menu->add(new Criteria('hasmain', 1));
     $criteria4menu->add(new Criteria('mid', '1', '>'));
     $modules4menu = $module_handler4menu->getObjects($criteria4menu, true);
-    $system_module = $module_handler4menu->get(1) ;
+    $system_module = $module_handler4menu->get(1);
     if (is_object($system_module)) {
-        array_unshift($modules4menu, $system_module) ;
+        array_unshift($modules4menu, $system_module);
     }
 
-$adminmenu = array() ;
+$adminmenu = array();
 foreach ($modules4menu as $m4menu) {
     // get block info
     if ($core_type != ALTSYS_CORE_TYPE_X22) {
-        list($block_count_all) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $m4menu->getVar('mid'))) ;
-        list($block_count_visible) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $m4menu->getVar('mid') . ' AND visible>0')) ;
+        list($block_count_all) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('newblocks').' WHERE mid='.$m4menu->getVar('mid')));
+        list($block_count_visible) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('newblocks').' WHERE mid='.$m4menu->getVar('mid').' AND visible>0'));
         // $block_desc = " $block_count_all($block_count_visible)" ;
-        $block_desc = " ($block_count_visible/$block_count_all)" ;
+        $block_desc = " ($block_count_visible/$block_count_all)";
     } else {
-        $block_desc = '' ;
+        $block_desc = '';
     }
 
     if ($m4menu->getVar('dirname') == $current_dirname) {
         $adminmenu[] = array(
-            'selected' => true ,
-            'title' => $m4menu->getVar('name', 'n') . $block_desc ,
+            'selected' => true,
+            'title' => $m4menu->getVar('name', 'n').$block_desc,
             'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$m4menu->getVar('dirname', 'n')
-        ) ;
+        );
         //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => $m4menu->getVar('name') ) ;
     } else {
         $adminmenu[] = array(
-            'selected' => false ,
-            'title' => $m4menu->getVar('name', 'n') . $block_desc ,
+            'selected' => false,
+            'title' => $m4menu->getVar('name', 'n').$block_desc,
             'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$m4menu->getVar('dirname', 'n')
-        ) ;
+        );
     }
 }
 
 
 // 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(
     'adminmenu' => $adminmenu,
     'mypage' => 'myblocksadmin'
-)) ;
-$tpl->display('db:altsys_inc_mymenusub.html') ;
+));
+$tpl->display('db:altsys_inc_mymenusub.html');

xoops_trust_path/libs/altsys/preload.php

Spacing +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
 //admin page
 if ($root->mController->_mStrategy) {
     if (strtolower(get_class($root->mController->_mStrategy)) == strtolower('Legacy_AdminControllerStrategy')) {
-        include_once __DIR__.'/include/altsys_functions.php' ;
+        include_once __DIR__.'/include/altsys_functions.php';
         // language file (modinfo.php)
-        altsys_include_language_file('modinfo') ;
+        altsys_include_language_file('modinfo');
     }
 }
 // load altsys newly gticket class for other modules