Dev Removed "Force SSL to 'off'" as it makes no sense . It is either …

…'on' now or any other string is interpreted as 'not forced'
LimeSurvey · Nov 18, 2019 · d256bf2 · d256bf2
1 parent 261d253
commit d256bf2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -3287,13 +3287,14 @@ function SSLRedirect($enforceSSLMode)
 */
 function enforceSSLMode()
 {
+    $bForceSSL = ''; // off 
     $bSSLActive = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off") ||
     (isset($_SERVER['HTTP_FORWARDED_PROTO']) && $_SERVER['HTTP_FORWARDED_PROTO'] == "https") ||
     (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == "https"));
     if (Yii::app()->getConfig('ssl_emergency_override') !== true) {
-        $force_ssl = strtolower(getGlobalSetting('force_ssl'));
+        $bForceSSL = strtolower(getGlobalSetting('force_ssl'));
     } 
-    if ($force_ssl == 'on' && !$bSSLActive) {
+    if ($bForceSSL == 'on' && !$bSSLActive) {
         SSLRedirect('s');
     }