Fixed Issue :04824

Dev Fixed local and global settings email issue Dev Set the default ports of ssl and tls encryptions as well git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9643 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 15, 2010 · c98ed40 · c98ed40
1 parent 7591892
commit c98ed40
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -248,11 +248,33 @@
             {
               if($accounttype=="IMAP")
                 {
-                  $hostname = $hostname.":993";
+                  switch($hostencryption)
+                  {
+                      case "Off":
+                        $hostname = $hostname.":143";    
+                        break;
+                      case "SSL":
+                        $hostname = $hostname.":993";    
+                        break;
+                      case "TLS":
+                        $hostname = $hostname.":993";    
+                        break;
+                  }
                 }
               else
                 {
-                  $hostname = $hostname.":995";
+                   switch($hostencryption)
+                  {
+                      case "Off":
+                        $hostname = $hostname.":110";    
+                        break;
+                      case "SSL":
+                        $hostname = $hostname.":995";    
+                        break;
+                      case "TLS":
+                        $hostname = $hostname.":995";    
+                        break;
+                  }
                 }
             }
 		$flags="";
@@ -770,7 +792,7 @@
 $tokenoutput .= "<div id='bouncesettings'>\n"
 			."<form id='bouncesettings' name='bouncesettings' action='$scriptname?action=tokens&sid=$surveyid&subaction=surveysettingsave' method='post'>"
 	        ."\t\n<br><li><label for='bounce_email'>".$clang->gT('Survey bounce email:')."</label>\n"
-            ."\t\t<input type='text' size='50' id='bounce_email' name='bounce_email' value=\"".htmlspecialchars(getGlobalSetting('siteadminbounce'))."\" /></li>\n"
+            ."\t\t<input type='text' size='50' id='bounce_email' name='bounce_email' value=\"".$settings['bounce_email']."\" ></li>\n"
 			."\t<li><label for='bounceprocessing'>".$clang->gT("Bounce Settings to be used")."</label>\n"
 	        ."\t\t<select id='bounceprocessing' name='bounceprocessing'>\n"
     	    ."\t\t\t<option value='N'";