Inspection of "docs updates" - mambax7/altsys - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3a6ebc...3a5a05 )

by Michael

created 2016-06-23 11:49 UTC

Status

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -1,45 +1,45 @@
 block discarded – undo
 <?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_dirnames)) {
-    return ;
+if (!is_array(@$tplsadmin_autoupdate_dirnames)) {
+    return;
 }
 
 foreach ($tplsadmin_autoupdate_dirnames as $dirname) {
-    $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname) ;
-    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates' ;
+    $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname);
+    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/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) && substr($file, -5) == '.html') {
                 $mtime = (int)(@filemtime($file_path));
-                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
+                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
                 if ($count <= 0) {
-                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
+                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }
             }
         }
     }
 
     // blocks
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/blocks/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/blocks/')) {
         while (($file = readdir($handler)) !== false) {
-            $file_path = $tplsadmin_autoupdate_path . '/blocks/' . $file ;
+            $file_path = $tplsadmin_autoupdate_path.'/blocks/'.$file;
             if (is_file($file_path) && substr($file, -5) == '.html') {
                 $mtime = (int)(@filemtime($file_path));
-                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
+                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
                 if ($count <= 0) {
-                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
+                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }
             }
         }

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/include/autoupdate_from_theme.inc.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,21 +1,21 @@
 block discarded – undo
 <?php
 
-if (! $xoopsConfig['theme_fromfile']) {
-    return ;
+if (!$xoopsConfig['theme_fromfile']) {
+    return;
 }
 
 // templates/ under the theme
-$tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
+$tplsadmin_autoupdate_path = XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/templates';
 
-if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
     while (($file = readdir($handler)) !== false) {
-        $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
+        $file_path = $tplsadmin_autoupdate_path.'/'.$file;
         if (is_file($file_path) && substr($file, -5) == '.html') {
             $mtime = (int)(@filemtime($file_path));
-            list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
+            list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
             if ($count <= 0) {
-                include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
+                include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
             }
         }
     }

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/include/adminmenu_functions.php 1 patch

Spacing +132 added lines, -132 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/include/mygroupperm.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/include/formcheckboxgroup.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/index.php 1 patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/mypreferences.php 2 patches

Switch Indentation +76 added lines, -76 removed lines patch added patch discarded remove patch

@@ -76,83 +76,83 @@
 block discarded – undo
         $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
         switch ($config[$i]->getVar('conf_formtype')) {
-        case 'textarea':
-            (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);
-            } else {
-                $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
-            }
-            break;
-        case 'select':
-        case 'radio':
-            if ($config[$i]->getVar('conf_formtype') === 'select') {
-                $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
-                $addBr = '';
-            } else {
-                $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')));
-            $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');
-                $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
-                $ele->addOption($optval, $optkey.$addBr);
-            }
-            break;
-        case 'select_multi':
-        case 'checkbox':
-            if ($config[$i]->getVar('conf_formtype') === 'select_multi') {
-                $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
-                $addBr = '';
-            } else {
-                $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')));
-            $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');
-                $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+            case 'textarea':
+                (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);
+                } else {
+                    $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
+                }
+                break;
+            case 'select':
+            case 'radio':
+                if ($config[$i]->getVar('conf_formtype') === 'select') {
+                    $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+                    $addBr = '';
+                } else {
+                    $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')));
+                $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');
+                    $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+                    $ele->addOption($optval, $optkey.$addBr);
+                }
+                break;
+            case 'select_multi':
+            case 'checkbox':
+                if ($config[$i]->getVar('conf_formtype') === 'select_multi') {
+                    $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
+                    $addBr = '';
+                } else {
+                    $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')));
+                $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');
+                    $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
 
-                $ele->addOption($optval, $optkey.$addBr);
-            }
-            break;
-        case 'yesno':
-            $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
-            break;
-        case 'group':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
-            break;
-        case 'group_multi':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
-            break;
-        case 'group_checkbox':
-            include_once __DIR__.'/include/formcheckboxgroup.php';
-            $ele = new AltsysFormCheckboxGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput());
-            break;
-        // RMV-NOTIFY: added 'user' and 'user_multi'
-        case 'user':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
-            break;
-        case 'user_multi':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $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();
-            $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();
-            $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
-            break;
+                    $ele->addOption($optval, $optkey.$addBr);
+                }
+                break;
+            case 'yesno':
+                $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
+                break;
+            case 'group':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
+                break;
+            case 'group_multi':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
+                break;
+            case 'group_checkbox':
+                include_once __DIR__.'/include/formcheckboxgroup.php';
+                $ele = new AltsysFormCheckboxGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput());
+                break;
+            // RMV-NOTIFY: added 'user' and 'user_multi'
+            case 'user':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
+                break;
+            case 'user_multi':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $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();
+                $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();
+                $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, '') ;

Please login to merge, or discard this patch.

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -5,33 +5,33 @@  discard block
 block discarded – undo
 //                     GIJOE <http://www.peak.ne.jp/>                        //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 // 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() ;
+(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() ;
+    $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');
@@ -39,30 +39,30 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
         //  $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);
@@ -145,35 +145,35 @@  discard block
 block discarded – undo
             $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, $ele, $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();
@@ -185,10 +185,10 @@  discard block
 block discarded – undo
     //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
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
     if ($count > 0) {
         for ($i = 0; $i < $count; $i++) {
             $config = $config_handler->getConfig($conf_ids[$i]);
-            $new_value =& $_POST[$config->getVar('conf_name')];
+            $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') {
@@ -238,13 +238,13 @@  discard block
 block discarded – undo
                         // generate compiled files for the new theme
                         // block files only for now..
                         $tplfile_handler = xoops_gethandler('tplfile');
-                        $dtemplates =& $tplfile_handler->find('default', 'block');
+                        $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);
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
 
                         // 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);
+                        $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 {
@@ -272,12 +272,12 @@  discard block
 block discarded – undo
                 }
 
                 // 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') {
+                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();
+                    $groups = & $member_handler->getGroupList();
                     $moduleperm_handler = xoops_gethandler('groupperm');
                     $module_handler = xoops_gethandler('module');
-                    $module =& $module_handler->getByDirname($new_value);
+                    $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);
@@ -293,5 +293,5 @@  discard block
 block discarded – undo
         }
     }
 
-    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);
 }

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/blocks/block_functions.php 1 patch

Spacing +70 added lines, -70 removed lines patch added patch discarded remove patch

@@ -1,147 +1,147 @@
 block discarded – undo
 <?php
 
-require_once dirname(__DIR__).'/include/altsys_functions.php' ;
+require_once dirname(__DIR__).'/include/altsys_functions.php';
 
 function b_altsys_admin_menu_show($options)
 {
-    global $xoopsUser ;
+    global $xoopsUser;
 
-    $mydirname = empty($options[0]) ? 'altsys' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'altsys' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
-    if (! is_object(@$xoopsUser)) {
-        return array() ;
+    if (!is_object(@$xoopsUser)) {
+        return array();
     }
 
     // coretype
-    $coretype = altsys_get_core_type() ;
+    $coretype = altsys_get_core_type();
 
     // mid_selected
     if (is_object(@$GLOBALS['xoopsModule'])) {
-        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid') ;
+        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid');
         // for system->preferences
-        if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
+        if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
             $mid_selected = (int)$_GET['mod'];
         }
     } else {
-        $mid_selected = 0 ;
+        $mid_selected = 0;
     }
 
     $db = XoopsDatabaseFactory::getDatabaseConnection();
-    (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+    (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
     $module_handler = xoops_gethandler('module');
-    $current_module =& $module_handler->getByDirname($mydirname);
+    $current_module = & $module_handler->getByDirname($mydirname);
     $config_handler = xoops_gethandler('config');
-    $current_configs = $config_handler->getConfigList($current_module->mid()) ;
+    $current_configs = $config_handler->getConfigList($current_module->mid());
     $moduleperm_handler = xoops_gethandler('groupperm');
     $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
-    $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids) . ')', 'IN'), true) ;
+    $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids).')', 'IN'), true);
 
     $block = array(
-        'mydirname' => $mydirname ,
-        'mod_url' => XOOPS_URL.'/modules/'.$mydirname ,
-        'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'] ,
+        'mydirname' => $mydirname,
+        'mod_url' => XOOPS_URL.'/modules/'.$mydirname,
+        'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'],
         'mod_config' => $current_configs
-    ) ;
+    );
 
     foreach ($modules as $mod) {
         $mid = (int)$mod->getVar('mid');
-        $dirname = $mod->getVar('dirname') ;
-        $modinfo = $mod->getInfo() ;
-        $submenus4assign = array() ;
-        $adminmenu = array() ;
-        $adminmenu4altsys = array() ;
-        unset($adminmenu_use_altsys) ;
-        @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'] ;
+        $dirname = $mod->getVar('dirname');
+        $modinfo = $mod->getInfo();
+        $submenus4assign = array();
+        $adminmenu = array();
+        $adminmenu4altsys = array();
+        unset($adminmenu_use_altsys);
+        @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'];
         // from admin_menu.php etc.
-        $adminmenu = array_merge($adminmenu, $adminmenu4altsys) ;
+        $adminmenu = array_merge($adminmenu, $adminmenu4altsys);
         foreach ($adminmenu as $sub) {
-            $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'] ;
+            $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'];
             if (isset($sub['show']) && $sub['show'] === false) {
-                continue ;
+                continue;
             }
             $submenus4assign[] = array(
-                'title' => $myts->makeTboxData4Show($sub['title']) ,
+                'title' => $myts->makeTboxData4Show($sub['title']),
                 'url' => XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($link, ENT_QUOTES)
-            ) ;
+            );
         }
 
         // for modules overriding Module.class.php (eg. Analyzer for XC)
-        if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['cube_style'])) {
+        if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['cube_style'])) {
             $module_handler = xoops_gethandler('module');
             $module = $module_handler->get($mid);
-            $moduleObj =& Legacy_Utils::createModule($module);
-            $modinfo['adminindex'] = $moduleObj->getAdminIndex() ;
-            $modinfo['adminindex_absolute'] = true ;
+            $moduleObj = & Legacy_Utils::createModule($module);
+            $modinfo['adminindex'] = $moduleObj->getAdminIndex();
+            $modinfo['adminindex_absolute'] = true;
             foreach ($moduleObj->getAdminMenu() as $sub) {
                 if (@$sub['show'] === false) {
-                    continue ;
+                    continue;
                 }
                 $submenus4assign[] = array(
-                    'title' => $myts->makeTboxData4Show($sub['title']) ,
+                    'title' => $myts->makeTboxData4Show($sub['title']),
                     'url' => strncmp($sub['link'], 'http', 4) === 0 ? htmlspecialchars($sub['link'], ENT_QUOTES) : XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($sub['link'], ENT_QUOTES)
-                ) ;
+                );
             }
         } elseif (empty($adminmenu4altsys)) {
 
             // add preferences
-            if ($mod->getVar('hasconfig') && ! in_array($mod->getVar('dirname'), array( 'system', 'legacy' ))) {
+            if ($mod->getVar('hasconfig') && !in_array($mod->getVar('dirname'), array('system', 'legacy'))) {
                 $submenus4assign[] = array(
-                    'title' => _PREFERENCES ,
+                    'title' => _PREFERENCES,
                     'url' => htmlspecialchars(altsys_get_link2modpreferences($mid, $coretype), ENT_QUOTES)
-                ) ;
+                );
             }
 
             // add help
-            if (defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['help'])) {
+            if (defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['help'])) {
                 $submenus4assign[] = array(
-                    'title' => _HELP ,
+                    'title' => _HELP,
                     'url' => XOOPS_URL.'/modules/legacy/admin/index.php?action=Help&amp;dirname='.$dirname
-                ) ;
+                );
             }
         }
 
         $module4assign = array(
-            'mid' => $mid ,
-            'dirname' => $dirname ,
-            'name' => $mod->getVar('name') ,
-            'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0) ,
-            'version_in_file' => sprintf('%.2f', $modinfo['version']) ,
-            'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES) ,
-            'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES) ,
-            'isactive' => $mod->getVar('isactive') ,
-            'hasmain' => $mod->getVar('hasmain') ,
-            'hasadmin' => $mod->getVar('hasadmin') ,
-            'hasconfig' => $mod->getVar('hasconfig') ,
-            'weight' => $mod->getVar('weight') ,
-            'adminindex' => htmlspecialchars(@$modinfo['adminindex'], ENT_QUOTES) ,
-            'adminindex_absolute' => @$modinfo['adminindex_absolute'] ,
-            'submenu' => $submenus4assign ,
-            'selected' => $mid == $mid_selected ? true : false ,
+            'mid' => $mid,
+            'dirname' => $dirname,
+            'name' => $mod->getVar('name'),
+            'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0),
+            'version_in_file' => sprintf('%.2f', $modinfo['version']),
+            'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES),
+            'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES),
+            'isactive' => $mod->getVar('isactive'),
+            'hasmain' => $mod->getVar('hasmain'),
+            'hasadmin' => $mod->getVar('hasadmin'),
+            'hasconfig' => $mod->getVar('hasconfig'),
+            'weight' => $mod->getVar('weight'),
+            'adminindex' => htmlspecialchars(@$modinfo['adminindex'], ENT_QUOTES),
+            'adminindex_absolute' => @$modinfo['adminindex_absolute'],
+            'submenu' => $submenus4assign,
+            'selected' => $mid == $mid_selected ? true : false,
             'dot_suffix' => $mid == $mid_selected ? 'selected_opened' : 'closed'
-        ) ;
-        $block['modules'][] = $module4assign ;
+        );
+        $block['modules'][] = $module4assign;
     }
 
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-    $tpl = new D3Tpl() ;
-    $tpl->assign('block', $block) ;
-    $ret['content'] = $tpl->fetch($this_template) ;
-    return $ret ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+    $tpl = new D3Tpl();
+    $tpl->assign('block', $block);
+    $ret['content'] = $tpl->fetch($this_template);
+    return $ret;
 }
 
 
 function b_altsys_admin_menu_edit($options)
 {
-    $mydirname = empty($options[0]) ? 'd3forum' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'd3forum' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
 
     $form = "

Please login to merge, or discard this patch.

xoops_trust_path/libs/altsys/xoops_version.php 1 patch

Spacing +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -1,14 +1,14 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__.'/include/altsys_functions.php' ;
+include_once __DIR__.'/include/altsys_functions.php';
 
 // language file (modinfo.php)
-altsys_include_language_file('modinfo') ;
+altsys_include_language_file('modinfo');
 
-$modversion['name'] = _MI_ALTSYS_MODULENAME ;
-$modversion['version'] = '0.83' ;
-$modversion['detailed_version'] = '0.83.0' ;
-$modversion['description'] = _MI_ALTSYS_MODULEDESC ;
+$modversion['name'] = _MI_ALTSYS_MODULENAME;
+$modversion['version'] = '0.83';
+$modversion['detailed_version'] = '0.83.0';
+$modversion['description'] = _MI_ALTSYS_MODULEDESC;
 $modversion['credits'] = 'PEAK Corp.';
 $modversion['author'] = 'GIJ=CHECKMATE<br />PEAK Corp.(http://www.peak.ne.jp/), XOOPS X Distribution(https://github.com/XoopsX)';
 $modversion['license'] = 'GPL see LICENSE';
@@ -26,18 +26,18 @@  discard block
 block discarded – undo
 $modversion['adminmenu'] = 'admin/admin_menu.php';
 
 // All Templates can't be touched by modulesadmin.
-$modversion['templates'] = array() ;
+$modversion['templates'] = array();
 
 // Blocks
 $modversion['blocks'][1] = array(
-    'file'            => 'blocks.php' ,
-    'name'            => _MI_ALTSYS_BNAME_ADMIN_MENU ,
-    'description'    => '' ,
-    'show_func'        => 'b_altsys_admin_menu_show' ,
-    'edit_func'        => 'b_altsys_admin_menu_edit' ,
-    'options'        => "$mydirname" ,
-    'template'        => '' , // use "module" template instead
-) ;
+    'file'            => 'blocks.php',
+    'name'            => _MI_ALTSYS_BNAME_ADMIN_MENU,
+    'description'    => '',
+    'show_func'        => 'b_altsys_admin_menu_show',
+    'edit_func'        => 'b_altsys_admin_menu_edit',
+    'options'        => "$mydirname",
+    'template'        => '', // use "module" template instead
+);
 
 // Menu
 $modversion['hasMain'] = 1;
@@ -50,64 +50,64 @@  discard block
 block discarded – undo
 
 // Configurations
 $modversion['config'][1] = array(
-    'name'            => 'adminmenu_hack_ft' ,
-    'title'            => '_MI_ALTSYS_ADMINMENU_HFT' ,
-    'description'    => '_MI_ALTSYS_ADMINMENU_HFTDSC' ,
-    'formtype'        => 'select' ,
-    'valuetype'        => 'int' ,
-    'default'        => 0 ,
-    'options'        => array( '_NONE' => 0 , '_MI_ALTSYS_AMHFT_OPT_2COL' => 1 , '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2 , '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3 )
-) ;
+    'name'            => 'adminmenu_hack_ft',
+    'title'            => '_MI_ALTSYS_ADMINMENU_HFT',
+    'description'    => '_MI_ALTSYS_ADMINMENU_HFTDSC',
+    'formtype'        => 'select',
+    'valuetype'        => 'int',
+    'default'        => 0,
+    'options'        => array('_NONE' => 0, '_MI_ALTSYS_AMHFT_OPT_2COL' => 1, '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2, '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3)
+);
 
 $modversion['config'][] = array(
-    'name'            => 'adminmenu_insert_mymenu' ,
-    'title'            => '_MI_ALTSYS_ADMINMENU_IM' ,
-    'description'    => '_MI_ALTSYS_ADMINMENU_IMDSC' ,
-    'formtype'        => 'yesno' ,
-    'valuetype'        => 'int' ,
-    'default'        => 0 ,
+    'name'            => 'adminmenu_insert_mymenu',
+    'title'            => '_MI_ALTSYS_ADMINMENU_IM',
+    'description'    => '_MI_ALTSYS_ADMINMENU_IMDSC',
+    'formtype'        => 'yesno',
+    'valuetype'        => 'int',
+    'default'        => 0,
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'admin_in_theme' ,
-    'title'            => '_MI_ALTSYS_ADMIN_IN_THEME' ,
-    'description'    => '_MI_ALTSYS_ADMIN_IN_THEMEDSC' ,
-    'formtype'        => 'textbox' ,
-    'valuetype'        => 'text' ,
-    'default'        => 'default' ,
+    'name'            => 'admin_in_theme',
+    'title'            => '_MI_ALTSYS_ADMIN_IN_THEME',
+    'description'    => '_MI_ALTSYS_ADMIN_IN_THEMEDSC',
+    'formtype'        => 'textbox',
+    'valuetype'        => 'text',
+    'default'        => 'default',
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'enable_force_clone' ,
-    'title'            => '_MI_ALTSYS_ENABLEFORCECLONE' ,
-    'description'    => '_MI_ALTSYS_ENABLEFORCECLONEDSC' ,
-    'formtype'        => 'yesno' ,
-    'valuetype'        => 'int' ,
-    'default'        => 1 ,
+    'name'            => 'enable_force_clone',
+    'title'            => '_MI_ALTSYS_ENABLEFORCECLONE',
+    'description'    => '_MI_ALTSYS_ENABLEFORCECLONEDSC',
+    'formtype'        => 'yesno',
+    'valuetype'        => 'int',
+    'default'        => 1,
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'images_dir' ,
-    'title'            => '_MI_ALTSYS_IMAGES_DIR' ,
-    'description'    => '_MI_ALTSYS_IMAGES_DIRDSC' ,
-    'formtype'        => 'textbox' ,
-    'valuetype'        => 'text' ,
-    'default'        => 'images' ,
+    'name'            => 'images_dir',
+    'title'            => '_MI_ALTSYS_IMAGES_DIR',
+    'description'    => '_MI_ALTSYS_IMAGES_DIRDSC',
+    'formtype'        => 'textbox',
+    'valuetype'        => 'text',
+    'default'        => 'images',
     'options'        => array()
-) ;
+);
 
 // Notification
 
 $modversion['hasNotification'] = 0;
 
-$modversion['onInstall'] = 'include/oninstall.php' ;
-$modversion['onUpdate'] = 'include/onupdate.php' ;
-$modversion['onUninstall'] = 'include/onuninstall.php' ;
+$modversion['onInstall'] = 'include/oninstall.php';
+$modversion['onUpdate'] = 'include/onupdate.php';
+$modversion['onUninstall'] = 'include/onuninstall.php';
 
 // keep block's options
-if (! defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && ! empty($_POST['fct']) && ! empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
-    include __DIR__.'/include/x20_keepblockoptions.inc.php' ;
+if (!defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && !empty($_POST['fct']) && !empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
+    include __DIR__.'/include/x20_keepblockoptions.inc.php';
 }

Please login to merge, or discard this patch.

		@@ -1,45 +1,45 @@
		block discarded – undo
1	1	<?php
2	2
3		-if (! $xoopsConfig['theme_fromfile']) {
4		- return ;
	3	+if (!$xoopsConfig['theme_fromfile']) {
	4	+ return;
5	5	}
6	6
7	7	// templates/ under modules
8	8	// $tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
9	9
10		-if (! is_array(@$tplsadmin_autoupdate_dirnames)) {
11		- return ;
	10	+if (!is_array(@$tplsadmin_autoupdate_dirnames)) {
	11	+ return;
12	12	}
13	13
14	14	foreach ($tplsadmin_autoupdate_dirnames as $dirname) {
15		- $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname) ;
16		- $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates' ;
	15	+ $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname);
	16	+ $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates';
17	17
18	18	// modules
19		- if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
	19	+ if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
20	20	while (($file = readdir($handler)) !== false) {
21		- $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
	21	+ $file_path = $tplsadmin_autoupdate_path.'/'.$file;
22	22	if (is_file($file_path) && substr($file, -5) == '.html') {
23	23	$mtime = (int)(@filemtime($file_path));
24		- list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
	24	+ list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
25	25	if ($count <= 0) {
26		- include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
27		- tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
	26	+ include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
	27	+ tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
28	28	}
29	29	}
30	30	}
31	31	}
32	32
33	33	// blocks
34		- if ($handler = @opendir($tplsadmin_autoupdate_path . '/blocks/')) {
	34	+ if ($handler = @opendir($tplsadmin_autoupdate_path.'/blocks/')) {
35	35	while (($file = readdir($handler)) !== false) {
36		- $file_path = $tplsadmin_autoupdate_path . '/blocks/' . $file ;
	36	+ $file_path = $tplsadmin_autoupdate_path.'/blocks/'.$file;
37	37	if (is_file($file_path) && substr($file, -5) == '.html') {
38	38	$mtime = (int)(@filemtime($file_path));
39		- list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
	39	+ list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
40	40	if ($count <= 0) {
41		- include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
42		- tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
	41	+ include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
	42	+ tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
43	43	}
44	44	}
45	45	}

		@@ -1,21 +1,21 @@
		block discarded – undo
1	1	<?php
2	2
3		-if (! $xoopsConfig['theme_fromfile']) {
4		- return ;
	3	+if (!$xoopsConfig['theme_fromfile']) {
	4	+ return;
5	5	}
6	6
7	7	// templates/ under the theme
8		-$tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
	8	+$tplsadmin_autoupdate_path = XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/templates';
9	9
10		-if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
	10	+if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
11	11	while (($file = readdir($handler)) !== false) {
12		- $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
	12	+ $file_path = $tplsadmin_autoupdate_path.'/'.$file;
13	13	if (is_file($file_path) && substr($file, -5) == '.html') {
14	14	$mtime = (int)(@filemtime($file_path));
15		- list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
	15	+ list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
16	16	if ($count <= 0) {
17		- include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
18		- tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
	17	+ include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
	18	+ tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
19	19	}
20	20	}
21	21	}

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if (! defined('XOOPS_ROOT_PATH')) {
4		- exit ;
	3	+if (!defined('XOOPS_ROOT_PATH')) {
	4	+ exit;
5	5	}
6	6
7	7	function myDeleteByModule($DB, $gperm_modid, $gperm_name = null, $gperm_itemid = null)
		@@ -13,7 +13,7 @@ discard block
		block discarded – undo
13	13	$criteria->add(new Criteria('gperm_itemid', (int)$gperm_itemid));
14	14	}
15	15	}
16		- $sql = 'DELETE FROM ' . $DB->prefix('group_permission') . ' ' . $criteria->renderWhere();
	16	+ $sql = 'DELETE FROM '.$DB->prefix('group_permission').' '.$criteria->renderWhere();
17	17	if (!$result = $DB->query($sql)) {
18	18	return false;
19	19	}
		@@ -27,27 +27,27 @@ discard block
		block discarded – undo
27	27
28	28	if ($modid == 1) {
29	29	// check by the permission of eather 'altsys' or 'system'
30		- $module_handler = xoops_gethandler('module') ;
31		- $module =& $module_handler->getByDirname('altsys') ;
32		- if (! is_object($module)) {
33		- $module =& $module_handler->getByDirname('system') ;
34		- if (! is_object($module)) {
35		- die('there is no altsys nor system.') ;
	30	+ $module_handler = xoops_gethandler('module');
	31	+ $module = & $module_handler->getByDirname('altsys');
	32	+ if (!is_object($module)) {
	33	+ $module = & $module_handler->getByDirname('system');
	34	+ if (!is_object($module)) {
	35	+ die('there is no altsys nor system.');
36	36	}
37	37	}
38		- $moduleperm_handler = xoops_gethandler('groupperm') ;
39		- if (! is_object(@$GLOBALS['xoopsUser']) \|\| ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
40		- die('only admin of altsys can access this area') ;
	38	+ $moduleperm_handler = xoops_gethandler('groupperm');
	39	+ if (!is_object(@$GLOBALS['xoopsUser']) \|\| !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
	40	+ die('only admin of altsys can access this area');
41	41	}
42	42	} else {
43	43	// check the permission of 'module_admin' of the module
44	44	if ($modid <= 0 \|\| !is_object($GLOBALS['xoopsUser']) \|\| !$GLOBALS['xoopsUser']->isAdmin($modid)) {
45		- die(_NOPERM) ;
	45	+ die(_NOPERM);
46	46	}
47	47	$module_handler = xoops_gethandler('module');
48	48	$module = $module_handler->get($modid);
49	49	if (!is_object($module) \|\| !$module->getVar('isactive')) {
50		- die(_MODULENOEXIST) ;
	50	+ die(_MODULENOEXIST);
51	51	}
52	52	}
53	53
		@@ -56,18 +56,18 @@ discard block
		block discarded – undo
56	56	if (!empty($_POST['perms']) && is_array($_POST['perms'])) {
57	57	$gperm_handler = xoops_gethandler('groupperm');
58	58	foreach ($_POST['perms'] as $perm_name => $perm_data) {
59		- foreach ($perm_data['itemname' ] as $item_id => $item_name) {
	59	+ foreach ($perm_data['itemname'] as $item_id => $item_name) {
60	60	// checking code
61	61	// echo "<pre>" ;
62	62	// var_dump( $_POST['perms'] ) ;
63	63	// exit ;
64	64	if (false != myDeleteByModule($gperm_handler->db, $modid, $perm_name, $item_id)) {
65	65	if (empty($perm_data['groups'])) {
66		- continue ;
	66	+ continue;
67	67	}
68	68	foreach ($perm_data['groups'] as $group_id => $item_ids) {
69	69	// foreach ($item_ids as $item_id => $selected) {
70		- $selected = isset($item_ids[ $item_id ]) ? $item_ids[ $item_id ] : 0 ;
	70	+ $selected = isset($item_ids[$item_id]) ? $item_ids[$item_id] : 0;
71	71	if ($selected == 1) {
72	72	// make sure that all parent ids are selected as well
73	73	if ($perm_data['parents'][$item_id] != '') {
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	}
81	81	}
82	82	}
83		- $gperm =& $gperm_handler->create();
	83	+ $gperm = & $gperm_handler->create();
84	84	$gperm->setVar('gperm_groupid', $group_id);
85	85	$gperm->setVar('gperm_name', $perm_name);
86	86	$gperm->setVar('gperm_modid', $modid);

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	/**
45	45	* Parent
46	46	*/
47		-include_once XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php';
	47	+include_once XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php';
48	48
49	49	/**
50	50	* A checkbox field with a choice of available groups
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	* @param bool $include_anon Include group "anonymous"?
66	66	* @param mixed $value Pre-selected value (or array of them).
67	67	*/
68		- public function __construct($caption, $name, $include_anon=false, $value=null)
	68	+ public function __construct($caption, $name, $include_anon = false, $value = null)
69	69	{
70	70	parent::__construct($caption, $name, $value);
71	71	$member_handler = xoops_gethandler('member');
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	$options = $member_handler->getGroupList();
76	76	}
77	77	foreach ($options as $k => $v) {
78		- $options[$k] = $v . '<br />';
	78	+ $options[$k] = $v.'<br />';
79	79	}
80	80	$this->addOptionArray($options);
81	81	}

		@@ -1,51 +1,51 @@
		block discarded – undo
1	1	<?php
2	2
3		-if (! defined('XOOPS_MODULE_PATH')) {
4		- define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH . '/modules');
	3	+if (!defined('XOOPS_MODULE_PATH')) {
	4	+ define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH.'/modules');
5	5	}
6		-if (! defined('XOOPS_MODULE_URL')) {
7		- define('XOOPS_MODULE_URL', XOOPS_URL . '/modules');
	6	+if (!defined('XOOPS_MODULE_URL')) {
	7	+ define('XOOPS_MODULE_URL', XOOPS_URL.'/modules');
8	8	}
9	9
10	10
11		-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
12		-require_once __DIR__.'/include/altsys_functions.php' ;
	11	+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
	12	+require_once __DIR__.'/include/altsys_functions.php';
13	13
14	14
15	15	if (empty($xoopsModule)) {
16		- $moduleperm_handler = xoops_gethandler('module') ;
17		- $xoopsModule =& $moduleperm_handler->getByDirname('altsys') ;
	16	+ $moduleperm_handler = xoops_gethandler('module');
	17	+ $xoopsModule = & $moduleperm_handler->getByDirname('altsys');
18	18	}
19	19
20		-require XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
	20	+require XOOPS_ROOT_PATH.'/include/cp_functions.php';
21	21
22	22	// breadcrumbs
23		-$breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
24		-$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name')) ;
	23	+$breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
	24	+$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name'));
25	25
26	26	// get page
27		-$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']) ;
28		-require __DIR__.'/controllers.php' ;
29		-if (! in_array($page, $controllers)) {
30		- $_GET['page'] = $page = 'myblocksadmin' ;
31		- $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin' ;
	27	+$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']);
	28	+require __DIR__.'/controllers.php';
	29	+if (!in_array($page, $controllers)) {
	30	+ $_GET['page'] = $page = 'myblocksadmin';
	31	+ $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin';
32	32	}
33	33
34	34
35	35	// half measure ... (TODO)
36	36	if (empty($_GET['dirname'])) {
37		- $module_handler = xoops_gethandler('module') ;
38		- list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1)) ;
39		- $_GET['dirname'] = $top_module->getVar('dirname') ;
	37	+ $module_handler = xoops_gethandler('module');
	38	+ list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1));
	39	+ $_GET['dirname'] = $top_module->getVar('dirname');
40	40	}
41	41
42	42	// language file
43		-altsys_include_language_file($page) ;
	43	+altsys_include_language_file($page);
44	44
45	45	// branch to each pages
46		-$mytrustdirpath = __DIR__ ;
	46	+$mytrustdirpath = __DIR__;
47	47	if (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php')) {
48		- include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php' ;
	48	+ include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php';
49	49	} else {
50		- die('wrong request') ;
	50	+ die('wrong request');
51	51	}

		@@ -76,83 +76,83 @@
		block discarded – undo
76	76	$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
77	77	$title = '' ; // GIJ
78	78	switch ($config[$i]->getVar('conf_formtype')) {
79		- case 'textarea':
80		- (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
81		- if ($config[$i]->getVar('conf_valuetype') == 'array') {
82		- // this is exceptional.. only when value type is arrayneed a smarter way for this
83		- $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);
84		- } else {
85		- $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
86		- }
87		- break;
88		- case 'select':
89		- case 'radio':
90		- if ($config[$i]->getVar('conf_formtype') === 'select') {
91		- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
92		- $addBr = '';
93		- } else {
94		- $ele = new XoopsFormRadio($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
95		- $addBr = '<br />';
96		- }
97		- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
98		- $opcount = count($options);
99		- for ($j = 0; $j < $opcount; $j++) {
100		- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
101		- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
102		- $ele->addOption($optval, $optkey.$addBr);
103		- }
104		- break;
105		- case 'select_multi':
106		- case 'checkbox':
107		- if ($config[$i]->getVar('conf_formtype') === 'select_multi') {
108		- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
109		- $addBr = '';
110		- } else {
111		- $ele = new XoopsFormCheckBox($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
112		- $addBr = '<br />';
113		- }
114		- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
115		- $opcount = count($options);
116		- for ($j = 0; $j < $opcount; $j++) {
117		- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
118		- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
	79	+ case 'textarea':
	80	+ (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
	81	+ if ($config[$i]->getVar('conf_valuetype') == 'array') {
	82	+ // this is exceptional.. only when value type is arrayneed a smarter way for this
	83	+ $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);
	84	+ } else {
	85	+ $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
	86	+ }
	87	+ break;
	88	+ case 'select':
	89	+ case 'radio':
	90	+ if ($config[$i]->getVar('conf_formtype') === 'select') {
	91	+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
	92	+ $addBr = '';
	93	+ } else {
	94	+ $ele = new XoopsFormRadio($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
	95	+ $addBr = '<br />';
	96	+ }
	97	+ $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
	98	+ $opcount = count($options);
	99	+ for ($j = 0; $j < $opcount; $j++) {
	100	+ $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
	101	+ $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
	102	+ $ele->addOption($optval, $optkey.$addBr);
	103	+ }
	104	+ break;
	105	+ case 'select_multi':
	106	+ case 'checkbox':
	107	+ if ($config[$i]->getVar('conf_formtype') === 'select_multi') {
	108	+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
	109	+ $addBr = '';
	110	+ } else {
	111	+ $ele = new XoopsFormCheckBox($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
	112	+ $addBr = '<br />';
	113	+ }
	114	+ $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
	115	+ $opcount = count($options);
	116	+ for ($j = 0; $j < $opcount; $j++) {
	117	+ $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
	118	+ $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
119	119
120		- $ele->addOption($optval, $optkey.$addBr);
121		- }
122		- break;
123		- case 'yesno':
124		- $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
125		- break;
126		- case 'group':
127		- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
128		- $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
129		- break;
130		- case 'group_multi':
131		- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
132		- $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
133		- break;
134		- case 'group_checkbox':
135		- include_once __DIR__.'/include/formcheckboxgroup.php';
136		- $ele = new AltsysFormCheckboxGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput());
137		- break;
138		- // RMV-NOTIFY: added 'user' and 'user_multi'
139		- case 'user':
140		- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
141		- $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
142		- break;
143		- case 'user_multi':
144		- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
145		- $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
146		- break;
147		- case 'password':
148		- (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
149		- $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
150		- break;
151		- case 'textbox':
152		- default:
153		- (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
154		- $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
155		- break;
	120	+ $ele->addOption($optval, $optkey.$addBr);
	121	+ }
	122	+ break;
	123	+ case 'yesno':
	124	+ $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
	125	+ break;
	126	+ case 'group':
	127	+ include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
	128	+ $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
	129	+ break;
	130	+ case 'group_multi':
	131	+ include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
	132	+ $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
	133	+ break;
	134	+ case 'group_checkbox':
	135	+ include_once __DIR__.'/include/formcheckboxgroup.php';
	136	+ $ele = new AltsysFormCheckboxGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput());
	137	+ break;
	138	+ // RMV-NOTIFY: added 'user' and 'user_multi'
	139	+ case 'user':
	140	+ include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
	141	+ $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
	142	+ break;
	143	+ case 'user_multi':
	144	+ include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
	145	+ $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
	146	+ break;
	147	+ case 'password':
	148	+ (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
	149	+ $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
	150	+ break;
	151	+ case 'textbox':
	152	+ default:
	153	+ (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
	154	+ $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
	155	+ break;
156	156	}
157	157	$hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
158	158	$ele_tray = new XoopsFormElementTray($title4tray, '') ;

		@@ -5,33 +5,33 @@ discard block
		block discarded – undo
5	5	// GIJOE <http://www.peak.ne.jp/> //
6	6	// ------------------------------------------------------------------------- //
7	7
8		-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
9		-include_once __DIR__.'/include/gtickets.php' ;
10		-include_once __DIR__.'/include/altsys_functions.php' ;
	8	+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
	9	+include_once __DIR__.'/include/gtickets.php';
	10	+include_once __DIR__.'/include/altsys_functions.php';
11	11
12	12	// check access right (needs module_admin of this module)
13		-if (! is_object($xoopsUser) \|\| ! is_object($xoopsModule) \|\| ! $xoopsUser->isAdmin($xoopsModule->mid())) {
14		- die('Access Denied') ;
	13	+if (!is_object($xoopsUser) \|\| !is_object($xoopsModule) \|\| !$xoopsUser->isAdmin($xoopsModule->mid())) {
	14	+ die('Access Denied');
15	15	}
16	16
17	17
18	18	// initials
19	19	$db = XoopsDatabaseFactory::getDatabaseConnection();
20		-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance() ;
	20	+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
21	21
22	22	// language file
23		-altsys_include_language_file('mypreferences') ;
	23	+altsys_include_language_file('mypreferences');
24	24
25	25
26		-$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']) ;
	26	+$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']);
27	27
28	28	if ($op == 'showmod') {
29	29	$config_handler = xoops_gethandler('config');
30		- $mod = $xoopsModule->mid() ;
	30	+ $mod = $xoopsModule->mid();
31	31	$config = $config_handler->getConfigs(new Criteria('conf_modid', $mod));
32	32	$count = count($config);
33	33	if ($count < 1) {
34		- die('no configs') ;
	34	+ die('no configs');
35	35	}
36	36	include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
37	37	$form = new XoopsThemeForm(_MD_A_MYPREFERENCES_FORMTITLE, 'pref_form', 'index.php?mode=admin&lib=altsys&page=mypreferences&op=save');
		@@ -39,30 +39,30 @@ discard block
		block discarded – undo
39	39	$module = $module_handler->get($mod);
40	40
41	41	// language
42		- $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ;
	42	+ $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
43	43
44	44	// load modinfo.php if necessary (judged by a specific constant is defined)
45		- if (! defined('_MYMENU_CONSTANT_IN_MODINFO') \|\| ! defined(_MYMENU_CONSTANT_IN_MODINFO)) {
	45	+ if (!defined('_MYMENU_CONSTANT_IN_MODINFO') \|\| !defined(_MYMENU_CONSTANT_IN_MODINFO)) {
46	46	if (file_exists("$mydirpath/language/$language/modinfo.php")) {
47	47	// user customized language file
48		- include_once "$mydirpath/language/$language/modinfo.php" ;
	48	+ include_once "$mydirpath/language/$language/modinfo.php";
49	49	} elseif (file_exists("$mytrustdirpath/language/$language/modinfo.php")) {
50	50	// default language file
51		- include_once "$mytrustdirpath/language/$language/modinfo.php" ;
	51	+ include_once "$mytrustdirpath/language/$language/modinfo.php";
52	52	} else {
53	53	// fallback english
54		- include_once "$mytrustdirpath/language/english/modinfo.php" ;
	54	+ include_once "$mytrustdirpath/language/english/modinfo.php";
55	55	}
56	56	}
57	57
58	58	// if has comments feature, need comment lang file
59		- if ($module->getVar('hascomments') == 1 && ! defined('_CM_TITLE')) {
	59	+ if ($module->getVar('hascomments') == 1 && !defined('_CM_TITLE')) {
60	60	include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
61	61	}
62	62
63	63	// RMV-NOTIFY
64	64	// if has notification feature, need notification lang file
65		- if ($module->getVar('hasnotification') == 1 && ! defined('_NOT_NOTIFICATIONOPTIONS')) {
	65	+ if ($module->getVar('hasnotification') == 1 && !defined('_NOT_NOTIFICATIONOPTIONS')) {
66	66	include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
67	67	}
68	68
		@@ -72,12 +72,12 @@ discard block
		block discarded – undo
72	72	// $form->addElement(new XoopsFormHidden('redirect', XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')));
73	73	// }
74	74	for ($i = 0; $i < $count; $i++) {
75		- $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'
	75	+ $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'
76	76	$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
77		- $title = '' ; // GIJ
	77	+ $title = ''; // GIJ
78	78	switch ($config[$i]->getVar('conf_formtype')) {
79	79	case 'textarea':
80		- (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
	80	+ (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
81	81	if ($config[$i]->getVar('conf_valuetype') == 'array') {
82	82	// this is exceptional.. only when value type is arrayneed a smarter way for this
83	83	$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);
		@@ -145,35 +145,35 @@ discard block
		block discarded – undo
145	145	$ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
146	146	break;
147	147	case 'password':
148		- (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
	148	+ (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
149	149	$ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
150	150	break;
151	151	case 'textbox':
152	152	default:
153		- (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
	153	+ (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
154	154	$ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
155	155	break;
156	156	}
157	157	$hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
158		- $ele_tray = new XoopsFormElementTray($title4tray, '') ;
	158	+ $ele_tray = new XoopsFormElementTray($title4tray, '');
159	159	$ele_tray->addElement($ele);
160	160	$ele_tray->addElement($hidden);
161		- $form->addElement($ele_tray) ;
	161	+ $form->addElement($ele_tray);
162	162	unset($ele_tray, $ele, $hidden);
163	163	}
164	164	// $button_tray->addElement(new XoopsFormHidden('op', 'save'));
165		- $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences') ;
	165	+ $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences');
166	166	$button_tray->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
167		- $form->addElement($button_tray) ;
	167	+ $form->addElement($button_tray);
168	168	xoops_cp_header();
169	169
170	170	// GIJ patch start
171		- altsys_include_mymenu() ;
172		- $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
	171	+ altsys_include_mymenu();
	172	+ $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
173	173	if ($breadcrumbsObj->hasPaths()) {
174		- $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=mypreferences', _PREFERENCES) ;
	174	+ $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=mypreferences', _PREFERENCES);
175	175	}
176		- echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').'   '._PREFERENCES."</h3>\n" ;
	176	+ echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').'   '._PREFERENCES."</h3>\n";
177	177	// GIJ patch end
178	178
179	179	$form->display();
		@@ -185,10 +185,10 @@ discard block
		block discarded – undo
185	185	//if ( !admin_refcheck("/modules/$admin_mydirname/admin/") ) {
186	186	// exit('Invalid referer');
187	187	//}
188		- if (! $xoopsGTicket->check(true, 'mypreferences')) {
	188	+ if (!$xoopsGTicket->check(true, 'mypreferences')) {
189	189	redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
190	190	}
191		- require_once XOOPS_ROOT_PATH.'/class/template.php' ;
	191	+ require_once XOOPS_ROOT_PATH.'/class/template.php';
192	192	$xoopsTpl = new XoopsTpl();
193	193	//HACK by domifara for new XOOPS and XCL etc.
194	194	//old xoops
		@@ -209,7 +209,7 @@ discard block
		block discarded – undo
209	209	if ($count > 0) {
210	210	for ($i = 0; $i < $count; $i++) {
211	211	$config = $config_handler->getConfig($conf_ids[$i]);
212		- $new_value =& $_POST[$config->getVar('conf_name')];
	212	+ $new_value = & $_POST[$config->getVar('conf_name')];
213	213	if (is_array($new_value) \|\| $new_value != $config->getVar('conf_value')) {
214	214	// if language has been changed
215	215	if (!$lang_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'language') {
		@@ -238,13 +238,13 @@ discard block
		block discarded – undo
238	238	// generate compiled files for the new theme
239	239	// block files only for now..
240	240	$tplfile_handler = xoops_gethandler('tplfile');
241		- $dtemplates =& $tplfile_handler->find('default', 'block');
	241	+ $dtemplates = & $tplfile_handler->find('default', 'block');
242	242	$dcount = count($dtemplates);
243	243
244	244	// need to do this to pass to xoops_template_touch function
245	245	$GLOBALS['xoopsConfig']['template_set'] = $newtplset;
246	246
247		- altsys_clear_templates_c() ;
	247	+ altsys_clear_templates_c();
248	248
249	249	/* for ($i = 0; $i < $dcount; $i++) {
250	250	$found =& $tplfile_handler->find($newtplset, 'block', $dtemplates[$i]->getVar('tpl_refid'), null);
		@@ -259,7 +259,7 @@ discard block
		block discarded – undo
259	259
260	260	// generate image cache files from image binary data, save them under cache/
261	261	$image_handler = xoops_gethandler('imagesetimg');
262		- $imagefiles =& $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
	262	+ $imagefiles = & $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
263	263	foreach (array_keys($imagefiles) as $i) {
264	264	if (!$fp = fopen(XOOPS_CACHE_PATH.'/'.$newtplset.'_'.$imagefiles[$i]->getVar('imgsetimg_file'), 'wb')) {
265	265	} else {
		@@ -272,12 +272,12 @@ discard block
		block discarded – undo
272	272	}
273	273
274	274	// add read permission for the start module to all groups
275		- if (!$startmod_updated && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
	275	+ if (!$startmod_updated && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
276	276	$member_handler = xoops_gethandler('member');
277		- $groups =& $member_handler->getGroupList();
	277	+ $groups = & $member_handler->getGroupList();
278	278	$moduleperm_handler = xoops_gethandler('groupperm');
279	279	$module_handler = xoops_gethandler('module');
280		- $module =& $module_handler->getByDirname($new_value);
	280	+ $module = & $module_handler->getByDirname($new_value);
281	281	foreach ($groups as $groupid => $groupname) {
282	282	if (!$moduleperm_handler->checkRight('module_read', $module->getVar('mid'), $groupid)) {
283	283	$moduleperm_handler->addRight('module_read', $module->getVar('mid'), $groupid);
		@@ -293,5 +293,5 @@ discard block
		block discarded – undo
293	293	}
294	294	}
295	295
296		- redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED) ;
	296	+ redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED);
297	297	}

		@@ -1,147 +1,147 @@
		block discarded – undo
1	1	<?php
2	2
3		-require_once dirname(__DIR__).'/include/altsys_functions.php' ;
	3	+require_once dirname(__DIR__).'/include/altsys_functions.php';
4	4
5	5	function b_altsys_admin_menu_show($options)
6	6	{
7		- global $xoopsUser ;
	7	+ global $xoopsUser;
8	8
9		- $mydirname = empty($options[0]) ? 'altsys' : $options[0] ;
10		- $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
	9	+ $mydirname = empty($options[0]) ? 'altsys' : $options[0];
	10	+ $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
11	11
12	12	if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
13		- die('Invalid mydirname') ;
	13	+ die('Invalid mydirname');
14	14	}
15		- if (! is_object(@$xoopsUser)) {
16		- return array() ;
	15	+ if (!is_object(@$xoopsUser)) {
	16	+ return array();
17	17	}
18	18
19	19	// coretype
20		- $coretype = altsys_get_core_type() ;
	20	+ $coretype = altsys_get_core_type();
21	21
22	22	// mid_selected
23	23	if (is_object(@$GLOBALS['xoopsModule'])) {
24		- $mid_selected = $GLOBALS['xoopsModule']->getVar('mid') ;
	24	+ $mid_selected = $GLOBALS['xoopsModule']->getVar('mid');
25	25	// for system->preferences
26		- if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
	26	+ if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
27	27	$mid_selected = (int)$_GET['mod'];
28	28	}
29	29	} else {
30		- $mid_selected = 0 ;
	30	+ $mid_selected = 0;
31	31	}
32	32
33	33	$db = XoopsDatabaseFactory::getDatabaseConnection();
34		- (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
	34	+ (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) \|\| $myts = MyTextSanitizer::getInstance();
35	35
36	36	$module_handler = xoops_gethandler('module');
37		- $current_module =& $module_handler->getByDirname($mydirname);
	37	+ $current_module = & $module_handler->getByDirname($mydirname);
38	38	$config_handler = xoops_gethandler('config');
39		- $current_configs = $config_handler->getConfigList($current_module->mid()) ;
	39	+ $current_configs = $config_handler->getConfigList($current_module->mid());
40	40	$moduleperm_handler = xoops_gethandler('groupperm');
41	41	$admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
42		- $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids) . ')', 'IN'), true) ;
	42	+ $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids).')', 'IN'), true);
43	43
44	44	$block = array(
45		- 'mydirname' => $mydirname ,
46		- 'mod_url' => XOOPS_URL.'/modules/'.$mydirname ,
47		- 'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'] ,
	45	+ 'mydirname' => $mydirname,
	46	+ 'mod_url' => XOOPS_URL.'/modules/'.$mydirname,
	47	+ 'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'],
48	48	'mod_config' => $current_configs
49		- ) ;
	49	+ );
50	50
51	51	foreach ($modules as $mod) {
52	52	$mid = (int)$mod->getVar('mid');
53		- $dirname = $mod->getVar('dirname') ;
54		- $modinfo = $mod->getInfo() ;
55		- $submenus4assign = array() ;
56		- $adminmenu = array() ;
57		- $adminmenu4altsys = array() ;
58		- unset($adminmenu_use_altsys) ;
59		- @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'] ;
	53	+ $dirname = $mod->getVar('dirname');
	54	+ $modinfo = $mod->getInfo();
	55	+ $submenus4assign = array();
	56	+ $adminmenu = array();
	57	+ $adminmenu4altsys = array();
	58	+ unset($adminmenu_use_altsys);
	59	+ @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'];
60	60	// from admin_menu.php etc.
61		- $adminmenu = array_merge($adminmenu, $adminmenu4altsys) ;
	61	+ $adminmenu = array_merge($adminmenu, $adminmenu4altsys);
62	62	foreach ($adminmenu as $sub) {
63		- $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'] ;
	63	+ $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'];
64	64	if (isset($sub['show']) && $sub['show'] === false) {
65		- continue ;
	65	+ continue;
66	66	}
67	67	$submenus4assign[] = array(
68		- 'title' => $myts->makeTboxData4Show($sub['title']) ,
	68	+ 'title' => $myts->makeTboxData4Show($sub['title']),
69	69	'url' => XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($link, ENT_QUOTES)
70		- ) ;
	70	+ );
71	71	}
72	72
73	73	// for modules overriding Module.class.php (eg. Analyzer for XC)
74		- if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['cube_style'])) {
	74	+ if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['cube_style'])) {
75	75	$module_handler = xoops_gethandler('module');
76	76	$module = $module_handler->get($mid);
77		- $moduleObj =& Legacy_Utils::createModule($module);
78		- $modinfo['adminindex'] = $moduleObj->getAdminIndex() ;
79		- $modinfo['adminindex_absolute'] = true ;
	77	+ $moduleObj = & Legacy_Utils::createModule($module);
	78	+ $modinfo['adminindex'] = $moduleObj->getAdminIndex();
	79	+ $modinfo['adminindex_absolute'] = true;
80	80	foreach ($moduleObj->getAdminMenu() as $sub) {
81	81	if (@$sub['show'] === false) {
82		- continue ;
	82	+ continue;
83	83	}
84	84	$submenus4assign[] = array(
85		- 'title' => $myts->makeTboxData4Show($sub['title']) ,
	85	+ 'title' => $myts->makeTboxData4Show($sub['title']),
86	86	'url' => strncmp($sub['link'], 'http', 4) === 0 ? htmlspecialchars($sub['link'], ENT_QUOTES) : XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($sub['link'], ENT_QUOTES)
87		- ) ;
	87	+ );
88	88	}
89	89	} elseif (empty($adminmenu4altsys)) {
90	90
91	91	// add preferences
92		- if ($mod->getVar('hasconfig') && ! in_array($mod->getVar('dirname'), array( 'system', 'legacy' ))) {
	92	+ if ($mod->getVar('hasconfig') && !in_array($mod->getVar('dirname'), array('system', 'legacy'))) {
93	93	$submenus4assign[] = array(
94		- 'title' => _PREFERENCES ,
	94	+ 'title' => _PREFERENCES,
95	95	'url' => htmlspecialchars(altsys_get_link2modpreferences($mid, $coretype), ENT_QUOTES)
96		- ) ;
	96	+ );
97	97	}
98	98
99	99	// add help
100		- if (defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['help'])) {
	100	+ if (defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['help'])) {
101	101	$submenus4assign[] = array(
102		- 'title' => _HELP ,
	102	+ 'title' => _HELP,
103	103	'url' => XOOPS_URL.'/modules/legacy/admin/index.php?action=Help&dirname='.$dirname
104		- ) ;
	104	+ );
105	105	}
106	106	}
107	107
108	108	$module4assign = array(
109		- 'mid' => $mid ,
110		- 'dirname' => $dirname ,
111		- 'name' => $mod->getVar('name') ,
112		- 'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0) ,
113		- 'version_in_file' => sprintf('%.2f', $modinfo['version']) ,
114		- 'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES) ,
115		- 'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES) ,
116		- 'isactive' => $mod->getVar('isactive') ,
117		- 'hasmain' => $mod->getVar('hasmain') ,
118		- 'hasadmin' => $mod->getVar('hasadmin') ,
119		- 'hasconfig' => $mod->getVar('hasconfig') ,
120		- 'weight' => $mod->getVar('weight') ,
121		- 'adminindex' => htmlspecialchars(@$modinfo['adminindex'], ENT_QUOTES) ,
122		- 'adminindex_absolute' => @$modinfo['adminindex_absolute'] ,
123		- 'submenu' => $submenus4assign ,
124		- 'selected' => $mid == $mid_selected ? true : false ,
	109	+ 'mid' => $mid,
	110	+ 'dirname' => $dirname,
	111	+ 'name' => $mod->getVar('name'),
	112	+ 'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0),
	113	+ 'version_in_file' => sprintf('%.2f', $modinfo['version']),
	114	+ 'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES),
	115	+ 'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES),
	116	+ 'isactive' => $mod->getVar('isactive'),
	117	+ 'hasmain' => $mod->getVar('hasmain'),
	118	+ 'hasadmin' => $mod->getVar('hasadmin'),
	119	+ 'hasconfig' => $mod->getVar('hasconfig'),
	120	+ 'weight' => $mod->getVar('weight'),
	121	+ 'adminindex' => htmlspecialchars(@$modinfo['adminindex'], ENT_QUOTES),
	122	+ 'adminindex_absolute' => @$modinfo['adminindex_absolute'],
	123	+ 'submenu' => $submenus4assign,
	124	+ 'selected' => $mid == $mid_selected ? true : false,
125	125	'dot_suffix' => $mid == $mid_selected ? 'selected_opened' : 'closed'
126		- ) ;
127		- $block['modules'][] = $module4assign ;
	126	+ );
	127	+ $block['modules'][] = $module4assign;
128	128	}
129	129
130		- require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
131		- $tpl = new D3Tpl() ;
132		- $tpl->assign('block', $block) ;
133		- $ret['content'] = $tpl->fetch($this_template) ;
134		- return $ret ;
	130	+ require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
	131	+ $tpl = new D3Tpl();
	132	+ $tpl->assign('block', $block);
	133	+ $ret['content'] = $tpl->fetch($this_template);
	134	+ return $ret;
135	135	}
136	136
137	137
138	138	function b_altsys_admin_menu_edit($options)
139	139	{
140		- $mydirname = empty($options[0]) ? 'd3forum' : $options[0] ;
141		- $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
	140	+ $mydirname = empty($options[0]) ? 'd3forum' : $options[0];
	141	+ $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
142	142
143	143	if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
144		- die('Invalid mydirname') ;
	144	+ die('Invalid mydirname');
145	145	}
146	146
147	147	$form = "

		@@ -1,14 +1,14 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__.'/include/altsys_functions.php' ;
	3	+include_once __DIR__.'/include/altsys_functions.php';
4	4
5	5	// language file (modinfo.php)
6		-altsys_include_language_file('modinfo') ;
	6	+altsys_include_language_file('modinfo');
7	7
8		-$modversion['name'] = _MI_ALTSYS_MODULENAME ;
9		-$modversion['version'] = '0.83' ;
10		-$modversion['detailed_version'] = '0.83.0' ;
11		-$modversion['description'] = _MI_ALTSYS_MODULEDESC ;
	8	+$modversion['name'] = _MI_ALTSYS_MODULENAME;
	9	+$modversion['version'] = '0.83';
	10	+$modversion['detailed_version'] = '0.83.0';
	11	+$modversion['description'] = _MI_ALTSYS_MODULEDESC;
12	12	$modversion['credits'] = 'PEAK Corp.';
13	13	$modversion['author'] = 'GIJ=CHECKMATE<br />PEAK Corp.(http://www.peak.ne.jp/), XOOPS X Distribution(https://github.com/XoopsX)';
14	14	$modversion['license'] = 'GPL see LICENSE';
		@@ -26,18 +26,18 @@ discard block
		block discarded – undo
26	26	$modversion['adminmenu'] = 'admin/admin_menu.php';
27	27
28	28	// All Templates can't be touched by modulesadmin.
29		-$modversion['templates'] = array() ;
	29	+$modversion['templates'] = array();
30	30
31	31	// Blocks
32	32	$modversion['blocks'][1] = array(
33		- 'file' => 'blocks.php' ,
34		- 'name' => _MI_ALTSYS_BNAME_ADMIN_MENU ,
35		- 'description' => '' ,
36		- 'show_func' => 'b_altsys_admin_menu_show' ,
37		- 'edit_func' => 'b_altsys_admin_menu_edit' ,
38		- 'options' => "$mydirname" ,
39		- 'template' => '' , // use "module" template instead
40		-) ;
	33	+ 'file' => 'blocks.php',
	34	+ 'name' => _MI_ALTSYS_BNAME_ADMIN_MENU,
	35	+ 'description' => '',
	36	+ 'show_func' => 'b_altsys_admin_menu_show',
	37	+ 'edit_func' => 'b_altsys_admin_menu_edit',
	38	+ 'options' => "$mydirname",
	39	+ 'template' => '', // use "module" template instead
	40	+);
41	41
42	42	// Menu
43	43	$modversion['hasMain'] = 1;
		@@ -50,64 +50,64 @@ discard block
		block discarded – undo
50	50
51	51	// Configurations
52	52	$modversion['config'][1] = array(
53		- 'name' => 'adminmenu_hack_ft' ,
54		- 'title' => '_MI_ALTSYS_ADMINMENU_HFT' ,
55		- 'description' => '_MI_ALTSYS_ADMINMENU_HFTDSC' ,
56		- 'formtype' => 'select' ,
57		- 'valuetype' => 'int' ,
58		- 'default' => 0 ,
59		- 'options' => array( '_NONE' => 0 , '_MI_ALTSYS_AMHFT_OPT_2COL' => 1 , '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2 , '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3 )
60		-) ;
	53	+ 'name' => 'adminmenu_hack_ft',
	54	+ 'title' => '_MI_ALTSYS_ADMINMENU_HFT',
	55	+ 'description' => '_MI_ALTSYS_ADMINMENU_HFTDSC',
	56	+ 'formtype' => 'select',
	57	+ 'valuetype' => 'int',
	58	+ 'default' => 0,
	59	+ 'options' => array('_NONE' => 0, '_MI_ALTSYS_AMHFT_OPT_2COL' => 1, '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2, '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3)
	60	+);
61	61
62	62	$modversion['config'][] = array(
63		- 'name' => 'adminmenu_insert_mymenu' ,
64		- 'title' => '_MI_ALTSYS_ADMINMENU_IM' ,
65		- 'description' => '_MI_ALTSYS_ADMINMENU_IMDSC' ,
66		- 'formtype' => 'yesno' ,
67		- 'valuetype' => 'int' ,
68		- 'default' => 0 ,
	63	+ 'name' => 'adminmenu_insert_mymenu',
	64	+ 'title' => '_MI_ALTSYS_ADMINMENU_IM',
	65	+ 'description' => '_MI_ALTSYS_ADMINMENU_IMDSC',
	66	+ 'formtype' => 'yesno',
	67	+ 'valuetype' => 'int',
	68	+ 'default' => 0,
69	69	'options' => array()
70		-) ;
	70	+);
71	71
72	72	$modversion['config'][] = array(
73		- 'name' => 'admin_in_theme' ,
74		- 'title' => '_MI_ALTSYS_ADMIN_IN_THEME' ,
75		- 'description' => '_MI_ALTSYS_ADMIN_IN_THEMEDSC' ,
76		- 'formtype' => 'textbox' ,
77		- 'valuetype' => 'text' ,
78		- 'default' => 'default' ,
	73	+ 'name' => 'admin_in_theme',
	74	+ 'title' => '_MI_ALTSYS_ADMIN_IN_THEME',
	75	+ 'description' => '_MI_ALTSYS_ADMIN_IN_THEMEDSC',
	76	+ 'formtype' => 'textbox',
	77	+ 'valuetype' => 'text',
	78	+ 'default' => 'default',
79	79	'options' => array()
80		-) ;
	80	+);
81	81
82	82	$modversion['config'][] = array(
83		- 'name' => 'enable_force_clone' ,
84		- 'title' => '_MI_ALTSYS_ENABLEFORCECLONE' ,
85		- 'description' => '_MI_ALTSYS_ENABLEFORCECLONEDSC' ,
86		- 'formtype' => 'yesno' ,
87		- 'valuetype' => 'int' ,
88		- 'default' => 1 ,
	83	+ 'name' => 'enable_force_clone',
	84	+ 'title' => '_MI_ALTSYS_ENABLEFORCECLONE',
	85	+ 'description' => '_MI_ALTSYS_ENABLEFORCECLONEDSC',
	86	+ 'formtype' => 'yesno',
	87	+ 'valuetype' => 'int',
	88	+ 'default' => 1,
89	89	'options' => array()
90		-) ;
	90	+);
91	91
92	92	$modversion['config'][] = array(
93		- 'name' => 'images_dir' ,
94		- 'title' => '_MI_ALTSYS_IMAGES_DIR' ,
95		- 'description' => '_MI_ALTSYS_IMAGES_DIRDSC' ,
96		- 'formtype' => 'textbox' ,
97		- 'valuetype' => 'text' ,
98		- 'default' => 'images' ,
	93	+ 'name' => 'images_dir',
	94	+ 'title' => '_MI_ALTSYS_IMAGES_DIR',
	95	+ 'description' => '_MI_ALTSYS_IMAGES_DIRDSC',
	96	+ 'formtype' => 'textbox',
	97	+ 'valuetype' => 'text',
	98	+ 'default' => 'images',
99	99	'options' => array()
100		-) ;
	100	+);
101	101
102	102	// Notification
103	103
104	104	$modversion['hasNotification'] = 0;
105	105
106		-$modversion['onInstall'] = 'include/oninstall.php' ;
107		-$modversion['onUpdate'] = 'include/onupdate.php' ;
108		-$modversion['onUninstall'] = 'include/onuninstall.php' ;
	106	+$modversion['onInstall'] = 'include/oninstall.php';
	107	+$modversion['onUpdate'] = 'include/onupdate.php';
	108	+$modversion['onUninstall'] = 'include/onuninstall.php';
109	109
110	110	// keep block's options
111		-if (! defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && ! empty($_POST['fct']) && ! empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
112		- include __DIR__.'/include/x20_keepblockoptions.inc.php' ;
	111	+if (!defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && !empty($_POST['fct']) && !empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
	112	+ include __DIR__.'/include/x20_keepblockoptions.inc.php';
113	113	}

mambax7 / altsys

Push — master ( 3a6ebc...3a5a05 )

Status

Category

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +132 added lines, -132 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Switch Indentation +76 added lines, -76 removed lines patch added patch discarded remove patch

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

Spacing +70 added lines, -70 removed lines patch added patch discarded remove patch

Spacing +56 added lines, -56 removed lines patch added patch discarded remove patch