Changeset 3988

Timestamp:

04/12/11 10:40:42 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #1726 - Corrigido url do link (voltar) do mobile, r3987

File:

• branches/2.2.0.1/mobile/inc/class.mobiletemplate.inc.php (modified) (1 diff)

branches/2.2.0.1/mobile/inc/class.mobiletemplate.inc.php

@@ -140 +140 @@
 
                 private function process_back_link() {
-                        $url = $GLOBALS['phpgw']->session->appsession('mobile.last_url','mobile');
-
-                        if($url) {
-                                $params = $GLOBALS['phpgw']->session->appsession('mobile.last_request','mobile');
-
-                                $query_string = "";
-                                unset($params['sessionid']);
-                                unset($params['domain']);
-                                unset($params['last_loginid']);
-                                unset($params['last_domain']);
-                                unset($params['kp3']);
-                                unset($params['showHeader']);
-                                
-                                foreach ($params as $key => $value) {
-                                        $query_string .= "&".$key."=".$value;
+                        $trace = $GLOBALS['phpgw']->session->appsession('mobile.trace_urls','mobile');
+
+                        $trace_idx = 0;
+
+                        if($trace) {
+                                $trace_idx = sizeof($trace)-1;
+
+                                if($_REQUEST["is_back_link"])
+                                        $trace_idx = $trace_idx - 2;
+
+                                if($trace_idx < 0) $trace_idx = 0;
+
+                                $url = $trace[$trace_idx]["url"];
+                                $params = $trace[$trace_idx]["request"];
+
+                                $this->href_back = $this->build_url($url, $params);
+                        } else {
+                                $trace = array();
+                                $this->href_back = '';
+                        }
+                        
+                        if(!$_REQUEST["is_back_link"]) {
+                                $current_url = $_SERVER["SCRIPT_NAME"];
+                                $current_params = $_REQUEST;
+
+                                unset($current_params['sessionid']);
+                                unset($current_params['domain']);
+                                unset($current_params['last_loginid']);
+                                unset($current_params['last_domain']);
+                                unset($current_params['kp3']);
+                                unset($current_params['showHeader']);
+
+                                $built_current_url = $this->build_url($current_url, $current_params);
+
+                                //se der reload não vai gravar a url e vai sobreescrever o link do botão voltar para não voltar para a mesma página
+                                if(str_replace("&is_back_link=true","",$built_current_url) != str_replace("&is_back_link=true","",$this->href_back))
+                                        $trace[sizeof($trace)] = array("url" => $current_url, "request" => $current_params);
+                                else {
+                                        if($trace_idx >= 1) $trace_idx--;
+                                        $this->href_back = $this->build_url($trace[$trace_idx]["url"], $trace[$trace_idx]["request"]);
                                 }
-
-                                if($query_string != "")
-                                        $url .= "?".substr($query_string,1);
-
-                                $this->href_back = $url;
                         } else {
-                                $this->href_back = 'javascript:history.back()';
-                        }
-
-                        $GLOBALS['phpgw']->session->appsession('mobile.last_url','mobile',$_SERVER["SCRIPT_NAME"]);
-                        $GLOBALS['phpgw']->session->appsession('mobile.last_request','mobile',$_REQUEST);
+                                if(sizeof($trace) > 1)
+                                        unset($trace[sizeof($trace)-1]);
+                        }
+                        
+                        if(sizeof($trace) > 0)
+                                $GLOBALS['phpgw']->session->appsession('mobile.trace_urls','mobile',$trace);
+                        else
+                                $GLOBALS['phpgw']->session->appsession('mobile.trace_urls','mobile',null);
+                        
+                        $this->template->set_var('href_back', $this->href_back);
+                }
+                
+                private function build_url($url, $params) {
+                        $query_string = "";
+                        
+                        foreach ($params as $key => $value) {
+                                $query_string .= "&".$key."=".$value;
+                        }
+
+                        if($query_string != "")
+                                $url .= "?".substr($query_string,1);
+                        
+                        if(!$params["is_back_link"])
+                                $url .= "&is_back_link=true";
+                        
+                        return $url;
                 }