Changeset 6731 for branches


Ignore:
Timestamp:
07/06/12 08:37:46 (7 years ago)
Author:
eduardow
Message:

Ticket #2607 - Acesso via Windows phone não redireciona página automaticamente.

Location:
branches/2.4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/expressoMail1_2/inc/class.functions.inc.php

    r5509 r6731  
    1515                function CalculateDateOffset() 
    1616                { 
     17                                         
    1718 
     19                                        $zones = $this->getTimezones();  
     20                            $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['timezone'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] : sprintf("%s", array_search("America/Sao_Paulo", $zones));  
     21                     
    1822                    $timezone_index = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['timezone']; 
    19                     $zones = $this->getTimezones(); 
    20                     $user_timezone = $zones[$timezone_index]; 
     23                    $user_timezone = $zones[$timezone_index] 
     24 
    2125                    $tz = new DateTimeZone($user_timezone); 
    2226                    $gmt = new DateTimeZone("Etc/GMT+0"); 
     
    2428                    $offset = $tz->getOffset($gmttime); 
    2529                    return $offset; 
    26  
    2730                } 
    2831 
  • branches/2.4/login.php

    r5926 r6731  
    3434                                $GLOBALS['phpgw']->redirect_link('/home.php'); 
    3535                        } 
     36 
    3637                } 
    3738                 
     
    8687                case browser::PLATFORM_NOKIA: 
    8788                case browser::PLATFORM_ANDROID: 
     89                case browser::PLATFORM_WINMOBILE:  
    8890                        $ifMobile = true;                                                
    8991                        break; 
     
    9395        { 
    9496                $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = preg_replace("/\,.*/","",$GLOBALS['_SERVER']['HTTP_ACCEPT_LANGUAGE']); 
    95                 if( $_GET['cd'] == '66' ) 
    96                         $GLOBALS['phpgw']->redirect_link('/mobile/login.php?cd=66'); 
    97                 else 
    98                         $GLOBALS['phpgw']->redirect_link('/mobile/login.php'); 
     97                $GLOBALS['phpgw']->redirect_link('/mobile/login.php'); 
    9998        } 
    10099        else 
  • branches/2.4/mobile/inc/class.ui_mobilemail.inc.php

    r6037 r6731  
    1212 
    1313        //TODO: Criar a Classe Widget. 
    14  
    1514        include_once(PHPGW_INCLUDE_ROOT.'/expressoMail1_2/inc/class.imap_functions.inc.php'); 
    1615 
     
    341340                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : lang("Spam"); 
    342341                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : lang("Sent"); 
    343                  
    344342                } 
    345343 
     
    904902                        $ccaddress = implode(',',$db_functions->getAddrs(explode(',',$ccaddress))); 
    905903                         
    906                         if(!$this->imap_functions->add_recipients("to", $toaddress, &$mail)) 
     904                        if(!$this->imap_functions->add_recipients("to", $toaddress, &$mail, true)) 
    907905                        { 
    908906                                $error_msg = lang("Some addresses in the To field were not recognized. Please make sure that all addresses are properly formed"); 
    909907                        } 
    910908                         
    911                         if(!$this->imap_functions->add_recipients("cc", $ccaddress, &$mail)) 
     909                        if(!$this->imap_functions->add_recipients("cc", $ccaddress, &$mail, true))  
    912910                        { 
    913911                                $error_msg = lang("Some addresses in the CC field were not recognized. Please make sure that all addresses are properly formed"); 
  • branches/2.4/phpgwapi/inc/class.browser.inc.php

    r5281 r6731  
    4444                const PLATFORM_ANDROID = 'Android'; 
    4545                const PLATFORM_UNIX = 'Unix'; 
     46                const PLATFORM_WINMOBILE = 'WinMobile';  
    4647 
    4748                function browser() 
     
    117118                                $this->BROWSER_PLATFORM = self::PLATFORM_MAC; 
    118119                        } 
     120                        elseif(strstr($HTTP_USER_AGENT,'IEMobile'))  
     121            {  
     122                    $this->BROWSER_PLATFORM = self::PLATFORM_WINMOBILE;  
     123            }  
    119124                        elseif(strstr($HTTP_USER_AGENT,'Win')) 
    120125                        { 
Note: See TracChangeset for help on using the changeset viewer.