mambax7 / altsys

xoops_trust_path/libs/altsys/include/mygrouppermform.php

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/include/autoupdate_from_theme.inc.php

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

xoops_trust_path/libs/altsys/include/adminmenu_functions.php

Spacing +132 added lines, -132 removed lines

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

xoops_trust_path/libs/altsys/blocks.php

Spacing +8 added lines, -8 removed lines

@@ -1,21 +1,21 @@
 <?php
 
-$mytrustdirname = basename(__DIR__) ;
-$mytrustdirpath = __DIR__ ;
+$mytrustdirname = basename(__DIR__);
+$mytrustdirpath = __DIR__;
 
 // language files
-$language = empty($GLOBALS['xoopsConfig']['language']) ? 'english' : $GLOBALS['xoopsConfig']['language'] ;
+$language = empty($GLOBALS['xoopsConfig']['language']) ? 'english' : $GLOBALS['xoopsConfig']['language'];
 if (file_exists("$mydirpath/language/$language/blocks.php")) {
     // user customized language file (already read by class/xoopsblock.php etc)
     // include_once "$mydirpath/language/$language/blocks.php" ;
 } elseif (file_exists("$mytrustdirpath/language/$language/blocks_common.php")) {
     // default language file
-    include_once "$mytrustdirpath/language/$language/blocks_common.php" ;
-    include "$mytrustdirpath/language/$language/blocks_each.php" ;
+    include_once "$mytrustdirpath/language/$language/blocks_common.php";
+    include "$mytrustdirpath/language/$language/blocks_each.php";
 } else {
     // fallback english
-    include_once "$mytrustdirpath/language/english/blocks_common.php" ;
-    include "$mytrustdirpath/language/english/blocks_each.php" ;
+    include_once "$mytrustdirpath/language/english/blocks_common.php";
+    include "$mytrustdirpath/language/english/blocks_each.php";
 }
 
-require_once "$mytrustdirpath/blocks/block_functions.php" ;
+require_once "$mytrustdirpath/blocks/block_functions.php";

xoops_trust_path/libs/altsys/compilehookadmin.php

Spacing +93 added lines, -93 removed lines

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

xoops_trust_path/libs/altsys/get_templates.php

Spacing +20 added lines, -20 removed lines

@@ -5,37 +5,37 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-error_reporting(0) ;
+error_reporting(0);
 
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 
 // this page can be called only from altsys
 if ($xoopsModule->getVar('dirname') != 'altsys') {
-    die('this page can be called only from altsys') ;
+    die('this page can be called only from altsys');
 }
 
 
 // language file
-altsys_include_language_file('compilehookadmin') ;
+altsys_include_language_file('compilehookadmin');
 
-if (! empty($_POST['download_zip'])) {
-    require_once XOOPS_ROOT_PATH.'/class/zipdownloader.php' ;
+if (!empty($_POST['download_zip'])) {
+    require_once XOOPS_ROOT_PATH.'/class/zipdownloader.php';
     $downloader = new XoopsZipDownloader();
-    $do_download = true ;
-} elseif (! empty($_POST['download_tgz'])) {
-    require_once XOOPS_ROOT_PATH.'/class/tardownloader.php' ;
+    $do_download = true;
+} elseif (!empty($_POST['download_tgz'])) {
+    require_once XOOPS_ROOT_PATH.'/class/tardownloader.php';
     $downloader = new XoopsTarDownloader();
-    $do_download = true ;
+    $do_download = true;
 }
 if (empty($do_download)) {
-    exit ;
+    exit;
 }
 
-$tplset = @$_POST['tplset'] ;
-if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
-    die(_TPLSADMIN_ERR_INVALIDTPLSET) ;
+$tplset = @$_POST['tplset'];
+if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
+    die(_TPLSADMIN_ERR_INVALIDTPLSET);
 }
 
 //fix for mb_http_output setting and for add any browsers
@@ -45,17 +45,17 @@ 
 //ob_buffer over flow
 //HACK by suin & nao-pon 2012/01/06
     while (ob_get_level() > 0) {
-        if (! ob_end_clean()) {
+        if (!ob_end_clean()) {
             break;
         }
     }
-$trs = $xoopsDB->query('SELECT distinct tpl_file,tpl_source,tpl_lastmodified FROM ' . $xoopsDB->prefix('tplfile') . ' NATURAL LEFT JOIN ' . $xoopsDB->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset) . "' ORDER BY tpl_file") ;
+$trs = $xoopsDB->query('SELECT distinct tpl_file,tpl_source,tpl_lastmodified FROM '.$xoopsDB->prefix('tplfile').' NATURAL LEFT JOIN '.$xoopsDB->prefix('tplsource')." WHERE tpl_tplset='".addslashes($tplset)."' ORDER BY tpl_file");
 if ($xoopsDB->getRowsNum($trs) <= 0) {
-    die(_TPLSADMIN_ERR_INVALIDTPLSET) ;
+    die(_TPLSADMIN_ERR_INVALIDTPLSET);
 }
 
 while (list($tpl_file, $tpl_source, $tpl_lastmodified) = $xoopsDB->fetchRow($trs)) {
-    $downloader->addFileData($tpl_source, $tplset.'/'.$tpl_file, $tpl_lastmodified) ;
+    $downloader->addFileData($tpl_source, $tplset.'/'.$tpl_file, $tpl_lastmodified);
 }
 //bugfix by nao-pon ,echo is not necessary for downloader
-$downloader->download('template_'.$tplset, true) ;
+$downloader->download('template_'.$tplset, true);

xoops_trust_path/libs/altsys/mytplsadmin.php

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

xoops_trust_path/libs/altsys/get_tplsvarsinfo.php

Spacing +63 added lines, -63 removed lines

@@ -5,26 +5,26 @@ 
 //                        GIJOE <http://www.peak.ne.jp/>                     //
 // ------------------------------------------------------------------------- //
 
-error_reporting(0) ;
+error_reporting(0);
 
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 
 // this page can be called only from altsys
 if ($xoopsModule->getVar('dirname') != 'altsys') {
-    die('this page can be called only from altsys') ;
+    die('this page can be called only from altsys');
 }
 
 
 // language file
-altsys_include_language_file('compilehookadmin') ;
+altsys_include_language_file('compilehookadmin');
 
 
-$dw_snippets_dirname = 'files' ;
-$site_name = @$_SERVER['HTTP_HOST'] ;
-if (! preg_match('/^[0-9A-Za-z._-]+$/', $site_name)) {
-    $site_name = 'xoops_site' ;
+$dw_snippets_dirname = 'files';
+$site_name = @$_SERVER['HTTP_HOST'];
+if (!preg_match('/^[0-9A-Za-z._-]+$/', $site_name)) {
+    $site_name = 'xoops_site';
 }
 
 
@@ -38,36 +38,36 @@ 
         case 'array' :
             foreach ($var_value as $key => $val) {
                 if (gettype($key) == 'integer') {
-                    $GLOBALS[ $sum_array_name ][ $var_name ] = '(array)' ;
-                    continue ;
+                    $GLOBALS[$sum_array_name][$var_name] = '(array)';
+                    continue;
                 }
-                convert_array2info_recursive($var_name.'.'.$key, $val, $sum_array_name) ;
+                convert_array2info_recursive($var_name.'.'.$key, $val, $sum_array_name);
             }
-            return ;
+            return;
         case 'string' :
-            $GLOBALS[ $sum_array_name ][ $var_name ] = $var_value ;
-            return ;
+            $GLOBALS[$sum_array_name][$var_name] = $var_value;
+            return;
         case 'boolean' :
         case 'integer' :
         case 'float' :
         case 'double' :
-            $GLOBALS[ $sum_array_name ][ $var_name ] = (string)$var_value ;
-            return ;
+            $GLOBALS[$sum_array_name][$var_name] = (string)$var_value;
+            return;
         case 'null' :
-            $GLOBALS[ $sum_array_name ][ $var_name ] = '(null)' ;
-            return ;
+            $GLOBALS[$sum_array_name][$var_name] = '(null)';
+            return;
         case 'object' :
-            $GLOBALS[ $sum_array_name ][ $var_name ] = '(object)' ;
-            return ;
+            $GLOBALS[$sum_array_name][$var_name] = '(object)';
+            return;
         default :
-            return ;
+            return;
     }
 }
 
 
 function get_mxi_body($mxi_name, $file_entries)
 {
-    global $site_name ;
+    global $site_name;
 
     return '<macromedia-extension name="XOOPS-'.$site_name.' '.$mxi_name.'" version="1.0" type="Suite" requires-restart="true">
 	<products>
@@ -108,44 +108,44 @@ 
 // TOTAL STAGE
 //
 
-$tplsvarsinfo_mod_tpl = array() ;
-$tplsvarsinfo_total = array() ;
+$tplsvarsinfo_mod_tpl = array();
+$tplsvarsinfo_total = array();
 
-if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
+if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
     while (($file = readdir($handler)) !== false) {
 
         // skip files other than tplsvars_* files
         if (substr($file, 0, 9) !== 'tplsvars_') {
-            continue ;
+            continue;
         }
 
         // 'tplsvars_'.(randomized 4byte).'_'.(tpl_file)
-        $tpl_name = substr($file, 14) ;
-        if (! preg_match('/^[%0-9A-Za-z._-]+$/', $tpl_name)) {
-            continue ;
+        $tpl_name = substr($file, 14);
+        if (!preg_match('/^[%0-9A-Za-z._-]+$/', $tpl_name)) {
+            continue;
         }
-        $file_path = XOOPS_COMPILE_PATH . '/' . $file ;
-        $file_body = implode('', file($file_path)) ;
-        $tplsvars = @unserialize($file_body) ;
-        if (! is_array($tplsvars)) {
-            $tplsvars = array() ;
+        $file_path = XOOPS_COMPILE_PATH.'/'.$file;
+        $file_body = implode('', file($file_path));
+        $tplsvars = @unserialize($file_body);
+        if (!is_array($tplsvars)) {
+            $tplsvars = array();
         }
-        $GLOBALS['tplsvarsinfo'] = array() ;
-        convert_array2info_recursive('', $tplsvars, 'tplsvarsinfo') ;
+        $GLOBALS['tplsvarsinfo'] = array();
+        convert_array2info_recursive('', $tplsvars, 'tplsvarsinfo');
         if (strstr($tpl_name, '%')) {
-            $mod_name = 'theme_etc' ;
+            $mod_name = 'theme_etc';
         } else {
-            list($mod_name) = explode('_', $tpl_name) ;
+            list($mod_name) = explode('_', $tpl_name);
         }
-        $tplsvarsinfo_mod_tpl[$mod_name][$tpl_name] = $tplsvarsinfo ;
-        $tplsvarsinfo_total = array_merge($tplsvarsinfo_total, $tplsvarsinfo) ;
+        $tplsvarsinfo_mod_tpl[$mod_name][$tpl_name] = $tplsvarsinfo;
+        $tplsvarsinfo_total = array_merge($tplsvarsinfo_total, $tplsvarsinfo);
     }
 } else {
-    die('XOOPS_COMPILE_PATH cannot be opened') ;
+    die('XOOPS_COMPILE_PATH cannot be opened');
 }
 
 if (empty($tplsvarsinfo_total)) {
-    die(_TPLSADMIN_ERR_NOTPLSVARSINFO) ;
+    die(_TPLSADMIN_ERR_NOTPLSVARSINFO);
 }
 
 //
@@ -162,17 +162,17 @@ 
 </snippet>' ;
 
 
-if (! empty($_POST['as_dw_extension_zip'])) {
-    require_once XOOPS_ROOT_PATH.'/class/zipdownloader.php' ;
+if (!empty($_POST['as_dw_extension_zip'])) {
+    require_once XOOPS_ROOT_PATH.'/class/zipdownloader.php';
     $downloader = new XoopsZipDownloader();
-    $do_download = true ;
-} elseif (! empty($_POST['as_dw_extension_tgz'])) {
-    require_once XOOPS_ROOT_PATH.'/class/tardownloader.php' ;
+    $do_download = true;
+} elseif (!empty($_POST['as_dw_extension_tgz'])) {
+    require_once XOOPS_ROOT_PATH.'/class/tardownloader.php';
     $downloader = new XoopsTarDownloader();
-    $do_download = true ;
+    $do_download = true;
 }
 
-if (! empty($do_download)) {
+if (!empty($do_download)) {
     //fix for mb_http_output setting and for add any browsers
     if (function_exists('mb_http_output')) {
         mb_http_output('pass');
@@ -180,33 +180,33 @@ 
     //ob_buffer over flow
 //HACK by suin & nao-pon 2012/01/06
     while (ob_get_level() > 0) {
-        if (! ob_end_clean()) {
+        if (!ob_end_clean()) {
             break;
         }
     }
     // make files for each tplsvars
     foreach ($tplsvarsinfo_total as $key => $val) {
-        $name = substr($key, 1) ;
-        $description = htmlspecialchars(xoops_utf8_encode(xoops_substr($val, 0, 256)), ENT_QUOTES) ;
-        $snippet_body = sprintf($snippet_format, $name, $description) ;
+        $name = substr($key, 1);
+        $description = htmlspecialchars(xoops_utf8_encode(xoops_substr($val, 0, 256)), ENT_QUOTES);
+        $snippet_body = sprintf($snippet_format, $name, $description);
 
-        $file_name = strtr($key, '.', '_') . '.csn' ;
-        $downloader->addFileData($snippet_body, $dw_snippets_dirname.'/'.$file_name) ;
+        $file_name = strtr($key, '.', '_').'.csn';
+        $downloader->addFileData($snippet_body, $dw_snippets_dirname.'/'.$file_name);
     }
 
     // make a mxi file per module
     foreach ($tplsvarsinfo_mod_tpl as $mod_name => $tplsvarsinfo_tpl) {
-        $file_entries = '' ;
+        $file_entries = '';
         foreach ($tplsvarsinfo_tpl as $tpl_name => $tplsvarsinfo) {
             foreach ($tplsvarsinfo as $key => $val) {
-                $name = substr($key, 1) ;
-                $file_name = strtr($key, '.', '_') . '.csn' ;
-                $file_entries .= "\t\t".'<file name="'.$dw_snippets_dirname.'/'.$file_name.'" destination="$Dreamweaver/Configuration/Snippets/XOOPS-'.$site_name.'/'.$tpl_name.'" />'."\n" ;
+                $name = substr($key, 1);
+                $file_name = strtr($key, '.', '_').'.csn';
+                $file_entries .= "\t\t".'<file name="'.$dw_snippets_dirname.'/'.$file_name.'" destination="$Dreamweaver/Configuration/Snippets/XOOPS-'.$site_name.'/'.$tpl_name.'" />'."\n";
             }
         }
-        $mxi_body = get_mxi_body($mod_name, $file_entries) ;
-        $downloader->addFileData($mxi_body, $mod_name.'.mxi') ;
+        $mxi_body = get_mxi_body($mod_name, $file_entries);
+        $downloader->addFileData($mxi_body, $mod_name.'.mxi');
     }
 //bugfix by nao-pon ,echo is not necessary for downloader
-    $downloader->download('tplsvarsinfo', true) ;
+    $downloader->download('tplsvarsinfo', true);
 }

xoops_trust_path/libs/altsys/language/persian/mytplsadmin.php

Spacing +20 added lines, -20 removed lines

@@ -14,25 +14,25 @@
 define('_MYTPLSADMIN_CUSTOMTEMPLATE', 'الگوی شخصی');
 define('_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE', 'یک الگوی شخصی بسازید');
 
-define('_MYTPLSADMIN_CREATE_NEW_TPLSET', 'ساخت مجموعه‌ی جدید') ;
-define('_MYTPLSADMIN_CAPTION_BASE', 'پایگاه') ;
-define('_MYTPLSADMIN_CAPTION_SETNAME', 'نام') ;
-define('_MYTPLSADMIN_OPT_BLANKSET', '(فاصله)') ;
-define('_MYTPLSADMIN_CAPTION_COPYTO', 'بسوی') ;
-define('_MYTPLSADMIN_BTN_COPY', 'کپی') ;
-define('_MYTPLSADMIN_TITLE_CHECKALL', 'خاموش /روشن کردن تمام چک باکس‌ها در این خط') ;
-define('_MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES', 'تمام الگو‌های انتخاب شده در این دسته پاک خواهند شد. آیا شما موافقید؟') ;
-define('_MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES', 'تمام الگو‌های انتخاب شده در این دسته در  در دسته ی انتخاب شده کپی/بازچسبانی میشوند. آیا شما موافقید؟') ;
-define('_MYTPLSADMIN_TH_NAME', 'نام الگو') ;
-define('_MYTPLSADMIN_TH_TYPE', 'نوع') ;
-define('_MYTPLSADMIN_TH_FILE', 'پرونده‌ی پایگاه') ;
-define('_MYTPLSADMIN_ERR_NOTPLFILE', 'هیچ الگوی چک نشده') ;
-define('_MYTPLSADMIN_ERR_INVALIDTPLSET', 'جایگاه مقصد باید دقیقا مانند جایگاه پرونده درون بسته باشد در غیر این صورت هیچ الگویی مجاز شناخته نخواهد شد') ;
-define('_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT', 'شما میتوانید الگو پیش فرض را پاک کنید.') ;
-define('_MYTPLSADMIN_ERR_DUPLICATEDSETNAME', 'نام مجموعه قبلا وجود داشته.') ;
-define('_MYTPLSADMIN_ERR_INVALIDSETNAME', 'خطا: نام مجموعه پیشتر تعیین شده است.') ;
+define('_MYTPLSADMIN_CREATE_NEW_TPLSET', 'ساخت مجموعه‌ی جدید');
+define('_MYTPLSADMIN_CAPTION_BASE', 'پایگاه');
+define('_MYTPLSADMIN_CAPTION_SETNAME', 'نام');
+define('_MYTPLSADMIN_OPT_BLANKSET', '(فاصله)');
+define('_MYTPLSADMIN_CAPTION_COPYTO', 'بسوی');
+define('_MYTPLSADMIN_BTN_COPY', 'کپی');
+define('_MYTPLSADMIN_TITLE_CHECKALL', 'خاموش /روشن کردن تمام چک باکس‌ها در این خط');
+define('_MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES', 'تمام الگو‌های انتخاب شده در این دسته پاک خواهند شد. آیا شما موافقید؟');
+define('_MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES', 'تمام الگو‌های انتخاب شده در این دسته در  در دسته ی انتخاب شده کپی/بازچسبانی میشوند. آیا شما موافقید؟');
+define('_MYTPLSADMIN_TH_NAME', 'نام الگو');
+define('_MYTPLSADMIN_TH_TYPE', 'نوع');
+define('_MYTPLSADMIN_TH_FILE', 'پرونده‌ی پایگاه');
+define('_MYTPLSADMIN_ERR_NOTPLFILE', 'هیچ الگوی چک نشده');
+define('_MYTPLSADMIN_ERR_INVALIDTPLSET', 'جایگاه مقصد باید دقیقا مانند جایگاه پرونده درون بسته باشد در غیر این صورت هیچ الگویی مجاز شناخته نخواهد شد');
+define('_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT', 'شما میتوانید الگو پیش فرض را پاک کنید.');
+define('_MYTPLSADMIN_ERR_DUPLICATEDSETNAME', 'نام مجموعه قبلا وجود داشته.');
+define('_MYTPLSADMIN_ERR_INVALIDSETNAME', 'خطا: نام مجموعه پیشتر تعیین شده است.');
 
-define('_MYTPLSADMIN_H3_MODULE', 'ماژول') ;
-define('_MYTPLSADMIN_BTN_NEWTPLSET', 'ساختن') ;
+define('_MYTPLSADMIN_H3_MODULE', 'ماژول');
+define('_MYTPLSADMIN_BTN_NEWTPLSET', 'ساختن');
 
-define('_MYTPLSADMIN_DBUPDATED', 'الگو‌ها با موفقیت به روز شدند') ;
+define('_MYTPLSADMIN_DBUPDATED', 'الگو‌ها با موفقیت به روز شدند');