aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-15 17:31:49 -0700
committerFriendika <info@friendika.com>2011-03-15 17:31:49 -0700
commitf01538a54f68c172e09aabed90e2651ca2305675 (patch)
tree69ca84f95663c93d098be91047f55daa31a12106 /mod
parent73d3758e45f2049ad669225910afeb0d24e25e86 (diff)
downloadvolse-hubzilla-f01538a54f68c172e09aabed90e2651ca2305675.tar.gz
volse-hubzilla-f01538a54f68c172e09aabed90e2651ca2305675.tar.bz2
volse-hubzilla-f01538a54f68c172e09aabed90e2651ca2305675.zip
content expiration
Diffstat (limited to 'mod')
-rw-r--r--mod/item.php2
-rw-r--r--mod/settings.php6
2 files changed, 6 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php
index 5989d0967..90fb546bc 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -532,7 +532,7 @@ function item_content(&$a) {
require_once('include/security.php');
- $uid = $_SESSION['uid'];
+ $uid = local_user();
if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
diff --git a/mod/settings.php b/mod/settings.php
index ebe07612e..85029b3d7 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -63,6 +63,7 @@ function settings_post(&$a) {
$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);
+ $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 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);
@@ -139,7 +140,7 @@ function settings_post(&$a) {
$openidserver = '';
}
- $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, `openidserver` = '%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, `expire` = %d, `openidserver` = '%s' WHERE `uid` = %d LIMIT 1",
dbesc($username),
dbesc($email),
dbesc($openid),
@@ -154,6 +155,7 @@ function settings_post(&$a) {
intval($allow_location),
dbesc($theme),
intval($maxreq),
+ intval($expire),
dbesc($openidserver),
intval(local_user())
);
@@ -238,6 +240,7 @@ function settings_content(&$a) {
$defloc = $a->user['default-location'];
$openid = $a->user['openid'];
$maxreq = $a->user['maxreq'];
+ $expire = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
if(! strlen($a->user['timezone']))
$timezone = date_default_timezone_get();
@@ -358,6 +361,7 @@ function settings_content(&$a) {
'$sel_notify4' => (($notify & NOTIFY_COMMENT) ? ' checked="checked" ' : ''),
'$sel_notify5' => (($notify & NOTIFY_MAIL) ? ' checked="checked" ' : ''),
'$maxreq' => $maxreq,
+ '$expire' => $expire,
'$theme' => $theme_selector,
'$pagetype' => $pagetype
));