strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into item-notification

Browse source
This commit is contained in:
Michael 2020-01-04 22:53:06 +00:00
parent 3a1798d1c3 c8a322baf0
commit 30a4b0eafb
37 changed files with 219 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
boot.php
View file

@ -234,29 +234,6 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
}
/**
* @brief Retrieve the App structure
*
* Useful in functions which require it but don't get it passed to them
*
* @deprecated since version 2018.09
* @see DI::app()
* @return App
*/
function get_app()
{
return DI::app();
}
/**
* @brief Used to end the current process, after saving session state.
* @deprecated
*/
function killme()
{
exit();
}
/**
* @brief Returns the user id of locally logged in user or false.
*
@ -325,7 +302,7 @@ function notice($s)
return;
}
$a = \get_app();
$a = DI::app();
if (empty($_SESSION['sysmsg'])) {
$_SESSION['sysmsg'] = [];
}
@ -343,7 +320,7 @@ function notice($s)
*/
function info($s)
{
$a = \get_app();
$a = DI::app();
if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
return;
@ -406,7 +383,7 @@ function feed_birthday($uid, $tz)
*/
function is_site_admin()
{
$a = \get_app();
$a = DI::app();
$admin_email = Config::get('config', 'admin_email');
@ -683,22 +660,3 @@ function validate_include(&$file)
// Simply return flag
return $valid;
}
/**
* PHP 5 compatible dirname() with count parameter
*
* @see http://php.net/manual/en/function.dirname.php#113193
*
* @deprecated with PHP 7
* @param string $path
* @param int $levels
* @return string
*/
function rdirname($path, $levels = 1)
{
if ($levels > 1) {
return dirname(rdirname($path, --$levels));
} else {
return dirname($path);
}
}

86
include/api.php
View file

@ -930,7 +930,7 @@ function api_format_data($root_element, $type, $data)
*/
function api_account_verify_credentials($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -998,7 +998,7 @@ function requestdata($k)
*/
function api_statuses_mediap($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
Logger::log('api_statuses_update: no user');
@ -1052,7 +1052,7 @@ api_register_func('api/statuses/mediap', 'api_statuses_mediap', true, API_METHOD
*/
function api_statuses_update($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
Logger::log('api_statuses_update: no user');
@ -1202,7 +1202,7 @@ api_register_func('api/statuses/update_with_media', 'api_statuses_update', true,
*/
function api_media_upload()
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
Logger::log('no user');
@ -1257,7 +1257,7 @@ api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST)
*/
function api_media_metadata_create($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
Logger::info('no user');
@ -1404,7 +1404,7 @@ api_register_func('api/externalprofile/show', 'api_users_show');
*/
function api_users_search($type)
{
$a = \get_app();
$a = DI::app();
$userlist = [];
@ -1466,7 +1466,7 @@ function api_users_lookup($type)
if (!empty($_REQUEST['user_id'])) {
foreach (explode(',', $_REQUEST['user_id']) as $id) {
if (!empty($id)) {
$users[] = api_get_user(get_app(), $id);
$users[] = api_get_user(DI::app(), $id);
}
}
}
@ -1497,7 +1497,7 @@ api_register_func('api/users/lookup', 'api_users_lookup', true);
*/
function api_search($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -1611,7 +1611,7 @@ api_register_func('api/search', 'api_search', true);
*/
function api_statuses_home_timeline($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -1704,7 +1704,7 @@ api_register_func('api/statuses/friends_timeline', 'api_statuses_home_timeline',
*/
function api_statuses_public_timeline($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -1789,7 +1789,7 @@ api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline'
*/
function api_statuses_networkpublic_timeline($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -1850,7 +1850,7 @@ api_register_func('api/statuses/networkpublic_timeline', 'api_statuses_networkpu
*/
function api_statuses_show($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -1929,7 +1929,7 @@ api_register_func('api/statuses/show', 'api_statuses_show', true);
*/
function api_conversation_show($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -2011,7 +2011,7 @@ function api_statuses_repeat($type)
{
global $called_api;
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -2088,7 +2088,7 @@ api_register_func('api/statuses/retweet', 'api_statuses_repeat', true, API_METHO
*/
function api_statuses_destroy($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -2135,7 +2135,7 @@ api_register_func('api/statuses/destroy', 'api_statuses_destroy', true, API_METH
*/
function api_statuses_mentions($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -2204,7 +2204,7 @@ api_register_func('api/statuses/replies', 'api_statuses_mentions', true);
*/
function api_statuses_user_timeline($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -2288,7 +2288,7 @@ api_register_func('api/statuses/user_timeline', 'api_statuses_user_timeline', tr
*/
function api_favorites_create_destroy($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -2371,7 +2371,7 @@ function api_favorites($type)
{
global $called_api;
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -2836,7 +2836,7 @@ function api_contactlink_to_array($txt)
*/
function api_format_items_activities($item, $type = "json")
{
$a = \get_app();
$a = DI::app();
$activities = [
'like' => [],
@ -3257,7 +3257,7 @@ api_register_func('api/lists/subscriptions', 'api_lists_list', true);
*/
function api_lists_ownerships($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -3306,7 +3306,7 @@ api_register_func('api/lists/ownerships', 'api_lists_ownerships', true);
*/
function api_lists_statuses($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -3384,7 +3384,7 @@ api_register_func('api/lists/statuses', 'api_lists_statuses', true);
*/
function api_statuses_f($qtype)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -3636,7 +3636,7 @@ function api_ff_ids($type, int $rel)
throw new ForbiddenException();
}
$a = \get_app();
$a = DI::app();
api_get_user($a);
@ -3723,7 +3723,7 @@ api_register_func('api/followers/ids', 'api_followers_ids', true);
*/
function api_direct_messages_new($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -3815,7 +3815,7 @@ api_register_func('api/direct_messages/new', 'api_direct_messages_new', true, AP
*/
function api_direct_messages_destroy($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -3983,7 +3983,7 @@ api_register_func('api/friendships/destroy', 'api_friendships_destroy', true, AP
*/
function api_direct_messages_box($type, $box, $verbose)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
}
@ -4627,7 +4627,7 @@ function api_account_update_profile_image($type)
Contact::updateSelfFromUserID(api_user(), true);
// Update global directory in background
$url = DI::baseUrl() . '/profile/' . \get_app()->user['nickname'];
$url = DI::baseUrl() . '/profile/' . DI::app()->user['nickname'];
if ($url && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $url);
}
@ -4668,7 +4668,7 @@ api_register_func('api/account/update_profile_image', 'api_account_update_profil
function api_account_update_profile($type)
{
$local_user = api_user();
$api_user = api_get_user(get_app());
$api_user = api_get_user(DI::app());
if (!empty($_POST['name'])) {
DBA::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]);
@ -4963,7 +4963,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
*/
function prepare_photo_data($type, $scale, $photo_id)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if ($user_info === false) {
@ -5391,7 +5391,7 @@ function api_best_nickname(&$contacts)
*/
function api_friendica_group_show($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5461,7 +5461,7 @@ api_register_func('api/friendica/group_show', 'api_friendica_group_show', true);
*/
function api_friendica_group_delete($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5528,7 +5528,7 @@ api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', tr
*/
function api_lists_destroy($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5650,7 +5650,7 @@ function group_create($name, $uid, $users = [])
*/
function api_friendica_group_create($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5684,7 +5684,7 @@ api_register_func('api/friendica/group_create', 'api_friendica_group_create', tr
*/
function api_lists_create($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5723,7 +5723,7 @@ api_register_func('api/lists/create', 'api_lists_create', true, API_METHOD_POST)
*/
function api_friendica_group_update($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5802,7 +5802,7 @@ api_register_func('api/friendica/group_update', 'api_friendica_group_update', tr
*/
function api_lists_update($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5852,7 +5852,7 @@ api_register_func('api/lists/update', 'api_lists_update', true, API_METHOD_POST)
*/
function api_friendica_activity($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5899,7 +5899,7 @@ api_register_func('api/friendica/activity/unattendmaybe', 'api_friendica_activit
*/
function api_friendica_notification($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -5937,7 +5937,7 @@ function api_friendica_notification($type)
*/
function api_friendica_notification_seen($type)
{
$a = \get_app();
$a = DI::app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
@ -5987,7 +5987,7 @@ api_register_func('api/friendica/notification', 'api_friendica_notification', tr
*/
function api_friendica_direct_messages_setseen($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
}
@ -6041,7 +6041,7 @@ api_register_func('api/friendica/direct_messages_setseen', 'api_friendica_direct
*/
function api_friendica_direct_messages_search($type, $box = "")
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();
@ -6109,7 +6109,7 @@ api_register_func('api/friendica/direct_messages_search', 'api_friendica_direct_
*/
function api_friendica_profile_show($type)
{
$a = \get_app();
$a = DI::app();
if (api_user() === false) {
throw new ForbiddenException();

2
include/enotify.php
View file

@ -33,7 +33,7 @@ use Friendica\Util\Strings;
*/
function notification($params)
{
$a = \get_app();
$a = DI::app();
// Temporary logging for finding the origin
if (!isset($params['uid'])) {

2
include/items.php
View file

@ -258,7 +258,7 @@ function consume_feed($xml, array $importer, array $contact, &$hub)
if ($contact['network'] === Protocol::FEED) {
Logger::log("Consume feeds", Logger::DEBUG);
Feed::import($xml, $importer, $contact, $hub);
Feed::import($xml, $importer, $contact);
return;
}

2
mod/fbrowser.php
View file

@ -78,7 +78,7 @@ function fbrowser_content(App $a)
function _map_files1($rr)
{
$a = \get_app();
$a = DI::app();
$types = Images::supportedTypes();
$ext = $types[$rr['type']];
$filename_e = $rr['filename'];

8
mod/item.php
View file

@ -246,7 +246,7 @@ function item_post(App $a) {
$app = $orig_post['app'];
$categories = $orig_post['file'];
$title = Strings::escapeTags(trim($_REQUEST['title']));
$body = Strings::escapeHtml(trim($body));
$body = trim($body);
$private = $orig_post['private'];
$pubmail_enabled = $orig_post['pubmail'];
$network = $orig_post['network'];
@ -285,7 +285,7 @@ function item_post(App $a) {
$coord = Strings::escapeTags(trim($_REQUEST['coord'] ?? ''));
$verb = Strings::escapeTags(trim($_REQUEST['verb'] ?? ''));
$emailcc = Strings::escapeTags(trim($_REQUEST['emailcc'] ?? ''));
$body = Strings::escapeHtml(trim($body));
$body = trim($body);
$network = Strings::escapeTags(trim(($_REQUEST['network'] ?? '') ?: Protocol::DFRN));
$guid = System::createUUID();
@ -509,7 +509,7 @@ function item_post(App $a) {
// Fold multi-line [code] sequences
$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
$body = BBCode::scaleExternalImages($body, false);
$body = BBCode::scaleExternalImages($body);
// Setting the object type if not defined before
if (!$objecttype) {
@ -848,7 +848,7 @@ function item_post(App $a) {
function item_post_return($baseurl, $api_source, $return_path)
{
// figure out how to return, depending on from whence we came
$a = \get_app();
$a = DI::app();
if ($api_source) {
return;

2
mod/message.php
View file

@ -499,7 +499,7 @@ function get_messages($uid, $start, $limit)
function render_messages(array $msg, $t)
{
$a = \get_app();
$a = DI::app();
$tpl = Renderer::getMarkupTemplate($t);
$rslt = '';

2
mod/photos.php
View file

@ -814,7 +814,7 @@ function photos_post(App $a)
Hook::callAll('photo_post_end', $item_id);
// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
// addon uploaders should call "exit()" within the photo_post_end hook
// if they do not wish to be redirected
DI::baseUrl()->redirect($_SESSION['photo_return']);

2
mod/settings.php
View file

@ -33,7 +33,7 @@ function get_theme_config_file($theme)
{
$theme = Strings::sanitizeFilePathItem($theme);
$a = \get_app();
$a = DI::app();
$base_theme = $a->theme_info['extends'] ?? '';
if (file_exists("view/theme/$theme/config.php")) {

2
src/App/BaseURL.php
View file

@ -355,7 +355,7 @@ class BaseURL
if (!empty($relative_script_path)) {
// Module
if (!empty($this->server['QUERY_STRING'])) {
$this->urlPath = trim(rdirname($relative_script_path, substr_count(trim($this->server['QUERY_STRING'], '/'), '/') + 1), '/');
$this->urlPath = trim(dirname($relative_script_path, substr_count(trim($this->server['QUERY_STRING'], '/'), '/') + 1), '/');
} else {
// Root page
$this->urlPath = trim($relative_script_path, '/');

8
src/BaseModule.php
View file

@ -88,7 +88,7 @@ abstract class BaseModule
*/
public static function getFormSecurityToken($typename = '')
{
$a = \get_app();
$a = DI::app();
$timestamp = time();
$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
@ -116,7 +116,7 @@ abstract class BaseModule
$max_livetime = 10800; // 3 hours
$a = \get_app();
$a = DI::app();
$x = explode('.', $hash);
if (time() > (intval($x[0]) + $max_livetime)) {
@ -136,7 +136,7 @@ abstract class BaseModule
public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
{
if (!self::checkFormSecurityToken($typename, $formname)) {
$a = \get_app();
$a = DI::app();
Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
notice(self::getFormSecurityStandardErrorMessage());
@ -147,7 +147,7 @@ abstract class BaseModule
public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
{
if (!self::checkFormSecurityToken($typename, $formname)) {
$a = \get_app();
$a = DI::app();
Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);

14
src/Console/DocBloxErrorChecker.php
View file

@ -2,6 +2,8 @@
namespace Friendica\Console;
use Friendica\App;
/**
* When I installed docblox, I had the experience that it does not generate any output at all.
* This script may be used to find that kind of problems with the documentation build process.
@ -29,6 +31,16 @@ class DocBloxErrorChecker extends \Asika\SimpleConsole\Console
protected $helpOptions = ['h', 'help', '?'];
/** @var App */
private $app;
public function __construct(App $app, array $argv = null)
{
parent::__construct($argv);
$this->app = $app;
}
protected function getHelp()
{
$help = <<<HELP
@ -59,7 +71,7 @@ HELP;
throw new \RuntimeException('DocBlox isn\'t available.');
}
$dir = \get_app()->getBasePath();
$dir = $this->app->getBasePath();
//stack for dirs to search
$dirstack = [];

14
src/Console/PhpToPo.php
View file

@ -2,6 +2,8 @@
namespace Friendica\Console;
use Friendica\App;
/**
* Read a strings.php file and create messages.po in the same directory
*
@ -15,6 +17,16 @@ class PhpToPo extends \Asika\SimpleConsole\Console
private $normBaseMsgIds = [];
const NORM_REGEXP = "|[\\\]|";
/** @var App */
private $app;
public function __construct(App $app, array $argv = null)
{
parent::__construct($argv);
$this->app = $app;
}
protected function getHelp()
{
$help = <<<HELP
@ -51,7 +63,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
$a = \get_app();
$a = $this->app;
$phpfile = realpath($this->getArgument(0));

2
src/Content/OEmbed.php
View file

@ -57,7 +57,7 @@ class OEmbed
{
$embedurl = trim($embedurl, '\'"');
$a = \get_app();
$a = DI::app();
$cache_key = 'oembed:' . $a->videowidth . ':' . $embedurl;

30
src/Content/Text/BBCode.php
View file

@ -436,15 +436,9 @@ class BBCode
}
}
public static function scaleExternalImages($srctext, $include_link = true, $scale_replace = false)
public static function scaleExternalImages($srctext)
{
// Suppress "view full size"
if (intval(Config::get('system', 'no_view_full_size'))) {
$include_link = false;
}
// Picture addresses can contain special characters
$s = htmlspecialchars_decode($srctext);
$s = $srctext;
$matches = null;
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
@ -457,17 +451,7 @@ class BBCode
continue;
}
// $scale_replace, if passed, is an array of two elements. The
// first is the name of the full-size image. The second is the
// name of a remote, scaled-down version of the full size image.
// This allows Friendica to display the smaller remote image if
// one exists, while still linking to the full-size image
if ($scale_replace) {
$scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[1]);
} else {
$scaled = $mtch[1];
}
$i = Network::fetchUrl($scaled);
$i = Network::fetchUrl($mtch[1]);
if (!$i) {
return $srctext;
}
@ -488,10 +472,8 @@ class BBCode
Logger::log('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], Logger::DEBUG);
$s = str_replace(
$mtch[0],
'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]'
. "\n" . (($include_link)
? '[url=' . $mtch[1] . ']' . L10n::t('view full size') . '[/url]' . "\n"
: ''),
'[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]'
. "\n",
$s
);
Logger::log('scale_external_images: new string: ' . $s, Logger::DEBUG);
@ -501,8 +483,6 @@ class BBCode
}
}
// replace the special char encoding
$s = htmlspecialchars($s, ENT_NOQUOTES, 'UTF-8');
return $s;
}

3
src/Content/Text/HTML.php
View file

@ -12,6 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Config;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
@ -815,7 +816,7 @@ class HTML
*/
public static function contactBlock()
{
$a = \get_app();
$a = DI::app();
return ContactBlock::getHTML($a->profile);
}

2
src/Content/Text/Markdown.php
View file

@ -119,7 +119,7 @@ class Markdown
$s = preg_replace('/(\[code\])+(.*?)(\[\/code\])+/ism', '[code]$2[/code]', $s);
// Don't show link to full picture (until it is fixed)
$s = BBCode::scaleExternalImages($s, false);
$s = BBCode::scaleExternalImages($s);
return $s;
}

4
src/Content/Widget.php
View file

@ -302,7 +302,7 @@ class Widget
*/
public static function categories($baseurl, $selected = '')
{
$a = \get_app();
$a = DI::app();
$uid = intval($a->profile['profile_uid']);
@ -420,7 +420,7 @@ class Widget
*/
public static function tagCloud($limit = 50)
{
$a = \get_app();
$a = DI::app();
$uid = intval($a->profile['profile_uid']);

3
src/Content/Widget/CalendarExport.php
View file

@ -9,6 +9,7 @@ namespace Friendica\Content\Widget;
use Friendica\Content\Feature;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
/**
* TagCloud widget
@ -24,7 +25,7 @@ class CalendarExport
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function getHTML() {
$a = \get_app();
$a = DI::app();
if (empty($a->data['user'])) {
return;

1
src/Core/System.php
View file

@ -283,7 +283,6 @@ class System
/// @todo Move the following functions from boot.php
/*
function killme()
function local_user()
function public_contact()
function remote_user()

6
src/Core/Worker.php
View file

@ -48,8 +48,6 @@ class Worker
*/
public static function processQueue($run_cron = true)
{
$a = \get_app();
// Ensure that all "strtotime" operations do run timezone independent
date_default_timezone_set('UTC');
@ -372,7 +370,7 @@ class Worker
*/
private static function execFunction($queue, $funcname, $argv, $method_call)
{
$a = \get_app();
$a = DI::app();
$argc = count($argv);
@ -1083,7 +1081,7 @@ class Worker
$args = ['no_cron' => !$do_cron];
$a = get_app();
$a = DI::app();
$process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath());
$process->run($command, $args);

2
src/Model/Contact.php
View file

@ -2220,7 +2220,7 @@ class Contact
{
$result = ['cid' => -1, 'success' => false, 'message' => ''];
$a = \get_app();
$a = DI::app();
// remove ajax junk, e.g. Twitter
$url = str_replace('/#!/', '/', $url);

2
src/Model/Mail.php
View file

@ -105,7 +105,7 @@ class Mail
*/
public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
{
$a = \get_app();
$a = DI::app();
if (!$recipient) {
return -1;

2
src/Model/Photo.php
View file

@ -461,7 +461,7 @@ class Photo
$micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix;
// Remove the cached photo
$a = \get_app();
$a = DI::app();
$basepath = $a->getBasePath();
if (is_dir($basepath . "/photo")) {

8
src/Model/Profile.php
View file

@ -568,7 +568,7 @@ class Profile
public static function getBirthdays()
{
$a = \get_app();
$a = DI::app();
$o = '';
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
@ -665,7 +665,7 @@ class Profile
public static function getEventsReminderHTML()
{
$a = \get_app();
$a = DI::app();
$o = '';
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
@ -1106,7 +1106,7 @@ class Profile
*/
public static function addVisitorCookieForHandle($handle)
{
$a = \get_app();
$a = DI::app();
// Try to find the public contact entry of the visitor.
$cid = Contact::getIdForURL($handle);
@ -1144,7 +1144,7 @@ class Profile
*/
public static function openWebAuthInit($token)
{
$a = \get_app();
$a = DI::app();
// Clean old OpenWebAuthToken entries.
OpenWebAuthToken::purge('owt', '3 MINUTE');

5
src/Module/Debug/Feed.php
View file

@ -29,15 +29,12 @@ class Feed extends BaseModule
if (!empty($_REQUEST['url'])) {
$url = $_REQUEST['url'];
$importer = Model\User::getById(local_user());
$contact_id = Model\Contact::getIdForURL($url, local_user(), true);
$contact = Model\Contact::getById($contact_id);
$xml = Network::fetchUrl($contact['poll']);
$dummy = null;
$import_result = Protocol\Feed::import($xml, $importer, $contact, $dummy, true);
$import_result = Protocol\Feed::import($xml);
$result = [
'input' => $xml,

8
src/Network/Probe.php
View file

@ -1480,10 +1480,7 @@ class Probe
return false;
}
$feed = $curlResult->getBody();
$dummy1 = null;
$dummy2 = null;
$dummy2 = null;
$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
$feed_data = Feed::import($feed);
if (!$feed_data) {
return false;
}
@ -1763,8 +1760,7 @@ class Probe
return false;
}
$feed = $curlResult->getBody();
$dummy1 = $dummy2 = $dummy3 = null;
$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
$feed_data = Feed::import($feed);
if (!$feed_data) {
if (!$probe) {

44
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1304,12 +1304,17 @@ class Transmitter
$data['content'] = BBCode::convert($body, false, 9);
}
$regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
$richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
$richbody = BBCode::removeAttachment($richbody);
// The regular "content" field does contain a minimized HTML. This is done since systems like
// Mastodon has got problems with - for example - embedded pictures.
// The contentMap does contain the unmodified HTML.
$language = self::getLanguage($item);
if (!empty($language)) {
$regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
$richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
$richbody = BBCode::removeAttachment($richbody);
$data['contentMap']['text/html'] = BBCode::convert($richbody, false);
$data['contentMap']['text/markdown'] = BBCode::toMarkdown($item["body"]);
$data['contentMap'][$language] = BBCode::convert($richbody, false);
}
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
@ -1333,6 +1338,35 @@ class Transmitter
return $data;
}
/**
* Fetches the language from the post, the user or the system.
*
* @param array $item
*
* @return string language string
*/
private static function getLanguage(array $item)
{
// Try to fetch the language from the post itself
if (!empty($item['language'])) {
$languages = array_keys(json_decode($item['language'], true));
if (!empty($languages[0])) {
return $languages[0];
}
}
// Otherwise use the user's language
if (!empty($item['uid'])) {
$user = DBA::selectFirst('user', ['language'], ['uid' => $item['uid']]);
if (!empty($user['language'])) {
return $user['language'];
}
}
// And finally just use the system language
return Config::get('system', 'language');
}
/**
* Creates an an "add tag" entry
*

2
src/Protocol/DFRN.php
View file

@ -146,7 +146,7 @@ class DFRN
*/
public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
{
$a = \get_app();
$a = DI::app();
$sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
$public_feed = (($dfrn_id) ? false : true);

90
src/Protocol/Feed.php
View file

@ -14,8 +14,8 @@ use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Util\ParseUrl;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
use Friendica\Util\XML;
/**
@ -29,24 +29,23 @@ class Feed {
* @param string $xml The feed data
* @param array $importer The user record of the importer
* @param array $contact The contact record of the feed
* @param string $hub Unused dummy value for compatibility reasons
* @param bool $simulate If enabled, no data is imported
*
* @return array In simulation mode it returns the header and the first item
* @return array Returns the header and the first item in dry run mode
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function import($xml, $importer, &$contact, &$hub, $simulate = false) {
public static function import($xml, array $importer = [], array $contact = [])
{
$dryRun = empty($importer) && empty($contact);
$a = \get_app();
if (!$simulate) {
Logger::log("Import Atom/RSS feed '".$contact["name"]."' (Contact ".$contact["id"].") for user ".$importer["uid"], Logger::DEBUG);
if ($dryRun) {
Logger::info("Test Atom/RSS feed");
} else {
Logger::log("Test Atom/RSS feed", Logger::DEBUG);
Logger::info("Import Atom/RSS feed '" . $contact["name"] . "' (Contact " . $contact["id"] . ") for user " . $importer["uid"]);
}
if (empty($xml)) {
Logger::log('XML is empty.', Logger::DEBUG);
return;
Logger::info('XML is empty.');
return [];
}
if (!empty($contact['poll'])) {
@ -114,14 +113,17 @@ class Feed {
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
}
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()');
if ($value != "") {
$author["author-name"] = $value;
}
if ($simulate) {
if ($dryRun) {
$author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:id/text()');
// See https://tools.ietf.org/html/rfc4287#section-3.2.2
@ -134,14 +136,17 @@ class Feed {
if ($value != "") {
$author["author-nick"] = $value;
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()');
if ($value != "") {
$author["author-location"] = $value;
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()');
if ($value != "") {
$author["author-about"] = $value;
}
$avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']");
if (is_object($avatar)) {
foreach ($avatar AS $attribute) {
@ -169,9 +174,11 @@ class Feed {
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
}
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
}
$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
$author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
@ -179,12 +186,13 @@ class Feed {
$entries = $xpath->query('/rss/channel/item');
}
if (!$simulate) {
if (!$dryRun) {
$author["author-link"] = $contact["url"];
if (empty($author["author-name"])) {
$author["author-name"] = $contact["name"];
}
$author["author-avatar"] = $contact["thumb"];
$author["owner-link"] = $contact["url"];
@ -193,7 +201,7 @@ class Feed {
}
$header = [];
$header["uid"] = $importer["uid"];
$header["uid"] = $importer["uid"] ?? 0;
$header["network"] = Protocol::FEED;
$header["wall"] = 0;
$header["origin"] = 0;
@ -202,16 +210,16 @@ class Feed {
$header["verb"] = Activity::POST;
$header["object-type"] = Activity\ObjectType::NOTE;
$header["contact-id"] = $contact["id"];
$header["contact-id"] = $contact["id"] ?? 0;
if (!is_object($entries)) {
Logger::log("There are no entries in this feed.", Logger::DEBUG);
return;
Logger::info("There are no entries in this feed.");
return [];
}
$items = [];
// Importing older entries first
for($i = $entries->length - 1; $i >= 0;--$i) {
for ($i = $entries->length - 1; $i >= 0; --$i) {
$entry = $entries->item($i);
$item = array_merge($header, $author);
@ -227,9 +235,11 @@ class Feed {
}
}
}
if (empty($item["plink"])) {
$item["plink"] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
}
if (empty($item["plink"])) {
$item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
}
@ -239,6 +249,7 @@ class Feed {
if (empty($item["uri"])) {
$item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
}
if (empty($item["uri"])) {
$item["uri"] = $item["plink"];
}
@ -249,12 +260,12 @@ class Feed {
$item["parent-uri"] = $item["uri"];
if (!$simulate) {
if (!$dryRun) {
$condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
$importer["uid"], $item["uri"], Protocol::FEED, Protocol::DFRN];
$previous = Item::selectFirst(['id'], $condition);
if (DBA::isResult($previous)) {
Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$previous["id"], Logger::DEBUG);
Logger::info("Item with uri " . $item["uri"] . " for user " . $importer["uid"] . " already existed under id " . $previous["id"]);
continue;
}
}
@ -275,9 +286,11 @@ class Feed {
if (empty($published)) {
$published = XML::getFirstNodeValue($xpath, 'pubDate/text()', $entry);
}
if (empty($published)) {
$published = XML::getFirstNodeValue($xpath, 'dc:date/text()', $entry);
}
$updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
if (empty($updated) && !empty($published)) {
@ -291,20 +304,25 @@ class Feed {
if ($published != "") {
$item["created"] = $published;
}
if ($updated != "") {
$item["edited"] = $updated;
}
$creator = XML::getFirstNodeValue($xpath, 'author/text()', $entry);
if (empty($creator)) {
$creator = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $entry);
}
if (empty($creator)) {
$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
}
if ($creator != "") {
$item["author-name"] = $creator;
}
$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
if ($creator != "") {
@ -332,6 +350,7 @@ class Feed {
$type = $attribute->textContent;
}
}
if (!empty($item["attach"])) {
$item["attach"] .= ',';
} else {
@ -340,7 +359,7 @@ class Feed {
$attachments[] = ["link" => $href, "type" => $type, "length" => $length];
$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'"[/attach]';
$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '"[/attach]';
}
$tags = '';
@ -418,7 +437,7 @@ class Feed {
$item["body"] = trim($item["title"]);
}
$data = ParseUrl::getSiteinfoCached($item['plink'], true);
$data = ParseUrl::getSiteinfoCached($item['plink'], true);
if (!empty($data['text']) && !empty($data['title']) && (mb_strlen($item['body']) < mb_strlen($data['text']))) {
// When the fetched page info text is longer than the body, we do try to enhance the body
if (!empty($item['body']) && (strpos($data['title'], $item['body']) === false) && (strpos($data['text'], $item['body']) === false)) {
@ -432,7 +451,7 @@ class Feed {
// We always strip the title since it will be added in the page information
$item["title"] = "";
$item["body"] = $item["body"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
$item["body"] = $item["body"] . add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
$item["tag"] = add_page_keywords($item["plink"], $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
$item["object-type"] = Activity\ObjectType::BOOKMARK;
unset($item["attach"]);
@ -448,16 +467,20 @@ class Feed {
// @todo $preview is never set in this case, is it intended? - @MrPetovan 2018-02-13
$item["tag"] = add_page_keywords($item["plink"], $preview, true, $contact["ffi_keyword_blacklist"]);
}
$item["body"] .= "\n".$item['tag'];
$item["body"] .= "\n" . $item['tag'];
}
// Add the link to the original feed entry if not present in feed
if (($item['plink'] != '') && !strstr($item["body"], $item['plink'])) {
$item["body"] .= "[hr][url]".$item['plink']."[/url]";
$item["body"] .= "[hr][url]" . $item['plink'] . "[/url]";
}
}
if (!$simulate) {
Logger::log("Stored feed: ".print_r($item, true), Logger::DEBUG);
if ($dryRun) {
$items[] = $item;
break;
} else {
Logger::info("Stored feed: " . print_r($item, true));
$notify = Item::isRemoteSelf($contact, $item);
@ -474,18 +497,11 @@ class Feed {
$id = Item::insert($item, false, $notify);
Logger::log("Feed for contact ".$contact["url"]." stored under id ".$id);
} else {
$items[] = $item;
}
if ($simulate) {
break;
Logger::info("Feed for contact " . $contact["url"] . " stored under id " . $id);
}
}
if ($simulate) {
return ["header" => $author, "items" => $items];
}
return ["header" => $author, "items" => $items];
}
private static function titleIsBody($title, $body)

3
src/Render/FriendicaSmarty.php
View file

@ -4,6 +4,7 @@
*/
namespace Friendica\Render;
use Friendica\DI;
use Smarty;
use Friendica\Core\Renderer;
@ -22,7 +23,7 @@ class FriendicaSmarty extends Smarty
{
parent::__construct();
$a = \get_app();
$a = DI::app();
$theme = $a->getCurrentTheme();
// setTemplateDir can be set to an array, which Smarty will parse in order.

5
src/Render/FriendicaSmartyEngine.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Render;
use Friendica\Core\Hook;
use Friendica\DI;
/**
* Smarty implementation of the Friendica template engine interface
@ -32,7 +33,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
$s = new FriendicaSmarty();
}
$r['$APP'] = \get_app();
$r['$APP'] = DI::app();
// "middleware": inject variables into templates
$arr = [
@ -54,7 +55,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
public function getTemplateFile($file, $root = '')
{
$a = \get_app();
$a = DI::app();
$template = new FriendicaSmarty();
// Make sure $root ends with a slash /

6
src/Util/Network.php
View file

@ -96,7 +96,7 @@ class Network
{
$stamp1 = microtime(true);
$a = \get_app();
$a = DI::app();
if (strlen($url) > 1000) {
Logger::log('URL is longer than 1000 characters. Callstack: ' . System::callstack(20), Logger::DEBUG);
@ -260,7 +260,7 @@ class Network
return CurlResult::createErrorCurl($url);
}
$a = \get_app();
$a = DI::app();
$ch = curl_init($url);
if (($redirects > 8) || (!$ch)) {
@ -630,7 +630,7 @@ class Network
*/
public static function finalUrl(string $url, int $depth = 1, bool $fetchbody = false)
{
$a = \get_app();
$a = DI::app();
$url = self::stripTrackingQueryParams($url);

4
static/defaults.config.php
View file

@ -297,10 +297,6 @@ return [
// Don't show smilies.
'no_smilies' => false,
// no_view_full_size (Boolean)
// Don't add the link "View full size" under a resized image.
'no_view_full_size' => false,
// optimize_items (Boolean)
// Triggers an SQL command to optimize the item table before expiring items.
'optimize_items' => false,

6
tests/include/ApiTest.php
View file

@ -1383,7 +1383,7 @@ class ApiTest extends DatabaseTest
'type' => 'image/png'
]
];
$app = \get_app();
$app = DI::app();
$app->argc = 2;
$result = api_media_upload();
@ -3305,7 +3305,7 @@ class ApiTest extends DatabaseTest
*/
public function testApiOauthRequestToken()
{
$this->markTestIncomplete('killme() kills phpunit as well');
$this->markTestIncomplete('exit() kills phpunit as well');
}
/**
@ -3315,7 +3315,7 @@ class ApiTest extends DatabaseTest
*/
public function testApiOauthAccessToken()
{
$this->markTestIncomplete('killme() kills phpunit as well');
$this->markTestIncomplete('exit() kills phpunit as well');
}
/**

3
view/theme/frio/php/scheme.php
View file

@ -19,11 +19,12 @@
*/
use Friendica\Core\PConfig;
use Friendica\DI;
use Friendica\Util\Strings;
function get_scheme_info($scheme)
{
$theme = \get_app()->getCurrentTheme();
$theme = DI::app()->getCurrentTheme();
$themepath = 'view/theme/' . $theme . '/';
if (empty($scheme)) {
$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));

2
view/theme/vier/theme.php
View file

@ -106,7 +106,7 @@ function get_vier_config($key, $default = false, $admin = false)
function vier_community_info()
{
$a = \get_app();
$a = DI::app();
$show_pages = get_vier_config("show_pages", 1);
$show_profiles = get_vier_config("show_profiles", 1);