Просмотр исходного кода

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

Thijs Kinkhorst 19 лет назад
Родитель
Сommit
92cebefae1
2 измененных файлов с 3 добавлено и 1 удалено
  1. 1 0
      ChangeLog
  2. 2 1
      config/conf.pl

+ 1 - 0
ChangeLog

@@ -47,6 +47,7 @@ Version 1.5.2 - CVS
   - Fixed session lockups on large attachment downloads.
   - Fixed session lockups on large attachment downloads.
   - Added configtest hook in src/configtest.php.
   - Added configtest hook in src/configtest.php.
   - Improved error handling for the help pages.
   - 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)
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------
 --------------------------------------

+ 2 - 1
config/conf.pl

@@ -1018,7 +1018,7 @@ sub command7 {
 
 
 sub command8 {
 sub command8 {
     print "Here you can set the name of the link on the right of the page.\n";
     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 "\n";
     print "[$WHT$provider_name$NRM]: $WHT";
     print "[$WHT$provider_name$NRM]: $WHT";
     $new_provider_name = <STDIN>;
     $new_provider_name = <STDIN>;
@@ -1027,6 +1027,7 @@ sub command8 {
     } else {
     } else {
         $new_provider_name =~ s/[\r\n]//g;
         $new_provider_name =~ s/[\r\n]//g;
         $new_provider_name =~ s/^\s+$//g;
         $new_provider_name =~ s/^\s+$//g;
+        $new_provider_name =~ s/\'/\\'/g;
     }
     }
     return $new_provider_name;
     return $new_provider_name;
 }
 }