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

[friendica.git] / view / theme / vier / theme.php

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 89fea650bac1b6b2c531d09b9885d52f0703ad40..ebe4011e654b2b0fc9e1beb3050a2233bf378dd1 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -16,8 +16,9 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -29,45 +30,22 @@ function vier_init(App $a)
 
        Renderer::setActiveTemplateEngine('smarty3');
 
-       if (!empty($a->argv[0]) && $a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
+       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 ($a->is_mobile || $a->is_tablet) {
-               $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";
+       if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
+               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 insertFormatting(BBcode, id) {
-       var tmpStr = $("#comment-edit-text-" + id).val();
-       if (tmpStr == "") {
-               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-               openMenu("comment-edit-submit-wrapper-" + id);
-       }
-
-       textarea = document.getElementById("comment-edit-text-" +id);
-       if (document.selection) {
-               textarea.focus();
-               selected = document.selection.createRange();
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
-               var start = textarea.selectionStart;
-               var end = textarea.selectionEnd;
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-       }
-
-       return true;
-}
-
 function showThread(id) {
        $("#collapsed-comments-" + id).show()
        $("#collapsed-comments-" + id + " .collapsed-comments").show()
@@ -86,8 +64,8 @@ function cmtBbClose(id) {
 </script>
 EOT;
 
-       if ($a->is_mobile || $a->is_tablet) {
-               $a->page['htmlhead'] .= <<< EOT
+       if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
+               DI::page()['htmlhead'] .= <<< EOT
 <script>
        $(document).ready(function() {
                $(".mobile-aside-toggle a").click(function(e){
@@ -104,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", "manage", "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' />";
        }
 }
 
@@ -129,7 +107,7 @@ function get_vier_config($key, $default = false, $admin = false)
 
 function vier_community_info()
 {
-       $a = get_app();
+       $a = DI::app();
 
        $show_pages      = get_vier_config("show_pages", 1);
        $show_profiles   = get_vier_config("show_profiles", 1);
@@ -139,7 +117,7 @@ function vier_community_info()
        $show_lastusers  = get_vier_config("show_lastusers", 1);
 
        // get_baseurl
-       $url = System::baseUrl();
+       $url = DI::baseUrl();
        $aside['$url'] = $url;
 
        // comunity_profiles
@@ -186,7 +164,7 @@ function vier_community_info()
                                $entry = Renderer::replaceMacros($tpl, [
                                        '$id' => $rr['id'],
                                        '$profile_link' => $profile_link,
-                                       '$photo' => $a->removeBaseURL($rr['thumb']),
+                                       '$photo' => DI::baseUrl()->remove($rr['thumb']),
                                        '$alt_text' => $rr['name']]);
                                $aside['$lastusers_items'][] = $entry;
                        }
@@ -206,7 +184,7 @@ function vier_community_info()
                $nv['random'] = L10n::t('Random Profile');
                $nv['inv'] = L10n::t('Invite Friends');
                $nv['directory'] = L10n::t('Global Directory');
-               $nv['global_dir'] = get_server();
+               $nv['global_dir'] = Search::getGlobalDirectory();
                $nv['local_directory'] = L10n::t('Local Directory');
 
                $aside['$nv'] = $nv;
@@ -214,7 +192,7 @@ function vier_community_info()
 
        //Community_Pages at right_aside
        if ($show_pages && local_user()) {
-               $cid = defaults($_GET, 'cid', null);
+               $cid = $_GET['cid'] ?? null;
 
                //sort by last updated item
                $lastitem = true;
@@ -230,12 +208,12 @@ function vier_community_info()
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
                                $entry = [
-                                       'url'          => 'network?f=&cid=' . $contact['id'],
+                                       'url'          => 'network?cid=' . $contact['id'],
                                        'external_url' => Contact::magicLink($contact['url']),
                                        'name'         => $contact['name'],
                                        'cid'          => $contact['id'],
                                        'selected'     => $selected,
-                                       'micro'        => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
+                                       'micro'        => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
                                        'id'           => ++$id,
                                ];
                                $entries[] = $entry;
@@ -313,10 +291,6 @@ function vier_community_info()
                /// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
                $r = [];
 
-               if (Addon::isEnabled("appnet")) {
-                       $r[] = ["photo" => "images/appnet.png", "name" => "App.net"];
-               }
-
                if (Addon::isEnabled("buffer")) {
                        $r[] = ["photo" => "images/buffer.png", "name" => "Buffer"];
                }
@@ -329,10 +303,6 @@ function vier_community_info()
                        $r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"];
                }
 
-               if (Addon::isEnabled("fbpost")) {
-                       $r[] = ["photo" => "images/facebook.png", "name" => "Facebook"];
-               }
-
                if (Addon::isEnabled("ifttt")) {
                        $r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"];
                }
@@ -341,10 +311,6 @@ function vier_community_info()
                        $r[] = ["photo" => "images/gnusocial.png", "name" => "GNU Social"];
                }
 
-               if (Addon::isEnabled("gpluspost")) {
-                       $r[] = ["photo" => "images/googleplus.png", "name" => "Google+"];
-               }
-
                /// @TODO old-lost code (and below)?
                //if (Addon::isEnabled("ijpost")) {
                //      $r[] = array("photo" => "images/", "name" => "");
@@ -399,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);
 }