[frio] Fix wrongly removed content wrapper and fix CSS instead. (#5496) (#5505)

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

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index cc08a7d71fa442c39b8cf5de51bc0ee5de4f5217..43b786e6e89cddc64534037ea15bd06f6debb7c5 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -12,14 +12,13 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
-use Friendica\Core\L10n;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
 
 require_once "mod/proxy.php";
 
@@ -29,7 +28,7 @@ function vier_init(App $a)
 
        $a->set_template_engine('smarty3');
 
-       if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
+       if (!empty($a->argv[0]) && $a->argv[0] . defaults($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";
@@ -104,7 +103,7 @@ EOT;
 
        // Hide the left menu bar
        /// @TODO maybe move this static array out where it should belong?
-       if (($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", "manage", "notifications",
                        "probe", "webfinger", "login", "invite", "credits"])) {
                $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
        }
@@ -147,7 +146,7 @@ function vier_community_info()
                $r = GContact::suggestionQuery(local_user(), 0, 9);
 
                $tpl = get_markup_template('ch_directory_item.tpl');
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $aside['$comunity_profiles_title'] = L10n::t('Community Profiles');
                        $aside['$comunity_profiles_items'] = [];
 
@@ -177,7 +176,7 @@ function vier_community_info()
                        9
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $aside['$lastusers_title'] = L10n::t('Last users');
                        $aside['$lastusers_items'] = [];
 
@@ -278,7 +277,7 @@ function vier_community_info()
                                        $query .= ",";
                                }
 
-                               $query .= "'".dbesc(normalise_link(trim($helper)))."'";
+                               $query .= "'".DBA::escape(normalise_link(trim($helper)))."'";
                        }
 
                        $r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query);
@@ -383,7 +382,7 @@ function vier_community_info()
 
                $tpl = get_markup_template('ch_connectors.tpl');
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $con_services = [];
                        $con_services['title'] = ["", L10n::t('Connect Services'), "", ""];
                        $aside['$con_services'] = $con_services;