new option: ALLOW_SELECT_UPDATE_METHOD (bump config ver)

diff --git a/config.php-dist b/config.php-dist
index 2c92429ec07cdd2f3eb6a8089a1d4584aae8293e..191d648e39a58d6ae02c733189b17628ecb91462 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -174,7 +174,11 @@
        // Directory for lockfiles, must be writable to the user you run
        // daemon process or cronjobs under.
 
-       define('CONFIG_VERSION', 14);
+       define('ALLOW_SELECT_UPDATE_METHOD', false);
+       // Allow users to select the library to update feeds with - e.g.
+       // Magpie or SimplePie
+
+       define('CONFIG_VERSION', 15);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).
 

diff --git a/functions.php b/functions.php
index 6cc3b6785f898ee3011f21c1dfcc04174c05f819..33a5a9077561369e9e7908be611181dd40be391f 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -501,10 +501,14 @@
                $auth_login = db_fetch_result($result, 0, "auth_login");
                $auth_pass = db_fetch_result($result, 0, "auth_pass");
 
-               if (ENABLE_SIMPLEPIE) {
-                       $use_simplepie = $update_method != 1;
+               if (ALLOW_SELECT_UPDATE_METHOD) {
+                       if (ENABLE_SIMPLEPIE) {
+                               $use_simplepie = $update_method != 1;
+                       } else {
+                               $use_simplepie = $update_method == 2;
+                       }
                } else {
-                       $use_simplepie = $update_method == 2;
+                       $use_simplepie = ENABLE_SIMPLEPIE;
                }
 
                if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 749f4dc045dfdf80ac9ad4781ef71a7c3ae2ead3..93230215080f458ff71543ecf35dc2e44bea0070 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -260,16 +260,19 @@
                        
                        print "</td>";
 
-                       $update_method = db_fetch_result($result, 0, "update_method");
+                       if (ALLOW_SELECT_UPDATE_METHOD) {
 
-                       print "<tr><td>".__('Update using:')."</td>";
-
-                       print "<td>";
-
-                       print_select_hash("update_method", $update_method, $update_methods, 
-                               "class=\"iedit\"");
-                       
-                       print "</td>";
+                               $update_method = db_fetch_result($result, 0, "update_method");
+       
+                               print "<tr><td>".__('Update using:')."</td>";
+       
+                               print "<td>";
+       
+                               print_select_hash("update_method", $update_method, $update_methods, 
+                                       "class=\"iedit\"");
+                               
+                               print "</td>";
+                       }
 
                        $auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login"));
 

diff --git a/sanity_check.php b/sanity_check.php
index 250505d00c31167070ba8cb278b58d5e55d20226..0a6b9a36c6faa0b2fb2d4e32c093870ed5feb377 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,7 +1,7 @@
 <?php
        require_once "functions.php";
 
-       define('EXPECTED_CONFIG_VERSION', 14);
+       define('EXPECTED_CONFIG_VERSION', 15);
        define('SCHEMA_VERSION', 31);
 
        if (!file_exists("config.php")) {