Merge pull request #2149 from annando/issue-1921

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index b2bda828792828b2dc21207fcf74949d80b32db6..0a2a7dead52048cf3dfd1860b11da789921d47fd 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -11,39 +11,41 @@ require_once('include/Photo.php');
  * @param App $a
  */
 function fbrowser_content($a){
-       
+
        if (!local_user())
                killme();
 
        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();   
-       
+
+       //echo "<pre>"; var_dump($a->argv); killme();
+
        switch($a->argv[1]){
                case "image":
                        $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);
+
                        }
-                       
+
                        $album = "";
                        if ($a->argc==3){
                                $album = hex2bin($a->argv[2]);
@@ -51,14 +53,16 @@ function fbrowser_content($a){
                                $sql_extra2 = "";
                                $path[]=array($a->argv[2], $album);
                        }
-                               
-                       $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
+
+                       $r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`
+                                       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){ 
+
+                       function _map_files1($rr){
                                global $a;
                                $types = Photo::supportedTypes();
                                $ext = $types[$rr['type']];
@@ -70,16 +74,16 @@ function fbrowser_content($a){
                                        $filename_e = $rr['filename'];
                                }
 
-                               return array( 
-                                       $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext, 
-                                       $filename_e, 
+                               return array(
+                                       $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+                                       $filename_e,
                                        $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $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(),
@@ -89,16 +93,16 @@ function fbrowser_content($a){
                                '$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 ",
+                               $files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ",
                                        intval(local_user())
                                );
-                               
-                               function files2($rr){ global $a; 
+
+                               function _map_files2($rr){ global $a;
                                        list($m1,$m2) = explode("/",$rr['filetype']);
                                        $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
 
@@ -109,12 +113,11 @@ function fbrowser_content($a){
                                                $filename_e = $rr['filename'];
                                        }
 
-                                       return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
+                                       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();
-                       
-                                                       
+                               $files = array_map("_map_files2", $files);
+
+
                                $tpl = get_markup_template($template_file);
                                $o = replace_macros($tpl, array(
                                        '$type' => 'file',
@@ -125,18 +128,18 @@ function fbrowser_content($a){
                                        '$cancel' => t('Cancel'),
                                        '$nickname' => $a->user['nickname'],
                                ));
-                               
+
                        }
-               
+
                        break;
        }
-       
+
        if (x($_GET,'mode')) {
                return $o;
        } else {
                echo $o;
                killme();
        }
-       
-       
+
+
 }