aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-06 17:52:00 -0800
committerfriendica <info@friendica.com>2012-03-06 17:52:00 -0800
commit7ad2dd65654f6b1cb17ae98e65c3e95528d29e30 (patch)
tree2c5e17fcd19506101dcfe9ba4ab044b426091da8
parent1224e256b1aba0b52bd64f63204b29d0ec86e813 (diff)
downloadvolse-hubzilla-7ad2dd65654f6b1cb17ae98e65c3e95528d29e30.tar.gz
volse-hubzilla-7ad2dd65654f6b1cb17ae98e65c3e95528d29e30.tar.bz2
volse-hubzilla-7ad2dd65654f6b1cb17ae98e65c3e95528d29e30.zip
fix photos after permissions_sql change
-rwxr-xr-xinclude/security.php80
-rwxr-xr-xmod/display.php2
-rwxr-xr-xmod/profile.php2
3 files changed, 78 insertions, 6 deletions
diff --git a/include/security.php b/include/security.php
index c04491570..9042d4d64 100755
--- a/include/security.php
+++ b/include/security.php
@@ -159,6 +159,77 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
AND allow_gid = ''
AND deny_cid = ''
AND deny_gid = ''
+ ";
+
+ /**
+ * Profile owner - everything is visible
+ */
+
+ if(($local_user) && ($local_user == $owner_id)) {
+ $sql = '';
+ }
+
+ /**
+ * Authenticated visitor. Unless pre-verified,
+ * check that the contact belongs to this $owner_id
+ * and load the groups the visitor belongs to.
+ * If pre-verified, the caller is expected to have already
+ * done this and passed the groups into this function.
+ */
+
+ elseif($remote_user) {
+
+ if(! $remote_verified) {
+ $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
+ intval($remote_user),
+ intval($owner_id)
+ );
+ if(count($r)) {
+ $remote_verified = true;
+ $groups = init_groups_visitor($remote_user);
+ }
+ }
+ if($remote_verified) {
+
+ $gs = '<<>>'; // should be impossible to match
+
+ if(is_array($groups) && count($groups)) {
+ foreach($groups as $g)
+ $gs .= '|<' . intval($g) . '>';
+ }
+
+ $sql = sprintf(
+ " AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
+ AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' )
+ AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
+ AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s')
+ ",
+ intval($remote_user),
+ intval($remote_user),
+ dbesc($gs),
+ dbesc($gs)
+ );
+ }
+ }
+ return $sql;
+}
+
+
+function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) {
+
+ $local_user = local_user();
+ $remote_user = remote_user();
+
+ /**
+ * Construct permissions
+ *
+ * default permissions - anonymous user
+ */
+
+ $sql = " AND allow_cid = ''
+ AND allow_gid = ''
+ AND deny_cid = ''
+ AND deny_gid = ''
AND private = 0
";
@@ -200,11 +271,10 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
}
$sql = sprintf(
- " AND (( allow_cid = '' OR allow_cid REGEXP '<%d>' )
+ " AND ( private = 0 OR (( allow_cid = '' OR allow_cid REGEXP '<%d>' )
AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' )
AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
- AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s')
- OR private = 0 )
+ AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s')))
",
intval($remote_user),
intval($remote_user),
@@ -214,4 +284,6 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
}
}
return $sql;
-} \ No newline at end of file
+}
+
+
diff --git a/mod/display.php b/mod/display.php
index f510f793d..f428149e8 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -85,7 +85,7 @@ function display_content(&$a) {
$o .= status_editor($a,$x,0,true);
- $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
+ $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
diff --git a/mod/profile.php b/mod/profile.php
index 74e1a2302..1a701f407 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) {
* Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
*/
- $sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+ $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
if($update) {