aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-03 21:05:39 -0700
committerFriendika <info@friendika.com>2011-08-03 21:05:39 -0700
commitd45a66e700a62626007b05ef1b78dff8f0931210 (patch)
tree38e2d19a744e65b44184885400c0ba33984bec7a
parentad1e827169d9f57c02746b51c5268bdbe2cd8ac9 (diff)
downloadvolse-hubzilla-d45a66e700a62626007b05ef1b78dff8f0931210.tar.gz
volse-hubzilla-d45a66e700a62626007b05ef1b78dff8f0931210.tar.bz2
volse-hubzilla-d45a66e700a62626007b05ef1b78dff8f0931210.zip
allow custom avatar sizes - needed for Diaspora hcard/vcard
-rw-r--r--boot.php18
-rw-r--r--include/items.php5
-rw-r--r--include/text.php6
-rw-r--r--mod/photo.php17
4 files changed, 43 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index b306b1402..9ff17b466 100644
--- 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 8c6134f94..047dd4442 100644
--- 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 a568b7a94..d53a2ceb9 100644
--- 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 9809aa418..3994620f8 100644
--- 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
+}