From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 29 Sep 2006 09:03:34 +0000 (+0000)
Subject: "Fix" so old prefs do not totally kill conf.pl.  Should be reverted when everyone... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b4e8b4a3ac58d76b9cbe395189e167a89647eaf3;p=squirrelmail.git

"Fix" so old prefs do not totally kill conf.pl.  Should be reverted when everyone has had a good chance to upgrade their configuration files


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 95bbd8f1..c199a435 100755
--- 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['"]\]//;