Replace deprecated $a->page with DI::page()

diff --git a/include/conversation.php b/include/conversation.php
index bf1f5645b1aa48ea5c30a50ac0a18c99e3639139..6ded55eec62ad7563ab42f1a6364262991c7dad8 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1171,7 +1171,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
        $geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
 
        $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$newpost'   => 'true',
                '$baseurl'   => System::baseUrl(true),
                '$geotag'    => $geotag,

diff --git a/mod/api.php b/mod/api.php
index 842c1a74dc67ea0b289e768898d9e7b3b9b42421..68308d3a621b018ad06ce884371512848c46f703 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -50,7 +50,7 @@ function api_content(App $a)
                 * api/oauth/authorize interact with the user. return a standard page
                 */
 
-               $a->page['template'] = "minimal";
+               DI::page()['template'] = "minimal";
 
                // get consumer/client from request token
                try {

diff --git a/mod/cal.php b/mod/cal.php
index 62508fbef73be395fe2a04276148a92653183d64..f7fe2435d055549f2db3bdaadd37a5bc21f59e72 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -67,12 +67,12 @@ function cal_init(App $a)
 
        $cal_widget = Widget\CalendarExport::getHTML();
 
-       if (empty($a->page['aside'])) {
-               $a->page['aside'] = '';
+       if (empty(DI::page()['aside'])) {
+               DI::page()['aside'] = '';
        }
 
-       $a->page['aside'] .= $vcard_widget;
-       $a->page['aside'] .= $cal_widget;
+       DI::page()['aside'] .= $vcard_widget;
+       DI::page()['aside'] .= $cal_widget;
 
        return;
 }
@@ -85,7 +85,7 @@ function cal_content(App $a)
        $i18n = Event::getStrings();
 
        $htpl = Renderer::getMarkupTemplate('event_head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
                '$module_url' => '/cal/' . $a->data['user']['nickname'],
                '$modparams' => 2,
                '$i18n' => $i18n,

diff --git a/mod/common.php b/mod/common.php
index c66da0385092912ff12461f9074673949cc31ab6..6ad531d0712727cf52c70aec10ca4581a62ead43 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -41,7 +41,7 @@ function common_content(App $a)
                $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['id' => $cid, 'uid' => $uid]);
 
                if (DBA::isResult($contact)) {
-                       $a->page['aside'] = "";
+                       DI::page()['aside'] = "";
                        Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
                }
        } else {
@@ -54,10 +54,10 @@ function common_content(App $a)
                                'url'    => 'contact/' . $cid
                        ]);
 
-                       if (empty($a->page['aside'])) {
-                               $a->page['aside'] = '';
+                       if (empty(DI::page()['aside'])) {
+                               DI::page()['aside'] = '';
                        }
-                       $a->page['aside'] .= $vcard_widget;
+                       DI::page()['aside'] .= $vcard_widget;
                }
        }
 

diff --git a/mod/community.php b/mod/community.php
index 461dd2f9e0ace478586390f9577203552e6f7240..22c1c5d76ebfea1ac59def95dda8af4ddb5af3ff 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -127,7 +127,7 @@ function community_content(App $a, $update = 0)
                                'default_location' => $a->user['default-location'],
                                'nickname' => $a->user['nickname'],
                                'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                               'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
+                               'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
                                'bang' => '',
                                'visitor' => 'block',
                                'profile_uid' => local_user(),
@@ -193,12 +193,12 @@ function community_content(App $a, $update = 0)
                $o .= $pager->renderMinimal(count($r));
        }
 
-       if (empty($a->page['aside'])) {
-               $a->page['aside'] = '';
+       if (empty(DI::page()['aside'])) {
+               DI::page()['aside'] = '';
        }
 
        if (Feature::isEnabled(local_user(), 'trending_tags')) {
-               $a->page['aside'] .= TrendingTags::getHTML($content);
+               DI::page()['aside'] .= TrendingTags::getHTML($content);
        }
 
        $t = Renderer::getMarkupTemplate("community.tpl");

diff --git a/mod/crepair.php b/mod/crepair.php
index b9b8651439c531fb84c1f181387782e28daa6d21..ad90c9f7a911dbdfbfb0452171498d98740bb907 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -10,6 +10,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Module;
 use Friendica\Util\Strings;
@@ -103,8 +104,8 @@ function crepair_content(App $a)
                return;
        }
 
-       if (empty($a->page['aside'])) {
-               $a->page['aside'] = '';
+       if (empty(DI::page()['aside'])) {
+               DI::page()['aside'] = '';
        }
 
        if (DBA::isResult($contact)) {

diff --git a/mod/display.php b/mod/display.php
index fa2127aaec247ddfea37ac678528a40104fc3971..f4274caeaeb20eca05327812aafa32cfc392ed4e 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -239,7 +239,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $conversation = '';
        }
 
-       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
+       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
                                ['$alternate' => $alternate,
                                        '$conversation' => $conversation]);
 
@@ -281,7 +281,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                       'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
+                       'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -342,39 +342,41 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
        $author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
 
+       $page = DI::page();
+
        if (DBA::exists('contact', ['unsearchable' => true, 'id' => [$item['contact-id'], $item['author-id'], $item['owner-id']]])) {
-               $a->page['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
+               $page['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
        }
 
-       $a->page['htmlhead'] .= '<meta name="author" content="'.$author_name.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="description" content="'.$description.'" />'."\n";
+       DI::page()['htmlhead'] .= '<meta name="author" content="'.$author_name.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="description" content="'.$description.'" />'."\n";
 
        // Schema.org microdata
-       $a->page['htmlhead'] .= '<meta itemprop="name" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta itemprop="description" content="'.$description.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta itemprop="image" content="'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta itemprop="author" content="'.$author_name.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="name" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="image" content="'.$image.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="author" content="'.$author_name.'" />'."\n";
 
        // Twitter cards
-       $a->page['htmlhead'] .= '<meta name="twitter:card" content="summary" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:card" content="summary" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
 
        // Dublin Core
-       $a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="DC.description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="DC.description" content="'.$description.'" />'."\n";
 
        // Open Graph
-       $a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
        // article:tag
 
        return $o;

diff --git a/mod/editpost.php b/mod/editpost.php
index 690cb2ac0d0947d40da1e0a5b9c6994b8f0653d8..b6ed782463fe7573645d747d3b613e6b62383d28 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -9,6 +9,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
@@ -47,7 +48,7 @@ function editpost_content(App $a)
        ]);
 
        $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$ispublic' => '&nbsp;', // L10n::t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']

diff --git a/mod/events.php b/mod/events.php
index 245ee34b305ed482e52c3b5ad6de00d814ffb918..8984e99561a72a3d02393eccd2620972b99d5118 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -37,13 +37,13 @@ function events_init(App $a)
                return;
        }
 
-       if (empty($a->page['aside'])) {
-               $a->page['aside'] = '';
+       if (empty(DI::page()['aside'])) {
+               DI::page()['aside'] = '';
        }
 
        $cal_widget = CalendarExport::getHTML();
 
-       $a->page['aside'] .= $cal_widget;
+       DI::page()['aside'] .= $cal_widget;
 
        return;
 }
@@ -242,7 +242,7 @@ function events_content(App $a)
        $i18n = Event::getStrings();
 
        $htpl = Renderer::getMarkupTemplate('event_head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
                '$module_url' => '/events',
                '$modparams' => 1,
                '$i18n' => $i18n,
@@ -384,10 +384,10 @@ function events_content(App $a)
                }
 
                // ACL blocks are loaded in modals in frio
-               $a->page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
-               $a->page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
-               $a->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
-               $a->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
+               DI::page()->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
+               DI::page()->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
+               DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
+               DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
                $o = Renderer::replaceMacros($tpl, [
                        '$tabs'      => $tabs,
@@ -489,7 +489,7 @@ function events_content(App $a)
                $fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
 
                if (!$cid && in_array($mode, ['new', 'copy'])) {
-                       $acl = ACL::getFullSelectorHTML($a->page, $a->user, false, ACL::getDefaultUserPermissions($orig_event));
+                       $acl = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($orig_event));
                } else {
                        $acl = '';
                }

diff --git a/mod/follow.php b/mod/follow.php
index 94db3ad38dafbb1106645c4b98938da040530d86..99601e7592aa7eb15090bb7046eaa6fe128cc212 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -184,7 +184,7 @@ function follow_content(App $a)
                '$keywords_label'=> L10n::t('Tags:')
        ]);
 
-       $a->page['aside'] = '';
+       DI::page()['aside'] = '';
 
        $profiledata = Contact::getDetailsByURL($ret['url']);
        if ($profiledata) {

diff --git a/mod/match.php b/mod/match.php
index 189210f4b54e07d50e2a814bd88a88c449511666..ae7cf73baa6f3305dd569a430651eba24d8ed447 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -36,8 +36,8 @@ function match_content(App $a)
                return '';
        }
 
-       $a->page['aside'] .= Widget::findPeople();
-       $a->page['aside'] .= Widget::follow();
+       DI::page()['aside'] .= Widget::findPeople();
+       DI::page()['aside'] .= Widget::follow();
 
        $_SESSION['return_path'] = DI::args()->getCommand();
 

diff --git a/mod/message.php b/mod/message.php
index f10ff76b92266a3039b0a4ffa2498abdaedd9e7d..5c84838965bd8dc5bb99fa3d1708bf253e6a2fe5 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -38,14 +38,14 @@ function message_init(App $a)
        ];
 
        $tpl = Renderer::getMarkupTemplate('message_side.tpl');
-       $a->page['aside'] = Renderer::replaceMacros($tpl, [
+       DI::page()['aside'] = Renderer::replaceMacros($tpl, [
                '$tabs' => $tabs,
                '$new' => $new,
        ]);
        $base = System::baseUrl();
 
        $head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
                '$baseurl' => System::baseUrl(true),
                '$base' => $base
        ]);
@@ -199,7 +199,7 @@ function message_content(App $a)
                $o .= $header;
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')
@@ -355,7 +355,7 @@ function message_content(App $a)
                }
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')

diff --git a/mod/network.php b/mod/network.php
index be121540c122c61708aedcb925d7c7076b6277b6..0308e4a10e121a715eebac3612505a8965e9e6e5 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -132,16 +132,16 @@ function network_init(App $a)
                }
        }
 
-       if (empty($a->page['aside'])) {
-               $a->page['aside'] = '';
+       if (empty(DI::page()['aside'])) {
+               DI::page()['aside'] = '';
        }
 
-       $a->page['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
-       $a->page['aside'] .= ForumManager::widget(local_user(), $cid);
-       $a->page['aside'] .= Widget::postedByYear('network', local_user(), false);
-       $a->page['aside'] .= Widget::networks('network', $_GET['nets'] ?? '');
-       $a->page['aside'] .= Widget\SavedSearches::getHTML(DI::args()->getQueryString());
-       $a->page['aside'] .= Widget::fileAs('network', $_GET['file'] ?? '');
+       DI::page()['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
+       DI::page()['aside'] .= ForumManager::widget(local_user(), $cid);
+       DI::page()['aside'] .= Widget::postedByYear('network', local_user(), false);
+       DI::page()['aside'] .= Widget::networks('network', $_GET['nets'] ?? '');
+       DI::page()['aside'] .= Widget\SavedSearches::getHTML(DI::args()->getQueryString());
+       DI::page()['aside'] .= Widget::fileAs('network', $_GET['file'] ?? '');
 }
 
 /**
@@ -374,7 +374,7 @@ function networkFlatView(App $a, $update = 0)
                        (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
                        strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
                        'default_perms' => ACL::getDefaultUserPermissions($a->user),
-                       'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
+                       'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -548,7 +548,7 @@ function networkThreadedView(App $a, $update, $parent)
                        (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
                        strlen($a->user['deny_cid']) || strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
                        'default_perms' => ACL::getDefaultUserPermissions($a->user),
-                       'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true, $default_permissions),
+                       'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true, $default_permissions),
                        'bang' => (($gid || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
                        'profile_uid' => local_user(),

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index f112a2ef916b848b88823a042e0e73c5c43844e8..ec79f87e50d8733e39ce0dcc6a577af6a61ed575 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -25,8 +25,6 @@ function ostatus_subscribe_content(App $a)
 
        $uid = local_user();
 
-       $a = \get_app();
-
        $counter = intval($_REQUEST['counter']);
 
        if (PConfig::get($uid, 'ostatus', 'legacy_friends') == '') {
@@ -65,7 +63,7 @@ function ostatus_subscribe_content(App $a)
        $total = sizeof($friends);
 
        if ($counter >= $total) {
-               $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/settings/connectors">';
+               DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/settings/connectors">';
                PConfig::delete($uid, 'ostatus', 'legacy_friends');
                PConfig::delete($uid, 'ostatus', 'legacy_contact');
                $o .= L10n::t('Done');
@@ -94,7 +92,7 @@ function ostatus_subscribe_content(App $a)
 
        $o .= '<p>' . L10n::t('Keep this window open until done.') . '</p>';
 
-       $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/ostatus_subscribe?counter=' . $counter . '">';
+       DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/ostatus_subscribe?counter=' . $counter . '">';
 
        return $o;
 }

diff --git a/mod/photos.php b/mod/photos.php
index a0a1be9327bbae93565b49e18cc52f1c293a14e0..fde2d6c897e40270f5a65445fc96a8da710645ef 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -116,19 +116,19 @@ function photos_init(App $a) {
                        ]);
                }
 
-               if (empty($a->page['aside'])) {
-                       $a->page['aside'] = '';
+               if (empty(DI::page()['aside'])) {
+                       DI::page()['aside'] = '';
                }
 
-               $a->page['aside'] .= $vcard_widget;
+               DI::page()['aside'] .= $vcard_widget;
 
                if (!empty($photo_albums_widget)) {
-                       $a->page['aside'] .= $photo_albums_widget;
+                       DI::page()['aside'] .= $photo_albums_widget;
                }
 
                $tpl = Renderer::getMarkupTemplate("photos_head.tpl");
 
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[
                        '$ispublic' => L10n::t('everybody')
                ]);
        }
@@ -957,7 +957,7 @@ function photos_content(App $a)
 
                $tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
 
-               $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->page, $a->user));
+               $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML(DI::page(), $a->user));
 
                $o .= Renderer::replaceMacros($tpl,[
                        '$pagename' => L10n::t('Upload Photos'),
@@ -1198,7 +1198,7 @@ function photos_content(App $a)
                                }
 
                                $tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
-                               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
+                               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[
                                        '$prevlink' => $prevlink,
                                        '$nextlink' => $nextlink
                                ]);
@@ -1325,7 +1325,7 @@ function photos_content(App $a)
 
                        $album_e = $ph[0]['album'];
                        $caption_e = $ph[0]['desc'];
-                       $aclselect_e = ACL::getFullSelectorHTML($a->page, $a->user, false, ACL::getDefaultUserPermissions($ph[0]));
+                       $aclselect_e = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($ph[0]));
 
                        $edit = Renderer::replaceMacros($edit_tpl, [
                                '$id' => $ph[0]['id'],
@@ -1527,11 +1527,11 @@ function photos_content(App $a)
                        '$paginate' => $paginate,
                ]);
 
-               $a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="summary_large_image" />' . "\n";
-               $a->page['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
-               $a->page['htmlhead'] .= '<meta name="twitter:image" content="' . System::baseUrl() . "/" . $photo["href"] . '" />' . "\n";
-               $a->page['htmlhead'] .= '<meta name="twitter:image:width" content="' . $photo["width"] . '" />' . "\n";
-               $a->page['htmlhead'] .= '<meta name="twitter:image:height" content="' . $photo["height"] . '" />' . "\n";
+               DI::page()['htmlhead'] .= "\n" . '<meta name="twitter:card" content="summary_large_image" />' . "\n";
+               DI::page()['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
+               DI::page()['htmlhead'] .= '<meta name="twitter:image" content="' . System::baseUrl() . "/" . $photo["href"] . '" />' . "\n";
+               DI::page()['htmlhead'] .= '<meta name="twitter:image:width" content="' . $photo["width"] . '" />' . "\n";
+               DI::page()['htmlhead'] .= '<meta name="twitter:image:height" content="' . $photo["height"] . '" />' . "\n";
 
                return $o;
        }

diff --git a/mod/poke.php b/mod/poke.php
index 69fd42c72cf1d19cfce6f0a3c3075f6278b2e6d2..9a0e50362e520dddb81cd832c8d2bd78fe7faee0 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -20,6 +20,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Strings;
@@ -156,7 +157,7 @@ function poke_content(App $a)
        $id = $contact['id'];
 
        $head_tpl = Renderer::getMarkupTemplate('poke_head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl,[
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl,[
                '$baseurl' => System::baseUrl(true),
        ]);
 

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 6d625cedeb5350e2f67a6ed265e8436311a9b7f2..e04062a4d5ee1d9720b75e9e46e4ae0daccc3c81 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -167,7 +167,7 @@ function profile_photo_post(App $a)
        $ph->orient($src);
        @unlink($src);
 
-       $imagecrop = profile_photo_crop_ui_head($a, $ph);
+       $imagecrop = profile_photo_crop_ui_head($ph);
        DI::baseUrl()->redirect('profile_photo/use/' . $imagecrop['hash']);
 }
 
@@ -228,7 +228,7 @@ function profile_photo_content(App $a)
                }
                $ph = Photo::getImageForPhoto($r[0]);
                
-               $imagecrop = profile_photo_crop_ui_head($a, $ph);
+               $imagecrop = profile_photo_crop_ui_head($ph);
                // go ahead as we have jus uploaded a new photo to crop
        }
 
@@ -271,7 +271,7 @@ function profile_photo_content(App $a)
        }
 }
 
-function profile_photo_crop_ui_head(App $a, Image $image)
+function profile_photo_crop_ui_head(Image $image)
 {
        $max_length = Config::get('system', 'max_image_length');
        if (!$max_length) {
@@ -315,7 +315,7 @@ function profile_photo_crop_ui_head(App $a, Image $image)
                }
        }
 
-       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
+       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
 
        $imagecrop = [
                'hash'       => $hash,

diff --git a/mod/profiles.php b/mod/profiles.php
index 18fe636d3d5ee229e553cd2f939c88e0937ef0e5..13e92b054e1a591207bc78149fecec2089690e3d 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -513,7 +513,7 @@ function profiles_content(App $a) {
                        return;
                }
 
-               $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
+               DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
                        '$baseurl' => System::baseUrl(true),
                ]);
 

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index f1a86e6b2343f30b3abae54f07a45c83aef6719d..30ad1476ca900f784e7c638592ff25c567960ccd 100644 (file)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -60,7 +60,7 @@ function repair_ostatus_content(App $a) {
 
        Contact::createFromProbe($uid, $r[0]["url"], true);
 
-       $a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.System::baseUrl().'/repair_ostatus?counter='.$counter.'">';
+       DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.System::baseUrl().'/repair_ostatus?counter='.$counter.'">';
 
        return $o;
 }

diff --git a/mod/settings.php b/mod/settings.php
index 5f28ca6d29ecebbab2a01905e381c01837f33db3..9e47b3d2e14a80c58124c8e92b853c9b04086598 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -56,7 +56,7 @@ function settings_init(App $a)
        // These lines provide the javascript needed by the acl selector
 
        $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$ispublic' => L10n::t('everybody')
        ]);
 
@@ -143,7 +143,7 @@ function settings_init(App $a)
 
 
        $tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
-       $a->page['aside'] = Renderer::replaceMacros($tabtpl, [
+       DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [
                '$title' => L10n::t('Settings'),
                '$class' => 'settings-widget',
                '$items' => $tabs,
@@ -787,7 +787,7 @@ function settings_content(App $a)
 
                if (!empty($legacy_contact)) {
                        /// @todo Isn't it supposed to be a $a->internalRedirect() call?
-                       $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
+                       DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
                }
 
                $settings_connectors = '';
@@ -1203,7 +1203,7 @@ function settings_content(App $a)
                '$permissions' => L10n::t('Default Post Permissions'),
                '$permdesc' => L10n::t("\x28click to open/close\x29"),
                '$visibility' => $profile['net-publish'],
-               '$aclselect' => ACL::getFullSelectorHTML($a->page, $a->user),
+               '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user),
                '$suggestme' => $suggestme,
                '$blockwall'=> $blockwall, // array('blockwall', L10n::t('Allow friends to post to your profile page:'), !$blockwall, ''),
                '$blocktags'=> $blocktags, // array('blocktags', L10n::t('Allow friends to tag your posts:'), !$blocktags, ''),

diff --git a/mod/suggest.php b/mod/suggest.php
index 15370d25a9bdcfb4355c2f36d6a9b6428ef8687b..aab313366b20d7ae933832d9747270d2b69e6e11 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -43,8 +43,8 @@ function suggest_content(App $a)
 
        $_SESSION['return_path'] = DI::args()->getCommand();
 
-       $a->page['aside'] .= Widget::findPeople();
-       $a->page['aside'] .= Widget::follow();
+       DI::page()['aside'] .= Widget::findPeople();
+       DI::page()['aside'] .= Widget::follow();
 
 
        $r = GContact::suggestionQuery(local_user());

diff --git a/mod/unfollow.php b/mod/unfollow.php
index c7ad413d225e34eda1cac94a99244043da3d1d41..9f9ebdf5930307bba830dc7604052b07607ce8b8 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -142,7 +142,7 @@ function unfollow_content(App $a)
                '$keywords_label'=> ''
        ]);
 
-       $a->page['aside'] = '';
+       DI::page()['aside'] = '';
        Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
 
        $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);

diff --git a/mod/videos.php b/mod/videos.php
index b6f6b1d8e74094fcafc698134679be8856fdc663..2c21be0cc82e0d441b339af82ef5db7be04a3ad3 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -58,14 +58,14 @@ function videos_init(App $a)
                ]);
 
                // If not there, create 'aside' empty
-               if (!isset($a->page['aside'])) {
-                       $a->page['aside'] = '';
+               if (!isset(DI::page()['aside'])) {
+                       DI::page()['aside'] = '';
                }
 
-               $a->page['aside'] .= $vcard_widget;
+               DI::page()['aside'] .= $vcard_widget;
 
                $tpl = Renderer::getMarkupTemplate("videos_head.tpl");
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl);
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl);
        }
 
        return;

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index eaa3174f4a2e67a6cecc1b809d62431bcd0cd908..e9e90574557921864dca768f767d50ebcd96893b 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -118,7 +118,7 @@ function wallmessage_content(App $a) {
        }
 
        $tpl = Renderer::getMarkupTemplate('wallmsg-header.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => L10n::t('Please enter a link URL:')

diff --git a/src/App.php b/src/App.php
index 71b64bdb64781a899c257cf7d10ba9f94fd39b3b..4a620313817fa297c4addb0544631d946ccbf36b 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -40,10 +40,6 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-       /**
-        * @var Page The current page environment
-        */
-       public $page;
        public $profile;
        public $profile_uid;
        public $user;
@@ -154,7 +150,7 @@ class App
         * @param App\Arguments   $args     The Friendica Arguments of the call
         * @param Core\Process    $process  The process methods
         */
-       public function __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, App\Page $page, Core\Process $process)
+       public function __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process)
        {
                $this->database = $database;
                $this->config   = $config;
@@ -168,7 +164,6 @@ class App
 
                $this->argv         = $args->getArgv();
                $this->argc         = $args->getArgc();
-               $this->page         = $page;
 
                $this->load();
        }
@@ -435,10 +430,11 @@ class App
         * @param App\Router     $router
         * @param IPConfiguration $pconfig
         * @param Authentication $auth The Authentication backend of the node
+        * @param App\Page $page The Friendica page printing container
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function runFrontend(App\Module $module, App\Router $router, IPConfiguration $pconfig, Authentication $auth)
+       public function runFrontend(App\Module $module, App\Router $router, IPConfiguration $pconfig, Authentication $auth, App\Page $page)
        {
                $moduleName = $module->getName();
 
@@ -567,7 +563,7 @@ class App
                        }
 
                        // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
-                       $this->page['page_title'] = $moduleName;
+                       $page['page_title'] = $moduleName;
 
                        // determine the module class and save it to the module instance
                        // @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
@@ -579,7 +575,7 @@ class App
                        ModuleHTTPException::rawContent($e);
                }
 
-               $this->page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
+               $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
        }
 
        /**

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index b1e925a6621511c1d2605eb34ee81fb4c9ca9c39..25c159a5ce63227b3ecf4f6efd7345a2c688890d 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -13,6 +13,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
@@ -49,13 +50,12 @@ class Widget
         */
        public static function findPeople()
        {
-               $a = \get_app();
                $global_dir = Config::get('system', 'directory');
 
                if (Config::get('system', 'invitation_only')) {
                        $x = intval(PConfig::get(local_user(), 'system', 'invites_remaining'));
                        if ($x || is_site_admin()) {
-                               $a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
+                               DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
                                        . L10n::tt('%d invitation available', '%d invitations available', $x)
                                        . '</div>';
                        }

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 16a6a0a24cc7990a8ec599c46120ab9ad0430afd..d521e4ca5e5e9386f85e2386295c510ea53386fe 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3576,7 +3576,7 @@ class Item
                        if (strpos($mime, 'video') !== false) {
                                if (!$vhead) {
                                        $vhead = true;
-                                       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'));
+                                       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'));
                                }
 
                                $url_parts = explode('/', $the_url);

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index a08cdade126493efa1f716a129019ef0e2998317..af903e745830e3eb476b5d5eb645157da1ea7ee6 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -155,7 +155,7 @@ class Profile
                        }
 
                        // Add profile data to sidebar
-                       $a->page['aside'] .= self::sidebar($a, $profiledata, true, $show_connect);
+                       DI::page()['aside'] .= self::sidebar($a, $profiledata, true, $show_connect);
 
                        if (!DBA::isResult($user)) {
                                return;
@@ -189,7 +189,7 @@ class Profile
                $a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme');
                $a->profile['network'] = Protocol::DFRN;
 
-               $a->page['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename');
+               DI::page()['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename');
 
                if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
                        $a->setCurrentTheme($a->profile['theme']);
@@ -208,7 +208,7 @@ class Profile
                }
 
                if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
-                       $a->page['aside'] .= Renderer::replaceMacros(
+                       DI::page()['aside'] .= Renderer::replaceMacros(
                                Renderer::getMarkupTemplate('profile_edlink.tpl'),
                                [
                                        '$editprofile' => L10n::t('Edit profile'),
@@ -225,7 +225,7 @@ class Profile
                 * But: When this profile was on the same server, then we could display the contacts
                 */
                if (!$profiledata) {
-                       $a->page['aside'] .= self::sidebar($a, $a->profile, $block, $show_connect);
+                       DI::page()['aside'] .= self::sidebar($a, $a->profile, $block, $show_connect);
                }
 
                return;

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 47d8c3e2644dc2cc4e88fed74d0a361330f041e8..e145614982274a50d4741c29ba4ba5d96e5ed5a8 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -44,7 +44,7 @@ class AllFriends extends BaseModule
                        throw new HTTPException\BadRequestException(L10n::t('Invalid contact.'));
                }
 
-               $app->page['aside'] = "";
+               DI::page()['aside'] = "";
                Model\Profile::load($app, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
 
                $total = Model\GContact::countAllFriends(local_user(), $cid);

diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index f985b4a4956c8fd6555c6e87355ec1d974581a4c..bbb633ab8c590e1b94e65a8f5a77e831f6beb06d 100644 (file)
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -51,8 +51,6 @@ abstract class BaseAdminModule extends BaseModule
 
        public static function content(array $parameters = [])
        {
-               $a = DI::app();
-
                if (!is_site_admin()) {
                        notice(L10n::t('Please login to continue.'));
                        Session::set('return_path', DI::args()->getQueryString());
@@ -64,7 +62,7 @@ abstract class BaseAdminModule extends BaseModule
                }
 
                // Header stuff
-               $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []);
+               DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []);
 
                /*
                 * Side bar links
@@ -109,7 +107,7 @@ abstract class BaseAdminModule extends BaseModule
                ];
 
                $t = Renderer::getMarkupTemplate('admin/aside.tpl');
-               $a->page['aside'] .= Renderer::replaceMacros($t, [
+               DI::page()['aside'] .= Renderer::replaceMacros($t, [
                        '$admin' => ['addons_admin' => Addon::getAdminList()],
                        '$subpages' => $aside_sub,
                        '$admtxt' => L10n::t('Admin'),

diff --git a/src/Module/BaseSettingsModule.php b/src/Module/BaseSettingsModule.php
index 244dcdf17dda2f34b27da3c3e4cd381282ddb3e1..291ae8d0b6d7abee12f4cb10eab62ada7193edc2 100644 (file)
--- a/src/Module/BaseSettingsModule.php
+++ b/src/Module/BaseSettingsModule.php
@@ -15,7 +15,7 @@ class BaseSettingsModule extends BaseModule
                $a = DI::app();
 
                $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$ispublic' => L10n::t('everybody')
                ]);
 
@@ -102,7 +102,7 @@ class BaseSettingsModule extends BaseModule
 
 
                $tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
-               $a->page['aside'] = Renderer::replaceMacros($tabtpl, [
+               DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [
                        '$title' => L10n::t('Settings'),
                        '$class' => 'settings-widget',
                        '$items' => $tabs,

diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index f5627e4354eb7c0f8172f06a5b167dd4b7214c11..5cd908488eed42dfee08882ac7b4475bd8fce4b3 100644 (file)
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -46,7 +46,7 @@ class Bookmarklet extends BaseModule
                                'nickname'         => $app->user['nickname'],
                                'lockstate'        => ((is_array($app->user) && ((strlen($app->user['allow_cid'])) || (strlen($app->user['allow_gid'])) || (strlen($app->user['deny_cid'])) || (strlen($app->user['deny_gid'])))) ? 'lock' : 'unlock'),
                                'default_perms'    => ACL::getDefaultUserPermissions($app->user),
-                               'acl'              => ACL::getFullSelectorHTML($app->page, $app->user, true),
+                               'acl'              => ACL::getFullSelectorHTML(DI::page(), $app->user, true),
                                'bang'             => '',
                                'visitor'          => 'block',
                                'profile_uid'      => local_user(),

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index d307652b63681ff5fc9aa4619ad6d533d4c3ce1d..85590d0c66e1cf0940d47a359dd305940d6751f1 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -252,8 +252,8 @@ class Contact extends BaseModule
                $nets = $_GET['nets'] ?? '';
                $rel  = $_GET['rel']  ?? '';
 
-               if (empty($a->page['aside'])) {
-                       $a->page['aside'] = '';
+               if (empty(DI::page()['aside'])) {
+                       DI::page()['aside'] = '';
                }
 
                $contact_id = null;
@@ -347,10 +347,10 @@ class Contact extends BaseModule
                        $groups_widget = null;
                }
 
-               $a->page['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
+               DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
 
                $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => DI::baseUrl()->get(true),
                ]);
 
@@ -434,7 +434,7 @@ class Contact extends BaseModule
                                                }
                                        }
 
-                                       $a->page['aside'] = '';
+                                       DI::page()['aside'] = '';
 
                                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
                                                '$header' => L10n::t('Drop contact'),
@@ -472,7 +472,7 @@ class Contact extends BaseModule
                if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
                        $contact = $a->data['contact'];
 
-                       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
+                       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
                                '$baseurl' => DI::baseUrl()->get(true),
                        ]);
 

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index fc4c1be4f8ca5b2019e769d719067938a4d72520..41f27502875207eab78f8326ac7b452ca02f072f 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -33,8 +33,8 @@ class Directory extends BaseModule
                }
 
                if (local_user()) {
-                       $app->page['aside'] .= Widget::findPeople();
-                       $app->page['aside'] .= Widget::follow();
+                       DI::page()['aside'] .= Widget::findPeople();
+                       DI::page()['aside'] .= Widget::follow();
                }
 
                $output = '';

diff --git a/src/Module/Group.php b/src/Module/Group.php
index 8de4c5033b1b2095734038fb9a686bb3db7b9f74..ccb4f8bdf81381f7a8c35a31e01c0af67a30bf36 100644 (file)
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -137,7 +137,7 @@ class Group extends BaseModule
 
                $a = DI::app();
 
-               $a->page['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
+               DI::page()['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
 
                // With no group number provided we jump to the unassigned contacts as a starting point
                // @TODO: Replace with parameter from router

diff --git a/src/Module/Help.php b/src/Module/Help.php
index d9362712fd6e597d3b9f7ef0f0aeb6d9283f1f66..b18500a1096907f45b4e6d5ac0c7d0c054ad15fb 100644 (file)
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -41,16 +41,16 @@ class Help extends BaseModule
                        $title = basename($path);
                        $filename = $path;
                        $text = self::loadDocFile('doc/' . $path . '.md', $lang);
-                       $a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
+                       DI::page()['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
                }
 
                $home = self::loadDocFile('doc/Home.md', $lang);
                if (!$text) {
                        $text = $home;
                        $filename = "Home";
-                       $a->page['title'] = L10n::t('Help');
+                       DI::page()['title'] = L10n::t('Help');
                } else {
-                       $a->page['aside'] = Markdown::convert($home, false);
+                       DI::page()['aside'] = Markdown::convert($home, false);
                }
 
                if (!strlen($text)) {
@@ -104,7 +104,7 @@ class Help extends BaseModule
 
                        $html = implode("\n", $lines);
 
-                       $a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
+                       DI::page()['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . DI::page()['aside'] . '</div>';
                }
 
                return $html;

diff --git a/src/Module/Home.php b/src/Module/Home.php
index 3d04849cf46d1c0f1158ef95b61d18847ae9168d..77eec34c428ed0f8a5ba3546f641e5da35cb0038 100644 (file)
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -42,7 +42,7 @@ class Home extends BaseModule
                        $customHome = $homeFilePath;
 
                        if (file_exists($cssFilePath)) {
-                               $app->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/home.css' . '" media="all" />';
+                               DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/home.css' . '" media="all" />';
                        }
                }
 

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 5d4a3c18edfb0f145e49e1d6a90672dba9a646e8..2364d64839cd8c429ef72c32730c1015d983af6a 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -114,9 +114,9 @@ class Compose extends BaseModule
                Hook::callAll('jot_tool', $jotplugins);
 
                // Output
-               $a->page->registerFooterScript(Theme::getPathForFile('js/ajaxupload.js'));
-               $a->page->registerFooterScript(Theme::getPathForFile('js/linkPreview.js'));
-               $a->page->registerFooterScript(Theme::getPathForFile('js/compose.js'));
+               DI::page()->registerFooterScript(Theme::getPathForFile('js/ajaxupload.js'));
+               DI::page()->registerFooterScript(Theme::getPathForFile('js/linkPreview.js'));
+               DI::page()->registerFooterScript(Theme::getPathForFile('js/compose.js'));
 
                $tpl = Renderer::getMarkupTemplate('item/compose.tpl');
                return Renderer::replaceMacros($tpl, [
@@ -162,7 +162,7 @@ class Compose extends BaseModule
                        '$jotplugins'   => $jotplugins,
                        '$sourceapp'    => L10n::t($a->sourcename),
                        '$rand_num'     => Crypto::randomDigits(12),
-                       '$acl_selector'  => ACL::getFullSelectorHTML($a->page, $a->user, $doesFederate, [
+                       '$acl_selector'  => ACL::getFullSelectorHTML(DI::page(), $a->user, $doesFederate, [
                                'allow_cid' => $contact_allow_list,
                                'allow_gid' => $group_allow_list,
                                'deny_cid'  => $contact_deny_list,

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 8232282dfd56e5fe725c5cc2fbe7644cffbb7d1b..3fe28a0b91489034b9e8f89f55c181b6388b47b8 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -84,51 +84,53 @@ class Profile extends BaseModule
                if (!$update) {
                        ProfileModel::load($a, self::$which, self::$profile);
 
-                       $a->page['htmlhead'] .= "\n";
+                       $page = DI::page();
+
+                       $page['htmlhead'] .= "\n";
 
                        $blocked   = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && Config::get('system', 'block_public');
                        $userblock = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && $a->profile['hidewall'];
 
                        if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
-                               $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />' . "\n";
+                               $page['htmlhead'] .= '<meta name="friendica.community" content="true" />' . "\n";
                        }
 
                        if (!empty($a->profile['openidserver'])) {
-                               $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\n";
+                               $page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\n";
                        }
 
                        if (!empty($a->profile['openid'])) {
                                $delegate = strstr($a->profile['openid'], '://') ? $a->profile['openid'] : 'https://' . $a->profile['openid'];
-                               $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\n";
+                               $page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\n";
                        }
 
                        // site block
                        if (!$blocked && !$userblock) {
                                $keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], $a->profile['pub_keywords'] ?? '');
                                if (strlen($keywords)) {
-                                       $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\n";
+                                       $page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\n";
                                }
                        }
 
-                       $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\n";
+                       $page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\n";
 
                        if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
-                               $a->page['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
+                               $page['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
                        }
 
-                       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . self::$which . '" title="DFRN: ' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\n";
-                       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\n";
-                       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\n";
-                       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\n";
+                       $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . self::$which . '" title="DFRN: ' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\n";
+                       $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\n";
+                       $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\n";
+                       $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\n";
                        $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : ''));
-                       $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\n";
+                       $page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\n";
                        header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
                        $dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
                        foreach ($dfrn_pages as $dfrn) {
-                               $a->page['htmlhead'] .= '<link rel="dfrn-' . $dfrn . '" href="' . System::baseUrl() . '/dfrn_' . $dfrn . '/' . self::$which . '" />' . "\n";
+                               $page['htmlhead'] .= '<link rel="dfrn-' . $dfrn . '" href="' . System::baseUrl() . '/dfrn_' . $dfrn . '/' . self::$which . '" />' . "\n";
                        }
-                       $a->page['htmlhead'] .= '<link rel="dfrn-poco" href="' . System::baseUrl() . '/poco/' . self::$which . '" />' . "\n";
+                       $page['htmlhead'] .= '<link rel="dfrn-poco" href="' . System::baseUrl() . '/poco/' . self::$which . '" />' . "\n";
                }
 
                $category = $datequery = $datequery2 = '';
@@ -191,9 +193,9 @@ class Profile extends BaseModule
                        $commpage = $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                        $commvisitor = $commpage && $remote_contact;
 
-                       $a->page['aside'] .= Widget::postedByYear(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'] ?? 0, true);
-                       $a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], XML::escape($category));
-                       $a->page['aside'] .= Widget::tagCloud();
+                       DI::page()['aside'] .= Widget::postedByYear(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'] ?? 0, true);
+                       DI::page()['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], XML::escape($category));
+                       DI::page()['aside'] .= Widget::tagCloud();
 
                        if (Security::canWriteToUserWall($a->profile['profile_uid'])) {
                                $x = [
@@ -207,7 +209,7 @@ class Profile extends BaseModule
                                                || strlen($a->user['deny_cid'])
                                                || strlen($a->user['deny_gid'])
                                        ) ? 'lock' : 'unlock',
-                                       'acl' => $is_owner ? ACL::getFullSelectorHTML($a->page, $a->user, true) : '',
+                                       'acl' => $is_owner ? ACL::getFullSelectorHTML(DI::page(), $a->user, true) : '',
                                        'bang' => '',
                                        'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                        'profile_uid' => $a->profile['profile_uid'],

diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php
index df73437c6e16970920ce228be4b1d5d56eadf872..55510aa5391de55b22981db336311783abb2546c 100644 (file)
--- a/src/Module/Search/Directory.php
+++ b/src/Module/Search/Directory.php
@@ -23,14 +23,12 @@ class Directory extends BaseSearchModule
 
                $search = Strings::escapeTags(trim(rawurldecode($_REQUEST['search'] ?? '')));
 
-               $a = DI::app();
-
-               if (empty($a->page['aside'])) {
-                       $a->page['aside'] = '';
+               if (empty(DI::page()['aside'])) {
+                       DI::page()['aside'] = '';
                }
 
-               $a->page['aside'] .= Widget::findPeople();
-               $a->page['aside'] .= Widget::follow();
+               DI::page()['aside'] .= Widget::findPeople();
+               DI::page()['aside'] .= Widget::follow();
 
                return self::performContactSearch($search);
        }

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 87f0193c328453c0f1c6607d7d45bee3bbb6d6a7..247ac5988c2bd52e34fc76d7fb83928a2b3b493f 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -66,7 +66,7 @@ class Index extends BaseSearchModule
                }
 
                if (local_user()) {
-                       DI::app()->page['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
+                       DI::page()['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
                }
 
                Nav::setSelected('search');

diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index 053e17b1b4536333b448f1699335d35640ea2452..a52a38f6824acb32d9e297264171358cefc98dd5 100644 (file)
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -75,7 +75,6 @@ class Login extends BaseModule
         */
        public static function form($return_path = null, $register = false, $hiddens = [])
        {
-               $a = DI::app();
                $o = '';
 
                $noid = Config::get('system', 'no_openid');
@@ -101,7 +100,7 @@ class Login extends BaseModule
                if (local_user()) {
                        $tpl = Renderer::getMarkupTemplate('logout.tpl');
                } else {
-                       $a->page['htmlhead'] .= Renderer::replaceMacros(
+                       DI::page()['htmlhead'] .= Renderer::replaceMacros(
                                Renderer::getMarkupTemplate('login_head.tpl'),
                                [
                                        '$baseurl' => DI::baseUrl()->get(true)

diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 363f6dc487d7fc883776f5e37b967cb31f6a2a72..5ee2e2bcfb6d29c8e65e9311e389fdf62801e668 100644 (file)
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function duepuntozero_init(App $a) {
 
@@ -14,19 +15,19 @@ Renderer::setActiveTemplateEngine('smarty3');
        $colorset = Config::get('duepuntozero', 'colorset');          // user setting have priority, then node settings
     if ($colorset) {
         if ($colorset == 'greenzero')
-            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";
+            DI::page()['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";
         if ($colorset == 'purplezero')
-            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/purplezero.css" type="text/css" media="screen" />'."\n";
+               DI::page()['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/purplezero.css" type="text/css" media="screen" />'."\n";
         if ($colorset == 'easterbunny')
-            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/easterbunny.css" type="text/css" media="screen" />'."\n";
+               DI::page()['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/easterbunny.css" type="text/css" media="screen" />'."\n";
         if ($colorset == 'darkzero')
-            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/darkzero.css" type="text/css" media="screen" />'."\n";
+               DI::page()['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/darkzero.css" type="text/css" media="screen" />'."\n";
         if ($colorset == 'comix')
-            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/comix.css" type="text/css" media="screen" />'."\n";
+               DI::page()['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/comix.css" type="text/css" media="screen" />'."\n";
         if ($colorset == 'slackr')
-            $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/slackr.css" type="text/css" media="screen" />'."\n";
+               DI::page()['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/slackr.css" type="text/css" media="screen" />'."\n";
     }
-$a->page['htmlhead'] .= <<< EOT
+DI::page()['htmlhead'] .= <<< EOT
 <script>
 function cmtBbOpen(comment, id) {
        if ($(comment).hasClass('comment-edit-text-full')) {

diff --git a/view/theme/frio/php/frio_boot.php b/view/theme/frio/php/frio_boot.php
index 7ec81a3565785fa34ef7ba0a7dcba971ff8c13b2..0ec8ba0b47e13a3a026b5941de4b5f61a9b0779d 100644 (file)
--- a/view/theme/frio/php/frio_boot.php
+++ b/view/theme/frio/php/frio_boot.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\DI;
 
 /**
  * @brief Load page template in dependence of the template mode
@@ -22,7 +23,7 @@ function load_page(App $a)
                require 'view/theme/frio/none.php';
        } else {
                $template = 'view/theme/' . $a->getCurrentTheme() . '/'
-                       . (($a->page['template'] ?? '') ?: 'default' ) . '.php';
+                       . ((DI::page()['template'] ?? '') ?: 'default' ) . '.php';
                if (file_exists($template)) {
                        require_once $template;
                } else {

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 5fe0152748ec59dd22b24c1d720a18a05838e0f4..2cd30ad1f1f4e9495fb1f329ccde8e7c68b8f666 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -36,7 +36,7 @@ function frio_init(App $a)
        // if the device is a mobile device set js is_mobile
        // variable so the js scripts can use this information
        if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
-               $a->page['htmlhead'] .= <<< EOT
+               DI::page()['htmlhead'] .= <<< EOT
                        <script type="text/javascript">
                                var is_mobile = 1;
                        </script>
@@ -45,7 +45,7 @@ EOT;
 
        $enable_compose = \Friendica\Core\PConfig::get(local_user(), 'frio', 'enable_compose');
        $compose = $enable_compose === '1' || $enable_compose === null && Config::get('frio', 'enable_compose') ? 1 : 0;
-       $a->page['htmlhead'] .= <<< HTML
+       DI::page()['htmlhead'] .= <<< HTML
                <script type="text/javascript">
                        var compose = $compose;
                </script>

diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index ac172cee053fbd0d385c060271f1147a454858b9..e82b9f2d8f11bddbca6515f9ef6f9626e3ccc2dd 100644 (file)
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -9,8 +9,9 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\DI;
 
 function quattro_init(App $a) {
-       $a->page['htmlhead'] .= '<script src="'.System::baseUrl().'/view/theme/quattro/tinycon.min.js"></script>';
-       $a->page['htmlhead'] .= '<script src="'.System::baseUrl().'/view/theme/quattro/js/quattro.js"></script>';;
+       DI::page()['htmlhead'] .= '<script src="'.System::baseUrl().'/view/theme/quattro/tinycon.min.js"></script>';
+       DI::page()['htmlhead'] .= '<script src="'.System::baseUrl().'/view/theme/quattro/js/quattro.js"></script>';;
 }

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index e2289c87be41502af49e07c44ea6b3d24d707c21..f373cdec5ff56561096c7c556c2b8b2ee750928e 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -13,6 +13,7 @@
 use Friendica\App;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\DI;
 
 function smoothly_init(App $a) {
        Renderer::setActiveTemplateEngine('smarty3');
@@ -20,7 +21,7 @@ function smoothly_init(App $a) {
        $cssFile = null;
        $ssl_state = null;
        $baseurl = System::baseUrl($ssl_state);
-       $a->page['htmlhead'] .= <<< EOT
+       DI::page()['htmlhead'] .= <<< EOT
 
 <script>
 function cmtBbOpen(id) {
@@ -75,7 +76,7 @@ EOT;
 
        /** custom css **/
        if (!is_null($cssFile)) {
-        $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+               DI::page()['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
        }
 
        _js_in_foot();
@@ -85,12 +86,11 @@ if (! function_exists('_js_in_foot')) {
        function _js_in_foot() {
                /** @purpose insert stuff in bottom of page
                */
-               $a = \get_app();
                $ssl_state = null;
                $baseurl = System::baseUrl($ssl_state);
                $bottom['$baseurl'] = $baseurl;
                $tpl = Renderer::getMarkupTemplate('bottom.tpl');
 
-               return $a->page['bottom'] = Renderer::replaceMacros($tpl, $bottom);
+               return DI::page()['bottom'] = Renderer::replaceMacros($tpl, $bottom);
        }
 }

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 9f974eda0744e00da949611d6cf500031e70ad97..02aac5b6488d5898636b4b8de50e2b3d0f4b5579 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -33,17 +33,17 @@ function vier_init(App $a)
        if (!empty($a->argv[0]) && ($a->argv[0] . ($a->argv[1] ?? '')) === ('profile' . $a->user['nickname']) || $a->argv[0] === 'network' && local_user()) {
                vier_community_info();
 
-               $a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
+               DI::page()['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
        }
 
        if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
-               $a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
-               $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
+               DI::page()['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
+               DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
        }
        /// @todo deactivated since it doesn't work with desktop browsers at the moment
-       //$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
+       //DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
 
-       $a->page['htmlhead'] .= <<< EOT
+       DI::page()['htmlhead'] .= <<< EOT
 <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />
 <script type="text/javascript">
 function showThread(id) {
@@ -65,7 +65,7 @@ function cmtBbClose(id) {
 EOT;
 
        if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
-               $a->page['htmlhead'] .= <<< EOT
+               DI::page()['htmlhead'] .= <<< EOT
 <script>
        $(document).ready(function() {
                $(".mobile-aside-toggle a").click(function(e){
@@ -82,9 +82,9 @@ EOT;
 
        // Hide the left menu bar
        /// @TODO maybe move this static array out where it should belong?
-       if (empty($a->page['aside']) && in_array($a->argv[0], ["community", "events", "help", "delegation", "notifications",
+       if (empty(DI::page()['aside']) && in_array($a->argv[0], ["community", "events", "help", "delegation", "notifications",
                        "probe", "webfinger", "login", "invite", "credits"])) {
-               $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
+               DI::page()['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
        }
 }
 
@@ -365,5 +365,5 @@ function vier_community_info()
 
        //print right_aside
        $tpl = Renderer::getMarkupTemplate('communityhome.tpl');
-       $a->page['right_aside'] = Renderer::replaceMacros($tpl, $aside);
+       DI::page()['right_aside'] = Renderer::replaceMacros($tpl, $aside);
 }