fix some more HTML violations in posted_date_widget.tpl

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

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 269b34460ceba151b0603b129c16fda6c8202472..b703173bbd9c7484044ff276b4798ba1ccd59dd5 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -10,6 +10,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once "include/plugin.php";
 require_once "include/socgraph.php";
@@ -21,7 +22,7 @@ function vier_init(App $a) {
 
        set_template_engine($a, 'smarty3');
 
-       if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()) {
+       if ($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";
@@ -96,14 +97,14 @@ EOT;
 
        // Hide the left menu bar
        /// @TODO maybe move this static array out where it should belong?
-       if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
+       if (($a->page['aside'] == "") && in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
                        "probe", "webfinger", "login", "invite", "credits"))) {
                $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
        }
 }
 
 function get_vier_config($key, $default = false, $admin = false) {
-       if (local_user() AND !$admin) {
+       if (local_user() && !$admin) {
                $result = get_pconfig(local_user(), "vier", $key);
                if ($result !== false) {
                        return $result;
@@ -129,7 +130,7 @@ function vier_community_info() {
        $show_lastusers  = get_vier_config("show_lastusers", 1);
 
        // get_baseurl
-       $url = App::get_baseurl($ssl_state);
+       $url = System::baseUrl($ssl_state);
        $aside['$url'] = $url;
 
        // comunity_profiles
@@ -186,7 +187,7 @@ function vier_community_info() {
        }
 
        //right_aside FIND FRIENDS
-       if ($show_friends AND local_user()) {
+       if ($show_friends && local_user()) {
                $nv = array();
                $nv['title'] = array("", t('Find Friends'), "", "");
                $nv['directory'] = array('directory', t('Local Directory'), "", "");
@@ -206,7 +207,7 @@ function vier_community_info() {
        }
 
        //Community_Pages at right_aside
-       if ($show_pages AND local_user()) {
+       if ($show_pages && local_user()) {
 
                require_once 'include/ForumManager.php';
 
@@ -235,7 +236,7 @@ function vier_community_info() {
                                        'name'         => $contact['name'],
                                        'cid'          => $contact['id'],
                                        'selected'     => $selected,
-                                       'micro'        => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+                                       'micro'        => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
                                        'id'           => ++$id,
                                );
                                $entries[] = $entry;
@@ -372,7 +373,7 @@ function vier_community_info() {
                        $r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
                }
 
-               if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) {
+               if (function_exists("imap_open") && !get_config("system","imap_disabled") && !get_config("system","dfrn_only")) {
                        $r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
                }