Merge pull request #636 from fabrixxm/installer/checkphpcli

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 3f034226e15084e8947d3ca7db4409782041b3ef..075846e50631e5cf577bca02bb70d38edb707f49 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -46,7 +46,7 @@ function fbrowser_content($a){
                        }
                                
                        $r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  
-                                       FROM `photo` WHERE `uid` = %d $sql_extra
+                                       FROM `photo` WHERE `uid` = %d AND (height <= 320 AND width <= 320) $sql_extra
                                        GROUP BY `resource-id` $sql_extra2",
                                intval(local_user())                                    
                        );
@@ -55,9 +55,17 @@ function fbrowser_content($a){
                                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, 
-                                       template_escape($rr['filename']), 
+                                       $filename_e, 
                                        $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext
                                );
                        }
@@ -70,6 +78,7 @@ function fbrowser_content($a){
                                '$path' => $path,
                                '$folders' => $albums,
                                '$files' =>$files,
+                               '$cancel' => t('Cancel'),
                        ));
                                
                                
@@ -83,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();
@@ -96,6 +113,7 @@ function fbrowser_content($a){
                                        '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
                                        '$folders' => false,
                                        '$files' =>$files,
+                                       '$cancel' => t('Cancel'),
                                ));
                                
                        }