move connection filtering setting from network to connections, provide a link to settings in the navbar if present for a module and some code optimisation

2 files changed, 53 insertions, 12 deletions

diff --git a/Zotlabs/Module/Settings/Connections.php b/Zotlabs/Module/Settings/Connections.php
new file mode 100644
index 000000000..361d86ccb
--- /dev/null
+++ b/Zotlabs/Module/Settings/Connections.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Zotlabs\Module\Settings;
+
+
+class Connections {
+
+	function post() {
+		check_form_security_token_redirectOnErr('/settings/connections', 'settings_connections');
+	
+		$features = self::get_features();
+
+		process_features_post(local_channel(), $features, $_POST);
+		
+		build_sync_packet();
+		return;
+	}
+
+	function get() {
+		
+		$features = self::get_features();
+
+		$tpl = get_markup_template("settings_module.tpl");
+
+		$o .= replace_macros($tpl, array(
+			'$action_url' => 'settings/connections',
+			'$form_security_token' => get_form_security_token("settings_connections"),
+			'$title' => t('Connections Settings'),
+			'$features'  => process_features_get(local_channel(), $features),
+			'$submit'    => t('Submit')
+		));
+	
+		return $o;
+	}
+
+	function get_features() {
+		$arr = [
+			[
+				'connfilter',
+				t('Connection Filtering'),
+				t('Filter incoming posts from connections based on keywords/content'),
+				false,
+				get_config('feature_lock','connfilter')
+			]
+		];
+
+		return $arr;
+
+	}
+
+}
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
index 4e2e3915e..eaf11f3da 100644
--- a/Zotlabs/Module/Settings/Network.php
+++ b/Zotlabs/Module/Settings/Network.php
@@ -10,13 +10,7 @@ class Network {
 	
 		$features = self::get_features();
 
-		foreach($features as $f) {
-			$k = $f[0];
-			if(array_key_exists("feature_$k",$_POST))
-				set_pconfig(local_channel(),'feature',$k, (string) $_POST["feature_$k"]);
-			else
-				set_pconfig(local_channel(),'feature', $k, '');
-		}
+		process_features_post(local_channel(), $features, $_POST);
 		
 		build_sync_packet();
 		return;
@@ -26,17 +20,13 @@ class Network {
 		
 		$features = self::get_features();
 
-		foreach($features as $f) {
-			$arr[] = array('feature_' . $f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
-		}
-
 		$tpl = get_markup_template("settings_module.tpl");
 
 		$o .= replace_macros($tpl, array(
 			'$action_url' => 'settings/network',
 			'$form_security_token' => get_form_security_token("settings_network"),
 			'$title' => t('Activity Settings'),
-			'$features'  => $arr,
+			'$features'  => process_features_get(local_channel(), $features),
 			'$submit'    => t('Submit')
 		));