Changeset 623 for trunk/mobile/login.php

Timestamp:

01/26/09 14:47:04 (15 years ago)

Author:

niltonneto

Message:

Resolve #399.

File:

• trunk/mobile/login.php (modified) (5 diffs)

trunk/mobile/login.php

@@ -11 +11 @@
                 'noheader'               => True
         );
-
-        include('../header.inc.php');
+        
+        include('../header.inc.php');   
+        include('./mobile_header.inc.php');     
         $GLOBALS['sessionid'] = @$_GET['sessionid'] ? $_GET['sessionid'] : @$_COOKIE['sessionid'];
+        
         if(isset($GLOBALS['sessionid']) && $_GET['cd'] != 10 && $_GET['cd'] != 1)
-                //$GLOBALS['phpgw']->redirect_link($GLOBALS['phpgw_info']['flags']['currentdir'].'/calendar.php');
-                //session_start();
-                $GLOBALS['phpgw']->redirect_link($GLOBALS['phpgw_info']['flags']['currentdir'].'/home.php');
-        if ($GLOBALS['phpgw_info']['server']['use_https'] > 0)  {
+                start_prefered_app();           
+                if ($GLOBALS['phpgw_info']['server']['use_https'] > 0)  {
                 if ($_SERVER['HTTPS'] != 'on') {
                         Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
@@ -24 +24 @@
                 }
         }
-
-        $GLOBALS['phpgw']->session = CreateObject('phpgwapi.sessions');
-        //$GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT.$GLOBALS['phpgw_info']['flags']['currentdir'].'/templates/'.$GLOBALS['phpgw_info']['login_template_set'];
-        $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT.$GLOBALS['phpgw_info']['flags']['currentdir'].'/templates/';
+        
+        $GLOBALS['phpgw']->session = CreateObject('phpgwapi.sessions'); 
+        $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT.$GLOBALS['phpgw_info']['flags']['currentdir'].'/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];       
         $tmpl = CreateObject('phpgwapi.Template', $GLOBALS['phpgw_info']['server']['template_dir']);
         $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = $GLOBALS['phpgw_info']['login_template_set'];
         $tmpl->set_file(array('login_form' => 'login.tpl'));
         $tmpl->set_var('cd',check_logoutcode($_GET['cd']));
-
+        
         function check_logoutcode($code) {
                 switch($code) {
@@ -96 +95 @@
                         $GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] .$GLOBALS['phpgw_info']['flags']['currentdir'].'/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason);
                 }
-                else{
-                        //$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] .$GLOBALS['phpgw_info']['flags']['currentdir'].'/calendar.php');
-                        $GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] .$GLOBALS['phpgw_info']['flags']['currentdir'].'/home.php');
+                else{           
+                        start_prefered_app();
                 }
         }
@@ -117 +115 @@
         $tmpl->set_var('lang_username',"Usuário");
         $tmpl->set_var('lang_password',"Senha");
-        $tmpl->set_var('lang_login',"Login");
-        
+        $tmpl->set_var('lang_login',"Login");   
         $tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);
         $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
@@ -126 +123 @@
         $tmpl->pfp('loginout','login_form');
 
-        function logout(){
+        function logout(){              
                 $verified = $GLOBALS['phpgw']->session->verify();
                 if ($verified)