forumlist: added a "div" for styling reasons

privacy_image_cache: If a picture comes from another picture cache (like facebook) take the original picture

diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php
index 37752462912efccd9a70bc8fdb882b9bad5b5f94..95ae98909bf81e4e81905ae21cf6c0beb7c054a0 100644 (file)
--- a/forumlist/forumlist.php
+++ b/forumlist/forumlist.php
@@ -74,7 +74,7 @@ function forumlist_network_mod_init($a,$b) {
 
        if(count($contacts)) {
                foreach($contacts as $contact) {
-                       $forumlist .= '<a href="' . $a->get_baseurl() . '/redir/' . $contact["id"] . '" title="' . $contact['url'] . '" class="label sparkle" target="external-link"><img class="forumlist-img" height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /></a> <a href="' . $a->get_baseurl() . '/network?f=&cid=' . $contact['id'] . '" >' . $contact["name"]."</a><br />";
+                       $forumlist .= '<div><a href="' . $a->get_baseurl() . '/redir/' . $contact["id"] . '" title="' . $contact['url'] . '" class="label sparkle" target="external-link"><img class="forumlist-img" height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /></a> <a href="' . $a->get_baseurl() . '/network?f=&cid=' . $contact['id'] . '" >' . $contact["name"]."</a></div>";
                }
        }
        else {

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 3be4262088310dbf8751c9ff791d071b115deefa..b9367e49b37244fbbd55ab4a79b5406aa69aa6a8 100644 (file)
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -119,6 +119,15 @@ function privacy_image_cache_init() {
                // It shouldn't happen but it does - spaces in URL
                $_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
 
+               // if the picture seems to be from another picture cache then take the original source
+               $queryvar = privacy_image_cache_parse_query($_REQUEST['url']);
+               if ($queryvar['url'] != "")
+                       $_REQUEST['url'] = urldecode($queryvar['url']);
+
+               // if fetching facebook pictures don't fetch the thumbnail but the big one
+               if (strpos($_REQUEST['url'], ".fbcdn.net/") and (substr($_REQUEST['url'], -6) == "_s.jpg"))
+                       $_REQUEST['url'] = substr($_REQUEST['url'], 0, -6)."_n.jpg";
+
                $img_str = fetch_url($_REQUEST['url'],true);
 
                $tempfile = tempnam(get_config("system","temppath"), "cache");
@@ -372,3 +381,22 @@ function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
         q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"');
     }
 }
+
+function privacy_image_cache_parse_query($var) {
+       /**
+        *  Use this function to parse out the query array element from
+        *  the output of parse_url().
+       */
+       $var  = parse_url($var, PHP_URL_QUERY);
+       $var  = html_entity_decode($var);
+       $var  = explode('&', $var);
+       $arr  = array();
+
+       foreach($var as $val) {
+               $x          = explode('=', $val);
+               $arr[$x[0]] = $x[1];
+       }
+
+       unset($val, $x, $var);
+       return $arr;
+}