From d52532d592e73ff67e42bb883621e0039866637e Mon Sep 17 00:00:00 2001 From: brong Date: Mon, 18 Mar 2002 05:35:55 +0000 Subject: [PATCH] Fix for bug #505216 - Folder Prefix always getting a '/' appended. The logic is now much nicer :) git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2599 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/config/conf.pl b/config/conf.pl index db58c0b8..2b5b72bc 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1034,13 +1034,20 @@ sub command21 { if ( $new_default_folder_prefix eq "\n" ) { $new_default_folder_prefix = $default_folder_prefix; } else { - $new_default_folder_prefix =~ s/[\r|\n]//g; + $new_default_folder_prefix =~ s/[\r\n]//g; } - if ( ( $new_default_folder_prefix =~ /^\s*$/ ) || ( $new_default_folder_prefix =~ /none/i ) ) { + if ( ( $new_default_folder_prefix =~ /^\s*$/ ) || ( $new_default_folder_prefix =~ m/^none$/i ) ) { $new_default_folder_prefix = ""; } else { - $new_default_folder_prefix =~ s/\/*$//g; - $new_default_folder_prefix =~ s/$/\//g; + # 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') { + $new_default_folder_prefix =~ s/\.*$/\./; + } elsif ($imap_server_type eq 'uw') { + $new_default_folder_prefix =~ s/\/*$/\//; + } } return $new_default_folder_prefix; } -- 2.25.1