X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=21b9b2e7b416605842ee36378cb24a0d9587247a;hb=6161ceff649fd52cb6cdfe14ebe5fdd35f6854a9;hp=e7f4b76d48a585869caae6c68e4234baa027cdfe;hpb=aa9ceabdd9eeec82393e4d5f09aad09c181af33d;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index e7f4b76d48..21b9b2e7b4 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -5,42 +5,45 @@
  * @author		Fabio Comuni <fabrixxm@kirgroup.com>
  */
 
+use Friendica\App;
+
 require_once('include/Photo.php');
 
 /**
  * @param App $a
  */
-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 "<pre>"; 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";
 
 			if ($a->argc==2){
-				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
-					intval(local_user())
+				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
+					intval(local_user()),
+					dbesc('Contact Photos'),
+					dbesc( t('Contact Photos'))
 				);
-				// anon functions only from 5.3.0... meglio tardi che mai..
-				$folder1 = function($el) use ($mode) {return array(bin2hex($el['album']),$el['album']);};
-				$albums = array_map( $folder1 , $albums);
+
+				function _map_folder1($el){return array(bin2hex($el['album']),$el['album']);};
+				$albums = array_map( "_map_folder1" , $albums);
 
 			}
 
@@ -53,13 +56,15 @@ 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 $sql_extra AND `album` != '%s' AND `album` != '%s'
 					GROUP BY `resource-id` $sql_extra2",
-				intval(local_user())
+				intval(local_user()),
+				dbesc('Contact Photos'),
+				dbesc( t('Contact Photos'))
 			);
 
-			function files1($rr){
-				global $a;
+			function _map_files1($rr){
+				$a = get_app();
 				$types = Photo::supportedTypes();
 				$ext = $types[$rr['type']];
 
@@ -70,59 +75,66 @@ 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() . '/photo/' . $rr['resource-id'] . '.' .$ext,
+					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("files1", $r);
+			$files = array_map("_map_files1", $r);
 
 			$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){
-				$files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
+			if ($a->argc==2) {
+				$files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ",
 					intval(local_user())
 				);
 
-				function 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("files2", $files);
-				//echo "<pre>"; var_dump($files); killme();
+				$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'],
 				));