Index: trunk/kernel/parser.php
===================================================================
diff -u -r592 -r635
--- trunk/kernel/parser.php	(.../parser.php)	(revision 592)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 635)
@@ -779,7 +779,7 @@
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {        
@@ -794,13 +794,13 @@
         }
         break;
     case "logout":
-        $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_logout";
+        $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_logout";
         break;
     case "forgotpw":
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {      
@@ -810,21 +810,21 @@
             }
             else
                 $err = $var_list["t"];
-            $ret = GetIndexURL()."?env=".BuildEnv()."&Action=m_forgotpw&error=$err";
+            $ret = GetIndexURL(2)."?env=".BuildEnv()."&Action=m_forgotpw&error=$err";
         }
         break;
     case "forgotpw_confirm":
-        $ret = GetIndexURL()."?env=".BuildEnv();
+        $ret = GetIndexURL(2)."?env=".BuildEnv();
         break;
     case "suggest":
     	if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {      
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_suggest_email";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_suggest_email";
         	if(strlen($attribs["_confirmtemplate"])>0)
         	{
         		$ret .= "&Confirm=".$attribs["_confirmtemplate"];        		
@@ -849,7 +849,7 @@
     	if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {      
@@ -860,18 +860,18 @@
 			else 
 			  $var_list_update["t"] = "index";
 			  
-			$ret = GetIndexURL()."?env=" . BuildEnv();
+			$ret = GetIndexURL(2)."?env=" . BuildEnv();
         }  
 	break;			          
     case "m_subscribe":
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {      
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_subscribe_confirm";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_subscribe_confirm";
             if(strlen($attribs["_subscribetemplate"]))
             {
             	$ret .="&Subscribe=".$attribs["_subscribetemplate"];
@@ -889,24 +889,24 @@
     break; 
         
     case "subscribe_confirm":				
-		$ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_subscribe";  
+		$ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_subscribe";  
 		if($attribs["_subscribetemplate"])
 		  $ret .= "&Subscribe=".$attribs["_subscribetemplate"];		  
     break;   
     case "unsubscribe_confirm":
-		$ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_unsubscribe";  
+		$ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_unsubscribe";  
 		if($attribs["_subscribetemplate"])
 		  $ret .= "&Subscribe=".$attribs["_subscribetemplate"];		      
     break;
     case "m_unsubscribe":
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {   
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_unsubscribe";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_unsubscribe";
         	if(strlen($attribs["_confirmtemplate"])>0)
         	{
         		$ret .= "&Confirm=".$attribs["_confirmtemplate"];        		
@@ -930,31 +930,31 @@
         
     break;   
     case "m_unsubscribe_confirm":
-		$ret = GetIndexURL()."?env=" . BuildEnv();
+		$ret = GetIndexURL(2)."?env=" . BuildEnv();
     break;   
     case "m_acctinfo":
-        $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_acctinfo&UserId=".$objSession->Get("PortalUserId");
+        $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_acctinfo&UserId=".$objSession->Get("PortalUserId");
         m_form_load_values($form, $objSession->Get("PortalUserId"));
     break;
     case "m_profile":
-        $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_profile&UserId=".$objSession->Get("PortalUserId");
+        $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_profile&UserId=".$objSession->Get("PortalUserId");
         m_form_load_values($form,$objSession->Get("PortalUserId"));
     break;
     
     case "m_set_theme":
-        $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_set_theme";        
+        $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_set_theme";        
     break;
     
     case "m_register":        
     	
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {      
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_register";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_register";
             
             switch ($objConfig->Get("User_Allow_New"))
             {
@@ -985,18 +985,18 @@
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {      
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
     break;
     case "m_addcat":
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {      
@@ -1018,7 +1018,7 @@
                 $action="m_add_cat_confirm";
             }
 
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=$action";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=$action";
             if(strlen($ConfirmTemplate))
                 $ret .= "&Confirm=$ConfirmTemplate";
 
@@ -1059,17 +1059,17 @@
         }
         else
           $var_list_update["t"] = $var_list["t"];
-          $ret = GetIndexURL()."?env=".BuildEnv();        
+          $ret = GetIndexURL(2)."?env=".BuildEnv();        
         break;
     case "m_simplesearch":     
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {  
-          $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_simple_search";
+          $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_simple_search";
           
           if(strlen($attribs["_errortemplate"]))
           	$ret.= "&Error=".$attribs["_errortemplate"];
@@ -1081,23 +1081,23 @@
         if(!$objSession->SessionEnabled())
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {  
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_simple_subsearch";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_simple_subsearch";
             m_form_load_values($form,0);
         }
     break;
     case "m_adv_search_type":
     	if(!$objSession->SessionEnabled())
     	{
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {  
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_advsearch_type";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_advsearch_type";
             m_form_load_values($form,0);
         }
     break;        		
@@ -1108,11 +1108,11 @@
         if(!$objSession->SessionEnabled() && !strlen($SearchType))
         {
             $var_list_update["t"] = "error_session";
-            $ret = GetIndexURL()."?env=" . BuildEnv();
+            $ret = GetIndexURL(2)."?env=" . BuildEnv();
         }
         else
         {  
-            $ret = GetIndexURL()."?env=" . BuildEnv()."&Action=m_adv_search&type=$SearchType";
+            $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=m_adv_search&type=$SearchType";
             m_form_load_values($form,0);
         }
     break;
@@ -1123,7 +1123,7 @@
             $target_template="login";
         $var_list_update["t"] = $target_template;
 
-        $ret = GetIndexURL()."?env=" . BuildEnv();
+        $ret = GetIndexURL(2)."?env=" . BuildEnv();
     break;
     
     case "error_template":
@@ -1143,7 +1143,7 @@
 
 //        $m_var_list_update["cat"]=0;
         
-        $ret = GetIndexURL()."?env=".BuildEnv();
+        $ret = GetIndexURL(2)."?env=".BuildEnv();
         
     break;