MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Image filebrowser dialog links images to image page

Browse source 
fix #1991
This commit is contained in:
fabrixxm 2015-11-08 12:05:23 +01:00
parent 0363bab040
commit 24d807221b
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/main.js
View file

@ -872,7 +872,7 @@ var Dialog = {
* to the event handler * to the event handler
*/ */
doFileBrowser : function (name, id) { doFileBrowser : function (name, id) {
var url = Dialog._get_url("image",name,id); var url = Dialog._get_url("file",name,id);
return Dialog.show(url); return Dialog.show(url);
}, },

17
mod/fbrowser.php
View file

@ -40,9 +40,9 @@ function fbrowser_content($a){
dbesc('Contact Photos'), dbesc('Contact Photos'),
dbesc( t('Contact Photos')) dbesc( t('Contact Photos'))
); );
// anon functions only from 5.3.0... meglio tardi che mai..
$folder1 = function($el) use ($mode) {return array(bin2hex($el['album']),$el['album']);}; function _map_folder1($el){return array(bin2hex($el['album']),$el['album']);};
$albums = array_map( $folder1 , $albums); $albums = array_map( "_map_folder1" , $albums);
} }
@ -62,7 +62,7 @@ function fbrowser_content($a){
dbesc( t('Contact Photos')) dbesc( t('Contact Photos'))
); );
function files1($rr){ function _map_files1($rr){
global $a; global $a;
$types = Photo::supportedTypes(); $types = Photo::supportedTypes();
$ext = $types[$rr['type']]; $ext = $types[$rr['type']];
@ -75,12 +75,12 @@ function fbrowser_content($a){
} }
return array( return array(
$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '.' .$ext, $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
$filename_e, $filename_e,
$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext
); );
} }
$files = array_map("files1", $r); $files = array_map("_map_files1", $r);
$tpl = get_markup_template($template_file); $tpl = get_markup_template($template_file);
@ -102,7 +102,7 @@ function fbrowser_content($a){
intval(local_user()) intval(local_user())
); );
function files2($rr){ global $a; function _map_files2($rr){ global $a;
list($m1,$m2) = explode("/",$rr['filetype']); list($m1,$m2) = explode("/",$rr['filetype']);
$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
@ -115,8 +115,7 @@ function fbrowser_content($a){
return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png');
} }
$files = array_map("files2", $files); $files = array_map("_map_files2", $files);
//echo "<pre>"; var_dump($files); killme();
$tpl = get_markup_template($template_file); $tpl = get_markup_template($template_file);