Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convent...

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

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 50e8cd377b8923753425f0bc1b642eefba49026d..da2c08335dae02cb42c3e8579b8d7e33ac1b4cb3 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -9,9 +9,11 @@
  * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
  */
 
-require_once("include/plugin.php");
-require_once("include/socgraph.php");
-require_once("mod/proxy.php");
+use Friendica\App;
+
+require_once "include/plugin.php";
+require_once "include/socgraph.php";
+require_once "mod/proxy.php";
 
 function vier_init(App $a) {
 
@@ -101,8 +103,9 @@ 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",
-                                                                       "probe", "webfinger", "login", "invite", "credits"))) {
+                       "probe", "webfinger", "login", "invite", "credits"))) {
                $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
        }
 }
@@ -110,13 +113,15 @@ EOT;
 function get_vier_config($key, $default = false, $admin = false) {
        if (local_user() AND !$admin) {
                $result = get_pconfig(local_user(), "vier", $key);
-               if ($result !== false)
+               if ($result !== false) {
                        return $result;
+               }
        }
 
        $result = get_config("vier", $key);
-       if ($result !== false)
+       if ($result !== false) {
                return $result;
+       }
 
        return $default;
 }
@@ -131,7 +136,7 @@ function vier_community_info() {
        $show_friends    = get_vier_config("show_friends", 1);
        $show_lastusers  = get_vier_config("show_lastusers", 1);
 
-       //get_baseurl
+       // get_baseurl
        $url = App::get_baseurl($ssl_state);
        $aside['$url'] = $url;
 
@@ -161,7 +166,7 @@ function vier_community_info() {
 
        // last 9 users
        if ($show_lastusers) {
-               $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
+               $publish = (get_config('system', 'publish_all') ? '' : " AND `publish` = 1 ");
                $order = " ORDER BY `register_date` DESC ";
 
                $tpl = get_markup_template('ch_directory_item.tpl');
@@ -191,12 +196,12 @@ function vier_community_info() {
        //right_aside FIND FRIENDS
        if ($show_friends AND local_user()) {
                $nv = array();
-               $nv['title'] = Array("", t('Find Friends'), "", "");
-               $nv['directory'] = Array('directory', t('Local Directory'), "", "");
+               $nv['title'] = array("", t('Find Friends'), "", "");
+               $nv['directory'] = array('directory', t('Local Directory'), "", "");
                $nv['global_directory'] = Array(get_server(), t('Global Directory'), "", "");
-               $nv['match'] = Array('match', t('Similar Interests'), "", "");
-               $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-               $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+               $nv['match'] = array('match', t('Similar Interests'), "", "");
+               $nv['suggest'] = array('suggest', t('Friend Suggestions'), "", "");
+               $nv['invite'] = array('invite', t('Invite Friends'), "", "");
 
                $nv['search'] = '<form name="simple_bar" method="get" action="dirfind">
                                                <span class="sbox_l"></span>
@@ -211,7 +216,7 @@ function vier_community_info() {
        //Community_Pages at right_aside
        if ($show_pages AND local_user()) {
 
-               require_once('include/ForumManager.php');
+               require_once 'include/ForumManager.php';
 
                if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
                        $cid = $_GET['cid'];
@@ -247,7 +252,7 @@ function vier_community_info() {
 
                        $tpl = get_markup_template('widget_forumlist_right.tpl');
 
-                       $page .= replace_macros($tpl,array(
+                       $page .= replace_macros($tpl, array(
                                '$title'          => t('Forums'),
                                '$forums'         => $entries,
                                '$link_desc'      => t('External link to forum'),
@@ -259,9 +264,9 @@ function vier_community_info() {
                        $aside['$page'] = $page;
                }
        }
-       //END Community Page
+       // END Community Page
 
-       //helpers
+       // helpers
        if ($show_helpers) {
                $r = array();
 
@@ -284,14 +289,14 @@ function vier_community_info() {
                foreach ($r AS $index => $helper)
                        $r[$index]["url"] = zrl($helper["url"]);
 
-               $r[] = Array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));
+               $r[] = array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));
 
                $tpl = get_markup_template('ch_helpers.tpl');
 
                if ($r) {
 
                        $helpers = array();
-                       $helpers['title'] = Array("", t('Help'), "", "");
+                       $helpers['title'] = array("", t('Help'), "", "");
 
                        $aside['$helpers_items'] = array();
 
@@ -306,9 +311,9 @@ function vier_community_info() {
                        $aside['$helpers'] = $helpers;
                }
        }
-       //end helpers
+       // end helpers
 
-       //connectable services
+       // connectable services
        if ($show_services) {
 
                /// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
@@ -346,6 +351,7 @@ function vier_community_info() {
                        $r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
                }
 
+               /// @TODO old-lost code (and below)?
                //if (plugin_enabled("ijpost")) {
                //      $r[] = array("photo" => "images/", "name" => "");
                //}
@@ -383,7 +389,7 @@ function vier_community_info() {
                if (dbm::is_result($r)) {
 
                        $con_services = array();
-                       $con_services['title'] = Array("", t('Connect Services'), "", "");
+                       $con_services['title'] = array("", t('Connect Services'), "", "");
                        $aside['$con_services'] = $con_services;
 
                        foreach ($r as $rr) {