Fixed possibility to use single quote in provider name (#1475744).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11109 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 1d7466e0ee99efe674532f3346c2595cc5c2e8af..ed8703123ea169f67c9e8194f12744bf2c7c63f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@ Version 1.5.2 - CVS
   - Fixed session lockups on large attachment downloads.
   - Added configtest hook in src/configtest.php.
   - Improved error handling for the help pages.
+  - Fixed possibility to use single quote in provider name (#1475744).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/config/conf.pl b/config/conf.pl
index d928d0a314334ed675e2c089a06441037433bb86..d71b82ac198d9c9af0d9632b9c7bdb4d6454904e 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1018,7 +1018,7 @@ sub command7 {
 
 sub command8 {
     print "Here you can set the name of the link on the right of the page.\n";
-    print "The default is 'SquirrelMail/'\n";
+    print "The default is 'SquirrelMail'\n";
     print "\n";
     print "[$WHT$provider_name$NRM]: $WHT";
     $new_provider_name = <STDIN>;
@@ -1027,6 +1027,7 @@ sub command8 {
     } else {
         $new_provider_name =~ s/[\r\n]//g;
         $new_provider_name =~ s/^\s+$//g;
+        $new_provider_name =~ s/\'/\\'/g;
     }
     return $new_provider_name;
 }