clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/friendica/friendica-addons into develop

This commit is contained in:
Andy Hee 2018-02-22 10:21:04 +07:00
parent 99a7be5eb6 61b79f8723
commit 5c7754f524
3 changed files with 177 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
blockem/lang/en-gb/messages.po Normal file
View File

@ -0,0 +1,59 @@
# ADDON blockem
# Copyright (C)
# This file is distributed under the same license as the Friendica blockem addon package.
#
#
# Translators:
# Andy H3 <andy@hubup.pro>, 2018
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-09 13:00+0100\n"
"PO-Revision-Date: 2018-02-17 11:24+0000\n"
"Last-Translator: Andy H3 <andy@hubup.pro>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: blockem.php:51 blockem.php:55
msgid "\"Blockem\""
msgstr "\"Blockem\""
#: blockem.php:59
msgid ""
"Hides user's content by collapsing posts. Also replaces their avatar with "
"generic image."
msgstr "Hides user's content by collapsing posts. Also replaces their avatar with generic image."
#: blockem.php:60
msgid "Comma separated profile URLS:"
msgstr "Comma separated profile URLs:"
#: blockem.php:64
msgid "Save Settings"
msgstr "Save settings"
#: blockem.php:77
msgid "BLOCKEM Settings saved."
msgstr "Blockem settings saved."
#: blockem.php:140
#, php-format
msgid "Hidden content by %s - Click to open/close"
msgstr "Hidden content by %s - Show/hide"
#: blockem.php:193
msgid "Unblock Author"
msgstr "Unblock author"
#: blockem.php:195
msgid "Block Author"
msgstr "Block author"
#: blockem.php:227
msgid "blockem settings updated"
msgstr "Blockem settings updated"

16
blockem/lang/en-gb/strings.php Normal file
View File

@ -0,0 +1,16 @@
<?php
if(! function_exists("string_plural_select_en_gb")) {
function string_plural_select_en_gb($n){
return ($n != 1);;
}}
;
$a->strings["\"Blockem\""] = "\"Blockem\"";
$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Hides user's content by collapsing posts. Also replaces their avatar with generic image.";
$a->strings["Comma separated profile URLS:"] = "Comma separated profile URLs:";
$a->strings["Save Settings"] = "Save settings";
$a->strings["BLOCKEM Settings saved."] = "Blockem settings saved.";
$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Show/hide";
$a->strings["Unblock Author"] = "Unblock author";
$a->strings["Block Author"] = "Block author";
$a->strings["blockem settings updated"] = "Blockem settings updated";

177
public_server/public_server.php
View File

@ -9,53 +9,51 @@
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Model\User; use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
function public_server_install() { function public_server_install()
{
Addon::registerHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account'); 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('cron', 'addon/public_server/public_server.php', 'public_server_cron');
Addon::registerHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify'); 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'); Addon::registerHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
} }
function public_server_uninstall()
function public_server_uninstall() { {
Addon::unregisterHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account'); 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('cron', 'addon/public_server/public_server.php', 'public_server_cron');
Addon::unregisterHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify'); 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'); Addon::unregisterHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
} }
function public_server_register_account($a,$b) { function public_server_register_account($a, $b)
{
$uid = $b; $uid = $b;
$days = Config::get('public_server','expiredays'); $days = Config::get('public_server', 'expiredays');
$days_posts = Config::get('public_server','expireposts'); $days_posts = Config::get('public_server', 'expireposts');
if(! $days) if (!$days) {
return; return;
}
$r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d", $fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days'), 'expire' => $days_posts];
dbesc(DateTimeFormat::utc('now +' . $days . ' days')), dba::update('user', $fields, ['uid' => $uid]);
intval($days_posts), }
intval($uid)
);
}; function public_server_cron($a, $b)
{
function public_server_cron($a,$b) {
logger("public_server: cron start"); logger("public_server: cron start");
require_once('include/enotify.php'); 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 $r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
expire_notification_sent = '0000-00-00 00:00:00' "); `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) { foreach ($r as $rr) {
notification([ notification([
'uid' => $rr['uid'], 'uid' => $rr['uid'],
'type' => NOTIFY_SYSTEM, 'type' => NOTIFY_SYSTEM,
@ -68,62 +66,52 @@ function public_server_cron($a,$b) {
'source_photo' => $a->get_baseurl() . '/images/person-80.jpg', 'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
]); ]);
q("update user set expire_notification_sent = '%s' where uid = %d", $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
dbesc(DateTimeFormat::utcNow()), dba::update('user', $fields, ['uid' => $rr['uid']]);
intval($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'"); $nologin = Config::get('public_server', 'nologin', false);
if(count($r)) { if ($nologin) {
foreach($r as $rr) { $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'",
User::remove($rr['uid']); 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']]);
} }
} }
$nologin = Config::get('public_server','nologin');
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'])
);
}
} }
$flagusers = Config::get('public_server', 'flagusers', false);
$flagusers = Config::get('public_server','flagusers'); if ($flagusers) {
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",
$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)); intval($flagusers), dbesc(NULL_DATE));
if(count($r)) { if (DBM::is_result($r)) {
foreach($r as $rr) foreach ($r as $rr) {
q("update user set account_expires_on = '%s' where uid = %d", $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
dbesc(DateTimeFormat::utc('now +' . '6 days')), dba::update('user', $fields, ['uid' => $rr['uid']]);
intval($rr['uid']) }
);
} }
} }
$flagposts = Config::get('public_server','flagposts'); $flagposts = Config::get('public_server', 'flagposts');
$flagpostsexpire = Config::get('public_server','flagpostsexpire'); $flagpostsexpire = Config::get('public_server', 'flagpostsexpire');
if ($flagposts && $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)); $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",
if(count($r)) { intval($flagposts), dbesc(NULL_DATE));
foreach($r as $rr) if (DBM::is_result($r)) {
q("update user set expire = %d where uid = %d", foreach ($r as $rr) {
intval($flagpostsexpire), dba::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
intval($rr['uid']) }
);
} }
} }
logger("public_server: cron end"); logger("public_server: cron end");
} }
function public_server_enotify(&$a, &$b) { function public_server_enotify(&$a, &$b)
{
if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
&& x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') { && x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') {
$b['itemlink'] = $a->get_baseurl(); $b['itemlink'] = $a->get_baseurl();
@ -133,44 +121,49 @@ function public_server_enotify(&$a, &$b) {
} }
} }
function public_server_login($a,$b) { function public_server_login($a, $b)
$days = Config::get('public_server','expiredays'); {
if(! $days) $days = Config::get('public_server', 'expiredays');
if (!$days) {
return; 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 ) { function public_server_addon_admin_post(&$a)
{
check_form_security_token_redirectOnErr('/admin/addons/publicserver', 'publicserver'); check_form_security_token_redirectOnErr('/admin/addons/publicserver', 'publicserver');
$expiredays = (( x($_POST, 'expiredays') ) ? notags(trim($_POST['expiredays'] )) : ''); $expiredays = (x($_POST, 'expiredays') ? notags(trim($_POST['expiredays'])) : '');
$expireposts = (( x($_POST, 'expireposts') ) ? notags(trim($_POST['expireposts'] )) : ''); $expireposts = (x($_POST, 'expireposts') ? notags(trim($_POST['expireposts'])) : '');
$nologin = (( x($_POST, 'nologin') ) ? notags(trim($_POST['nologin'] )) : ''); $nologin = (x($_POST, 'nologin') ? notags(trim($_POST['nologin'])) : '');
$flagusers = (( x($_POST, 'flagusers') ) ? notags(trim($_POST['flagusers'] )) : ''); $flagusers = (x($_POST, 'flagusers') ? notags(trim($_POST['flagusers'])) : '');
$flagposts = (( x($_POST, 'flagposts') ) ? notags(trim($_POST['flagposts'] )) : ''); $flagposts = (x($_POST, 'flagposts') ? notags(trim($_POST['flagposts'])) : '');
$flagpostsexpire = (( x($_POST, 'flagpostsexpire') ) ? notags(trim($_POST['flagpostsexpire'] )) : ''); $flagpostsexpire = (x($_POST, 'flagpostsexpire') ? notags(trim($_POST['flagpostsexpire'])) : '');
Config::set( 'public_server','expiredays',$expiredays ); Config::set('public_server', 'expiredays', $expiredays);
Config::set( 'public_server','expireposts',$expireposts ); Config::set('public_server', 'expireposts', $expireposts);
Config::set( 'public_server','nologin',$nologin ); Config::set('public_server', 'nologin', $nologin);
Config::set( 'public_server','flagusers',$flagusers); Config::set('public_server', 'flagusers', $flagusers);
Config::set( 'public_server','flagposts',$flagposts ); Config::set('public_server', 'flagposts', $flagposts);
Config::set( 'public_server','flagpostsexpire',$flagpostsexpire ); Config::set('public_server', 'flagpostsexpire', $flagpostsexpire);
info(L10n::t('Settings saved').EOL ); info(L10n::t('Settings saved').EOL);
} }
function public_server_addon_admin ( &$a, &$o) {
function public_server_addon_admin(&$a, &$o)
{
$token = get_form_security_token("publicserver"); $token = get_form_security_token("publicserver");
$t = get_markup_template( "admin.tpl", "addon/public_server"); $t = get_markup_template("admin.tpl", "addon/public_server");
$o = replace_macros($t, [ $o = replace_macros($t, [
'$submit' => L10n::t('Save Settings'), '$submit' => L10n::t('Save Settings'),
'$form_security_token' => $token, '$form_security_token' => $token,
'$infotext' => L10n::t('Set any of these options to 0 to deactivate it.'), '$infotext' => L10n::t('Set any of these options to 0 to deactivate it.'),
'$expiredays' => [ "expiredays","Expire Days", intval(Config::get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "], '$expiredays' => ["expiredays","Expire Days", intval(Config::get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
'$expireposts' => [ "expireposts", "Expire Posts", intval(Config::get('public_server','expireposts')), "Set the default days for posts to expire here"], '$expireposts' => ["expireposts", "Expire Posts", intval(Config::get('public_server', 'expireposts')), "Set the default days for posts to expire here"],
'$nologin' => [ "nologin", "No Login", intval(Config::get('public_server','nologin')), "Remove users who have never logged in after nologin days "], '$nologin' => ["nologin", "No Login", intval(Config::get('public_server', 'nologin')), "Remove users who have never logged in after nologin days "],
'$flagusers' => [ "flagusers", "Flag users", intval(Config::get('public_server','flagusers')), "Remove users who last logged in over flagusers days ago"], '$flagusers' => ["flagusers", "Flag users", intval(Config::get('public_server', 'flagusers')), "Remove users who last logged in over flagusers days ago"],
'$flagposts' => [ "flagposts", "Flag posts", intval(Config::get('public_server','flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "], '$flagposts' => ["flagposts", "Flag posts", intval(Config::get('public_server', 'flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "],
'$flagpostsexpire' => [ "flagpostsexpire", "Flag posts expire", intval(Config::get('public_server','flagpostsexpire'))], '$flagpostsexpire' => ["flagpostsexpire", "Flag posts expire", intval(Config::get('public_server', 'flagpostsexpire'))],
]); ]);
} }