When storing items, the object-type is detected and stored.

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 33695b30f670e2947962a8e9f2d90760c1ee86f3..075846e50631e5cf577bca02bb70d38edb707f49 100644 (file)
--- 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
  */
@@ -22,6 +24,9 @@ function fbrowser_content($a){
                case "image":
                        $path = array( array($a->get_baseurl()."/fbrowser/image/", 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())
@@ -36,16 +41,34 @@ function fbrowser_content($a){
                        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);
                        }
                                
-                       $r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  FROM `photo` WHERE `uid` = %d $sql_extra
-                               AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
+                       $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
+                                       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']];
+
+                               if($a->theme['template_engine'] === 'internal') {
+                                       $filename_e = template_escape($rr['filename']);
+                               }
+                               else {
+                                       $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
+                               );
+                       }
                        $files = array_map("files1", $r);
                        
                        $tpl = get_markup_template("filebrowser.tpl");
@@ -55,6 +78,7 @@ function fbrowser_content($a){
                                '$path' => $path,
                                '$folders' => $albums,
                                '$files' =>$files,
+                               '$cancel' => t('Cancel'),
                        ));
                                
                                
@@ -68,7 +92,15 @@ function fbrowser_content($a){
                                function files2($rr){ global $a; 
                                        list($m1,$m2) = explode("/",$rr['filetype']);
                                        $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
-                                       return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
+
+                                       if($a->theme['template_engine'] === 'internal') {
+                                               $filename_e = template_escape($rr['filename']);
+                                       }
+                                       else {
+                                               $filename_e = $rr['filename'];
+                                       }
+
+                                       return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
                                }
                                $files = array_map("files2", $files);
                                //echo "<pre>"; var_dump($files); killme();
@@ -81,6 +113,7 @@ function fbrowser_content($a){
                                        '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
                                        '$folders' => false,
                                        '$files' =>$files,
+                                       '$cancel' => t('Cancel'),
                                ));
                                
                        }