Vier: Now there are buttons for inserting bbcode elements in the comments

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 66ff9252ebbcf77f1e2f895b59d235c288b86b32..5ee813b4d68f1dc6e5efe66325eb251047e40561 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
  */
@@ -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`  
-                                       FROM `photo` WHERE `uid` = %d $sql_extra
+                       $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']];
+                               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");