new option: ALLOW_SELECT_UPDATE_METHOD (bump config ver)

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).
 

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']) {

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"));
 

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")) {