X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=b703173bbd9c7484044ff276b4798ba1ccd59dd5;hb=8167e75e6a213db396f2be470801c8a4fda6f0be;hp=4abc9d2a81001cb9e7d33b8a0550b8efc0a0aa98;hpb=daa8e4f9013d3ad329d3deadf8c823bae57bc171;p=friendica.git

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 4abc9d2a81..b703173bbd 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -9,17 +9,20 @@
  * 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;
+use Friendica\Core\System;
 
-function vier_init(&$a) {
+require_once "include/plugin.php";
+require_once "include/socgraph.php";
+require_once "mod/proxy.php";
+
+function vier_init(App $a) {
 
 	$a->theme_events_in_profile = false;
 
 	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";
@@ -36,33 +39,25 @@ function vier_init(&$a) {
 <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />
 <script type="text/javascript">
 
-function insertFormatting(comment,BBcode,id) {
-
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			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);
-			$("#comment-edit-text-" + id).val(tmpStr);
-		}
+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();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else
 		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
 		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
+
 	return true;
 }
 
@@ -101,22 +96,25 @@ EOT;
 	}
 
 	// Hide the left menu bar
-	if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
-									"probe", "webfinger", "login", "invite", "credits"))) {
+	/// @TODO maybe move this static array out where it should belong?
+	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)
+		if ($result !== false) {
 			return $result;
+		}
 	}
 
 	$result = get_config("vier", $key);
-	if ($result !== false)
+	if ($result !== false) {
 		return $result;
+	}
 
 	return $default;
 }
@@ -131,8 +129,8 @@ function vier_community_info() {
 	$show_friends    = get_vier_config("show_friends", 1);
 	$show_lastusers  = get_vier_config("show_lastusers", 1);
 
-	//get_baseurl
-	$url = App::get_baseurl($ssl_state);
+	// get_baseurl
+	$url = System::baseUrl($ssl_state);
 	$aside['$url'] = $url;
 
 	// comunity_profiles
@@ -161,7 +159,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');
@@ -189,14 +187,14 @@ 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'), "", "");
+		$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>
@@ -209,12 +207,13 @@ 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');
+		require_once 'include/ForumManager.php';
 
-		if (x($_GET['cid']) && intval($_GET['cid']) != 0)
+		if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
 			$cid = $_GET['cid'];
+		}
 
 		//sort by last updated item
 		$lastitem = true;
@@ -227,18 +226,18 @@ function vier_community_info() {
 
 			$id = 0;
 
-			foreach($contacts as $contact) {
+			foreach ($contacts as $contact) {
 
 				$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
 				$entry = array(
-					'url' => 'network?f=&cid=' . $contact['id'],
+					'url'          => 'network?f=&cid=' . $contact['id'],
 					'external_url' => 'redir/' . $contact['id'],
-					'name' => $contact['name'],
-					'cid' => $contact['id'],
-					'selected' 	=> $selected,
-					'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
-					'id' => ++$id,
+					'name'         => $contact['name'],
+					'cid'          => $contact['id'],
+					'selected'     => $selected,
+					'micro'        => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+					'id'           => ++$id,
 				);
 				$entries[] = $entry;
 			}
@@ -246,21 +245,21 @@ function vier_community_info() {
 
 			$tpl = get_markup_template('widget_forumlist_right.tpl');
 
-			$page .= replace_macros($tpl,array(
-				'$title'	=> t('Forums'),
-				'$forums'	=> $entries,
-				'$link_desc'	=> t('External link to forum'),
-				'$total'	=> $total,
+			$page .= replace_macros($tpl, array(
+				'$title'          => t('Forums'),
+				'$forums'         => $entries,
+				'$link_desc'      => t('External link to forum'),
+				'$total'          => $total,
 				'$visible_forums' => $visible_forums,
-				'$showmore'	=> t('show more'),
+				'$showmore'       => t('show more'),
 			));
 
 			$aside['$page'] = $page;
 		}
 	}
-	//END Community Page
+	// END Community Page
 
-	//helpers
+	// helpers
 	if ($show_helpers) {
 		$r = array();
 
@@ -283,14 +282,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();
 
@@ -305,9 +304,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)
@@ -345,6 +344,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" => "");
 		//}
@@ -373,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");
 		}
 
@@ -382,7 +382,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) {