[Fmsystem-commits] [16982] API: enforce ssl

[sigurdne]

Revision: 16982
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16982
Author:   sigurdne
Date:     2017-08-16 09:47:42 -0400 (Wed, 16 Aug 2017)
Log Message:
-----------
API: enforce ssl

Modified Paths:
--------------
    trunk/phpgwapi/inc/functions.inc.php

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2017-08-15 12:49:44 UTC (rev 
16981)
+++ trunk/phpgwapi/inc/functions.inc.php        2017-08-16 13:47:42 UTC (rev 
16982)
@@ -738,12 +738,14 @@
        }
 
        $request_scheme = empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 
'off' ? 'http' : 'https';
-
        if(isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && 
$request_scheme != 'https' )
        {
-//             Header('Location: https://' . 
$GLOBALS['phpgw_info']['server']['hostname'] . 
$GLOBALS['phpgw_info']['server']['webserver_url'] . $_SERVER['REQUEST_URI']);
-               Header("Location: 
https://{$GLOBALS['phpgw_info']['server']['hostname']}{$_SERVER['REQUEST_URI']}");
-               exit;
+               $script_name = basename($_SERVER['SCRIPT_NAME'], '.php');
+               if(!$script_name == 'xmlrpc' && !$script_name == 'soap')
+               {
+                       Header("Location: 
https://{$GLOBALS['phpgw_info']['server']['hostname']}{$_SERVER['REQUEST_URI']}");
+                       exit;
+               }
        }
 
        
/************************************************************************\