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

move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided

Browse Source
This commit is contained in:
Mario Vavti
2018-10-04 21:38:39 +02:00
parent 6e03104e3e
commit d4af745fc8
14 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Zotlabs/Module/Settings/Network.php
View File

@@ -14,8 +14,18 @@ class Network {
$features = get_module_features($module);
process_module_features_post(local_channel(), $features, $_POST);
$network_divmore_height = ((x($_POST,'network_divmore_height')) ? intval($_POST['network_divmore_height']) : 400);
if($network_divmore_height < 50)
$network_divmore_height = 50;
set_pconfig(local_channel(),'system','network_divmore_height', $network_divmore_height);
build_sync_packet();
if($_POST['rpath'])
goaway($_POST['rpath']);
return;
}
@@ -26,6 +36,19 @@ class Network {
$features = get_module_features($module);
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$network_divmore_height = [
'network_divmore_height',
t('Max height of content (in pixels)'),
((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400),
t('Click to expand content exceeding this height')
];
$extra_settings_html = replace_macros(get_markup_template('field_input.tpl'),
[
'$field' => $network_divmore_height
]
);
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
@@ -33,8 +56,9 @@ class Network {
'$action_url' => 'settings/' . $module,
'$form_security_token' => get_form_security_token('settings_' . $module),
'$title' => t('Activity Settings'),
'$features' => process_module_features_get(local_channel(), $features),
'$submit' => t('Submit')
'$features' => process_module_features_get(local_channel(), $features),
'$extra_settings_html' => $extra_settings_html,
'$submit' => t('Submit')
));
return $o;