Merge pull request #823 from tobiasd/20190312-blackout

[friendica-addons.git] / public_server / public_server.php

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 64f9d5d22e94a944afe0ac41326d817ce94d3670..639b8fcef21a6a25306237803a3bf87ab991e6ed 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -6,33 +6,38 @@
  * 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)
@@ -51,13 +56,12 @@ 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'",
-               DBA::escape(NULL_DATE), DBA::escape(NULL_DATE));
+               DBA::NULL_DATETIME, DBA::NULL_DATETIME);
 
        if (DBA::isResult($r)) {
                foreach ($r as $rr) {
@@ -81,7 +85,7 @@ function public_server_cron($a, $b)
        $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'",
-                       DBA::escape(NULL_DATE), intval($nologin), DBA::escape(NULL_DATE));
+                       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')];
@@ -93,7 +97,7 @@ function public_server_cron($a, $b)
        $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), DBA::escape(NULL_DATE));
+                       intval($flagusers), DBA::NULL_DATETIME);
                if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
@@ -106,7 +110,7 @@ function public_server_cron($a, $b)
        $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), DBA::escape(NULL_DATE));
+                       intval($flagposts), DBA::NULL_DATETIME);
                if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
@@ -114,13 +118,13 @@ function public_server_cron($a, $b)
                }
        }
 
-       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') {
+       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.');
@@ -136,19 +140,19 @@ function public_server_login($a, $b)
        }
 
        $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);
@@ -160,9 +164,9 @@ function public_server_addon_admin_post(&$a)
 
 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.'),