Merge branch 'affinity_fixes' into 'dev'

affinity tool fixes

See merge request hubzilla/core!1511

5 files changed, 94 insertions, 119 deletions

diff --git a/Zotlabs/Module/Affinity.php b/Zotlabs/Module/Affinity.php
index 8c2ee7821..fbcb178e9 100644
--- a/Zotlabs/Module/Affinity.php
+++ b/Zotlabs/Module/Affinity.php
@@ -9,24 +9,30 @@ class Affinity extends \Zotlabs\Web\Controller {
 
 	function post() {
 
-		if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Affinity Tool'))) {
-            return;
-        }
-
-		if($_POST['affinity-submit']) {
-			$cmax = intval($_POST['affinity_cmax']);
-			if($cmax < 0 || $cmax > 99)
-				$cmax = 99;
-			$cmin = intval($_POST['affinity_cmin']);
-			if($cmin < 0 || $cmin > 99)
-				$cmin = 0;
-			set_pconfig(local_channel(),'affinity','cmin',$cmin);
-			set_pconfig(local_channel(),'affinity','cmax',$cmax);
-
-			info( t('Affinity Tool settings updated.') . EOL);
+		if(! local_channel())
+			return;
+
+		if(! Apps::system_app_installed(local_channel(),'Affinity Tool'))
+			return;
+
+		check_form_security_token_redirectOnErr('affinity', 'affinity');
+
+		$cmax = intval($_POST['affinity_cmax']);
+		if($cmax < 0 || $cmax > 99)
+			$cmax = 99;
+
+		$cmin = intval($_POST['affinity_cmin']);
+		if($cmin < 0 || $cmin > 99)
+			$cmin = 0;
+
+		$lock = intval($_POST['affinity_lock']);
+
+		set_pconfig(local_channel(),'affinity','cmin',$cmin);
+		set_pconfig(local_channel(),'affinity','cmax',$cmax);
+		set_pconfig(local_channel(),'affinity','lock',$lock);
+
+		info( t('Affinity Tool settings updated.') . EOL);
 
-		}
-		
 		Libsync::build_sync_packet();
 
 	}
@@ -34,35 +40,53 @@ class Affinity extends \Zotlabs\Web\Controller {
 
 	function get() {
 
-        $desc = t('This app (when installed) presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship or <em>affinity</em> with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.');
+		if(! local_channel())
+			return;
 
-        $text = '<div class="section-content-info-wrapper">' . $desc . '</div>';
+		$desc = t('This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (affinity) with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.');
+		if(! Apps::system_app_installed(local_channel(),'Affinity Tool')) {
+			//Do not display any associated widgets at this point
+			App::$pdl = '';
 
-        if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Affinity Tool'))) {
-            return $text;
-        }
+			$o = '<b>' . t('Affinity Tool App') . ' (' . t('Not Installed') . '):</b><br>';
+			$o .= $desc;
+			return $o;
+		}
 
-		$text .= EOL . t('The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage.') . EOL . EOL; 			
+		$text = t('The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage.'); 			
 
-		$setting_fields = $text;
+		$content = '<div class="section-content-info-wrapper">' . $text . '</div>';
 
 		$cmax = intval(get_pconfig(local_channel(),'affinity','cmax'));
 		$cmax = (($cmax) ? $cmax : 99);
-		$setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array(
+		$content .= replace_macros(get_markup_template('field_input.tpl'), array(
 			'$field'    => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99'))
 		));
+
 		$cmin = intval(get_pconfig(local_channel(),'affinity','cmin'));
 		$cmin = (($cmin) ? $cmin : 0);
-		$setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array(
+		$content .= replace_macros(get_markup_template('field_input.tpl'), array(
 			'$field'    => array('affinity_cmin', t('Default minimum affinity level'), $cmin, t('0-99 - default 0'))
 		));
 
-		$s .= replace_macros(get_markup_template('generic_app_settings.tpl'), array(
-			'$addon'    => array('affinity', '' . t('Affinity Tool Settings'), '', t('Submit')),
-			'$content'  => $setting_fields
+		$lock = intval(get_pconfig(local_channel(),'affinity','lock',1));
+
+		$content .= replace_macros(get_markup_template('field_checkbox.tpl'), array(
+			'$field'    => array('affinity_lock', t('Persistent affinity levels'), $lock, t('If disabled the max and min levels will be reset to default after page reload'), ['No','Yes'])
+		));
+
+		$tpl = get_markup_template("settings_addon.tpl");
+
+		$o = replace_macros($tpl, array(
+			'$action_url' => 'affinity',
+			'$form_security_token' => get_form_security_token("affinity"),
+			'$title' => t('Affinity Tool Settings'),
+			'$content'  => $content,
+			'$baseurl'   => z_root(),
+			'$submit'    => t('Submit'),
 		));
 
-		return $s;
+		return $o;
 	}
 
 
diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php
index 1d903fcf7..d5d740aff 100644
--- a/Zotlabs/Module/Settings/Featured.php
+++ b/Zotlabs/Module/Settings/Featured.php
@@ -10,24 +10,6 @@ class Featured {
 	
 		call_hooks('feature_settings_post', $_POST);
 	
-		if($_POST['affinity_slider-submit']) {
-			$cmax = intval($_POST['affinity_cmax']);
-			if($cmax < 0 || $cmax > 99)
-				$cmax = 99;
-			$cmin = intval($_POST['affinity_cmin']);
-			if($cmin < 0 || $cmin > 99)
-				$cmin = 0;
-
-			$lock = ($_POST['affinity_lock']) ? intval($_POST['affinity_lock']) : 1;
-
-			set_pconfig(local_channel(),'affinity','cmin',$cmin);
-			set_pconfig(local_channel(),'affinity','cmax',$cmax);
-			set_pconfig(local_channel(),'affinity','lock',$lock);
-
-			info( t('Affinity Slider settings updated.') . EOL);
-
-		}
-		
 		build_sync_packet();
 		return;
 	}
@@ -41,34 +23,10 @@ class Featured {
 		if(! $r)
 			$settings_addons = t('No feature settings configured');
 	
-		if(feature_enabled(local_channel(),'affinity')) {
-			
-			$cmax = intval(get_pconfig(local_channel(),'affinity','cmax'));
-			$cmax = (($cmax) ? $cmax : 99);
-			$setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array(
-				'$field'    => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99'))
-			));
-			$cmin = intval(get_pconfig(local_channel(),'affinity','cmin'));
-			$cmin = (($cmin) ? $cmin : 0);
-			$setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array(
-				'$field'    => array('affinity_cmin', t('Default minimum affinity level'), $cmin, t('0-99 - default 0'))
-			));
-			$lock = intval(get_pconfig(local_channel(),'affinity','lock',1));
-			$setting_fields .= replace_macros(get_markup_template('field_checkbox.tpl'), array(
-				'$field'    => array('affinity_lock', t('Always reset on new page visit.'), $lock, t('default: yes'), Array('No','Yes'))
-			));
-
-			$settings_addons .= replace_macros(get_markup_template('generic_addon_settings.tpl'), array(
-				'$addon'    => array('affinity_slider', '' . t('Affinity Slider Settings'), '', t('Submit')),
-				'$content'  => $setting_fields
-			));
-		}
-
 		call_hooks('feature_settings', $settings_addons);
 		
 		$this->sortpanels($settings_addons);
 
-			
 		$tpl = get_markup_template("settings_addons.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_featured"),
diff --git a/Zotlabs/Widget/Affinity.php b/Zotlabs/Widget/Affinity.php
index 140d8f8ca..572af0503 100644
--- a/Zotlabs/Widget/Affinity.php
+++ b/Zotlabs/Widget/Affinity.php
@@ -9,10 +9,10 @@ class Affinity {
 	function widget($arr) {
 
 		if(! local_channel())
-			return '';
-        
-//         replace feature_enabled(local_channel() with 
-//         Apps::system_app_installed(local_channel()
+			return;
+
+		if(! Apps::system_app_installed(local_channel(),'Affinity Tool'))
+			return;
         
 		$default_cmin = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0);
 		$default_cmax = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99);
@@ -20,47 +20,47 @@ class Affinity {
 		$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $default_cmin);
 		$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $default_cmax);
 
-		if(Apps::system_app_installed(local_channel(),'Affinity Tool')) {
+		$affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
+		if ($affinity_locked) {
+			set_pconfig(local_channel(),'affinity','cmin',$cmin);
+			set_pconfig(local_channel(),'affinity','cmax',$cmax);
+		}
 
-                        $affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
-                        if ($affinity_locked) {
-                                set_pconfig(local_channel(),'affinity','cmin',$cmin);
-                                set_pconfig(local_channel(),'affinity','cmax',$cmax);
-                        }
+		$labels = array(
+			t('Me'),
+			t('Family'),
+			t('Friends'),
+			t('Acquaintances'),
+			t('All')
+		);
+		call_hooks('affinity_labels',$labels);
 
-			$labels = array(
-				t('Me'),
-				t('Family'),
-				t('Friends'),
-				t('Acquaintances'),
-				t('All')
-			);
-			call_hooks('affinity_labels',$labels);
-			$label_str = '';
+		$label_str = '';
 
-			if($labels) {
-				foreach($labels as $l) {
-					if($label_str) {
-						$label_str .= ", '|'";
-						$label_str .= ", '" . $l . "'";
-					}
-					else
-						$label_str .= "'" . $l . "'";
+		if($labels) {
+			foreach($labels as $l) {
+				if($label_str) {
+					$label_str .= ", '|'";
+					$label_str .= ", '" . $l . "'";
 				}
+				else
+					$label_str .= "'" . $l . "'";
 			}
-
-			$tpl = get_markup_template('main_slider.tpl');
-			$x = replace_macros($tpl,array(
-				'$val' => $cmin . ',' . $cmax,
-				'$refresh' => t('Refresh'),
-				'$labels' => $label_str,
-			));
-		
-			$arr = array('html' => $x);
-			call_hooks('main_slider',$arr);
-			return $arr['html'];
 		}
- 		return '';
+
+		$tpl = get_markup_template('main_slider.tpl');
+		$x = replace_macros($tpl,array(
+			'$val' => $cmin . ',' . $cmax,
+			'$refresh' => t('Refresh'),
+			'$labels' => $label_str,
+		));
+	
+		$arr = array('html' => $x);
+		call_hooks('main_slider',$arr);
+
+		return $arr['html'];
+
+
 	}
 }
  
diff --git a/app/affinity.apd b/app/affinity.apd
index f56f28ae0..3860581aa 100644
--- a/app/affinity.apd
+++ b/app/affinity.apd
@@ -4,3 +4,4 @@ requires: local_channel
 name: Affinity Tool
 photo: icon:arrows-h
 categories: Networking
+desc: This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (affinity) with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.
diff --git a/include/features.php b/include/features.php
index 05ce3db32..35a4c0dd4 100644
--- a/include/features.php
+++ b/include/features.php
@@ -361,14 +361,6 @@ function get_features($filtered = true, $level = (-1)) {
 			],
 
 			[
-				'affinity',       
-				t('Affinity Tool'),			    
-				t('Filter stream activity by depth of relationships'),
-				false,
-				get_config('feature_lock','affinity')
-			],
-
-			[
 				'suggest',    	
 				t('Suggest Channels'),			
 				t('Show friend and connection suggestions'),