Fix field view and edit restriction

This commit is contained in:
Champ Camba
2017-01-20 23:19:49 +08:00
parent fdf3cc0e79
commit cc76ce5674
2 changed files with 19 additions and 3 deletions
+10 -1
View File
@@ -1110,13 +1110,22 @@ class UM_Fields {
if ( ( $visibility == 'view' && $this->set_mode == 'register' ) ||
( isset( $data['editable'] ) && $data['editable'] == 0 && $this->set_mode == 'profile' ) ){
$disabled = ' disabled="disabled" ';
$disabled = ' disabled="disabled" ';
if ( $data['public'] == '-2' && $data['roles'] ){
if ( in_array( $ultimatemember->query->get_role_by_userid( get_current_user_id() ), $data['roles'] ) ){
$disabled = '';
}
}
}
if( ! isset( $data['autocomplete'] ) ){
$autocomplete = 'off';
}
if ( !um_can_view_field( $data ) ) return;
if ( !um_can_edit_field( $data ) ) return;
+9 -2
View File
@@ -1056,11 +1056,18 @@
if ( is_user_logged_in() && isset( $data['editable'] ) && $data['editable'] == 0 ) {
if ( um_is_user_himself() && !um_user('can_edit_everyone') )
if( $data['public'] == "-2"){
return true;
}
if ( !um_is_user_himself() && !um_user_can('can_edit_everyone') )
if ( um_is_user_himself() && !um_user('can_edit_everyone') ){
return true;
}
if ( !um_is_user_himself() && !um_user_can('can_edit_everyone') ){
return false;
}
}