Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -r3109 -r3124
--- trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 3109)
+++ trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 3124)
@@ -488,7 +488,7 @@
             
             case 'send_pm_link':
             	$var_list_update['t'] = $element->GetAttributeByName('_Template');
-            	$ret = GetIndexURL(2)."?env=".BuildEnv()."&ToUser=".$this->Get('Login');
+            	$ret = HREF_Wrapper('', Array('ToUser' => $this->Get('Login') ) );
             	break;
             	
             case "profile_link":
@@ -503,8 +503,10 @@
                     $var_list_update["t"] = $t;
                 }
                 else
+                {
                     $var_list_update["t"] = $var_list["t"];
-                $ret = GetIndexURL(2)."?env=" . BuildEnv()."&UserId=".$this->Get("PortalUserId");
+                }
+                $ret = HREF_Wrapper('', Array('UserId' => $this->Get('PortalUserId') ) );
             break;
             case "add_friend_link":
                 /*
@@ -521,9 +523,10 @@
                         $var_list_update["t"] = $t;
                     }
                     else
+                    {
                         $var_list_update["t"] = $var_list["t"];
-                    $action = "m_add_friend";
-                    $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=".$action."&UserId=".$this->Get("PortalUserId");
+                    }
+                    $ret = HREF_Wrapper('', Array('Action' => 'm_add_friend', 'UserId' => $this->Get('PortalUserId') ) );
                 }
                 else
                     $ret = "";
@@ -543,9 +546,10 @@
                     $var_list_update["t"] = $t;
                   }
                   else
+                  {
                     $var_list_update["t"] = $var_list["t"];
-                  $action = "m_del_friend";
-                  $ret = GetIndexURL(2)."?env=" . BuildEnv()."&Action=".$action."&UserId=".$this->Get("PortalUserId");
+                  }
+                  $ret = HREF_Wrapper('', Array('Action' => 'm_del_friend', 'UserId' => $this->Get('PortalUserId') ) );
                 }
                 else
                     $ret = "";
@@ -703,7 +707,7 @@
 		case "user_profile_link":
 			$var_list_update["t"] = "user_profile";
 			$m_var_list_update["action"] = $this->Get("UserId");
-			$ret = GetIndexURL(2)."?env=" . BuildEnv();
+			$ret = HREF_Wrapper();
 			unset($m_var_list_update["action"], $var_list_update["t"]);
 			return $ret;
 			break;
@@ -712,7 +716,7 @@
             break;
         case "user_messages_link":
 			$var_list_update["t"] = "inbulletin/bb_private_msg_list";
-			return GetIndexURL(2)."?env=" . BuildEnv();
+			return HREF_Wrapper();
 			unset($var_list_update);
 			break;
 		default:
@@ -744,8 +748,7 @@
     {
         global $objConfig, $m_var_list_update, $var_list_update, $var_list;
 
-        if(!strlen($page))
-            $page = GetIndexURL(2);
+//        if(!strlen($page)) $page = GetIndexURL(2);
         $NumPages = $this->GetNumPages($objConfig->Get("Perpage_Topics"));
         if(strlen($dest_template)>0)
         {
@@ -759,12 +762,12 @@
         if($this->Page>1)
         {
           $m_var_list_update["p"]=$this->Page-1;
-          $prev_url = $page."?env=".BuildEnv();
+          $prev_url = HREF_Wrapper();
         }
         if($this->Page<$NumPages)
         {
           $m_var_list_update["p"]=$this->Page+1;
-          $next_url = $page."?env=".BuildEnv();
+          $next_url = HREF_Wrapper();
         }
         
         for($p=1;$p<=$NumPages;$p++)
@@ -773,7 +776,7 @@
             if($p!=$this->Page)
             {
                 $m_var_list_update["p"]=$p;
-                $href = $page."?env=".BuildEnv();
+                $href = HREF_Wrapper();
                 $t = str_replace("<%page_link%>", $href, $t);
                 $t = str_replace("<%page_number%>",$p,$t);
                 $t = str_replace("<%prev_url%>",$prev_url,$t);