X-Git-Url: http://git.dj3c1t.com/?a=blobdiff_plain;f=mw%2Fenv%2Fmodules%2Fmw_env_urls.php;h=b76a270f7b51ec71cbc7ce19fd4cad369b2e32d8;hb=refs%2Fheads%2Fmaster;hp=d7194f80b93003a43d2697570d911ebdfa89a035;hpb=36ed114046cbe3d72a3589230e9f306a54fcc79d;p=mtweb

diff --git a/mw/env/modules/mw_env_urls.php b/mw/env/modules/mw_env_urls.php
index d7194f8..b76a270 100644
--- a/mw/env/modules/mw_env_urls.php
+++ b/mw/env/modules/mw_env_urls.php
@@ -2,9 +2,9 @@
 
   class mw_env_urls extends mw_env{
 
-    var $additional_get_params;
+    public $additional_get_params;
 
-    function init_additional_get_params(){
+    public function init_additional_get_params(){
       $this->additional_get_params = array();
       $_params = $_SERVER["QUERY_STRING"];
       $v_params = explode("&", $_params);
@@ -17,12 +17,13 @@
       }
     }
 
-    function is_a_param($key){
+    public function is_a_param($key){
       foreach($this->get_PARAMS() as $_key => $_value) if(strcmp($key, $_value) == 0) return true;
       return false;
     }
 
-    function url($action = "", $_params = array(), $script_name = "index.php"){
+    public function url($action = "", $_params = array(), $script_name = null){
+      $script_name = isset($script_name) ? $script_name : ($this->config("script_name") ? $this->config("script_name") : "index.php");
       if($action) $_params["e"] = $action;
       $get_params = "";
       if(isset($this->additional_get_params)) foreach($this->additional_get_params as $key => $value) $get_params .= ($get_params ? "&" : "?").$key."=".$value;
@@ -30,7 +31,7 @@
       return $this->path("web").$script_name.$get_params;
     }
 
-    function redirect($url, $message, $wait = 1){
+    public function redirect($url, $message, $wait = 1){
       $this->set_etat("reponses/html/redirect_javascript", false);
       $this->set_out(
         "redirect",
@@ -40,8 +41,12 @@
           "wait" => $wait
         )
       );
+      if(!headers_sent()){
+        if($wait){
+          if(function_exists("header_remove")) header_remove("Location");
+        }
+        else header("Location: ".str_replace("&", "&", $url));
+      }
     }
 
   }
-
-?>
\ No newline at end of file