X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconf.pl;h=2f6677211b25ca78c77b73cac8fa25c564034a6c;hp=1249e022b9ea2d769d0031fc5c1a0d58a6e9a820;hb=e06886c9a7200acf2ec1bee567dcb9513e3b3a08;hpb=7af858cdd5b2823ce8751ba4bffd0714f9052cb3

diff --git a/config/conf.pl b/config/conf.pl
index 1249e022..2f667721 100755
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -140,7 +140,7 @@ if ( -e "config.php" ) {
         print "  should get the 'config_default.php' that matches the version\n";
         print "  of SquirrelMail that you are running. You can get this from\n";
         print "  the SquirrelMail web page by going to the following URL:\n";
-        print "      http://www.squirrelmail.org.\n";
+        print "      http://squirrelmail.org.\n";
         print "\n";
         print "Continue loading with old config_default.php (a bad idea) [y/N]? ";
         $ctu = <STDIN>;
@@ -685,7 +685,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) {
         print "1.  Use Icons?                   : $WHT$use_icons$NRM\n";
 #        print "3.  Default Icon Set             : $WHT$icon_theme_def$NRM\n";
         print "2.  Default font size            : $WHT$default_fontsize$NRM\n";
-        print "3.  Manage template sets\n";
+        print "3.  Manage template sets (skins)\n";
         print "4.  Manage user themes\n";
         print "5.  Manage font sets\n";
         print "6.  Manage icon themes\n";
@@ -728,7 +728,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) {
         }
         print "\n  Available Plugins:\n";
         opendir( DIR, "../plugins" );
-        @files          = readdir(DIR);
+        @files          = sort(readdir(DIR));
         $pos            = 0;
         @unused_plugins = ();
         for ( $i = 0 ; $i <= $#files ; $i++ ) {
@@ -1015,7 +1015,7 @@ sub command2 {
     print "    to use the default logo, use ../images/sm_logo.png\n";
     print "  - To specify a logo defined outside the SquirrelMail source tree\n";
     print "    use the absolute URL the webserver would use to include the file\n";
-    print "    e.g. http://www.example.com/images/mylogo.gif or /images/mylogo.jpg\n";
+    print "    e.g. http://example.com/images/mylogo.gif or /images/mylogo.jpg\n";
     print "\n";
     print "[$WHT$org_logo$NRM]: $WHT";
     $new_org_logo = <STDIN>;
@@ -1443,6 +1443,7 @@ sub command112b {
                 print " ERROR TESTING\n";
                 close $sock;
             } else {
+                $got = <$sock>;  # Discard greeting
                 print $sock "HELO $domain\r\n";
                 $got = <$sock>;  # Discard
                 print $sock "MAIL FROM:<tester\@squirrelmail.org>\r\n";
@@ -2187,7 +2188,7 @@ sub command215 {
 
 #noselect fix
 sub command216 {
-    print "Some IMAP server allow subfolders to exist even if the parent\n";
+    print "Some IMAP servers allow subfolders to exist even if the parent\n";
     print "folders do not. This fixes some problems with the folder list\n";
     print "when this is the case, causing the /NoSelect folders to be displayed\n";
     print "\n";
@@ -2769,7 +2770,7 @@ sub command_userThemes {
             print "\nStarting detection...\n\n";
 
             opendir( DIR, "../css" );
-            @files = readdir(DIR);
+            @files = sort(readdir(DIR));
             $cnt = 0;
             while ( $cnt <= $#files ) {
                 $filename = "../css/" . $files[$cnt] .'/';
@@ -2974,7 +2975,7 @@ sub command_iconSets {
             print "\nStarting detection...\n\n";
 
             opendir( DIR, "../images/themes/" );
-            @files = readdir(DIR);
+            @files = sort(readdir(DIR));
             $cnt = 0;
             while ( $cnt <= $#files ) {
                 $filename = "../images/themes/" . $files[$cnt] .'/';
@@ -3041,7 +3042,7 @@ sub command_iconSets {
 }
 
 sub command_templates {
-    print "\nDefine the template sets that you wish to use.  If you have added\n";
+    print "\nDefine the template sets (skins) that you wish to use.  If you have added\n";
     print "a template set of your own, just follow the instructions (?) about\n";
     print "how to add them.  You can also change the default template.\n";
 
@@ -3082,7 +3083,7 @@ sub command_templates {
                . "| - N           (remove template set) |\n"
                . "| m N     (mark default template set) |\n"
                . "| f N     (set fallback template set) |\n"
-               . "| l              (list template sets) |\n"
+               . "| l        (list template sets/skins) |\n"
                . "| d                            (done) |\n"
                . "|-------------------------------------|\n"
                . "| where N is a template set number    |\n"
@@ -3170,7 +3171,7 @@ sub command_templates {
         } elsif ( $input =~ /^\s*t\s*/i ) {
             print "\nStarting detection...\n\n";
             opendir( DIR, "../templates" );
-            @files = readdir(DIR);
+            @files = sort(readdir(DIR));
             $cnt = 0;
             while ( $cnt <= $#files ) {
                 if ( -d "../templates/" . $files[$cnt] && $files[$cnt] !~ /^\./ && $files[$cnt] ne "CVS" ) {
@@ -4315,7 +4316,6 @@ sub save_data {
         print CF " * Created using the configure script, conf.pl\n";
         print CF " */\n";
         print CF "\n";
-        print CF "global \$version;\n";
 
         if ($print_config_version) {
             print CF "\$config_version = '$print_config_version';\n";
@@ -5049,14 +5049,11 @@ sub detect_auth_support {
 
     # So at this point, we have a response, and it is (hopefully) valid.
     if ($service eq 'SMTP') {
-        if (($response =~ /^535/) or ($response =~/^502/)) {
+        if (!($response =~ /^334/)) {
             # Not supported
             print $sock $logout;
             close $sock;
             return 'NO';
-        } elsif ($response =~ /^503/) {
-            #Something went wrong
-            return undef;
         }
     } elsif ($service eq 'IMAP') {
         if ($response =~ /^A01/) {
@@ -5388,4 +5385,3 @@ PLUGIN: for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) {
     }
 
 }
-