Issue issue-1312: Reworked "public server" addon

This commit is contained in:
Michael 2018-02-18 22:20:38 +00:00
parent a4a89c7f5f
commit 446ab8c678
1 changed files with 90 additions and 106 deletions

View File

@ -9,20 +9,16 @@
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
function public_server_install() {
Addon::registerHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
Addon::registerHook('cron', 'addon/public_server/public_server.php', 'public_server_cron');
Addon::registerHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
Addon::registerHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
}
function public_server_uninstall() {
Addon::unregisterHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
Addon::unregisterHook('cron', 'addon/public_server/public_server.php', 'public_server_cron');
Addon::unregisterHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
@ -30,31 +26,28 @@ function public_server_uninstall() {
}
function public_server_register_account($a, $b) {
$uid = $b;
$days = Config::get('public_server', 'expiredays');
$days_posts = Config::get('public_server', 'expireposts');
if(! $days)
if (!$days) {
return;
}
$r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d",
dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
intval($days_posts),
intval($uid)
);
};
$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days'), 'expire' => $days_posts];
dba::update('user', $fields, ['uid' => $uid]);
}
function public_server_cron($a, $b) {
logger("public_server: cron start");
require_once('include/enotify.php');
$r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and account_expires_on > '0000-00-00 00:00:00' and
expire_notification_sent = '0000-00-00 00:00:00' ");
$r = q("select * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
`account_expires_on` > '%s' AND
expire_notification_sent <= '%s'",
dbesc(NULL_DATE), dbesc(NULL_DATE));
if(count($r)) {
if (DBM::is_result($r)) {
foreach ($r as $rr) {
notification([
'uid' => $rr['uid'],
@ -68,59 +61,48 @@ function public_server_cron($a,$b) {
'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
]);
q("update user set expire_notification_sent = '%s' where uid = %d",
dbesc(DateTimeFormat::utcNow()),
intval($rr['uid'])
);
$fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
dba::update('user', $fields, ['uid' => $rr['uid']]);
}
}
$r = q("select * from user where account_expired = 1 and account_expires_on < UTC_TIMESTAMP() - INTERVAL 5 DAY and account_expires_on > '0000-00-00 00:00:00'");
if(count($r)) {
foreach($r as $rr) {
User::remove($rr['uid']);
}
}
$nologin = Config::get('public_server','nologin');
$nologin = Config::get('public_server', 'nologin', false);
if ($nologin) {
$r = q("select uid from user where account_expired = 0 and login_date = '0000-00-00 00:00:00' and register_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00'",intval($nologin));
if(count($r)) {
foreach($r as $rr)
q("update user set account_expires_on = '%s' where uid = %d",
dbesc(DateTimeFormat::utc('now +' . '6 days')),
intval($rr['uid'])
);
$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND login_date <= '%s' AND `register_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s'",
dbesc(NULL_DATE), intval($nologin), dbesc(NULL_DATE));
if (DBM::is_result($r)) {
foreach ($r as $rr) {
$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
dba::update('user', $fields, ['uid' => $rr['uid']]);
}
}
}
$flagusers = Config::get('public_server','flagusers');
$flagusers = Config::get('public_server', 'flagusers', false);
if ($flagusers) {
$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and `page-flags` = 0",intval($flagusers));
if(count($r)) {
foreach($r as $rr)
q("update user set account_expires_on = '%s' where uid = %d",
dbesc(DateTimeFormat::utc('now +' . '6 days')),
intval($rr['uid'])
);
$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s' AND `page-flags` = 0",
intval($flagusers), dbesc(NULL_DATE));
if (DBM::is_result($r)) {
foreach ($r as $rr) {
$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
dba::update('user', $fields, ['uid' => $rr['uid']]);
}
}
}
$flagposts = Config::get('public_server', 'flagposts');
$flagpostsexpire = Config::get('public_server', 'flagpostsexpire');
if ($flagposts && $flagpostsexpire) {
$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts));
if(count($r)) {
foreach($r as $rr)
q("update user set expire = %d where uid = %d",
intval($flagpostsexpire),
intval($rr['uid'])
);
$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s' and `expire` = 0 AND `page-flags` = 0",
intval($flagposts), dbesc(NULL_DATE));
if (DBM::is_result($r)) {
foreach ($r as $rr) {
dba::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
}
}
}
logger("public_server: cron end");
}
function public_server_enotify(&$a, &$b) {
@ -135,22 +117,23 @@ function public_server_enotify(&$a, &$b) {
function public_server_login($a, $b) {
$days = Config::get('public_server', 'expiredays');
if(! $days)
if (!$days) {
return;
$r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
local_user()
);
}
$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')];
$condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), NULL_DATE];
dba::update('user', $fields, $condition);
}
function public_server_addon_admin_post (&$a) {
check_form_security_token_redirectOnErr('/admin/addons/publicserver', 'publicserver');
$expiredays = (( x($_POST, 'expiredays') ) ? notags(trim($_POST['expiredays'] )) : '');
$expireposts = (( x($_POST, 'expireposts') ) ? notags(trim($_POST['expireposts'] )) : '');
$nologin = (( x($_POST, 'nologin') ) ? notags(trim($_POST['nologin'] )) : '');
$flagusers = (( x($_POST, 'flagusers') ) ? notags(trim($_POST['flagusers'] )) : '');
$flagposts = (( x($_POST, 'flagposts') ) ? notags(trim($_POST['flagposts'] )) : '');
$flagpostsexpire = (( x($_POST, 'flagpostsexpire') ) ? notags(trim($_POST['flagpostsexpire'] )) : '');
$expiredays = (x($_POST, 'expiredays') ? notags(trim($_POST['expiredays'])) : '');
$expireposts = (x($_POST, 'expireposts') ? notags(trim($_POST['expireposts'])) : '');
$nologin = (x($_POST, 'nologin') ? notags(trim($_POST['nologin'])) : '');
$flagusers = (x($_POST, 'flagusers') ? notags(trim($_POST['flagusers'])) : '');
$flagposts = (x($_POST, 'flagposts') ? notags(trim($_POST['flagposts'])) : '');
$flagpostsexpire = (x($_POST, 'flagpostsexpire') ? notags(trim($_POST['flagpostsexpire'])) : '');
Config::set('public_server', 'expiredays', $expiredays);
Config::set('public_server', 'expireposts', $expireposts);
Config::set('public_server', 'nologin', $nologin);
@ -159,6 +142,7 @@ function public_server_addon_admin_post ( &$a ) {
Config::set('public_server', 'flagpostsexpire', $flagpostsexpire);
info(L10n::t('Settings saved').EOL);
}
function public_server_addon_admin (&$a, &$o) {
$token = get_form_security_token("publicserver");
$t = get_markup_template("admin.tpl", "addon/public_server");