Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

3 files changed, 55 insertions, 4 deletions

diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php
index eec5f6c02..4885abd1d 100644
--- a/Zotlabs/Module/Settings/Featured.php
+++ b/Zotlabs/Module/Settings/Featured.php
@@ -10,6 +10,16 @@ class Featured {
 	
 		call_hooks('feature_settings_post', $_POST);
 	
+		if(intval($_POST['affinity_cmax'])) {
+			set_pconfig(local_channel(),'affinity','cmax',intval($_POST['affinity_cmax']));
+		}
+		if(intval($_POST['affinity_cmin'])) {
+			set_pconfig(local_channel(),'affinity','cmin',intval($_POST['affinity_cmin']));			
+		}
+		if(intval($_POST['affinity_cmax']) || intval($_POST['affinity_cmin'])) {
+			info( t('Affinity Slider settings updated.') . EOL);
+		}
+		
 		build_sync_packet();
 		return;
 	}
@@ -23,6 +33,25 @@ 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, '')
+			));
+			$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, '')
+			));
+
+			$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);
 					
 		$tpl = get_markup_template("settings_addons.tpl");
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 74dde5de2..ede6c8f11 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -8,6 +8,21 @@ function update_queue_item($id, $add_priority = 0) {
 	if(! $x)
 		return;
 
+
+	$y = q("select min(outq_created) as earliest from outq where outq_posturl = '%s'",
+		dbesc($x[0]['outq_posturl'])
+	);
+
+	// look for the oldest queue entry with this destination URL. If it's older than a couple of days,
+	// the destination is considered to be down and only scheduled once an hour, regardless of the
+	// age of the current queue item.
+
+	$might_be_down = false;
+
+	if($y)
+		$might_be_down = ((datetime_convert('UTC','UTC',$y[0]['earliest']) < datetime_convert('UTC','UTC','now - 2 days')) ? true : false);
+
+
 	// Set all other records for this destination way into the future. 
 	// The queue delivers by destination. We'll keep one queue item for
 	// this destination (this one) with a shorter delivery. If we succeed
@@ -23,7 +38,7 @@ function update_queue_item($id, $add_priority = 0) {
  
 	$since = datetime_convert('UTC','UTC',$x[0]['outq_created']);
 
-	if($since < datetime_convert('UTC','UTC','now - 12 hour')) {
+	if(($might_be_down) || ($since < datetime_convert('UTC','UTC','now - 12 hour'))) {
 		$next = datetime_convert('UTC','UTC','now + 1 hour');
 	}
 	else {
diff --git a/include/widgets.php b/include/widgets.php
index 98ea4e6a1..27eae7d6f 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -521,9 +521,16 @@ function widget_affinity($arr) {
 
 	if(! local_channel())
 		return '';
-
-	$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : 0);
-	$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : 99);
+	
+	// Get default cmin value from pconfig, but allow GET parameter to override
+	$cmin = intval(get_pconfig(local_channel(),'affinity','cmin'));
+	$cmin = (($cmin) ? $cmin : 0);
+	$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $cmin);
+	
+	// Get default cmax value from pconfig, but allow GET parameter to override
+	$cmax = intval(get_pconfig(local_channel(),'affinity','cmax'));
+	$cmax = (($cmax) ? $cmax : 99);
+	$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $cmax);
 
 
 	if(feature_enabled(local_channel(),'affinity')) {