10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-18 22:23:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- conditional logic fixed;

Browse Source 
- some code optimization and documentation;
- fixed conflict with WP Fusion;
This commit is contained in:
nikitozzzzzzz
2018-03-16 09:37:19 +02:00
parent 3a3af72e82
commit 8e348e084e
17 changed files with 2718 additions and 2321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-menu.php
-39
View File
@@ -1,39 +0,0 @@
<?php
namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Menu' ) ) {
class Menu {
function __construct() {
}
/***
*** @new menu
***/
function new_ui( $position, $element, $trigger, $items ) {
?>
<div class="um-dropdown" data-element="<?php echo $element; ?>" data-position="<?php echo $position; ?>" data-trigger="<?php echo $trigger; ?>">
<div class="um-dropdown-b">
<div class="um-dropdown-arr"><i class=""></i></div>
<ul>
<?php foreach( $items as $k => $v ) { ?>
<li><?php echo $v; ?></li>
<?php } ?>
</ul>
</div>
</div>
<?php
}
}
}
includes/core/class-profile.php
+33 -2
View File
@@ -21,7 +21,10 @@ if ( ! class_exists( 'Profile' ) ) {
function ajax_delete_profile_photo() {
extract( $_REQUEST );
/**
* @var $user_id
*/
extract( $_REQUEST );
if ( ! UM()->roles()->um_current_user_can( 'edit', $user_id ) )
die( __( 'You can not edit this user' ) );
@@ -31,7 +34,10 @@ if ( ! class_exists( 'Profile' ) ) {
function ajax_delete_cover_photo() {
extract($_REQUEST);
/**
* @var $user_id
*/
extract( $_REQUEST );
if ( ! UM()->roles()->um_current_user_can( 'edit', $user_id ) )
die( __( 'You can not edit this user' ) );
@@ -284,5 +290,30 @@ if ( ! class_exists( 'Profile' ) ) {
return $output;
}
/**
* New menu
*
* @param string $position
* @param string $element
* @param string $trigger
* @param array $items
*/
function new_ui( $position, $element, $trigger, $items ) {
?>
<div class="um-dropdown" data-element="<?php echo $element; ?>" data-position="<?php echo $position; ?>" data-trigger="<?php echo $trigger; ?>">
<div class="um-dropdown-b">
<div class="um-dropdown-arr"><i class=""></i></div>
<ul>
<?php foreach ( $items as $k => $v ) { ?>
<li><?php echo $v; ?></li>
<?php } ?>
</ul>
</div>
</div>
<?php
}
}
}
includes/core/um-actions-profile.php
+4 -4
View File
@@ -592,7 +592,7 @@ add_action( 'um_after_user_updated', 'um_restore_default_roles', 10, 3 );
'<a href="#" class="um-dropdown-hide">' . __( 'Cancel', 'ultimate-member' ) . '</a>',
);
echo UM()->menu()->new_ui( 'bc', 'div.um-cover', 'click', $items );
echo UM()->profile()->new_ui( 'bc', 'div.um-cover', 'click', $items );
}
@@ -749,7 +749,7 @@ add_action( 'um_after_user_updated', 'um_restore_default_roles', 10, 3 );
*/
$items = apply_filters( 'um_user_photo_menu_view', $items );
echo UM()->menu()->new_ui( 'bc', 'div.um-profile-photo', 'click', $items );
echo UM()->profile()->new_ui( 'bc', 'div.um-profile-photo', 'click', $items );
} else if (UM()->fields()->editing == true) {
@@ -782,7 +782,7 @@ add_action( 'um_after_user_updated', 'um_restore_default_roles', 10, 3 );
*/
$items = apply_filters( 'um_user_photo_menu_edit', $items );
echo UM()->menu()->new_ui( 'bc', 'div.um-profile-photo', 'click', $items );
echo UM()->profile()->new_ui( 'bc', 'div.um-profile-photo', 'click', $items );
}
@@ -1117,7 +1117,7 @@ add_action( 'um_after_user_updated', 'um_restore_default_roles', 10, 3 );
}
UM()->menu()->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items );
UM()->profile()->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items );
?>