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.1.6

Browse Source
This commit is contained in:
ultimatemember
2015-04-07 20:10:23 +02:00
parent 89722448cb
commit 5e281fbeaf
69 changed files with 820 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-columns.css
+2 -4
View File
@@ -54,16 +54,14 @@
.um-admin-txtspace {margin: 0 0 0 10px;}
.um-adm-ico {
font-size: 20px;
width: 20px;
font-size: 18px;
width: 18px;
text-align: center;
margin-top: 5px;
display: inline-block;
color: #7ACF58;
}
.um-adm-ico.inactive {color: #C74A4A}
.um-adm-ico.pointer {cursor: pointer}
.um-admin-icontext i {
admin/assets/css/um-admin-rtl.css
+44
View File
@@ -0,0 +1,44 @@
.um-admin-yesno span.yes, .um-admin-yesno span.no {
padding: 0 10px 0 0;
}
.um-admin-drag-ctrls-demo.um-admin-drag-ctrls {
left: 12px;
right: auto;
}
.um-admin-drag-row-icons {
left: 0;
right: auto;
}
.um-admin-drag-ctrls.columns {
right: 0 !important;
left: auto;
}
.um-admin-drag-ctrls.columns a {
float: right;
}
.um-admin-drag-rowsub-icons {
right: auto;
left: 0;
}
.um-admin-drag-row-icons a {
float: right;
}
.um-admin-drag-fld-icons a {
float: right;
}
.um-admin-drag-fld-icons {
float: left;
}
.um-admin-drag-fld-title, .um-admin-drag-fld-type {
float: right;
margin: 0 20px 0 0;
}
admin/core/um-admin-access.php
+2
View File
@@ -90,6 +90,8 @@ class UM_Admin_Access {
function add_metabox_form() {
global $ultimatemember;
if ( um_get_option('access_widget_admin_only') && !current_user_can( 'edit_users' ) ) return;
$types = $ultimatemember->query->get_post_types;
foreach($types as $post_type) {
admin/core/um-admin-actions.php
+2 -2
View File
@@ -6,7 +6,7 @@
add_action('um_admin_do_action__delete_users', 'um_admin_do_action__delete_users');
function um_admin_do_action__delete_users( $action ){
global $ultimatemember;
if ( !is_admin() || !current_user_can('manage_options') ) die();
if ( !is_admin() || !current_user_can( 'edit_users' ) ) die();
$redirect = admin_url('users.php');
@@ -219,7 +219,7 @@
add_action('um_admin_do_action__user_action', 'um_admin_do_action__user_action');
function um_admin_do_action__user_action( $action ){
global $ultimatemember;
if ( !is_admin() || !current_user_can('manage_options') ) die();
if ( !is_admin() || !current_user_can( 'edit_users' ) ) die();
if ( !isset( $_REQUEST['sub'] ) ) die();
if ( !isset($_REQUEST['user_id']) ) die();
admin/core/um-admin-dashboard.php
+7
View File
@@ -68,6 +68,8 @@ 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', __('Latest from our blog','ultimatemember'), array(&$this, 'um_news'), $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() ) {
@@ -98,6 +100,11 @@ class UM_Admin_Dashboard {
include_once um_path . 'admin/templates/dashboard/language-contrib.php';
}
function um_news() {
global $ultimatemember;
include_once um_path . 'admin/templates/dashboard/feed.php';
}
function users_overview() {
global $ultimatemember;
include_once um_path . 'admin/templates/dashboard/users.php';
admin/core/um-admin-enqueue.php
+5
View File
@@ -271,6 +271,11 @@ class UM_Admin_Enqueue {
$this->load_core_wp();
$this->load_ajax_js();
$this->load_custom_scripts();
if ( is_rtl() ) {
wp_register_style('um_admin_rtl', um_url . 'admin/assets/css/um-admin-rtl.css' );
wp_enqueue_style('um_admin_rtl');
}
}
admin/core/um-admin-users.php
+3 -6
View File
@@ -32,19 +32,16 @@ class UM_Admin_Users {
$user_id = $user_object->ID;
um_fetch_user( $user_id );
$actions = array();
unset( $actions['edit'] );
unset( $actions['delete'] );
$actions['backend_profile'] = "<a class='' href='" . admin_url('user-edit.php?user_id='. $user_id ) . "'>" . __( 'Edit','ultimatemember' ) . "</a>";
$actions['frontend_profile'] = "<a class='' href='" . um_user_profile_url() . "'>" . __( 'Edit in frontend','ultimatemember') . "</a>";
if ( um_user('submitted') ) {
$actions['view_info'] = '<a href="#" data-modal="UM_preview_registration" data-modal-size="smaller" data-dynamic-content="um_admin_review_registration" data-arg1="'.$user_id.'" data-arg2="edit_registration">' . __('Info','ultimatemember') . '</a>';
$actions['view_info'] = '<a href="#" data-modal="UM_preview_registration" data-modal-size="smaller" data-dynamic-content="um_admin_review_registration" data-arg1="'.$user_id.'" data-arg2="edit_registration">' . __('Info','ultimatemember') . '</a>';
}
return $actions;
}
/***
admin/templates/dashboard/feed.php
+18
View File
@@ -0,0 +1,18 @@
<?php
echo '<div class="rss-widget">';
wp_widget_rss_output(array(
'url' => 'https://ultimatemember.com/blog/feed/',
'title' => 'Latest From Ultimate Member',
'items' => 4,
'show_summary' => 0,
'show_author' => 0,
'show_date' => 1,
));
echo "</div>";
echo "<style type='text/css'>#um-metaboxes-mainbox-1 a.rsswidget {font-weight: 400}#um-metaboxes-mainbox-1 .rss-widget span.rss-date{ color: #777; margin-left: 12px;}</style>";
?>
admin/templates/directory/general.php
+1
View File
@@ -58,6 +58,7 @@
<option value="last_name" <?php selected('last_name', $ultimatemember->query->get_meta_value('_um_sortby') ); ?>>Last Name</option>
<option value="random" <?php selected('random', $ultimatemember->query->get_meta_value('_um_sortby') ); ?>>Random</option>
<option value="other" <?php selected('other', $ultimatemember->query->get_meta_value('_um_sortby') ); ?>>Other (custom field)</option>
<?php do_action('um_admin_directory_sort_users_select', '_um_sortby'); ?>
</select>
</span>
admin/templates/directory/search.php
+6 -2
View File
@@ -29,6 +29,10 @@
<?php
$custom_search = apply_filters('um_admin_custom_search_filters', array() );
$searchable_fields = $ultimatemember->builtin->all_user_fields('date,time,url');
$searchable_fields = $searchable_fields + $custom_search;
$meta_test = get_post_meta( get_the_ID(), '_um_search_fields', true );
$i = 0;
if ( is_array( $meta_test ) ) {
@@ -38,7 +42,7 @@
<span class="um-admin-field">
<select name="_um_search_fields[]" id="_um_search_fields" class="umaf-selectjs" style="width: 300px" data-placeholder="Choose a field">
<?php foreach($ultimatemember->builtin->all_user_fields('date,time,url') as $key => $arr) { ?>
<?php foreach( $searchable_fields as $key => $arr) { ?>
<option value="<?php echo $key; ?>" <?php selected($key, $val ); ?>><?php echo isset( $arr['title'] ) ? $arr['title'] : ''; ?></option>
<?php } ?>
</select>
@@ -59,7 +63,7 @@
<span class="um-admin-field">
<select name="_um_search_fields[]" id="_um_search_fields" class="umaf-selectjs" style="width: 300px" data-placeholder="Choose a field">
<?php foreach($ultimatemember->builtin->all_user_fields('date,time,url') as $key => $arr) { ?>
<?php foreach( $searchable_fields as $key => $arr) { ?>
<option value="<?php echo $key; ?>" <?php selected($key, $ultimatemember->query->get_meta_value('_um_search_fields', $key) ); ?>><?php echo isset( $arr['title'] ) ? $arr['title'] : ''; ?></option>
<?php } ?>
</select>
admin/templates/extensions.php
+23 -2
View File
@@ -1,10 +1,24 @@
<?php
$premium['real-time-notifications'] = array(
'url' => 'https://ultimatemember.com/extensions/real-time-notifications/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/04/notifications-01-copy.png',
'name' => 'Real-time Notifications',
'desc' => 'Add a real-time notification system to your site so users can receive updates and notifications directly on your website as they happen.',
);
$premium['user-reviews'] = array(
'url' => 'https://ultimatemember.com/extensions/user-reviews/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/03/userrating800x300.png',
'name' => 'User Reviews',
'desc' => 'With our user reviews extension, you can add a 5 star user rating and review system to your site so users can rate/review each other.',
);
$premium['social-login'] = array(
'url' => 'https://ultimatemember.com/extensions/social-login/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/sociallogin.png',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/socialloginv2-011.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)',
'desc' => 'This extension allows users to register and login to your site using their social network accounts (Facebook, Twitter, Google+, LinkedIn, Instagram, VK)',
);
$premium['bbpress'] = array(
@@ -35,6 +49,13 @@
'desc' => 'Alert users to important information or let them know about promotions or new features using conditional notices.',
);
/*$free['online-users'] = array(
'url' => 'https://ultimatemember.com/extensions/online-users/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/04/onlineuser1-01-copy.png',
'name' => 'Online Users',
'desc' => 'Adds online users widget to your site and allow you to show the online users anywhere with a simple shortcode, and also see user online status.'
);*/
$free['google-recaptcha'] = array(
'url' => 'https://ultimatemember.com/extensions/google-recaptcha/',
'image' => 'https://ultimatemember.com/wp-content/uploads/2015/02/recaptcha-01-copy.png',
admin/templates/role/register.php
+11
View File
@@ -48,6 +48,7 @@
<!-- Email Approval Settings -->
<div class="checkmail">
<p>
<label class="um-admin-half"><?php _e('Action to be taken after registration','ultimatemember'); ?> <?php $this->tooltip( __('Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message','ultimatemember') ); ?></label>
<span class="um-admin-half">
@@ -79,6 +80,16 @@
</span>
</p><div class="um-admin-clear"></div>
<p>
<label class="um-admin-half" for="_um_url_email_activate"><?php _e('URL redirect after e-mail activation','ultimatemember'); ?> <?php $this->tooltip( __('If you want users to go to a specific page other than login page after e-mail activation, enter the URL here.','ultimatemember') ); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_url_email_activate', null, 'na'); ?>" name="_um_url_email_activate" id="_um_url_email_activate" />
</span>
</p><div class="um-admin-clear"></div>
</div>
<!-- Email Approval Settings -->