$master_record = $r[0];
}
- $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
+ $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ",
dbesc($master_record['password']),
dbesc($master_record['email'])
);
$a->identities = array();
$r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname`
- from manage left join user on manage.mid = user.uid
- where `manage`.`uid` = %d",
+ from manage left join user on manage.mid = user.uid where `user`.`account_removed` = 0
+ and `manage`.`uid` = %d",
intval($master_record['uid'])
);
if($r && count($r))
* Profile owner - everything is visible
*/
- if(($local_user) && ($local_user == $owner_id)) {
- $sql = '';
+ if($local_user && ($local_user == $owner_id)) {
+ $sql = '';
}
/**
}
$sql = sprintf(
- " AND ( private = 0 OR ( private = 1 AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
+ /*" AND ( private = 0 OR ( private in (1,2) AND wall = 1 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),
dbesc($gs),
dbesc($gs)
+*/
+ " AND ( private = 0 OR ( private in (1,2) AND wall = 1
+ AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
+ AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '')))))
+ ",
+ intval($remote_user),
+ dbesc($gs),
+ intval($remote_user),
+ dbesc($gs)
);
}
}