Browse Source

content expiration

pull/1/head
Friendika 10 years ago
parent
commit
f01538a54f
15 changed files with 165 additions and 20 deletions
  1. +1
    -1
      boot.php
  2. +1
    -0
      database.sql
  3. +44
    -0
      include/expire.php
  4. +46
    -0
      include/items.php
  5. +23
    -11
      include/notifier.php
  6. +11
    -0
      include/poller.php
  7. +1
    -1
      mod/item.php
  8. +5
    -1
      mod/settings.php
  9. +7
    -1
      update.php
  10. +5
    -1
      view/de/settings.tpl
  11. +5
    -2
      view/en/settings.tpl
  12. +4
    -1
      view/fr/settings.tpl
  13. +4
    -1
      view/it/settings.tpl
  14. +4
    -0
      view/theme/duepuntozero/style.css
  15. +4
    -0
      view/theme/loozah/style.css

+ 1
- 1
boot.php View File

@ -4,7 +4,7 @@ set_time_limit(0);
define ( 'FRIENDIKA_VERSION', '2.1.919' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
define ( 'DB_UPDATE_VERSION', 1042 );
define ( 'DB_UPDATE_VERSION', 1043 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );


+ 1
- 0
database.sql View File

@ -379,6 +379,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`page-flags` int(11) unsigned NOT NULL DEFAULT '0',
`pwdreset` char(255) NOT NULL,
`maxreq` int(11) NOT NULL DEFAULT '10',
`expire` int(11) unsigned NOT NULL DEFAULT '0',
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,


+ 44
- 0
include/expire.php View File

@ -0,0 +1,44 @@
<?php
require_once("boot.php");
function expire_run($argv, $argc){
global $a, $db;
if(is_null($a)) {
$a = new App;
}
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};
require_once('session.php');
require_once('datetime.php');
require_once('simplepie/simplepie.inc');
require_once('include/items.php');
require_once('include/Contact.php');
$a->set_baseurl(get_config('system','url'));
logger('expire: start');
$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
if(count($r)) {
foreach($r as $rr) {
logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
item_expire($rr['uid'],$rr['expire']);
}
}
return;
}
if (array_search(__file__,get_included_files())===0){
expire_run($argv,$argc);
killme();
}

+ 46
- 0
include/items.php View File

@ -1507,3 +1507,49 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
return $o;
}
function item_expire($uid,$days) {
if((! $uid) || (! $days))
return;
$r = q("SELECT * FROM `item`
WHERE `uid` = %d
AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY
AND `id` = `parent`
AND `deleted` = 0",
intval($uid),
intval($days)
);
if(! count($r))
return;
logger('expire: # items=' . count($r) );
foreach($r as $item) {
// Only expire posts, not photos and photo comments
if(strlen($item['resource-id']))
continue;
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
// kill the kids
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($item['parent-uri']),
intval($item['uid'])
);
}
proc_run('php',"include/notifier.php","expire","$uid");
}

+ 23
- 11
include/notifier.php View File

@ -40,6 +40,7 @@ function notifier_run($argv, $argc){
break;
}
$expire = false;
$top_level = false;
$recipients = array();
$url_recipients = array();
@ -57,6 +58,17 @@ function notifier_run($argv, $argc){
$item = $message[0];
}
elseif($cmd === 'expire') {
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 10 MINUTE",
intval($item_id)
);
$uid = $item_id;
$item_id = 0;
if(! count($items))
return;
}
else {
// find ancestors
@ -76,11 +88,10 @@ function notifier_run($argv, $argc){
intval($parent_id)
);
if(! count($items)){
if(! count($items)) {
return;
}
// avoid race condition with deleting entries
if($items[0]['deleted']) {
@ -98,11 +109,11 @@ function notifier_run($argv, $argc){
intval($uid)
);
if(count($r))
$owner = $r[0];
else {
if(! count($r))
return;
}
$owner = $r[0];
$hub = get_config('system','huburl');
// If this is a public conversation, notify the feed hub
@ -117,7 +128,7 @@ function notifier_run($argv, $argc){
$parent = $items[0];
if($parent['type'] === 'remote') {
if($parent['type'] === 'remote' && (! $expire)) {
// local followup to remote post
$followup = true;
$notify_hub = false; // not public
@ -235,6 +246,7 @@ function notifier_run($argv, $argc){
}
else {
foreach($items as $item) {
if(! $item['parent'])
continue;
@ -242,9 +254,9 @@ function notifier_run($argv, $argc){
if(! $contact)
continue;
$atom .= atom_entry($item,'text',$contact,$owner,true);
$atom .= atom_entry($item,'text',$contact,$owner,true);
if(($top_level) && ($notify_hub) && ($item['author-link'] === $item['owner-link']))
if(($top_level) && ($notify_hub) && ($item['author-link'] === $item['owner-link']) && (! $expire))
$slaps[] = atom_entry($item,'html',$contact,$owner,true);
}
}
@ -319,7 +331,7 @@ function notifier_run($argv, $argc){
// only send salmon if public - e.g. if it's ok to notify
// a public hub, it's ok to send a salmon
if(count($slaps) && $notify_hub) {
if((count($slaps)) && ($notify_hub) && (! $expire)) {
logger('notifier: slapdelivery: ' . $contact['name']);
foreach($slaps as $slappy) {
if($contact['notify']) {
@ -350,7 +362,7 @@ function notifier_run($argv, $argc){
// send additional slaps to mentioned remote tags (@foo@example.com)
if($slap && count($url_recipients) && $followup && $notify_hub) {
if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
foreach($url_recipients as $url) {
if($url) {
logger('notifier: urldelivery: ' . $url);


+ 11
- 0
include/poller.php View File

@ -29,6 +29,17 @@ function poller_run($argv, $argc){
proc_run('php',"include/queue.php");
// once daily run expire in background
$d1 = get_config('system','last_expire_day');
$d2 = intval(datetime_convert('UTC','UTC','now','d'));
if($d2 != intval($d1)) {
set_config('system','last_expire_day',$d2);
proc_run('php','include/expire.php');
}
// clear old cache
q("DELETE FROM `cache` WHERE `updated` < '%s'",
dbesc(datetime_convert('UTC','UTC',"now - 30 days")));


+ 1
- 1
mod/item.php View File

@ -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])) {


+ 5
- 1
mod/settings.php View File

@ -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
));


+ 7
- 1
update.php View File

@ -400,4 +400,10 @@ function update_1040() {
function update_1041() {
q("ALTER TABLE `profile` CHANGE `keywords` `prv_keywords` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ");
q("ALTER TABLE `profile` ADD `pub_keywords` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `religion` ");
}
}
function update_1042() {
q("ALTER TABLE `user` ADD `expire` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `maxreq` ");
}

+ 5
- 1
view/de/settings.tpl View File

@ -78,7 +78,7 @@ $profile_in_net_dir
<div id="settings-default-perms" class="settings-default-perms" >
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
<div id="settings-default-perms-menu-end"></div>
<div id="settings-default-perms-select" style="display: none;" >
@ -89,6 +89,10 @@ $profile_in_net_dir
</div>
<div id="settings-default-perms-end"></div>
<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
<div id="settings-expire-end"></div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
</div>


+ 5
- 2
view/en/settings.tpl View File

@ -76,9 +76,8 @@ $profile_in_dir
$profile_in_net_dir
<div id="settings-default-perms" class="settings-default-perms" >
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
<div id="settings-default-perms-menu-end"></div>
<div id="settings-default-perms-select" style="display: none;" >
@ -89,6 +88,10 @@ $profile_in_net_dir
</div>
<div id="settings-default-perms-end"></div>
<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
<div id="settings-expire-end"></div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
</div>


+ 4
- 1
view/fr/settings.tpl View File

@ -78,7 +78,7 @@ $profile_in_net_dir
<div id="settings-default-perms" class="settings-default-perms" >
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
<div id="settings-default-perms-menu-end"></div>
<div id="settings-default-perms-select" style="display: none;" >
@ -89,6 +89,9 @@ $profile_in_net_dir
</div>
<div id="settings-default-perms-end"></div>
<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
<div id="settings-expire-end"></div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
</div>


+ 4
- 1
view/it/settings.tpl View File

@ -79,7 +79,7 @@ $profile_in_net_dir
<div id="settings-default-perms" class="settings-default-perms" >
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
<div id="settings-default-perms-menu-end"></div>
<div id="settings-default-perms-select" style="display: none;" >
@ -90,6 +90,9 @@ $profile_in_net_dir
</div>
<div id="settings-default-perms-end"></div>
<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
<div id="settings-expire-end"></div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
</div>


+ 4
- 0
view/theme/duepuntozero/style.css View File

@ -373,6 +373,10 @@ input#dfrn-url {
margin-bottom: 30px;
}
#settings-expire-end {
margin-bottom: 30px;
}
#settings-username-end,
#settings-email-end,
#settings-nick-end,


+ 4
- 0
view/theme/loozah/style.css View File

@ -506,6 +506,10 @@ input#dfrn-url {
margin-bottom: 30px;
}
#settings-expire-end {
margin-bottom: 30px;
}
#settings-username-end,
#settings-email-end,
#settings-nick-end,


Loading…
Cancel
Save