From: Alan Knowles <alan@roojs.com>
Date: Mon, 25 Jan 2021 05:06:05 +0000 (+0800)
Subject: Fix #6571 - store progress locally so task list can be rebuilt.
X-Git-Url: http://git.roojs.org/?p=pear;a=commitdiff_plain;h=1b3b9698a9eca070153aca7d2c16f9252d288dc5

Fix #6571 - store progress locally so task list can be rebuilt.
---

diff --git a/DB/mysqlfb.php b/DB/mysqlfb.php
index 5e397460..ca345b95 100644
--- a/DB/mysqlfb.php
+++ b/DB/mysqlfb.php
@@ -139,7 +139,7 @@ class DB_mysqlfb extends DB_mysqli
     // {{{ disconnect()
 
      
-    // }}}
+    // }}}z
 
 }
 
diff --git a/HTML/FlexyFramework.php b/HTML/FlexyFramework.php
index 3d16bca2..c1a23e47 100755
--- a/HTML/FlexyFramework.php
+++ b/HTML/FlexyFramework.php
@@ -213,7 +213,15 @@ RewriteRule ^(.+)$ /web.hpasite/index.local.php [L,NC,E=URL:$1]
         }
         $proj = $cfg['project'];
         $rootDir = realpath(dirname($_SERVER["SCRIPT_FILENAME"]));
-
+        $cls = $proj.'_Config';
+        if (file_exists($rootDir . '/'.str_replace('_','/', $cls). '.php')) {
+            require_once str_replace('_','/', $cls). '.php';
+            $c = new $cls();
+            if (method_exists($c,'init')) {
+                $cfg = $c->init($this,$cfg);
+            }
+        }
+        
         foreach(explode(',',$cfg['enable']) as $m) {
             $cls = $proj.'_'. $m . '_Config';
 
diff --git a/HTML/FlexyFramework2.php b/HTML/FlexyFramework2.php
index fed11cd9..9d3c36db 100644
--- a/HTML/FlexyFramework2.php
+++ b/HTML/FlexyFramework2.php
@@ -201,6 +201,15 @@ class HTML_FlexyFramework2 {
         $proj = $cfg['project'];
         $rootDir = realpath(dirname($_SERVER["SCRIPT_FILENAME"]));
 
+        $cls = $proj.'_Config';
+        if (file_exists($rootDir . '/'.str_replace('_','/', $cls). '.php')) {
+            require_once str_replace('_','/', $cls). '.php';
+            $c = new $cls();
+            if (method_exists($c,'init')) {
+                $cfg = $c->init($this,$cfg);
+            }
+        }
+        
         foreach($mods as $m) {
             $cls = $proj. (strlen($m) ? '_'. $m  : '' ) . '_Config';