Index: trunk/kernel/include/category.php
===================================================================
diff -u -r2562 -r3124
--- trunk/kernel/include/category.php	(.../category.php)	(revision 2562)
+++ trunk/kernel/include/category.php	(.../category.php)	(revision 3124)
@@ -184,7 +184,7 @@
          $m_var_list_update["p"] = "1";
          $cat_name = $rs->fields['Name'];
 		if (!is_null($anchor))
-			$ret .= "<a class=\"$class_name\" href=\"".GetIndexURL(2)."?env=" . BuildEnv() . "\">$cat_name</a>";            
+			$ret .= "<a class=\"$class_name\" href=\"". HREF_Wrapper() . "\">$cat_name</a>";            
 		else
 			$ret .= "<span=\"$class_name\">$cat_name</span>";       
         
@@ -615,7 +615,7 @@
         global $m_var_list_update;
 
         $m_var_list_update["cat"] = $this->Get("CategoryId");
-        $ret =  GetIndexURL(2)."?env=".BuildEnv();
+        $ret =  HREF_Wrapper();
         unset($m_var_list_update["cat"]);
         return $ret;
     }
@@ -625,7 +625,7 @@
         global $m_var_list_update;
 
         $m_var_list_update["cat"] = $this->Get("ParentId");
-        $ret =  GetIndexURL(2)."?env=".BuildEnv();
+        $ret =  HREF_Wrapper();
         unset($m_var_list_update["cat"]);
         return $ret;
     }
@@ -998,9 +998,11 @@
                     $var_list_update["t"] = $t;
                 }
                 else
+                {
                     $var_list_update["t"] = $var_list["t"];
+                }
                 $m_var_list_update["cat"] = $this->Get("CategoryId");
-                $ret = GetIndexURL(2)."?env=" . BuildEnv();
+                $ret = HREF_Wrapper();
                 unset($m_var_list_update["cat"], $var_list_update["t"]);
             break;
             case "adminlink":
@@ -1018,9 +1020,11 @@
                     $var_list_update["t"] = $t;
                 }
                 else
+                {
                     $var_list_update["t"] = $var_list["t"];
+                }
                 $m_var_list_update["cat"] = $this->Get("CategoryId");
-                $ret = GetIndexURL(2)."?env=" . BuildEnv();
+                $ret = HREF_Wrapper();
                 unset($m_var_list_update["cat"], $var_list_update["t"]);
 			break;            
             case "link_selector":
@@ -1693,8 +1697,7 @@
   {
       global $objConfig, $m_var_list_update, $var_list_update, $var_list;
 
-      if(!strlen($page))
-          $page = GetIndexURL(2);
+//      if(!strlen($page)) $page = GetIndexURL(2);
 
       $PerPage = $this->GetPerPage();
       $NumPages = ceil( $this->GetNumPages($PerPage) );
@@ -1729,7 +1732,7 @@
       if($StartPage>1)
       {
         $m_var_list_update["p"] = $this->Page-$PagesToList;
-        $prev_url = $page."?env=".BuildEnv();
+        $prev_url = HREF_Wrapper();
         $o .= "<A HREF=\"$prev_url\">&lt;&lt;</A>";
       }
 
@@ -1739,7 +1742,7 @@
           if($p!=$this->Page)
           {
               $m_var_list_update["p"]=$p;
-              $href = $page."?env=".BuildEnv();
+              $href = HREF_Wrapper();
               $o .= " <A HREF=\"$href\" >$p</A> ";
           }
           else
@@ -1750,7 +1753,7 @@
       if($EndPage<$NumPages && $EndPage>0)
       {
         $m_var_list_update["p"]=$this->Page+$PagesToList;
-        $next_url = $page."?env=".BuildEnv();
+        $next_url = HREF_Wrapper();
         $o .= "<A HREF=\"$next_url\"> &gt;&gt;</A>";
       }
       unset($m_var_list_update,$var_list_update["t"] );
@@ -1848,12 +1851,11 @@
     // draw category navigation bar (at top)
     global $Errors, $var_list_update, $var_list, $m_var_list_update, $m_var_list, $objConfig;
 
-	$selector = isset($_REQUEST['Selector']) ? '&Selector='.$_REQUEST['Selector'] : '';
-	$new = isset($_REQUEST['new']) ? '&new='.$_REQUEST['new'] : '';
-	$destform = GetVar('destform') !== false ? '&destform='.GetVar('destform') : '';
+    $url_params = Array('reset' => 1);
+	if( GetVar('Selector') ) $url_params['Selector'] = GetVar('Selector');
+	if( GetVar('new') ) $url_params['new'] = GetVar('new');
+	if( GetVar('destform') ) $url_params['destform'] = GetVar('destform');
 	
-	$add = $selector.$new.$destform.'&reset=1';
-	
     $nav = "";
     $m_var_list_update["p"]=1;   
     if(strlen($target_template)==0)
@@ -1866,7 +1868,7 @@
         if ($LinkRoot)
         {
         	$var_list_update["t"] = strlen($RootTemplate)? $RootTemplate : $target_template;
-        	$nav = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">$cat_name</a>";	}
+        	$nav = "<a class=\"navbar\" href=\"" . HREF_Wrapper('', $url_params) . "\">$cat_name</a>";	}
         else
         	$nav = "<span class=\"NAV_CURRENT_ITEM\">$cat_name</span>";
     }
@@ -1896,7 +1898,7 @@
         {          
           if ($admin == 1)       
           {
-            $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$add."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"control_link\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
           }
           else
           {
@@ -1908,7 +1910,7 @@
             {
               $var_list_update["t"] = $target_template;
             }
-            $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"navbar\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
           }
         }
       }
@@ -1925,7 +1927,7 @@
         {          
           if ($admin == 1)       
           {
-            $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$add."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"control_link\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
           }
           else
           {
@@ -1935,7 +1937,7 @@
             }
             else
               $var_list_update["t"] = $target_template;
-            $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"navbar\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
           }
         }
         
@@ -1969,12 +1971,12 @@
               {          
                 if ($admin == 1)       
                 {
-                  $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$add."\">".$cat_name."</a>";
+                  $nav[] = "<a class=\"control_link\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
                 }
                 else
                 {
                   $var_list_update["t"] = $t;
-                  $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">".$cat_name."</a>";
+                  $nav[] = "<a class=\"navbar\" href=\"".HREF_Wrapper('', $url_params)."\">".$cat_name."</a>";
                   unset($var_list_update["t"]);
                 }
               }