Changeset 5141 for trunk/phpgwapi/templates/default/login_default.php

Timestamp:

11/03/11 13:53:15 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, modulo phpgwapi.

File:

• trunk/phpgwapi/templates/default/login_default.php (modified) (5 diffs)

trunk/phpgwapi/templates/default/login_default.php

@@ -12 +12 @@
         \**************************************************************************/
 
-        function check_logoutcode($code)
+function check_logoutcode($code)
         {
                 switch($code)
@@ -57 +57 @@
                 }
         }
-        
-        $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
-        {
+        function troca_espaco_por_mais($pem_data)
+        {
+            $begin = "CERTIFICATE-----";
+            $end   = "-----END";
+            $aux = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
+            $aux = substr($aux, 0, strpos($aux, $end));
+            $aux = strtr($aux,' ','+');
+            $aux = '-----BEGIN CERTIFICATE-----'.$aux.'-----END CERTIFICATE-----';
+            return $aux;
+        }
         /* Program starts here */
+        
         if($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
         {
@@ -124 +114 @@
                 unset($sslattributes);
         }
-
+        if(isset($_POST['certificado']) && $_POST['certificado'])
+        {
+
+            $_SESSION['login_certificado'] = troca_espaco_por_mais(str_replace(chr(0x0D).chr(0x0A),chr(0x0A),str_replace(chr(0x0A).chr(0x0A),chr(0x0A),$_POST['certificado'])));
+        }
     if( isset( $_GET[ 'cd' ] ) && ( $_GET['cd']=='1' || $_GET['cd'] == 10 ) )
         {
@@ -266 +260 @@
                         */
                         $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $lang;
+
+                        if (!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
+                        {
+                                $prefs2 = CreateObject('phpgwapi.preferences');
+                                $temp_pref = $prefs2->read_repository();
+                                $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = $temp_pref['common']['theme'];
+                        }
                 }
                 #print 'LANG:' . $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
@@ -584 +585 @@
 
         $tmpl->pfp('loginout','login_form');
-        }
 
 ?>