Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
This commit is contained in:
commit
28906bf50a
108
Zotlabs/Widget/Portfolio.php
Normal file
108
Zotlabs/Widget/Portfolio.php
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Zotlabs\Widget;
|
||||||
|
|
||||||
|
require_once('include/attach.php');
|
||||||
|
|
||||||
|
class Portfolio {
|
||||||
|
|
||||||
|
function widget($args) {
|
||||||
|
|
||||||
|
|
||||||
|
$owner_uid = \App::$profile_uid;
|
||||||
|
$sql_extra = permissions_sql($owner_uid);
|
||||||
|
|
||||||
|
|
||||||
|
if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage'))
|
||||||
|
return '';
|
||||||
|
|
||||||
|
if($args['album'])
|
||||||
|
$album = $args['album'];
|
||||||
|
if($args['title'])
|
||||||
|
$title = $args['title'];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This may return incorrect permissions if you have multiple directories of the same name.
|
||||||
|
* It is a limitation of the photo table using a name for a photo album instead of a folder hash
|
||||||
|
*/
|
||||||
|
|
||||||
|
if($album) {
|
||||||
|
$x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
|
||||||
|
dbesc($album),
|
||||||
|
intval($owner_uid)
|
||||||
|
);
|
||||||
|
if($x) {
|
||||||
|
$y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
|
||||||
|
if(! $y)
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$order = 'DESC';
|
||||||
|
|
||||||
|
$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
|
||||||
|
(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
|
||||||
|
ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
|
||||||
|
ORDER BY created $order ",
|
||||||
|
intval($owner_uid),
|
||||||
|
dbesc($album),
|
||||||
|
intval(PHOTO_NORMAL),
|
||||||
|
intval(PHOTO_PROFILE)
|
||||||
|
);
|
||||||
|
|
||||||
|
//edit album name
|
||||||
|
$album_edit = null;
|
||||||
|
|
||||||
|
$photos = array();
|
||||||
|
if($r) {
|
||||||
|
$twist = 'rotright';
|
||||||
|
foreach($r as $rr) {
|
||||||
|
|
||||||
|
if($twist == 'rotright')
|
||||||
|
$twist = 'rotleft';
|
||||||
|
else
|
||||||
|
$twist = 'rotright';
|
||||||
|
|
||||||
|
$ext = $phototypes[$rr['mimetype']];
|
||||||
|
|
||||||
|
$imgalt_e = $rr['filename'];
|
||||||
|
$desc_e = $rr['description'];
|
||||||
|
|
||||||
|
$imagelink = (z_root() . '/photos/' . \App::$profile['channel_address'] . '/image/' . $rr['resource_id']);
|
||||||
|
|
||||||
|
|
||||||
|
$photos[] = array(
|
||||||
|
'id' => $rr['id'],
|
||||||
|
'twist' => ' ' . $twist . rand(2,4),
|
||||||
|
'link' => $imagelink,
|
||||||
|
'title' => t('View Photo'),
|
||||||
|
'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
|
||||||
|
'fullsrc' => z_root() . '/photo/' . $rr['resource_id'] . '-' . '1' . '.' .$ext,
|
||||||
|
'resource_id' => $rr['resource_id'],
|
||||||
|
'alt' => $imgalt_e,
|
||||||
|
'desc'=> $desc_e,
|
||||||
|
'ext' => $ext,
|
||||||
|
'hash'=> $rr['resource_id'],
|
||||||
|
'unknown' => t('Unknown')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$tpl = get_markup_template('photo_album_portfolio.tpl');
|
||||||
|
$o .= replace_macros($tpl, array(
|
||||||
|
'$photos' => $photos,
|
||||||
|
'$album' => (($title) ? $title : $album),
|
||||||
|
'$album_id' => rand(),
|
||||||
|
'$album_edit' => array(t('Edit Album'), $album_edit),
|
||||||
|
'$can_post' => false,
|
||||||
|
'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
|
||||||
|
'$order' => false,
|
||||||
|
'$upload_form' => $upload_form,
|
||||||
|
'$usage' => $usage_message
|
||||||
|
));
|
||||||
|
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
11
view/tpl/photo_album_portfolio.tpl
Executable file
11
view/tpl/photo_album_portfolio.tpl
Executable file
@ -0,0 +1,11 @@
|
|||||||
|
<div class="row column">
|
||||||
|
<div id="photo-album-contents-{{$album_id}}">
|
||||||
|
{{foreach $photos as $photo}}
|
||||||
|
{{include file="photo_portfolio.tpl"}}
|
||||||
|
{{/foreach}}
|
||||||
|
<div id="page-end"></div>
|
||||||
|
</div>
|
||||||
|
<div class="photos-end"></div>
|
||||||
|
<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
|
||||||
|
<div id="page-spinner"></div>
|
||||||
|
</div>
|
13
view/tpl/photo_portfolio.tpl
Executable file
13
view/tpl/photo_portfolio.tpl
Executable file
@ -0,0 +1,13 @@
|
|||||||
|
|
||||||
|
|
||||||
|
<a data-open="portfolioModal-{{$photo.resource_id}}" aria-controls="portfolioModal-{{$photo.resource_id}}" aria-haspopup="true" tabindex="0">
|
||||||
|
<img class="thumbnail" src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.desc}}" id="photo-top-photo-{{$photo.resource_id}}">
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<div class="full reveal without-overlay" id="portfolioModal-{{$photo.resource_id}}" data-reveal="f175mw-reveal" role="dialog" aria-hidden="true" data-yeti-box="portfolioModal-{{$photo.resource_id}}" data-resize="portfolioModal-{{$photo.resource_id}}">
|
||||||
|
<h5>{{$photo.desc}}</h5>
|
||||||
|
<img class="thumbnail" src="{{$photo.fullsrc}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.desc}}" id="photo-top-photo-{{$photo.resource_id}}x">
|
||||||
|
<button class="close-button" data-close="" aria-label="Close reveal" type="button">
|
||||||
|
<span aria-hidden="true">×</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
Reference in New Issue
Block a user