Ultimate Member – User Profile & Membership Plugin - Version 1.0.28

Version Description

Download this release

Release Info

Developer ultimatemember
Plugin Icon 128x128 Ultimate Member – User Profile & Membership Plugin
Version 1.0.28
Comparing to
See all releases

Code changes from version 1.0.27 to 1.0.28

Files changed (6) hide show
  1. admin/core/um-admin-metabox.php +23 -2
  2. core/um-mail.php +14 -0
  3. core/um-short-functions.php +5 -4
  4. core/um-user.php +1 -1
  5. index.php +1 -1
  6. readme.txt +14 -7
admin/core/um-admin-metabox.php CHANGED
@@ -171,9 +171,28 @@ class UM_Admin_Metabox {
171
  *** @load a role metabox
172
  ***/
173
  function load_metabox_role( $object, $box ) {
174
- global $ultimatemember;
 
175
  $box['id'] = str_replace('um-admin-form-','', $box['id']);
176
- include_once um_path . 'admin/templates/role/'. $box['id'] . '.php';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
177
  wp_nonce_field( basename( __FILE__ ), 'um_admin_save_metabox_role_nonce' );
178
  }
179
 
@@ -244,6 +263,8 @@ class UM_Admin_Metabox {
244
  add_meta_box('um-admin-form-logout', __('Logout Options'), array(&$this, 'load_metabox_role'), 'um_role', 'normal', 'default');
245
 
246
  add_meta_box('um-admin-form-delete', __('Delete Options'), array(&$this, 'load_metabox_role'), 'um_role', 'normal', 'default');
 
 
247
 
248
  }
249
 
171
  *** @load a role metabox
172
  ***/
173
  function load_metabox_role( $object, $box ) {
174
+ global $ultimatemember, $post;
175
+
176
  $box['id'] = str_replace('um-admin-form-','', $box['id']);
177
+
178
+ if ( $box['id'] == 'builder' ) {
179
+ $UM_Builder = new UM_Admin_Builder();
180
+ $UM_Builder->form_id = get_the_ID();
181
+ }
182
+
183
+ preg_match('#\{.*?\}#s', $box['id'], $matches);
184
+
185
+ if ( isset($matches[0]) ){
186
+ $path = $matches[0];
187
+ $box['id'] = preg_replace('~(\\{[^}]+\\})~','', $box['id'] );
188
+ } else {
189
+ $path = um_path;
190
+ }
191
+
192
+ $path = str_replace('{','', $path );
193
+ $path = str_replace('}','', $path );
194
+
195
+ include_once $path . 'admin/templates/role/'. $box['id'] . '.php';
196
  wp_nonce_field( basename( __FILE__ ), 'um_admin_save_metabox_role_nonce' );
197
  }
198
 
263
  add_meta_box('um-admin-form-logout', __('Logout Options'), array(&$this, 'load_metabox_role'), 'um_role', 'normal', 'default');
264
 
265
  add_meta_box('um-admin-form-delete', __('Delete Options'), array(&$this, 'load_metabox_role'), 'um_role', 'normal', 'default');
266
+
267
+ do_action('um_admin_custom_role_metaboxes');
268
 
269
  }
270
 
core/um-mail.php CHANGED
@@ -3,7 +3,21 @@
3
  class UM_Mail {
4
 
5
  function __construct() {
 
 
 
 
6
 
 
 
 
 
 
 
 
 
 
 
7
  }
8
 
9
  /***
3
  class UM_Mail {
4
 
5
  function __construct() {
6
+
7
+ add_filter('mandrill_nl2br', array(&$this, 'mandrill_nl2br') );
8
+
9
+ }
10
 
11
+ /***
12
+ *** @mandrill compatibility
13
+ ***/
14
+ function mandrill_nl2br($nl2br, $message) {
15
+
16
+ // text emails
17
+ $nl2br = true;
18
+
19
+ return $nl2br;
20
+
21
  }
22
 
23
  /***
core/um-short-functions.php CHANGED
@@ -483,6 +483,7 @@
483
  $user_id = get_current_user_id();
484
  $role = get_user_meta( $user_id, 'role', true );
485
  $permissions = $ultimatemember->query->role_data( $role );
 
486
  if ( $permissions[ $permission ] == 1 )
487
  return true;
488
  return false;
@@ -514,14 +515,14 @@
514
 
515
  case 'edit':
516
  if ( get_current_user_id() == $user_id && um_user('can_edit_profile') ) $return = 1;
517
- if ( !um_user('can_edit_everyone') ) $return = 0;
518
- if ( get_current_user_id() == $user_id && !um_user('can_edit_profile') ) $return = 0;
519
- if ( um_user('can_edit_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_edit_roles') ) ) $return = 0;
520
  break;
521
 
522
  case 'delete':
523
  if ( !um_user('can_delete_everyone') ) $return = 0;
524
- if ( um_user('can_delete_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_delete_roles') ) ) $return = 0;
525
  break;
526
 
527
  }
483
  $user_id = get_current_user_id();
484
  $role = get_user_meta( $user_id, 'role', true );
485
  $permissions = $ultimatemember->query->role_data( $role );
486
+ $permissions = apply_filters('um_user_permissions_filter', $permissions, $user_id);
487
  if ( $permissions[ $permission ] == 1 )
488
  return true;
489
  return false;
515
 
516
  case 'edit':
517
  if ( get_current_user_id() == $user_id && um_user('can_edit_profile') ) $return = 1;
518
+ elseif ( !um_user('can_edit_everyone') ) $return = 0;
519
+ elseif ( get_current_user_id() == $user_id && !um_user('can_edit_profile') ) $return = 0;
520
+ elseif ( um_user('can_edit_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_edit_roles') ) ) $return = 0;
521
  break;
522
 
523
  case 'delete':
524
  if ( !um_user('can_delete_everyone') ) $return = 0;
525
+ elseif ( um_user('can_delete_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_delete_roles') ) ) $return = 0;
526
  break;
527
 
528
  }
core/um-user.php CHANGED
@@ -135,7 +135,7 @@ class UM_User {
135
  $user_role = $this->get_role();
136
  $this->role_meta = $ultimatemember->query->role_data( $user_role );
137
  $this->role_meta = apply_filters('um_user_permissions_filter', $this->role_meta, $this->id);
138
-
139
  $this->profile = array_merge( $this->profile, (array)$this->role_meta);
140
 
141
  $this->profile['super_admin'] = ( is_super_admin( $this->id ) ) ? 1 : 0;
135
  $user_role = $this->get_role();
136
  $this->role_meta = $ultimatemember->query->role_data( $user_role );
137
  $this->role_meta = apply_filters('um_user_permissions_filter', $this->role_meta, $this->id);
138
+
139
  $this->profile = array_merge( $this->profile, (array)$this->role_meta);
140
 
141
  $this->profile['super_admin'] = ( is_super_admin( $this->id ) ) ? 1 : 0;
index.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Ultimate Member
4
  Plugin URI: http://ultimatemember.com/
5
  Description: Ultimate Member is a powerful community and membership plugin that allows you to create beautiful community and membership sites with WordPress
6
- Version: 1.0.27
7
  Author: Ultimate Member
8
  Author URI: http://ultimatemember.com/
9
  */
3
  Plugin Name: Ultimate Member
4
  Plugin URI: http://ultimatemember.com/
5
  Description: Ultimate Member is a powerful community and membership plugin that allows you to create beautiful community and membership sites with WordPress
6
+ Version: 1.0.28
7
  Author: Ultimate Member
8
  Author URI: http://ultimatemember.com/
9
  */
readme.txt CHANGED
@@ -3,11 +3,11 @@ Author URI: https://ultimatemember.com/
3
  Plugin URI: https://ultimatemember.com/
4
  Contributors: ultimatemember
5
  Donate link:
6
- Tags: access control, community, communities, conditional fields, conditional logic, conditional menus, content protection, custom fields, file uploads, form builder, front-end login, front-end registration, hide wp-admin, login, login page, logged-in users, member, members, membership, member directory, profile, profiles, profile builder, registration, restrict content, role creation, role menus, search filters, sign in, sign up, social network, star ratings, toolbar, user, users, user fields, user profiles, user roles
7
  Requires at least: 4.1
8
  Tested up to: 4.1
9
 
10
- Stable Tag: 1.0.27
11
 
12
  License: GNU Version 2 or Any Later Version
13
 
@@ -38,6 +38,8 @@ Features of the plugin include:
38
  * Mobile adaptive & responsive
39
  * SEO optimized
40
  * Developer friendly with dozens of actions and filters
 
 
41
 
42
  **Front-end registration**
43
 
@@ -127,6 +129,10 @@ No, we have built Ultimate Member to be extremely easy to use and does not requi
127
 
128
  Yes. Ultimate Member is designed to adapt nicely to any screen resolution. It includes specific designs for phones, tablets and desktops.
129
 
 
 
 
 
130
  = Where can I get support? =
131
 
132
  If you need help with Ultimate Member the best place to ask for help is via the Ultimate Member community forum where you can get answers from the Ultimate Member team and other members.
@@ -143,10 +149,6 @@ Yes. Ultimate Member will work with any properly coded theme. However, some them
143
 
144
  The plugin works with popular caching plugins by automatically excluding Ultimate Member pages from being cached. This ensures other visitors to a page will not see the private information of another user. However, if you add features of Ultimate Member to other pages you have to exclude those pages from being cached through your cache plugin settings panel.
145
 
146
- = Does the plugin work on WordPress Multisite? =
147
-
148
- Yes. The plugin works fine with WordPress network / multisite now. In a recent update, we have made it possible to show the user photos network-wide.
149
-
150
  == Screenshots ==
151
 
152
  1. Front-end User Profile (Edit mode)
@@ -168,6 +170,11 @@ Yes. The plugin works fine with WordPress network / multisite now. In a recent u
168
 
169
  == Changelog ==
170
 
 
 
 
 
 
171
  = 1.0.27: January 27, 2015 =
172
 
173
  * Fixed: WP admin bar issue with some plugins and themes
@@ -239,7 +246,7 @@ Yes. The plugin works fine with WordPress network / multisite now. In a recent u
239
 
240
  = 1.0.17: January 22, 2015 =
241
 
242
- * New: WordPress Multisite compatibility for user uploads and photos
243
  * Fixed: Searching members by username or email in directory (partial search supported)
244
  * Fixed: Anonymous tracking
245
  * Fixed: Minor css fixes
3
  Plugin URI: https://ultimatemember.com/
4
  Contributors: ultimatemember
5
  Donate link:
6
+ Tags: access control, community, communities, conditional fields, conditional logic, conditional menus, content protection, custom fields, file uploads, form builder, front-end login, front-end registration, hide wp-admin, login, login page, logged-in users, mandrill, member, members, membership, member directory, profile, profiles, profile builder, registration, restrict content, role creation, role menus, search filters, sign in, sign up, social network, star ratings, toolbar, user, users, user fields, user profiles, user roles
7
  Requires at least: 4.1
8
  Tested up to: 4.1
9
 
10
+ Stable Tag: 1.0.28
11
 
12
  License: GNU Version 2 or Any Later Version
13
 
38
  * Mobile adaptive & responsive
39
  * SEO optimized
40
  * Developer friendly with dozens of actions and filters
41
+ * Multi-site compatibility
42
+ * Mandrill compatibility
43
 
44
  **Front-end registration**
45
 
129
 
130
  Yes. Ultimate Member is designed to adapt nicely to any screen resolution. It includes specific designs for phones, tablets and desktops.
131
 
132
+ = Is Ultimate Member multi-site compatible? =
133
+
134
+ Yes. Ultimate Member works great on both single site and multi-site WordPress installs.
135
+
136
  = Where can I get support? =
137
 
138
  If you need help with Ultimate Member the best place to ask for help is via the Ultimate Member community forum where you can get answers from the Ultimate Member team and other members.
149
 
150
  The plugin works with popular caching plugins by automatically excluding Ultimate Member pages from being cached. This ensures other visitors to a page will not see the private information of another user. However, if you add features of Ultimate Member to other pages you have to exclude those pages from being cached through your cache plugin settings panel.
151
 
 
 
 
 
152
  == Screenshots ==
153
 
154
  1. Front-end User Profile (Edit mode)
170
 
171
  == Changelog ==
172
 
173
+ = 1.0.28: January 27, 2015 =
174
+
175
+ * New: added compatibility with wpMandrill to handle email delivery
176
+ * Fixed: Issue with profile edit menu not appearing
177
+
178
  = 1.0.27: January 27, 2015 =
179
 
180
  * Fixed: WP admin bar issue with some plugins and themes
246
 
247
  = 1.0.17: January 22, 2015 =
248
 
249
+ * New: WordPress Multi-site compatibility for user uploads and photos
250
  * Fixed: Searching members by username or email in directory (partial search supported)
251
  * Fixed: Anonymous tracking
252
  * Fixed: Minor css fixes