* Author: Keith Fernie <http://friendika.me4.it/profile/keith>
*/
-use Friendica\Core\Addon;
+use Friendica\App;
+use Friendica\BaseModule;
use Friendica\Core\Config;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
function public_server_install()
{
- Addon::registerHook('load_config', 'addon/public_server/public_server.php', 'public_server_load_config');
- 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');
+ Hook::register('load_config', 'addon/public_server/public_server.php', 'public_server_load_config');
+ Hook::register('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
+ Hook::register('cron', 'addon/public_server/public_server.php', 'public_server_cron');
+ Hook::register('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
+ Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
}
function public_server_uninstall()
{
- Addon::unregisterHook('load_config', 'addon/public_server/public_server.php', 'public_server_load_config');
- 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');
- Addon::unregisterHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
+ Hook::unregister('load_config', 'addon/public_server/public_server.php', 'public_server_load_config');
+ Hook::unregister('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
+ Hook::unregister('cron', 'addon/public_server/public_server.php', 'public_server_cron');
+ Hook::unregister('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
+ Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
}
-function public_server_load_config(\Friendica\App $a)
+function public_server_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
{
- $a->loadConfigFile(__DIR__. '/config/public_server.ini.php');
+ $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
}
function public_server_register_account($a, $b)
function public_server_cron($a, $b)
{
- logger("public_server: cron start");
+ Logger::log("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` > '%s' AND
`expire_notification_sent` <= '%s'",
- dbesc(NULL_DATE), dbesc(NULL_DATE));
+ DBA::NULL_DATETIME, DBA::NULL_DATETIME);
- if (DBA::is_result($r)) {
+ if (DBA::isResult($r)) {
foreach ($r as $rr) {
notification([
'uid' => $rr['uid'],
'to_name' => $rr['username'],
'to_email' => $rr['email'],
'source_name' => L10n::t('Administrator'),
- 'source_link' => $a->get_baseurl(),
- 'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
+ 'source_link' => $a->getBaseURL(),
+ 'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
]);
$fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
$nologin = Config::get('public_server', 'nologin', false);
if ($nologin) {
$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 (DBA::is_result($r)) {
+ DBA::NULL_DATETIME, intval($nologin), DBA::NULL_DATETIME);
+ if (DBA::isResult($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', false);
if ($flagusers) {
$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 (DBA::is_result($r)) {
+ intval($flagusers), DBA::NULL_DATETIME);
+ if (DBA::isResult($r)) {
foreach ($r as $rr) {
$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
DBA::update('user', $fields, ['uid' => $rr['uid']]);
$flagpostsexpire = Config::get('public_server', 'flagpostsexpire');
if ($flagposts && $flagpostsexpire) {
$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 (DBA::is_result($r)) {
+ intval($flagposts), DBA::NULL_DATETIME);
+ if (DBA::isResult($r)) {
foreach ($r as $rr) {
DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
}
}
}
- logger("public_server: cron end");
+ Logger::log("public_server: cron end");
}
function public_server_enotify(&$a, &$b)
{
- if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
- && x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') {
- $b['itemlink'] = $a->get_baseurl();
+ if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
+ && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
+ $b['itemlink'] = $a->getBaseURL();
$b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
$b['subject'] = L10n::t('Your Friendica account is about to expire.');
$b['body'] = 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=" . Config::get('system', 'url') . "]" . Config::get('config', 'sitename') . "[/url]");
}
$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')];
- $condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), NULL_DATE];
+ $condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), DBA::NULL_DATETIME];
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'])) : '');
+ 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'])) : '');
Config::set('public_server', 'expiredays', $expiredays);
Config::set('public_server', 'expireposts', $expireposts);
Config::set('public_server', 'nologin', $nologin);
function public_server_addon_admin(&$a, &$o)
{
- $token = get_form_security_token("publicserver");
- $t = get_markup_template("admin.tpl", "addon/public_server");
- $o = replace_macros($t, [
+ $token = BaseModule::getFormSecurityToken("publicserver");
+ $t = Renderer::getMarkupTemplate("admin.tpl", "addon/public_server");
+ $o = Renderer::replaceMacros($t, [
'$submit' => L10n::t('Save Settings'),
'$form_security_token' => $token,
'$infotext' => L10n::t('Set any of these options to 0 to deactivate it.'),
projects / friendica-addons.git / blobdiff