clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Continued with CR: 

- added spaces as requested
- removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2017-03-31 21:04:08 +02:00
parent d4e67338d8
commit 60552260e1
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
view/theme/vier/theme.php
View File

@ -9,9 +9,9 @@
* Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/ * 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/plugin.php";
require_once("include/socgraph.php"); require_once "include/socgraph.php";
require_once("mod/proxy.php"); require_once "mod/proxy.php";
function vier_init(App $a) { function vier_init(App $a) {
@ -101,6 +101,7 @@ EOT;
} }
// Hide the left menu bar // 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'] == "") 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' />"; $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
@ -110,13 +111,15 @@ EOT;
function get_vier_config($key, $default = false, $admin = false) { function get_vier_config($key, $default = false, $admin = false) {
if (local_user() AND !$admin) { if (local_user() AND !$admin) {
$result = get_pconfig(local_user(), "vier", $key); $result = get_pconfig(local_user(), "vier", $key);
if ($result !== false) if ($result !== false) {
return $result; return $result;
} }
}
$result = get_config("vier", $key); $result = get_config("vier", $key);
if ($result !== false) if ($result !== false) {
return $result; return $result;
}
return $default; return $default;
} }
@ -191,12 +194,12 @@ function vier_community_info() {
//right_aside FIND FRIENDS //right_aside FIND FRIENDS
if ($show_friends AND local_user()) { if ($show_friends AND local_user()) {
$nv = array(); $nv = array();
$nv['title'] = Array("", t('Find Friends'), "", ""); $nv['title'] = array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", ""); $nv['directory'] = array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array(get_server(), t('Global Directory'), "", ""); $nv['global_directory'] = Array(get_server(), t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['match'] = array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['suggest'] = array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", ""); $nv['invite'] = array('invite', t('Invite Friends'), "", "");
$nv['search'] = '<form name="simple_bar" method="get" action="dirfind"> $nv['search'] = '<form name="simple_bar" method="get" action="dirfind">
<span class="sbox_l"></span> <span class="sbox_l"></span>
@ -211,7 +214,7 @@ function vier_community_info() {
//Community_Pages at right_aside //Community_Pages at right_aside
if ($show_pages AND local_user()) { if ($show_pages AND local_user()) {
require_once('include/ForumManager.php'); require_once 'include/ForumManager.php';
if (x($_GET, 'cid') && intval($_GET['cid']) != 0) { if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
$cid = $_GET['cid']; $cid = $_GET['cid'];
@ -284,14 +287,14 @@ function vier_community_info() {
foreach ($r AS $index => $helper) foreach ($r AS $index => $helper)
$r[$index]["url"] = zrl($helper["url"]); $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'); $tpl = get_markup_template('ch_helpers.tpl');
if ($r) { if ($r) {
$helpers = array(); $helpers = array();
$helpers['title'] = Array("", t('Help'), "", ""); $helpers['title'] = array("", t('Help'), "", "");
$aside['$helpers_items'] = array(); $aside['$helpers_items'] = array();
@ -346,6 +349,7 @@ function vier_community_info() {
$r[] = array("photo" => "images/googleplus.png", "name" => "Google+"); $r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
} }
/// @TODO old-lost code (and below)?
//if (plugin_enabled("ijpost")) { //if (plugin_enabled("ijpost")) {
// $r[] = array("photo" => "images/", "name" => ""); // $r[] = array("photo" => "images/", "name" => "");
//} //}
@ -383,7 +387,7 @@ function vier_community_info() {
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$con_services = array(); $con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", ""); $con_services['title'] = array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services; $aside['$con_services'] = $con_services;
foreach ($r as $rr) { foreach ($r as $rr) {