Changeset 5036 for trunk/phpgwapi

Timestamp:

09/05/11 16:51:41 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #2260 - Sincronismo do branch2.2(versão 2.2.8) do modulo phpgwapi para 2.4

Location:

trunk/phpgwapi

Files:

• inc/class.vfs_shared.inc.php (modified) (1 diff)
• inc/class.vfs_sql.inc.php (modified) (1 diff)
• inc/functions.inc.php (modified) (1 diff)
• js/browser (added)
• js/browser/browserDetect.js (added)
• js/x_tools (added)
• js/x_tools/xtools.js (added)
• templates/default/login_default.php (modified) (4 diffs)

trunk/phpgwapi/inc/class.vfs_shared.inc.php

@@ -419 +419 @@
 
                 /*!
+                * @function get_size_all
+                * @abstract Determine size of location
+                * @owner_id string      uid owner
+                */
+                
+                function get_size_all($owner_id) { return 0; }
+                
+                /*!
                  * @function get_size
                  * @abstract Determine size of location

trunk/phpgwapi/inc/class.vfs_sql.inc.php

@@ -2512 +2512 @@
                         return $size;
                 }
+                
+                function get_size_all($owner_id)
+                {
+                        $query = $GLOBALS['phpgw']->db->query ("SELECT Sum(size) FROM phpgw_vfs WHERE owner_id = '".$owner_id."'" .
+                                                                                                        $this->extra_sql(array ('query_text' => VFS_SQL_SELECT)));
+                        $GLOBALS['phpgw']->db->next_record ();
+                        
+                        $size = $GLOBALS['phpgw']->db->Record[0];                       
+                        
+                        return $size;
+                }               
 
                 /*return the total number of files in path*/

trunk/phpgwapi/inc/functions.inc.php

@@ -345 +345 @@
                                 }
                         }
-                        // this removes the sessiondata if its saved in the URL
-                        $query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/','',$_SERVER['QUERY_STRING']);
-                        Header('Location: '.$GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?cd=10&phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : '')));
-                        exit;
+
+                        $ifMobile = false;
+                        $browser = CreateObject('phpgwapi.browser');
+                        switch ( $browser->get_platform() )
+                        {
+                                case browser::PLATFORM_IPHONE:
+                                case browser::PLATFORM_IPOD:
+                                case browser::PLATFORM_IPAD:
+                                case browser::PLATFORM_BLACKBERRY:
+                                case browser::PLATFORM_NOKIA:
+                                case browser::PLATFORM_ANDROID:
+                                        $ifMobile = true;                                               
+                                        break;
+                        }
+                        
+                        if( $ifMobile )                 
+                        {
+                                Header('Location: '.$GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?cd=66');
+                                exit;
+                        }
+                        else
+                        {
+                                // this removes the sessiondata if its saved in the URL
+                                $query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/','',$_SERVER['QUERY_STRING']);
+                                Header('Location: '.$GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?cd=10&phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : '')));
+                                exit;
+                        }
                 }
 

trunk/phpgwapi/templates/default/login_default.php

@@ -12 +12 @@
         \**************************************************************************/
 
-function check_logoutcode($code)
+        function check_logoutcode($code)
         {
                 switch($code)
@@ -35 +35 @@
                                 
                         case 99:
-                                return '<font color="FF0000">' . lang('Blocked, too many attempts(%1)! Retry in %2 minute(s)',$GLOBALS['phpgw_info']['server']['num_unsuccessful_id'],$GLOBALS['phpgw_info']['server']['block_time']) . '</font>';
+                                return '<font color="FF0000">' . lang('Blocked, too many attempts(%1)! Retry in %2 minute(s)',$GLOBALS['phpgw_info']['server']['num_unsuccessful_id'],$GLOBALS['phpgw_info']['server']['block_time']) . '</font>';
                         case 200:
                             //return '<font color="FF0000">' . lang('Invalid code') . '</font>';
-                            return '<font color="FF0000">' . lang('Bad login or password') . '</font>';
+                return '<font color="FF0000">' . lang('Bad login or password') . '</font>';
                             break;
                         case 10:
@@ -180 +180 @@
                         $login .= '@'.$GLOBALS['phpgw_info']['server']['default_domain'];
                 }
-                If(!$_GET['cd'])
-                $GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create(strtolower($login),$passwd,$passwd_type,'u');
+                
+                If(!$_GET['cd'])
+                        $GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create(strtolower($login),$passwd,$passwd_type,'u');
 
                 if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
                 {
-
-                       If(!$_GET['cd']) $_GET['cd'] = $GLOBALS['phpgw']->session->cd_reason;
+                        If(!$_GET['cd']) $_GET['cd'] = $GLOBALS['phpgw']->session->cd_reason;
                 }
                 else
@@ -586 +586 @@
 
         $tmpl->pfp('loginout','login_form');
+        }
 
 ?>