harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Manning 2017-01-30 06:03:53 -05:00
commit fab103524a
3 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Zotlabs/Module/Settings/Featured.php
View File

@ -10,6 +10,16 @@ class Featured {
call_hooks('feature_settings_post', $_POST); 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(); build_sync_packet();
return; return;
} }
@ -23,6 +33,25 @@ class Featured {
if(! $r) if(! $r)
$settings_addons = t('No feature settings configured'); $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); call_hooks('feature_settings', $settings_addons);
$tpl = get_markup_template("settings_addons.tpl"); $tpl = get_markup_template("settings_addons.tpl");

17
include/queue_fn.php
View File

@ -8,6 +8,21 @@ function update_queue_item($id, $add_priority = 0) {
if(! $x) if(! $x)
return; 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. // Set all other records for this destination way into the future.
// The queue delivers by destination. We'll keep one queue item for // The queue delivers by destination. We'll keep one queue item for
// this destination (this one) with a shorter delivery. If we succeed // 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']); $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'); $next = datetime_convert('UTC','UTC','now + 1 hour');
} }
else { else {

11
include/widgets.php
View File

@ -522,8 +522,15 @@ function widget_affinity($arr) {
if(! local_channel()) if(! local_channel())
return ''; return '';
$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : 0); // Get default cmin value from pconfig, but allow GET parameter to override
$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : 99); $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')) { if(feature_enabled(local_channel(),'affinity')) {