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

Update 1.0.64

Browse Source
This commit is contained in:
ultimatemember
2015-02-23 01:43:11 +02:00
parent 6bc9419c06
commit e341d4e965
13 changed files with 84 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-dashboard.css
+20
View File
@@ -71,6 +71,26 @@
font-size: 18px;
}
.um-metabox-holder .norm i {
display: inline-block;
width: 30px;
text-align: center;
}
.um-metabox-holder .norm p {
margin: 5px 0;
}
.um-metabox-holder .norm .count {
font-size: 16px;
font-family: Gerogia;
color: #999;
width: 40px;
display: inline-block;
text-align: right;
margin-right: 10px;
}
/* Share bar */
.um-admin-dash-share {
admin/assets/js/um-admin-dashboard.js
-25
View File
@@ -1,28 +1,3 @@
jQuery(document).ready(function() {
/**
var active_tab = jQuery('.um-admin-dash-nav a.active').attr('data-rel');
jQuery('.um-admin-dash-content').hide();
jQuery('.um-admin-dash-content#'+active_tab).show();
draw_linechart();
chart_ready = 0;
jQuery(document).on('click', '.um-admin-dash-nav a', function(e){
e.preventDefault();
active_tab = jQuery(this).attr('data-rel');
jQuery('.um-admin-dash-nav a').removeClass('active');
jQuery(this).addClass('active');
jQuery('.um-admin-dash-content').hide();
jQuery('.um-admin-dash-content#'+active_tab).show();
if ( chart_ready == 0 ) {
draw_linechart();
chart_ready = 1;
}
return false;
});
**/
});
admin/core/um-admin-dashboard.php
+2 -2
View File
@@ -60,7 +60,7 @@ class UM_Admin_Dashboard {
add_meta_box('um-metaboxes-contentbox-1', __('Users Overview','ultimatemember'), array(&$this, 'users_overview'), $this->pagehook, 'core', 'core');
add_meta_box('um-metaboxes-mainbox-1', __('Purge Temp Files','ultimatemember'), array(&$this, 'purge_temp'), $this->pagehook, 'normal', 'core');
add_meta_box('um-metaboxes-sidebox-1', __('Purge Temp Files','ultimatemember'), array(&$this, 'purge_temp'), $this->pagehook, 'side', 'core');
if ( $this->language_avaialable_not_installed() ) {
add_meta_box('um-metaboxes-sidebox-2', __('Language','ultimatemember'), array(&$this, 'dl_language'), $this->pagehook, 'side', 'core');
@@ -105,7 +105,7 @@ class UM_Admin_Dashboard {
***/
function language_not_available() {
$locale = get_option('WPLANG');
if ( $locale && !isset( $ultimatemember->available_languages[$locale] ) && !file_exists( WP_LANG_DIR . '/plugins/ultimatemember-' . $locale . '.mo' ) )
if ( $locale && !strstr($locale, 'en_') && !isset( $ultimatemember->available_languages[$locale] ) && !file_exists( WP_LANG_DIR . '/plugins/ultimatemember-' . $locale . '.mo' ) )
return true;
return false;
}
admin/core/um-admin-notices.php
+1
View File
@@ -74,6 +74,7 @@ class UM_Admin_Notices {
$locale = get_option('WPLANG');
if ( !$locale ) return;
if ( strstr( $locale, 'en_' ) ) return; // really, english!
if ( file_exists( WP_LANG_DIR . '/plugins/ultimatemember-' . $locale . '.mo' ) ) return;
if ( isset( $ultimatemember->available_languages[$locale] ) ) {
assets/css/um-styles.css
+6 -5
View File
@@ -309,8 +309,6 @@ p.um-notice.err {
.um-field-label .um-field-label-icon i { font-size: 22px; height: 22px; line-height: 22px; vertical-align: middle; }
.um-field-label label {
display: inline-block !important;
height: 22px;
font-size: 15px !important;
line-height: 22px !important;
font-weight: bold;
@@ -439,7 +437,7 @@ p.um-notice.err {
display: block;
margin: 8px 0;
position: relative;
cursor: pointer;
cursor: pointer !important;
}
.um-field-checkbox:hover i, .um-field-radio:hover i {color: #666}
@@ -447,6 +445,9 @@ p.um-notice.err {
.um-field-checkbox input,
.um-field-radio input{
opacity: 0 !important;
display: inline !important;
width: 0 !important;
float: left;
}
.um-field-checkbox-state,
@@ -469,10 +470,10 @@ p.um-notice.err {
.um-field-checkbox-option,
.um-field-radio-option {
margin: 0 0 0 22px;
margin: 0px 0px 0px 36px;
line-height: 24px;
color: #888 !important;
display: inline-block;
display: block;
}
/*
assets/css/um.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
core/um-account.php
-2
View File
@@ -255,8 +255,6 @@ class UM_Account {
do_action("um_before_{$mode}_form_is_loaded", $args);
do_action("um_before_{$template}_form_is_loaded", $args);
$this->template_load( $template, $args );
if ( !is_admin() && !defined( 'DOING_AJAX' ) ) {
core/um-actions-account.php
+25 -17
View File
@@ -32,10 +32,12 @@
if ( current_user_can('delete_users') || um_user('can_delete_profile') ) {
if ( !um_user('super_admin') ) {
$ultimatemember->user->delete();
if ( um_user('after_delete') == 'redirect_home' ) {
if ( um_user('after_delete') && um_user('after_delete') == 'redirect_home' ) {
um_redirect_home();
} else {
} elseif ( um_user('delete_redirect_url') ) {
exit( wp_redirect( um_user('delete_redirect_url') ) );
} else {
um_redirect_home();
}
}
}
@@ -60,24 +62,29 @@
function um_submit_account_errors_hook( $args ) {
global $ultimatemember;
if ( isset($_POST['first_name']) && strlen(trim( $_POST['first_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
// errors on general tab
if ( isset($_POST['um_account_submit']) && !$_POST['um_account_submit'] == __('Delete Account','ultimatemember') ) {
if ( isset($_POST['first_name']) && strlen(trim( $_POST['first_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
if ( isset($_POST['last_name']) && strlen(trim( $_POST['last_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
$ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
$ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
if ( isset($_POST['last_name']) && strlen(trim( $_POST['last_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
$ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
$ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
$ultimatemember->account->current_tab = 'general';
// change password
if ( $_POST['current_user_password'] != '' ) {
if ( !wp_check_password( $_POST['current_user_password'], um_user('user_pass'), um_user('ID') ) ) {
$ultimatemember->form->add_error('current_user_password', __('This is not your password','ultimatemember') );
@@ -109,6 +116,7 @@
}
}
// delete account
if ( isset($_POST['um_account_submit']) && $_POST['um_account_submit'] == __('Delete Account','ultimatemember') ) {
if ( strlen(trim( $_POST['single_user_password'] ) ) == 0 ) {
$ultimatemember->form->add_error('single_user_password', __('You must enter your password','ultimatemember') );
@@ -330,7 +338,7 @@
$current_tab = $ultimatemember->account->current_tab;
if ( um_get_option('account_tab_'.$id ) == 1 || $id == 'general' ) { ?>
if ( isset($info['custom']) || um_get_option('account_tab_'.$id ) == 1 || $id == 'general' ) { ?>
<li>
<a data-tab="<?php echo $id; ?>" href="<?php echo $ultimatemember->account->tab_link($id); ?>" class="um-account-link <?php if ( $id == $current_tab ) echo 'current'; ?>">
core/um-actions-register.php
+10 -4
View File
@@ -98,7 +98,7 @@
$ultimatemember->user->set_plain_password( $args['user_password'] );
do_action('um_post_registration_save', $user_id, $args);
do_action('um_post_registration_listener', $user_id, $args);
do_action('um_post_registration', $user_id, $args);
@@ -236,18 +236,24 @@
// DO NOT add when reviewing user's details
if ( isset( $ultimatemember->user->preview ) && $ultimatemember->user->preview == true && is_admin() ) return;
$primary_btn_word = $args['primary_btn_word'];
$primary_btn_word = apply_filters('um_register_form_button_one', $primary_btn_word);
$secondary_btn_word = $args['secondary_btn_word'];
$secondary_btn_word = apply_filters('um_register_form_button_two', $secondary_btn_word);
?>
<div class="um-col-alt">
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
<div class="um-left um-half"><input type="submit" value="<?php echo $args['primary_btn_word']; ?>" class="um-button" /></div>
<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>
<div class="um-left um-half"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
<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>
<?php } else { ?>
<div class="um-center"><input type="submit" value="<?php echo $args['primary_btn_word']; ?>" class="um-button" /></div>
<div class="um-center"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
<?php } ?>
core/um-password.php
+1 -3
View File
@@ -177,9 +177,7 @@ class UM_Password {
do_action("um_before_form_is_loaded", $args);
do_action("um_before_{$mode}_form_is_loaded", $args);
do_action("um_before_{$template}_form_is_loaded", $args);
$this->template_load( $template, $args );
if ( !is_admin() && !defined( 'DOING_AJAX' ) ) {
core/um-shortcodes.php
+1 -3
View File
@@ -111,9 +111,7 @@ class UM_Shortcodes {
do_action("um_before_form_is_loaded", $args);
do_action("um_before_{$mode}_form_is_loaded", $args);
do_action("um_before_{$template}_form_is_loaded", $args);
$this->template_load( $template, $args );
$this->dynamic_css( $args );
index.php
+1 -1
View File
@@ -3,7 +3,7 @@
Plugin Name: Ultimate Member
Plugin URI: http://ultimatemember.com/
Description: Ultimate Member is a powerful community and membership plugin that allows you to create beautiful community and membership sites with WordPress
Version: 1.0.62
Version: 1.0.64
Author: Ultimate Member
Author URI: http://ultimatemember.com/
*/
readme.txt
+16 -1
View File
@@ -7,7 +7,7 @@ Tags: access control, author, authors, author profile, comments, community, comm
Requires at least: 4.1
Tested up to: 4.1.1
Stable Tag: 1.0.62
Stable Tag: 1.0.64
License: GNU Version 2 or Any Later Version
@@ -189,6 +189,21 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
== Changelog ==
= 1.0.64: February 22, 2015 =
* Tweak: updated language files on server
* Tweak: modified account page hooks to accept custom hooks easily
* Fixed: important css issues with safari browser
* Fixed: language notice will no longer show on (English UK/Other) wordpress sites
= 1.0.63: February 21, 2015 =
* Tweak: minor changes to dashboard widgets
* Tweak: cleaned dashboard js
* Tweak: a few action hooks refined
* Tweak: added filters to registration form buttons
* Fixed: issue with delete account feature
= 1.0.62: February 20, 2015 =
* New: added Polish (Polski) language