X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=9a0e9244c1cbb617511187d7273f58f853e077db;hb=05dcedb54c8c8f2b48e47fa11cb6dd4586bdd9bb;hp=73510ef58a13c4355ea1d55d34dfb4b61aa6740f;hpb=db949bb802448184bfe5164d8d3dd86ddf51b187;p=friendica.git diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 73510ef58a..9a0e9244c1 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -10,27 +10,25 @@ require_once('include/Photo.php'); /** * @param App $a */ -if(! function_exists('fbrowser_content')) { -function fbrowser_content($a){ +function fbrowser_content(App $a) { - if (!local_user()) + if (!local_user()) { killme(); + } - if ($a->argc==1) + if ($a->argc == 1) { 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]){ + switch ($a->argv[1]) { case "image": - $path = array( array("", t("Photos"))); + $path = array(array("", t("Photos"))); $albums = false; $sql_extra = ""; $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10"; @@ -64,7 +62,7 @@ function fbrowser_content($a){ ); function _map_files1($rr){ - global $a; + $a = get_app(); $types = Photo::supportedTypes(); $ext = $types[$rr['type']]; @@ -75,10 +73,18 @@ function fbrowser_content($a){ $filename_e = $rr['filename']; } + // 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'], + App::get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'], $filename_e, - $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext + App::get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext ); } $files = array_map("_map_files1", $r); @@ -86,47 +92,47 @@ function fbrowser_content($a){ $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'), + '$type' => 'image', + '$baseurl' => App::get_baseurl(), + '$path' => $path, + '$folders' => $albums, + '$files' => $files, + '$cancel' => t('Cancel'), '$nickname' => $a->user['nickname'], )); break; case "file": - if ($a->argc==2){ + if ($a->argc==2) { $files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ", intval(local_user()) ); - function _map_files2($rr){ global $a; + function _map_files2($rr){ + $a = get_app(); list($m1,$m2) = explode("/",$rr['filetype']); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); - if($a->theme['template_engine'] === 'internal') { + if ($a->theme['template_engine'] === 'internal') { $filename_e = template_escape($rr['filename']); - } - else { + } else { $filename_e = $rr['filename']; } - return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); + return array( App::get_baseurl() . '/attach/' . $rr['id'], $filename_e, App::get_baseurl() . '/images/icons/16/' . $filetype . '.png'); } $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( "", t("Files")) ), - '$folders' => false, - '$files' =>$files, - '$cancel' => t('Cancel'), + '$type' => 'file', + '$baseurl' => App::get_baseurl(), + '$path' => array( array( "", t("Files")) ), + '$folders' => false, + '$files' =>$files, + '$cancel' => t('Cancel'), '$nickname' => $a->user['nickname'], )); @@ -142,5 +148,5 @@ function fbrowser_content($a){ killme(); } -} + }