Changeset 5164

Timestamp:

11/10/11 14:57:58 (12 years ago)

Author:

niltonneto

Message:

Ticket #2276 - Resincronizando as revisões deste ticket para o Trunk.

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) (2 diffs)
• js/browser/browserDetect.js (added)
• js/x_tools/xtools.js (added)
• templates/default/login_default.php (modified) (2 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

@@ -2513 +2513 @@
                 }
                 
+                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*/
                 function count_files($data){

trunk/phpgwapi/inc/functions.inc.php

@@ -345 +345 @@
                                 }
                         }
+
+                        $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']);
@@ -350 +372 @@
                                 exit;
                         }
+                }
 
                 $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.date_time');

trunk/phpgwapi/templates/default/login_default.php

@@ -67 +67 @@
             return $aux;
         }
+        $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 && $_GET['dont_redirect_if_moble'] != 1 ) 
+        {
+                $GLOBALS['phpgw']->redirect_link('/mobile/login.php');
+        }
+        else
+        {
         /* Program starts here */
         
@@ -585 +605 @@
 
         $tmpl->pfp('loginout','login_form');
+        }
 
 ?>