Finished up defines for all current config options. Should be up to date with 1...

[squirrelmail.git] / config / conf.pl

diff --git a/config/conf.pl b/config/conf.pl
index dc9f20c9a5a933bd80ef5bcc3f0693392e2e1b68..7502fb982ea4f5855787bd841126c7eb4482c8ac 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -2989,10 +2989,8 @@ sub change_to_SM_path() {
 
     # If the path is absolute, don't bother.
     return "\'" . $old_path . "\'"  if ( $old_path eq '');
-    return "\'" . $old_path . "\'"  if ( $old_path =~ /^\// );
-    return "\'" . $old_path . "\'"  if ( $old_path =~ /^http/ );
-    return $old_path                if ( $old_path =~ /^\$/);
-    return $old_path                if ( $old_path =~ /^SM_PATH/ );
+    return "\'" . $old_path . "\'"  if ( $old_path =~ /^(\/|http)/ );
+    return $old_path                if ( $old_path =~ /^(\$|SM_PATH)/);
     
     # For relative paths, split on '../'
     @rel_path = split(/\.\.\//, $old_path);