mambax7 / altsys

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

Doc Comments +24 added lines

@@ -488,6 +488,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;
@@ -646,6 +652,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_delete($bid)
     {
         $bid = intval($bid) ;
@@ -671,6 +680,9 @@ 
     }
 
 //HACK add by domifara
+/**
+ * @param integer $bid
+ */
 public function do_deleteBlockReadGroupPerm($bid)
 {
     $bid = intval($bid) ;
@@ -679,6 +691,9 @@ 
     $this->db->query($sql) ;
 }
 
+    /**
+     * @param integer $bid
+     */
     public function form_delete($bid)
     {
         $bid = intval($bid) ;
@@ -708,6 +723,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_clone($bid)
     {
         $bid = intval($bid) ;
@@ -786,6 +804,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_edit($bid)
     {
         $bid = intval($bid) ;
@@ -829,6 +850,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function form_edit($bid, $mode = 'edit')
     {
         $bid = intval($bid) ;

Switch Indentation +66 added lines, -66 removed lines

@@ -308,30 +308,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 ;
     }
     }
 
@@ -851,31 +851,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 ;
@@ -1051,23 +1051,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

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

xoops_trust_path/libs/altsys/include/altsys_functions.php

Doc Comments +6 added lines

@@ -103,6 +103,12 @@
 }
 
 
+/**
+ * @param integer $mid
+ * @param integer $coretype
+ *
+ * @return string
+ */
 function altsys_get_link2modpreferences($mid, $coretype)
 {
     switch ($coretype) {

Spacing +56 added lines, -56 removed lines

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

xoops_trust_path/libs/altsys/include/mygrouppermform.php

Doc Comments +10 added lines

@@ -82,6 +82,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
@@ -112,6 +118,9 @@ 
      * Add appendix
      *
      * @access public
+     * @param string $permName
+     * @param integer $itemId
+     * @param string $itemName
      */
     public function addAppendix($permName, $itemId, $itemName)
     {
@@ -251,6 +260,7 @@ 
 
     /**
      * Constructor
+     * @param string $name
      */
     public function MyXoopsGroupFormCheckBox($caption, $name, $groupId, $values = null)
     {

Spacing +28 added lines, -28 removed lines

@@ -29,8 +29,8 @@ 
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
@@ -60,7 +60,7 @@ 
      * Tree structure of items
      * @var array
      */
-    public $_itemTree = array() ;
+    public $_itemTree = array();
     /**
      * Name of permission
      * @var string
@@ -75,7 +75,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -115,7 +115,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);
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function render()
     {
-        global $xoopsGTicket ;
+        global $xoopsGTicket;
 
         // load all child ids for javascript codes
         foreach (array_keys($this->_itemTree) as $item_id) {
@@ -166,11 +166,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);
@@ -180,11 +180,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
 
@@ -195,7 +195,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];
@@ -211,7 +211,7 @@ 
                 $ret .= $elements[$i]->render();
             }
         }
-        $ret .= '</table>' . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin') . '</form>';
+        $ret .= '</table>'.$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin').'</form>';
         return $ret;
     }
 }
@@ -247,7 +247,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -287,7 +287,7 @@ 
      */
     public function setOptionTree(&$optionTree)
     {
-        $this->_optionTree =& $optionTree;
+        $this->_optionTree = & $optionTree;
     }
 
     /**
@@ -297,7 +297,7 @@ 
      */
     public function setAppendix($appendix)
     {
-        $this->_appendix = $appendix ;
+        $this->_appendix = $appendix;
     }
 
     /**
@@ -308,7 +308,7 @@ 
      */
     public function render()
     {
-        $ret = '' ;
+        $ret = '';
 
         if (count($this->_appendix) > 0) {
             $ret .= '<table class="outer"><tr>';
@@ -318,11 +318,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>';
@@ -330,7 +330,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>';
@@ -358,8 +358,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.
@@ -379,8 +379,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/include/admin_in_theme_header.inc.php

Switch Indentation +35 added lines, -35 removed lines

@@ -201,41 +201,41 @@
             }
         }
         switch ($block_arr[$i]->getVar('side')) {
-        case XOOPS_SIDEBLOCK_LEFT:
-            if (!isset($show_lblock)) {
-                $xoopsTpl->assign('xoops_showlblock', 1);
-                $show_lblock = 1;
-            }
-            $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_CENTERBLOCK_LEFT:
-            if (!isset($show_cblock)) {
-                $xoopsTpl->assign('xoops_showcblock', 1);
-                $show_cblock = 1;
-            }
-            $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_CENTERBLOCK_RIGHT:
-            if (!isset($show_cblock)) {
-                $xoopsTpl->assign('xoops_showcblock', 1);
-                $show_cblock = 1;
-            }
-            $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_CENTERBLOCK_CENTER:
-            if (!isset($show_cblock)) {
-                $xoopsTpl->assign('xoops_showcblock', 1);
-                $show_cblock = 1;
-            }
-            $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_SIDEBLOCK_RIGHT:
-            if (!isset($show_rblock)) {
-                $xoopsTpl->assign('xoops_showrblock', 1);
-                $show_rblock = 1;
-            }
-            $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
+            case XOOPS_SIDEBLOCK_LEFT:
+                if (!isset($show_lblock)) {
+                    $xoopsTpl->assign('xoops_showlblock', 1);
+                    $show_lblock = 1;
+                }
+                $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_CENTERBLOCK_LEFT:
+                if (!isset($show_cblock)) {
+                    $xoopsTpl->assign('xoops_showcblock', 1);
+                    $show_cblock = 1;
+                }
+                $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_CENTERBLOCK_RIGHT:
+                if (!isset($show_cblock)) {
+                    $xoopsTpl->assign('xoops_showcblock', 1);
+                    $show_cblock = 1;
+                }
+                $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_CENTERBLOCK_CENTER:
+                if (!isset($show_cblock)) {
+                    $xoopsTpl->assign('xoops_showcblock', 1);
+                    $show_cblock = 1;
+                }
+                $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_SIDEBLOCK_RIGHT:
+                if (!isset($show_rblock)) {
+                    $xoopsTpl->assign('xoops_showrblock', 1);
+                    $show_rblock = 1;
+                }
+                $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
         }
         unset($bcontent);
     }

Indentation +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
     $block_arr = array() ;
     if (!empty($blockids)) {
         $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id=' . (int)$altsysModuleId
-               . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
+                . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
         $result = $db->query($sql);
         while ($myrow = $db->fetchArray($result)) {
 

Spacing +47 added lines, -47 removed lines

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

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

Doc Comments +3 added lines

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

Spacing +39 added lines, -39 removed lines

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

xoops_trust_path/libs/altsys/mytplsform.php

Indentation +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
 altsys_include_mymenu() ;
 
 echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT . ' : ' . htmlspecialchars($tpl['tpl_type'], ENT_QUOTES) . ' : ' . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . ' ('
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . ")</h3>\n" ;
+        . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . ")</h3>\n" ;
 
 
 // diff from file to selected DB template
@@ -241,7 +241,7 @@ 
 echo "
 <a name='altsys_tplsform_top' id='altsys_tplsform_top'></a>
 <form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl_file, ENT_QUOTES) . '&amp;tpl_tplset='
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . $target_mname . "' method='post'>
+        . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . $target_mname . "' method='post'>
 	".$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys_tplsform')."
     <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>".htmlspecialchars($tpl['tpl_source'], ENT_QUOTES) . '</textarea>
 	<br />

Spacing +113 added lines, -113 removed lines

@@ -5,36 +5,36 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__ . '/include/tpls_functions.php';
-include_once __DIR__.'/include/Text_Diff.php' ;
-include_once __DIR__.'/include/Text_Diff_Renderer.php' ;
-include_once __DIR__.'/include/Text_Diff_Renderer_unified.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
+include_once __DIR__.'/include/Text_Diff.php';
+include_once __DIR__.'/include/Text_Diff_Renderer.php';
+include_once __DIR__.'/include/Text_Diff_Renderer_unified.php';
 
 
 // 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(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $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(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 //$xoops_system_path = XOOPS_ROOT_PATH . '/modules/system' ;
 
 // initials
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mytplsform') ;
-altsys_include_language_file('mytplsadmin') ;
+altsys_include_language_file('mytplsform');
+altsys_include_language_file('mytplsadmin');
 
 // check $xoopsModule
-if (! is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM) ;
+if (!is_object($xoopsModule)) {
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // check access right (needs system_admin of tplset)
@@ -42,128 +42,128 @@ 
 //if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_TPLSET, $xoopsUser->getGroups())) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
 
 // tpl_file from $_GET
-$tpl_tplset = $myts->stripSlashesGPC(@$_GET['tpl_tplset']) ;
-if (! $tpl_tplset) {
-    $tpl_tplset = $xoopsConfig['template_set'] ;
+$tpl_tplset = $myts->stripSlashesGPC(@$_GET['tpl_tplset']);
+if (!$tpl_tplset) {
+    $tpl_tplset = $xoopsConfig['template_set'];
 }
-$tpl_tplset4sql = addslashes($tpl_tplset) ;
+$tpl_tplset4sql = addslashes($tpl_tplset);
 
 if (empty($_GET['tpl_file']) || $_GET['tpl_file'] == '_custom') {
-    $edit_mode = 'create' ;
-    $tpl_file = '_custom' ;
+    $edit_mode = 'create';
+    $tpl_file = '_custom';
     $tpl = array(
-        'tpl_id' => 0 ,
-        'tpl_refid' => 0 ,
-        'tpl_module' => '_custom' ,
-        'tpl_tplset' => $tpl_tplset ,
-        'tpl_file' => '_custom_'.substr(date('YmdHis'), 2, -2).'.html' ,
-        'tpl_desc' => '' ,
-        'tpl_lastmodified' => 0 ,
-        'tpl_lastimported' => 0 ,
-        'tpl_type' => 'custom' ,
+        'tpl_id' => 0,
+        'tpl_refid' => 0,
+        'tpl_module' => '_custom',
+        'tpl_tplset' => $tpl_tplset,
+        'tpl_file' => '_custom_'.substr(date('YmdHis'), 2, -2).'.html',
+        'tpl_desc' => '',
+        'tpl_lastmodified' => 0,
+        'tpl_lastimported' => 0,
+        'tpl_type' => 'custom',
         'tpl_source' => ''
-    ) ;
+    );
 
     // breadcrumbs
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN') ;
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname=_custom', _MYTPLSADMIN_CUSTOMTEMPLATE) ;
-    $breadcrumbsObj->appendPath('', '_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE') ;
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname=_custom', _MYTPLSADMIN_CUSTOMTEMPLATE);
+    $breadcrumbsObj->appendPath('', '_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE');
     $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE;
 } else {
     // tpl_file from $_GET
-    $edit_mode = 'modify' ;
-    $tpl_file = $myts->stripSlashesGPC(@$_GET['tpl_file']) ;
-    $tpl_file = str_replace('db:', '', $tpl_file) ;
-    $tpl_file4sql = addslashes($tpl_file) ;
+    $edit_mode = 'modify';
+    $tpl_file = $myts->stripSlashesGPC(@$_GET['tpl_file']);
+    $tpl_file = str_replace('db:', '', $tpl_file);
+    $tpl_file4sql = addslashes($tpl_file);
 
     // get information from tplfile table
-    $sql = 'SELECT * FROM ' . $db->prefix('tplfile') . ' f NATURAL LEFT JOIN ' . $db->prefix('tplsource') . " s WHERE f.tpl_file='$tpl_file4sql' ORDER BY f.tpl_tplset='$tpl_tplset4sql' DESC,f.tpl_tplset='default' DESC" ;
-    $tpl = $db->fetchArray($db->query($sql)) ;
+    $sql = 'SELECT * FROM '.$db->prefix('tplfile').' f NATURAL LEFT JOIN '.$db->prefix('tplsource')." s WHERE f.tpl_file='$tpl_file4sql' ORDER BY f.tpl_tplset='$tpl_tplset4sql' DESC,f.tpl_tplset='default' DESC";
+    $tpl = $db->fetchArray($db->query($sql));
 
     // get module info
     if ($tpl['tpl_module'] == '_custom') {
-        $target_module = null ;
-        $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE ;
+        $target_module = null;
+        $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE;
     } else {
-        $module_handler = xoops_gethandler('module') ;
-        $target_module =& $module_handler->getByDirname($tpl['tpl_module']) ;
-        $target_mname = is_object($target_module) ? $target_module->getVar('name') : '' ;
+        $module_handler = xoops_gethandler('module');
+        $target_module = & $module_handler->getByDirname($tpl['tpl_module']);
+        $target_mname = is_object($target_module) ? $target_module->getVar('name') : '';
     }
 
     // breadcrumbs
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
     if ($mydirname != 'altsys' && is_object($target_module)) {
         // mytplsform in each modules
-        $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname') ;
-        $modinfo = $target_module->getInfo() ;
-        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $target_mname) ;
-        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MD_A_MYTPLSFORM_TPLSADMIN) ;
+        $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname');
+        $modinfo = $target_module->getInfo();
+        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $target_mname);
+        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MD_A_MYTPLSFORM_TPLSADMIN);
     } else {
         // mytplsform in altsys
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN') ;
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname='.htmlspecialchars($tpl['tpl_module']), $target_mname) ;
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname='.htmlspecialchars($tpl['tpl_module']), $target_mname);
     }
-    $breadcrumbsObj->appendPath('', _MD_A_MYTPLSFORM_EDIT) ;
+    $breadcrumbsObj->appendPath('', _MD_A_MYTPLSFORM_EDIT);
 }
 
 // error in specifying tpl_file
 if (empty($tpl)) {
     if (strncmp($tpl_file, 'file:', 5) === 0) {
-        die('Not DB template') ;
+        die('Not DB template');
     } else {
-        die('Invalid tpl_file.') ;
+        die('Invalid tpl_file.');
     }
 }
 
 //****************//
 // TRANSACT stage //
 //****************//
-if (! empty($_POST['do_modifycont']) || ! empty($_POST['do_modify'])) {
+if (!empty($_POST['do_modifycont']) || !empty($_POST['do_modify'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check(true, 'altsys_tplsform')) {
+    if (!$xoopsGTicket->check(true, 'altsys_tplsform')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $result = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_file='$tpl_file4sql' AND tpl_tplset='" . addslashes($tpl['tpl_tplset']) . "'") ;
+    $result = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_file='$tpl_file4sql' AND tpl_tplset='".addslashes($tpl['tpl_tplset'])."'");
     while (list($tpl_id) = $db->fetchRow($result)) {
-        $sql = 'UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($myts->stripSlashesGPC($_POST['tpl_source'])) . "' WHERE tpl_id=$tpl_id" ;
-        if (! $db->query($sql)) {
-            die('SQL Error') ;
+        $sql = 'UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($myts->stripSlashesGPC($_POST['tpl_source']))."' WHERE tpl_id=$tpl_id";
+        if (!$db->query($sql)) {
+            die('SQL Error');
         }
-        $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified=UNIX_TIMESTAMP() WHERE tpl_id=$tpl_id") ;
-        altsys_template_touch($tpl_id) ;
+        $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified=UNIX_TIMESTAMP() WHERE tpl_id=$tpl_id");
+        altsys_template_touch($tpl_id);
     }
 
     // continue or end ?
-    if (! empty($_POST['do_modifycont'])) {
-        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsform&tpl_file='.$tpl_file.'&tpl_tplset='.$tpl_tplset.'&dirname='.$tpl['tpl_module'].'#altsys_tplsform_top', 1, _MD_A_MYTPLSFORM_UPDATED) ;
+    if (!empty($_POST['do_modifycont'])) {
+        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsform&tpl_file='.$tpl_file.'&tpl_tplset='.$tpl_tplset.'&dirname='.$tpl['tpl_module'].'#altsys_tplsform_top', 1, _MD_A_MYTPLSFORM_UPDATED);
     } else {
-        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_UPDATED) ;
+        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_UPDATED);
     }
-    exit ;
+    exit;
 }
 
-if (! empty($_POST['do_create'])) {
+if (!empty($_POST['do_create'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check(true, 'altsys_tplsform')) {
+    if (!$xoopsGTicket->check(true, 'altsys_tplsform')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $sql = 'INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_file='" . addslashes($myts->stripSlashesGPC($_POST['tpl_file'])) . "',tpl_refid=0,tpl_module='" . addslashes($tpl['tpl_module']) . "',tpl_tplset='" . addslashes($tpl['tpl_tplset']) . "',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='" . addslashes($tpl['tpl_type']) . "'" ;
-    if (! $db->query($sql)) {
-        die('SQL Error'.__LINE__) ;
+    $sql = 'INSERT INTO '.$db->prefix('tplfile')." SET tpl_file='".addslashes($myts->stripSlashesGPC($_POST['tpl_file']))."',tpl_refid=0,tpl_module='".addslashes($tpl['tpl_module'])."',tpl_tplset='".addslashes($tpl['tpl_tplset'])."',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='".addslashes($tpl['tpl_type'])."'";
+    if (!$db->query($sql)) {
+        die('SQL Error'.__LINE__);
     }
     $tpl_id = (int)$db->getInsertId();
-    $sql = 'INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id=$tpl_id,tpl_source='" . addslashes($myts->stripSlashesGPC($_POST['tpl_source'])) . "'" ;
-    if (! $db->query($sql)) {
-        die('SQL Error'.__LINE__) ;
+    $sql = 'INSERT INTO '.$db->prefix('tplsource')." SET tpl_id=$tpl_id,tpl_source='".addslashes($myts->stripSlashesGPC($_POST['tpl_source']))."'";
+    if (!$db->query($sql)) {
+        die('SQL Error'.__LINE__);
     }
-    altsys_template_touch($tpl_id) ;
+    altsys_template_touch($tpl_id);
 
     // continue or end ?
-    redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_CREATED) ;
-    exit ;
+    redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_CREATED);
+    exit;
 }
 
 
@@ -171,56 +171,56 @@ 
 //****************//
 //   FORM stage   //
 //****************//
-xoops_cp_header() ;
-$mymenu_fake_uri = 'index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$mydirname ;
+xoops_cp_header();
+$mymenu_fake_uri = 'index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$mydirname;
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
-echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT . ' : ' . htmlspecialchars($tpl['tpl_type'], ENT_QUOTES) . ' : ' . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . ' ('
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . ")</h3>\n" ;
+echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT.' : '.htmlspecialchars($tpl['tpl_type'], ENT_QUOTES).' : '.htmlspecialchars($tpl['tpl_file'], ENT_QUOTES).' ('
+     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES).")</h3>\n";
 
 
 // diff from file to selected DB template
-$basefilepath = tplsadmin_get_basefilepath($tpl['tpl_module'], $tpl['tpl_type'], $tpl['tpl_file']) ;
-$diff_from_file4disp = '' ;
+$basefilepath = tplsadmin_get_basefilepath($tpl['tpl_module'], $tpl['tpl_type'], $tpl['tpl_file']);
+$diff_from_file4disp = '';
 if (file_exists($basefilepath)) {
-    $original_error_level = error_reporting() ;
-    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING) ;
-    $diff = new Text_Diff(file($basefilepath), explode("\n", $tpl['tpl_source'])) ;
+    $original_error_level = error_reporting();
+    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING);
+    $diff = new Text_Diff(file($basefilepath), explode("\n", $tpl['tpl_source']));
     $renderer = new Text_Diff_Renderer_unified();
-    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES) ;
+    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES);
     foreach (explode("\n", $diff_str) as $line) {
         if (ord($line) == 0x2d) {
-            $diff_from_file4disp .= "<span style='color:red;'>".$line."</span>\n" ;
+            $diff_from_file4disp .= "<span style='color:red;'>".$line."</span>\n";
         } elseif (ord($line) == 0x2b) {
-            $diff_from_file4disp .= "<span style='color:blue;'>".$line."</span>\n" ;
+            $diff_from_file4disp .= "<span style='color:blue;'>".$line."</span>\n";
         } else {
-            $diff_from_file4disp .= $line."\n" ;
+            $diff_from_file4disp .= $line."\n";
         }
     }
-    error_reporting($original_error_level) ;
+    error_reporting($original_error_level);
 }
 
 // diff from DB-default to selected DB template
-$diff_from_default4disp = '' ;
+$diff_from_default4disp = '';
 if ($tpl['tpl_tplset'] != 'default') {
-    $original_error_level = error_reporting() ;
-    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING) ;
-    list($default_source) = $db->fetchRow($db->query('SELECT tpl_source FROM ' . $db->prefix('tplfile') . ' NATURAL LEFT JOIN ' . $db->prefix('tplsource') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl['tpl_file']) . "' AND tpl_module='" . addslashes($tpl['tpl_module']) . "'")) ;
-    $diff = new Text_Diff(explode("\n", $default_source), explode("\n", $tpl['tpl_source'])) ;
+    $original_error_level = error_reporting();
+    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING);
+    list($default_source) = $db->fetchRow($db->query('SELECT tpl_source FROM '.$db->prefix('tplfile').' NATURAL LEFT JOIN '.$db->prefix('tplsource')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl['tpl_file'])."' AND tpl_module='".addslashes($tpl['tpl_module'])."'"));
+    $diff = new Text_Diff(explode("\n", $default_source), explode("\n", $tpl['tpl_source']));
     $renderer = new Text_Diff_Renderer_unified();
-    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES) ;
+    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES);
     foreach (explode("\n", $diff_str) as $line) {
         if (ord($line) == 0x2d) {
-            $diff_from_default4disp .= "<span style='color:red;'>".$line."</span>\n" ;
+            $diff_from_default4disp .= "<span style='color:red;'>".$line."</span>\n";
         } elseif (ord($line) == 0x2b) {
-            $diff_from_default4disp .= "<span style='color:blue;'>".$line."</span>\n" ;
+            $diff_from_default4disp .= "<span style='color:blue;'>".$line."</span>\n";
         } else {
-            $diff_from_default4disp .= $line."\n" ;
+            $diff_from_default4disp .= $line."\n";
         }
     }
-    error_reporting($original_error_level) ;
+    error_reporting($original_error_level);
 }
 
 
@@ -228,11 +228,11 @@ 
 	<form name='diff_form' id='diff_form' action='' method='get'>\n" ;
 if ($diff_from_file4disp) {
     echo "<input type='checkbox' name='display_diff2file' value='1' onClick=\"if(this.checked){document.getElementById('diff2file').style.display='block'}else{document.getElementById('diff2file').style.display='none'};\" id='display_diff2file' checked='checked' />&nbsp;<label for='display_diff2file'>diff from file</label>
-	<pre id='diff2file' style='display:block;border:1px solid black;'>$diff_from_file4disp</pre>\n" ;
+	<pre id='diff2file' style='display:block;border:1px solid black;'>$diff_from_file4disp</pre>\n";
 }
 if ($diff_from_default4disp) {
     echo "<input type='checkbox' name='display_diff2default' value='1' onClick=\"if(this.checked){document.getElementById('diff2default').style.display='block'}else{document.getElementById('diff2default').style.display='none'};\" id='display_diff2default' />&nbsp;<label for='display_diff2default'>diff from default</label>
-	<pre id='diff2default' style='display:none;border:1px solid black;'>$diff_from_default4disp</pre>\n" ;
+	<pre id='diff2default' style='display:none;border:1px solid black;'>$diff_from_default4disp</pre>\n";
 }
 echo "
 	</form>\n" ;
@@ -240,10 +240,10 @@ 
 
 echo "
 <a name='altsys_tplsform_top' id='altsys_tplsform_top'></a>
-<form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl_file, ENT_QUOTES) . '&amp;tpl_tplset='
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . $target_mname . "' method='post'>
+<form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl_file, ENT_QUOTES).'&amp;tpl_tplset='
+     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES).'&amp;dirname='.$target_mname."' method='post'>
 	".$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys_tplsform')."
-    <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>".htmlspecialchars($tpl['tpl_source'], ENT_QUOTES) . '</textarea>
+    <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>".htmlspecialchars($tpl['tpl_source'], ENT_QUOTES).'</textarea>
 	<br />
 ';
 if ($edit_mode == 'create') {
@@ -251,7 +251,7 @@ 
     echo "
 	<label for='tpl_file'>"._MD_A_MYTPLSFORM_LABEL_TPLFILE."</label>
 	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES)."' size='64' /><br />
-	<input type='submit' name='do_create' id='do_create' value='"._MD_A_MYTPLSFORM_BTN_CREATE."' />\n" ;
+	<input type='submit' name='do_create' id='do_create' value='"._MD_A_MYTPLSFORM_BTN_CREATE."' />\n";
 } else {
     // modify form
     echo "
@@ -261,4 +261,4 @@ 
 </form>\n" ;
 }
 
-xoops_cp_footer() ;
+xoops_cp_footer();

xoops_trust_path/libs/altsys/put_templates.php

Spacing +37 added lines, -37 removed lines

@@ -5,25 +5,25 @@ 
 //                        GIJOE <http://www.peak.ne.jp/>                     //
 // ------------------------------------------------------------------------- //
 
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/tpls_functions.php' ;
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
 
 
 // this page can be called only from altsys
 if ($xoopsModule->getVar('dirname') != 'altsys') {
-    die('this page can be called only from altsys') ;
+    die('this page can be called only from altsys');
 }
 
 
 // language file
-altsys_include_language_file('compilehookadmin') ;
+altsys_include_language_file('compilehookadmin');
 
 
-$db = XoopsDatabaseFactory::getDatabaseConnection() ;
+$db = XoopsDatabaseFactory::getDatabaseConnection();
 
-if (empty($_FILES['tplset_archive']['tmp_name']) || ! is_uploaded_file($_FILES['tplset_archive']['tmp_name'])) {
-    die(_TPLSADMIN_ERR_NOTUPLOADED) ;
+if (empty($_FILES['tplset_archive']['tmp_name']) || !is_uploaded_file($_FILES['tplset_archive']['tmp_name'])) {
+    die(_TPLSADMIN_ERR_NOTUPLOADED);
 }
 //fix for mb_http_output setting and for add any browsers
     if (function_exists('mb_http_output')) {
@@ -32,7 +32,7 @@ 
 //ob_buffer over flow
 //HACK by suin & nao-pon 2012/01/06
     while (ob_get_level() > 0) {
-        if (! ob_end_clean()) {
+        if (!ob_end_clean()) {
             break;
         }
     }
@@ -41,62 +41,62 @@ 
 // EXTRACT STAGE
 //
 
-$orig_filename4check = strtolower($_FILES['tplset_archive']['name']) ;
+$orig_filename4check = strtolower($_FILES['tplset_archive']['name']);
 if (strtolower(substr($orig_filename4check, -4)) == '.zip') {
 
     // zip
-    require_once __DIR__.'/include/Archive_Zip.php' ;
-    $reader = new Archive_Zip($_FILES['tplset_archive']['tmp_name']) ;
-    $files = $reader->extract(array( 'extract_as_string' => true )) ;
-    if (! is_array(@$files)) {
-        die($reader->errorName()) ;
+    require_once __DIR__.'/include/Archive_Zip.php';
+    $reader = new Archive_Zip($_FILES['tplset_archive']['tmp_name']);
+    $files = $reader->extract(array('extract_as_string' => true));
+    if (!is_array(@$files)) {
+        die($reader->errorName());
     }
-    $do_upload = true ;
+    $do_upload = true;
 } elseif (substr($orig_filename4check, -4) == '.tgz' || substr($orig_filename4check, -7) == '.tar.gz') {
 
     // tar.gz
-    require_once XOOPS_ROOT_PATH.'/class/class.tar.php' ;
-    $tar = new tar() ;
-    $tar->openTAR($_FILES['tplset_archive']['tmp_name']) ;
-    $files = array() ;
+    require_once XOOPS_ROOT_PATH.'/class/class.tar.php';
+    $tar = new tar();
+    $tar->openTAR($_FILES['tplset_archive']['tmp_name']);
+    $files = array();
     foreach ($tar->files as $id => $info) {
         $files[] = array(
-            'filename' => $info['name'] ,
-            'mtime' => $info['time'] ,
+            'filename' => $info['name'],
+            'mtime' => $info['time'],
             'content' => $info['file']
-        ) ;
+        );
     }
     if (empty($files)) {
-        die(_TPLSADMIN_ERR_INVALIDARCHIVE) ;
+        die(_TPLSADMIN_ERR_INVALIDARCHIVE);
     }
-    $do_upload = true ;
+    $do_upload = true;
 }
 
 if (empty($do_upload)) {
-    die(_TPLSADMIN_ERR_EXTENSION) ;
+    die(_TPLSADMIN_ERR_EXTENSION);
 }
 
 //
 // IMPORT STAGE
 //
 
-$tplset = @$_POST['tplset'] ;
-if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
-    die(_TPLSADMIN_ERR_INVALIDTPLSET) ;
+$tplset = @$_POST['tplset'];
+if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
+    die(_TPLSADMIN_ERR_INVALIDTPLSET);
 }
 
-$imported = 0 ;
+$imported = 0;
 foreach ($files as $file) {
-    if (! empty($file['folder'])) {
-        continue ;
+    if (!empty($file['folder'])) {
+        continue;
     }
-    $pos = strrpos($file['filename'], '/') ;
-    $tpl_file = $pos === false ? $file['filename'] : substr($file['filename'], $pos + 1) ;
+    $pos = strrpos($file['filename'], '/');
+    $tpl_file = $pos === false ? $file['filename'] : substr($file['filename'], $pos + 1);
 
     if (tplsadmin_import_data($tplset, $tpl_file, rtrim($file['content']), $file['mtime'])) {
-        $imported ++ ;
+        $imported++;
     }
 }
 
-redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf(_TPLSADMIN_FMT_MSG_PUTTEMPLATES, $imported)) ;
-exit ;
+redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf(_TPLSADMIN_FMT_MSG_PUTTEMPLATES, $imported));
+exit;

xoops_trust_path/libs/altsys/class/d3utilities.php

Spacing +101 added lines, -101 removed lines

@@ -3,40 +3,40 @@ 
 class d3utilities
 {
 
-    public $dirname = '' ; // directory name under xoops_trust_path
-    public $mydirname = '' ; // each directory name under xoops_root_path
-    public $mid = 0 ; // id of each module instance
-    public $table = '' ; // table with prefix and dirname
-    public $primary_key = '' ; // column for primary_key
-    public $cols = array() ; // settings of each columns
-    public $form_mode = 'new' ; // 'new','edit' are available
-    public $page_name = '' ; // controller's name  eg) page=(controller) in URI
-    public $action_base_hiddens = array() ;
+    public $dirname = ''; // directory name under xoops_trust_path
+    public $mydirname = ''; // each directory name under xoops_root_path
+    public $mid = 0; // id of each module instance
+    public $table = ''; // table with prefix and dirname
+    public $primary_key = ''; // column for primary_key
+    public $cols = array(); // settings of each columns
+    public $form_mode = 'new'; // 'new','edit' are available
+    public $page_name = ''; // controller's name  eg) page=(controller) in URI
+    public $action_base_hiddens = array();
 
 //HACK by domifara
 //	public function D3Utilities( $mydirname , $table_body , $primary_key , $cols , $page_name , $action_base_hiddens )
     public function __construct($mydirname, $table_body, $primary_key, $cols, $page_name, $action_base_hiddens)
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-
-        $this->dirname = basename(dirname(__DIR__)) ;
-        $this->mydirname = $mydirname ;
-        $this->table = $db->prefix($mydirname ? $mydirname . '_' . $table_body : $table_body) ;
-        $this->primary_key = $primary_key ;
-        $this->cols = $cols ;
-        $module_handler = xoops_gethandler('module') ;
-        $module =& $module_handler->getByDirname($this->mydirname) ;
-        if (! empty($module)) {
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
+
+        $this->dirname = basename(dirname(__DIR__));
+        $this->mydirname = $mydirname;
+        $this->table = $db->prefix($mydirname ? $mydirname.'_'.$table_body : $table_body);
+        $this->primary_key = $primary_key;
+        $this->cols = $cols;
+        $module_handler = xoops_gethandler('module');
+        $module = & $module_handler->getByDirname($this->mydirname);
+        if (!empty($module)) {
             $this->mid = (int)$module->getVar('mid');
         }
-        $this->page_name = $page_name ;
-        $this->action_base_hiddens = $action_base_hiddens ;
+        $this->page_name = $page_name;
+        $this->action_base_hiddens = $action_base_hiddens;
     }
 
 
     public function get_language_constant($name)
     {
-        return constant(strtoupper('_MD_A_' . $this->dirname . '_' . $this->page_name . '_' . $name)) ;
+        return constant(strtoupper('_MD_A_'.$this->dirname.'_'.$this->page_name.'_'.$name));
     }
 
 
@@ -46,22 +46,22 @@ 
             case 'text' :
             case 'blob' :
                 $length = empty($col['length']) ? 65535 : (int)$col['length'];
-                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'" ;
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'char' :
             case 'varchar' :
             case 'string' :
                 $length = empty($col['length']) ? 255 : (int)$col['length'];
-                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'" ;
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'int' :
             case 'integer' :
                 $value = (int)$value;
-                if (! empty($col['max'])) {
-                    $value = min($value, (int)$col['max']) ;
+                if (!empty($col['max'])) {
+                    $value = min($value, (int)$col['max']);
                 }
-                if (! empty($col['min'])) {
-                    $value = max($value, (int)$col['min']) ;
+                if (!empty($col['min'])) {
+                    $value = max($value, (int)$col['min']);
                 }
-                return "`{$col['name']}`=$value" ;
+                return "`{$col['name']}`=$value";
         }
     }
 
@@ -69,29 +69,29 @@ 
     // single update or insert
     public function insert()
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
-        $id = $this->init_default_values() ;
+        $id = $this->init_default_values();
 
-        $set4sql = '' ;
+        $set4sql = '';
         foreach ($this->cols as $col) {
             if (empty($col['edit_edit'])) {
-                continue ;
+                continue;
             }
             if ($col['name'] == $this->primary_key) {
-                continue ;
+                continue;
             }
-            $set4sql .= $this->get_set4sql(@$_POST[ $col['name'] ], $col) . ',' ;
+            $set4sql .= $this->get_set4sql(@$_POST[$col['name']], $col).',';
         }
-        if (! empty($set4sql)) {
+        if (!empty($set4sql)) {
             if ($id > 0) {
                 // UPDATE
-                $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key='".addslashes($id)."'") ;
-                return array( $id , 'update' ) ;
+                $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key='".addslashes($id)."'");
+                return array($id, 'update');
             } else {
                 // INSERT
-                $db->queryF("INSERT INTO $this->table SET ".substr($set4sql, 0, -1)) ;
-                return array( $db->getInsertId() , 'insert' ) ;
+                $db->queryF("INSERT INTO $this->table SET ".substr($set4sql, 0, -1));
+                return array($db->getInsertId(), 'insert');
             }
         }
     }
@@ -100,156 +100,156 @@ 
     // multiple update
     public function update()
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
         // search appropriate column for getting primary_key
         foreach ($this->cols as $col) {
-            if (in_array(@$col['list_edit'], array( 'text', 'textarea', 'hidden' ))) {
-                $column4key = $col['name'] ;
-                break ;
+            if (in_array(@$col['list_edit'], array('text', 'textarea', 'hidden'))) {
+                $column4key = $col['name'];
+                break;
             }
         }
         if (empty($column4key)) {
-            $column4key = $this->cols[0]['name'] ;
+            $column4key = $this->cols[0]['name'];
         }
 
-        $ret = array() ;
+        $ret = array();
         foreach (array_keys($_POST[$column4key]) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
-            $set4sql = '' ;
+            $id = (int)$id; // primary_key should be 'integer'
+            $set4sql = '';
             foreach ($this->cols as $col) {
                 if (empty($col['list_edit'])) {
-                    continue ;
+                    continue;
                 }
                 if ($col['name'] == $this->primary_key) {
-                    continue ;
+                    continue;
                 }
-                $set4sql .= $this->get_set4sql(@$_POST[ $col['name'] ][$id], $col) . ',' ;
+                $set4sql .= $this->get_set4sql(@$_POST[$col['name']][$id], $col).',';
             }
-            if (! empty($set4sql)) {
-                $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            if (!empty($set4sql)) {
+                $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
                 if ($db->getRowsNum($result) == 1) {
-                    $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key=$id") ;
+                    $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key=$id");
                     if ($db->getAffectedRows() == 1) {
-                        $ret[ $id ] = $db->fetchArray($result) ;
+                        $ret[$id] = $db->fetchArray($result);
                     }
                 }
             }
         }
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function delete($delete_comments = false, $delete_notifications = false)
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
-        $ret = array() ;
+        $ret = array();
         foreach (array_keys($_POST['admin_main_checkboxes']) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
-            $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $id = (int)$id; // primary_key should be 'integer'
+            $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
             if ($db->getRowsNum($result) == 1) {
-                $ret[ $id ] = $db->fetchArray($result) ;
+                $ret[$id] = $db->fetchArray($result);
 
-                $db->queryF("DELETE FROM $this->table WHERE $this->primary_key=$id") ;
+                $db->queryF("DELETE FROM $this->table WHERE $this->primary_key=$id");
                 if ($delete_comments) {
                     // remove comments
-                    $db->queryF('DELETE FROM ' . $db->prefix('xoopscomments') . " WHERE com_modid=$this->mid AND com_itemid=$id") ;
+                    $db->queryF('DELETE FROM '.$db->prefix('xoopscomments')." WHERE com_modid=$this->mid AND com_itemid=$id");
                 }
 
                 if ($delete_notifications) {
                     // remove notifications
-                    $db->queryF('DELETE FROM ' . $db->prefix('xoopsnotifications') . " WHERE not_modid=$this->mid AND not_itemid=$id") ;
+                    $db->queryF('DELETE FROM '.$db->prefix('xoopsnotifications')." WHERE not_modid=$this->mid AND not_itemid=$id");
                 }
             }
         }
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function init_default_values()
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
         if (@$_GET['id']) {
             $id = (int)$_GET['id'];
-            $rs = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $rs = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
             if ($db->getRowsNum($rs) == 1) {
-                $row = $db->fetchArray($rs) ;
+                $row = $db->fetchArray($rs);
                 foreach (array_keys($this->cols) as $key) {
                     if (empty($this->cols[$key]['edit_show'])) {
-                        continue ;
+                        continue;
                     }
-                    $this->cols[$key]['default_value'] = $row[ $this->cols[$key]['name'] ] ;
+                    $this->cols[$key]['default_value'] = $row[$this->cols[$key]['name']];
                 }
-                $this->form_mode = 'edit' ;
-                return $id ;
+                $this->form_mode = 'edit';
+                return $id;
             }
         }
 
-        $this->form_mode = 'new' ;
-        return 0 ;
+        $this->form_mode = 'new';
+        return 0;
     }
 
 
     public function get_view_edit()
     {
-        $id = $this->init_default_values() ;
+        $id = $this->init_default_values();
 
-        $lines = array() ;
+        $lines = array();
         foreach ($this->cols as $col) {
             if (empty($col['edit_show'])) {
-                continue ;
+                continue;
             }
-            if (! isset($col['default_value'])) {
+            if (!isset($col['default_value'])) {
                 switch ($col['type']) {
                     case 'int' :
                     case 'integer' :
-                        $col['default_value'] = 0 ;
-                        break ;
+                        $col['default_value'] = 0;
+                        break;
                     default :
-                        $col['default_value'] = '' ;
-                        break ;
+                        $col['default_value'] = '';
+                        break;
                 }
             }
             switch ($col['edit_edit']) {
                 case 'checkbox' :
-                    $checked = empty($col['default_value']) ? '' : "checked='checked'" ;
-                    $value = empty($col['checkbox_value']) ? 1 : htmlspecialchars($col['checkbox_value'], ENT_QUOTES) ;
+                    $checked = empty($col['default_value']) ? '' : "checked='checked'";
+                    $value = empty($col['checkbox_value']) ? 1 : htmlspecialchars($col['checkbox_value'], ENT_QUOTES);
 
-                    $lines[ $col['name'] ] = "<input type='checkbox' name='{$col['name']}' value='$value' $checked />" ;
-                    break ;
+                    $lines[$col['name']] = "<input type='checkbox' name='{$col['name']}' value='$value' $checked />";
+                    break;
                 case 'text' :
                 default :
                     $size = empty($col['edit_size']) ? 32 : (int)$col['edit_size'];
                     $length = empty($col['length']) ? 255 : (int)$col['length'];
-                    $lines[ $col['name'] ] = "<input type='text' name='{$col['name']}' size='$size' maxlength='$length' value='".htmlspecialchars($col['default_value'], ENT_QUOTES)."' />" ;
-                    break ;
+                    $lines[$col['name']] = "<input type='text' name='{$col['name']}' size='$size' maxlength='$length' value='".htmlspecialchars($col['default_value'], ENT_QUOTES)."' />";
+                    break;
                 case false :
-                    $lines[ $col['name'] ] = htmlspecialchars($col['default_value'], ENT_QUOTES) ;
-                    break ;
+                    $lines[$col['name']] = htmlspecialchars($col['default_value'], ENT_QUOTES);
+                    break;
             }
         }
 
-        return array( $id , $lines ) ;
+        return array($id, $lines);
     }
 
 
     public function get_control_form($controllers)
     {
-        $hiddens = '' ;
+        $hiddens = '';
         foreach ($this->action_base_hiddens as $key => $val) {
-            $key4disp = htmlspecialchars($key, ENT_QUOTES) ;
-            $val4disp = htmlspecialchars($val, ENT_QUOTES) ;
-            $hiddens .= "<input type='hidden' name='$key4disp' value='$val4disp' />\n" ;
+            $key4disp = htmlspecialchars($key, ENT_QUOTES);
+            $val4disp = htmlspecialchars($val, ENT_QUOTES);
+            $hiddens .= "<input type='hidden' name='$key4disp' value='$val4disp' />\n";
         }
 
-        $controllers_html = '' ;
+        $controllers_html = '';
         foreach ($controllers as $type => $body) {
             if ($type == 'num') {
-                $controllers_html .= $this->get_select('num', $body, $GLOBALS['num']) ;
+                $controllers_html .= $this->get_select('num', $body, $GLOBALS['num']);
             }
         }
 
@@ -263,13 +263,13 @@ 
 
     public function get_select($name, $options, $current_value)
     {
-        $ret = "<select name='".htmlspecialchars($name, ENT_QUOTES)."'>\n" ;
+        $ret = "<select name='".htmlspecialchars($name, ENT_QUOTES)."'>\n";
         foreach ($options as $key => $val) {
             $selected = $val == $current_value ? "selected='selected'" : '';
-            $ret .= "<option value='".htmlspecialchars($key, ENT_QUOTES)."' $selected>".htmlspecialchars($val, ENT_QUOTES)."</option>\n" ;
+            $ret .= "<option value='".htmlspecialchars($key, ENT_QUOTES)."' $selected>".htmlspecialchars($val, ENT_QUOTES)."</option>\n";
         }
-        $ret .= "</select>\n" ;
+        $ret .= "</select>\n";
 
-        return $ret ;
+        return $ret;
     }
 }

xoops_trust_path/libs/altsys/class/MyBlocksAdminForXCL21.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 // $Id: MyBlocksAdminForXCL21.class.php ,ver 0.0.7.1 2011/01/27 16:10:00 domifara Exp $
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForXCL21 extends MyBlocksAdmin
 {
@@ -18,7 +18,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForXCL21();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -29,8 +29,8 @@ 
 public function renderCell4BlockOptions($block_data)
 {
     if ($this->target_dirname && substr($this->target_dirname, 0, 1) != '_') {
-        $langman =& D3LanguageManager::getInstance() ;
-        $langman->read('admin.php', $this->target_dirname) ;
+        $langman = & D3LanguageManager::getInstance();
+        $langman->read('admin.php', $this->target_dirname);
     }
 
     $bid = (int)$block_data['bid'];
@@ -38,15 +38,15 @@ 
 //HACK by domifara
 //	$block = new XoopsBlock( $bid ) ;
     $handler = xoops_gethandler('block');
-    $block =& $handler->create(false) ;
-    $block->load($bid) ;
+    $block = & $handler->create(false);
+    $block->load($bid);
 
-    $legacy_block =& Legacy_Utils::createBlockProcedure($block) ;
-    return $legacy_block->getOptionForm() ;
+    $legacy_block = & Legacy_Utils::createBlockProcedure($block);
+    return $legacy_block->getOptionForm();
 }
 
     public function checkFck()
     {
-        return (! altsysUtils::isInstalledXclHtmleditor() && file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'));
+        return (!altsysUtils::isInstalledXclHtmleditor() && file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'));
     }
 }