"Fix" so old prefs do not totally kill conf.pl. Should be reverted when everyone...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11765 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index 95bbd8f1c16af1cbe9a8fad29a0b2145f3d368a6..c199a43584b6c804bd4bc58cd28f1b1c25305112 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -196,6 +196,18 @@ while ( $line = <FILE> ) {
                 $options[1] =~ s/^\.\.\/config/\.\.\/templates/;
             }
             $templateset_id[$sub] = $options[1];
+##### FIXME: This section here so old prefs files don't blow up when running conf.pl
+#####        Remove after a month or two 
+        } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) {
+            $sub = $options[0];
+            $sub =~ s/\]\[['"]PATH['"]\]//;
+            $sub =~ s/.*\[//;
+            if ( -e "../templates" ) {
+                $options[1] =~ s/^\.\.\/config/\.\.\/templates/;
+            }
+            $templateset_id[$sub] = $options[1];
+##### FIXME: This section here so old prefs files don't blow up when running conf.pl
+#####        Remove after a month or two 
         } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]NAME['"]\]/ ) {
             $sub = $options[0];
             $sub =~ s/\]\[['"]NAME['"]\]//;