mambax7 / altsys

xoops_trust_path/libs/altsys/mymenusub/myblocksadmin.php

Spacing +23 added lines, -23 removed lines

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

xoops_trust_path/libs/altsys/preload.php

Spacing +2 added lines, -2 removed lines

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

xoops_trust_path/libs/altsys/onupdate.php

Spacing +39 added lines, -39 removed lines

@@ -1,75 +1,75 @@ 
 <?php
 
-eval(' function xoops_module_update_'.$mydirname.'( $module ) { return altsys_onupdate_base( $module , "'.$mydirname.'" ) ; } ') ;
+eval(' function xoops_module_update_'.$mydirname.'( $module ) { return altsys_onupdate_base( $module , "'.$mydirname.'" ) ; } ');
 
 
-if (! function_exists('altsys_onupdate_base')) {
+if (!function_exists('altsys_onupdate_base')) {
     function altsys_onupdate_base($module, $mydirname)
     {
         // transations on module update
 
-    global $msgs ; // TODO :-D
+    global $msgs; // TODO :-D
 
     // for Cube 2.1
     if (defined('XOOPS_CUBE_LEGACY')) {
         $root = XCube_Root::getSingleton();
-        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_onupdate') ;
-        $msgs = array() ;
+        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUpdate.'.ucfirst($mydirname).'.Success', 'altsys_message_append_onupdate');
+        $msgs = array();
     } else {
-        if (! is_array($msgs)) {
-            $msgs = array() ;
+        if (!is_array($msgs)) {
+            $msgs = array();
         }
     }
 
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-        $mid = $module->getVar('mid') ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
+        $mid = $module->getVar('mid');
 
 
 
     // TABLES (write here ALTER TABLE etc. if necessary)
 
     // configs (Though I know it is not a recommended way...)
-    $check_sql = 'SHOW COLUMNS FROM ' . $db->prefix('config') . " LIKE 'conf_title'" ;
+    $check_sql = 'SHOW COLUMNS FROM '.$db->prefix('config')." LIKE 'conf_title'";
         if (($result = $db->query($check_sql)) && ($myrow = $db->fetchArray($result)) && @$myrow['Type'] == 'varchar(30)') {
-            $db->queryF('ALTER TABLE ' . $db->prefix('config') . " MODIFY `conf_title` varchar(255) NOT NULL default '', MODIFY `conf_desc` varchar(255) NOT NULL default ''") ;
+            $db->queryF('ALTER TABLE '.$db->prefix('config')." MODIFY `conf_title` varchar(255) NOT NULL default '', MODIFY `conf_desc` varchar(255) NOT NULL default ''");
         }
 
     // 0.4 -> 0.5
-    $check_sql = 'SELECT COUNT(*) FROM ' . $db->prefix($mydirname . '_language_constants') ;
-        if (! $db->query($check_sql)) {
-            $db->queryF('CREATE TABLE ' . $db->prefix($mydirname . '_language_constants') . " (mid smallint(5) unsigned NOT NULL default 0,language varchar(32) NOT NULL default '',name varchar(255) NOT NULL default '',value text,PRIMARY KEY (mid,language,name)) ENGINE=MyISAM") ;
+    $check_sql = 'SELECT COUNT(*) FROM '.$db->prefix($mydirname.'_language_constants');
+        if (!$db->query($check_sql)) {
+            $db->queryF('CREATE TABLE '.$db->prefix($mydirname.'_language_constants')." (mid smallint(5) unsigned NOT NULL default 0,language varchar(32) NOT NULL default '',name varchar(255) NOT NULL default '',value text,PRIMARY KEY (mid,language,name)) ENGINE=MyISAM");
         }
 
 
     // TEMPLATES (all templates have been already removed by modulesadmin)
-    $tplfile_handler = xoops_getHandler('tplfile') ;
-        $tpl_path = __DIR__.'/templates' ;
-        if ($handler = @opendir($tpl_path . '/')) {
+    $tplfile_handler = xoops_getHandler('tplfile');
+        $tpl_path = __DIR__.'/templates';
+        if ($handler = @opendir($tpl_path.'/')) {
             while (($file = readdir($handler)) !== false) {
                 if (substr($file, 0, 1) == '.') {
-                    continue ;
+                    continue;
                 }
-                $file_path = $tpl_path . '/' . $file ;
+                $file_path = $tpl_path.'/'.$file;
                 if (is_file($file_path)) {
                     $mtime = (int)(@filemtime($file_path));
-                    $tplfile = $tplfile_handler->create() ;
-                    $tplfile->setVar('tpl_source', file_get_contents($file_path), true) ;
-                    $tplfile->setVar('tpl_refid', $mid) ;
-                    $tplfile->setVar('tpl_tplset', 'default') ;
-                    $tplfile->setVar('tpl_file', $mydirname . '_' . $file) ;
-                    $tplfile->setVar('tpl_desc', '', true) ;
-                    $tplfile->setVar('tpl_module', $mydirname) ;
-                    $tplfile->setVar('tpl_lastmodified', $mtime) ;
-                    $tplfile->setVar('tpl_lastimported', 0) ;
-                    $tplfile->setVar('tpl_type', 'module') ;
-                    if (! $tplfile_handler->insert($tplfile)) {
+                    $tplfile = $tplfile_handler->create();
+                    $tplfile->setVar('tpl_source', file_get_contents($file_path), true);
+                    $tplfile->setVar('tpl_refid', $mid);
+                    $tplfile->setVar('tpl_tplset', 'default');
+                    $tplfile->setVar('tpl_file', $mydirname.'_'.$file);
+                    $tplfile->setVar('tpl_desc', '', true);
+                    $tplfile->setVar('tpl_module', $mydirname);
+                    $tplfile->setVar('tpl_lastmodified', $mtime);
+                    $tplfile->setVar('tpl_lastimported', 0);
+                    $tplfile->setVar('tpl_type', 'module');
+                    if (!$tplfile_handler->insert($tplfile)) {
                         $msgs[] = '<span style="color:#ff0000;">ERROR: Could not insert template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> to the database.</span>';
                     } else {
-                        $tplid = $tplfile->getVar('tpl_id') ;
+                        $tplid = $tplfile->getVar('tpl_id');
                         $msgs[] = 'Template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> added to the database. (ID: <b>'.$tplid.'</b>)';
                     // generate compiled file
-                    require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php' ;
-                        altsys_clear_templates_c() ;
+                    require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php';
+                        altsys_clear_templates_c();
                     /*include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
                     if( ! xoops_template_touch( $tplid ) ) {
                         $msgs[] = '<span style="color:#ff0000;">ERROR: Failed compiling template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b>.</span>';
@@ -79,20 +79,20 @@ 
                     }
                 }
             }
-            closedir($handler) ;
+            closedir($handler);
         }
-        include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
-        include_once XOOPS_ROOT_PATH.'/class/template.php' ;
-        xoops_template_clear_module_cache($mid) ;
+        include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+        include_once XOOPS_ROOT_PATH.'/class/template.php';
+        xoops_template_clear_module_cache($mid);
 
-        return true ;
+        return true;
     }
 
     function altsys_message_append_onupdate(&$module_obj, &$log)
     {
         if (is_array(@$GLOBALS['msgs'])) {
             foreach ($GLOBALS['msgs'] as $message) {
-                $log->add(strip_tags($message)) ;
+                $log->add(strip_tags($message));
             }
         }
 

xoops_trust_path/libs/altsys/include/mygroupperm.php

Spacing +17 added lines, -17 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 function myDeleteByModule($DB, $gperm_modid, $gperm_name = null, $gperm_itemid = null)
@@ -13,7 +13,7 @@ 
             $criteria->add(new Criteria('gperm_itemid', (int)$gperm_itemid));
         }
     }
-    $sql = 'DELETE FROM ' . $DB->prefix('group_permission') . ' ' . $criteria->renderWhere();
+    $sql = 'DELETE FROM '.$DB->prefix('group_permission').' '.$criteria->renderWhere();
     if (!$result = $DB->query($sql)) {
         return false;
     }
@@ -27,27 +27,27 @@ 
 
 if ($modid == 1) {
     // check by the permission of eather 'altsys' or 'system'
-    $module_handler = xoops_getHandler('module') ;
-    $module = $module_handler->getByDirname('altsys') ;
-    if (! is_object($module)) {
-        $module = $module_handler->getByDirname('system') ;
-        if (! is_object($module)) {
-            die('there is no altsys nor system.') ;
+    $module_handler = xoops_getHandler('module');
+    $module = $module_handler->getByDirname('altsys');
+    if (!is_object($module)) {
+        $module = $module_handler->getByDirname('system');
+        if (!is_object($module)) {
+            die('there is no altsys nor system.');
         }
     }
-    $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') ;
+    $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');
     }
 } else {
     // check the permission of 'module_admin' of the module
     if ($modid <= 0 || !is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin($modid)) {
-        die(_NOPERM) ;
+        die(_NOPERM);
     }
     $module_handler = xoops_getHandler('module');
     $module = $module_handler->get($modid);
     if (!is_object($module) || !$module->getVar('isactive')) {
-        die(_MODULENOEXIST) ;
+        die(_MODULENOEXIST);
     }
 }
 
@@ -56,18 +56,18 @@ 
 if (!empty($_POST['perms']) && is_array($_POST['perms'])) {
     $gperm_handler = xoops_getHandler('groupperm');
     foreach ($_POST['perms'] as $perm_name => $perm_data) {
-        foreach ($perm_data['itemname' ] as $item_id => $item_name) {
+        foreach ($perm_data['itemname'] as $item_id => $item_name) {
             // checking code
             // echo "<pre>" ;
             // var_dump( $_POST['perms'] ) ;
             // exit ;
             if (false != myDeleteByModule($gperm_handler->db, $modid, $perm_name, $item_id)) {
                 if (empty($perm_data['groups'])) {
-                    continue ;
+                    continue;
                 }
                 foreach ($perm_data['groups'] as $group_id => $item_ids) {
                     //              foreach ($item_ids as $item_id => $selected) {
-                    $selected = isset($item_ids[ $item_id ]) ? $item_ids[ $item_id ] : 0 ;
+                    $selected = isset($item_ids[$item_id]) ? $item_ids[$item_id] : 0;
                     if ($selected == 1) {
                         // make sure that all parent ids are selected as well
                         if ($perm_data['parents'][$item_id] != '') {

xoops_trust_path/libs/altsys/include/lang_functions.php

Spacing +38 added lines, -38 removed lines

@@ -2,91 +2,91 @@
 
 function altsys_mylangadmin_get_constant_names($langfile_unique_path, $mydirname)
 {
-    $constpref = '' ;
-    $langfile_names = array() ;
-    $reqonce_ret = 0 ;
-    $already_read = false ;
-    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path) ;
+    $constpref = '';
+    $langfile_names = array();
+    $reqonce_ret = 0;
+    $already_read = false;
+    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path);
 
     // for debug
     //require_once XOOPS_TRUST_PATH.'/modules/pico/language/japanese/modinfo.php' ;
 
     // get constant_names by "require"
-    if (! defined($langfile_fingerprint)) {
-        $system_constants = array_keys(get_defined_constants()) ;
+    if (!defined($langfile_fingerprint)) {
+        $system_constants = array_keys(get_defined_constants());
         $reqonce_ret = require_once $langfile_unique_path;
-        $langfile_names = array_diff(array_keys(get_defined_constants()), $system_constants) ;
+        $langfile_names = array_diff(array_keys(get_defined_constants()), $system_constants);
     }
 
     // We have to parse the file if it has been already included ...
     if (empty($langfile_names) && ($reqonce_ret === true || defined($langfile_fingerprint))) {
-        $already_read = true ;
-        $langfile_names = altsys_mylangadmin_get_constant_names_by_pcre($langfile_unique_path) ;
+        $already_read = true;
+        $langfile_names = altsys_mylangadmin_get_constant_names_by_pcre($langfile_unique_path);
     }
 
     // modinfo.php of D3 module
     if (empty($langfile_names) && file_exists(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/mytrustdirname.php') /* && substr( $langfile_unique_path , -11 ) == 'modinfo.php' */) {
         // get $constpref
-        $constpref = '' ;
-        require $langfile_unique_path ;
-        $langfile_names = array() ;
+        $constpref = '';
+        require $langfile_unique_path;
+        $langfile_names = array();
         if ($constpref) {
             foreach (array_keys(get_defined_constants()) as $name) {
                 if (strncmp($name, $constpref, strlen($constpref)) == 0) {
-                    $langfile_names[] = $name ;
+                    $langfile_names[] = $name;
                 }
             }
         }
     }
 
 
-    return array( $langfile_names , $constpref , $already_read ) ;
+    return array($langfile_names, $constpref, $already_read);
 }
 
 
 function altsys_mylangadmin_get_constant_names_by_pcre($langfile_path)
 {
-    if (! file_exists($langfile_path)) {
-        return array() ;
+    if (!file_exists($langfile_path)) {
+        return array();
     }
-    $file_contents = file_get_contents($langfile_path) ;
-    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1/iU', $file_contents, $matches) ;
-    $langfile_names = array() ;
+    $file_contents = file_get_contents($langfile_path);
+    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1/iU', $file_contents, $matches);
+    $langfile_names = array();
     foreach ($matches[2] as $name) {
         // if( defined( $name ) )
-        $langfile_names[] = $name ;
+        $langfile_names[] = $name;
     }
 
-    return $langfile_names ;
+    return $langfile_names;
 }
 
 
 function altsys_mylangadmin_get_constants_by_pcre($langfile_path)
 {
-    if (! file_exists($langfile_path)) {
-        return array() ;
+    if (!file_exists($langfile_path)) {
+        return array();
     }
 
-    $file_contents = file_get_contents($langfile_path) ;
-    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1\s*\,\s*(["\'])([^\\3]+)\\3/iU', $file_contents, $matches) ;
-    $constants = array() ;
+    $file_contents = file_get_contents($langfile_path);
+    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1\s*\,\s*(["\'])([^\\3]+)\\3/iU', $file_contents, $matches);
+    $constants = array();
     foreach ($matches[2] as $i => $name) {
-        $constants[ $name ] = $matches[4][$i] ;
+        $constants[$name] = $matches[4][$i];
     }
 
-    return $constants ;
+    return $constants;
 }
 
 
 function altsys_mylangadmin_errordie($target_mname, $message4disp)
 {
-    xoops_cp_header() ;
-    altsys_include_mymenu() ;
-    $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN) ;
-    $breadcrumbsObj->appendPath('', $target_mname) ;
-    echo '<h3>' . _MYLANGADMIN_H3_MODULE . ' : ' . $target_mname . '</h3>' ;
-    echo '<p>'.$message4disp.'</p>' ;
-    xoops_cp_footer() ;
-    exit ;
+    xoops_cp_header();
+    altsys_include_mymenu();
+    $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
+    $breadcrumbsObj->appendPath('', $target_mname);
+    echo '<h3>'._MYLANGADMIN_H3_MODULE.' : '.$target_mname.'</h3>';
+    echo '<p>'.$message4disp.'</p>';
+    xoops_cp_footer();
+    exit;
 }

xoops_trust_path/libs/altsys/include/formcheckboxgroup.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 /**
  * Parent
  */
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php';
 
 /**
  * A checkbox field with a choice of available groups
@@ -53,7 +53,7 @@ 
      * @param   bool    $include_anon   Include group "anonymous"?
      * @param   mixed   $value          Pre-selected value (or array of them).
      */
-    public function __construct($caption, $name, $include_anon=false, $value=null)
+    public function __construct($caption, $name, $include_anon = false, $value = null)
     {
         parent::__construct($caption, $name, $value);
         $member_handler = xoops_getHandler('member');
@@ -63,7 +63,7 @@ 
             $options = $member_handler->getGroupList();
         }
         foreach ($options as $k => $v) {
-            $options[$k] = $v . '<br />';
+            $options[$k] = $v.'<br />';
         }
         $this->addOptionArray($options);
     }

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/myblocksadmin.php

Spacing +32 added lines, -32 removed lines

@@ -5,56 +5,56 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-require_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/mygrouppermform.php' ;
-include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+require_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/mygrouppermform.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
 // language file
-altsys_include_language_file('myblocksadmin') ;
+altsys_include_language_file('myblocksadmin');
 
 // fork by core types
 switch (altsys_get_core_type()) {
     case ALTSYS_CORE_TYPE_X22:
-        include_once __DIR__.'/class/MyBlocksAdminForX22.class.php' ;
-        $myba = MyBlocksAdminForX22::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForX22.class.php';
+        $myba = MyBlocksAdminForX22::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_X25:
-        include_once __DIR__.'/class/MyBlocksAdminForX25.class.php' ;
-        $myba = MyBlocksAdminForX25::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForX25.class.php';
+        $myba = MyBlocksAdminForX25::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_XCL21:
-        include_once __DIR__.'/class/MyBlocksAdminForXCL21.class.php' ;
-        $myba = MyBlocksAdminForXCL21::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForXCL21.class.php';
+        $myba = MyBlocksAdminForXCL21::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_ICMS:
-        include_once __DIR__.'/class/MyBlocksAdminForICMS.class.php' ;
-        $myba = MyBlocksAdminForICMS::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForICMS.class.php';
+        $myba = MyBlocksAdminForICMS::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_X20S:
     case ALTSYS_CORE_TYPE_X23P:
-        include_once __DIR__.'/class/MyBlocksAdminForX20S.class.php' ;
-        $myba = MyBlocksAdminForX20S::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForX20S.class.php';
+        $myba = MyBlocksAdminForX20S::getInstance();
+        break;
     default:
-        include_once __DIR__.'/class/MyBlocksAdmin.class.php' ;
-        $myba = MyBlocksAdmin::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdmin.class.php';
+        $myba = MyBlocksAdmin::getInstance();
+        break;
 }
 // permission
-$myba->checkPermission() ;
+$myba->checkPermission();
 
 // set parameters target_mid , target_dirname etc.
-$myba->init($xoopsModule) ;
+$myba->init($xoopsModule);
 
 
 //
 // transaction stage
 //
 
-if (! empty($_POST)) {
-    $myba->processPost() ;
+if (!empty($_POST)) {
+    $myba->processPost();
 }
 
 //
@@ -62,12 +62,12 @@ 
 //
 
 // header
-xoops_cp_header() ;
+xoops_cp_header();
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
-$myba->processGet() ;
+$myba->processGet();
 
 // footer
-xoops_cp_footer() ;
+xoops_cp_footer();

xoops_trust_path/libs/altsys/index.php

Spacing +23 added lines, -23 removed lines

@@ -1,51 +1,51 @@
 <?php
 
-if (! defined('XOOPS_MODULE_PATH')) {
-    define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH . '/modules');
+if (!defined('XOOPS_MODULE_PATH')) {
+    define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH.'/modules');
 }
-if (! defined('XOOPS_MODULE_URL')) {
-    define('XOOPS_MODULE_URL', XOOPS_URL . '/modules');
+if (!defined('XOOPS_MODULE_URL')) {
+    define('XOOPS_MODULE_URL', XOOPS_URL.'/modules');
 }
 
  
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-require_once __DIR__.'/include/altsys_functions.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+require_once __DIR__.'/include/altsys_functions.php';
 
 
 if (empty($xoopsModule)) {
-    $moduleperm_handler = xoops_getHandler('module') ;
-    $xoopsModule = $moduleperm_handler->getByDirname('altsys') ;
+    $moduleperm_handler = xoops_getHandler('module');
+    $xoopsModule = $moduleperm_handler->getByDirname('altsys');
 }
 
-require XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
+require XOOPS_ROOT_PATH.'/include/cp_functions.php';
 
 // breadcrumbs
-$breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name')) ;
+$breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name'));
 
 // get page
-$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']) ;
-require __DIR__.'/controllers.php' ;
-if (! in_array($page, $controllers)) {
-    $_GET['page'] = $page = 'myblocksadmin' ;
-    $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin' ;
+$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']);
+require __DIR__.'/controllers.php';
+if (!in_array($page, $controllers)) {
+    $_GET['page'] = $page = 'myblocksadmin';
+    $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin';
 }
 
 
 // half measure ... (TODO)
 if (empty($_GET['dirname'])) {
-    $module_handler = xoops_getHandler('module') ;
-    list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1)) ;
-    $_GET['dirname'] = $top_module->getVar('dirname') ;
+    $module_handler = xoops_getHandler('module');
+    list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1));
+    $_GET['dirname'] = $top_module->getVar('dirname');
 }
 
 // language file
-altsys_include_language_file($page) ;
+altsys_include_language_file($page);
 
 // branch to each pages
-$mytrustdirpath = __DIR__ ;
+$mytrustdirpath = __DIR__;
 if (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php')) {
-    include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php' ;
+    include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php';
 } else {
-    die('wrong request') ;
+    die('wrong request');
 }