aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2010-12-21 07:14:58 +0100
committerroot <root@diekershoff.homeunix.net>2010-12-21 07:14:58 +0100
commit8cfa93b730f87edf98c52e9a38cfa015ce1f5d47 (patch)
treeda79ea09482cf8984c7d9e02076dd2e4f0e8e65e /mod/settings.php
parentad32d85cfaa775efbd89b273bd51c82f4e45baab (diff)
parentddec422de6707809aceb541e1191073b43aec18a (diff)
downloadvolse-hubzilla-8cfa93b730f87edf98c52e9a38cfa015ce1f5d47.tar.gz
volse-hubzilla-8cfa93b730f87edf98c52e9a38cfa015ce1f5d47.tar.bz2
volse-hubzilla-8cfa93b730f87edf98c52e9a38cfa015ce1f5d47.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/settings.php')
-rw-r--r--mod/settings.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php
index a8e02ea40..b86ff4c1c 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -53,6 +53,7 @@ function settings_post(&$a) {
$timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
$defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : '');
$openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
+ $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
$allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
$publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
@@ -105,7 +106,7 @@ function settings_post(&$a) {
$str_group_deny = perms2str($_POST['group_deny']);
$str_contact_deny = perms2str($_POST['contact_deny']);
- $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s' WHERE `uid` = %d LIMIT 1",
+ $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d WHERE `uid` = %d LIMIT 1",
dbesc($username),
dbesc($email),
dbesc($openid),
@@ -119,6 +120,7 @@ function settings_post(&$a) {
dbesc($defloc),
intval($allow_location),
dbesc($theme),
+ intval($maxreq),
intval(local_user())
);
if($r)
@@ -179,6 +181,7 @@ function settings_content(&$a) {
$notify = $a->user['notify-flags'];
$defloc = $a->user['default-location'];
$openid = $a->user['openid'];
+ $maxreq = $a->user['maxreq'];
if(! strlen($a->user['timezone']))
$timezone = date_default_timezone_get();
@@ -290,6 +293,7 @@ function settings_content(&$a) {
'$sel_notify3' => (($notify & NOTIFY_WALL) ? ' checked="checked" ' : ''),
'$sel_notify4' => (($notify & NOTIFY_COMMENT) ? ' checked="checked" ' : ''),
'$sel_notify5' => (($notify & NOTIFY_MAIL) ? ' checked="checked" ' : ''),
+ '$maxreq' => $maxreq,
'$theme' => $theme_selector,
'$pagetype' => $pagetype
));