X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Ffbrowser.php;h=110ca9585c9d2e5ff0e346aaf4ad4328afffadd7;hb=ed6ada0da571ac88b039a162601ac172c3680710;hp=92c6bd3b4becf14456c51e2ccdf9cbc78d3b7f64;hpb=96ed0a77912e049799dc81761f1dbe4a9eec5757;p=friendica.git diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 92c6bd3b4b..110ca9585c 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -11,47 +11,58 @@ require_once('include/Photo.php'); * @param App $a */ function fbrowser_content($a){ - + if (!local_user()) killme(); if ($a->argc==1) killme(); - - //echo "
"; var_dump($a->argv); killme(); - + + $template_file = "filebrowser.tpl"; + $mode = ""; + if (x($_GET,'mode')) { + $template_file = "filebrowser_plain.tpl"; + $mode = "?mode=".$_GET['mode']; + } + + //echo ""; var_dump($a->argv); killme(); + switch($a->argv[1]){ case "image": - $path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos"))); + $path = array( array("", t("Photos"))); $albums = false; $sql_extra = ""; $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10"; - + if ($a->argc==2){ - $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ", - intval(local_user()) + $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ", + intval(local_user()), + dbesc('Contact Photos'), + dbesc( t('Contact Photos')) ); - // anon functions only from 5.3.0... meglio tardi che mai.. - function folder1($el){return array(bin2hex($el['album']),$el['album']);} - $albums = array_map( "folder1" , $albums); - + + function _map_folder1($el){return array(bin2hex($el['album']),$el['album']);}; + $albums = array_map( "_map_folder1" , $albums); + } - + $album = ""; if ($a->argc==3){ $album = hex2bin($a->argv[2]); $sql_extra = sprintf("AND `album` = '%s' ",dbesc($album)); $sql_extra2 = ""; - $path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album); + $path[]=array($a->argv[2], $album); } - - $r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` - FROM `photo` WHERE `uid` = %d AND (height <= 320 AND width <= 320) $sql_extra + + $r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` + FROM `photo` WHERE `uid` = %d $sql_extra AND `album` != '%s' AND `album` != '%s' GROUP BY `resource-id` $sql_extra2", - intval(local_user()) + intval(local_user()), + dbesc('Contact Photos'), + dbesc( t('Contact Photos')) ); - - function files1($rr){ + + function _map_files1($rr){ global $a; $types = Photo::supportedTypes(); $ext = $types[$rr['type']]; @@ -63,32 +74,43 @@ function fbrowser_content($a){ $filename_e = $rr['filename']; } - return array( - $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext, - $filename_e, - $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext + // Take the largest picture that is smaller or equal 640 pixels + $p = q("SELECT `scale` FROM `photo` WHERE `resource-id` = '%s' AND `height` <= 640 AND `width` <= 640 ORDER BY `resource-id`, `scale` LIMIT 1", + dbesc($rr['resource-id'])); + if ($p) + $scale = $p[0]["scale"]; + else + $scale = $rr['loq']; + + return array( + $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'], + $filename_e, + $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext ); } - $files = array_map("files1", $r); - - $tpl = get_markup_template("filebrowser.tpl"); - echo replace_macros($tpl, array( + $files = array_map("_map_files1", $r); + + $tpl = get_markup_template($template_file); + + $o = replace_macros($tpl, array( '$type' => 'image', '$baseurl' => $a->get_baseurl(), '$path' => $path, '$folders' => $albums, '$files' =>$files, + '$cancel' => t('Cancel'), + '$nickname' => $a->user['nickname'], )); - - + + break; case "file": if ($a->argc==2){ - $files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ", + $files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ", intval(local_user()) ); - - function files2($rr){ global $a; + + function _map_files2($rr){ global $a; list($m1,$m2) = explode("/",$rr['filetype']); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); @@ -99,27 +121,33 @@ function fbrowser_content($a){ $filename_e = $rr['filename']; } - 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); - //echo ""; var_dump($files); killme(); - - - $tpl = get_markup_template("filebrowser.tpl"); - echo replace_macros($tpl, array( + $files = array_map("_map_files2", $files); + + + $tpl = get_markup_template($template_file); + $o = replace_macros($tpl, array( '$type' => 'file', '$baseurl' => $a->get_baseurl(), - '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ), + '$path' => array( array( "", t("Files")) ), '$folders' => false, '$files' =>$files, + '$cancel' => t('Cancel'), + '$nickname' => $a->user['nickname'], )); - + } - + break; } - - killme(); - + if (x($_GET,'mode')) { + return $o; + } else { + echo $o; + killme(); + } + + }