Index: trunk/kernel/include/modules.php
===================================================================
diff -u -r1462 -r1566
--- trunk/kernel/include/modules.php	(.../modules.php)	(revision 1462)
+++ trunk/kernel/include/modules.php	(.../modules.php)	(revision 1566)
@@ -44,16 +44,19 @@
          if(strlen($key))
          {
            $parsed=FALSE;
+           
            $parser_name = $key . "_ParseEnv";
            for($i=1; $i<sizeof($envsections); $i++)
            {
-             $pieces = explode("-", $envsections[$i]);
-             if(substr($pieces[0],0,strlen($key))==$key)
+           	 $section_piece = preg_replace("/^([a-zA-Z]+)([0-9]+)-(.*)/", "$1-$2-$3", $envsections[$i]);
+             $pieces = explode("-", $section_piece);
+             if($pieces[0] == $key)
              {             
                 $parsed=TRUE;
                 if(function_exists($parser_name))
                 {
-                  $parser_name($envsections[$i]);
+                	$inp_section = preg_replace('/^([a-zA-Z]+)-([0-9]+)-(.*)/','\\1\\2-\\3',  $envsections[$i]);
+                  	$parser_name($inp_section);
                 }
              }
            }
@@ -66,7 +69,8 @@
            }
          }
        }
-       $req_vars = explode("-", $envsections[0]);
+       
+       $req_vars = explode("-", $envsections[0], 2);
        $sid = $req_vars[0]; 
        if(!$SessionQueryString)
        {
@@ -135,83 +139,91 @@
 
 function BuildEnv($mod_prefix = false)
 {  
-    global $var_list,$m_var_list, $var_list_update, $mod_prefix, $objSession, $objConfig,
-           $ExtraVars, $objThemes, $CurrentTheme, $SessionQueryString, $FrontEnd;
-    
-    static $theme;
+	global $var_list,$m_var_list, $var_list_update, $mod_prefix, $objSession, $objConfig,
+	$ExtraVars, $objThemes, $CurrentTheme, $SessionQueryString, $FrontEnd;
 
-    $env = "";  
-    //echo "Query String: $SessionQueryString<br>\n";
-    if(($objConfig->Get("CookieSessions")==0 || !$FrontEnd || ($objConfig->Get("CookieSessions")==2 && $SessionQueryString==TRUE)))
-    {
-    	if(!$objSession->UseTempKeys)
-    	{
-    	  $sessionkey = $objSession->GetSessionKey();
-    	}
-    	else
-    	  $sessionkey = $objSession->Get("CurrentTempKey");
-	  $env = $sessionkey;
-    }
-    $env .= "-";	
-    
-    if (isset($var_list_update["t"]))
-    { 
-    	if($var_list_update["t"]=="_referer_")
-    	{
-    		$var_list_update["t"] =$objSession->GetVariable("Template_Referer");
-    	}
-    	
-        $t = $var_list_update["t"];
-        if(!is_numeric($t))
-        {
-            if(!is_object($theme))
-               $theme = $objThemes->GetItem($m_var_list["theme"]);            
-            $id = $theme->GetTemplateId($t);
-            $var_list_update["t"] = $id;
-        }
-		$env .= $var_list_update["t"];
-    }
+	static $theme;
+
+	$env = "";
+	//echo "Query String: $SessionQueryString<br>\n";
+	if(($objConfig->Get("CookieSessions")==0 || !$FrontEnd || ($objConfig->Get("CookieSessions")==2 && $SessionQueryString==TRUE)))
+	{
+		if(!$objSession->UseTempKeys)
+		{
+			$sessionkey = $objSession->GetSessionKey();
+		}
+		else
+		$sessionkey = $objSession->Get("CurrentTempKey");
+		$env = $sessionkey;
+	}
+	$env .= "-";
+
+	if (isset($var_list_update["t"]))
+	{
+		if($var_list_update["t"]=="_referer_")
+		{
+			$var_list_update["t"] =$objSession->GetVariable("Template_Referer");
+		}
+
+		$t = $var_list_update["t"];
+		
+		if (substr($t, 0, strlen('kernel4:')) == 'kernel4:') 
+		{
+			$t = substr($t, strlen('kernel4:'));
+			$env .= $t;
+		}
+		else {
+			if(!is_numeric($t))
+			{
+				if(!is_object($theme))
+				$theme = $objThemes->GetItem($m_var_list["theme"]);
+				$id = $theme->GetTemplateId($t);
+				$var_list_update["t"] = $id;
+			}
+			$env .= $var_list_update["t"];
+		}
+	}
 	else
-    {
-        $t = isset($var_list['t']) ? $var_list['t'] : '';
-        if(!is_numeric($t))
-        {
-            if(!is_object($theme))
-               $theme = $objThemes->GetItem($m_var_list["theme"]);           
-            $id = $theme->GetTemplateId($t);
-            $t = $id;            
-        }
-		$env .= $t; 
-    }
+	{
+		$t = isset($var_list['t']) ? $var_list['t'] : '';
+		if(!is_numeric($t))
+		{
+			if(!is_object($theme))
+			$theme = $objThemes->GetItem($m_var_list["theme"]);
+			$id = $theme->GetTemplateId($t);
+			$t = $id;
+		}
+		$env .= $t;
+	}
 
-    if(is_array($mod_prefix))
-    {    
-      foreach($mod_prefix as $key => $value)
-	  {        
-       	$builder_name = $key . "_BuildEnv";
-        if(function_exists($builder_name))
-        { 
-        	$GLOBALS[$key.'_var_list_update']['test'] = 'test';
-        	$env .= $builder_name();
-        }
-	  }
-    }
-    
-    $extra = "";
-    $keys = array_keys($ExtraVars);
-    if(is_array($keys))
-    {    
-      for($i=0;$i<count($keys);$i++)   
-      {
-        $key = $keys[$i];
+	if(is_array($mod_prefix))
+	{
+		foreach($mod_prefix as $key => $value)
+		{
+			$builder_name = $key . "_BuildEnv";
+			if(function_exists($builder_name))
+			{
+				$GLOBALS[$key.'_var_list_update']['test'] = 'test';
+				$env .= $builder_name();
+			}
+		}
+	}
 
-        $e = "&".$key."=".$ExtraVars[$key];
-        $extra .= $e;
-        $e = "";
-      }
-    }
-    $env .= $extra;
-    
+	$extra = "";
+	$keys = array_keys($ExtraVars);
+	if(is_array($keys))
+	{
+		for($i=0;$i<count($keys);$i++)
+		{
+			$key = $keys[$i];
+
+			$e = "&".$key."=".$ExtraVars[$key];
+			$extra .= $e;
+			$e = "";
+		}
+	}
+	$env .= $extra;
+
 	return $env;
 }
 
@@ -907,6 +919,9 @@
 {
  foreach($mod_prefix as $key => $folder_name)
  {
+ 		$var_to_global = $key.'_var_list';
+ 		global $$var_to_global;
+ 		
     if( $FrontEnd==0 || !is_numeric($FrontEnd) || $FrontEnd==2)
     { 
 	  $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");