diff options
| author | friendica <info@friendica.com> | 2012-06-07 15:44:56 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-07 15:44:56 -0700 |
| commit | f4a80fcf2474a13b2d733f59f1a928b40841d83c (patch) | |
| tree | 27c32cdfbaa3a63877b118609b5177c705ff747a /mod/fbrowser.php | |
| parent | fcf8f301e595444620f07ea0e01994ea99ee961b (diff) | |
| parent | 2438c6e45d47ca194b51f99ddf113112fbb6ccb9 (diff) | |
| download | volse-hubzilla-f4a80fcf2474a13b2d733f59f1a928b40841d83c.tar.gz volse-hubzilla-f4a80fcf2474a13b2d733f59f1a928b40841d83c.tar.bz2 volse-hubzilla-f4a80fcf2474a13b2d733f59f1a928b40841d83c.zip | |
Merge pull request #328 from fabrixxm/master
PNG with alpha channel
Diffstat (limited to 'mod/fbrowser.php')
| -rw-r--r-- | mod/fbrowser.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 66ff9252e..3f034226e 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -4,7 +4,9 @@ * @subpackage FileBrowser * @author Fabio Comuni <fabrixxm@kirgroup.com> */ - + +require_once('include/Photo.php'); + /** * @param App $a */ @@ -43,14 +45,22 @@ function fbrowser_content($a){ $path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album); } - $r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` + $r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` FROM `photo` WHERE `uid` = %d $sql_extra GROUP BY `resource-id` $sql_extra2", intval(local_user()) ); - - function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.jpg'); } + function files1($rr){ + global $a; + $types = Photo::supportedTypes(); + $ext = $types[$rr['type']]; + return array( + $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext, + template_escape($rr['filename']), + $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext + ); + } $files = array_map("files1", $r); $tpl = get_markup_template("filebrowser.tpl"); |