allow custom avatar sizes - needed for Diaspora hcard/vcard

diff --git a/boot.php b/boot.php
index b306b140298fef07cc58ac94151cab900b19d1e5..9ff17b4666fd4f432e73c8edf6155aae1e4a7e33 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -877,7 +877,9 @@ function profile_sidebar($profile) {
        $podloc = $a->get_baseurl();
        $searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' );
        $nickname = $profile['nick'];
-       $dphoto = $profile['photo'];
+       $photo300 = $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg';
+       $photo100 = $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg';
+       $photo50  = $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg';
 
        $diaspora_vcard = <<< EOT
 
@@ -897,7 +899,19 @@ function profile_sidebar($profile) {
 <dl class="entity_photo">
 <dt>Photo</dt>
 <dd>
-<img class="photo avatar" height="175px" src="$dphoto" width='175px'>
+<img class="photo avatar" height="300px" width="300px" src="$photo300">
+</dd>
+</dl>
+<dl class="entity_photo_medium">
+<dt>Photo</dt>
+<dd> 
+<img class="photo avatar" height="100px" width="100px" src="$photo100">
+</dd>
+</dl>
+<dl class="entity_photo_small">
+<dt>Photo</dt>
+<dd>
+<img class="photo avatar" height="50px" width="50px" src="$photo50">
 </dd>
 </dl>
 <dl class='entity_searchable'>

diff --git a/include/items.php b/include/items.php
index 8c6134f94f7fa205e56a581cef1ed7be1aea88c2..047dd4442b9edb575935f88cc7c6402dae3a63f8 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -995,6 +995,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 
        require_once('library/simplepie/simplepie.inc');
 
+       if(! strlen($xml)) {
+               logger('consume_feed: empty input');
+               return;
+       }
+               
        $feed = new SimplePie();
        $feed->set_raw_data($xml);
        if($datedir)

diff --git a/include/text.php b/include/text.php
index a568b7a948ad7861735e0db47cedbbea36c3f684..d53a2ceb9ae7905a554af14cabd4e3d8a14598c1 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -732,6 +732,9 @@ function link_compare($a,$b) {
        return false;
 }}
 
+// Given an item array, convert the body element from bbcode to html and add smilie icons.
+// If attach is true, also add icons for item attachments
+
 
 if(! function_exists('prepare_body')) {
 function prepare_body($item,$attach = false) {
@@ -771,6 +774,9 @@ function prepare_body($item,$attach = false) {
        return $s;
 }}
 
+
+// Given a text string, convert from bbcode to html and add smilie icons.
+
 if(! function_exists('prepare_text')) {
 function prepare_text($text) {
 

diff --git a/mod/photo.php b/mod/photo.php
index 9809aa418de296d9c7b55581b8f2480701743d2c..3994620f89cfcd1e3fb1253cdfa7bb9bf1290097 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -5,6 +5,11 @@ require_once('include/security.php');
 function photo_init(&$a) {
 
        switch($a->argc) {
+               case 4:
+                       $person = $a->argv[3];
+                       $customres = intval($a->argv[2]);
+                       $type = $a->argv[1];
+                       break;
                case 3:
                        $person = $a->argv[2];
                        $type = $a->argv[1];
@@ -29,6 +34,7 @@ function photo_init(&$a) {
                switch($type) {
 
                        case 'profile':
+                       case 'custom':
                                $resolution = 4;
                                break;
                        case 'micro':
@@ -113,8 +119,17 @@ function photo_init(&$a) {
                // NOTREACHED
        }
 
+       if(intval($customres) && $customres > 0 && $customres < 500) {
+               require_once('include/Photo.php');
+               $ph = new Photo($data);
+               if($ph->is_valid()) {
+                       $ph->scaleImageSquare($customres);
+                       $data = $ph->imageString();
+               }
+       }
+
        header("Content-type: image/jpeg");
        echo $data;
        killme();
        // NOTREACHED
-}
\ No newline at end of file
+}