From 5d4d175bf9491d6f62e0803eab2ac2ea605c1f2f Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 15 Dec 2019 22:34:10 +0100 Subject: [PATCH 01/12] Introduce new DI container - Adding Friendica\DI class for getting dynamic classes - Replacing BaseObject::getApp() with this class --- pumpio/pumpio_sync.php | 2 +- twitter/twitter_sync.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php index de794ad6..f59d621f 100644 --- a/pumpio/pumpio_sync.php +++ b/pumpio/pumpio_sync.php @@ -3,7 +3,7 @@ use Friendica\Core\Config; use Friendica\Core\Logger; function pumpio_sync_run(&$argv, &$argc) { - $a = Friendica\BaseObject::getApp(); + $a = Friendica\DI::app(); require_once("addon/pumpio/pumpio.php"); diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php index b2c655e7..d320763b 100644 --- a/twitter/twitter_sync.php +++ b/twitter/twitter_sync.php @@ -5,7 +5,7 @@ use Friendica\Core\Logger; function twitter_sync_run($argv, $argc) { - $a = Friendica\BaseObject::getApp(); + $a = Friendica\DI::app(); require_once 'addon/twitter/twitter.php'; From 34ba7f441dcaf28e2ed7ac2cedf998bdc8b39be2 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 15 Dec 2019 23:28:00 +0100 Subject: [PATCH 02/12] Replace BaseObject class with DI::* calls --- remote_permissions/remote_permissions.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index ad6d7b25..7d42c560 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -7,14 +7,13 @@ * Status: Unsupported */ -use Friendica\BaseObject; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\Util\ACLFormatter; +use Friendica\DI; use Friendica\Util\Strings; function remote_permissions_install() { @@ -125,8 +124,7 @@ function remote_permissions_content($a, $item_copy) { $item = $r[0]; - /** @var ACLFormatter $aclFormatter */ - $aclFormatter = BaseObject::getClass(ACLFormatter::class); + $aclFormatter = DI::aclFormatter(); $allowed_users = $aclFormatter->expand($item['allow_cid']); $allowed_groups = $aclFormatter->expand($item['allow_gid']); From 44bf0343e2c01851c44daaa6f3dda09ef3e16a30 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 15 Dec 2019 23:46:55 +0100 Subject: [PATCH 03/12] Refactor dynamic App::getLogger() to static DI::logger() --- phpmailer/phpmailer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php index a5ab2558..7f91c277 100644 --- a/phpmailer/phpmailer.php +++ b/phpmailer/phpmailer.php @@ -10,6 +10,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\Hook; +use Friendica\DI; use Friendica\Util\ConfigFileLoader; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; @@ -99,6 +100,6 @@ function phpmailer_emailer_send_prepare(App $a, array &$b) $b['sent'] = $mail->send(); } catch (Exception $e) { - $a->getLogger()->error('PHPMailer error', ['ErrorInfo' => $mail->ErrorInfo, 'code' => $e->getCode(), 'message' => $e->getMessage()]); + DI::logger()->error('PHPMailer error', ['ErrorInfo' => $mail->ErrorInfo, 'code' => $e->getCode(), 'message' => $e->getMessage()]); } } From 33dae7eb94dfa575429b873ac560e8c4237ca5a1 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 15 Dec 2019 23:50:35 +0100 Subject: [PATCH 04/12] Refactor dynamic App::getProfiler() to static DI::profiler() --- rendertime/rendertime.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index a54fc489..2ed7ee40 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -9,6 +9,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\DI; function rendertime_install() { Hook::register('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end'); @@ -30,7 +31,7 @@ function rendertime_init_1(&$a) { function rendertime_page_end(Friendica\App $a, &$o) { - $profiler = $a->getProfiler(); + $profiler = DI::profiler(); $duration = microtime(true) - $profiler->get('start'); From 99db3452e31b05621f4cde02a94d0c0058b82bd0 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 00:28:30 +0100 Subject: [PATCH 05/12] Refactor deprecated App::internalRedirect() to DI::baseUrl()->redirect() --- impressum/impressum.php | 4 ++-- notifyall/notifyall.php | 3 ++- statusnet/statusnet.php | 7 ++++--- twitter/twitter.php | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/impressum/impressum.php b/impressum/impressum.php index dc5d3552..b943fd9f 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -13,6 +13,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; +use Friendica\DI; use Friendica\Util\ConfigFileLoader; use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; @@ -34,8 +35,7 @@ function impressum_uninstall() { function impressum_module() { } function impressum_content() { - $a = \get_app(); - $a->internalRedirect('friendica/'); + DI::baseUrl()->redirect('friendica/'); } function obfuscate_email ($s) { diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index af52e668..8205e200 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -15,6 +15,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\System; +use Friendica\DI; use Friendica\Util\Emailer; function notifyall_install() @@ -96,7 +97,7 @@ function notifyall_post(App $a) } notice(L10n::t('Emails sent')); - $a->internalRedirect('admin'); + DI::baseUrl()->redirect('admin'); } function notifyall_content(&$a) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index fee8fd82..baba236a 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -50,6 +50,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; @@ -167,7 +168,7 @@ function statusnet_settings_post(App $a, $post) } } } - $a->internalRedirect('settings/connectors'); + DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-consumersecret'])) { // check if we can reach the API of the GNU Social server @@ -195,7 +196,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); } } - $a->internalRedirect('settings/connectors'); + DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-pin'])) { // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen @@ -213,7 +214,7 @@ function statusnet_settings_post(App $a, $post) PConfig::set(local_user(), 'statusnet', 'post', 1); PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Bug #42 - $a->internalRedirect('settings/connectors'); + DI::baseUrl()->redirect('settings/connectors'); } else { // 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 diff --git a/twitter/twitter.php b/twitter/twitter.php index 6cc11f9b..54d90948 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -78,6 +78,7 @@ use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\Group; @@ -263,7 +264,7 @@ function twitter_settings_post(App $a) info($e->getMessage()); } // reload the Addon Settings page, if we don't do it see Bug #42 - $a->internalRedirect('settings/connectors'); + DI::baseUrl()->redirect('settings/connectors'); } else { // 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 From 0775c28854ee674e6fae8a7ee39dffc7030cc9cb Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 00:47:24 +0100 Subject: [PATCH 06/12] Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName() --- diaspora/diaspora.php | 3 ++- notifyall/notifyall.php | 2 +- pumpio/pumpio.php | 5 +++-- securemail/securemail.php | 3 ++- statusnet/statusnet.php | 2 +- twitter/twitter.php | 4 ++-- xmpp/xmpp.php | 3 ++- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 0d847b14..eb7e521b 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -18,6 +18,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\Core\Worker; +use Friendica\DI; function diaspora_install() { @@ -231,7 +232,7 @@ function diaspora_post_local(App $a, array &$b) function diaspora_send(App $a, array &$b) { - $hostname = $a->getHostName(); + $hostname = DI::baseUrl()->getHostname(); Logger::log('diaspora_send: invoked'); diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index 8205e200..c470cb4e 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -57,7 +57,7 @@ function notifyall_post(App $a) } if (!Config::get('config', 'sender_email')) { - $sender_email = 'noreply@' . $a->getHostName(); + $sender_email = 'noreply@' . DI::baseUrl()->getHostname(); } else { $sender_email = Config::get('config', 'sender_email'); } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index e8b740c2..18ab5f41 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -17,6 +17,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; @@ -105,7 +106,7 @@ function pumpio_registerclient(App $a, $host) $application_name = Config::get('pumpio', 'application_name'); if ($application_name == "") { - $application_name = $a->getHostName(); + $application_name = DI::baseUrl()->getHostname(); } $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))); @@ -772,7 +773,7 @@ function pumpio_fetchtimeline(App $a, $uid) $application_name = Config::get('pumpio', 'application_name'); } if ($application_name == "") { - $application_name = $a->getHostName(); + $application_name = DI::baseUrl()->getHostname(); } $first_time = ($lastdate == ""); diff --git a/securemail/securemail.php b/securemail/securemail.php index 5662714b..029e040a 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -13,6 +13,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; +use Friendica\DI; use Friendica\Util\Emailer; require_once __DIR__ . '/vendor/autoload.php'; @@ -92,7 +93,7 @@ function securemail_settings_post(App &$a, array &$b) if ($_POST['securemail-submit'] == L10n::t('Save and send test')) { $sitename = Config::get('config', 'sitename'); - $hostname = $a->getHostName(); + $hostname = DI::baseUrl()->getHostname(); if (strpos($hostname, ':')) { $hostname = substr($hostname, 0, strpos($hostname, ':')); } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index baba236a..38b9f8ab 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -838,7 +838,7 @@ function statusnet_fetchtimeline(App $a, $uid) $application_name = Config::get('statusnet', 'application_name'); } if ($application_name == "") { - $application_name = $a->getHostName(); + $application_name = DI::baseUrl()->getHostname(); } $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); diff --git a/twitter/twitter.php b/twitter/twitter.php index 54d90948..cfa7bfdc 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -940,7 +940,7 @@ function twitter_fetchtimeline(App $a, $uid) $application_name = Config::get('twitter', 'application_name'); if ($application_name == "") { - $application_name = $a->getHostName(); + $application_name = DI::baseUrl()->getHostname(); } $has_picture = false; @@ -1633,7 +1633,7 @@ function twitter_fetchhometimeline(App $a, $uid) $application_name = Config::get('twitter', 'application_name'); if ($application_name == "") { - $application_name = $a->getHostName(); + $application_name = DI::baseUrl()->getHostname(); } $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index f596a679..cbb770f6 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -13,6 +13,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; +use Friendica\DI; use Friendica\Util\Strings; function xmpp_install() @@ -167,7 +168,7 @@ function xmpp_converse(App $a) PConfig::set(local_user(), "xmpp", "password", $password); } - $jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . Strings::getRandomHex(5); + $jid = $a->user["nickname"] . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5); $auto_login = "auto_login: true, authentication: 'login', From 335fcf670f35f577eacf1050b223641b60bbb35c Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 01:05:14 +0100 Subject: [PATCH 07/12] Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get() --- blockem/blockem.php | 5 ++-- blogger/blogger.php | 3 ++- buffer/buffer.php | 11 ++++---- catavatar/catavatar.php | 7 ++--- curweather/curweather.php | 3 ++- diaspora/diaspora.php | 2 +- dwpost/dwpost.php | 3 ++- ifttt/ifttt.php | 3 ++- jappixmini/jappixmini.php | 23 ++++++++-------- langfilter/langfilter.php | 3 ++- mailstream/mailstream.php | 3 ++- notifyall/notifyall.php | 2 +- pumpio/pumpio.php | 12 ++++----- smileybutton/smileybutton.php | 51 ++++++++++++++++++----------------- statusnet/statusnet.php | 6 ++--- tumblr/tumblr.php | 9 ++++--- twitter/twitter.php | 8 +++--- widgets/widgets.php | 4 +-- xmpp/xmpp.php | 2 +- 19 files changed, 86 insertions(+), 74 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index e0c0a74a..6d93de1d 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -11,6 +11,7 @@ use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\DI; use Friendica\Util\Strings; function blockem_install() @@ -43,7 +44,7 @@ function blockem_addon_settings (App $a, &$s) } /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; $words = PConfig::get(local_user(), 'blockem', 'words'); @@ -148,7 +149,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) function blockem_display_item(App $a, array &$b = null) { if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) { - $b['output']['thumb'] = $a->getBaseURL() . "/images/person-80.jpg"; + $b['output']['thumb'] = DI::baseUrl()->get() . "/images/person-80.jpg"; } } diff --git a/blogger/blogger.php b/blogger/blogger.php index 001224d2..049ee077 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -12,6 +12,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; +use Friendica\DI; use Friendica\Util\Network; use Friendica\Util\XML; @@ -68,7 +69,7 @@ function blogger_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ diff --git a/buffer/buffer.php b/buffer/buffer.php index 13b5309d..24357634 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -17,6 +17,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\ItemContent; use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; @@ -110,7 +111,7 @@ function buffer_connect(App $a) $client_secret = Config::get('buffer','client_secret'); // The callback URL is the script that gets called after the user authenticates with buffer - $callback_url = $a->getBaseURL()."/buffer/connect"; + $callback_url = DI::baseUrl()->get()."/buffer/connect"; $buffer = new BufferApp($client_id, $client_secret, $callback_url); @@ -119,7 +120,7 @@ function buffer_connect(App $a) } else { Logger::log("buffer_connect: authenticated"); $o = L10n::t("You are now authenticated to buffer. "); - $o .= '
' . L10n::t("return to the connector page") . ''; + $o .= '
' . L10n::t("return to the connector page") . ''; PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token); } @@ -152,7 +153,7 @@ function buffer_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -181,7 +182,7 @@ function buffer_settings(App $a, &$s) if ($access_token == "") { $s .= '
'; } else { $s .= '
'; @@ -200,7 +201,7 @@ function buffer_settings(App $a, &$s) $s .= '
'; // The callback URL is the script that gets called after the user authenticates with buffer - $callback_url = $a->getBaseURL() . '/buffer/connect'; + $callback_url = DI::baseUrl()->get() . '/buffer/connect'; $buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token); diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index e70449af..b345ea4f 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -15,6 +15,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Network\HTTPException\NotFoundException; @@ -84,7 +85,7 @@ function catavatar_addon_settings_post(App $a, &$s) $seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email'])))); if (!empty($_POST['catavatar-usecat'])) { - $url = $a->getBaseURL() . '/catavatar/' . local_user() . '?ts=' . time(); + $url = DI::baseUrl()->get() . '/catavatar/' . local_user() . '?ts=' . time(); $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]); if (!DBA::isResult($self)) { @@ -111,7 +112,7 @@ function catavatar_addon_settings_post(App $a, &$s) Contact::updateSelfFromUserID(local_user(), true); // Update global directory in background - $url = $a->getBaseURL() . '/profile/' . $a->user['nickname']; + $url = DI::baseUrl()->get() . '/profile/' . $a->user['nickname']; if ($url && strlen(Config::get('system', 'directory'))) { Worker::add(PRIORITY_LOW, 'Directory', $url); } @@ -140,7 +141,7 @@ function catavatar_addon_settings_post(App $a, &$s) function catavatar_lookup(App $a, &$b) { $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]); - $url = $a->getBaseURL() . '/catavatar/' . $user['uid']; + $url = DI::baseUrl()->get() . '/catavatar/' . $user['uid']; switch($b['size']) { case 300: $url .= "/4"; break; diff --git a/curweather/curweather.php b/curweather/curweather.php index df7a701a..533c83e0 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -17,6 +17,7 @@ use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Session; +use Friendica\DI; use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; @@ -103,7 +104,7 @@ function curweather_network_mod_init(App $a, &$b) return; } - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; // $rpt value is needed for location // $lang will be taken from the browser session to honour user settings diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index eb7e521b..06b54399 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -66,7 +66,7 @@ function diaspora_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index ebba0232..5c13734b 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -15,6 +15,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\XML; @@ -63,7 +64,7 @@ function dwpost_settings(App $a, &$s) } /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ $enabled = PConfig::get(local_user(), 'dwpost', 'post'); diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 3bb55f35..c9e08696 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -14,6 +14,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Util\Strings; @@ -63,7 +64,7 @@ function ifttt_settings(App $a, &$s) $s .= '
'; $s .= '

' . L10n::t('Create an account at IFTTT. Create three Facebook recipes that are connected with Maker (In the form "if Facebook then Maker") with the following parameters:') . '

'; $s .= '

URL

'; - $s .= '

' . $a->getBaseURL() . '/ifttt/' . $a->user['nickname'] . '

'; + $s .= '

' . DI::baseUrl()->get() . '/ifttt/' . $a->user['nickname'] . '

'; $s .= '

Method

'; $s .= '

POST

'; $s .= '

Content Type

'; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 8f0a1f71..1a768dea 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -70,6 +70,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\User; use Friendica\Util\Network; @@ -324,10 +325,10 @@ function jappixmini_settings(App $a, &$s) if (!$activate) { // load scripts if not yet activated so that password can be saved - $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; } $s .= ''; @@ -490,10 +491,10 @@ function jappixmini_script(App $a) return; } - $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; $username = PConfig::get(local_user(), 'jappixmini', 'username'); $username = str_replace("'", "\\'", $username); @@ -514,7 +515,7 @@ function jappixmini_script(App $a) // set proxy if necessary $use_proxy = Config::get('jappixmini', 'bosh_proxy'); if ($use_proxy) { - $proxy = $a->getBaseURL() . '/addon/jappixmini/proxy.php'; + $proxy = DI::baseUrl()->get() . '/addon/jappixmini/proxy.php'; } else { $proxy = ""; } @@ -569,10 +570,10 @@ function jappixmini_login(App $a, &$o) { // create client secret on login to be able to encrypt jabber passwords // for setDB and str_sha1, needed by jappixmini_addon_set_client_secret - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; // for jappixmini_addon_set_client_secret - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; // save hash of password $o = str_replace("
getBaseURL() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors and is distributed under the terms of the GNU Affero General Public License.

'; - $b .= '

You can download the source code of the addon. The rest of Friendica is distributed under compatible licenses and can be retrieved from https://github.com/friendica/friendica and https://github.com/friendica/friendica-addons

'; + $b .= '

This site uses the jappixmini addon, which includes Jappix Mini by the Jappix authors and is distributed under the terms of the GNU Affero General Public License.

'; + $b .= '

You can download the source code of the addon. The rest of Friendica is distributed under compatible licenses and can be retrieved from https://github.com/friendica/friendica and https://github.com/friendica/friendica-addons

'; } diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 95021969..f4728c77 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -13,6 +13,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; +use Friendica\DI; /* Define the hooks we want to use * that is, we have settings, we need to save the settings and we want @@ -122,7 +123,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) // Never filter own messages // TODO: find a better way to extract this - $logged_user_profile = $a->getBaseURL() . '/profile/' . $a->user['nickname']; + $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->user['nickname']; if ($logged_user_profile == $hook_data['item']['author-link']) { return; } diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index d6d880f1..02e6dcb6 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -14,6 +14,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Protocol\Activity; use Friendica\Util\Network; use Friendica\Model\Item; @@ -306,7 +307,7 @@ function mailstream_send(\Friendica\App $a, $message_id, $item, $user) { $template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/'); $mail->AltBody = BBCode::toPlaintext($item['body']); $item['body'] = BBCode::convert($item['body']); - $item['url'] = $a->getBaseURL() . '/display/' . $item['guid']; + $item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid']; $mail->Body = Renderer::replaceMacros($template, [ '$upstream' => L10n::t('Upstream'), '$local' => L10n::t('Local'), diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index c470cb4e..92a1a2e3 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -32,7 +32,7 @@ function notifyall_module() {} function notifyall_addon_admin(App $a, &$o) { - $o = '
    ' . L10n::t('Send email to all members') . '
'; + $o = '
    ' . L10n::t('Send email to all members') . '
'; } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 18ab5f41..7c2149cf 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -115,8 +115,8 @@ function pumpio_registerclient(App $a, $host) $params["contacts"] = $adminlist[0]; $params["application_type"] = "native"; $params["application_name"] = $application_name; - $params["logo_url"] = $a->getBaseURL()."/images/friendica-256.png"; - $params["redirect_uris"] = $a->getBaseURL()."/pumpio/connect"; + $params["logo_url"] = DI::baseUrl()->get()."/images/friendica-256.png"; + $params["redirect_uris"] = DI::baseUrl()->get()."/pumpio/connect"; Logger::log("pumpio_registerclient: ".$url." parameters ".print_r($params, true), Logger::DEBUG); @@ -167,7 +167,7 @@ function pumpio_connect(App $a) } // The callback URL is the script that gets called after the user authenticates with pumpio - $callback_url = $a->getBaseURL()."/pumpio/connect"; + $callback_url = DI::baseUrl()->get()."/pumpio/connect"; // Let's begin. First we need a Request Token. The request token is required to send the user // to pumpio's login page. @@ -204,7 +204,7 @@ function pumpio_connect(App $a) if ($success) { Logger::log("pumpio_connect: authenticated"); $o = L10n::t("You are now authenticated to pumpio."); - $o .= '
'.L10n::t("return to the connector page").''; + $o .= '
'.L10n::t("return to the connector page").''; } else { Logger::log("pumpio_connect: could not connect"); $o = 'Could not connect to pumpio. Refresh the page or try again later.'; @@ -239,7 +239,7 @@ function pumpio_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -289,7 +289,7 @@ function pumpio_settings(App $a, &$s) $s .= '
'; if (($oauth_token == "") || ($oauth_token_secret == "")) { $s .= '
'; } else { $s .= '
'; diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index 593eed8b..bdd7d951 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -7,6 +7,7 @@ */ use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\DI; function smileybutton_install() { //Register hooks @@ -70,29 +71,29 @@ function show_button(Friendica\App $a, &$b) { ]; $icons = [ - '<3', - '</3', - ':-)', - ';-)', - ':-(', - ':-P', - ':-X', - ':-D', - ':-O', - '\\o/', - 'O_o', - ':\'(', - ':-!', - ':-/', - ':-[', - '8-)', - ':beer', - ':coffee', - ':facepalm', - ':like', - ':dislike', - '~friendica', - 'red' + '<3', + '</3', + ':-)', + ';-)', + ':-(', + ':-P', + ':-X', + ':-D', + ':-O', + '\\o/', + 'O_o', + ':\'(', + ':-!', + ':-/', + ':-[', + '8-)', + ':beer', + ':coffee', + ':facepalm', + ':like', + ':dislike', + '~friendica', + 'red' ]; // Call hooks to get aditional smileies from other addons @@ -116,7 +117,7 @@ function show_button(Friendica\App $a, &$b) { $css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css'; if (! file_exists($css_file)) $css_file = 'addon/smileybutton/view/default.css'; - $css_url = $a->getBaseURL().'/'.$css_file; + $css_url = DI::baseUrl()->get().'/'.$css_file; $a->page['htmlhead'] .= ''."\r\n"; @@ -125,7 +126,7 @@ function show_button(Friendica\App $a, &$b) { $image = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.png'; if (! file_exists($image)) $image = 'addon/smileybutton/view/default.png'; - $image_url = $a->getBaseURL().'/'.$image; + $image_url = DI::baseUrl()->get().'/'.$image; //Add the hmtl and script to the page $b = <<< EOT diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 38b9f8ab..0f48b87f 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -239,7 +239,7 @@ function statusnet_settings(App $a, &$s) if (!local_user()) { return; } - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have a base api url and a consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some @@ -736,7 +736,7 @@ function statusnet_prepare_body(App $a, &$b) } $item = $b["item"]; - $item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"]; + $item["plink"] = DI::baseUrl()->get() . "/display/" . $item["guid"]; $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()]; $orig_post = Item::selectFirst(['author-link', 'uri'], $condition); @@ -1529,7 +1529,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false) if ($mtch[1] == "#") { // Replacing the hash tags that are directed to the GNU Social server with internal links $snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]"; - $frdchash = '#[url=' . $a->getBaseURL() . '/search?tag=' . $mtch[3] . ']' . $mtch[3] . '[/url]'; + $frdchash = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $mtch[3] . ']' . $mtch[3] . '[/url]'; $body = str_replace($snhash, $frdchash, $body); $str_tags .= $frdchash; diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index c0e65c7e..ac9208ca 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -18,6 +18,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Util\Strings; function tumblr_install() @@ -109,7 +110,7 @@ function tumblr_connect(App $a) // The callback URL is the script that gets called after the user authenticates with tumblr // In this example, it would be the included callback.php - $callback_url = $a->getBaseURL()."/tumblr/callback"; + $callback_url = DI::baseUrl()->get()."/tumblr/callback"; // Let's begin. First we need a Request Token. The request token is required to send the user // to Tumblr's login page. @@ -188,7 +189,7 @@ function tumblr_callback(App $a) PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']); $o = L10n::t("You are now authenticated to tumblr."); - $o .= '
'.L10n::t("return to the connector page").''; + $o .= '
' . L10n::t("return to the connector page") . ''; return $o; } @@ -219,7 +220,7 @@ function tumblr_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -242,7 +243,7 @@ function tumblr_settings(App $a, &$s) $s .= ''; $s .= '
'; $s .= '
'; diff --git a/twitter/twitter.php b/twitter/twitter.php index cfa7bfdc..52a59480 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -288,7 +288,7 @@ function twitter_settings(App $a, &$s) if (!local_user()) { return; } - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have global consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some @@ -839,7 +839,7 @@ function twitter_prepare_body(App $a, array &$b) if ($b["preview"]) { $max_char = 280; $item = $b["item"]; - $item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"]; + $item["plink"] = DI::baseUrl()->get() . "/display/" . $item["guid"]; $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()]; $orig_post = Item::selectFirst(['author-link'], $condition); @@ -1146,7 +1146,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture) $tags_arr = []; foreach ($item->entities->hashtags AS $hashtag) { - $url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]'; + $url = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]'; $tags_arr['#' . $hashtag->text] = $url; $body = str_replace('#' . $hashtag->text, $url, $body); } @@ -1279,7 +1279,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture) } $basetag = str_replace('_', ' ', substr($tag, 1)); - $url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; + $url = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; $body = str_replace($tag, $url, $body); $tags_arr['#' . $basetag] = $url; } elseif (strpos($tag, '@') === 0) { diff --git a/widgets/widgets.php b/widgets/widgets.php index 5c075964..c22c3f68 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -13,6 +13,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; function widgets_install() { Hook::register('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings'); @@ -76,8 +77,7 @@ function widgets_module() { } function _abs_url($s){ - $a = \get_app(); - return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s); + return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1" . DI::baseUrl()->get() . "/\$2", $s); } function _randomAlphaNum($length){ diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index cbb770f6..dcbf3945 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -53,7 +53,7 @@ function xmpp_addon_settings(App $a, &$s) /* Add our stylesheet to the xmpp so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variable */ From 4b6527e27335756b4c0f2509bd206fd023de39b7 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 01:08:47 +0100 Subject: [PATCH 08/12] Remove deprecated App::registerStylesheet()/FooterScript() - replace with DI::page()->registerStylesheet()/FooterScript() --- cookienotice/cookienotice.php | 5 +++-- geonames/geonames.php | 3 ++- highlightjs/highlightjs.php | 7 ++++--- mathjax/mathjax.php | 5 +++-- pageheader/pageheader.php | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php index 097f3c25..bad867e7 100644 --- a/cookienotice/cookienotice.php +++ b/cookienotice/cookienotice.php @@ -12,6 +12,7 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\DI; /** * cookienotice_install @@ -90,8 +91,8 @@ function cookienotice_page_content_top(App $a, &$b) $stylesheetPath = __DIR__ . '/cookienotice.css'; $footerscriptPath = __DIR__ . '/cookienotice.js'; - $a->registerStylesheet($stylesheetPath); - $a->registerFooterScript($footerscriptPath); + DI::page()->registerStylesheet($stylesheetPath); + DI::page()->registerFooterScript($footerscriptPath); } /** diff --git a/geonames/geonames.php b/geonames/geonames.php index c052cef6..03a2e45b 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -13,6 +13,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; +use Friendica\DI; use Friendica\Util\ConfigFileLoader; use Friendica\Util\Network; use Friendica\Util\XML; @@ -136,7 +137,7 @@ function geonames_addon_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ $stylesheetPath = __DIR__ . '/geonames.css'; - $a->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet($stylesheetPath); /* Get the current state of our config variable */ $enabled = intval(PConfig::get(local_user(), 'geonames', 'enable')); diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php index 258cb4ad..823541bb 100644 --- a/highlightjs/highlightjs.php +++ b/highlightjs/highlightjs.php @@ -8,6 +8,7 @@ use Friendica\App; use Friendica\Core\Hook; +use Friendica\DI; function highlightjs_install() { @@ -29,11 +30,11 @@ function highlightjs_head(App $a, &$b) $style = 'default'; } - $a->registerStylesheet(__DIR__ . '/asset/styles/' . $style . '.css'); + DI::page()->registerStylesheet(__DIR__ . '/asset/styles/' . $style . '.css'); } function highlightjs_footer(App $a, &$b) { - $a->registerFooterScript(__DIR__ . '/asset/highlight.pack.js'); - $a->registerFooterScript(__DIR__ . '/highlightjs.js'); + DI::page()->registerFooterScript(__DIR__ . '/asset/highlight.pack.js'); + DI::page()->registerFooterScript(__DIR__ . '/highlightjs.js'); } diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 6e80d68f..2974f762 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -13,6 +13,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; +use Friendica\DI; function mathjax_install() { @@ -64,7 +65,7 @@ function mathjax_footer(App $a, &$b) // if the visitor of the page is not a local_user, use MathJax // otherwise check the users settings. if (!local_user() || PConfig::get(local_user(), 'mathjax', 'use', false)) { - $a->registerFooterScript(__DIR__ . '/asset/MathJax.js?config=TeX-MML-AM_CHTML'); - $a->registerFooterScript(__DIR__ . '/mathjax.js'); + DI::page()->registerFooterScript(__DIR__ . '/asset/MathJax.js?config=TeX-MML-AM_CHTML'); + DI::page()->registerFooterScript(__DIR__ . '/mathjax.js'); } } diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index fd07fc1d..1a7fb4eb 100644 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -13,6 +13,7 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\DI; function pageheader_install() { Hook::register('page_content_top', __FILE__, 'pageheader_fetch'); @@ -26,7 +27,7 @@ function pageheader_addon_admin(App &$a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ $stylesheetPath = __DIR__ . '/pageheader.css'; - $a->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet($stylesheetPath); $words = Config::get('pageheader','text'); if(! $words) @@ -65,7 +66,7 @@ function pageheader_fetch(App $a, &$b) } $stylesheetPath = __DIR__ .'/pageheader.css'; - $a->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet($stylesheetPath); if ($s) { $b .= '
' . $s . '
'; From 5060f3c0aa7e2443cafe7a2dcb9a243a098a1656 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 01:12:07 +0100 Subject: [PATCH 09/12] Remove deprecated App::is_mobile/is_tablet - replace with DI::mode()->isMobile()/isTablet() --- rendertime/rendertime.php | 2 +- smileybutton/smileybutton.php | 2 +- xmpp/xmpp.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 2ed7ee40..31025dce 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -38,7 +38,7 @@ function rendertime_page_end(Friendica\App $a, &$o) $ignored_modules = ["fbrowser"]; $ignored = in_array($a->module, $ignored_modules); - if (is_site_admin() && (($_GET['mode'] ?? '') != 'minimal') && !$a->is_mobile && !$a->is_tablet && !$ignored) { + if (is_site_admin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) { $o = $o . '
' . L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s", round($profiler->get('database') - $profiler->get('database_write'), 3), diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index bdd7d951..9711ecf2 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -33,7 +33,7 @@ function show_button(Friendica\App $a, &$b) { return; // Disable for mobile because most mobiles have a smiley key for ther own - if ($a->is_mobile || $a->is_tablet) + if (DI::mode()->isMobile() || DI::mode()->isMobile()) return; /** diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index dcbf3945..31edfdca 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -143,7 +143,7 @@ function xmpp_converse(App $a) return; } - if ($a->is_mobile || $a->is_tablet) { + if (DI::mode()->isMobile() || DI::mode()->isMobile()) { return; } From dfd8c4c24f91dc34335fc48381404a29b88e98c2 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 01:30:33 +0100 Subject: [PATCH 10/12] Remove deprecated App::query_string - replace with DI::args()->getQueryString() --- forumdirectory/forumdirectory.php | 3 ++- xmpp/xmpp.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index f7c8b244..16538d79 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -15,6 +15,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Profile; use Friendica\Util\Strings; @@ -107,7 +108,7 @@ function forumdirectory_content(App $a) $total = $cnt['total']; } - $pager = new Pager($a->query_string, 60); + $pager = new Pager(DI::args()->getQueryString(), 60); $order = " ORDER BY `name` ASC "; diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index 31edfdca..dbcaf67d 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -151,7 +151,7 @@ function xmpp_converse(App $a) return; } - if (in_array($a->query_string, ["admin/federation/"])) { + if (in_array(DI::args()->getQueryString(), ["admin/federation/"])) { return; } From 9d9384f5edc09fa50e81690ad3609e63a747f667 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 01:35:25 +0100 Subject: [PATCH 11/12] Remove deprecated App::module - replace with DI::module()->getName() --- rendertime/rendertime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 31025dce..505bceca 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -36,7 +36,7 @@ function rendertime_page_end(Friendica\App $a, &$o) $duration = microtime(true) - $profiler->get('start'); $ignored_modules = ["fbrowser"]; - $ignored = in_array($a->module, $ignored_modules); + $ignored = in_array(DI::module()->getName(), $ignored_modules); if (is_site_admin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) { From 0b56ff0aa0a31a47eacf7a7691265f99736825be Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 28 Dec 2019 15:18:18 +0100 Subject: [PATCH 12/12] Add DI::auth() call to windowsphonepush --- windowsphonepush/windowsphonepush.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index 242fe96d..8d35e787 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -27,16 +27,14 @@ */ use Friendica\App; -use Friendica\BaseObject; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\App\Authentication; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; -use Friendica\Core\Session; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Model\User; @@ -475,9 +473,7 @@ function windowsphonepush_login(App $a) die('This api requires login'); } - /** @var Authentication $authentication */ - $authentication = BaseObject::getClass(Authentication::class); - $authentication->setForUser($a, $record); - $_SESSION["allow_api"] = true; + DI::auth()->setForUser($a, $record); + DI::session()->set('allow_api', true); Hook::callAll('logged_in', $a->user); }