Dev : fixed #6114 for global settings too

Dev: global setings : off and not Off : put in strtoupper for accounttype and hostencryption
LimeSurvey · May 18, 2012 · 49c5b77 · 49c5b77
1 parent 24957bf
commit 49c5b77
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -238,21 +238,19 @@
             $checktotal=0;
             if($thissurvey['bounceprocessing']=='G')
             {
-                $accounttype=getGlobalSetting('bounceaccounttype');
+                $accounttype=strtoupper(getGlobalSetting('bounceaccounttype'));
                 $hostname=getGlobalSetting('bounceaccounthost');
                 $username=getGlobalSetting('bounceaccountuser');
                 $pass=getGlobalSetting('bounceaccountpass');
-                $hostencryption=getGlobalSetting('bounceencryption');
-
+                $hostencryption=strtoupper(getGlobalSetting('bounceencryption'));
             }
             else
             {
-                $accounttype=$thissurvey['bounceaccounttype'];
+                $accounttype=strtoupper($thissurvey['bounceaccounttype']);
                 $hostname=$thissurvey['bounceaccounthost'];
                 $username=$thissurvey['bounceaccountuser'];
                 $pass=$thissurvey['bounceaccountpass'];
-                $hostencryption=$thissurvey['bounceaccountencryption'];
-
+                $hostencryption=strtoupper($thissurvey['bounceaccountencryption']);
             }
             @list($hostname,$port) = split(':', $hostname);
             if(empty($port))
@@ -261,7 +259,7 @@
                 {
                     switch($hostencryption)
                     {
-                        case "Off":
+                        case "OFF":
                             $hostname = $hostname.":143";
                             break;
                         case "SSL":
@@ -276,7 +274,7 @@
                 {
                     switch($hostencryption)
                     {
-                        case "Off":
+                        case "OFF":
                             $hostname = $hostname.":110";
                             break;
                         case "SSL":
@@ -300,7 +298,7 @@
             }
             switch($hostencryption) // novalidate-cert to have personal CA , maybe option.
             {
-                case "Off":
+                case "OFF":
                     $flags.="/notls"; // Really Off
                     break;
                 case "SSL":