some minor cleanup of unreported (and as yet undiscovered) issues with permissions toggling. No smoking guns and no obvious issues discovered here. Repeated and tried to duplicate zottell's issue as described without seeing any obvious problems.

This commit is contained in:
friendica 2014-11-05 16:21:03 -08:00
parent b16ee29cc3
commit 3b22e2f5f5
4 changed files with 7 additions and 3 deletions

View File

@ -203,8 +203,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
return $result;
}
$r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & ABOOK_FLAG_FEED )",
intval($aid)
$r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & %d )",
intval($aid),
intval(ABOOK_FLAG_FEED)
);
if($r)
$total_feeds = $r[0]['total'];

View File

@ -376,6 +376,8 @@ function create_identity($arr) {
set_pconfig($newuid,'system','permissions_role',$arr['permissions_role']);
if(array_key_exists('online',$role_permissions))
set_pconfig($newuid,'system','hide_presence',1-intval($role_permissions['online']));
if(array_key_exists('perms_auto',$role_permissions))
set_pconfig($newuid,'system','autoperms',(($role_permissions['perms_auto']) ? $role_permissions['perms_accept'] : 0));
}
// Create a group with yourself as a member. This allows somebody to use it

View File

@ -337,6 +337,7 @@ function settings_post(&$a) {
intval(local_user()),
intval(ABOOK_FLAG_SELF)
);
set_pconfig(local_user(),'system','autoperms',(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0));
foreach($role_permissions as $p => $v) {
if(strpos($p,'channel_') !== false) {

View File

@ -1 +1 @@
2014-11-04.849
2014-11-05.850