Merge pull request #1325 from annando/1501-more-stuff-to-proxy

Just two more places where pictures have to be send through the proxy

diff --git a/include/text.php b/include/text.php
index 9fef4aebb59f761ae4bd81aadd342f5d8eaefc86..b45c2765eb378547e3f7f1ff7c4a2093d9b74331 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -2,6 +2,7 @@
 
 require_once("include/template_processor.php");
 require_once("include/friendica_smarty.php");
+require_once("mod/proxy.php");
 
 if(! function_exists('replace_macros')) {
 /**
@@ -928,7 +929,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                        . (($click) ? ' fakelink' : '') . '" '
                        . (($redir) ? ' target="redir" ' : '')
                        . (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="'
-                       . $contact['micro'] . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
+                       . proxy_url($contact['micro']) . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
                        . '" /></a></div>' . "\r\n";
        }
 }}

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 8e261e71151d1e23e706ceabd89026779caa45c7..3a6c48a3b2fab619688999c7e751796785ce2456 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -13,6 +13,8 @@ function viewcontacts_init(&$a) {
 
 function viewcontacts_content(&$a) {
 
+       require_once("mod/proxy.php");
+
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
@@ -21,7 +23,7 @@ function viewcontacts_content(&$a) {
        if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
                notice( t('Permission denied.') . EOL);
                return;
-       } 
+       }
 
 
        $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ",
@@ -60,7 +62,7 @@ function viewcontacts_content(&$a) {
                $contacts[] = array(
                        'id' => $rr['id'],
                        'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
-                       'thumb' => $rr['thumb'], 
+                       'thumb' => proxy_url($rr['thumb']),
                        'name' => substr($rr['name'],0,20),
                        'username' => $rr['name'],
                        'url' => $url,