mambax7 / altsys

xoops_trust_path/libs/altsys/compilehookadmin.php

Spacing +93 added lines, -93 removed lines

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

xoops_trust_path/libs/altsys/mymenusub/myblocksadmin.php

Spacing +23 added lines, -23 removed lines

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

xoops_trust_path/libs/altsys/preload.php

Spacing +2 added lines, -2 removed lines

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

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

Spacing +107 added lines, -107 removed lines

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

xoops_trust_path/libs/altsys/include/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);
 }