Index: trunk/kernel/include/config.php =================================================================== diff -u -N -r105 -r259 --- trunk/kernel/include/config.php (.../config.php) (revision 105) +++ trunk/kernel/include/config.php (.../config.php) (revision 259) @@ -127,17 +127,18 @@ return $result; } - function GetSessionValues($VarType) + function GetConfigValues($postfix = '') { - $result = array(); - foreach($this->config as $property=>$values) - { - if(strlen($values[$VarType])>0) - { - $result[$property] = $values[$VarType]; - } - } - return $result; + // return only varibles, that match specified criteria + if(!$postfix) return $this->config; + $result = Array(); + $postfix_len = $postfix ? strlen($postfix) : 0; + foreach($this->config as $config_var => $var_value) + { + if( substr($config_var, - $postfix_len) == $postfix ) + $result[$config_var] = $var_value; + } + return $result; } }/* clsConfig */ Index: trunk/admin/install.php =================================================================== diff -u -N -r257 -r259 --- trunk/admin/install.php (.../install.php) (revision 257) +++ trunk/admin/install.php (.../install.php) (revision 259) @@ -71,13 +71,7 @@ } if( file_exists($pathtoroot.'debug.php') && !defined('DEBUG_MODE') ) include_once($pathtoroot.'debug.php'); -if( defined('DEBUG_MODE') ) -{ - error_reporting(E_ALL & E_NOTICE); - ini_set('display_errors', 1); -} -else - error_reporting(0); +//if( !defined('DEBUG_MODE') ) error_reporting(0); $path_char = GetPathChar(); //phpinfo(INFO_VARIABLES); Index: trunk/kernel/include/modlist.php =================================================================== diff -u -N -r13 -r259 --- trunk/kernel/include/modlist.php (.../modlist.php) (revision 13) +++ trunk/kernel/include/modlist.php (.../modlist.php) (revision 259) @@ -115,5 +115,16 @@ //$this->LoadModules(); return $this->FindModule('Name',$name); } + + function MergeReturn($array) + { + // merge results ganed with ExecuteFunction + // method in a specific way + $tmp = Array(); + foreach($array as $mod_name => $mod_results) + foreach($mod_results as $mod_var => $mod_var_value) + $tmp[$mod_var][$mod_name] = $mod_var_value; + return $tmp; + } } Index: trunk/admin/advanced_view.php =================================================================== diff -u -N -r141 -r259 --- trunk/admin/advanced_view.php (.../advanced_view.php) (revision 141) +++ trunk/admin/advanced_view.php (.../advanced_view.php) (revision 259) @@ -257,17 +257,17 @@ int_SectionHeader(); -$filter = false; -$sessVars = $objConfig->GetSessionValues(0); -//print_pre($sessVars); -foreach ($sessVars as $key => $value) { - if (strstr($key, '_View')) { - //echo "$value
"; - if ($value != 1) { + $bit_combo = $objModules->ExecuteFunction('GetModuleInfo', 'all_bitmask'); + $bit_combo = $objModules->MergeReturn($bit_combo); + foreach($bit_combo['VarName'] as $mod_name => $VarName) + { + //echo "VarName: [$VarName] = [".$objConfig->Get($VarName)."], ALL = [".$bit_combo['Bits'][$mod_name]."]
"; + if( $objConfig->Get($VarName) != $bit_combo['Bits'][$mod_name] ) + { $filter = true; + break; } } -} ?> Index: trunk/index.php =================================================================== diff -u -N -r13 -r259 --- trunk/index.php (.../index.php) (revision 13) +++ trunk/index.php (.../index.php) (revision 259) @@ -1,12 +1,7 @@ GetVariable("SearchWord") != '') { $filter = true; } else { - $sessVars = $objConfig->GetSessionValues(0); - //print_pre($sessVars); - foreach ($sessVars as $key => $value) { - if (strstr($key, '_View')) { - //echo "$value
"; - if ($value != 1) { - $filter = true; - } + $bit_combo = $objModules->ExecuteFunction('GetModuleInfo', 'all_bitmask'); + $bit_combo = $objModules->MergeReturn($bit_combo); + foreach($bit_combo['VarName'] as $mod_name => $VarName) + { + //echo "VarName: [$VarName] = [".$objConfig->Get($VarName)."], ALL = [".$bit_combo['Bits'][$mod_name]."]
"; + if( $objConfig->Get($VarName) != $bit_combo['Bits'][$mod_name] ) + { + $filter = true; + break; } } } Index: trunk/kernel/startup.php =================================================================== diff -u -N -r199 -r259 --- trunk/kernel/startup.php (.../startup.php) (revision 199) +++ trunk/kernel/startup.php (.../startup.php) (revision 259) @@ -3,13 +3,7 @@ startup.php: this is the primary startup sequence for in-portal services */ if( file_exists($pathtoroot.'debug.php') && !defined('DEBUG_MODE') ) include_once($pathtoroot.'debug.php'); -if( defined('DEBUG_MODE') ) -{ - error_reporting(E_ALL & E_NOTICE); - ini_set('display_errors', 1); -} -else - error_reporting(0); +if( !defined('DEBUG_MODE') ) error_reporting(0); ini_set('memory_limit', '16M'); Index: trunk/kernel/admin/include/parser.php =================================================================== diff -u -N -r150 -r259 --- trunk/kernel/admin/include/parser.php (.../parser.php) (revision 150) +++ trunk/kernel/admin/include/parser.php (.../parser.php) (revision 259) @@ -266,6 +266,10 @@ return $ret; break; + + case 'all_bitmask': // return bitmask value equals to "all" for module filter + return Array('VarName' => 'Category_View', 'Bits' => 127); + break; } return false; Index: trunk/admin/include/tabs.js =================================================================== diff -u -N -r251 -r259 --- trunk/admin/include/tabs.js (.../tabs.js) (revision 251) +++ trunk/admin/include/tabs.js (.../tabs.js) (revision 259) @@ -142,7 +142,6 @@ if(full_env.substr(0,3)!="env") full_env = 'env='+full_env; - f = document.getElementById(formname); if(f) @@ -167,8 +166,9 @@ { f.elements[status_field].value = save_value; //0= stay in temp, 1=save to perm, 2 = purge no save } - + alert('action: '+f.action); if(new_target != null && typeof(new_target) != 'undefined') f.target = new_target; + f.submit(); } else Index: trunk/kernel/include/modules.php =================================================================== diff -u -N -r236 -r259 --- trunk/kernel/include/modules.php (.../modules.php) (revision 236) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 259) @@ -130,7 +130,7 @@ } } -function BuildEnv($mod_prefix) +function BuildEnv($mod_prefix = false) { global $var_list,$m_var_list, $var_list_update, $mod_prefix, $objSession, $objConfig, $ExtraVars, $objThemes, $CurrentTheme, $SessionQueryString, $FrontEnd;