use Friendica\DI;
use Friendica\Model\Notification;
use Friendica\Model\User;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
function public_server_install()
{
Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
}
-function public_server_load_config(App $a, ConfigFileLoader $loader)
+function public_server_load_config(ConfigFileManager $loader)
{
- $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
+ DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
}
-function public_server_register_account($a, $b)
+function public_server_register_account($b)
{
$uid = $b;
DBA::update('user', $fields, ['uid' => $uid]);
}
-function public_server_cron($a, $b)
+function public_server_cron($b)
{
- Logger::log("public_server: cron start");
+ Logger::notice("public_server: cron start");
- $users = DBA::selectToArray('user', [], ["`account_expires_on` < UTC_TIMESTAMP() + INTERVAL ? DAY AND
- `account_expires_on` > ? AND `expire_notification_sent` <= ?", 5, DBA::NULL_DATETIME, DBA::NULL_DATETIME]);
+ $users = DBA::selectToArray('user', [], ["`account_expires_on` > ? AND `account_expires_on` < ?
+ AND `expire_notification_sent` <= ?", DBA::NULL_DATETIME, DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
foreach ($users as $rr) {
- notification([
+ DI::notify()->createFromArray([
'type' => Notification\Type::SYSTEM,
+ 'event' => 'SYSTEM_PUBLIC_SERVER_EXPIRATION',
'uid' => $rr['uid'],
'system_type' => 'public_server_expire',
'source_name' => DI::l10n()->t('Administrator'),
- 'source_link' => DI::baseUrl()->get(),
- 'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
+ 'source_link' => DI::baseUrl(),
+ 'source_photo' => DI::baseUrl() . '/images/person-80.jpg',
]);
$fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
$nologin = DI::config()->get('public_server', 'nologin', false);
if ($nologin) {
- $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` <= ? AND `register_date` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `account_expires_on` <= ?",
- DBA::NULL_DATETIME, $nologin, DBA::NULL_DATETIME]);
+ $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` <= ? AND `register_date` < ? AND `account_expires_on` <= ?",
+ DBA::NULL_DATETIME, DateTimeFormat::utc('now - ' . (int)$nologin . ' days'), DBA::NULL_DATETIME]);
foreach ($users as $rr) {
$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
DBA::update('user', $fields, ['uid' => $rr['uid']]);
$flagusers = DI::config()->get('public_server', 'flagusers', false);
if ($flagusers) {
- $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `account_expires_on` <= ? AND `page-flags` = ?",
- $flagusers, DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
+ $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < ? AND `account_expires_on` <= ? AND `page-flags` = ?",
+ DateTimeFormat::utc('now - ' . (int)$flagusers . ' days'), DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
foreach ($users as $rr) {
$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
DBA::update('user', $fields, ['uid' => $rr['uid']]);
$flagposts = DI::config()->get('public_server', 'flagposts');
$flagpostsexpire = DI::config()->get('public_server', 'flagpostsexpire');
if ($flagposts && $flagpostsexpire) {
- $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `account_expires_on` <= ? AND NOT `expire` AND `page-flags` = ?",
- $flagposts, DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
+ $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < ? AND `account_expires_on` <= ? AND NOT `expire` AND `page-flags` = ?",
+ DateTimeFormat::utc('now - ' . (int)$flagposts . ' days'), DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
foreach ($users as $rr) {
DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
}
}
- Logger::log("public_server: cron end");
+ Logger::notice("public_server: cron end");
}
-function public_server_enotify(&$a, &$b)
+function public_server_enotify(array &$b)
{
if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
- $b['itemlink'] = DI::baseUrl()->get();
+ $b['itemlink'] = DI::baseUrl();
$b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));
$b['subject'] = DI::l10n()->t('Your Friendica account is about to expire.');
$b['body'] = DI::l10n()->t("Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days", $b['params']['to_name'], "[url=" . DI::config()->get('system', 'url') . "]" . DI::config()->get('config', 'sitename') . "[/url]");
}
}
-function public_server_login($a, $b)
+function public_server_login($b)
{
$days = DI::config()->get('public_server', 'expiredays');
if (!$days) {
}
$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')];
- $condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), DBA::NULL_DATETIME];
+ $condition = ["`uid` = ? AND `account_expires_on` > ?", DI::userSession()->getLocalUserId(), DBA::NULL_DATETIME];
DBA::update('user', $fields, $condition);
}
-function public_server_addon_admin_post(&$a)
+function public_server_addon_admin_post()
{
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
- $expiredays = (!empty($_POST['expiredays']) ? Strings::escapeTags(trim($_POST['expiredays'])) : '');
- $expireposts = (!empty($_POST['expireposts']) ? Strings::escapeTags(trim($_POST['expireposts'])) : '');
- $nologin = (!empty($_POST['nologin']) ? Strings::escapeTags(trim($_POST['nologin'])) : '');
- $flagusers = (!empty($_POST['flagusers']) ? Strings::escapeTags(trim($_POST['flagusers'])) : '');
- $flagposts = (!empty($_POST['flagposts']) ? Strings::escapeTags(trim($_POST['flagposts'])) : '');
- $flagpostsexpire = (!empty($_POST['flagpostsexpire']) ? Strings::escapeTags(trim($_POST['flagpostsexpire'])) : '');
- DI::config()->set('public_server', 'expiredays', $expiredays);
- DI::config()->set('public_server', 'expireposts', $expireposts);
- DI::config()->set('public_server', 'nologin', $nologin);
- DI::config()->set('public_server', 'flagusers', $flagusers);
- DI::config()->set('public_server', 'flagposts', $flagposts);
- DI::config()->set('public_server', 'flagpostsexpire', $flagpostsexpire);
+
+ DI::config()->set('public_server', 'expiredays', trim($_POST['expiredays'] ?? ''));
+ DI::config()->set('public_server', 'expireposts', trim($_POST['expireposts'] ?? ''));
+ DI::config()->set('public_server', 'nologin', trim($_POST['nologin'] ?? ''));
+ DI::config()->set('public_server', 'flagusers', trim($_POST['flagusers'] ?? ''));
+ DI::config()->set('public_server', 'flagposts', trim($_POST['flagposts'] ?? ''));
+ DI::config()->set('public_server', 'flagpostsexpire', trim($_POST['flagpostsexpire'] ?? ''));
}
-function public_server_addon_admin(&$a, &$o)
+function public_server_addon_admin(string &$o)
{
- $token = BaseModule::getFormSecurityToken("publicserver");
- $t = Renderer::getMarkupTemplate("admin.tpl", "addon/public_server");
+ $token = BaseModule::getFormSecurityToken('publicserver');
+ $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/public_server');
$o = Renderer::replaceMacros($t, [
'$submit' => DI::l10n()->t('Save Settings'),
'$form_security_token' => $token,
'$infotext' => DI::l10n()->t('Set any of these options to 0 to deactivate it.'),
- '$expiredays' => ["expiredays","Expire Days", intval(DI::config()->get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
+ '$expiredays' => ["expiredays", "Expire Days", intval(DI::config()->get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
'$expireposts' => ["expireposts", "Expire Posts", intval(DI::config()->get('public_server', 'expireposts')), "Set the default days for posts to expire here"],
'$nologin' => ["nologin", "No Login", intval(DI::config()->get('public_server', 'nologin')), "Remove users who have never logged in after nologin days "],
'$flagusers' => ["flagusers", "Flag users", intval(DI::config()->get('public_server', 'flagusers')), "Remove users who last logged in over flagusers days ago"],
projects / friendica-addons.git / blobdiff