Ultimate Member – User Profile & Membership Plugin - Version 1.0.63

Version Description

Download this release

Release Info

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

Code changes from version 1.0.62 to 1.0.63

Files changed (10) hide show
  1. admin/assets/css/um-admin-dashboard.css +20 -0
  2. admin/assets/js/um-admin-dashboard.js +0 -25
  3. admin/core/um-admin-dashboard.php +1 -1
  4. core/um-account.php +0 -2
  5. core/um-actions-account.php +24 -16
  6. core/um-actions-register.php +9 -3
  7. core/um-password.php +1 -3
  8. core/um-shortcodes.php +1 -3
  9. index.php +1 -1
  10. readme.txt +9 -1
admin/assets/css/um-admin-dashboard.css CHANGED
@@ -71,6 +71,26 @@
71
  font-size: 18px;
72
  }
73
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
74
  /* Share bar */
75
 
76
  .um-admin-dash-share {
71
  font-size: 18px;
72
  }
73
 
74
+ .um-metabox-holder .norm i {
75
+ display: inline-block;
76
+ width: 30px;
77
+ text-align: center;
78
+ }
79
+
80
+ .um-metabox-holder .norm p {
81
+ margin: 5px 0;
82
+ }
83
+
84
+ .um-metabox-holder .norm .count {
85
+ font-size: 16px;
86
+ font-family: Gerogia;
87
+ color: #999;
88
+ width: 40px;
89
+ display: inline-block;
90
+ text-align: right;
91
+ margin-right: 10px;
92
+ }
93
+
94
  /* Share bar */
95
 
96
  .um-admin-dash-share {
admin/assets/js/um-admin-dashboard.js CHANGED
@@ -1,28 +1,3 @@
1
  jQuery(document).ready(function() {
2
-
3
- /**
4
-
5
- var active_tab = jQuery('.um-admin-dash-nav a.active').attr('data-rel');
6
- jQuery('.um-admin-dash-content').hide();
7
- jQuery('.um-admin-dash-content#'+active_tab).show();
8
-
9
- draw_linechart();
10
- chart_ready = 0;
11
-
12
- jQuery(document).on('click', '.um-admin-dash-nav a', function(e){
13
- e.preventDefault();
14
- active_tab = jQuery(this).attr('data-rel');
15
- jQuery('.um-admin-dash-nav a').removeClass('active');
16
- jQuery(this).addClass('active');
17
- jQuery('.um-admin-dash-content').hide();
18
- jQuery('.um-admin-dash-content#'+active_tab).show();
19
- if ( chart_ready == 0 ) {
20
- draw_linechart();
21
- chart_ready = 1;
22
- }
23
- return false;
24
- });
25
-
26
- **/
27
 
28
  });
1
  jQuery(document).ready(function() {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
 
3
  });
admin/core/um-admin-dashboard.php CHANGED
@@ -60,7 +60,7 @@ class UM_Admin_Dashboard {
60
 
61
  add_meta_box('um-metaboxes-contentbox-1', __('Users Overview','ultimatemember'), array(&$this, 'users_overview'), $this->pagehook, 'core', 'core');
62
 
63
- add_meta_box('um-metaboxes-mainbox-1', __('Purge Temp Files','ultimatemember'), array(&$this, 'purge_temp'), $this->pagehook, 'normal', 'core');
64
 
65
  if ( $this->language_avaialable_not_installed() ) {
66
  add_meta_box('um-metaboxes-sidebox-2', __('Language','ultimatemember'), array(&$this, 'dl_language'), $this->pagehook, 'side', 'core');
60
 
61
  add_meta_box('um-metaboxes-contentbox-1', __('Users Overview','ultimatemember'), array(&$this, 'users_overview'), $this->pagehook, 'core', 'core');
62
 
63
+ add_meta_box('um-metaboxes-sidebox-1', __('Purge Temp Files','ultimatemember'), array(&$this, 'purge_temp'), $this->pagehook, 'side', 'core');
64
 
65
  if ( $this->language_avaialable_not_installed() ) {
66
  add_meta_box('um-metaboxes-sidebox-2', __('Language','ultimatemember'), array(&$this, 'dl_language'), $this->pagehook, 'side', 'core');
core/um-account.php CHANGED
@@ -255,8 +255,6 @@ class UM_Account {
255
 
256
  do_action("um_before_{$mode}_form_is_loaded", $args);
257
 
258
- do_action("um_before_{$template}_form_is_loaded", $args);
259
-
260
  $this->template_load( $template, $args );
261
 
262
  if ( !is_admin() && !defined( 'DOING_AJAX' ) ) {
255
 
256
  do_action("um_before_{$mode}_form_is_loaded", $args);
257
 
 
 
258
  $this->template_load( $template, $args );
259
 
260
  if ( !is_admin() && !defined( 'DOING_AJAX' ) ) {
core/um-actions-account.php CHANGED
@@ -32,10 +32,12 @@
32
  if ( current_user_can('delete_users') || um_user('can_delete_profile') ) {
33
  if ( !um_user('super_admin') ) {
34
  $ultimatemember->user->delete();
35
- if ( um_user('after_delete') == 'redirect_home' ) {
36
  um_redirect_home();
37
- } else {
38
  exit( wp_redirect( um_user('delete_redirect_url') ) );
 
 
39
  }
40
  }
41
  }
@@ -60,24 +62,29 @@
60
  function um_submit_account_errors_hook( $args ) {
61
  global $ultimatemember;
62
 
63
- if ( isset($_POST['first_name']) && strlen(trim( $_POST['first_name'] ) ) == 0 ) {
64
- $ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
65
- }
66
-
67
- if ( isset($_POST['last_name']) && strlen(trim( $_POST['last_name'] ) ) == 0 ) {
68
- $ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
69
- }
70
-
71
- if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
72
- $ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
73
- }
 
 
 
 
 
 
 
74
 
75
- if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
76
- $ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
77
  }
78
-
79
  $ultimatemember->account->current_tab = 'general';
80
 
 
81
  if ( $_POST['current_user_password'] != '' ) {
82
  if ( !wp_check_password( $_POST['current_user_password'], um_user('user_pass'), um_user('ID') ) ) {
83
  $ultimatemember->form->add_error('current_user_password', __('This is not your password','ultimatemember') );
@@ -109,6 +116,7 @@
109
  }
110
  }
111
 
 
112
  if ( isset($_POST['um_account_submit']) && $_POST['um_account_submit'] == __('Delete Account','ultimatemember') ) {
113
  if ( strlen(trim( $_POST['single_user_password'] ) ) == 0 ) {
114
  $ultimatemember->form->add_error('single_user_password', __('You must enter your password','ultimatemember') );
32
  if ( current_user_can('delete_users') || um_user('can_delete_profile') ) {
33
  if ( !um_user('super_admin') ) {
34
  $ultimatemember->user->delete();
35
+ if ( um_user('after_delete') && um_user('after_delete') == 'redirect_home' ) {
36
  um_redirect_home();
37
+ } elseif ( um_user('delete_redirect_url') ) {
38
  exit( wp_redirect( um_user('delete_redirect_url') ) );
39
+ } else {
40
+ um_redirect_home();
41
  }
42
  }
43
  }
62
  function um_submit_account_errors_hook( $args ) {
63
  global $ultimatemember;
64
 
65
+ // errors on general tab
66
+ if ( isset($_POST['um_account_submit']) && !$_POST['um_account_submit'] == __('Delete Account','ultimatemember') ) {
67
+
68
+ if ( isset($_POST['first_name']) && strlen(trim( $_POST['first_name'] ) ) == 0 ) {
69
+ $ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
70
+ }
71
+
72
+ if ( isset($_POST['last_name']) && strlen(trim( $_POST['last_name'] ) ) == 0 ) {
73
+ $ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
74
+ }
75
+
76
+ if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
77
+ $ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
78
+ }
79
+
80
+ if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
81
+ $ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
82
+ }
83
 
 
 
84
  }
 
85
  $ultimatemember->account->current_tab = 'general';
86
 
87
+ // change password
88
  if ( $_POST['current_user_password'] != '' ) {
89
  if ( !wp_check_password( $_POST['current_user_password'], um_user('user_pass'), um_user('ID') ) ) {
90
  $ultimatemember->form->add_error('current_user_password', __('This is not your password','ultimatemember') );
116
  }
117
  }
118
 
119
+ // delete account
120
  if ( isset($_POST['um_account_submit']) && $_POST['um_account_submit'] == __('Delete Account','ultimatemember') ) {
121
  if ( strlen(trim( $_POST['single_user_password'] ) ) == 0 ) {
122
  $ultimatemember->form->add_error('single_user_password', __('You must enter your password','ultimatemember') );
core/um-actions-register.php CHANGED
@@ -236,18 +236,24 @@
236
  // DO NOT add when reviewing user's details
237
  if ( isset( $ultimatemember->user->preview ) && $ultimatemember->user->preview == true && is_admin() ) return;
238
 
 
 
 
 
 
 
239
  ?>
240
 
241
  <div class="um-col-alt">
242
 
243
  <?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
244
 
245
- <div class="um-left um-half"><input type="submit" value="<?php echo $args['primary_btn_word']; ?>" class="um-button" /></div>
246
- <div class="um-right um-half"><a href="<?php echo um_get_core_page('login'); ?>" class="um-button um-alt"><?php echo $args['secondary_btn_word']; ?></a></div>
247
 
248
  <?php } else { ?>
249
 
250
- <div class="um-center"><input type="submit" value="<?php echo $args['primary_btn_word']; ?>" class="um-button" /></div>
251
 
252
  <?php } ?>
253
 
236
  // DO NOT add when reviewing user's details
237
  if ( isset( $ultimatemember->user->preview ) && $ultimatemember->user->preview == true && is_admin() ) return;
238
 
239
+ $primary_btn_word = $args['primary_btn_word'];
240
+ $primary_btn_word = apply_filters('um_register_form_button_one', $primary_btn_word);
241
+
242
+ $secondary_btn_word = $args['secondary_btn_word'];
243
+ $secondary_btn_word = apply_filters('um_register_form_button_two', $secondary_btn_word);
244
+
245
  ?>
246
 
247
  <div class="um-col-alt">
248
 
249
  <?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
250
 
251
+ <div class="um-left um-half"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
252
+ <div class="um-right um-half"><a href="<?php echo um_get_core_page('login'); ?>" class="um-button um-alt"><?php echo $secondary_btn_word; ?></a></div>
253
 
254
  <?php } else { ?>
255
 
256
+ <div class="um-center"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
257
 
258
  <?php } ?>
259
 
core/um-password.php CHANGED
@@ -177,9 +177,7 @@ class UM_Password {
177
  do_action("um_before_form_is_loaded", $args);
178
 
179
  do_action("um_before_{$mode}_form_is_loaded", $args);
180
-
181
- do_action("um_before_{$template}_form_is_loaded", $args);
182
-
183
  $this->template_load( $template, $args );
184
 
185
  if ( !is_admin() && !defined( 'DOING_AJAX' ) ) {
177
  do_action("um_before_form_is_loaded", $args);
178
 
179
  do_action("um_before_{$mode}_form_is_loaded", $args);
180
+
 
 
181
  $this->template_load( $template, $args );
182
 
183
  if ( !is_admin() && !defined( 'DOING_AJAX' ) ) {
core/um-shortcodes.php CHANGED
@@ -111,9 +111,7 @@ class UM_Shortcodes {
111
  do_action("um_before_form_is_loaded", $args);
112
 
113
  do_action("um_before_{$mode}_form_is_loaded", $args);
114
-
115
- do_action("um_before_{$template}_form_is_loaded", $args);
116
-
117
  $this->template_load( $template, $args );
118
 
119
  $this->dynamic_css( $args );
111
  do_action("um_before_form_is_loaded", $args);
112
 
113
  do_action("um_before_{$mode}_form_is_loaded", $args);
114
+
 
 
115
  $this->template_load( $template, $args );
116
 
117
  $this->dynamic_css( $args );
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.62
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.63
7
  Author: Ultimate Member
8
  Author URI: http://ultimatemember.com/
9
  */
readme.txt CHANGED
@@ -7,7 +7,7 @@ Tags: access control, author, authors, author profile, comments, community, comm
7
  Requires at least: 4.1
8
  Tested up to: 4.1.1
9
 
10
- Stable Tag: 1.0.62
11
 
12
  License: GNU Version 2 or Any Later Version
13
 
@@ -189,6 +189,14 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
189
 
190
  == Changelog ==
191
 
 
 
 
 
 
 
 
 
192
  = 1.0.62: February 20, 2015 =
193
 
194
  * New: added Polish (Polski) language
7
  Requires at least: 4.1
8
  Tested up to: 4.1.1
9
 
10
+ Stable Tag: 1.0.63
11
 
12
  License: GNU Version 2 or Any Later Version
13
 
189
 
190
  == Changelog ==
191
 
192
+ = 1.0.63: February 21, 2015 =
193
+
194
+ * Tweak: minor changes to dashboard widgets
195
+ * Tweak: cleaned dashboard js
196
+ * Tweak: a few action hooks refined
197
+ * Tweak: added filters to registration form buttons
198
+ * Fixed: issue with delete account feature
199
+
200
  = 1.0.62: February 20, 2015 =
201
 
202
  * New: added Polish (Polski) language