1 files changed, 53 insertions, 31 deletions

diff --git a/Zotlabs/Module/Admin/Features.php b/Zotlabs/Module/Admin/Features.php
index 6a3ab104b..504caae79 100644
--- a/Zotlabs/Module/Admin/Features.php
+++ b/Zotlabs/Module/Admin/Features.php
@@ -1,52 +1,74 @@
 <?php
 
-namespace Zotlabs\Module\Settings;
+namespace Zotlabs\Module\Admin;
+
 
 
 class Features {
 
+	
 	function post() {
-		check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
 	
+		check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
+	
+		logger('postvars: ' . print_r($_POST,true));
+	
+		$arr = array();
 		$features = get_features(false);
-
+	
 		foreach($features as $fname => $fdata) {
 			foreach(array_slice($fdata,1) as $f) {
-				$k = $f[0];
-				if(array_key_exists("feature_$k",$_POST))
-					set_pconfig(local_channel(),'feature',$k, (string) $_POST["feature_$k"]);
+				$feature = $f[0];
+	
+				if(array_key_exists('feature_' . $feature,$_POST))
+					$val = intval($_POST['feature_' . $feature]);
+				else
+					$val = 0;
+				set_config('feature',$feature,$val);
+	
+				if(array_key_exists('featurelock_' . $feature,$_POST))
+					set_config('feature_lock',$feature,$val);
 				else
-					set_pconfig(local_channel(),'feature', $k, '');
+					del_config('feature_lock',$feature);
 			}
 		}
-		build_sync_packet();
-		return;
+	
+		goaway(z_root() . '/admin/features' );
+	
 	}
-
+	
 	function get() {
 		
-		$arr = [];
-
-		$features = get_features(false);
-
-		foreach($features as $fname => $fdata) {
-			$arr[$fname] = array();
-			$arr[$fname][0] = $fdata[0];
-			foreach(array_slice($fdata,1) as $f) {
-				$arr[$fname][1][] = array('feature_' . $f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
+		if((argc() > 1) && (argv(1) === 'features')) {
+			$arr = array();
+			$features = get_features(false);
+	
+			foreach($features as $fname => $fdata) {
+				$arr[$fname] = array();
+				$arr[$fname][0] = $fdata[0];
+				foreach(array_slice($fdata,1) as $f) {
+	
+					$set = get_config('feature',$f[0]);
+					if($set === false)
+						$set = $f[3];
+					$arr[$fname][1][] = array(
+						array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'),t('On'))),
+						array('featurelock_' .$f[0],sprintf( t('Lock feature %s'),$f[1]),(($f[4] !== false) ? 1 : 0),'',array(t('Off'),t('On')))
+					);
+				}
 			}
-		}
 			
-		$tpl = get_markup_template("settings_features.tpl");
-		$o .= replace_macros($tpl, array(
-			'$form_security_token' => get_form_security_token("settings_features"),
-			'$title'	 => t('Additional Features'),
-			'$features'  => $arr,
-			'$baseurl'   => z_root(),
-			'$submit'    => t('Submit'),
-		));
-	
-		return $o;
+			$tpl = get_markup_template("admin_settings_features.tpl");
+			$o .= replace_macros($tpl, array(
+				'$form_security_token' => get_form_security_token("admin_manage_features"),
+				'$title'	=> t('Manage Additional Features'),
+				'$features' => $arr,
+				'$submit'   => t('Submit'),
+			));
+	
+			return $o;
+		}
 	}
+	
 
-}
+}
\ No newline at end of file