X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=075846e50631e5cf577bca02bb70d38edb707f49;hb=f2f73799ba49560eff9ca2582080a6f762f01511;hp=66ff9252ebbcf77f1e2f895b59d235c288b86b32;hpb=71e2dbf3522dcf076458805ee65dc976fb35a6f3;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 66ff9252eb..075846e506 100644
--- 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,30 @@ 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']];
+
+				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");
@@ -60,6 +78,7 @@ function fbrowser_content($a){
 				'$path' => $path,
 				'$folders' => $albums,
 				'$files' =>$files,
+				'$cancel' => t('Cancel'),
 			));
 				
 				
@@ -73,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();
@@ -86,6 +113,7 @@ function fbrowser_content($a){
 					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
 					'$folders' => false,
 					'$files' =>$files,
+					'$cancel' => t('Cancel'),
 				));
 				
 			}