diff options
| author | friendica <info@friendica.com> | 2014-11-19 16:29:35 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-11-19 16:29:35 -0800 |
| commit | 50244f943d0a14e3d7a7fcbe7f51d02dbe039879 (patch) | |
| tree | 3e3272e4026ebf1244321541a9b7b67418bb2231 | |
| parent | 7fec939c23f2a23c8ac123d8a416cb2bde9ffbd9 (diff) | |
| download | volse-hubzilla-50244f943d0a14e3d7a7fcbe7f51d02dbe039879.tar.gz volse-hubzilla-50244f943d0a14e3d7a7fcbe7f51d02dbe039879.tar.bz2 volse-hubzilla-50244f943d0a14e3d7a7fcbe7f51d02dbe039879.zip | |
minor photo flag issue - and some more whitespace edits
| -rw-r--r-- | include/dir_fns.php | 8 | ||||
| -rw-r--r-- | include/permissions.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index 8f27fb85d..0ba4f8712 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -38,7 +38,7 @@ function check_upstream_directory() { */ $directory = get_config('system','directory_server'); if ($directory) { - $r = q("select * from site where site_url = '%s' and (site_flags & %d)>0 ", + $r = q("select * from site where site_url = '%s' and (site_flags & %d) > 0 ", dbesc($directory), intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY|DIRECTORY_MODE_STANDALONE) ); @@ -86,14 +86,14 @@ function sync_directories($dirmode) { $realm = get_directory_realm(); if($realm == DIRECTORY_REALM) { - $r = q("select * from site where (site_flags & %d)>0 and site_url != '%s' and ( site_realm = '%s' or site_realm = '') ", + $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and ( site_realm = '%s' or site_realm = '') ", intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), dbesc(z_root()), dbesc($realm) ); } else { - $r = q("select * from site where (site_flags & %d)>0 and site_url != '%s' and site_realm like '%s' ", + $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_realm like '%s' ", intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), dbesc(z_root()), dbesc(protect_sprintf('%' . $realm . '%')) @@ -120,7 +120,7 @@ function sync_directories($dirmode) { dbesc($r[0]['site_realm']) ); - $r = q("select * from site where (site_flags & %d)>0 and site_url != '%s'", + $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s'", intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), dbesc(z_root()) ); diff --git a/include/permissions.php b/include/permissions.php index 0ad28b3f1..b078de4d5 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -257,7 +257,7 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { $channel_perm = $global_perms[$permission][0]; - $r = q("select %s, channel_hash from channel where channel_id = %d limit 1", + $r = q("select %s, channel_pageflags, channel_hash from channel where channel_id = %d limit 1", dbesc($channel_perm), intval($uid) ); diff --git a/mod/photos.php b/mod/photos.php index ce24762b1..7a9229cc4 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1176,7 +1176,7 @@ function photos_content(&$a) { $r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.album, p.scale, p.created FROM photo p INNER JOIN (SELECT resource_id, max(scale) scale FROM photo WHERE uid=%d AND album != '%s' AND album != '%s' - AND (photo_flags = %d or photo_flags = %d ) $sql_extra group by resource_id) ph + AND (photo_flags = %d or ( photo_flags & %d ) > 0 ) $sql_extra group by resource_id) ph ON (p.resource_id = ph.resource_id and p.scale = ph.scale) ORDER by p.created DESC LIMIT %d OFFSET %d", intval($a->data['channel']['channel_id']), dbesc('Contact Photos'), |