diff options
| author | friendica <info@friendica.com> | 2014-08-13 16:54:59 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-13 16:54:59 -0700 |
| commit | 4156c68d0d433e804787cdd7ff52235d51b53ba2 (patch) | |
| tree | eae3a51dc94beefabb95fea5df455dfa80255f43 /mod | |
| parent | eb38f3f47460bfb00af3dcae815720b2970a31eb (diff) | |
| parent | 4a938db39841d91d294b1cb1c193f12cae5f9492 (diff) | |
| download | volse-hubzilla-4156c68d0d433e804787cdd7ff52235d51b53ba2.tar.gz volse-hubzilla-4156c68d0d433e804787cdd7ff52235d51b53ba2.tar.bz2 volse-hubzilla-4156c68d0d433e804787cdd7ff52235d51b53ba2.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/settings.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php index 6c11fbc9b..631ceb3c2 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -135,6 +135,7 @@ function settings_post(&$a) { $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->channel['channel_theme']); $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme'])) : ''); + $user_scalable = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable']) : 0); $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); $browser_update = $browser_update * 1000; @@ -151,7 +152,7 @@ function settings_post(&$a) { } // $chanview_full = ((x($_POST,'chanview_full')) ? intval($_POST['chanview_full']) : 0); - + set_pconfig(local_user(),'system','user_scalable',$user_scalable); set_pconfig(local_user(),'system','update_interval', $browser_update); set_pconfig(local_user(),'system','itemspage', $itemspage); set_pconfig(local_user(),'system','no_smilies',$nosmile); @@ -727,6 +728,9 @@ function settings_content(&$a) { } $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); $mobile_theme_selected = (!x($_SESSION,'mobile_theme')? $default_mobile_theme : $_SESSION['mobile_theme']); + + $user_scalable = get_pconfig(local_user(),'system','user_scalable'); + $user_scalable = (($user_scalable===false)? '1': $user_scalable); // default if not set: 1 $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds @@ -753,11 +757,13 @@ function settings_content(&$a) { '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview'), '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, ''), + '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, ''), '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), '$layout_editor' => t('System Page Layout Editor - (advanced)'), '$theme_config' => $theme_config, + '$expert' => feature_enabled(local_user(),'expert'), )); return $o; |