diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-20 09:40:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-20 09:40:32 +0200 |
| commit | 96f23758b4c0e2b997a8c3579639a57f5c533649 (patch) | |
| tree | 22342fb92a56086ac37fca13433b56d42acbe30a | |
| parent | f00887ea42e04caecb9cbc56d92c2e70513768af (diff) | |
| download | volse-hubzilla-96f23758b4c0e2b997a8c3579639a57f5c533649.tar.gz volse-hubzilla-96f23758b4c0e2b997a8c3579639a57f5c533649.tar.bz2 volse-hubzilla-96f23758b4c0e2b997a8c3579639a57f5c533649.zip | |
hubzilla photo object compatibility
| -rw-r--r-- | include/ItemObject.php | 16 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 5 |
2 files changed, 20 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index d5601edf5..0add87510 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -263,7 +263,19 @@ class Item extends BaseObject { localize_item($item); - $body = prepare_body($item,true); + + $is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false); + if($is_photo) { + $object = json_decode($item['object'],true); + $photo = array( + 'url' => rawurldecode($object['id']) . '?zid=' . $observer['xchan_addr'], + 'link' => rawurldecode(get_rel_link($object['link'],'alternate')) . '?zid=' . $observer['xchan_addr'], + 'width' => $object['width'], + 'height' => $object['height'] + ); + } + + $body .= prepare_body($item,true); // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link // since we can't depend on llink or plink pointing to the right local location. @@ -323,6 +335,8 @@ class Item extends BaseObject { 'owner_url' => $this->get_owner_url(), 'owner_photo' => $this->get_owner_photo(), 'owner_name' => $this->get_owner_name(), + 'is_photo' => $is_photo, + 'photo' => (($is_photo) ? $photo : ''), // Item toolbar buttons 'like' => $like, diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 30a007bd6..c16e7d6a6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -33,6 +33,11 @@ <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > + {{if $item.is_photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + <a href="{{$item.photo.link}}"><img style="max-width:{{$item.photo.width}}px; width:100%; height:auto;" src={{$item.photo.url}}></a> + </div> + {{/if}} {{$item.body}} {{if $item.tags}} <div class="body-tag"> |