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

Update 1.0.85

Browse Source
This commit is contained in:
ultimatemember
2015-03-14 23:39:33 +02:00
parent 506593f409
commit 5815557192
27 changed files with 238 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-columns.css
+6 -1
View File
@@ -64,4 +64,9 @@
.um-adm-ico.inactive {color: #C74A4A}
.um-adm-ico.pointer {cursor: pointer}
.um-adm-ico.pointer {cursor: pointer}
.um-admin-icontext i {
font-size: 18px;
margin: 0 5px 0 0;
}
admin/assets/css/um-admin-dashboard.css
+5
View File
@@ -35,6 +35,11 @@
/* Dashboard widgets */
.p_seperate {
margin-top: 12px;
border-top: 1px solid #ddd;
}
.um-metabox-holder p.sub {
padding: 0 4px 2px 4px;
margin: 0 0 8px 0;
admin/assets/css/um-admin-form.css
+5
View File
@@ -7,6 +7,11 @@
-moz-osx-font-smoothing: grayscale !important;
}
.um-admin-metabox h6 {
font-size: 14px;
margin: 12px 0 0 0;
}
/*
- Metabox layout
*/
admin/core/um-admin-dashboard.php
+1 -1
View File
@@ -44,7 +44,7 @@ class UM_Admin_Dashboard {
do_action('um_extend_admin_menu');
add_submenu_page( $this->slug, __('Extensions', $this->slug), '<span style="color: #19e0ff">' .__('Extensions', $this->slug) . '</span>', 'manage_options', $this->slug . '-extensions', array(&$this, 'admin_page') );
add_submenu_page( $this->slug, __('Extensions', $this->slug), '<span style="color: #3dc3e5">' .__('Extensions', $this->slug) . '</span>', 'manage_options', $this->slug . '-extensions', array(&$this, 'admin_page') );
}
admin/templates/extensions.php
+77 -55
View File
@@ -1,89 +1,111 @@
<?php
$premium['social-login'] = array(
'url' => 'https://ultimatemember.com/extensions/social-login/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/sociallogin.png',
'name' => 'Social Login',
'desc' => 'This extension allows users to register and login to your site using their social network accounts (Facebook, Twitter, Google+, LinkedIn)',
);
$premium['bbpress'] = array(
'url' => 'https://ultimatemember.com/extensions/bbpress/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/bbpress-copy.png',
'name' => 'bbPress',
'desc' => 'Integrates the popular forums plugin bbPress with Ultimate Member.',
);
$premium['mailchimp'] = array(
'url' => 'https://ultimatemember.com/extensions/mailchimp/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/mailchimp-01-copy.png',
'name' => 'MailChimp',
'desc' => 'This extension integrates MailChimp with Ultimate Member and allows users to subscribe to your mailing lists when they register on your site.',
);
$premium['mycred'] = array(
'url' => 'https://ultimatemember.com/extensions/mycred/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/mycred1.png',
'name' => 'myCRED',
'desc' => 'With our myCRED extension, reward or charge your users for using Ultimate Member features and doing profile updates and show their rank and badges beautifully in their user profile.',
);
$premium['notices'] = array(
'url' => 'https://ultimatemember.com/extensions/notices/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/notices.png',
'name' => 'Notices',
'desc' => 'Alert users to important information or let them know about promotions or new features using conditional notices.',
);
$free['google-recaptcha'] = array(
'url' => 'https://ultimatemember.com/extensions/google-recaptcha/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/recaptcha-01-copy.png',
'name' => 'Google reCAPTCHA',
'desc' => 'This free Google reCAPTCHA extension helps you stop spam registrations on your WordPress site.',
);
?>
<div id="um-extensions-wrap" class="wrap">
<h2>Ultimate Member - Extensions</h2>
<div class="wp-filter">
<p>Our free & paid extensions help you extend the functionality of your community powered by Ultimate Member.</p>
<ul class="filter-links">
<li><a href='?page=ultimatemember-extensions&filter=premium' class='<?php if ( !isset($_REQUEST['filter']) || isset( $_REQUEST['filter'] ) && $_REQUEST['filter'] == 'premium' ) { echo 'current'; } ?>'>Premium</a></li>
<li><a href='?page=ultimatemember-extensions&filter=free' class='<?php if ( isset( $_REQUEST['filter'] ) && $_REQUEST['filter'] == 'free' ) { echo 'current'; } ?>'>Free</a></li>
</ul>
</div>
<div class="wp-list-table widefat plugin-install">
<div id="the-list">
<?php if ( !isset($_REQUEST['filter']) || isset( $_REQUEST['filter'] ) && $_REQUEST['filter'] == 'premium' ) { ?>
<?php foreach( $premium as $key => $info ) { ?>
<div class="plugin-card">
<a href="https://ultimatemember.com/extensions/mailchimp/" class="plugin-image"><img src="https://ultimatemember.com/wp-content/uploads/2015/02/mailchimp-01-copy.png" /></a>
<a href="<?php echo $info['url']; ?>" class="plugin-image"><img src="<?php echo $info['image']; ?>" /></a>
<div class="plugin-card-top">
<div class="name column-name">
<h4><a href="https://ultimatemember.com/extensions/mailchimp/">MailChimp</a></h4>
<h4><a href="<?php echo $info['url']; ?>"><?php echo $info['name']; ?></a></h4>
</div>
<div class="action-links">
<ul class="plugin-action-buttons"><li><a class="install-now button" href="https://ultimatemember.com/extensions/mailchimp/">Buy Now</a></li>
<li><a href="https://ultimatemember.com/extensions/mailchimp/">More Details</a></li></ul> </div>
<ul class="plugin-action-buttons"><li><a class="install-now button" href="<?php echo $info['url']; ?>">Get this Add on</a></li>
<li><a href="<?php echo $info['url']; ?>">More Details</a></li></ul>
</div>
<div class="desc column-description">
<p>This extension integrates MailChimp with Ultimate Member and allows users to subscribe to your mailing lists when they register on your site.</p>
<p><?php echo $info['desc']; ?></p>
</div>
</div>
</div>
<?php }
} ?>
<?php if ( isset( $_REQUEST['filter'] ) && $_REQUEST['filter'] == 'free' ) { ?>
<?php foreach( $free as $key => $info ) { ?>
<div class="plugin-card">
<a href="https://ultimatemember.com/extensions/social-login/" class="plugin-image"><img src="https://ultimatemember.com/wp-content/uploads/2015/02/sociallogin.png" /></a>
<a href="<?php echo $info['url']; ?>" class="plugin-image"><img src="<?php echo $info['image']; ?>" /></a>
<div class="plugin-card-top">
<div class="name column-name">
<h4><a href="https://ultimatemember.com/extensions/social-login/">Social Login</a></h4>
<h4><a href="<?php echo $info['url']; ?>"><?php echo $info['name']; ?></a></h4>
</div>
<div class="action-links">
<ul class="plugin-action-buttons"><li><a class="install-now button" href="https://ultimatemember.com/extensions/social-login/">Buy Now</a></li>
<li><a href="https://ultimatemember.com/extensions/social-login/">More Details</a></li></ul> </div>
<ul class="plugin-action-buttons"><li><a class="install-now button" href="<?php echo $info['url']; ?>">Get this Add on</a></li>
<li><a href="<?php echo $info['url']; ?>">More Details</a></li></ul>
</div>
<div class="desc column-description">
<p>The social login extension allows users to easily register/login to your site using their social network accounts (Facebook, Twitter, Google+, LinkedIn)</p>
<p><?php echo $info['desc']; ?></p>
</div>
</div>
</div>
<div class="plugin-card">
<a href="https://ultimatemember.com/extensions/bbpress/" class="plugin-image"><img src="https://ultimatemember.com/wp-content/uploads/2015/02/bbpress-copy.png" /></a>
<div class="plugin-card-top">
<div class="name column-name">
<h4><a href="https://ultimatemember.com/extensions/bbpress/">bbPress</a></h4>
</div>
<div class="action-links">
<ul class="plugin-action-buttons"><li><a class="install-now button" href="https://ultimatemember.com/extensions/bbpress/">Buy Now</a></li>
<li><a href="https://ultimatemember.com/extensions/bbpress/">More Details</a></li></ul> </div>
<div class="desc column-description">
<p>Integrates the popular forums plugin bbPress with Ultimate Member.</p>
</div>
</div>
</div>
<?php }
} ?>
<div class="plugin-card">
<a href="https://ultimatemember.com/extensions/mycred/" class="plugin-image"><img src="https://ultimatemember.com/wp-content/uploads/2015/02/mycred1.png" /></a>
<div class="plugin-card-top">
<div class="name column-name">
<h4><a href="https://ultimatemember.com/extensions/mycred/">myCRED</a></h4>
</div>
<div class="action-links">
<ul class="plugin-action-buttons"><li><a class="install-now button" href="https://ultimatemember.com/extensions/mycred/">Buy Now</a></li>
<li><a href="https://ultimatemember.com/extensions/mycred/">More Details</a></li></ul> </div>
<div class="desc column-description">
<p>With our myCRED extension, reward or charge your users for using Ultimate Member features and doing profile updates and show their rank and badges beautifully in their user profile.</p>
</div>
</div>
</div>
<div class="plugin-card">
<a href="https://ultimatemember.com/extensions/google-recaptcha/" class="plugin-image"><img src="https://ultimatemember.com/wp-content/uploads/2015/02/recaptcha-01-copy.png" /></a>
<div class="plugin-card-top">
<div class="name column-name">
<h4><a href="https://ultimatemember.com/extensions/google-recaptcha/">Google reCAPTCHA</a></h4>
</div>
<div class="action-links">
<ul class="plugin-action-buttons"><li><a class="install-now button" href="https://ultimatemember.com/extensions/google-recaptcha/">Download</a></li>
<li><a href="https://ultimatemember.com/extensions/google-recaptcha/">More Details</a></li></ul> </div>
<div class="desc column-description">
<p>With our free Google reCAPTCHA extension, you can stop spam registrations on your site easily.</p>
</div>
</div>
</div>
</div>
</div>
admin/templates/form/profile_customize.php
+9
View File
@@ -173,6 +173,15 @@
</span>
</p><div class="um-admin-clear"></div>
<p>
<label><?php _e('Show social links in profile header?','ultimatemember'); ?></label>
<span>
<?php $this->ui_on_off('_um_profile_show_social_links', 0 ); ?>
</span>
</p><div class="um-admin-clear"></div>
<p>
<label><?php _e('Show user description in profile header?','ultimatemember'); ?></label>
<span>
assets/css/um-misc.css
+14
View File
@@ -26,4 +26,18 @@
.um-misc-ul,
.um-misc-ul li {
font-size: 14px;
}
/* profile misc */
.um-profile-connect.um-member-connect {
padding: 5px 0 10px 0;
}
.um-profile-connect.um-member-connect a {
text-align: center;
width: 36px;
line-height: 36px;
height: 36px;
font-size: 20px;
}
assets/css/um-profile.css
+25 -5
View File
@@ -347,12 +347,13 @@ font-weight: normal;
text-align: center;
}
.um-profile-nav-item.active a {
.um-profile-nav-item.active a,
.um-profile-nav-item.active a:hover {
background: #3ba1da;
color: #FFF!important;
}
.um-profile-nav-item.active a span.count {background: transparent}
.um-profile-nav-item.active a span.count {background: transparent;padding: 4px 0;color: #fff}
.um-profile-nav-item a {
color: #fff!important;
@@ -377,9 +378,10 @@ font-weight: normal;
.um-profile-nav-item span.count {
font-size: 12px;
font-weight: 300;
background: #777;
background: #ddd;
color: #666;
border-radius: 3px;
padding: 2px 4px;
padding: 4px 8px;
margin-left: 3px;
}
@@ -446,12 +448,30 @@ font-weight: normal;
.um-item-link i {
font-size: 24px;
color: #ccc;
color: #666;
margin-right: 10px;
position: relative;
top: 3px;
}
.um-item-img {
padding: 10px 0 0 0;
}
.um-item-img a {
display: inline-block;
padding: 8px;
border-radius: 3px;
border: 1px solid #ddd;
}
.um-item-img a:hover {border-color: #bbb}
.um-item-img img {
max-width: 100%;
border-radius: 3px;
}
.um-item-meta {color: #888}
.um-item-meta span {
assets/css/um.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/js/um-profile.js
+2
View File
@@ -29,8 +29,10 @@ jQuery(document).ready(function() {
});
jQuery(document).on('click', '.um-photo-modal', function(e){
e.preventDefault();
var photo_src = jQuery(this).attr('data-src');
um_new_modal('um_view_photo', 'fit', true, photo_src );
return false;
});
jQuery(document).on('click', '.um-reset-profile-photo', function(e){
assets/js/um.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
core/lib/upload/um-file-upload.php
+2
View File
@@ -31,5 +31,7 @@ if(isset($_FILES[$id]['name'])) {
}
} else {
$ret['error'] = __('Theme Compatibility Issue.','ultimatemember');
}
echo json_encode($ret);
core/lib/upload/um-image-upload.php
+2
View File
@@ -32,5 +32,7 @@ if(isset($_FILES[$id]['name'])) {
}
} else {
$ret['error'] = __('Theme Compatibility Issue.','ultimatemember');
}
echo json_encode($ret);
core/um-actions-global.php
+1 -1
View File
@@ -46,7 +46,7 @@
/***
*** @empty the honeypot value
***/
add_action('wp_footer', 'um_add_form_honeypot_js');
add_action('wp_footer', 'um_add_form_honeypot_js', 99999999999999999 );
function um_add_form_honeypot_js() { global $ultimatemember; ?>
<script type="text/javascript">jQuery( '#<?php echo $ultimatemember->honeypot; ?>' ).val( '' );</script>
core/um-actions-profile.php
+16
View File
@@ -242,6 +242,21 @@
}
/***
*** @Show social links as icons below profile name
***/
add_action('um_after_profile_header_name_args','um_social_links_icons', 50 );
function um_social_links_icons( $args ) {
global $ultimatemember;
if ( isset($args['show_social_links']) && $args['show_social_links'] ) {
echo '<div class="um-profile-connect um-member-connect">';
echo $ultimatemember->fields->show_social_urls();
echo '</div>';
}
}
/***
*** @profile header
***/
@@ -320,6 +335,7 @@
<div class="um-clear"></div>
<?php do_action('um_after_profile_header_name_args', $args ); ?>
<?php do_action('um_after_profile_header_name'); ?>
</div>
core/um-cache.php
+3 -2
View File
@@ -10,9 +10,10 @@ class UM_Cache {
function do_not_cache() {
if ( um_is_core_uri() )
if ( um_is_core_uri() ) {
define( "DONOTCACHEPAGE", true );
}
}
}
core/um-fields.php
+1 -1
View File
@@ -41,7 +41,7 @@ class UM_Fields {
foreach( $social as $k => $arr ) {
if ( um_profile( $k ) ) { ?>
<a href="<?php echo um_filtered_social_link( $k , $arr['match'] ); ?>" style="background: <?php echo $arr['color']; ?>;" target="_blank"><i class="<?php echo $arr['icon']; ?>"></i></a>
<a href="<?php echo um_filtered_social_link( $k , $arr['match'] ); ?>" style="background: <?php echo $arr['color']; ?>;" target="_blank" class="um-tip-n" title="<?php echo $arr['title']; ?>"><i class="<?php echo $arr['icon']; ?>"></i></a>
<?php
}
core/um-files.php
+2 -2
View File
@@ -314,7 +314,7 @@ class UM_Files {
if ( $fileinfo['invalid_image'] == true ) {
$error = sprintf(__('Your image is invalid or too large!','ultimatemember') );
} elseif ( !$this->in_array( $fileinfo['extension'], $data['allowed_types'] ) ) {
$error = $data['extension_error'];
$error = ( isset( $data['extension_error'] ) && !empty( $data['extension_error'] ) ) ? $data['extension_error'] : 'not allowed';
} elseif ( isset($data['min_size']) && ( $fileinfo['size'] < $data['min_size'] ) ) {
$error = $data['min_size_error'];
} elseif ( isset($data['min_width']) && ( $fileinfo['width'] < $data['min_width'] ) ) {
@@ -337,7 +337,7 @@ class UM_Files {
$data = $ultimatemember->fields->get_field($field);
if ( !$this->in_array( $extension, $data['allowed_types'] ) ) {
$error = $data['extension_error'];
$error = ( isset( $data['extension_error'] ) && !empty( $data['extension_error'] ) ) ? $data['extension_error'] : 'not allowed';
} elseif ( isset($data['min_size']) && ( $fileinfo['size'] < $data['min_size'] ) ) {
$error = $data['min_size_error'];
}
core/um-setup.php
+1
View File
@@ -91,6 +91,7 @@ class UM_Setup {
'_um_secondary_btn_hover' => '#e5e5e5',
'_um_secondary_btn_text' => '#666',
'_um_profile_show_name' => 1,
'_um_profile_show_social_links' => 0,
'_um_profile_show_bio' => 1,
'_um_profile_bio_maxchars' => 180,
'_um_profile_header_menu' => 'bc',
core/um-shortcodes.php
+24
View File
@@ -10,6 +10,30 @@ class UM_Shortcodes {
add_shortcode('ultimatemember', array(&$this, 'ultimatemember'), 1);
add_filter( 'body_class', array(&$this, 'body_class'), 0 );
}
/***
*** @extend body classes
***/
function body_class( $classes ) {
global $ultimatemember;
$array = $ultimatemember->permalinks->core;
foreach( $array as $slug => $info ) {
if ( um_is_core_page( $slug ) ) {
$classes[] = 'um-page-' . $slug;
}
}
if ( is_user_logged_in() ) {
$classes[] = 'um-page-loggedin';
} else {
$classes[] = 'um-page-loggedout';
}
return $classes;
}
/***
core/um-user-posts.php
+1 -1
View File
@@ -52,7 +52,7 @@ class UM_User_posts {
$ultimatemember->shortcodes->modified_args = "$post_type,$posts_per_page,$offset_n,$author";
$ultimatemember->shortcodes->loop = $ultimatemember->query->make("post_type=$post_type&number=$posts_per_page&offset=$offset&author_email=$author");
$ultimatemember->shortcodes->loop = $ultimatemember->query->make("post_type=$post_type&number=$posts_per_page&offset=$offset&user_id=$author");
$ultimatemember->shortcodes->load_template('profile/comments-single');
index.php
+1 -1
View File
@@ -3,7 +3,7 @@
Plugin Name: Ultimate Member
Plugin URI: http://ultimatemember.com/
Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
Version: 1.0.83
Version: 1.0.85
Author: Ultimate Member
Author URI: http://ultimatemember.com/
*/
readme.txt
+14 -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.83
Stable Tag: 1.0.85
License: GNU Version 2 or Any Later Version
@@ -202,6 +202,19 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
== Changelog ==
= 1.0.85: March 14, 2015 =
* New: added option to show user social links in profile header (optional)
* New: added option to display post featured image in profile "posts" tab
* Tweak: improved error reporting for theme conflicts on photo upload
* Fixed: issue with comments tab on profile
= 1.0.84: March 13, 2015 =
* New: adds automatic body class to UM core pages automatically
* Fixed: important jQuery issue
* Fixed: upload security issue - extension error was empty
= 1.0.83: March 12, 2015 =
* New: added a logout template If user is already logged in (customizable)
templates/profile/comments-single.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php foreach( $ultimatemember->shortcodes->loop as $comment ) { ?>
<div class="um-item">
<div class="um-item-link"><a href="<?php echo get_comment_link( $comment->comment_ID ); ?>"><?php echo get_comment_excerpt( $comment->comment_ID ); ?></a></div>
<div class="um-item-link"><i class="um-icon-chatboxes"></i><a href="<?php echo get_comment_link( $comment->comment_ID ); ?>"><?php echo get_comment_excerpt( $comment->comment_ID ); ?></a></div>
<div class="um-item-meta">
<span><?php printf(__('On <a href="%1$s">%2$s</a>','ultimatemember'), get_permalink($comment->comment_post_ID), get_the_title($comment->comment_post_ID) ); ?></span>
</div>
templates/profile/comments.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php $ultimatemember->shortcodes->loop = $ultimatemember->query->make('post_type=comment&number=10&offset=0&author_email=' . um_user('user_email') ); ?>
<?php $ultimatemember->shortcodes->loop = $ultimatemember->query->make('post_type=comment&number=10&offset=0&user_id=' . um_user('ID') ); ?>
<?php if ( $ultimatemember->shortcodes->loop ) { ?>
@@ -11,7 +11,7 @@
<?php if ( count($ultimatemember->shortcodes->loop) >= 10 ) { ?>
<div class="um-load-items">
<a href="#" class="um-ajax-paginate um-button" data-hook="um_load_comments" data-args="comment,10,10,<?php echo um_user('user_email'); ?>"><?php _e('load more comments','ultimatemember'); ?></a>
<a href="#" class="um-ajax-paginate um-button" data-hook="um_load_comments" data-args="comment,10,10,<?php echo um_user('ID'); ?>"><?php _e('load more comments','ultimatemember'); ?></a>
</div>
<?php } ?>
templates/profile/posts-single.php
+11 -1
View File
@@ -1,7 +1,17 @@
<?php while ($ultimatemember->shortcodes->loop->have_posts()) { $ultimatemember->shortcodes->loop->the_post(); $post_id = get_the_ID(); ?>
<div class="um-item">
<div class="um-item-link"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></div>
<div class="um-item-link"><i class="um-icon-ios-paper"></i><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></div>
<?php if ( has_post_thumbnail( $post_id ) ) {
$image_id = get_post_thumbnail_id( $post_id );
$image_url = wp_get_attachment_image_src( $image_id, 'full', true );
?>
<div class="um-item-img"><a href="#" class="um-photo-modal" data-src="<?php echo $image_url[0]; ?>"><?php echo get_the_post_thumbnail( $post_id, 'medium' ); ?></a></div>
<?php } ?>
<div class="um-item-meta">
<span><?php echo sprintf(__('%s ago','ultimatemember'), human_time_diff( get_the_time('U'), current_time('timestamp') ) ); ?></span>
<span>in: <?php the_category( ', ' ); ?></span>
um-config.php
+10
View File
@@ -1378,6 +1378,16 @@ $this->sections[] = array(
'off' => __('Off','ultimatemember'),
),
array(
'id' => 'profile_show_social_links',
'type' => 'switch',
'title' => __( 'Show social links in profile header','ultimatemember' ),
'default' => um_get_metadefault('profile_show_social_links'),
'desc' => __('Switch on/off the social links on profile header','ultimatemember'),
'on' => __('On','ultimatemember'),
'off' => __('Off','ultimatemember'),
),
array(
'id' => 'profile_show_bio',
'type' => 'switch',