mambax7 / altsys

xoops_trust_path/libs/altsys/admin_menu.php

Spacing +26 added lines, -26 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 $adminmenu = array(
     array(
-        'title' => _MI_ALTSYS_MENU_CUSTOMBLOCKS ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__' ,
-    ) ,
+        'title' => _MI_ALTSYS_MENU_CUSTOMBLOCKS,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__',
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_NEWCUSTOMBLOCK ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__&op=edit' ,
-        'show' => false ,
-    ) ,
+        'title' => _MI_ALTSYS_MENU_NEWCUSTOMBLOCK,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__&op=edit',
+        'show' => false,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYBLOCKSADMIN ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin' ,
-    ) ,
+        'title' => _MI_ALTSYS_MENU_MYBLOCKSADMIN,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin',
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYTPLSADMIN ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=mytplsadmin' ,
-    ) ,
+        'title' => _MI_ALTSYS_MENU_MYTPLSADMIN,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=mytplsadmin',
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_COMPILEHOOKADMIN ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=compilehookadmin' ,
-    ) ,
+        'title' => _MI_ALTSYS_MENU_COMPILEHOOKADMIN,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=compilehookadmin',
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYLANGADMIN ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=mylangadmin' ,
-    ) ,
+        'title' => _MI_ALTSYS_MENU_MYLANGADMIN,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=mylangadmin',
+    ),
 /*	array(
         'title' => _MI_ALTSYS_MENU_MYAVATAR ,
         'link' => 'index.php?mode=admin&lib=altsys&page=myavatar' ,
@@ -38,11 +38,11 @@ 
         'title' => _MI_ALTSYS_MENU_MYSMILEY ,
         'link' => 'index.php?mode=admin&lib=altsys&page=mysmiley' ,
     ) ,*/
-) ;
+);
 
 $adminmenu4altsys = array(
     array(
-        'title' => 'ALTSYS '._PREFERENCES ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=mypreferences' ,
-    ) ,
-) ;
+        'title' => 'ALTSYS '._PREFERENCES,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=mypreferences',
+    ),
+);

xoops_trust_path/libs/altsys/onuninstall.php

Spacing +15 added lines, -15 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 
-eval(' function xoops_module_uninstall_'.$mydirname.'( $module ) { return altsys_onuninstall_base( $module , "'.$mydirname.'" ) ; } ') ;
+eval(' function xoops_module_uninstall_'.$mydirname.'( $module ) { return altsys_onuninstall_base( $module , "'.$mydirname.'" ) ; } ');
 
 
-if (! function_exists('altsys_onuninstall_base')) {
+if (!function_exists('altsys_onuninstall_base')) {
     function altsys_onuninstall_base($module, $mydirname)
     {
         // transations on module uninstall
 
-    global $ret ; // TODO :-D
+    global $ret; // TODO :-D
 
     // for Cube 2.1
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $root =& XCube_Root::getSingleton();
-        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_onuninstall') ;
-        $ret = array() ;
+        $root = & XCube_Root::getSingleton();
+        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUninstall.'.ucfirst($mydirname).'.Success', 'altsys_message_append_onuninstall');
+        $ret = array();
     } else {
-        if (! is_array($ret)) {
-            $ret = array() ;
+        if (!is_array($ret)) {
+            $ret = array();
         }
     }
 
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
-        $mid = $module->getVar('mid') ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
+        $mid = $module->getVar('mid');
 
     // TABLES (loading mysql.sql)
-    $sql_file_path = dirname(__FILE__).'/sql/mysql.sql' ;
-        $prefix_mod = $db->prefix() . '_' . $mydirname ;
+    $sql_file_path = dirname(__FILE__).'/sql/mysql.sql';
+        $prefix_mod = $db->prefix().'_'.$mydirname;
         if (file_exists($sql_file_path)) {
             $ret[] = "SQL file found at <b>".htmlspecialchars($sql_file_path)."</b>.<br  /> Deleting tables...<br />";
-            $sql_lines = file($sql_file_path) ;
+            $sql_lines = file($sql_file_path);
             foreach ($sql_lines as $sql_line) {
                 if (preg_match('/^CREATE TABLE \`?([a-zA-Z0-9_-]+)\`? /i', $sql_line, $regs)) {
                     $sql = 'DROP TABLE '.addslashes($prefix_mod.'_'.$regs[1]);
@@ -59,14 +59,14 @@ 
     unset($templates); */
 
 
-    return true ;
+    return true;
     }
 
     function altsys_message_append_onuninstall(&$module_obj, &$log)
     {
         if (is_array(@$GLOBALS['ret'])) {
             foreach ($GLOBALS['ret'] as $message) {
-                $log->add(strip_tags($message)) ;
+                $log->add(strip_tags($message));
             }
         }
 

xoops_trust_path/libs/altsys/put_templates.php

Spacing +38 added lines, -38 removed lines

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

xoops_trust_path/libs/altsys/mylangadmin.php

Spacing +116 added lines, -116 removed lines

@@ -5,170 +5,170 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once dirname(__FILE__).'/class/AltsysBreadcrumbs.class.php' ;
-include_once dirname(__FILE__)."/include/gtickets.php" ;
-include_once dirname(__FILE__).'/include/altsys_functions.php' ;
-include_once dirname(__FILE__).'/include/lang_functions.php' ;
-include_once dirname(__FILE__).'/class/D3LanguageManager.class.php' ;
+require_once dirname(__FILE__).'/class/AltsysBreadcrumbs.class.php';
+include_once dirname(__FILE__)."/include/gtickets.php";
+include_once dirname(__FILE__).'/include/altsys_functions.php';
+include_once dirname(__FILE__).'/include/lang_functions.php';
+include_once dirname(__FILE__).'/class/D3LanguageManager.class.php';
 
 
 // only groups have 'module_admin' of 'altsys' can do that.
-$module_handler =& xoops_gethandler('module') ;
-$module =& $module_handler->getByDirname('altsys') ;
-if (! is_object($module)) {
-    die('install altsys') ;
+$module_handler = & xoops_gethandler('module');
+$module = & $module_handler->getByDirname('altsys');
+if (!is_object($module)) {
+    die('install altsys');
 }
-$moduleperm_handler =& xoops_gethandler('groupperm') ;
-if (! is_object(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
-    die('only admin of altsys can access this area') ;
+$moduleperm_handler = & xoops_gethandler('groupperm');
+if (!is_object(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 
 // initials
-$db =& XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance() ;
-$langman =& D3LanguageManager::getInstance() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
+$langman = & D3LanguageManager::getInstance();
 
 // language file of this controller
-altsys_include_language_file('mylangadmin') ;
+altsys_include_language_file('mylangadmin');
 
 // check $xoopsModule
-if (! is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM) ;
+if (!is_object($xoopsModule)) {
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // set target_module if specified by $_GET['dirname']
-$module_handler =& xoops_gethandler('module');
-if (! empty($_GET['dirname'])) {
-    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']) ;
-    $target_module =& $module_handler->getByDirname($dirname) ;
+$module_handler = & xoops_gethandler('module');
+if (!empty($_GET['dirname'])) {
+    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']);
+    $target_module = & $module_handler->getByDirname($dirname);
 }
 
-if (! empty($target_module) && is_object($target_module)) {
+if (!empty($target_module) && is_object($target_module)) {
     // specified by dirname (for langadmin as an independent module)
-    $target_mid = $target_module->getVar('mid') ;
-    $target_dirname = $target_module->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $target_module->getVar('name') . "&nbsp;" . sprintf("(%2.2f)", $target_module->getVar('version') / 100.0) ;
+    $target_mid = $target_module->getVar('mid');
+    $target_dirname = $target_module->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $target_module->getVar('name')."&nbsp;".sprintf("(%2.2f)", $target_module->getVar('version') / 100.0);
     //$query4redirect = '?dirname='.urlencode(strip_tags($_GET['dirname'])) ;
 } else {
     // not specified by dirname (for 3rd party modules as mylangadmin)
-    $target_mid = $xoopsModule->getVar('mid') ;
-    $target_dirname = $xoopsModule->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $xoopsModule->getVar('name') ;
+    $target_mid = $xoopsModule->getVar('mid');
+    $target_dirname = $xoopsModule->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $xoopsModule->getVar('name');
     //$query4redirect = '' ;
 }
 
 // basic GET variables
-$target_lang = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['target_lang']) ;
+$target_lang = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['target_lang']);
 if (empty($target_lang)) {
-    $target_lang = $GLOBALS['xoopsConfig']['language'] ;
+    $target_lang = $GLOBALS['xoopsConfig']['language'];
 }
-$target_lang4sql = addslashes($target_lang) ;
-$target_file = preg_replace('/[^0-9a-zA-Z_.-]/', '', @$_GET['target_file']) ;
+$target_lang4sql = addslashes($target_lang);
+$target_file = preg_replace('/[^0-9a-zA-Z_.-]/', '', @$_GET['target_file']);
 if (empty($target_file)) {
-    $target_file = 'main.php' ;
+    $target_file = 'main.php';
 }
 
 // get $target_trustdirname
-$mytrustdirname = '' ;
+$mytrustdirname = '';
 if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php')) {
-    require XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php' ;
+    require XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php';
 }
-$target_trustdirname = $mytrustdirname ;
+$target_trustdirname = $mytrustdirname;
 
 // get base directory
 if (empty($target_trustdirname)) {
     // conventinal module
-    $base_dir = XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/language' ;
+    $base_dir = XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/language';
 } else {
     // D3 module
-    $base_dir = XOOPS_TRUST_PATH.'/modules/'.$target_trustdirname.'/language' ;
+    $base_dir = XOOPS_TRUST_PATH.'/modules/'.$target_trustdirname.'/language';
 }
 
 // make list of language and check $target_lang
-$languages = array() ;
-$languages4disp = array() ;
-if (! is_dir($base_dir)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODNOLANGUAGE) ;
+$languages = array();
+$languages4disp = array();
+if (!is_dir($base_dir)) {
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODNOLANGUAGE);
 }
-$dh = opendir($base_dir) ;
+$dh = opendir($base_dir);
 if ($dh) {
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if (is_dir("$base_dir/$file")) {
-            list($count) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("altsys_language_constants")." WHERE mid=$target_mid AND language='".addslashes($file)."'")) ;
-            $languages[] = $file ;
-            $languages4disp[] = $file . " ($count)" ;
+            list($count) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("altsys_language_constants")." WHERE mid=$target_mid AND language='".addslashes($file)."'"));
+            $languages[] = $file;
+            $languages4disp[] = $file." ($count)";
         }
     }
 }
-closedir($dh) ;
-if (! in_array($target_lang, $languages)) {
-    $target_lang = $languages[0] ;
+closedir($dh);
+if (!in_array($target_lang, $languages)) {
+    $target_lang = $languages[0];
 }
 
 // get base directory seleced language
-$lang_base_dir = $base_dir.'/'.$target_lang ;
-if (! is_dir($lang_base_dir)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODLANGINCOMPATIBLE) ;
+$lang_base_dir = $base_dir.'/'.$target_lang;
+if (!is_dir($lang_base_dir)) {
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODLANGINCOMPATIBLE);
 }
 
 // make list of files and check $target_file
-$lang_files = array() ;
-$dh = opendir($lang_base_dir) ;
+$lang_files = array();
+$dh = opendir($lang_base_dir);
 if ($dh) {
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if ($file == 'index.html') {
-            continue ;
+            continue;
         }
     //if( $file == 'modinfo.php' ) continue ; // TODO(?)
     //if( $file == 'global.php' ) continue ; // TODO(?)
     if (is_file("$lang_base_dir/$file")) {
-        $lang_files[] = $file ;
+        $lang_files[] = $file;
     }
     }
 }
-closedir($dh) ;
+closedir($dh);
 if (empty($lang_files)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODEMPTYLANGDIR) ;
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODEMPTYLANGDIR);
 }
-if (! in_array($target_file, $lang_files)) {
-    $target_file = $lang_files[0] ;
+if (!in_array($target_file, $lang_files)) {
+    $target_file = $lang_files[0];
 }
 
 // get unique path of language_file
-$langfile_unique_path = "$lang_base_dir/$target_file" ;
+$langfile_unique_path = "$lang_base_dir/$target_file";
 
 // get constants defined by the target_file
-list($langfile_names, $constpref, $already_read) = altsys_mylangadmin_get_constant_names($langfile_unique_path, $target_dirname) ;
+list($langfile_names, $constpref, $already_read) = altsys_mylangadmin_get_constant_names($langfile_unique_path, $target_dirname);
 
 // get user_values should be overridden
-$langfile_constants = array() ;
+$langfile_constants = array();
 foreach ($langfile_names as $name) {
-    list($value) = $db->fetchRow($db->query("SELECT value FROM ".$db->prefix("altsys_language_constants")." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'")) ;
-    $langfile_constants[ $name ] = $value ;
+    list($value) = $db->fetchRow($db->query("SELECT value FROM ".$db->prefix("altsys_language_constants")." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'"));
+    $langfile_constants[$name] = $value;
 }
 
 // constants defined in XOOPS_ROOT_PATH/my_language/(dirname)/...
 if ($langman->my_language) {
-    $mylang_unique_path = $langman->my_language.'/modules/'.$target_dirname.'/'.$target_lang.'/'.$target_file ;
-    $mylang_constants = array_map('htmlspecialchars', altsys_mylangadmin_get_constants_by_pcre($mylang_unique_path)) ;
+    $mylang_unique_path = $langman->my_language.'/modules/'.$target_dirname.'/'.$target_lang.'/'.$target_file;
+    $mylang_constants = array_map('htmlspecialchars', altsys_mylangadmin_get_constants_by_pcre($mylang_unique_path));
     foreach ($mylang_constants as $key => $val) {
-        if (! in_array($key, array_keys($langfile_constants))) {
-            $langfile_constants[ $key ] = null ;
-            define($key, _MYLANGADMIN_NOTE_ADDEDBYMYLANG) ;
+        if (!in_array($key, array_keys($langfile_constants))) {
+            $langfile_constants[$key] = null;
+            define($key, _MYLANGADMIN_NOTE_ADDEDBYMYLANG);
         }
     }
 } else {
-    $mylang_unique_path = '' ;
-    $mylang_constants = array() ;
+    $mylang_unique_path = '';
+    $mylang_constants = array();
 }
 
 
@@ -177,57 +177,57 @@ 
 //
 
 // Update language table and cache file
-if (! empty($_POST['do_update'])) {
+if (!empty($_POST['do_update'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check(true, 'altsys')) {
+    if (!$xoopsGTicket->check(true, 'altsys')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     // read original file
-    $file_contents = file_get_contents($langfile_unique_path) ;
+    $file_contents = file_get_contents($langfile_unique_path);
 
     // insert fingerprint of langfile_unique_path
-    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path) ;
-    $file_contents = str_replace('<?php', "<?php\nif(!defined('$langfile_fingerprint'))define('$langfile_fingerprint',1);", $file_contents) ;
+    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path);
+    $file_contents = str_replace('<?php', "<?php\nif(!defined('$langfile_fingerprint'))define('$langfile_fingerprint',1);", $file_contents);
 
     // constants loop
-    $overrides_counter = 0 ;
+    $overrides_counter = 0;
     foreach (array_reverse($langfile_names) as $name) {
-        $user_value = $myts->stripSlashesGPC(@$_POST[$name]) ;
-        $db->query("DELETE FROM ".$db->prefix("altsys_language_constants")." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'") ;
+        $user_value = $myts->stripSlashesGPC(@$_POST[$name]);
+        $db->query("DELETE FROM ".$db->prefix("altsys_language_constants")." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'");
         if ($user_value !== '') {
-            $overrides_counter ++ ;
+            $overrides_counter++;
             // Update table
-            $db->query("INSERT INTO ".$db->prefix("altsys_language_constants")." (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','".addslashes($name)."','".addslashes($user_value)."')") ;
+            $db->query("INSERT INTO ".$db->prefix("altsys_language_constants")." (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','".addslashes($name)."','".addslashes($user_value)."')");
             // rewrite script for cache
             // comment-out the line of define()
             if (empty($constpref)) {
-                $from = '/.*define\s?\(\s*(["\'])'.preg_quote($name).'(\\1).*\;.*/' ;
+                $from = '/.*define\s?\(\s*(["\'])'.preg_quote($name).'(\\1).*\;.*/';
             } else {
-                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])'.preg_quote(substr($name, strlen($constpref))).'(\\1).*\;.*/' ;
+                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])'.preg_quote(substr($name, strlen($constpref))).'(\\1).*\;.*/';
             }
-            $to = '//$0'."\ndefine('".addslashes($name)."','".addslashes($user_value)."');" ;
-            $file_contents = preg_replace($from, $to, $file_contents) ;
+            $to = '//$0'."\ndefine('".addslashes($name)."','".addslashes($user_value)."');";
+            $file_contents = preg_replace($from, $to, $file_contents);
         }
     }
 
     // get the file name for caching
-    $cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang) ;
+    $cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang);
 
     // Create language cache file
     if ($overrides_counter > 0) {
-        $fp = fopen($cache_file_name, 'wb') ;
-        if (! $fp) {
-            die('Invalid Cache Directory. (Set XOOPS_TRUST_PATH/cache writable)') ;
+        $fp = fopen($cache_file_name, 'wb');
+        if (!$fp) {
+            die('Invalid Cache Directory. (Set XOOPS_TRUST_PATH/cache writable)');
         }
-        fwrite($fp, $file_contents) ;
-        fclose($fp) ;
+        fwrite($fp, $file_contents);
+        fclose($fp);
     } else {
-        unlink($cache_file_name) ;
+        unlink($cache_file_name);
     }
 
-    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname='.$target_dirname.'&target_lang='.rawurlencode($target_lang).'&target_file='.rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED) ;
-    exit ;
+    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname='.$target_dirname.'&target_lang='.rawurlencode($target_lang).'&target_file='.rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED);
+    exit;
 }
 
 
@@ -236,22 +236,22 @@ 
 //
 
 // check cache file
-$cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang) ;
-$cache_file_mtime = file_exists($cache_file_name) ? filemtime($cache_file_name) : 0 ;
+$cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang);
+$cache_file_mtime = file_exists($cache_file_name) ? filemtime($cache_file_name) : 0;
 
 // check core version and generate message to enable D3LanguageManager
 if (altsys_get_core_type() == ALTSYS_CORE_TYPE_XCL21) {
     // XoopsCube Legacy without preload
     if (class_exists('AltsysLangMgr_LanguageManager')) {
         // the preload enabled
-        $notice4disp = _MYLANGADMIN_MSG_D3LANGMANENABLED ;
+        $notice4disp = _MYLANGADMIN_MSG_D3LANGMANENABLED;
     } else {
         // the preload disabled
-        $notice4disp = sprintf(_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL, 'SetupAltsysLangMgr.class.php', 'XOOPS_ROOT_PATH/preload') ;
+        $notice4disp = sprintf(_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL, 'SetupAltsysLangMgr.class.php', 'XOOPS_ROOT_PATH/preload');
     }
 } else {
     // X2 core etc.
-    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2.'<br />' ;
+    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2.'<br />';
     $notice4disp .= '
 		<h4>include/common.php</h4>
 		<pre>
@@ -275,20 +275,20 @@ 
 //
 
 
-xoops_cp_header() ;
+xoops_cp_header();
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
 // breadcrumbs
-$breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+$breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
 if ($breadcrumbsObj->hasPaths()) {
-    $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) ;
+    $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);
 }
 
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'target_dirname' => $target_dirname,
     'target_mname' => $target_mname,
@@ -307,8 +307,8 @@ 
     'notice' => $notice4disp,
     'already_read' => $already_read,
     'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys'),
-)) ;
-$tpl->display('db:altsys_main_mylangadmin.html') ;
+));
+$tpl->display('db:altsys_main_mylangadmin.html');
 
-xoops_cp_footer() ;
-exit ;
+xoops_cp_footer();
+exit;

xoops_trust_path/libs/altsys/mytplsadmin.php

Spacing +134 added lines, -134 removed lines

@@ -5,63 +5,63 @@ 
 //                      GIJOE <http://www.peak.ne.jp/>                       //
 // ------------------------------------------------------------------------- //
 
-require_once dirname(__FILE__).'/class/AltsysBreadcrumbs.class.php' ;
-include_once dirname(__FILE__)."/include/gtickets.php" ;
-include_once dirname(__FILE__).'/include/altsys_functions.php' ;
-include_once dirname(__FILE__)."/include/tpls_functions.php" ;
+require_once dirname(__FILE__).'/class/AltsysBreadcrumbs.class.php';
+include_once dirname(__FILE__)."/include/gtickets.php";
+include_once dirname(__FILE__).'/include/altsys_functions.php';
+include_once dirname(__FILE__)."/include/tpls_functions.php";
 
 
 // only groups have 'module_admin' of 'altsys' can do that.
-$module_handler =& xoops_gethandler('module') ;
-$module =& $module_handler->getByDirname('altsys') ;
-if (! is_object($module)) {
-    die('install altsys') ;
+$module_handler = & xoops_gethandler('module');
+$module = & $module_handler->getByDirname('altsys');
+if (!is_object($module)) {
+    die('install altsys');
 }
-$moduleperm_handler =& xoops_gethandler('groupperm') ;
-if (! is_object(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
-    die('only admin of altsys can access this area') ;
+$moduleperm_handler = & xoops_gethandler('groupperm');
+if (!is_object(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 
 // initials
-$db =& XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mytplsadmin') ;
+altsys_include_language_file('mytplsadmin');
 
 // check $xoopsModule
-if (! is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM) ;
+if (!is_object($xoopsModule)) {
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // set target_module if specified by $_GET['dirname']
-$module_handler =& xoops_gethandler('module');
-if (! empty($_GET['dirname'])) {
-    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']) ;
-    $target_module =& $module_handler->getByDirname($dirname) ;
+$module_handler = & xoops_gethandler('module');
+if (!empty($_GET['dirname'])) {
+    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']);
+    $target_module = & $module_handler->getByDirname($dirname);
 }
 
-if (! empty($target_module) && is_object($target_module)) {
+if (!empty($target_module) && is_object($target_module)) {
     // specified by dirname (for tplsadmin as an independent module)
-    $target_mid = $target_module->getVar('mid') ;
-    $target_dirname = $target_module->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $target_module->getVar('name') . "&nbsp;" . sprintf("(%2.2f)", $target_module->getVar('version') / 100.0) ;
+    $target_mid = $target_module->getVar('mid');
+    $target_dirname = $target_module->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $target_module->getVar('name')."&nbsp;".sprintf("(%2.2f)", $target_module->getVar('version') / 100.0);
     //$query4redirect = '?dirname='.urlencode(strip_tags($_GET['dirname'])) ;
 } elseif (@$_GET['dirname'] == '_custom') {
     // custom template
-    $target_mid = 0 ;
-    $target_dirname = '_custom' ;
-    $target_dirname4sql = '_custom' ;
-    $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE ;
+    $target_mid = 0;
+    $target_dirname = '_custom';
+    $target_dirname4sql = '_custom';
+    $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE;
     //$query4redirect = '' ;
 } else {
     // not specified by dirname (for 3rd party modules as mytplsadmin)
-    $target_mid = $xoopsModule->getVar('mid') ;
-    $target_dirname = $xoopsModule->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $xoopsModule->getVar('name') ;
+    $target_mid = $xoopsModule->getVar('mid');
+    $target_dirname = $xoopsModule->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $xoopsModule->getVar('name');
     //$query4redirect = '' ;
 }
 
@@ -71,129 +71,129 @@ 
 //**************//
 
 // Create new template set (blank or clone)
-if (! empty($_POST['clone_tplset_do']) && ! empty($_POST['clone_tplset_from']) && ! empty($_POST['clone_tplset_to'])) {
+if (!empty($_POST['clone_tplset_do']) && !empty($_POST['clone_tplset_from']) && !empty($_POST['clone_tplset_to'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $tplset_from = $myts->stripSlashesGPC($_POST['clone_tplset_from']) ;
-    $tplset_to = $myts->stripSlashesGPC($_POST['clone_tplset_to']) ;
+    $tplset_from = $myts->stripSlashesGPC($_POST['clone_tplset_from']);
+    $tplset_to = $myts->stripSlashesGPC($_POST['clone_tplset_to']);
     // check tplset_name "from" and "to"
-    if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_from'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname) ;
+    if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_from'])) {
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname);
     }
-    if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_to'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname) ;
+    if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_to'])) {
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname);
     }
-    list($is_exist) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("tplfile")." WHERE tpl_tplset='".addslashes($tplset_to)."'")) ;
+    list($is_exist) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("tplfile")." WHERE tpl_tplset='".addslashes($tplset_to)."'"));
     if ($is_exist) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname);
     }
-    list($is_exist) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("tplset")." WHERE tplset_name='".addslashes($tplset_to)."'")) ;
+    list($is_exist) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("tplset")." WHERE tplset_name='".addslashes($tplset_to)."'"));
     if ($is_exist) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname);
     }
     // insert tplset table
-    $db->query("INSERT INTO ".$db->prefix("tplset")." SET tplset_name='".addslashes($tplset_to)."', tplset_desc='Created by tplsadmin', tplset_created=UNIX_TIMESTAMP()") ;
-    tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_module='$target_dirname4sql'") ;
-    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-    exit ;
+    $db->query("INSERT INTO ".$db->prefix("tplset")." SET tplset_name='".addslashes($tplset_to)."', tplset_desc='Created by tplsadmin', tplset_created=UNIX_TIMESTAMP()");
+    tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_module='$target_dirname4sql'");
+    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+    exit;
 }
 
 // DB to DB template copy (checked templates)
 if (is_array(@$_POST['copy_do'])) {
     foreach ($_POST['copy_do'] as $tplset_from_tmp => $val) {
-        if (! empty($val)) {
+        if (!empty($val)) {
             // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp) ;
+            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp);
             if (empty($_POST['copy_to'][$tplset_from]) || $_POST['copy_to'][$tplset_from] == $tplset_from) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname);
             }
             if (empty($_POST["{$tplset_from}_check"])) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
             }
-            $tplset_to = $myts->stripSlashesGPC($_POST['copy_to'][$tplset_from]) ;
+            $tplset_to = $myts->stripSlashesGPC($_POST['copy_to'][$tplset_from]);
             foreach ($_POST["{$tplset_from}_check"] as $tplfile_tmp => $val) {
                 if (empty($val)) {
-                    continue ;
+                    continue;
                 }
-                $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-                tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_file='".addslashes($tplfile)."'") ;
+                $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+                tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_file='".addslashes($tplfile)."'");
             }
-            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-            exit ;
+            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+            exit;
         }
     }
 }
 
 // File to DB template copy (checked templates)
-if (! empty($_POST['copyf2db_do'])) {
+if (!empty($_POST['copyf2db_do'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     if (empty($_POST['copyf2db_to'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname);
     }
     if (empty($_POST['basecheck'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
     }
-    $tplset_to = $myts->stripSlashesGPC($_POST['copyf2db_to']) ;
+    $tplset_to = $myts->stripSlashesGPC($_POST['copyf2db_to']);
     foreach ($_POST['basecheck'] as $tplfile_tmp => $val) {
         if (empty($val)) {
-            continue ;
+            continue;
         }
-        $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-        tplsadmin_copy_templates_f2db($tplset_to, "tpl_file='".addslashes($tplfile)."'") ;
+        $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+        tplsadmin_copy_templates_f2db($tplset_to, "tpl_file='".addslashes($tplfile)."'");
     }
-    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-    exit ;
+    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+    exit;
 }
 
 // DB template remove (checked templates)
 if (is_array(@$_POST['del_do'])) {
     foreach ($_POST['del_do'] as $tplset_from_tmp => $val) {
-        if (! empty($val)) {
+        if (!empty($val)) {
             // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp) ;
+            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp);
             if ($tplset_from == 'default' && $target_dirname != '_custom') {
-                tplsadmin_die(_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT, $target_dirname);
             }
             if (empty($_POST["{$tplset_from}_check"])) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
             }
 
-            require_once XOOPS_ROOT_PATH.'/class/template.php' ;
+            require_once XOOPS_ROOT_PATH.'/class/template.php';
             $tpl = new XoopsTpl();
             $tpl->force_compile = true;
 
             foreach ($_POST["{$tplset_from}_check"] as $tplfile_tmp => $val) {
                 if (empty($val)) {
-                    continue ;
+                    continue;
                 }
-                $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-                $result = $db->query("SELECT tpl_id FROM ".$db->prefix("tplfile")." WHERE tpl_tplset='".addslashes($tplset_from)."' AND tpl_file='".addslashes($tplfile)."'") ;
+                $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+                $result = $db->query("SELECT tpl_id FROM ".$db->prefix("tplfile")." WHERE tpl_tplset='".addslashes($tplset_from)."' AND tpl_file='".addslashes($tplfile)."'");
                 while (list($tpl_id) = $db->fetchRow($result)) {
-                    $tpl_id = intval($tpl_id) ;
-                    $db->query("DELETE FROM ".$db->prefix("tplfile")." WHERE tpl_id=$tpl_id") ;
-                    $db->query("DELETE FROM ".$db->prefix("tplsource")." WHERE tpl_id=$tpl_id") ;
+                    $tpl_id = intval($tpl_id);
+                    $db->query("DELETE FROM ".$db->prefix("tplfile")." WHERE tpl_id=$tpl_id");
+                    $db->query("DELETE FROM ".$db->prefix("tplsource")." WHERE tpl_id=$tpl_id");
                 }
         // remove templates_c
         $tpl->clear_cache('db:'.$tplfile);
                 $tpl->clear_compiled_tpl('db:'.$tplfile);
             }
-            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-            exit ;
+            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+            exit;
         }
     }
 }
@@ -234,60 +234,60 @@ 
 EOD;
 
 // get tplsets
-$tplset_handler =& xoops_gethandler('tplset') ;
-$tplsets = array_keys($tplset_handler->getList()) ;
-$sql = "SELECT distinct tpl_tplset FROM ".$db->prefix("tplfile")." ORDER BY tpl_tplset='default' DESC,tpl_tplset" ;
+$tplset_handler = & xoops_gethandler('tplset');
+$tplsets = array_keys($tplset_handler->getList());
+$sql = "SELECT distinct tpl_tplset FROM ".$db->prefix("tplfile")." ORDER BY tpl_tplset='default' DESC,tpl_tplset";
 $srs = $db->query($sql);
 while (list($tplset) = $db->fetchRow($srs)) {
-    if (! in_array($tplset, $tplsets)) {
-        $tplsets[] = $tplset ;
+    if (!in_array($tplset, $tplsets)) {
+        $tplsets[] = $tplset;
     }
 }
 
-$tplsets_th4disp = '' ;
-$tplset_options = "<option value=''>----</option>\n" ;
+$tplsets_th4disp = '';
+$tplset_options = "<option value=''>----</option>\n";
 foreach ($tplsets as $tplset) {
-    $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES) ;
+    $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
     $active = $th_attr = '';
     if ($tplset == $xoopsConfig['template_set']) {
         $th_attr = "class='active dbtplset_active'";
         $active = '<sup>*</sup>';
     }
-    $tplsets_th4disp .= "<th $th_attr><input type='checkbox' title='"._MYTPLSADMIN_TITLE_CHECKALL."' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'&&elements[i].name.indexOf('{$tplset4disp}_check')>=0){elements[i].checked=this.checked;}}}\" />{$active}DB-{$tplset4disp}</th>" ;
-    $tplset_options .= "<option value='$tplset4disp'>$tplset4disp</option>\n" ;
+    $tplsets_th4disp .= "<th $th_attr><input type='checkbox' title='"._MYTPLSADMIN_TITLE_CHECKALL."' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'&&elements[i].name.indexOf('{$tplset4disp}_check')>=0){elements[i].checked=this.checked;}}}\" />{$active}DB-{$tplset4disp}</th>";
+    $tplset_options .= "<option value='$tplset4disp'>$tplset4disp</option>\n";
 }
 
 // get tpl_file owned by the module
-$sql = "SELECT tpl_file,tpl_desc,tpl_type,COUNT(tpl_id) FROM ".$db->prefix("tplfile")." WHERE tpl_module='$target_dirname4sql' GROUP BY tpl_file ORDER BY tpl_type, tpl_file" ;
+$sql = "SELECT tpl_file,tpl_desc,tpl_type,COUNT(tpl_id) FROM ".$db->prefix("tplfile")." WHERE tpl_module='$target_dirname4sql' GROUP BY tpl_file ORDER BY tpl_type, tpl_file";
 $frs = $db->query($sql);
 
-xoops_cp_header() ;
+xoops_cp_header();
 
 // css 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();
 echo '<style scoped="scoped">';
-$tpl->display('db:altsys_inc_mytplsadmin.css') ;
+$tpl->display('db:altsys_inc_mytplsadmin.css');
 echo '</style>';
 
 // javascript
 echo $javascript;
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
 // breadcrumbs
-$breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+$breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
 if ($breadcrumbsObj->hasPaths()) {
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MI_ALTSYS_MENU_MYTPLSADMIN) ;
-    $breadcrumbsObj->appendPath('', $target_mname) ;
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MI_ALTSYS_MENU_MYTPLSADMIN);
+    $breadcrumbsObj->appendPath('', $target_mname);
 }
 
-echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MYTPLSADMIN_H3_MODULE." : $target_mname</h3>\n" ;
+echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MYTPLSADMIN_H3_MODULE." : $target_mname</h3>\n";
 
 // link to create a new custom template
 if ($target_dirname == '_custom') {
-    echo "<a href='index.php?mode=admin&lib=altsys&page=mytplsform&tpl_tplset=default'>"._MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE."</a>\n" ;
+    echo "<a href='index.php?mode=admin&lib=altsys&page=mytplsform&tpl_tplset=default'>"._MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE."</a>\n";
 }
 
 // beggining of table & form
@@ -300,14 +300,14 @@ 
 			<th>"._MYTPLSADMIN_TH_TYPE."</th>
 			<th><input type='checkbox' title="._MYTPLSADMIN_TITLE_CHECKALL." onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'&&elements[i].name.indexOf('basecheck')>=0){elements[i].checked=this.checked;}}}\" />"._MYTPLSADMIN_TH_FILE."</th>
 			$tplsets_th4disp
-		</tr>\n" ;
+		</tr>\n";
 
 // STYLE for distinguishing fingerprints
-$fingerprint_classes = array( '' , ' fingerprint1' , ' fingerprint2' , ' fingerprint3' , ' fingerprint4' , ' fingerprint5' , ' fingerprint6' , ' fingerprint7' ) ;
+$fingerprint_classes = array('', ' fingerprint1', ' fingerprint2', ' fingerprint3', ' fingerprint4', ' fingerprint5', ' fingerprint6', ' fingerprint7');
 
 // template ROWS
 while (list($tpl_file, $tpl_desc, $type, $count) = $db->fetchRow($frs)) {
-    $evenodd = @$evenodd == 'even' ? 'odd' : 'even' ;
+    $evenodd = @$evenodd == 'even' ? 'odd' : 'even';
     $fingerprints = array();
 
     // information about the template
@@ -319,45 +319,45 @@ 
 					<dd>".htmlspecialchars($tpl_desc, ENT_QUOTES)."</dd>
 				</dl>
 			</td>
-			<td class='$evenodd'>".$type."<br />(".$count.")</td>\n" ;
+			<td class='$evenodd'>".$type."<br />(".$count.")</td>\n";
 
     // the base file template column
-    $basefilepath = tplsadmin_get_basefilepath($target_dirname, $type, $tpl_file) ;
+    $basefilepath = tplsadmin_get_basefilepath($target_dirname, $type, $tpl_file);
 
     if (file_exists($basefilepath)) {
-        $fingerprint = tplsadmin_get_fingerprint(file($basefilepath)) ;
-        $fingerprints[ $fingerprint ] = '' ;
-        echo "<td class='$evenodd'>".formatTimestamp(filemtime($basefilepath), 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='basecheck[$tpl_file]' value='1' /></td>\n" ;
-        $fingerprint_class_count = 0 ;
+        $fingerprint = tplsadmin_get_fingerprint(file($basefilepath));
+        $fingerprints[$fingerprint] = '';
+        echo "<td class='$evenodd'>".formatTimestamp(filemtime($basefilepath), 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='basecheck[$tpl_file]' value='1' /></td>\n";
+        $fingerprint_class_count = 0;
     } else {
-        echo "<td class='$evenodd'><br /></td>" ;
-        $fingerprint_class_count = -1 ;
+        echo "<td class='$evenodd'><br /></td>";
+        $fingerprint_class_count = -1;
     }
 
     // db template columns
     foreach ($tplsets as $tplset) {
-        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES) ;
+        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
 
         // query for templates in db
-        $drs = $db->query("SELECT * FROM ".$db->prefix("tplfile")." f NATURAL LEFT JOIN ".$db->prefix("tplsource")." s WHERE tpl_file='".addslashes($tpl_file)."' AND tpl_tplset='".addslashes($tplset)."'") ;
-        $numrows = $db->getRowsNum($drs) ;
-        $tpl = $db->fetchArray($drs) ;
+        $drs = $db->query("SELECT * FROM ".$db->prefix("tplfile")." f NATURAL LEFT JOIN ".$db->prefix("tplsource")." s WHERE tpl_file='".addslashes($tpl_file)."' AND tpl_tplset='".addslashes($tplset)."'");
+        $numrows = $db->getRowsNum($drs);
+        $tpl = $db->fetchArray($drs);
         if (empty($tpl['tpl_id'])) {
-            echo "<td class='$evenodd'>($numrows)</td>\n" ;
+            echo "<td class='$evenodd'>($numrows)</td>\n";
         } else {
-            $fingerprint = tplsadmin_get_fingerprint(explode("\n", $tpl['tpl_source'])) ;
-            if (isset($fingerprints[ $fingerprint ])) {
-                $class = $fingerprints[ $fingerprint ] ;
+            $fingerprint = tplsadmin_get_fingerprint(explode("\n", $tpl['tpl_source']));
+            if (isset($fingerprints[$fingerprint])) {
+                $class = $fingerprints[$fingerprint];
             } else {
                 //$fingerprint_class_count ++ ;
-                $class = $fingerprint_classes[++$fingerprint_class_count] ;
-                $fingerprints[ $fingerprint ] = $class ;
+                $class = $fingerprint_classes[++$fingerprint_class_count];
+                $fingerprints[$fingerprint] = $class;
             }
-            echo "<td class='{$evenodd}{$class}'>".formatTimestamp($tpl['tpl_lastmodified'], 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='{$tplset4disp}_check[{$tpl_file}]' value='1' /> &nbsp; <a href='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES)."&amp;tpl_tplset=".htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES)."&amp;dirname=".htmlspecialchars($target_dirname, ENT_QUOTES)."'>"._EDIT."</a> ($numrows)</td>\n" ;
+            echo "<td class='{$evenodd}{$class}'>".formatTimestamp($tpl['tpl_lastmodified'], 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='{$tplset4disp}_check[{$tpl_file}]' value='1' /> &nbsp; <a href='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES)."&amp;tpl_tplset=".htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES)."&amp;dirname=".htmlspecialchars($target_dirname, ENT_QUOTES)."'>"._EDIT."</a> ($numrows)</td>\n";
         }
     }
 
-    echo "</tr>\n" ;
+    echo "</tr>\n";
 }
 
 // command submit ROW
@@ -384,21 +384,21 @@ 
 		</td>\n" ;
 
     foreach ($tplsets as $tplset) {
-        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES) ;
+        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
         echo "\t\t<td class='head'>
-			" . ($tplset == 'default' && $target_dirname != '_custom' ? "" : "<input name='del_do[{$tplset4disp}]' type='submit' value='"._DELETE."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", false);' /><br /><br />") . "
+			" . ($tplset == 'default' && $target_dirname != '_custom' ? "" : "<input name='del_do[{$tplset4disp}]' type='submit' value='"._DELETE."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", false);' /><br /><br />")."
 			"._MYTPLSADMIN_CAPTION_COPYTO.":
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
 			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
+		</td>\n";
     }
 
-echo "	</tr>\n" ;
+echo "	</tr>\n";
 
 
-echo "</table></form>" ;
+echo "</table></form>";
 // end of table & form
 
-xoops_cp_footer() ;
+xoops_cp_footer();

xoops_trust_path/libs/altsys/mypreferences.php

Spacing +54 added lines, -54 removed lines

@@ -5,64 +5,64 @@ 
 //                     GIJOE <http://www.peak.ne.jp/>                        //
 // ------------------------------------------------------------------------- //
 
-require_once dirname(__FILE__).'/class/AltsysBreadcrumbs.class.php' ;
-include_once dirname(__FILE__).'/include/gtickets.php' ;
-include_once dirname(__FILE__).'/include/altsys_functions.php' ;
+require_once dirname(__FILE__).'/class/AltsysBreadcrumbs.class.php';
+include_once dirname(__FILE__).'/include/gtickets.php';
+include_once dirname(__FILE__).'/include/altsys_functions.php';
 
 // check access right (needs module_admin of this module)
-if (! is_object($xoopsUser) || ! is_object($xoopsModule) || ! $xoopsUser->isAdmin($xoopsModule->mid())) {
-    die('Access Denied') ;
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
+    die('Access Denied');
 }
 
 
 // initials
-$db =& XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mypreferences') ;
+altsys_include_language_file('mypreferences');
 
 
-$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']) ;
+$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']);
 
 if ($op == 'showmod') {
-    $config_handler =& xoops_gethandler('config');
-    $mod = $xoopsModule->mid() ;
-    $config =& $config_handler->getConfigs(new Criteria('conf_modid', $mod));
+    $config_handler = & xoops_gethandler('config');
+    $mod = $xoopsModule->mid();
+    $config = & $config_handler->getConfigs(new Criteria('conf_modid', $mod));
     $count = count($config);
     if ($count < 1) {
-        die('no configs') ;
+        die('no configs');
     }
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $form = new XoopsThemeForm(_MD_A_MYPREFERENCES_FORMTITLE, 'pref_form', 'index.php?mode=admin&lib=altsys&page=mypreferences&op=save');
-    $module_handler =& xoops_gethandler('module');
-    $module =& $module_handler->get($mod);
+    $module_handler = & xoops_gethandler('module');
+    $module = & $module_handler->get($mod);
 
     // language
-    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ;
+    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
 
     // load modinfo.php if necessary (judged by a specific constant is defined)
-    if (! defined('_MYMENU_CONSTANT_IN_MODINFO') || ! defined(_MYMENU_CONSTANT_IN_MODINFO)) {
+    if (!defined('_MYMENU_CONSTANT_IN_MODINFO') || !defined(_MYMENU_CONSTANT_IN_MODINFO)) {
         if (file_exists("$mydirpath/language/$language/modinfo.php")) {
             // user customized language file
-            include_once "$mydirpath/language/$language/modinfo.php" ;
+            include_once "$mydirpath/language/$language/modinfo.php";
         } elseif (file_exists("$mytrustdirpath/language/$language/modinfo.php")) {
             // default language file
-            include_once "$mytrustdirpath/language/$language/modinfo.php" ;
+            include_once "$mytrustdirpath/language/$language/modinfo.php";
         } else {
             // fallback english
-            include_once "$mytrustdirpath/language/english/modinfo.php" ;
+            include_once "$mytrustdirpath/language/english/modinfo.php";
         }
     }
 
     // if has comments feature, need comment lang file
-    if ($module->getVar('hascomments') == 1 && ! defined('_CM_TITLE')) {
+    if ($module->getVar('hascomments') == 1 && !defined('_CM_TITLE')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
     }
 
     // RMV-NOTIFY
     // if has notification feature, need notification lang file
-    if ($module->getVar('hasnotification') == 1 && ! defined('_NOT_NOTIFICATIONOPTIONS')) {
+    if ($module->getVar('hasnotification') == 1 && !defined('_NOT_NOTIFICATIONOPTIONS')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
     }
 
@@ -72,12 +72,12 @@ 
         //	$form->addElement(new XoopsFormHidden('redirect', XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')));
     // }
     for ($i = 0; $i < $count; $i++) {
-        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt')? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
+        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt') ? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
         $title4tray = (!defined($config[$i]->getVar('conf_desc')) || constant($config[$i]->getVar('conf_desc')) == '') ? (constant($config[$i]->getVar('conf_title')).$title_icon) : (constant($config[$i]->getVar('conf_title')).$title_icon.'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('conf_desc')).'</span>'); // GIJ
-        $title = '' ; // GIJ
+        $title = ''; // GIJ
         switch ($config[$i]->getVar('conf_formtype')) {
         case 'textarea':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
             if ($config[$i]->getVar('conf_valuetype') == 'array') {
                 // this is exceptional.. only when value type is arrayneed a smarter way for this
                 $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
@@ -94,7 +94,7 @@ 
                 $ele = new XoopsFormRadio($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
                 $addBr = '<br />';
             }
-            $options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+            $options = & $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
             $opcount = count($options);
             for ($j = 0; $j < $opcount; $j++) {
                 $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
@@ -111,7 +111,7 @@ 
                 $ele = new XoopsFormCheckBox($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
                 $addBr = '<br />';
             }
-            $options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+            $options = & $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
             $opcount = count($options);
             for ($j = 0; $j < $opcount; $j++) {
                 $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
@@ -145,37 +145,37 @@ 
             $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
             break;
         case 'password':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
             $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
             break;
         case 'textbox':
         default:
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
             $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
             break;
         }
         $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
-        $ele_tray = new XoopsFormElementTray($title4tray, '') ;
+        $ele_tray = new XoopsFormElementTray($title4tray, '');
         $ele_tray->addElement($ele);
         $ele_tray->addElement($hidden);
-        $form->addElement($ele_tray) ;
+        $form->addElement($ele_tray);
         unset($ele_tray);
         unset($ele);
         unset($hidden);
     }
     // $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences') ;
+    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences');
     $button_tray->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
-    $form->addElement($button_tray) ;
+    $form->addElement($button_tray);
     xoops_cp_header();
 
     // GIJ patch start
-    altsys_include_mymenu() ;
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+    altsys_include_mymenu();
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
     if ($breadcrumbsObj->hasPaths()) {
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES) ;
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES);
     }
-    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').' &nbsp; '._PREFERENCES."</h3>\n" ;
+    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').' &nbsp; '._PREFERENCES."</h3>\n";
     // GIJ patch end
 
     $form->display();
@@ -187,10 +187,10 @@ 
     //if ( !admin_refcheck("/modules/$admin_mydirname/admin/") ) {
     //	exit('Invalid referer');
     //}
-    if (! $xoopsGTicket->check(true, 'mypreferences')) {
+    if (!$xoopsGTicket->check(true, 'mypreferences')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
-    require_once XOOPS_ROOT_PATH.'/class/template.php' ;
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
 //HACK by domifara for new XOOPS and XCL etc.
 //old xoops
@@ -210,8 +210,8 @@ 
     $lang_updated = false;
     if ($count > 0) {
         for ($i = 0; $i < $count; $i++) {
-            $config =& $config_handler->getConfig($conf_ids[$i]);
-            $new_value =& $_POST[$config->getVar('conf_name')];
+            $config = & $config_handler->getConfig($conf_ids[$i]);
+            $new_value = & $_POST[$config->getVar('conf_name')];
             if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {
                 // if language has been changed
                 if (!$lang_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'language') {
@@ -223,7 +223,7 @@ 
 
                 // if default theme has been changed
                 if (!$theme_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'theme_set') {
-                    $member_handler =& xoops_gethandler('member');
+                    $member_handler = & xoops_gethandler('member');
                     $member_handler->updateUsersByField('theme', $_POST[$config->getVar('conf_name')]);
                     $theme_updated = true;
                 }
@@ -239,14 +239,14 @@ 
 
                         // generate compiled files for the new theme
                         // block files only for now..
-                        $tplfile_handler =& xoops_gethandler('tplfile');
-                        $dtemplates =& $tplfile_handler->find('default', 'block');
+                        $tplfile_handler = & xoops_gethandler('tplfile');
+                        $dtemplates = & $tplfile_handler->find('default', 'block');
                         $dcount = count($dtemplates);
 
                         // need to do this to pass to xoops_template_touch function
                         $GLOBALS['xoopsConfig']['template_set'] = $newtplset;
 
-                        altsys_clear_templates_c() ;
+                        altsys_clear_templates_c();
 
 /*						for ($i = 0; $i < $dcount; $i++) {
                             $found =& $tplfile_handler->find($newtplset, 'block', $dtemplates[$i]->getVar('tpl_refid'), null);
@@ -260,8 +260,8 @@ 
                         }*/
 
                         // generate image cache files from image binary data, save them under cache/
-                        $image_handler =& xoops_gethandler('imagesetimg');
-                        $imagefiles =& $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
+                        $image_handler = & xoops_gethandler('imagesetimg');
+                        $imagefiles = & $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
                         foreach (array_keys($imagefiles) as $i) {
                             if (!$fp = fopen(XOOPS_CACHE_PATH.'/'.$newtplset.'_'.$imagefiles[$i]->getVar('imgsetimg_file'), 'wb')) {
                             } else {
@@ -274,12 +274,12 @@ 
                 }
 
                 // add read permission for the start module to all groups
-                if (!$startmod_updated    && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
-                    $member_handler =& xoops_gethandler('member');
-                    $groups =& $member_handler->getGroupList();
-                    $moduleperm_handler =& xoops_gethandler('groupperm');
-                    $module_handler =& xoops_gethandler('module');
-                    $module =& $module_handler->getByDirname($new_value);
+                if (!$startmod_updated && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
+                    $member_handler = & xoops_gethandler('member');
+                    $groups = & $member_handler->getGroupList();
+                    $moduleperm_handler = & xoops_gethandler('groupperm');
+                    $module_handler = & xoops_gethandler('module');
+                    $module = & $module_handler->getByDirname($new_value);
                     foreach ($groups as $groupid => $groupname) {
                         if (!$moduleperm_handler->checkRight('module_read', $module->getVar('mid'), $groupid)) {
                             $moduleperm_handler->addRight('module_read', $module->getVar('mid'), $groupid);
@@ -295,5 +295,5 @@ 
         }
     }
 
-    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED) ;
+    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED);
 }

xoops_trust_path/libs/altsys/get_templates.php

Spacing +20 added lines, -20 removed lines

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

xoops_trust_path/libs/altsys/include/altsys_functions.php

Spacing +57 added lines, -57 removed lines

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

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

Spacing +52 added lines, -52 removed lines

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