Index: trunk/kernel/include/modules.php =================================================================== diff -u -N -r4698 -r6093 --- trunk/kernel/include/modules.php (.../modules.php) (revision 4698) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 6093) @@ -35,7 +35,7 @@ else { $env_sections = explode(':', $env); - + $main = array_shift($env_sections); if($main) { @@ -55,7 +55,7 @@ $var_list['t'] = $template; if( getArrayValue($_GET, 'dest') ) $var_list['dest'] = $_GET['dest']; } - + foreach ($env_sections as $env_section) { $env_section = preg_replace("/^([a-zA-Z]+)([0-9]+)-(.*)/", "$1-$2-$3", $env_section); @@ -68,7 +68,7 @@ } } - + } if(!$SessionQueryString) $var_list['sid'] = $_COOKIE[SESSION_COOKIE_NAME]; @@ -77,7 +77,7 @@ function LoadEnv() { global $env, $var_list, $mod_prefix,$objSession; - + $env = $_GET["env"]; // echo "Loading Variables..
\n"; if ($env != "") @@ -224,7 +224,7 @@ $url_params = Array('t' => $t); $app =& kApplication::Instance(); $app->SetVar('prefixes_passed', Array() ); - + if( is_array($mod_prefix) ) { foreach($mod_prefix as $key => $value) @@ -240,7 +240,7 @@ } } } - + $url_params['pass'] = implode( ',', $app->GetVar('prefixes_passed') ); return $url_params; } @@ -559,7 +559,7 @@ foreach ($vars as $config_key => $config_value) { $GLOBALS['g_'.$config_key] = $config_value; } - + $lic = base64_decode($GLOBALS['g_License']); _ParseLicense($lic); @@ -798,7 +798,9 @@ $mod = $pathtoroot . $value . "parser.php"; // LogEntry("Loading parser $mod \n"); - require_once($mod); + if (file_exists($mod)) { // k4 modules may have no parser.php + require_once($mod); + } } } @@ -863,10 +865,10 @@ if($Action == 'm_logout') { $u = new clsUserSession($var_list['sid'] ,($SessionQueryString && $FrontEnd==1)); - + $application =& kApplication::Instance(); $application->HandleEvent( new kEvent('u:OnInpLogout') ); - + $u->Logout(); unset($u); $var_list_update['t'] = 'index'; @@ -962,7 +964,7 @@ { $var_to_global = $key.'_var_list'; global $$var_to_global; - + $application =& kApplication::Instance(); // just to sure, that object is here in all actions if($FrontEnd == 0 || !is_numeric($FrontEnd) || $FrontEnd == 2) { $rootURL = 'http://'.ThisDomain().$objConfig->Get('Site_Path');