X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=2533e50a8916630b75c49f2ab2b6fc8954b0d604;hb=b9325251e89db94439a670a32cd1d00f3db848d3;hp=26066ccb048c9d8ccd06b99536682d946437d5bb;hpb=cb612c712da10948266ad0b47a70f1e179ca4c90;p=friendica.git

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 26066ccb04..fcbb148dc7 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -11,61 +11,38 @@
 
 use Friendica\App;
 use Friendica\Content\ForumManager;
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Core\Addon;
+use Friendica\Core\Renderer;
+use Friendica\Core\Search;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
-
-require_once "include/plugin.php";
-require_once "mod/proxy.php";
-
-function vier_init(App $a) {
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
+function vier_init(App $a)
+{
 	$a->theme_events_in_profile = false;
 
-	$a->set_template_engine('smarty3');
+	Renderer::setActiveTemplateEngine('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] . ($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";
+		DI::page()['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
 	}
 
-	if ($a->is_mobile || $a->is_tablet) {
-		$a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
-		$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
+	if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
+		DI::page()['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
+		DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
 	}
 	/// @todo deactivated since it doesn't work with desktop browsers at the moment
-	//$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
+	//DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
 
-	$a->page['htmlhead'] .= <<< EOT
+	DI::page()['htmlhead'] .= <<< EOT
 <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />
 <script type="text/javascript">
-
-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();
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-
-	return true;
-}
-
 function showThread(id) {
 	$("#collapsed-comments-" + id).show()
 	$("#collapsed-comments-" + id + " .collapsed-comments").show()
@@ -84,8 +61,8 @@ function cmtBbClose(id) {
 </script>
 EOT;
 
-	if ($a->is_mobile || $a->is_tablet){
-		$a->page['htmlhead'] .= <<< EOT
+	if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
+		DI::page()['htmlhead'] .= <<< EOT
 <script>
 	$(document).ready(function() {
 		$(".mobile-aside-toggle a").click(function(e){
@@ -102,21 +79,22 @@ 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], array("community", "events", "help", "manage", "notifications",
-			"probe", "webfinger", "login", "invite", "credits"))) {
-		$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
+	if (empty(DI::page()['aside']) && in_array($a->argv[0], ["community", "events", "help", "delegation", "notifications",
+			"probe", "webfinger", "login", "invite", "credits"])) {
+		DI::page()['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
 	}
 }
 
-function get_vier_config($key, $default = false, $admin = false) {
+function get_vier_config($key, $default = false, $admin = false)
+{
 	if (local_user() && !$admin) {
-		$result = PConfig::get(local_user(), "vier", $key);
+		$result = DI::pConfig()->get(local_user(), "vier", $key);
 		if (!is_null($result)) {
 			return $result;
 		}
 	}
 
-	$result = Config::get("vier", $key);
+	$result = DI::config()->get("vier", $key);
 	if (!is_null($result)) {
 		return $result;
 	}
@@ -124,8 +102,9 @@ function get_vier_config($key, $default = false, $admin = false) {
 	return $default;
 }
 
-function vier_community_info() {
-	$a = get_app();
+function vier_community_info()
+{
+	$a = DI::app();
 
 	$show_pages      = get_vier_config("show_pages", 1);
 	$show_profiles   = get_vier_config("show_profiles", 1);
@@ -135,27 +114,25 @@ function vier_community_info() {
 	$show_lastusers  = get_vier_config("show_lastusers", 1);
 
 	// get_baseurl
-	$url = System::baseUrl($ssl_state);
+	$url = DI::baseUrl();
 	$aside['$url'] = $url;
 
 	// comunity_profiles
 	if ($show_profiles) {
 		$r = GContact::suggestionQuery(local_user(), 0, 9);
 
-		$tpl = get_markup_template('ch_directory_item.tpl');
-		if (DBM::is_result($r)) {
-
-			$aside['$comunity_profiles_title'] = t('Community Profiles');
-			$aside['$comunity_profiles_items'] = array();
+		$tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
+		if (DBA::isResult($r)) {
+			$aside['$comunity_profiles_title'] = DI::l10n()->t('Community Profiles');
+			$aside['$comunity_profiles_items'] = [];
 
 			foreach ($r as $rr) {
-				$entry = replace_macros($tpl,array(
+				$entry = Renderer::replaceMacros($tpl, [
 					'$id' => $rr['id'],
-					//'$profile_link' => Profile::zrl($rr['url']),
 					'$profile_link' => 'follow/?url='.urlencode($rr['url']),
-					'$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_MICRO),
+					'$photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_MICRO),
 					'$alt_text' => $rr['name'],
-				));
+				]);
 				$aside['$comunity_profiles_items'][] = $entry;
 			}
 		}
@@ -163,28 +140,29 @@ function vier_community_info() {
 
 	// last 9 users
 	if ($show_lastusers) {
-		$publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ");
+		$publish = (DI::config()->get('system', 'publish_all') ? '' : "`publish` = 1");
 		$order = " ORDER BY `register_date` DESC ";
 
-		$tpl = get_markup_template('ch_directory_item.tpl');
+		$tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
 
-		$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
+		$r = q("SELECT `profile`.*, `user`.`nickname`
 				FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
-				0, 9);
+				WHERE $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
+			0,
+			9
+		);
 
-		if (DBM::is_result($r)) {
-
-			$aside['$lastusers_title'] = t('Last users');
-			$aside['$lastusers_items'] = array();
+		if (DBA::isResult($r)) {
+			$aside['$lastusers_title'] = DI::l10n()->t('Last users');
+			$aside['$lastusers_items'] = [];
 
 			foreach ($r as $rr) {
-				$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-				$entry = replace_macros($tpl,array(
+				$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['uid']);
+				$entry = Renderer::replaceMacros($tpl, [
 					'$id' => $rr['id'],
 					'$profile_link' => $profile_link,
-					'$photo' => $a->remove_baseurl($rr['thumb']),
-					'$alt_text' => $rr['name']));
+					'$photo' => DI::baseUrl()->remove($rr['thumb']),
+					'$alt_text' => $rr['name']]);
 				$aside['$lastusers_items'][] = $entry;
 			}
 		}
@@ -192,29 +170,26 @@ function vier_community_info() {
 
 	//right_aside FIND FRIENDS
 	if ($show_friends && local_user()) {
-		$nv = array();
-		$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['search'] = '<form name="simple_bar" method="get" action="dirfind">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
+		$nv = [];
+		$nv['findpeople'] = DI::l10n()->t('Find People');
+		$nv['desc'] = DI::l10n()->t('Enter name or interest');
+		$nv['label'] = DI::l10n()->t('Connect/Follow');
+		$nv['hint'] = DI::l10n()->t('Examples: Robert Morgenstein, Fishing');
+		$nv['findthem'] = DI::l10n()->t('Find');
+		$nv['suggest'] = DI::l10n()->t('Friend Suggestions');
+		$nv['similar'] = DI::l10n()->t('Similar Interests');
+		$nv['random'] = DI::l10n()->t('Random Profile');
+		$nv['inv'] = DI::l10n()->t('Invite Friends');
+		$nv['directory'] = DI::l10n()->t('Global Directory');
+		$nv['global_dir'] = Search::getGlobalDirectory();
+		$nv['local_directory'] = DI::l10n()->t('Local Directory');
 
 		$aside['$nv'] = $nv;
 	}
 
 	//Community_Pages at right_aside
 	if ($show_pages && local_user()) {
-		if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
-			$cid = $_GET['cid'];
-		}
+		$cid = $_GET['cid'] ?? null;
 
 		//sort by last updated item
 		$lastitem = true;
@@ -229,30 +204,30 @@ function vier_community_info() {
 			foreach ($contacts as $contact) {
 				$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
-				$entry = array(
-					'url'          => 'network?f=&cid=' . $contact['id'],
-					'external_url' => 'redir/' . $contact['id'],
+				$entry = [
+					'url'          => 'network?cid=' . $contact['id'],
+					'external_url' => Contact::magicLink($contact['url']),
 					'name'         => $contact['name'],
 					'cid'          => $contact['id'],
 					'selected'     => $selected,
-					'micro'        => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+					'micro'        => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
 					'id'           => ++$id,
-				);
+				];
 				$entries[] = $entry;
 			}
 
 
-			$tpl = get_markup_template('widget_forumlist_right.tpl');
+			$tpl = Renderer::getMarkupTemplate('widget_forumlist_right.tpl');
 
-			$page .= replace_macros(
+			$page = Renderer::replaceMacros(
 				$tpl,
-				array(
-					'$title'          => t('Forums'),
+				[
+					'$title'          => DI::l10n()->t('Forums'),
 					'$forums'         => $entries,
-					'$link_desc'      => t('External link to forum'),
+					'$link_desc'      => DI::l10n()->t('External link to forum'),
 					'$total'          => $total,
 					'$visible_forums' => $visible_forums,
-					'$showmore'       => t('show more'))
+					'$showmore'       => DI::l10n()->t('show more')]
 			);
 
 			$aside['$page'] = $page;
@@ -262,43 +237,44 @@ function vier_community_info() {
 
 	// helpers
 	if ($show_helpers) {
-		$r = array();
+		$r = [];
 
-		$helperlist = Config::get("vier", "helperlist");
+		$helperlist = DI::config()->get("vier", "helperlist");
 
-		$helpers = explode(",",$helperlist);
+		$helpers = explode(",", $helperlist);
 
 		if ($helpers) {
 			$query = "";
-			foreach ($helpers AS $index=>$helper) {
-				if ($query != "")
+			foreach ($helpers as $index => $helper) {
+				if ($query != "") {
 					$query .= ",";
+				}
 
-				$query .= "'".dbesc(normalise_link(trim($helper)))."'";
+				$query .= "'".DBA::escape(Strings::normaliseLink(trim($helper)))."'";
 			}
 
 			$r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query);
 		}
 
-		foreach ($r AS $index => $helper)
-			$r[$index]["url"] = Profile::zrl($helper["url"]);
+		foreach ($r as $index => $helper) {
+			$r[$index]["url"] = Contact::magicLink($helper["url"]);
+		}
 
-		$r[] = array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));
+		$r[] = ["url" => "help/Quick-Start-guide", "name" => DI::l10n()->t("Quick Start")];
 
-		$tpl = get_markup_template('ch_helpers.tpl');
+		$tpl = Renderer::getMarkupTemplate('ch_helpers.tpl');
 
 		if ($r) {
+			$helpers = [];
+			$helpers['title'] = ["", DI::l10n()->t('Help'), "", ""];
 
-			$helpers = array();
-			$helpers['title'] = array("", t('Help'), "", "");
-
-			$aside['$helpers_items'] = array();
+			$aside['$helpers_items'] = [];
 
 			foreach ($r as $rr) {
-				$entry = replace_macros($tpl,array(
+				$entry = Renderer::replaceMacros($tpl, [
 					'$url' => $rr['url'],
 					'$title' => $rr['name'],
-				));
+				]);
 				$aside['$helpers_items'][] = $entry;
 			}
 
@@ -309,97 +285,104 @@ function vier_community_info() {
 
 	// connectable services
 	if ($show_services) {
-
 		/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
-		$r = array();
+		$r = [];
 
-		if (plugin_enabled("appnet")) {
-			$r[] = array("photo" => "images/appnet.png", "name" => "App.net");
+		if (Addon::isEnabled("buffer")) {
+			$r[] = ["photo" => "images/buffer.png", "name" => "Buffer"];
 		}
 
-		if (plugin_enabled("buffer")) {
-			$r[] = array("photo" => "images/buffer.png", "name" => "Buffer");
+		if (Addon::isEnabled("blogger")) {
+			$r[] = ["photo" => "images/blogger.png", "name" => "Blogger"];
 		}
 
-		if (plugin_enabled("blogger")) {
-			$r[] = array("photo" => "images/blogger.png", "name" => "Blogger");
+		if (Addon::isEnabled("dwpost")) {
+			$r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"];
 		}
 
-		if (plugin_enabled("dwpost")) {
-			$r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth");
+		if (Addon::isEnabled("ifttt")) {
+			$r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"];
 		}
 
-		if (plugin_enabled("fbpost")) {
-			$r[] = array("photo" => "images/facebook.png", "name" => "Facebook");
-		}
-
-		if (plugin_enabled("ifttt")) {
-			$r[] = array("photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT");
-		}
-
-		if (plugin_enabled("statusnet")) {
-			$r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social");
-		}
-
-		if (plugin_enabled("gpluspost")) {
-			$r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
+		if (Addon::isEnabled("statusnet")) {
+			$r[] = ["photo" => "images/gnusocial.png", "name" => "GNU Social"];
 		}
 
 		/// @TODO old-lost code (and below)?
-		//if (plugin_enabled("ijpost")) {
+		//if (Addon::isEnabled("ijpost")) {
 		//	$r[] = array("photo" => "images/", "name" => "");
 		//}
 
-		if (plugin_enabled("libertree")) {
-			$r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
+		if (Addon::isEnabled("libertree")) {
+			$r[] = ["photo" => "images/libertree.png", "name" => "Libertree"];
 		}
 
-		//if (plugin_enabled("ljpost")) {
+		//if (Addon::isEnabled("ljpost")) {
 		//	$r[] = array("photo" => "images/", "name" => "");
 		//}
 
-		if (plugin_enabled("pumpio")) {
-			$r[] = array("photo" => "images/pumpio.png", "name" => "pump.io");
+		if (Addon::isEnabled("pumpio")) {
+			$r[] = ["photo" => "images/pumpio.png", "name" => "pump.io"];
 		}
 
-		if (plugin_enabled("tumblr")) {
-			$r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr");
+		if (Addon::isEnabled("tumblr")) {
+			$r[] = ["photo" => "images/tumblr.png", "name" => "Tumblr"];
 		}
 
-		if (plugin_enabled("twitter")) {
-			$r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
+		if (Addon::isEnabled("twitter")) {
+			$r[] = ["photo" => "images/twitter.png", "name" => "Twitter"];
 		}
 
-		if (plugin_enabled("wppost")) {
-			$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
+		if (Addon::isEnabled("wppost")) {
+			$r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
 		}
 
-		if (function_exists("imap_open") && !Config::get("system","imap_disabled") && !Config::get("system","dfrn_only")) {
-			$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
+		if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled") && !DI::config()->get("system", "dfrn_only")) {
+			$r[] = ["photo" => "images/mail.png", "name" => "E-Mail"];
 		}
 
-		$tpl = get_markup_template('ch_connectors.tpl');
-
-		if (DBM::is_result($r)) {
+		$tpl = Renderer::getMarkupTemplate('ch_connectors.tpl');
 
-			$con_services = array();
-			$con_services['title'] = array("", t('Connect Services'), "", "");
+		if (DBA::isResult($r)) {
+			$con_services = [];
+			$con_services['title'] = ["", DI::l10n()->t('Connect Services'), "", ""];
 			$aside['$con_services'] = $con_services;
 
 			foreach ($r as $rr) {
-				$entry = replace_macros($tpl,array(
+				$entry = Renderer::replaceMacros($tpl, [
 					'$url' => $url,
 					'$photo' => $rr['photo'],
 					'$alt_text' => $rr['name'],
-				));
+				]);
 				$aside['$connector_items'][] = $entry;
 			}
 		}
-
 	}
 	//end connectable services
 
 	//print right_aside
-	$tpl = get_markup_template('communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
+	$tpl = Renderer::getMarkupTemplate('communityhome.tpl');
+	DI::page()['right_aside'] = Renderer::replaceMacros($tpl, $aside);
+}
+
+/**
+ * @param int|null $uid
+ * @return null
+ * @see \Friendica\Core\Theme::getBackgroundColor()
+ * @TODO Implement this function
+ */
+function vier_get_background_color(int $uid = null)
+{
+	return null;
+}
+
+/**
+ * @param int|null $uid
+ * @return null
+ * @see \Friendica\Core\Theme::getThemeColor()
+ * @TODO Implement this function
+ */
+function vier_get_theme_color(int $uid = null)
+{
+	return null;
 }