wrapping up 2019.12

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

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index fb4f66431b1bbb6470682edb48261ecca2dd70fa..e5d71bdf578545b13157a9f926f8c79de81b6a06 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -21,6 +21,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
 function vier_init(App $a)
 {
@@ -28,7 +29,7 @@ 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";
@@ -44,29 +45,6 @@ function vier_init(App $a)
        $a->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()
@@ -103,7 +81,7 @@ 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($a->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' />";
        }
@@ -128,7 +106,7 @@ function get_vier_config($key, $default = false, $admin = false)
 
 function vier_community_info()
 {
-       $a = get_app();
+       $a = \get_app();
 
        $show_pages      = get_vier_config("show_pages", 1);
        $show_profiles   = get_vier_config("show_profiles", 1);
@@ -213,10 +191,7 @@ function vier_community_info()
 
        //Community_Pages at right_aside
        if ($show_pages && local_user()) {
-               $cid = null;
-               if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
-                       $cid = $_GET['cid'];
-               }
+               $cid = $_GET['cid'] ?? null;
 
                //sort by last updated item
                $lastitem = true;
@@ -232,7 +207,7 @@ 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'],
@@ -277,7 +252,7 @@ function vier_community_info()
                                        $query .= ",";
                                }
 
-                               $query .= "'".DBA::escape(normalise_link(trim($helper)))."'";
+                               $query .= "'".DBA::escape(Strings::normaliseLink(trim($helper)))."'";
                        }
 
                        $r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query);
@@ -315,10 +290,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"];
                }
@@ -331,10 +302,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"];
                }
@@ -343,10 +310,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" => "");