mambax7 / altsys

xoops_trust_path/libs/altsys/mymenu.php

Spacing +24 added lines, -24 removed lines

@@ -2,30 +2,30 @@ 
 
 /********* mymenu only for ALTSYS ********/
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 // Skip for ORETEKI XOOPS
 if (defined('XOOPS_ORETEKI')) {
-    return ;
+    return;
 }
 
-if (! isset($module) || ! is_object($module)) {
-    $module = $xoopsModule ;
-} elseif (! is_object($xoopsModule)) {
-    die('$xoopsModule is not set')  ;
+if (!isset($module) || !is_object($module)) {
+    $module = $xoopsModule;
+} elseif (!is_object($xoopsModule)) {
+    die('$xoopsModule is not set');
 }
 
 // language files (modinfo.php)
-altsys_include_language_file('modinfo') ;
+altsys_include_language_file('modinfo');
 
-include __DIR__.'/admin_menu.php' ;
+include __DIR__.'/admin_menu.php';
 
-$adminmenu = array_merge($adminmenu, $adminmenu4altsys) ;
+$adminmenu = array_merge($adminmenu, $adminmenu4altsys);
 
-$mymenu_uri = empty($mymenu_fake_uri) ? $_SERVER['REQUEST_URI'] : $mymenu_fake_uri ;
-$mymenu_link = substr(strstr($mymenu_uri, '/admin/'), 1) ;
+$mymenu_uri = empty($mymenu_fake_uri) ? $_SERVER['REQUEST_URI'] : $mymenu_fake_uri;
+$mymenu_link = substr(strstr($mymenu_uri, '/admin/'), 1);
 
 // xoops_breadcrumbs
 // $GLOBALS['altsysXoopsBreadcrumbs'] = array( array( 'url' => XOOPS_URL.'/modules/altsys/admin/index.php' , 'name' => $xoopsModule->getVar('name') ) ) ;
@@ -33,19 +33,19 @@ 
 // highlight
 foreach (array_keys($adminmenu) as $i) {
     if ($mymenu_link == $adminmenu[$i]['link']) {
-        $adminmenu[$i]['selected'] = true ;
-        $adminmenu_hilighted = true ;
+        $adminmenu[$i]['selected'] = true;
+        $adminmenu_hilighted = true;
 //		$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'url' => XOOPS_URL."/modules/altsys/".htmlspecialchars($adminmenu[$i]['link'],ENT_QUOTES) , 'name' => htmlspecialchars( $adminmenu[$i]['title'] , ENT_QUOTES ) ) ;
     } else {
-        $adminmenu[$i]['selected'] = false ;
+        $adminmenu[$i]['selected'] = false;
     }
 }
 if (empty($adminmenu_hilighted)) {
     foreach (array_keys($adminmenu) as $i) {
         if (stristr($mymenu_uri, $adminmenu[$i]['link'])) {
-            $adminmenu[$i]['selected'] = true ;
+            $adminmenu[$i]['selected'] = true;
 //			$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'url' => XOOPS_URL."/modules/altsys/".htmlspecialchars($adminmenu[$i]['link'],ENT_QUOTES) , 'name' => htmlspecialchars( $adminmenu[$i]['title'] , ENT_QUOTES ) ) ;
-            break ;
+            break;
         }
     }
 }
@@ -53,20 +53,20 @@ 
 // link conversion from relative to absolute
 foreach (array_keys($adminmenu) as $i) {
     if (stristr($adminmenu[$i]['link'], XOOPS_URL) === false) {
-        $adminmenu[$i]['link'] = XOOPS_URL."/modules/$mydirname/" . $adminmenu[$i]['link'] ;
+        $adminmenu[$i]['link'] = XOOPS_URL."/modules/$mydirname/".$adminmenu[$i]['link'];
     }
 }
 
 // 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
-)) ;
-$tpl->display('db:altsys_inc_mymenu.html') ;
+));
+$tpl->display('db:altsys_inc_mymenu.html');
 
 // submenu
-$page = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['page']) ;
+$page = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['page']);
 if (file_exists(__DIR__.'/mymenusub/'.$page.'.php')) {
-    include __DIR__.'/mymenusub/'.$page.'.php' ;
+    include __DIR__.'/mymenusub/'.$page.'.php';
 }

xoops_trust_path/libs/altsys/mylangadmin.php

Indentation +1 added lines, -1 removed lines

@@ -302,7 +302,7 @@
     'use_my_language' => strlen($langman->my_language) > 0,
     'mylang_file_name' => htmlspecialchars($mylang_unique_path, ENT_QUOTES),
     'cache_file_name' => htmlspecialchars($cache_file_name, ENT_QUOTES),
-     'cache_file_mtime' => (int)$cache_file_mtime,
+        'cache_file_mtime' => (int)$cache_file_mtime,
     'timezone_offset' => xoops_getUserTimestamp(0),
     'notice' => $notice4disp,
     'already_read' => $already_read,

Spacing +114 added lines, -114 removed lines

@@ -5,170 +5,170 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/lang_functions.php' ;
-include_once __DIR__.'/class/D3LanguageManager.class.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/lang_functions.php';
+include_once __DIR__.'/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() ;
+(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) ;
+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/include/x20_keepblockoptions.inc.php

Spacing +18 added lines, -18 removed lines

@@ -3,9 +3,9 @@ 
 
 // Keep Block option values when update (by nobunobu) for XOOPS 2.0.x
 global $xoopsDB;
-$query = 'SELECT mid FROM ' . $xoopsDB->prefix('modules') . " WHERE dirname='" . $modversion['dirname'] . "' ";
+$query = 'SELECT mid FROM '.$xoopsDB->prefix('modules')." WHERE dirname='".$modversion['dirname']."' ";
 $result = $xoopsDB->query($query);
-$record= $xoopsDB->fetcharray($result);
+$record = $xoopsDB->fetcharray($result);
 if ($record) {
     $mid = $record['mid'];
     $count = count($modversion['blocks']);
@@ -53,40 +53,40 @@ 
         }
     } */
     
-    $sql = 'SELECT * FROM ' . $xoopsDB->prefix('newblocks') . ' WHERE mid=' . $mid . " AND block_type <>'D' AND func_num > $count";
+    $sql = 'SELECT * FROM '.$xoopsDB->prefix('newblocks').' WHERE mid='.$mid." AND block_type <>'D' AND func_num > $count";
     $fresult = $xoopsDB->query($sql);
     while ($fblock = $xoopsDB->fetchArray($fresult)) {
-        $local_msgs[] = 'Non Defined Block <b>' . $fblock['name'] . '</b> will be deleted';
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('newblocks') . " WHERE bid='" . $fblock['bid'] . "'";
+        $local_msgs[] = 'Non Defined Block <b>'.$fblock['name'].'</b> will be deleted';
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('newblocks')." WHERE bid='".$fblock['bid']."'";
         $iret = $xoopsDB->query($sql);
     }
     
-    for ($i = 1 ; $i <= $count ; $i++) {
-        $sql = 'SELECT name,options FROM ' . $xoopsDB->prefix('newblocks') . ' WHERE mid=' . $mid . ' AND func_num=' . $i . " AND show_func='" . addslashes($modversion['blocks'][$i]['show_func']) . "' AND func_file='" . addslashes($modversion['blocks'][$i]['file']) . "'";
+    for ($i = 1; $i <= $count; $i++) {
+        $sql = 'SELECT name,options FROM '.$xoopsDB->prefix('newblocks').' WHERE mid='.$mid.' AND func_num='.$i." AND show_func='".addslashes($modversion['blocks'][$i]['show_func'])."' AND func_file='".addslashes($modversion['blocks'][$i]['file'])."'";
         $fresult = $xoopsDB->query($sql);
         $fblock = $xoopsDB->fetchArray($fresult);
         if (isset($fblock['options'])) {
-            $old_vals=explode('|', $fblock['options']);
-            $def_vals=explode('|', $modversion['blocks'][$i]['options']);
+            $old_vals = explode('|', $fblock['options']);
+            $def_vals = explode('|', $modversion['blocks'][$i]['options']);
             if (count($old_vals) == count($def_vals)) {
                 $modversion['blocks'][$i]['options'] = $fblock['options'];
-                $local_msgs[] = "Option's values of the block <b>".$fblock['name'] . '</b> will be kept. (value = <b>' . $fblock['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be kept. (value = <b>'.$fblock['options'].'</b>)';
             } elseif (count($old_vals) < count($def_vals)) {
-                for ($j=0; $j < count($old_vals); $j++) {
+                for ($j = 0; $j < count($old_vals); $j++) {
                     $def_vals[$j] = $old_vals[$j];
                 }
                 $modversion['blocks'][$i]['options'] = implode('|', $def_vals);
-                $local_msgs[] = "Option's values of the block <b>".$fblock['name'] . '</b> will be kept and new option(s) are added. (value = <b>' . $modversion['blocks'][$i]['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be kept and new option(s) are added. (value = <b>'.$modversion['blocks'][$i]['options'].'</b>)';
             } else {
-                $local_msgs[] = "Option's values of the block <b>".$fblock['name'] . '</b> will be reset to the default, because of some decrease of options. (value = <b>'
-                                . $modversion['blocks'][$i]['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be reset to the default, because of some decrease of options. (value = <b>'
+                                . $modversion['blocks'][$i]['options'].'</b>)';
             }
         }
     }
 }
 
-global $msgs , $myblocksadmin_parsed_updateblock ;
-if (! empty($msgs) && ! empty($local_msgs) && empty($myblocksadmin_parsed_updateblock)) {
-    $msgs = array_merge($msgs, $local_msgs) ;
-    $myblocksadmin_parsed_updateblock = true ;
+global $msgs, $myblocksadmin_parsed_updateblock;
+if (!empty($msgs) && !empty($local_msgs) && empty($myblocksadmin_parsed_updateblock)) {
+    $msgs = array_merge($msgs, $local_msgs);
+    $myblocksadmin_parsed_updateblock = true;
 }

xoops_trust_path/libs/altsys/include/tpls_functions.php

Indentation +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
     // get tplfile and tplsource
     $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile') . ' NATURAL LEFT JOIN '
-                         . $db->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND ($whr_append)") ;
+                            . $db->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND ($whr_append)") ;
 
     while ($row = $db->fetchArray($result)) {
         $tpl_source = array_pop($row) ;

Spacing +61 added lines, -61 removed lines

@@ -1,41 +1,41 @@ 
 <?php
 
 include_once XOOPS_ROOT_PATH.'/class/template.php';
-include_once __DIR__.'/altsys_functions.php' ;
+include_once __DIR__.'/altsys_functions.php';
 
 function tplsadmin_import_data($tplset, $tpl_file, $tpl_source, $lastmodified = 0)
 {
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
 
     // check the file is valid template
-    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'")) ;
-    if (! $count) {
-        return false ;
+    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'"));
+    if (!$count) {
+        return false;
     }
 
     // check the template exists in the tplset
     if ($tplset != 'default') {
-        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'")) ;
+        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'"));
         if ($count <= 0) {
             // copy from 'default' to the tplset
-            $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'") ;
+            $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'");
             while ($row = $db->fetchArray($result)) {
-                $db->queryF('INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_module='" . addslashes($row['tpl_module']) . "',tpl_tplset='" . addslashes($tplset) . "',tpl_file='" . addslashes($tpl_file) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_type='" . addslashes($row['tpl_type']) . "'") ;
-                $tpl_id = $db->getInsertId() ;
-                $db->queryF('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source=''") ;
+                $db->queryF('INSERT INTO '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_module='".addslashes($row['tpl_module'])."',tpl_tplset='".addslashes($tplset)."',tpl_file='".addslashes($tpl_file)."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_type='".addslashes($row['tpl_type'])."'");
+                $tpl_id = $db->getInsertId();
+                $db->queryF('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source=''");
             }
         }
     }
 
     // UPDATE just tpl_lastmodified and tpl_source
-    $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'") ;
+    $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'");
     while (list($tpl_id) = $db->fetchRow($drs)) {
-        $db->queryF('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'") ;
-        $db->queryF('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-        altsys_template_touch($tpl_id) ;
+        $db->queryF('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'");
+        $db->queryF('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+        altsys_template_touch($tpl_id);
     }
 
-    return true ;
+    return true;
 }
 
 
@@ -43,46 +43,46 @@ 
 
 function tplsadmin_get_fingerprint($lines)
 {
-    $str = '' ;
+    $str = '';
     foreach ($lines as $line) {
         if (trim($line)) {
-            $str .= md5(trim($line)) ;
+            $str .= md5(trim($line));
         }
     }
-    return md5($str) ;
+    return md5($str);
 }
 
 
 
 function tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, $whr_append = '1')
 {
-    global $db ;
+    global $db;
 
     // get tplfile and tplsource
-    $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile') . ' NATURAL LEFT JOIN '
-                         . $db->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND ($whr_append)") ;
+    $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile').' NATURAL LEFT JOIN '
+                         . $db->prefix('tplsource')." WHERE tpl_tplset='".addslashes($tplset_from)."' AND ($whr_append)");
 
     while ($row = $db->fetchArray($result)) {
-        $tpl_source = array_pop($row) ;
+        $tpl_source = array_pop($row);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'") ;
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
-        if (! $db->getRowsNum($drs)) {
+        if (!$db->getRowsNum($drs)) {
             // INSERT mode
-            $sql = 'INSERT INTO ' . $db->prefix('tplfile') . ' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
+            $sql = 'INSERT INTO '.$db->prefix('tplfile').' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
             foreach ($row as $colval) {
-                $sql .= "'".addslashes($colval)."'," ;
+                $sql .= "'".addslashes($colval)."',";
             }
-            $db->query(substr($sql, 0, -1) . ')') ;
-            $tpl_id = $db->getInsertId() ;
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'") ;
-            altsys_template_touch($tpl_id) ;
+            $db->query(substr($sql, 0, -1).')');
+            $tpl_id = $db->getInsertId();
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
+            altsys_template_touch($tpl_id);
         } else {
             while (list($tpl_id) = $db->fetchRow($drs)) {
                 // UPDATE mode
-                $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_lastmodified='" . addslashes($row['tpl_lastmodified']) . "',tpl_lastimported='" . addslashes($row['tpl_lastimported']) . "',tpl_type='" . addslashes($row['tpl_type']) . "' WHERE tpl_id='$tpl_id'") ;
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-                altsys_template_touch($tpl_id) ;
+                $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_lastmodified='".addslashes($row['tpl_lastmodified'])."',tpl_lastimported='".addslashes($row['tpl_lastimported'])."',tpl_type='".addslashes($row['tpl_type'])."' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+                altsys_template_touch($tpl_id);
             }
         }
     }
@@ -92,31 +92,31 @@ 
 
 function tplsadmin_copy_templates_f2db($tplset_to, $whr_append = '1')
 {
-    global $db ;
+    global $db;
 
     // get tplsource
-    $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . "  WHERE tpl_tplset='default' AND ($whr_append)") ;
+    $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')."  WHERE tpl_tplset='default' AND ($whr_append)");
 
     while ($row = $db->fetchArray($result)) {
-        $basefilepath = tplsadmin_get_basefilepath($row['tpl_module'], $row['tpl_type'], $row['tpl_file']) ;
-        $tpl_source = rtrim(implode('', file($basefilepath))) ;
-        $lastmodified = filemtime($basefilepath) ;
+        $basefilepath = tplsadmin_get_basefilepath($row['tpl_module'], $row['tpl_type'], $row['tpl_file']);
+        $tpl_source = rtrim(implode('', file($basefilepath)));
+        $lastmodified = filemtime($basefilepath);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'") ;
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
-        if (! $db->getRowsNum($drs)) {
+        if (!$db->getRowsNum($drs)) {
             // INSERT mode
-            $sql = 'INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_lastmodified='" . addslashes($lastmodified) . "',tpl_type='" . addslashes($row['tpl_type']) . "',tpl_tplset='" . addslashes($tplset_to) . "',tpl_file='" . addslashes($row['tpl_file']) . "',tpl_module='" . addslashes($row['tpl_module']) . "'" ;
-            $db->query($sql) ;
-            $tpl_id = $db->getInsertId() ;
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'") ;
-            altsys_template_touch($tpl_id) ;
+            $sql = 'INSERT INTO '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_lastmodified='".addslashes($lastmodified)."',tpl_type='".addslashes($row['tpl_type'])."',tpl_tplset='".addslashes($tplset_to)."',tpl_file='".addslashes($row['tpl_file'])."',tpl_module='".addslashes($row['tpl_module'])."'";
+            $db->query($sql);
+            $tpl_id = $db->getInsertId();
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
+            altsys_template_touch($tpl_id);
         } else {
             while (list($tpl_id) = $db->fetchRow($drs)) {
                 // UPDATE mode
-                $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "' WHERE tpl_id='$tpl_id'") ;
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-                altsys_template_touch($tpl_id) ;
+                $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+                altsys_template_touch($tpl_id);
             }
         }
     }
@@ -127,7 +127,7 @@ 
 function tplsadmin_get_basefilepath($dirname, $type, $tpl_file)
 {
     // module instance
-    $path = $basefilepath = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.($type=='block'?'blocks/':'').$tpl_file ;
+    $path = $basefilepath = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.($type == 'block' ? 'blocks/' : '').$tpl_file;
 
     if (is_callable('Legacy_Utils::getTrustDirnameByDirname')) {
         $mytrustdirname = Legacy_Utils::getTrustDirnameByDirname($dirname);
@@ -137,33 +137,33 @@ 
 
     if (defined('ALTSYS_TPLSADMIN_BASEPATH')) {
         // Special hook
-        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.substr($tpl_file, strlen($dirname) + 1) ;
-    } elseif ($mytrustdirname || @include XOOPS_ROOT_PATH . '/modules/' . $dirname . '/mytrustdirname.php') {
+        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.substr($tpl_file, strlen($dirname) + 1);
+    } elseif ($mytrustdirname || @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/mytrustdirname.php') {
         // D3 module base
-        if (! empty($mytrustdirname)) {
-            $mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/' ;
+        if (!empty($mytrustdirname)) {
+            $mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/';
 
-            $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type=='block'?'blocks/':'').substr($tpl_file, strlen($dirname) + 1) ;
+            $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type == 'block' ? 'blocks/' : '').substr($tpl_file, strlen($dirname) + 1);
             //new for xcck etc.other trust_module
-            if (! file_exists($path)) {
-                $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type=='block'?'blocks/':'').$tpl_file ;
-                if (! file_exists($path)) {
+            if (!file_exists($path)) {
+                $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type == 'block' ? 'blocks/' : '').$tpl_file;
+                if (!file_exists($path)) {
                     $path = $basefilepath;
                 }
             }
         }
     }
 
-    return $path ;
+    return $path;
 }
 
 
 function tplsadmin_die($msg, $target_dirname = '', $wait = 2)
 {
     if (strtolower($_SERVER['REQUEST_METHOD']) === 'post') {
-        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, $wait, $msg) ;
-        exit ;
+        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, $wait, $msg);
+        exit;
     } else {
-        die($msg) ;
+        die($msg);
     }
 }

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

Spacing +11 added lines, -11 removed lines

@@ -2,29 +2,29 @@
 
 // render admin in theme.html
 if (is_object($xoopsUser)) {
-    $xoops_subpath = substr($_SERVER['REQUEST_URI'], strpos(strrev(XOOPS_URL), strrev($_SERVER['HTTP_HOST']))) ;
+    $xoops_subpath = substr($_SERVER['REQUEST_URI'], strpos(strrev(XOOPS_URL), strrev($_SERVER['HTTP_HOST'])));
     if (preg_match('#(^/admin.php|^/modules/system/|^/modules/[a-zA-Z0-9_.-]+/admin/)#', $xoops_subpath)) {
         // The request looks like admin
-        require_once __DIR__.'/altsys_functions.php' ;
-        if (! empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
+        require_once __DIR__.'/altsys_functions.php';
+        if (!empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
             // configs OK
-            require_once __DIR__.'/admin_in_theme_functions.php' ;
+            require_once __DIR__.'/admin_in_theme_functions.php';
 
             // for security with register_globals=1
-            unset($GLOBALS['altsysAdminPageTitle'], /* $GLOBALS['altsysXoopsBreadcrumbs'] ,*/ $GLOBALS['xoops_admin_contents']) ;
+            unset($GLOBALS['altsysAdminPageTitle'], /* $GLOBALS['altsysXoopsBreadcrumbs'] ,*/ $GLOBALS['xoops_admin_contents']);
 
             // disable error handler without XOOPS 2.0.14/15/16
-            if (! (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array( 1, 2 )))) {
-                restore_error_handler() ;
+            if (!(is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array(1, 2)))) {
+                restore_error_handler();
             }
 
             // to prepend Notice with 2.0.14/15/16 with PHP4
-            if (! defined('E_STRICT')) {
-                define('E_STRICT', 2048) ;
+            if (!defined('E_STRICT')) {
+                define('E_STRICT', 2048);
             }
 
-            register_shutdown_function('altsys_admin_in_theme_in_last') ;
-            ob_start('altsys_admin_in_theme') ;
+            register_shutdown_function('altsys_admin_in_theme_in_last');
+            ob_start('altsys_admin_in_theme');
         }
     }
 }

xoops_trust_path/libs/altsys/include/admin_in_theme_functions.php

Spacing +44 added lines, -44 removed lines

@@ -2,94 +2,94 @@ 
 
 function altsys_admin_in_theme($s)
 {
-    global $xoops_admin_contents ;
+    global $xoops_admin_contents;
 
-    $xoops_admin_contents = '' ;
+    $xoops_admin_contents = '';
 
     if (defined('ALTSYS_DONT_USE_ADMIN_IN_THEME')) {
-        return $s ;
+        return $s;
     }
 
     // check whether cp_functions.php is loaded
-    if (! defined('XOOPS_CPFUNC_LOADED')) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+    if (!defined('XOOPS_CPFUNC_LOADED')) {
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
     // redirect
     if (strstr($s, '<meta http-equiv="Refresh" ')) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
     // outputs before cp_header()
-    @list($former_outputs, $tmp_s) = explode('<!DOCTYPE', $s, 2) ;
+    @list($former_outputs, $tmp_s) = explode('<!DOCTYPE', $s, 2);
     if (empty($tmp_s)) {
-        $tmp_s = $s ;
+        $tmp_s = $s;
     }
 
-    @list(, $tmp_s) = explode("<div class='content'>", $tmp_s, 2) ;
+    @list(, $tmp_s) = explode("<div class='content'>", $tmp_s, 2);
     if (empty($tmp_s)) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
-    list($tmp_s, $tmp_after) = explode("<td width='1%' background='".XOOPS_URL."/modules/system/images/bg_content.gif'>", $tmp_s) ;
+    list($tmp_s, $tmp_after) = explode("<td width='1%' background='".XOOPS_URL."/modules/system/images/bg_content.gif'>", $tmp_s);
     if (empty($tmp_after)) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
-    $xoops_admin_contents = $former_outputs . substr(strrev(strstr(strrev($tmp_s), strrev('</div>'))), 0, -6) ;
+    $xoops_admin_contents = $former_outputs.substr(strrev(strstr(strrev($tmp_s), strrev('</div>'))), 0, -6);
 
-    return '' ;
+    return '';
 }
 
 
 function altsys_admin_in_theme_in_last($contents = null)
 {
-    global $xoops_admin_contents , $xoopsConfig , $xoopsModule , $xoopsUser , $xoopsUserIsAdmin , $xoopsLogger , $altsysModuleConfig , $altsysModuleId ;
+    global $xoops_admin_contents, $xoopsConfig, $xoopsModule, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger, $altsysModuleConfig, $altsysModuleId;
 
-    if (! isset($contents)) {
+    if (!isset($contents)) {
         while (ob_get_level()) {
-            ob_end_flush() ;
+            ob_end_flush();
         }
     } else {
-        $xoops_admin_contents = $contents ;
+        $xoops_admin_contents = $contents;
     }
 
-    if (! isset($xoops_admin_contents)) {
-        return ;
+    if (!isset($xoops_admin_contents)) {
+        return;
     }
     if (defined('ALTSYS_DONT_USE_ADMIN_IN_THEME')) {
-        return ;
+        return;
     }
 
-    if (! is_object($xoopsUser)) {
-        exit ;
+    if (!is_object($xoopsUser)) {
+        exit;
     }
 
     // language files
     if (file_exists(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php')) {
-        include_once dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php' ;
+        include_once dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php';
     } else {
-        include_once dirname(__DIR__).'/language/english/admin_in_theme.php' ;
+        include_once dirname(__DIR__).'/language/english/admin_in_theme.php';
     }
 
     // set the theme
-    $xoopsConfig['theme_set'] = $altsysModuleConfig['admin_in_theme'] ;
+    $xoopsConfig['theme_set'] = $altsysModuleConfig['admin_in_theme'];
 
     // language files under the theme
-    $original_error_level = error_reporting() ;
-    error_reporting($original_error_level & ~ E_NOTICE) ;
+    $original_error_level = error_reporting();
+    error_reporting($original_error_level & ~ E_NOTICE);
     if (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php')) {
-        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php' ;
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php';
     } elseif (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php')) {
-        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php' ;
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php';
     }
-    error_reporting($original_error_level) ;
+    error_reporting($original_error_level);
 
-    include __DIR__.'/admin_in_theme_header.inc.php' ;
+    include __DIR__.'/admin_in_theme_header.inc.php';
 
 /*	// include adminmenu
     include XOOPS_CACHE_PATH.'/adminmenu.php' ;
@@ -125,11 +125,11 @@ 
         function shutdown() {'.implode("\n",$xoops_admin_menu_sd).'}' ; */
 
     // appendix (core specific css etc)
-    $xoops_module_header = '' ;
+    $xoops_module_header = '';
     if (altsys_get_core_type() == ALTSYS_CORE_TYPE_XCL21) {
-        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=style.css" />'."\n" ;
+        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=style.css" />'."\n";
         if (is_object(@$xoopsModule)) {
-            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=module.css&amp;dirname='.$xoopsModule->getVar('dirname').'" />'."\n" ;
+            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=module.css&amp;dirname='.$xoopsModule->getVar('dirname').'" />'."\n";
         }
     }
 
@@ -148,14 +148,14 @@ 
         'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
         'xoops_contents' => $xoops_admin_contents, //. '<div id="adminmenu_layers">' . $xoops_admin_menu_dv . '</div>' ,
         'xoops_module_header' => $xoops_module_header
-    )) ;
+    ));
 
     // rendering
-    $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html') ;
+    $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html');
 
     // for XOOPS 2.0.14/15/16 from xoops.org
-    if (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array( 1, 2 ))) {
-        $xoopsLogger->activated = true ;
-        echo $xoopsLogger->render('') ;
+    if (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array(1, 2))) {
+        $xoopsLogger->activated = true;
+        echo $xoopsLogger->render('');
     }
 }

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

Spacing +14 added lines, -14 removed lines

@@ -1,33 +1,33 @@
 <?php
 
-if (! $xoopsConfig['theme_fromfile']) {
-    return ;
+if (!$xoopsConfig['theme_fromfile']) {
+    return;
 }
 
 // templates/ under modules
 // $tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
 
-if (! is_array(@$tplsadmin_autoupdate_mydirnames)) {
-    return ;
+if (!is_array(@$tplsadmin_autoupdate_mydirnames)) {
+    return;
 }
 
 foreach ($tplsadmin_autoupdate_mydirnames as $tplsadmin_mydirname) {
-    $tplsadmin_mydirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $tplsadmin_mydirname) ;
-    require XOOPS_ROOT_PATH . '/modules/' . $tplsadmin_mydirname . '/mytrustdirname.php' ;
-    $altsys_mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/' ;
-    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH . $altsys_mid_path . $mytrustdirname . '/templates' ;
+    $tplsadmin_mydirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $tplsadmin_mydirname);
+    require XOOPS_ROOT_PATH.'/modules/'.$tplsadmin_mydirname.'/mytrustdirname.php';
+    $altsys_mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/';
+    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH.$altsys_mid_path.$mytrustdirname.'/templates';
 
     // modules
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
         while (($file = readdir($handler)) !== false) {
-            $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
+            $file_path = $tplsadmin_autoupdate_path.'/'.$file;
             if (is_file($file_path)) {
                 $mtime = (int)(@filemtime($file_path));
-                $tpl_file = $tplsadmin_mydirname . '_' . $file ;
-                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($tpl_file) . "' AND tpl_lastmodified >= $mtime")) ;
+                $tpl_file = $tplsadmin_mydirname.'_'.$file;
+                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($tpl_file)."' AND tpl_lastmodified >= $mtime"));
                 if ($count <= 0) {
-                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $tpl_file, implode('', file($file_path)), $mtime) ;
+                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                    tplsadmin_import_data($xoopsConfig['template_set'], $tpl_file, implode('', file($file_path)), $mtime);
                 }
             }
         }

xoops_trust_path/libs/altsys/include/mygrouppermform.php

Indentation +2 added lines, -2 removed lines

@@ -359,7 +359,7 @@ 
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
         $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . ']['
-                 . $option['id'] . "]\" onclick=\"";
+                    . $option['id'] . "]\" onclick=\"";
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
@@ -380,7 +380,7 @@ 
             $tree .= ' checked="checked"';
         }
         $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname]['
-                 . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
+                    . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);

Doc Comments +10 added lines

@@ -70,6 +70,12 @@ 
      */
 //HACK by domifara
 //  public function MyXoopsGroupPermForm($title, $modid, $permname, $permdesc)
+    /**
+     * @param string $title
+     * @param integer $modid
+     * @param string $permname
+     * @param string $permdesc
+     */
     public function __construct($title, $modid, $permname, $permdesc)
     {
         //      $this->XoopsForm($title, 'groupperm_form', XOOPS_URL.'/modules/system/admin/groupperm.php', 'post'); GIJ
@@ -100,6 +106,9 @@ 
      * Add appendix
      *
      * @access public
+     * @param string $permName
+     * @param integer $itemId
+     * @param string $itemName
      */
     public function addAppendix($permName, $itemId, $itemName)
     {
@@ -239,6 +248,7 @@ 
 
     /**
      * Constructor
+     * @param string $name
      */
     public function __construct($caption, $name, $groupId, $values = null)
     {

Spacing +27 added lines, -27 removed lines

@@ -17,8 +17,8 @@ 
  * @author       XOOPS Development Team, Kazumi Ono (AKA onokazu)
  */
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
@@ -48,7 +48,7 @@ 
      * Tree structure of items
      * @var array
      */
-    public $_itemTree = array() ;
+    public $_itemTree = array();
     /**
      * Name of permission
      * @var string
@@ -63,7 +63,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -103,7 +103,7 @@ 
      */
     public function addAppendix($permName, $itemId, $itemName)
     {
-        $this->_appendix[] = array('permname'=>$permName,'itemid'=>$itemId,'itemname'=>$itemName,'selected'=>false);
+        $this->_appendix[] = array('permname'=>$permName, 'itemid'=>$itemId, 'itemname'=>$itemName, 'selected'=>false);
     }
 
     /**
@@ -137,7 +137,7 @@ 
      */
     public function render()
     {
-        global $xoopsGTicket ;
+        global $xoopsGTicket;
 
         // load all child ids for javascript codes
         foreach (array_keys($this->_itemTree) as $item_id) {
@@ -154,11 +154,11 @@ 
             $ele->setOptionTree($this->_itemTree);
 
             // GIJ start
-            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">') ;
+            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">');
             // GIJ_end
 
             foreach ($this->_appendix as $key => $append) {
-                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid) ;
+                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid);
             }
             $ele->setAppendix($this->_appendix);
             $this->addElement($ele);
@@ -168,11 +168,11 @@ 
         // GIJ start
         $jstray = new XoopsFormElementTray(' &nbsp; ');
         $jsuncheckbutton = new XoopsFormButton('', 'none', _NONE, 'button');
-        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"") ;
+        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"");
         $jscheckbutton = new XoopsFormButton('', 'all', _ALL, 'button');
-        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"") ;
-        $jstray->addElement($jsuncheckbutton) ;
-        $jstray->addElement($jscheckbutton) ;
+        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"");
+        $jstray->addElement($jsuncheckbutton);
+        $jstray->addElement($jscheckbutton);
         $this->addElement($jstray);
         // GIJ end
 
@@ -183,7 +183,7 @@ 
 
         $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
         $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $elements =& $this->getElements();
+        $elements = & $this->getElements();
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
@@ -199,7 +199,7 @@ 
                 $ret .= $elements[$i]->render();
             }
         }
-        $ret .= '</table>' . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin') . '</form>';
+        $ret .= '</table>'.$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin').'</form>';
         return $ret;
     }
 }
@@ -235,7 +235,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -285,7 +285,7 @@ 
      */
     public function setAppendix($appendix)
     {
-        $this->_appendix = $appendix ;
+        $this->_appendix = $appendix;
     }
 
     /**
@@ -296,7 +296,7 @@ 
      */
     public function render()
     {
-        $ret = '' ;
+        $ret = '';
 
         if (count($this->_appendix) > 0) {
             $ret .= '<table class="outer"><tr>';
@@ -306,11 +306,11 @@ 
                     $ret .= '</tr><tr>';
                     $cols = 1;
                 }
-                $checked = $append['selected'] ? 'checked="checked"' : '' ;
-                $name = 'perms['.$append['permname'].']' ;
-                $itemid = $append['itemid'] ;
-                $itemid = $append['itemid'] ;
-                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>" ;
+                $checked = $append['selected'] ? 'checked="checked"' : '';
+                $name = 'perms['.$append['permname'].']';
+                $itemid = $append['itemid'];
+                $itemid = $append['itemid'];
+                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>";
                 $cols++;
             }
             $ret .= '</tr></table>';
@@ -318,7 +318,7 @@ 
 
         $ret .= '<table class="outer"><tr>';
         $cols = 1;
-        if (! empty($this->_optionTree[0]['children'])) {
+        if (!empty($this->_optionTree[0]['children'])) {
             foreach ($this->_optionTree[0]['children'] as $topitem) {
                 if ($cols > 4) {
                     $ret .= '</tr><tr>';
@@ -346,8 +346,8 @@ 
      */
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
-        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . ']['
-                 . $option['id'] . "]\" onclick=\"";
+        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" id=\"".$this->getName().'[groups]['.$this->_groupId.']['
+                 . $option['id']."]\" onclick=\"";
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
@@ -367,8 +367,8 @@ 
         if (isset($this->_value) && in_array($option['id'], $this->_value)) {
             $tree .= ' checked="checked"';
         }
-        $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname]['
-                 . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
+        $tree .= ' />'.$option['name']."<input type=\"hidden\" name=\"".$this->getName().'[parents]['.$option['id']."]\" value=\"".implode(':', $parentIds)."\" /><input type=\"hidden\" name=\"".$this->getName().'[itemname]['
+                 . $option['id']."]\" value=\"".htmlspecialchars($option['name'])."\" /><br />\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);

xoops_trust_path/libs/altsys/blocks.php

Spacing +8 added lines, -8 removed lines

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