diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-06-07 20:17:31 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-06-07 20:17:31 +0200 |
| commit | 2438c6e45d47ca194b51f99ddf113112fbb6ccb9 (patch) | |
| tree | 27c32cdfbaa3a63877b118609b5177c705ff747a /mod | |
| parent | 7cc8c369cb6a01cffb58215966844b53794f32f4 (diff) | |
| download | volse-hubzilla-2438c6e45d47ca194b51f99ddf113112fbb6ccb9.tar.gz volse-hubzilla-2438c6e45d47ca194b51f99ddf113112fbb6ccb9.tar.bz2 volse-hubzilla-2438c6e45d47ca194b51f99ddf113112fbb6ccb9.zip | |
png support: update database.sql, fix some typos, fix tinymce image browser
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/fbrowser.php | 18 | ||||
| -rw-r--r-- | mod/photos.php | 4 | ||||
| -rw-r--r-- | mod/profile_photo.php | 3 | ||||
| -rw-r--r-- | mod/wall_upload.php | 3 |
4 files changed, 20 insertions, 8 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"); diff --git a/mod/photos.php b/mod/photos.php index 072353587..efeab8fa3 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -682,9 +682,9 @@ function photos_post(&$a) { $filesize = intval($_FILES['userfile']['size']); $type = $_FILES['userfile']['type']; } - + if ($type=="") $type=guess_image_type($filename); - logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' '. $type . ' ' . $filesize . ' bytes', LOGGER_DEBUG); + logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG); $maximagesize = get_config('system','maximagesize'); diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 2817f3942..e44707f9b 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -109,7 +109,8 @@ function profile_photo_post(&$a) { $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); $filetype = $_FILES['userfile']['type']; - + if ($filetype=="") $filetype=guess_image_type($filename); + $maximagesize = get_config('system','maximagesize'); if(($maximagesize) && ($filesize > $maximagesize)) { diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 20666e0ef..4b81f8d1c 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -69,7 +69,8 @@ function wall_upload_post(&$a) { $filesize = intval($_FILES['media']['size']); $filetype = $_FILES['media']['type']; } - + + if ($filetype=="") $filetype=guess_image_type($filename); $maximagesize = get_config('system','maximagesize'); if(($maximagesize) && ($filesize > $maximagesize)) { |