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

a different (hopefully better) implementation of affinity presets, but not for 3.0 because strings have changed.

Browse Source
This commit is contained in:
zotlabs 2017-12-28 15:12:20 -08:00
parent 38646fe0e1
commit 5cfb63da50
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Network.php
View File

@ -106,6 +106,8 @@ class Network extends \Zotlabs\Web\Controller {
$o = ''; $o = '';
$default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0);
$default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99);
// if no tabs are selected, defaults to comments // if no tabs are selected, defaults to comments
@ -115,8 +117,8 @@ class Network extends \Zotlabs\Web\Controller {
$liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0); $liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0); $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0); $spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0); $cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : $default_cmin);
$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99); $cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : $default_cmax);
$file = ((x($_GET,'file')) ? $_GET['file'] : ''); $file = ((x($_GET,'file')) ? $_GET['file'] : '');
$xchan = ((x($_GET,'xchan')) ? $_GET['xchan'] : ''); $xchan = ((x($_GET,'xchan')) ? $_GET['xchan'] : '');
$net = ((x($_GET,'net')) ? $_GET['net'] : ''); $net = ((x($_GET,'net')) ? $_GET['net'] : '');

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

@ -17,12 +17,8 @@ class Featured {
$cmin = intval($_POST['affinity_cmin']); $cmin = intval($_POST['affinity_cmin']);
if($cmin < 0 || $cmin > 99) if($cmin < 0 || $cmin > 99)
$cmin = 0; $cmin = 0;
if($cmin !== 0 || $cmax !== 99) { set_pconfig(local_channel(),'affinity','cmin',$cmin);
set_pconfig(local_channel(),'system','network_page_default','cmin=' . $cmin . '&cmax=' . $cmax); set_pconfig(local_channel(),'affinity','cmax',$cmax);
}
else {
set_pconfig(local_channel(),'system','network_page_default','');
}
info( t('Affinity Slider settings updated.') . EOL); info( t('Affinity Slider settings updated.') . EOL);
@ -46,12 +42,12 @@ class Featured {
$cmax = intval(get_pconfig(local_channel(),'affinity','cmax')); $cmax = intval(get_pconfig(local_channel(),'affinity','cmax'));
$cmax = (($cmax) ? $cmax : 99); $cmax = (($cmax) ? $cmax : 99);
$setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array(
'$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, '') '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99'))
)); ));
$cmin = intval(get_pconfig(local_channel(),'affinity','cmin')); $cmin = intval(get_pconfig(local_channel(),'affinity','cmin'));
$cmin = (($cmin) ? $cmin : 0); $cmin = (($cmin) ? $cmin : 0);
$setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array(
'$field' => array('affinity_cmin', t('Default minimum affinity level'), $cmin, '') '$field' => array('affinity_cmin', t('Default minimum affinity level'), $cmin, t('0-99 - default 0'))
)); ));
$settings_addons .= replace_macros(get_markup_template('generic_addon_settings.tpl'), array( $settings_addons .= replace_macros(get_markup_template('generic_addon_settings.tpl'), array(