Merge pull request #1995 from rabuzarus/2810_fbrowser
fbrowser: exclude Contact Photos
This commit is contained in:
commit
fb4adc83dc
1 changed files with 9 additions and 5 deletions
|
@ -35,8 +35,10 @@ function fbrowser_content($a){
|
||||||
$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
|
$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
|
||||||
|
|
||||||
if ($a->argc==2){
|
if ($a->argc==2){
|
||||||
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
|
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
|
||||||
intval(local_user())
|
intval(local_user()),
|
||||||
|
dbesc('Contact Photos'),
|
||||||
|
dbesc( t('Contact Photos'))
|
||||||
);
|
);
|
||||||
// anon functions only from 5.3.0... meglio tardi che mai..
|
// anon functions only from 5.3.0... meglio tardi che mai..
|
||||||
$folder1 = function($el) use ($mode) {return array(bin2hex($el['album']),$el['album']);};
|
$folder1 = function($el) use ($mode) {return array(bin2hex($el['album']),$el['album']);};
|
||||||
|
@ -53,9 +55,11 @@ function fbrowser_content($a){
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`
|
$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",
|
GROUP BY `resource-id` $sql_extra2",
|
||||||
intval(local_user())
|
intval(local_user()),
|
||||||
|
dbesc('Contact Photos'),
|
||||||
|
dbesc( t('Contact Photos'))
|
||||||
);
|
);
|
||||||
|
|
||||||
function files1($rr){
|
function files1($rr){
|
||||||
|
@ -94,7 +98,7 @@ function fbrowser_content($a){
|
||||||
break;
|
break;
|
||||||
case "file":
|
case "file":
|
||||||
if ($a->argc==2){
|
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())
|
intval(local_user())
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue