From: Michael Vogel <icarus@dabo.de>
Date: Wed, 28 Jan 2015 22:34:46 +0000 (+0100)
Subject: And yet another two places where pictures have to be sent through the proxy.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=036ccf84de010db0f464749fdb0322b5405c8356;p=friendica.git

And yet another two places where pictures have to be sent through the proxy.
---

diff --git a/mod/contacts.php b/mod/contacts.php
index 047dc1ea90..300331a9dc 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -3,6 +3,7 @@
 require_once('include/Contact.php');
 require_once('include/socgraph.php');
 require_once('include/contact_selectors.php');
+require_once('mod/proxy.php');
 
 function contacts_init(&$a) {
 	if(! local_user())
@@ -73,12 +74,12 @@ function contacts_init(&$a) {
 function contacts_batch_actions(&$a){
 	$contacts_id = $_POST['contact_batch'];
 	if (!is_array($contacts_id)) return;
-	
+
 	$orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
 		implode(",", $contacts_id),
 		intval(local_user())
 	);
-	
+
 	$count_actions=0;
 	foreach($orig_records as $orig_record) {
 		$contact_id = $orig_record['id'];
@@ -106,7 +107,7 @@ function contacts_batch_actions(&$a){
 	if ($count_actions>0) {
 		info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) );
 	}
-	
+
 	if(x($_SESSION,'return_url'))
 		goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
 	else
@@ -623,11 +624,11 @@ function contacts_content(&$a) {
 
 	if($nets)
 		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
- 
-	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
 
-	
-	$r = q("SELECT COUNT(*) AS `total` FROM `contact` 
+	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
+
+
+	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 		WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid']));
 	if(count($r)) {
@@ -681,7 +682,7 @@ function contacts_content(&$a) {
 				'id' => $rr['id'],
 				'alt_text' => $alt_text,
 				'dir_icon' => $dir_icon,
-				'thumb' => $rr['thumb'],
+				'thumb' => proxy_url($rr['thumb']),
 				'name' => $rr['name'],
 				'username' => $rr['name'],
 				'sparkle' => $sparkle,
diff --git a/mod/display.php b/mod/display.php
index f2fde57878..374de6cacc 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -94,8 +94,8 @@ function display_fetchauthor($a, $item) {
 		normalise_link($profiledata["url"]), $item["uid"]);
 	if (count($r)) {
 		$profiledata["photo"] = proxy_url($r[0]["photo"]);
-		$profiledata["address"] = bbcode($r[0]["location"]);
-		$profiledata["about"] = bbcode($r[0]["about"]);
+		$profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"]));
+		$profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"]));
 		if ($r[0]["nick"] != "")
 			$profiledata["nickname"] = $r[0]["nick"];
 	}
@@ -106,9 +106,9 @@ function display_fetchauthor($a, $item) {
 		if ($profiledata["photo"] == "")
 			$profiledata["photo"] = proxy_url($r[0]["avatar"]);
 		if ($profiledata["address"] == "")
-			$profiledata["address"] = bbcode($r[0]["location"]);
+			$profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"]));
 		if ($profiledata["about"] == "")
-			$profiledata["about"] = bbcode($r[0]["about"]);
+			$profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"]));
 		if (($profiledata["nickname"] == "") AND ($r[0]["nick"] != ""))
 			$profiledata["nickname"] = $r[0]["nick"];
 	}
@@ -172,8 +172,8 @@ function display_fetchauthor($a, $item) {
 			$r = q("SELECT `avatar`, `nick`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($profiledata["url"]));
 			if (count($r)) {
 				$profiledata["photo"] = proxy_url($r[0]["avatar"]);
-				$profiledata["address"] = bbcode($r[0]["location"]);
-				$profiledata["about"] = bbcode($r[0]["about"]);
+				$profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"]));
+				$profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"]));
 				if ($r[0]["nick"] != "")
 					$profiledata["nickname"] = $r[0]["nick"];
 			}