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

Merge remote-tracking branch 'upstream/develop' into twitter-notice

This commit is contained in:
Michael 2018-10-27 13:03:03 +00:00
parent 6bc8103ca2 b53157370a
commit 38ff8b5f88
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
advancedcontentfilter/advancedcontentfilter.php
View File

@ -39,7 +39,6 @@ use Friendica\Content\Text\Markdown;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Cache; use Friendica\Core\Cache;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Model\Item; use Friendica\Model\Item;
@ -47,7 +46,6 @@ use Friendica\Model\Term;
use Friendica\Module\Login; use Friendica\Module\Login;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Security;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Symfony\Component\ExpressionLanguage; use Symfony\Component\ExpressionLanguage;
@ -91,7 +89,7 @@ function advancedcontentfilter_dbstructure_definition(App $a, &$database)
"expression" => ["type" => "mediumtext" , "not null" => "1", "comment" => "Expression text"], "expression" => ["type" => "mediumtext" , "not null" => "1", "comment" => "Expression text"],
"serialized" => ["type" => "mediumtext" , "not null" => "1", "comment" => "Serialized parsed expression"], "serialized" => ["type" => "mediumtext" , "not null" => "1", "comment" => "Serialized parsed expression"],
"active" => ["type" => "boolean" , "not null" => "1", "default" => "1", "comment" => "Whether the rule is active or not"], "active" => ["type" => "boolean" , "not null" => "1", "default" => "1", "comment" => "Whether the rule is active or not"],
"created" => ["type" => "datetime" , "not null" => "1", "default" => NULL_DATE, "comment" => "Creation date"], "created" => ["type" => "datetime" , "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date"],
], ],
"indexes" => [ "indexes" => [
"PRIMARY" => ["id"], "PRIMARY" => ["id"],

2
blackout/blackout.php
View File

@ -85,7 +85,7 @@ function blackout_redirect ($a, $b) {
} }
if (( $date1 <= $now ) && ( $now <= $date2 )) { if (( $date1 <= $now ) && ( $now <= $date2 )) {
logger('redirecting user to blackout page'); logger('redirecting user to blackout page');
goaway($myurl); System::externalRedirect($myurl);
} }
} }

4
catavatar/catavatar.php
View File

@ -141,7 +141,7 @@ function catavatar_lookup(App $a, &$b)
$url = $a->getBaseURL() . '/catavatar/' . $user['uid']; $url = $a->getBaseURL() . '/catavatar/' . $user['uid'];
switch($b['size']) { switch($b['size']) {
case 175: $url .= "/4"; break; case 300: $url .= "/4"; break;
case 80: $url .= "/5"; break; case 80: $url .= "/5"; break;
case 47: $url .= "/6"; break; case 47: $url .= "/6"; break;
} }
@ -245,7 +245,7 @@ function build_cat($seed = '', $size = 0)
if ($size > 3 && $size < 7) { if ($size > 3 && $size < 7) {
switch ($size) { switch ($size) {
case 4: case 4:
$size = 175; $size = 300;
break; break;
case 5: case 5:
$size = 80; $size = 80;

14
forumdirectory/forumdirectory.php
View File

@ -8,6 +8,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget; use Friendica\Content\Widget;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -45,8 +46,6 @@ function forumdirectory_init(App $a)
{ {
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/forumdirectory/forumdirectory.css" media="all" />'; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/forumdirectory/forumdirectory.css" media="all" />';
$a->set_pager_itemspage(60);
if (local_user()) { if (local_user()) {
$a->page['aside'] .= Widget::findPeople(); $a->page['aside'] .= Widget::findPeople();
} else { } else {
@ -107,19 +106,22 @@ function forumdirectory_content(App $a)
$publish = Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 "; $publish = Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ";
$total = 0;
$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`" $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`"
. " WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `page-flags` = 2 $sql_extra "); . " WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `page-flags` = 2 $sql_extra ");
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$a->set_pager_total($r[0]['total']); $total = $r[0]['total'];
} }
$pager = new Pager($a->query_string, 60);
$order = " ORDER BY `name` ASC "; $order = " ORDER BY `name` ASC ";
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`" $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`"
. " FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish" . " FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish"
. " AND `user`.`blocked` = 0 AND `page-flags` = 2 $sql_extra $order LIMIT %d , %d ", . " AND `user`.`blocked` = 0 AND `page-flags` = 2 $sql_extra $order LIMIT %d , %d ",
intval($a->pager['start']), $pager->getStart(),
intval($a->pager['itemspage']) $pager->getItemsPerPage()
); );
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
@ -208,7 +210,7 @@ function forumdirectory_content(App $a)
} }
$o .= "<div class=\"directory-end\" ></div>\r\n"; $o .= "<div class=\"directory-end\" ></div>\r\n";
$o .= paginate($a); $o .= $pager->renderFull($total);
} else { } else {
info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL); info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
} }

2
impressum/impressum.php
View File

@ -31,7 +31,7 @@ function impressum_module() {
} }
function impressum_content() { function impressum_content() {
$a = get_app(); $a = get_app();
goaway('friendica/'); $a->internalRedirect('friendica/');
} }
function obfuscate_email ($s) { function obfuscate_email ($s) {

2
notifyall/notifyall.php
View File

@ -93,7 +93,7 @@ function notifyall_post(App $a)
} }
notice(L10n::t('Emails sent')); notice(L10n::t('Emails sent'));
goaway('admin'); $a->internalRedirect('admin');
} }
function notifyall_content(&$a) function notifyall_content(&$a)

14
public_server/public_server.php
View File

@ -6,13 +6,13 @@
* Author: Keith Fernie <http://friendika.me4.it/profile/keith> * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
*/ */
use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
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\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Security;
function public_server_install() function public_server_install()
{ {
@ -32,7 +32,7 @@ function public_server_uninstall()
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_load_config(\Friendica\App $a) function public_server_load_config(App $a)
{ {
$a->loadConfigFile(__DIR__. '/config/public_server.ini.php'); $a->loadConfigFile(__DIR__. '/config/public_server.ini.php');
} }
@ -59,7 +59,7 @@ function public_server_cron($a, $b)
$r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND $r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
`account_expires_on` > '%s' AND `account_expires_on` > '%s' AND
`expire_notification_sent` <= '%s'", `expire_notification_sent` <= '%s'",
DBA::escape(NULL_DATE), DBA::escape(NULL_DATE)); DBA::NULL_DATETIME, DBA::NULL_DATETIME);
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
@ -83,7 +83,7 @@ function public_server_cron($a, $b)
$nologin = Config::get('public_server', 'nologin', false); $nologin = Config::get('public_server', 'nologin', false);
if ($nologin) { 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'", $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)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')]; $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
@ -95,7 +95,7 @@ function public_server_cron($a, $b)
$flagusers = Config::get('public_server', 'flagusers', false); $flagusers = Config::get('public_server', 'flagusers', false);
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 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)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')]; $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
@ -108,7 +108,7 @@ function public_server_cron($a, $b)
$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 NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s' and `expire` = 0 AND `page-flags` = 0", $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)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]); DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
@ -138,7 +138,7 @@ function public_server_login($a, $b)
} }
$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')]; $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); DBA::update('user', $fields, $condition);
} }

2
startpage/startpage.php
View File

@ -31,7 +31,7 @@ function startpage_home_init($a, $b)
$page = PConfig::get(local_user(), 'startpage', 'startpage'); $page = PConfig::get(local_user(), 'startpage', 'startpage');
if (strlen($page)) { if (strlen($page)) {
goaway($page); $a->internalRedirect($page);
} }
return; return;
} }

6
statusnet/statusnet.php
View File

@ -160,7 +160,7 @@ function statusnet_settings_post(App $a, $post)
} }
} }
} }
goaway('settings/connectors'); $a->internalRedirect('settings/connectors');
} else { } else {
if (isset($_POST['statusnet-consumersecret'])) { if (isset($_POST['statusnet-consumersecret'])) {
// check if we can reach the API of the GNU Social server // check if we can reach the API of the GNU Social server
@ -188,7 +188,7 @@ function statusnet_settings_post(App $a, $post)
notice(L10n::t('We could not contact the GNU Social API with the Path you entered.') . EOL); notice(L10n::t('We could not contact the GNU Social API with the Path you entered.') . EOL);
} }
} }
goaway('settings/connectors'); $a->internalRedirect('settings/connectors');
} else { } else {
if (isset($_POST['statusnet-pin'])) { if (isset($_POST['statusnet-pin'])) {
// if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
@ -206,7 +206,7 @@ function statusnet_settings_post(App $a, $post)
PConfig::set(local_user(), 'statusnet', 'post', 1); PConfig::set(local_user(), 'statusnet', 'post', 1);
PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1); PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
// reload the Addon Settings page, if we don't do it see Bug #42 // reload the Addon Settings page, if we don't do it see Bug #42
goaway('settings/connectors'); $a->internalRedirect('settings/connectors');
} else { } else {
// if no PIN is supplied in the POST variables, the user has changed the setting // if no PIN is supplied in the POST variables, the user has changed the setting
// to post a dent for every new __public__ posting to the wall // to post a dent for every new __public__ posting to the wall

2
twitter/twitter.php
View File

@ -258,7 +258,7 @@ function twitter_settings_post(App $a)
info($e->getMessage()); info($e->getMessage());
} }
// reload the Addon Settings page, if we don't do it see Bug #42 // reload the Addon Settings page, if we don't do it see Bug #42
goaway('settings/connectors'); $a->internalRedirect('settings/connectors');
} else { } else {
// if no PIN is supplied in the POST variables, the user has changed the setting // if no PIN is supplied in the POST variables, the user has changed the setting
// to post a tweet for every new __public__ posting to the wall // to post a tweet for every new __public__ posting to the wall