Changeset 141 for trunk/index.php

Timestamp:

01/03/08 14:10:56 (16 years ago)

Author:

niltonneto

Message:

Correções no modo HTTPS

File:

• trunk/index.php (modified) (2 diffs)

trunk/index.php

@@ -21 +21 @@
         if(!$GLOBALS['sessionid'])
         {
-                /*if (($GLOBALS['phpgw_info']['server']['use_https'] == 2) && ($_SERVER['HTTPS'] != 'on'))
-                {
-                        
-                        Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-                        exit;
-                }
-                else
-                {*/
-                        Header('Location: login.php'.
-                        (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']) ?
-                        '?phpgw_forward='.urlencode('/index.php?'.$_SERVER['QUERY_STRING']):''));
-                        exit;
-                //}
+                Header('Location: login.php'.
+                (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']) ?
+                '?phpgw_forward='.urlencode('/index.php?'.$_SERVER['QUERY_STRING']):''));
+                exit;
         }
 
@@ -68 +59 @@
         );
         include('./header.inc.php');
+
+        if (($GLOBALS['phpgw_info']['server']['use_https'] == 2) && ($_SERVER['HTTPS'] != 'on'))
+        {
+                Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+                exit;
+        }
 
         if($app == 'home' && !$api_requested)