Changeset 4778 for sandbox/expressoMail1_2/MailArchiver/2.2/mobile/login.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/login.php (modified) (6 diffs)

sandbox/expressoMail1_2/MailArchiver/2.2/mobile/login.php

@@ -17 +17 @@
         $GLOBALS['sessionid'] = @$_GET['sessionid'] ? $_GET['sessionid'] : @$_COOKIE['sessionid'];
         
-        if(isset($GLOBALS['sessionid']) && $_GET['cd'] != 10 && $_GET['cd'] != 1)
-                start_prefered_app();
+        if( isset($GLOBALS['sessionid']) )
+        {
+                if( $_GET['cd'] != 10 && $_GET['cd'] != 1 && $_GET['cd'] !== 'logout_mobile' )
+                {
+                        start_prefered_app();
+                }
+        }
                 
         if ( $GLOBALS['phpgw_info']['server']['use_https'] > 0 )
@@ -35 +40 @@
         $tmpl = CreateObject('phpgwapi.Template', PHPGW_SERVER_ROOT . '/mobile/templates/'.$GLOBALS['phpgw_info']['server']['template_set']);
         $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = $GLOBALS['phpgw_info']['login_template_set'];
+        
+        //URL Expresso
+        $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 .= '/';
+        }
+        
         $tmpl->set_file(array('login_form' => 'login.tpl'));
         $tmpl->set_block('login_form','page');
         $tmpl->set_block('login_form','success_message');
         $tmpl->set_block('login_form','error_message');
+        $tmpl->set_var('url_expresso', $url_expresso);
+        $tmpl->set_var('lang_username', lang('username'));
+        $tmpl->set_var('lang_password', lang('password'));
+        $tmpl->set_var('lang_login', lang('login'));
+        
         
         //verificando a mensagem erro ou sucesso
@@ -68 +88 @@
         function check_logoutcode($code) {
                 switch($code) {
+                        case 'logout_mobile': 
                         case 1:
                                 logout();
@@ -94 +115 @@
                                 }
                                 return lang('Your session could not be verified.');
+                        
                         default:
                                 return '';
@@ -108 +130 @@
         elseif(get_var('lem',array('GET','COOKIE')) && get_var('pem',array('GET','COOKIE')))
         {
-                if(!$_GET['cd'] || $_GET['cd'] == '1' || $_GET['cd'] == '10') { 
-                        $submit = True;
-                        $login  = base64_decode(get_var('lem',array('GET','COOKIE')));
-                        $passwd = base64_decode(get_var('pem',array('GET','COOKIE')));
-                        $passwd_type = 'text';
-                }
-                else {
-                        $GLOBALS['phpgw']->session->phpgw_setcookie('lem');
-                        $GLOBALS['phpgw']->session->phpgw_setcookie('pem');
+                if( $_GET['cd'] !== 'logout_mobile' )
+                {
+                        if(!$_GET['cd'] || $_GET['cd'] == '1' || $_GET['cd'] == '10')
+                        { 
+                                $submit = True;
+                                $login  = base64_decode(get_var('lem',array('GET','COOKIE')));
+                                $passwd = base64_decode(get_var('pem',array('GET','COOKIE')));
+                                $passwd_type = 'text';
+                        }
+                        else
+                        {
+                                $GLOBALS['phpgw']->session->phpgw_setcookie('lem');
+                                $GLOBALS['phpgw']->session->phpgw_setcookie('pem');
+                        }
                 }
         }
@@ -180 +207 @@
         $tmpl->set_var('charset',$GLOBALS['phpgw']->translation->charset());
         $tmpl->set_var('cookie',$last_loginid);
-        $tmpl->set_var('lang_username', lang('username'));
-        $tmpl->set_var('lang_password', lang('password'));
-        $tmpl->set_var('lang_login', lang('login'));
         $tmpl->set_var('lang_notices', lang('notices'));
         $tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);