Changeset 4778 for sandbox/expressoMail1_2/MailArchiver/2.2/mobile/inc/class.mobiletemplate.inc.php

Timestamp:

07/15/11 18:03:42 (13 years ago)

Author:

fernando-alberto

Message:

Ticket #1269 - Mergiando revisoes do branch22 de rev4644 ate rev4755

File:

• sandbox/expressoMail1_2/MailArchiver/2.2/mobile/inc/class.mobiletemplate.inc.php (modified) (3 diffs)

sandbox/expressoMail1_2/MailArchiver/2.2/mobile/inc/class.mobiletemplate.inc.php

@@ -19 +19 @@
                         if( $template == "mini_desktop" )
                         {
+                                $url_expresso = $this->getUrlExpresso() . "index.php";
+                                
                                 $this->template->set_file(array('home_t' => 'pc_template.tpl'));
                                 $this->template->set_file(array('home_t_search_bar' => 'search_bar.tpl'));
                                 $this->template->set_block('home_t_search_bar','search_bar');
                                 $this->template->set_var('search',$this->template->fp('out','search_bar'));
+                                $this->template->set_var('url_expresso',$url_expresso);
                                 $this->template->set_var('lang_mini_mobile', lang('mini mobile'));
                                 $this->template->set_var('lang_search_error_message',lang("need choose one option"));
@@ -133 +136 @@
                         
                         $this->template->set_var('global_title', lang('expresso mini'));
-                        // button logout
-                        if( isset($_COOKIE['lem']) && isset($_COOKIE['pem']) )
-                        {
-                                $this->template->set_var('style_1','padding-left:65%;');
-                                $this->template->set_var('style_2','position:relative; float: right; display: none');
-                        }
-                        else
-                        {
-                                $this->template->set_var('style_1','position:absolute; float: left;');
-                                $this->template->set_var('style_2','position:relative; float: right; display: block');
-                        }
-
-                        if( isset($_SESSION['mobile']['displayIOS']) && $_SESSION['mobile']['displayIOS'] == "true" )
-                                $this->template->set_var('display_IOS', "none");
-                        else
-                                $this->template->set_var('display_IOS', "block");
-                                
+                        $this->template->set_var('style_1','position:absolute; float: left;');
+                        $this->template->set_var('style_2','position:relative; float: right; display: block');
                         $this->template->set_var('lang_tips', lang('Tips'));
                         $this->template->set_var('lang_logout', lang('logout'));
                         $this->template->set_var('lang_search', lang('search'));
                         
-                        $this->template->set_var('href_logout', 'login.php?cd=1');
+                        if( isset($_SESSION['mobile']['displayIOS']) && $_SESSION['mobile']['displayIOS'] == "true" )
+                        {
+                                $this->template->set_var('display_IOS', "none");
+                        }
+                        else
+                        {
+                                $this->template->set_var('display_IOS', "block");
+                        }
+
+                        if( isset($_COOKIE['lem']) && isset($_COOKIE['pem']) )
+                        {
+                                $this->template->set_var('href_logout', 'login.php?cd=logout_mobile');
+                        }
+                        else
+                        {
+                                $this->template->set_var('href_logout', 'login.php?cd=1');
+                        }
                 }
                 
@@ -249 +253 @@
                         return $url;
                 }
+                
+                private function getUrlExpresso()
+                {
+                        $url_expresso = $GLOBALS['phpgw_info']['server']['webserver_url'];
+                        $url_expresso = ( !empty($url_expresso) ) ? $url_expresso : '/';
+        
+                        if(strrpos($url_expresso,'/') === false || strrpos($url_expresso,'/') != (strlen($url_expresso)-1))
+                        {
+                                $url_expresso .= '/';
+                        }
+
+                        return $url_expresso;
+                }
 
                 function get_back_link(){