aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-04 06:01:15 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-04 06:01:15 +0100
commit8f810a3dcfd60c00b14d3da811e1c0cf005e8ced (patch)
tree07b801766018c60bd58a476bc60e85671bd70706 /include/identity.php
parent36ac48779c85ae324d2d702714677e360af5930d (diff)
parent006efbd906980fca8c0c377fa2b0a4054c2849f4 (diff)
downloadvolse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.tar.gz
volse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.tar.bz2
volse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php51
1 files changed, 37 insertions, 14 deletions
diff --git a/include/identity.php b/include/identity.php
index 037cf5061..4f58d7dc5 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1786,11 +1786,42 @@ function get_zcard($channel,$observer_hash = '',$args = array()) {
logger('get_zcard');
+ $maxwidth = (($args['width']) ? intval($args['width']) : 0);
+ $maxheight = (($args['height']) ? intval($args['height']) : 0);
+
+
+ if(($maxwidth > 1200) || ($maxwidth < 1))
+ $maxwidth = 1200;
+
+ if($maxwidth <= 425) {
+ $width = 425;
+ $size = 'hz_small';
+ $cover_size = PHOTO_RES_COVER_425;
+ $pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m']);
+ }
+ elseif($maxwidth <= 850) {
+ $width = 850;
+ $size = 'hz_medium';
+ $cover_size = PHOTO_RES_COVER_850;
+ $pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 160 , 'height' => 160, 'href' => $channel['xchan_photo_l']);
+ }
+ elseif($maxwidth <= 1200) {
+ $width = 1200;
+ $size = 'hz_large';
+ $cover_size = PHOTO_RES_COVER_1200;
+ $pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l']);
+ }
+
+// $scale = (float) $maxwidth / $width;
+// $translate = intval(($scale / 1.0) * 100);
+
+
$channel['channel_addr'] = $channel['channel_address'] . '@' . get_app()->get_hostname();
+ $zcard = array('chan' => $channel);
$r = q("select height, width, resource_id, scale, type from photo where uid = %d and scale = %d and photo_usage = %d",
intval($channel['channel_id']),
- intval(PHOTO_RES_COVER_1200),
+ intval($cover_size),
intval(PHOTO_COVER)
);
@@ -1798,23 +1829,15 @@ function get_zcard($channel,$observer_hash = '',$args = array()) {
$cover = $r[0];
$cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale'];
}
+ else {
+ // @fixme remove this when we have a fallback cover photo and use that instead.
+ return;
+ }
- $pphoto = array('type' => $channel['xchan_photo_mimetype'],
- 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l']);
-
- $maxwidth = (($args['width']) ? intval($args['width']) : 0);
- $maxheight = (($args['height']) ? intval($args['height']) : 0);
-
- $zcard = array('chan' => $channel);
- if(($maxwidth > 1200) || ($maxwidth < 1))
- $maxwidth = 1200;
- $scale = (float) $maxwidth / 1200;
-
- $translate = intval(($scale / 1.0) * 100);
-
$o .= replace_macros(get_markup_template('zcard.tpl'),array(
'$scale' => $scale,
'$translate' => $translate,
+ '$size' => $size,
'$cover' => $cover,
'$pphoto' => $pphoto,
'$zcard' => $zcard