aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Settings/Network.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-04 21:38:39 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-04 21:38:39 +0200
commitd4af745fc8000be9fcc198d3d0205a6b134e374c (patch)
tree9f3742fcf21e5d3ba48ec4922de43d07f1e97031 /Zotlabs/Module/Settings/Network.php
parent6e03104e3ee785954b4f755240d1595f702522b2 (diff)
downloadvolse-hubzilla-d4af745fc8000be9fcc198d3d0205a6b134e374c.tar.gz
volse-hubzilla-d4af745fc8000be9fcc198d3d0205a6b134e374c.tar.bz2
volse-hubzilla-d4af745fc8000be9fcc198d3d0205a6b134e374c.zip
move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided
Diffstat (limited to 'Zotlabs/Module/Settings/Network.php')
-rw-r--r--Zotlabs/Module/Settings/Network.php28
1 files changed, 26 insertions, 2 deletions
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
index c51b780f1..aaafe9255 100644
--- a/Zotlabs/Module/Settings/Network.php
+++ b/Zotlabs/Module/Settings/Network.php
@@ -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;