' . $data['description'] . '
'; + + $html .= ''; + + } else { + + $html .= '' . $this->render_field_label( $data );
+
+ if ( method_exists( $this, 'render_' . $data['type'] ) ) {
+
+ $html .= call_user_func( array( &$this, 'render_' . $data['type'] ), $data );
+
+ } else {
+
+ $html .= $this->render_field_by_hook( $data );
+
+ }
+
+ if ( ! empty( $data['description'] ) )
+ $html .= '
';
+
+ }
+ }
+
+ } else {
+ if ( strpos( $this->form_data['class'], 'um-top-label' ) !== false ) {
+
+ $html .= '' . $data['description'] . '
'; + + $html .= '' . $data['description'] . '
'; + if ( ! empty( $data['description'] ) ) + $html .= '' . $data['description'] . '
'; - $html .= '' . $data['description'] . '
'; + if ( ! empty( $data['description'] ) ) + $html .= '' . $data['description'] . '
'; - $html .= '' . $data['description'] . '
'; + if ( ! empty( $data['description'] ) ) + $html .= '' . $data['description'] . '
'; - $html .= '- ";
+ $html = "";
+ $html .= "
-
+ $html .= "
- " . __( 'Remove', 'ultimate-member' ) . "
"; - } - } elseif ( ! empty( $field_data['show_default_number'] ) && is_numeric( $field_data['show_default_number'] ) && $field_data['show_default_number'] > 0 ) { - $i = 0; - while( $i < $field_data['show_default_number'] ) { - $id_attr = ' id="' . $id . '-' . $i . '" '; + } + } elseif ( ! empty( $field_data['show_default_number'] ) && is_numeric( $field_data['show_default_number'] ) && $field_data['show_default_number'] > 0 ) { + $i = 0; + while( $i < $field_data['show_default_number'] ) { + $id_attr = ' id="' . $id . '-' . $i . '" '; - $options = ''; - foreach ( $field_data['options'] as $key=>$option ) { - $options .= ''; - } + $options = ''; + foreach ( $field_data['options'] as $key=>$option ) { + $options .= ''; + } - $html .= "- + $html .= "
- " . __( 'Remove', 'ultimate-member' ) . "
"; - $i++; - } - } + $i++; + } + } - $html .= "
- ";
- if ( ! empty( $values ) ) {
- foreach ( $values as $k=>$value ) {
+ if ( ! empty( $values ) ) {
+ foreach ( $values as $k=>$value ) {
- $id_attr = ' id="' . $id . '-' . $k . '" ';
+ $id_attr = ' id="' . $id . '-' . $k . '" ';
- $options = '';
- foreach ( $field_data['options'] as $key=>$option ) {
- $options .= '';
- }
+ $options = '';
+ foreach ( $field_data['options'] as $key=>$option ) {
+ $options .= '';
+ }
- $html .= "
- ";
+ $html = "";
+ $html .= "
-
+ $html .= "
- " . __( 'Remove', 'ultimate-member' ) . "
"; - } - } elseif ( ! empty( $field_data['show_default_number'] ) && is_numeric( $field_data['show_default_number'] ) && $field_data['show_default_number'] > 0 ) { - $i = 0; - while( $i < $field_data['show_default_number'] ) { - $id_attr = ' id="' . $id . '-' . $i . '" '; + } + } elseif ( ! empty( $field_data['show_default_number'] ) && is_numeric( $field_data['show_default_number'] ) && $field_data['show_default_number'] > 0 ) { + $i = 0; + while( $i < $field_data['show_default_number'] ) { + $id_attr = ' id="' . $id . '-' . $i . '" '; - $html .= "- + $html .= "
- " . __( 'Remove', 'ultimate-member' ) . "
"; - $i++; - } - } + $i++; + } + } - $html .= "
- ";
- if ( ! empty( $values ) ) {
- foreach ( $values as $k=>$value ) {
- $value = esc_attr($value);
- $id_attr = ' id="' . $id . '-' . $k . '" ';
+ if ( ! empty( $values ) ) {
+ foreach ( $values as $k=>$value ) {
+ $value = esc_attr($value);
+ $id_attr = ' id="' . $id . '-' . $k . '" ';
- $html .= "
" .
- "" .
- "" .
- "" .
- "" .
- "";
+ $html = "
- form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
- $id_attr = ' id="' . $id . '" ';
+ $id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
+ $id_attr = ' id="' . $id . '" ';
- $class = ! empty( $field_data['class'] ) ? $field_data['class'] : '';
- $class_attr = ' class="um-forms-field button ' . $class . '" ';
+ $class = ! empty( $field_data['class'] ) ? $field_data['class'] : '';
+ $class_attr = ' class="um-forms-field button ' . $class . '" ';
- $data = array(
- 'field_id' => $field_data['id']
- );
+ $data = array(
+ 'field_id' => $field_data['id']
+ );
- $data_attr = '';
- foreach ( $data as $key => $value ) {
- $data_attr .= " data-{$key}=\"{$value}\" ";
- }
+ $data_attr = '';
+ foreach ( $data as $key => $value ) {
+ $data_attr .= " data-{$key}=\"{$value}\" ";
+ }
- $name = $field_data['id'];
- $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
- $name_attr = ' name="' . $name . '" ';
+ $name = $field_data['id'];
+ $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
+ $name_attr = ' name="' . $name . '" ';
- $value = $this->get_field_value( $field_data );
- $value_attr = ' value="' . $value . '" ';
+ $value = $this->get_field_value( $field_data );
+ $value_attr = ' value="' . $value . '" ';
- $html = "";
+ $html = "";
- return $html;
- }
+ return $html;
+ }
- function render_info_text( $field_data ) {
- return $field_data['value'];
- }
+ /**
+ * @param $field_data
+ *
+ * @return mixed
+ */
+ function render_info_text( $field_data ) {
+ return $field_data['value'];
+ }
- /**
- * Get field value
- *
- * @param array $field_data
- * @param string $i
- * @return string|array
- */
- function get_field_value( $field_data, $i = '' ) {
- $default = ( $field_data['type'] == 'multi_checkbox' ) ? array() : '';
- $default = isset( $field_data['default' . $i] ) ? $field_data['default' . $i] : $default;
+ /**
+ * Get field value
+ *
+ * @param array $field_data
+ * @param string $i
+ * @return string|array
+ */
+ function get_field_value( $field_data, $i = '' ) {
+ $default = ( $field_data['type'] == 'multi_checkbox' ) ? array() : '';
+ $default = isset( $field_data['default' . $i] ) ? $field_data['default' . $i] : $default;
- if ( $field_data['type'] == 'checkbox' || $field_data['type'] == 'multi_checkbox' ) {
- $value = ( isset( $field_data['value' . $i] ) && '' !== $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
- } else {
- $value = isset( $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
- }
+ if ( $field_data['type'] == 'checkbox' || $field_data['type'] == 'multi_checkbox' ) {
+ $value = ( isset( $field_data['value' . $i] ) && '' !== $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
+ } else {
+ $value = isset( $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
+ }
- $value = is_string( $value ) ? stripslashes( $value ) : $value;
+ $value = is_string( $value ) ? stripslashes( $value ) : $value;
- return $value;
- }
- }
+ return $value;
+ }
+ }
}
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php
index f950baad..ccb35a3e 100644
--- a/includes/admin/core/class-admin-metabox.php
+++ b/includes/admin/core/class-admin-metabox.php
@@ -695,7 +695,7 @@ if ( ! class_exists( 'Admin_Metabox' ) ) {
$roles_metaboxes = array(
array(
- 'id' => 'um-admin-form-admin',
+ 'id' => 'um-admin-form-admin-permissions',
'title' => __( 'Administrative Permissions', 'ultimate-member' ),
'callback' => $callback,
'screen' => 'um_role_meta',
diff --git a/includes/admin/core/list-tables/emails-list-table.php b/includes/admin/core/list-tables/emails-list-table.php
index e51b8fe4..2b23a453 100644
--- a/includes/admin/core/list-tables/emails-list-table.php
+++ b/includes/admin/core/list-tables/emails-list-table.php
@@ -1,171 +1,275 @@
- __( 'item', 'ultimate-member' ),
- 'plural' => __( 'items', 'ultimate-member' ),
- 'ajax' => false
- ) );
-
- $this->no_items_message = $args['plural'] . ' ' . __( 'not found.', 'ultimate-member' );
-
- parent::__construct( $args );
+ /**
+ * @var string
+ */
+ var $no_items_message = '';
- }
-
- function __call( $name, $arguments ) {
- return call_user_func_array( array( $this, $name ), $arguments );
- }
-
- function prepare_items() {
- $columns = $this->get_columns();
- $hidden = array();
- $sortable = $this->get_sortable_columns();
- $this->_column_headers = array( $columns, $hidden, $sortable );
- }
-
- function column_default( $item, $column_name ) {
- if( isset( $item[ $column_name ] ) ) {
- return $item[ $column_name ];
- } else {
- return '';
- }
- }
-
- function no_items() {
- echo $this->no_items_message;
- }
-
- function set_sortable_columns( $args = array() ) {
- $return_args = array();
- foreach( $args as $k=>$val ) {
- if( is_numeric( $k ) ) {
- $return_args[ $val ] = array( $val, $val == $this->default_sorting_field );
- } else if( is_string( $k ) ) {
- $return_args[ $k ] = array( $val, $k == $this->default_sorting_field );
- } else {
- continue;
- }
- }
- $this->sortable_columns = $return_args;
- return $this;
- }
-
- function get_sortable_columns() {
- return $this->sortable_columns;
- }
-
- function set_columns( $args = array() ) {
- if ( count( $this->bulk_actions ) ) {
- $args = array_merge( array( 'cb' => '' ), $args );
- }
- $this->columns = $args;
-
- return $this;
- }
-
- function get_columns() {
- return $this->columns;
- }
-
- function set_actions( $args = array() ) {
- $this->actions = $args;
- return $this;
- }
-
- function get_actions() {
- return $this->actions;
- }
-
- function set_bulk_actions( $args = array() ) {
- $this->bulk_actions = $args;
- return $this;
- }
-
- function get_bulk_actions() {
- return $this->bulk_actions;
- }
-
- function column_email( $item ) {
- $active = UM()->options()->get( $item['key'] . '_on' );
-
- return ''. $item['title'] . '';
- }
+ /**
+ * @var array
+ */
+ var $sortable_columns = array();
- function column_recipients( $item ) {
- if ( $item['recipient'] == 'admin' )
- return UM()->options()->get( 'admin_email' );
- else
- return __( 'Member', 'ultimate-member' );
- }
+ /**
+ * @var string
+ */
+ var $default_sorting_field = '';
- function column_configure( $item ) {
- return '';
- }
-
- function column_icl_translations( $item ) {
- return UM()->external_integrations()->wpml_column_content( $item );
- }
+ /**
+ * @var array
+ */
+ var $actions = array();
- function wpc_set_pagination_args( $attr = array() ) {
- $this->set_pagination_args( $attr );
- }
+ /**
+ * @var array
+ */
+ var $bulk_actions = array();
+
+
+ /**
+ * @var array
+ */
+ var $columns = array();
+
+
+ /**
+ * UM_Emails_List_Table constructor.
+ *
+ * @param array $args
+ */
+ function __construct( $args = array() ){
+ $args = wp_parse_args( $args, array(
+ 'singular' => __( 'item', 'ultimate-member' ),
+ 'plural' => __( 'items', 'ultimate-member' ),
+ 'ajax' => false
+ ) );
+
+ $this->no_items_message = $args['plural'] . ' ' . __( 'not found.', 'ultimate-member' );
+
+ parent::__construct( $args );
+ }
+
+
+ /**
+ * @param callable $name
+ * @param array $arguments
+ *
+ * @return mixed
+ */
+ function __call( $name, $arguments ) {
+ return call_user_func_array( array( $this, $name ), $arguments );
+ }
+
+
+ /**
+ *
+ */
+ function prepare_items() {
+ $columns = $this->get_columns();
+ $hidden = array();
+ $sortable = $this->get_sortable_columns();
+ $this->_column_headers = array( $columns, $hidden, $sortable );
+ }
+
+
+ /**
+ * @param object $item
+ * @param string $column_name
+ *
+ * @return string
+ */
+ function column_default( $item, $column_name ) {
+ if( isset( $item[ $column_name ] ) ) {
+ return $item[ $column_name ];
+ } else {
+ return '';
+ }
+ }
+
+
+ /**
+ *
+ */
+ function no_items() {
+ echo $this->no_items_message;
+ }
+
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
+ function set_sortable_columns( $args = array() ) {
+ $return_args = array();
+ foreach( $args as $k=>$val ) {
+ if( is_numeric( $k ) ) {
+ $return_args[ $val ] = array( $val, $val == $this->default_sorting_field );
+ } else if( is_string( $k ) ) {
+ $return_args[ $k ] = array( $val, $k == $this->default_sorting_field );
+ } else {
+ continue;
+ }
+ }
+ $this->sortable_columns = $return_args;
+ return $this;
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_sortable_columns() {
+ return $this->sortable_columns;
+ }
+
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
+ function set_columns( $args = array() ) {
+ if ( count( $this->bulk_actions ) ) {
+ $args = array_merge( array( 'cb' => '' ), $args );
+ }
+ $this->columns = $args;
+
+ return $this;
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_columns() {
+ return $this->columns;
+ }
+
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
+ function set_actions( $args = array() ) {
+ $this->actions = $args;
+ return $this;
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_actions() {
+ return $this->actions;
+ }
+
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
+ function set_bulk_actions( $args = array() ) {
+ $this->bulk_actions = $args;
+ return $this;
+ }
+
+
+ /**
+ * @return array
+ */
+ function get_bulk_actions() {
+ return $this->bulk_actions;
+ }
+
+
+ /**
+ * @param $item
+ *
+ * @return string
+ */
+ function column_email( $item ) {
+ $active = UM()->options()->get( $item['key'] . '_on' );
+
+ return ''. $item['title'] . '';
+ }
+
+
+ /**
+ * @param $item
+ *
+ * @return mixed|string|void
+ */
+ function column_recipients( $item ) {
+ if ( $item['recipient'] == 'admin' )
+ return UM()->options()->get( 'admin_email' );
+ else
+ return __( 'Member', 'ultimate-member' );
+ }
+
+
+ /**
+ * @param $item
+ *
+ * @return string
+ */
+ function column_configure( $item ) {
+ return '';
+ }
+
+
+ /**
+ * @param $item
+ *
+ * @return string
+ */
+ function column_icl_translations( $item ) {
+ return UM()->external_integrations()->wpml_column_content( $item );
+ }
+
+
+ /**
+ * @param array $attr
+ */
+ function wpc_set_pagination_args( $attr = array() ) {
+ $this->set_pagination_args( $attr );
+ }
}
$ListTable = new UM_Emails_List_Table( array(
- 'singular' => __( 'Email Notification', 'ultimate-member' ),
- 'plural' => __( 'Email Notifications', 'ultimate-member' ),
- 'ajax' => false
+ 'singular' => __( 'Email Notification', 'ultimate-member' ),
+ 'plural' => __( 'Email Notifications', 'ultimate-member' ),
+ 'ajax' => false
));
$per_page = 20;
@@ -207,11 +311,11 @@ $ListTable->items = $emails;
$ListTable->wpc_set_pagination_args( array( 'total_items' => count( $emails ), 'per_page' => $per_page ) ); ?>
\ No newline at end of file
diff --git a/includes/admin/core/list-tables/roles-list-table.php b/includes/admin/core/list-tables/roles-list-table.php
index 02891b61..0df585c8 100644
--- a/includes/admin/core/list-tables/roles-list-table.php
+++ b/includes/admin/core/list-tables/roles-list-table.php
@@ -120,15 +120,53 @@ if( ! class_exists( 'WP_List_Table' ) )
require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+/**
+ * Class UM_Roles_List_Table
+ */
class UM_Roles_List_Table extends WP_List_Table {
+
+ /**
+ * @var string
+ */
var $no_items_message = '';
+
+
+ /**
+ * @var array
+ */
var $sortable_columns = array();
+
+
+ /**
+ * @var string
+ */
var $default_sorting_field = '';
+
+
+ /**
+ * @var array
+ */
var $actions = array();
+
+
+ /**
+ * @var array
+ */
var $bulk_actions = array();
+
+
+ /**
+ * @var array
+ */
var $columns = array();
+
+ /**
+ * UM_Roles_List_Table constructor.
+ *
+ * @param array $args
+ */
function __construct( $args = array() ){
$args = wp_parse_args( $args, array(
'singular' => __( 'item', 'ultimate-member' ),
@@ -139,14 +177,23 @@ class UM_Roles_List_Table extends WP_List_Table {
$this->no_items_message = $args['plural'] . ' ' . __( 'not found.', 'ultimate-member' );
parent::__construct( $args );
-
-
}
+
+ /**
+ * @param callable $name
+ * @param array $arguments
+ *
+ * @return mixed
+ */
function __call( $name, $arguments ) {
return call_user_func_array( array( $this, $name ), $arguments );
}
+
+ /**
+ *
+ */
function prepare_items() {
$columns = $this->get_columns();
$hidden = array();
@@ -154,6 +201,13 @@ class UM_Roles_List_Table extends WP_List_Table {
$this->_column_headers = array( $columns, $hidden, $sortable );
}
+
+ /**
+ * @param object $item
+ * @param string $column_name
+ *
+ * @return string
+ */
function column_default( $item, $column_name ) {
if( isset( $item[ $column_name ] ) ) {
return $item[ $column_name ];
@@ -162,10 +216,20 @@ class UM_Roles_List_Table extends WP_List_Table {
}
}
+
+ /**
+ *
+ */
function no_items() {
echo $this->no_items_message;
}
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
function set_sortable_columns( $args = array() ) {
$return_args = array();
foreach( $args as $k=>$val ) {
@@ -181,10 +245,20 @@ class UM_Roles_List_Table extends WP_List_Table {
return $this;
}
+
+ /**
+ * @return array
+ */
function get_sortable_columns() {
return $this->sortable_columns;
}
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
function set_columns( $args = array() ) {
if( count( $this->bulk_actions ) ) {
$args = array_merge( array( 'cb' => '' ), $args );
@@ -193,34 +267,68 @@ class UM_Roles_List_Table extends WP_List_Table {
return $this;
}
+
+ /**
+ * @return array
+ */
function get_columns() {
return $this->columns;
}
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
function set_actions( $args = array() ) {
$this->actions = $args;
return $this;
}
+
+ /**
+ * @return array
+ */
function get_actions() {
return $this->actions;
}
+
+ /**
+ * @param array $args
+ *
+ * @return $this
+ */
function set_bulk_actions( $args = array() ) {
$this->bulk_actions = $args;
return $this;
}
+
+ /**
+ * @return array
+ */
function get_bulk_actions() {
return $this->bulk_actions;
}
+ /**
+ * @param object $item
+ *
+ * @return string
+ */
function column_cb( $item ) {
return sprintf( '', $item['key'] );
}
+ /**
+ * @param $item
+ *
+ * @return string
+ */
function column_title( $item ) {
$actions = array();
@@ -241,26 +349,44 @@ class UM_Roles_List_Table extends WP_List_Table {
return sprintf('%1$s %2$s', '' . $item['name'] . '', $this->row_actions( $actions ) );
}
+
+ /**
+ * @param $item
+ *
+ * @return string
+ */
function column_roleid( $item ) {
return ! empty( $item['_um_is_custom'] ) ? 'um_' . $item['key'] : $item['key'];
}
+ /**
+ * @param $item
+ */
function column_core( $item ) {
echo ! empty( $item['_um_is_custom'] ) ? __( 'Yes', 'ultimate-member' ) : __( 'No', 'ultimate-member' );
}
+ /**
+ * @param $item
+ */
function column_admin_access( $item ) {
echo ! empty( $item['_um_can_access_wpadmin'] ) ? __( 'Yes', 'ultimate-member' ) : __( 'No', 'ultimate-member' );
}
+ /**
+ * @param $item
+ */
function column_priority( $item ) {
echo ! empty( $item['_um_priority'] ) ? $item['_um_priority'] : '-';
}
+ /**
+ * @param array $attr
+ */
function um_set_pagination_args( $attr = array() ) {
$this->set_pagination_args( $attr );
}
@@ -332,17 +458,11 @@ foreach ( $wp_roles->roles as $roleID => $role_data ) {
switch( strtolower( $order ) ) {
case 'asc':
uasort( $roles, function( $a, $b ) {
- //$a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name'];
- //$b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name'];
-
return strnatcmp( $a['name'], $b['name'] );
} );
break;
case 'desc':
uasort( $roles, function( $a, $b ) {
- //$a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name'];
- //$b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name'];
-
return strnatcmp( $a['name'], $b['name'] ) * -1;
} );
break;
@@ -355,7 +475,9 @@ $ListTable->um_set_pagination_args( array( 'total_items' => count( $roles ), 'pe
" .
+ "" .
+ "" .
+ "" .
+ "" .
+ "";
- if ( ! isset( $field_data['preview'] ) || $field_data['preview'] !== false ) {
- $html .= '
';
- }
+ if ( ! isset( $field_data['preview'] ) || $field_data['preview'] !== false ) {
+ $html .= '';
+ }
- if ( ! empty( $field_data['url'] ) ) {
- $html .= '';
- }
+ if ( ! empty( $field_data['url'] ) ) {
+ $html .= '';
+ }
- $html .= '
+ $html .= '
';
- return $html;
- }
+ return $html;
+ }
- function render_email_template( $field_data ) {
- if ( empty( $field_data['id'] ) )
- return false;
+ /**
+ * @param $field_data
+ *
+ * @return bool|string
+ */
+ function render_email_template( $field_data ) {
+ if ( empty( $field_data['id'] ) )
+ return false;
- $id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
+ $id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
- $class = ! empty( $field_data['class'] ) ? $field_data['class'] : '';
- $class .= ! empty( $field_data['size'] ) ? $field_data['size'] : 'um-long-field';
+ $class = ! empty( $field_data['class'] ) ? $field_data['class'] : '';
+ $class .= ! empty( $field_data['size'] ) ? $field_data['size'] : 'um-long-field';
- $data = array(
- 'field_id' => $field_data['id']
- );
+ $data = array(
+ 'field_id' => $field_data['id']
+ );
- $data_attr = '';
- foreach ( $data as $key => $value ) {
- $data_attr .= " data-{$key}=\"{$value}\" ";
- }
+ $data_attr = '';
+ foreach ( $data as $key => $value ) {
+ $data_attr .= " data-{$key}=\"{$value}\" ";
+ }
- $name = $field_data['id'];
- $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
+ $name = $field_data['id'];
+ $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
- $value = $this->get_field_value( $field_data );
+ $value = $this->get_field_value( $field_data );
- ob_start(); ?>
+ ob_start(); ?>
-
-
-
+
- $name,
- 'textarea_rows' => 20,
- 'editor_height' => 425,
- 'wpautop' => false,
- 'media_buttons' => false,
- 'editor_class' => $class
- )
- ); ?>
+ $name,
+ 'textarea_rows' => 20,
+ 'editor_height' => 425,
+ 'wpautop' => false,
+ 'media_buttons' => false,
+ 'editor_class' => $class
+ )
+ ); ?>
-
+ - + + +
query('INSERT INTO '.$wpdb->usermeta.'(user_id, meta_key, meta_value) - SELECT uu.ID, "_um_last_login", uu.user_registered - FROM '.$wpdb->users.' AS uu - WHERE - uu.ID NOT IN( - SELECT user_id FROM '.$wpdb->usermeta.' - WHERE meta_key = "_um_last_login" - GROUP BY user_id - )' - ); + \ No newline at end of file +/** + * This populates all existing UM users with meta_key `last_login` as `user_registered` if the meta key doesn't exist. + * Target Version: 1.3.39 + */ +global $wpdb; +$wpdb->query( + 'INSERT INTO '.$wpdb->usermeta.'(user_id, meta_key, meta_value) + SELECT uu.ID, "_um_last_login", uu.user_registered + FROM '.$wpdb->users.' AS uu + WHERE uu.ID NOT IN( + SELECT user_id FROM '.$wpdb->usermeta.' + WHERE meta_key = "_um_last_login" + GROUP BY user_id + )' +); \ No newline at end of file diff --git a/includes/admin/core/packages/2.0-beta1.php b/includes/admin/core/packages/2.0-beta1.php index 61d47981..200f993f 100644 --- a/includes/admin/core/packages/2.0-beta1.php +++ b/includes/admin/core/packages/2.0-beta1.php @@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) /** * This populates all existing UM users with meta_key `last_login` as `user_registered` if the meta key doesn't exist. - * Target Version: 1.3.39 + * Target Version: 2.0 */ global $wpdb; diff --git a/includes/admin/templates/role/admin.php b/includes/admin/templates/role/admin-permissions.php similarity index 100% rename from includes/admin/templates/role/admin.php rename to includes/admin/templates/role/admin-permissions.php diff --git a/includes/class-dependencies.php b/includes/class-dependencies.php index bbfc4ff3..8e5d3892 100644 --- a/includes/class-dependencies.php +++ b/includes/class-dependencies.php @@ -35,7 +35,7 @@ if ( ! class_exists( 'um\Dependencies' ) ) { 'private-content' => '2.0', 'profile-completeness' => '2.0.1', 'recaptcha' => '2.0', - 'reviews' => '2.0.1', + 'reviews' => '2.0.2', 'social-activity' => '2.0.1', 'social-login' => '2.0.1', 'terms-conditions' => '2.0', diff --git a/includes/class-init.php b/includes/class-init.php index f4f12cf0..7c631ab0 100644 --- a/includes/class-init.php +++ b/includes/class-init.php @@ -1030,20 +1030,6 @@ if ( ! class_exists( 'UM' ) ) { } - /** - * @since 2.0 - * - * @return um\core\Menu - */ - function menu() { - if ( empty( $this->classes['menu'] ) ) { - $this->classes['menu'] = new um\core\Menu(); - } - - return $this->classes['menu']; - } - - /** * @since 2.0 * diff --git a/includes/core/class-menu.php b/includes/core/class-menu.php deleted file mode 100644 index 53870113..00000000 --- a/includes/core/class-menu.php +++ /dev/null @@ -1,39 +0,0 @@ - - -
-
-
- 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 ) {
+ ?>
+
+
-
-
-
-
- $v ) { ?>
-
-
-
-
-
+
+
+ ' . __( 'Cancel', 'ultimate-member' ) . '',
);
- 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 );
?>
+
+
+
-
+ $v ) { ?>
+
+
+