From ce9f808b1830796b415c1607714d8be66b7c7efe Mon Sep 17 00:00:00 2001 From: jmunro Date: Tue, 14 May 2002 14:50:12 +0000 Subject: [PATCH] fix for bug #551310. The $optional_delimiter is now only added to the $default_folder_prefix if autodetect is selected or if $optional_delimiter is set to detect. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2820 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/config/conf.pl b/config/conf.pl index b625be9e..1b7e2766 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1079,12 +1079,13 @@ sub command21 { $new_default_folder_prefix = ""; } else { # add the trailing delimiter only if we know what the server is. - if ($optional_delimiter and $optional_delimiter ne 'detect') { - $new_default_folder_prefix =~ s/${optional_delimiter}*$/$optional_delimiter/; - } elsif ($imap_server_type eq 'cyrus' or - $imap_server_type eq 'courier') { + if (($imap_server_type eq 'cyrus' and + $optional_delimiter eq 'detect') or + ($imap_server_type eq 'courier' and + $optional_delimiter eq 'detect')) { $new_default_folder_prefix =~ s/\.*$/\./; - } elsif ($imap_server_type eq 'uw') { + } elsif ($imap_server_type eq 'uw' and + $optional_delimiter eq 'detect') { $new_default_folder_prefix =~ s/\/*$/\//; } } -- 2.25.1