Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir)

Browse source
This commit is contained in:
redmatrix 2015-08-05 22:07:51 -07:00
parent dfb8a1b2d4
commit 880dec5a4e
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/photos.php
View file

@ -355,7 +355,7 @@ function photos_albums_list($channel, $observer) {
$ret['albums'] = array();
foreach($albums as $k => $album) {
$entry = array(
'text' => $album['album'],
'text' => (($album['album']) ? $album['album'] : '/'),
'total' => $album['total'],
'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album['album']),
'urlencode' => urlencode($album['album']),

21
mod/photos.php
View file

@ -474,7 +474,12 @@ function photos_content(&$a) {
$datatype = argv(2);
$datum = argv(3);
} else {
$datatype = 'summary';
if(argc() > 2) {
$datatype = argv(2);
$datum = '';
}
else
$datatype = 'summary';
}
if(argc() > 4)
@ -602,15 +607,15 @@ function photos_content(&$a) {
if($datatype === 'album') {
if((strlen($datum) & 1) || (! ctype_xdigit($datum))) {
notice( t('Album name could not be decoded') . EOL);
logger('mod_photos: illegal album encoding: ' . $datum);
$datum = '';
if(strlen($datum)) {
if((strlen($datum) & 1) || (! ctype_xdigit($datum))) {
notice( t('Album name could not be decoded') . EOL);
logger('mod_photos: illegal album encoding: ' . $datum);
$datum = '';
}
}
$album = hex2bin($datum);
$album = (($datum) ? hex2bin($datum) : '');
$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",