mambax7 / altsys

xoops_trust_path/libs/altsys/blocks/block_functions.php

Doc Comments +1 added lines, -2 removed lines

@@ -156,5 +156,4 @@
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file

Unused Use Statements +1 added lines, -2 removed lines

@@ -156,5 +156,4 @@
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file

Indentation +1 added lines, -2 removed lines

@@ -156,5 +156,4 @@
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file

Switch Indentation +1 added lines, -2 removed lines

@@ -156,5 +156,4 @@
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file

Spacing +11 added lines, -12 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 
-require_once dirname(__DIR__).'/include/altsys_functions.php' ;
+require_once dirname(__DIR__).'/include/altsys_functions.php';
 
 function b_altsys_admin_menu_show($options)
 {
-    global $xoopsUser ;
+    global $xoopsUser;
 
-    $mydirname = empty($options[0]) ? 'altsys' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'altsys' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
-    if (! is_object(@$xoopsUser)) {
-        return array() ;
+    if (!is_object(@$xoopsUser)) {
+        return array();
     }
 
     // coretype
-    $coretype = altsys_get_core_type() ;
+    $coretype = altsys_get_core_type();
 
     // mid_selected
     if (is_object(@$GLOBALS['xoopsModule'])) {
-        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid') ;
+        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid');
         // for system->preferences
-<<<<<<< HEAD
+<< << <<< HEAD
         if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
             $mid_selected = intval($_GET['mod']) ;
 =======
@@ -156,5 +156,4 @@ 
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -156,5 +156,4 @@
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -2 removed lines

@@ -156,5 +156,4 @@
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file

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

Doc Comments +1 added lines, -5 removed lines

@@ -1085,8 +1085,4 @@
             // the first form (blocks)
             $this->list_blocks() ;
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
-    }
-    }
-}
+            $this->list_groups
\ No newline at end of file

Unused Use Statements +1 added lines, -5 removed lines

@@ -1085,8 +1085,4 @@
             // the first form (blocks)
             $this->list_blocks() ;
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
-    }
-    }
-}
+            $this->list_groups
\ No newline at end of file

Indentation +1 added lines, -5 removed lines

@@ -1085,8 +1085,4 @@
             // the first form (blocks)
             $this->list_blocks() ;
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
-    }
-    }
-}
+            $this->list_groups
\ No newline at end of file

Switch Indentation +25 added lines, -29 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 ;
     }
     }
 
@@ -1085,8 +1085,4 @@ 
             // the first form (blocks)
             $this->list_blocks() ;
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
-    }
-    }
-}
+            $this->list_groups
\ No newline at end of file

Spacing +161 added lines, -165 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');
     }
 }
 
@@ -86,53 +86,53 @@ 
         // altsys "module" MODE
     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) ;
+        $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 (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;
 }
 
 
@@ -184,13 +184,13 @@ 
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler =& xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $handler = & xoops_gethandler('block');
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
-    return $block->getOptions() ;
+    return $block->getOptions();
 }
 
 
@@ -203,43 +203,43 @@ 
     // 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
     }
 
     // get all targets
-    $module_handler =& xoops_gethandler('module');
+    $module_handler = & xoops_gethandler('module');
     $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() ;
+    $group_handler = & xoops_gethandler('group');
+    $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) ;
+        $handler = & xoops_gethandler('block');
+        $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,14 +542,14 @@ 
         } else {
             $msg = 'Failed update of block. ID:'.$bid;
         }
-        return $msg ;
+        return $msg;
     }
 
 
 // virtual
 public function updateBlockModuleLink($bid, $bmodules)
 {
-<<<<<<< HEAD
+<< << <<< HEAD
     $bid = intval($bid) ;
     $table = $this->db->prefix('block_module_link') ;
 =======
@@ -1085,8 +1085,4 @@ 
             // the first form (blocks)
             $this->list_blocks() ;
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
-    }
-    }
-}
+            $this->list_groups
\ No newline at end of file

Braces +1 added lines, -5 removed lines

@@ -1085,8 +1085,4 @@
             // the first form (blocks)
             $this->list_blocks() ;
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
-    }
-    }
-}
+            $this->list_groups
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -5 removed lines

@@ -1085,8 +1085,4 @@
             // the first form (blocks)
             $this->list_blocks() ;
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
-    }
-    }
-}
+            $this->list_groups
\ No newline at end of file

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

Doc Comments +1 added lines, -4 removed lines

@@ -160,7 +160,4 @@
         $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) ;
-    }
-}
-}
+        $this->db->query($sql
\ No newline at end of file

Unused Use Statements +1 added lines, -4 removed lines

@@ -160,7 +160,4 @@
         $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) ;
-    }
-}
-}
+        $this->db->query($sql
\ No newline at end of file

Indentation +1 added lines, -4 removed lines

@@ -160,7 +160,4 @@
         $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) ;
-    }
-}
-}
+        $this->db->query($sql
\ No newline at end of file

Switch Indentation +1 added lines, -4 removed lines

@@ -160,7 +160,4 @@
         $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) ;
-    }
-}
-}
+        $this->db->query($sql
\ No newline at end of file

Spacing +36 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');
+    $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,35 +117,35 @@ 
 {
     $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;
 }
 
 
 // virtual
 public function updateBlockModuleLink($bid, $bmodules)
 {
-<<<<<<< HEAD
+<< << <<< HEAD
     $bid = intval($bid) ;
     $table = $this->db->prefix('block_module_link') ;
 =======
@@ -160,7 +160,4 @@ 
         $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) ;
-    }
-}
-}
+        $this->db->query($sql
\ No newline at end of file

Braces +1 added lines, -4 removed lines

@@ -160,7 +160,4 @@
         $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) ;
-    }
-}
-}
+        $this->db->query($sql
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -4 removed lines

@@ -160,7 +160,4 @@
         $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) ;
-    }
-}
-}
+        $this->db->query($sql
\ No newline at end of file

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

Doc Comments +1 added lines, -1 removed lines

@@ -268,4 +268,4 @@
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

Unused Use Statements +1 added lines, -1 removed lines

@@ -268,4 +268,4 @@
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

@@ -268,4 +268,4 @@
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

Switch Indentation +1 added lines, -1 removed lines

@@ -268,4 +268,4 @@
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

Spacing +8 added lines, -8 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;
@@ -42,7 +42,7 @@ 
     }
     $xoopsTpl->assign(array('xoops_theme' => $xoopsConfig['theme_set'], 'xoops_imageurl' => XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/', 'xoops_themecss'=> xoops_getcss($xoopsConfig['theme_set']), 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES), 'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES)));
     // Meta tags
-    $config_handler =& xoops_gethandler('config');
+    $config_handler = & xoops_gethandler('config');
     $criteria = new CriteriaCompo(new Criteria('conf_modid', 0));
     $criteria->add(new Criteria('conf_catid', XOOPS_CONF_METAFOOTER));
     $config = $config_handler->getConfigs($criteria, true);
@@ -57,8 +57,8 @@ 
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler =& xoops_gethandler('block');
-        $xoopsblock =& $handler->create(false) ;
+        $handler = & xoops_gethandler('block');
+        $xoopsblock = & $handler->create(false);
     } else {
         $xoopsblock = new XoopsBlock();
     }
@@ -68,9 +68,9 @@ 
     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') ;
-<<<<<<< HEAD
+            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
+                $module_handler = & xoops_gethandler('module');
+<< << <<< HEAD
                 $target_module = $module_handler->get(intval($_GET['mod'])) ;
 =======
                 $target_module = $module_handler->get((int)$_GET['mod']) ;
@@ -268,4 +268,4 @@ 
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -268,4 +268,4 @@
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -268,4 +268,4 @@
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

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

Doc Comments +1 added lines, -6 removed lines

@@ -49,9 +49,4 @@
 >>>>>>> feature/intval
                 if ($count <= 0) {
                     include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-                }
-            }
-        }
-    }
-}
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Unused Use Statements +1 added lines, -6 removed lines

@@ -49,9 +49,4 @@
 >>>>>>> feature/intval
                 if ($count <= 0) {
                     include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-                }
-            }
-        }
-    }
-}
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Indentation +1 added lines, -6 removed lines

@@ -49,9 +49,4 @@
 >>>>>>> feature/intval
                 if ($count <= 0) {
                     include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-                }
-            }
-        }
-    }
-}
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Switch Indentation +1 added lines, -6 removed lines

@@ -49,9 +49,4 @@
 >>>>>>> feature/intval
                 if ($count <= 0) {
                     include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-                }
-            }
-        }
-    }
-}
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Spacing +10 added lines, -15 removed lines

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

Braces +1 added lines, -6 removed lines

@@ -49,9 +49,4 @@
 >>>>>>> feature/intval
                 if ($count <= 0) {
                     include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-                }
-            }
-        }
-    }
-}
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -6 removed lines

@@ -49,9 +49,4 @@
 >>>>>>> feature/intval
                 if ($count <= 0) {
                     include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-                }
-            }
-        }
-    }
-}
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

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

Doc Comments +1 added lines, -5 removed lines

@@ -20,8 +20,4 @@
 >>>>>>> feature/intval
             if ($count <= 0) {
                 include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-            }
-        }
-    }
-}
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Unused Use Statements +1 added lines, -5 removed lines

@@ -20,8 +20,4 @@
 >>>>>>> feature/intval
             if ($count <= 0) {
                 include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-            }
-        }
-    }
-}
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Indentation +1 added lines, -5 removed lines

@@ -20,8 +20,4 @@
 >>>>>>> feature/intval
             if ($count <= 0) {
                 include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-            }
-        }
-    }
-}
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Switch Indentation +1 added lines, -5 removed lines

@@ -20,8 +20,4 @@
 >>>>>>> feature/intval
             if ($count <= 0) {
                 include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-            }
-        }
-    }
-}
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Spacing +7 added lines, -11 removed lines

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

Braces +1 added lines, -5 removed lines

@@ -20,8 +20,4 @@
 >>>>>>> feature/intval
             if ($count <= 0) {
                 include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-            }
-        }
-    }
-}
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -5 removed lines

@@ -20,8 +20,4 @@
 >>>>>>> feature/intval
             if ($count <= 0) {
                 include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-            }
-        }
-    }
-}
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

xoops_trust_path/libs/altsys/include/mygrouppermform.php

Doc Comments +1 added lines

@@ -251,6 +251,7 @@
 
     /**
      * Constructor
+     * @param string $name
      */
     public function __construct($caption, $name, $groupId, $values = null)
     {

Indentation +2 added lines, -2 removed lines

@@ -359,7 +359,7 @@ 
     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=\"";
+                    . $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.
@@ -380,7 +380,7 @@ 
             $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";
+                    . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);

Spacing +30 added lines, -30 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,15 +149,15 @@ 
      */
     public function render()
     {
-        global $xoopsGTicket ;
+        global $xoopsGTicket;
 
         // load all child ids for javascript codes
         foreach (array_keys($this->_itemTree) as $item_id) {
             $this->_itemTree[$item_id]['allchild'] = array();
             $this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
         }
-        $gperm_handler =& xoops_gethandler('groupperm');
-        $member_handler =& xoops_gethandler('member');
+        $gperm_handler = & xoops_gethandler('groupperm');
+        $member_handler = & xoops_gethandler('member');
         $glist = $member_handler->getGroupList();
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
@@ -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/mytplsadmin.php

Doc Comments +1 added lines, -11 removed lines

@@ -398,14 +398,4 @@
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
-			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
-    }
-
-echo "	</tr>\n" ;
-
-
-echo '</table></form>';
-// end of table & form
-
-xoops_cp_footer() ;
+			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}
\ No newline at end of file

Unused Use Statements +1 added lines, -11 removed lines

@@ -398,14 +398,4 @@
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
-			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
-    }
-
-echo "	</tr>\n" ;
-
-
-echo '</table></form>';
-// end of table & form
-
-xoops_cp_footer() ;
+			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}
\ No newline at end of file

Indentation +1 added lines, -11 removed lines

@@ -398,14 +398,4 @@
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
-			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
-    }
-
-echo "	</tr>\n" ;
-
-
-echo '</table></form>';
-// end of table & form
-
-xoops_cp_footer() ;
+			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}
\ No newline at end of file

Switch Indentation +1 added lines, -11 removed lines

@@ -398,14 +398,4 @@
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
-			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
-    }
-
-echo "	</tr>\n" ;
-
-
-echo '</table></form>';
-// end of table & form
-
-xoops_cp_footer() ;
+			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}
\ No newline at end of file

Spacing +81 added lines, -91 removed lines

@@ -5,63 +5,63 @@ 
 //                      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" ;
+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";
 
 
 // only groups have 'module_admin' of 'altsys' can do that.
-$module_handler =& xoops_gethandler('module') ;
-$module =& $module_handler->getByDirname('altsys') ;
-if (! is_object($module)) {
-    die('install altsys') ;
+$module_handler = & xoops_gethandler('module');
+$module = & $module_handler->getByDirname('altsys');
+if (!is_object($module)) {
+    die('install altsys');
 }
-$moduleperm_handler =& xoops_gethandler('groupperm') ;
-if (! is_object(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
-    die('only admin of altsys can access this area') ;
+$moduleperm_handler = & xoops_gethandler('groupperm');
+if (!is_object(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 
 // initials
-$db =& XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mytplsadmin') ;
+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);
 }
 
 // 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) ;
+$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($target_module) && is_object($target_module)) {
+if (!empty($target_module) && is_object($target_module)) {
     // specified by dirname (for tplsadmin as an independent module)
-    $target_mid = $target_module->getVar('mid') ;
-    $target_dirname = $target_module->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $target_module->getVar('name') . '&nbsp;' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0) ;
+    $target_mid = $target_module->getVar('mid');
+    $target_dirname = $target_module->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $target_module->getVar('name').'&nbsp;'.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
     //$query4redirect = '?dirname='.urlencode(strip_tags($_GET['dirname'])) ;
 } elseif (@$_GET['dirname'] == '_custom') {
     // custom template
-    $target_mid = 0 ;
-    $target_dirname = '_custom' ;
-    $target_dirname4sql = '_custom' ;
-    $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE ;
+    $target_mid = 0;
+    $target_dirname = '_custom';
+    $target_dirname4sql = '_custom';
+    $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE;
     //$query4redirect = '' ;
 } else {
     // not specified by dirname (for 3rd party modules as mytplsadmin)
-    $target_mid = $xoopsModule->getVar('mid') ;
-    $target_dirname = $xoopsModule->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $xoopsModule->getVar('name') ;
+    $target_mid = $xoopsModule->getVar('mid');
+    $target_dirname = $xoopsModule->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $xoopsModule->getVar('name');
     //$query4redirect = '' ;
 }
 
@@ -71,120 +71,120 @@ 
 //**************//
 
 // Create new template set (blank or clone)
-if (! empty($_POST['clone_tplset_do']) && ! empty($_POST['clone_tplset_from']) && ! empty($_POST['clone_tplset_to'])) {
+if (!empty($_POST['clone_tplset_do']) && !empty($_POST['clone_tplset_from']) && !empty($_POST['clone_tplset_to'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $tplset_from = $myts->stripSlashesGPC($_POST['clone_tplset_from']) ;
-    $tplset_to = $myts->stripSlashesGPC($_POST['clone_tplset_to']) ;
+    $tplset_from = $myts->stripSlashesGPC($_POST['clone_tplset_from']);
+    $tplset_to = $myts->stripSlashesGPC($_POST['clone_tplset_to']);
     // check tplset_name "from" and "to"
-    if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_from'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname) ;
+    if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_from'])) {
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname);
     }
-    if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_to'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname) ;
+    if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_to'])) {
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname);
     }
-    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "'")) ;
+    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."'"));
     if ($is_exist) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname);
     }
-    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplset') . " WHERE tplset_name='" . addslashes($tplset_to) . "'")) ;
+    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplset')." WHERE tplset_name='".addslashes($tplset_to)."'"));
     if ($is_exist) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname);
     }
     // insert tplset table
-    $db->query('INSERT INTO ' . $db->prefix('tplset') . " SET tplset_name='" . addslashes($tplset_to) . "', tplset_desc='Created by tplsadmin', tplset_created=UNIX_TIMESTAMP()") ;
-    tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_module='$target_dirname4sql'") ;
-    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-    exit ;
+    $db->query('INSERT INTO '.$db->prefix('tplset')." SET tplset_name='".addslashes($tplset_to)."', tplset_desc='Created by tplsadmin', tplset_created=UNIX_TIMESTAMP()");
+    tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_module='$target_dirname4sql'");
+    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+    exit;
 }
 
 // DB to DB template copy (checked templates)
 if (is_array(@$_POST['copy_do'])) {
     foreach ($_POST['copy_do'] as $tplset_from_tmp => $val) {
-        if (! empty($val)) {
+        if (!empty($val)) {
             // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp) ;
+            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp);
             if (empty($_POST['copy_to'][$tplset_from]) || $_POST['copy_to'][$tplset_from] == $tplset_from) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname);
             }
             if (empty($_POST["{$tplset_from}_check"])) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
             }
-            $tplset_to = $myts->stripSlashesGPC($_POST['copy_to'][$tplset_from]) ;
+            $tplset_to = $myts->stripSlashesGPC($_POST['copy_to'][$tplset_from]);
             foreach ($_POST["{$tplset_from}_check"] as $tplfile_tmp => $val) {
                 if (empty($val)) {
-                    continue ;
+                    continue;
                 }
-                $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-                tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_file='".addslashes($tplfile)."'") ;
+                $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+                tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_file='".addslashes($tplfile)."'");
             }
-            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-            exit ;
+            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+            exit;
         }
     }
 }
 
 // File to DB template copy (checked templates)
-if (! empty($_POST['copyf2db_do'])) {
+if (!empty($_POST['copyf2db_do'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     if (empty($_POST['copyf2db_to'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname);
     }
     if (empty($_POST['basecheck'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
     }
-    $tplset_to = $myts->stripSlashesGPC($_POST['copyf2db_to']) ;
+    $tplset_to = $myts->stripSlashesGPC($_POST['copyf2db_to']);
     foreach ($_POST['basecheck'] as $tplfile_tmp => $val) {
         if (empty($val)) {
-            continue ;
+            continue;
         }
-        $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-        tplsadmin_copy_templates_f2db($tplset_to, "tpl_file='".addslashes($tplfile)."'") ;
+        $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+        tplsadmin_copy_templates_f2db($tplset_to, "tpl_file='".addslashes($tplfile)."'");
     }
-    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-    exit ;
+    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+    exit;
 }
 
 // DB template remove (checked templates)
 if (is_array(@$_POST['del_do'])) {
     foreach ($_POST['del_do'] as $tplset_from_tmp => $val) {
-        if (! empty($val)) {
+        if (!empty($val)) {
             // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp) ;
+            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp);
             if ($tplset_from == 'default' && $target_dirname != '_custom') {
-                tplsadmin_die(_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT, $target_dirname);
             }
             if (empty($_POST["{$tplset_from}_check"])) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
             }
 
-            require_once XOOPS_ROOT_PATH.'/class/template.php' ;
+            require_once XOOPS_ROOT_PATH.'/class/template.php';
             $tpl = new XoopsTpl();
             $tpl->force_compile = true;
 
             foreach ($_POST["{$tplset_from}_check"] as $tplfile_tmp => $val) {
                 if (empty($val)) {
-                    continue ;
+                    continue;
                 }
-                $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-                $result = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND tpl_file='" . addslashes($tplfile) . "'") ;
+                $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+                $result = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_from)."' AND tpl_file='".addslashes($tplfile)."'");
                 while (list($tpl_id) = $db->fetchRow($result)) {
-<<<<<<< HEAD
+<< << <<< HEAD
                     $tpl_id = intval($tpl_id) ;
                     $db->query('DELETE FROM ' . $db->prefix('tplfile') . " WHERE tpl_id=$tpl_id") ;
                     $db->query('DELETE FROM ' . $db->prefix('tplsource') . " WHERE tpl_id=$tpl_id") ;
@@ -398,14 +398,4 @@ 
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
-			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
-    }
-
-echo "	</tr>\n" ;
-
-
-echo '</table></form>';
-// end of table & form
-
-xoops_cp_footer() ;
+			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}
\ No newline at end of file

Braces +1 added lines, -11 removed lines

@@ -398,14 +398,4 @@
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
-			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
-    }
-
-echo "	</tr>\n" ;
-
-
-echo '</table></form>';
-// end of table & form
-
-xoops_cp_footer() ;
+			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -11 removed lines

@@ -398,14 +398,4 @@
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
-			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
-    }
-
-echo "	</tr>\n" ;
-
-
-echo '</table></form>';
-// end of table & form
-
-xoops_cp_footer() ;
+			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}
\ No newline at end of file

xoops_trust_path/libs/altsys/mytplsform.php

Doc Comments +1 added lines, -12 removed lines

@@ -255,15 +255,4 @@
     // create form
     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" ;
-} else {
-    // modify form
-    echo "
-	<input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
-	<input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
-	<input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' />
-</form>\n" ;
-}
-
-xoops_cp_footer() ;
+	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[
\ No newline at end of file

Unused Use Statements +1 added lines, -12 removed lines

@@ -255,15 +255,4 @@
     // create form
     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" ;
-} else {
-    // modify form
-    echo "
-	<input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
-	<input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
-	<input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' />
-</form>\n" ;
-}
-
-xoops_cp_footer() ;
+	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[
\ No newline at end of file

Indentation +1 added lines, -12 removed lines

@@ -255,15 +255,4 @@
     // create form
     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" ;
-} else {
-    // modify form
-    echo "
-	<input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
-	<input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
-	<input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' />
-</form>\n" ;
-}
-
-xoops_cp_footer() ;
+	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[
\ No newline at end of file

Switch Indentation +1 added lines, -12 removed lines

@@ -255,15 +255,4 @@
     // create form
     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" ;
-} else {
-    // modify form
-    echo "
-	<input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
-	<input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
-	<input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' />
-</form>\n" ;
-}
-
-xoops_cp_footer() ;
+	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[
\ No newline at end of file

Spacing +78 added lines, -89 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() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
+(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,119 +42,119 @@ 
 //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__);
     }
-<<<<<<< HEAD
+<< << <<< HEAD
     $tpl_id = intval($db->getInsertId()) ;
     $sql = 'INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id=$tpl_id,tpl_source='" . addslashes($myts->stripSlashesGPC($_POST['tpl_source'])) . "'" ;
 =======
@@ -255,15 +255,4 @@ 
     // create form
     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" ;
-} else {
-    // modify form
-    echo "
-	<input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
-	<input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
-	<input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' />
-</form>\n" ;
-}
-
-xoops_cp_footer() ;
+	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[
\ No newline at end of file

Braces +1 added lines, -12 removed lines

@@ -255,15 +255,4 @@
     // create form
     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" ;
-} else {
-    // modify form
-    echo "
-	<input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
-	<input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
-	<input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' />
-</form>\n" ;
-}
-
-xoops_cp_footer() ;
+	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -12 removed lines

@@ -255,15 +255,4 @@
     // create form
     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" ;
-} else {
-    // modify form
-    echo "
-	<input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
-	<input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
-	<input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' />
-</form>\n" ;
-}
-
-xoops_cp_footer() ;
+	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[
\ No newline at end of file