CSS conflicts fixed

This commit is contained in:
ultimatemember
2015-01-11 19:07:55 +02:00
parent 4a6d8c5df5
commit 49a262fa18
36 changed files with 266 additions and 309 deletions
+41 -48
View File
@@ -244,15 +244,6 @@
$ultimatemember->user->reset();
}
/***
*** @boolean if viewing his own profile
***/
function um_is_my_profile() {
if ( !is_user_logged_in() ) return false;
if ( um_is_core_page('user') && get_current_user_id() == um_get_requested_user() ) return true;
return false;
}
/***
*** @gets the queried user
***/
@@ -353,19 +344,6 @@
}
/***
*** @Tests for current user
***/
function um_user_can( $permission ) {
global $ultimatemember;
$user_id = get_current_user_id();
$role = get_user_meta( $user_id, 'role', true );
$permissions = $ultimatemember->query->role_data( $role );
if ( $permissions[ $permission ] == 1 )
return true;
return false;
}
/***
*** @boolean check for not same user
***/
@@ -395,23 +373,54 @@
}
/***
*** @checks if user can edit profile
*** @User can (role settings )
***/
function um_can_edit_profile( $user_id ){
function um_user_can( $permission ) {
global $ultimatemember;
$user_id = get_current_user_id();
$role = get_user_meta( $user_id, 'role', true );
$permissions = $ultimatemember->query->role_data( $role );
if ( $permissions[ $permission ] == 1 )
return true;
return false;
}
/***
*** @Check if user is in his profile
***/
function um_is_myprofile(){
global $ultimatemember;
if ( get_current_user_id() && get_current_user_id() == um_get_requested_user() )return true;
if ( !um_get_requested_user() && um_is_core_page('user') && get_current_user_id() ) return true;
return false;
}
/***
*** @Current user can
***/
function um_current_user_can( $cap, $user_id ){
global $ultimatemember;
if ( !is_user_logged_in() ) return false;
um_fetch_user( get_current_user_id() );
if ( um_user('can_edit_everyone') ) return true;
if ( get_current_user_id() == $user_id && um_user('can_edit_profile') ) return true;
if ( get_current_user_id() == $user_id && !um_user('can_edit_profile') ) return false;
if ( !um_user('can_edit_everyone') ) return false;
switch($cap) {
case 'edit':
if ( get_current_user_id() == $user_id && um_user('can_edit_profile') ) return true;
if ( !um_user('can_edit_everyone') ) return false;
if ( get_current_user_id() == $user_id && !um_user('can_edit_profile') ) return false;
if ( um_user('can_edit_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_edit_roles') ) ) return false;
break;
case 'delete':
if ( !um_user('can_delete_everyone') ) return false;
if ( um_user('can_delete_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_delete_roles') ) ) return false;
break;
}
return true;
}
/***
@@ -419,25 +428,9 @@
***/
function um_can_edit_my_profile(){
global $ultimatemember;
if ( !is_user_logged_in() ) return false;
if ( !um_user('can_edit_profile') ) return false;
return true;
}
/***
*** @quick test if the user's is on his profile
***/
function um_is_myprofile(){
global $ultimatemember;
if ( get_current_user_id() && get_current_user_id() == um_get_requested_user() )return true;
if ( !um_get_requested_user() && um_is_core_page('user') && get_current_user_id() ) return true;
return false;
}
/***