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

- fixed enqueue scripts;

Browse Source 
- fixed multisite check active plugins;
This commit is contained in:
nikitasinelnikov
2018-12-06 15:57:29 +02:00
parent 4d95fd7541
commit 960ab8bdab
3 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-enqueue.php
+4 -1
View File
@@ -373,6 +373,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
UM()->enqueue()->load_modal();
UM()->enqueue()->load_responsive();
wp_register_script( 'um_raty', um_url . 'assets/js/um-raty' . UM()->enqueue()->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_style( 'um_raty', um_url . 'assets/css/um-raty.css', array(), ultimatemember_version );
wp_register_style( 'um_default_css', um_url . 'assets/css/um-old-default.css', '', ultimatemember_version, 'all' );
wp_enqueue_style( 'um_default_css' );
@@ -380,7 +383,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
wp_register_style( 'um_admin_rtl', $this->css_url . 'um-admin-rtl.css' );
wp_enqueue_style( 'um_admin_rtl' );
}
} else {
$this->load_global_scripts();
includes/core/class-plugin-updater.php
+35 -12
View File
@@ -63,10 +63,6 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
'key' => 'instagram',
'title' => 'Instagram',
),
'um-invitations/um-invitations.php' => array(
'key' => 'invitations',
'title' => 'Invitations',
),
'um-mailchimp/um-mailchimp.php' => array(
'key' => 'mailchimp',
'title' => 'MailChimp',
@@ -125,18 +121,45 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
),
);
$the_plugs = get_option( 'active_plugins' );
$active_um_plugins = array();
foreach ( $the_plugs as $key => $value ) {
if ( is_multisite() ) {
// Per site activated
$sites = get_sites();
if ( in_array( $value, array_keys( $paid_extensions ) ) ) {
$license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" );
foreach ( $sites as $site ) {
switch_to_blog( $site->blog_id );
if ( empty( $license ) )
continue;
$the_plugs = get_option( 'active_plugins' );
foreach ( $the_plugs as $key => $value ) {
$active_um_plugins[ $value ] = $paid_extensions[ $value ];
$active_um_plugins[ $value ]['license'] = $license;
if ( in_array( $value, array_keys( $paid_extensions ) ) ) {
$license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" );
if ( empty( $license ) ) {
continue;
}
$active_um_plugins[ $value ] = $paid_extensions[ $value ];
$active_um_plugins[ $value ]['license'] = $license;
}
}
restore_current_blog();
}
} else {
$the_plugs = get_option( 'active_plugins' );
foreach ( $the_plugs as $key => $value ) {
if ( in_array( $value, array_keys( $paid_extensions ) ) ) {
$license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" );
if ( empty( $license ) )
continue;
$active_um_plugins[ $value ] = $paid_extensions[ $value ];
$active_um_plugins[ $value ]['license'] = $license;
}
}
}
includes/core/um-actions-login.php
+32 -26
View File
@@ -1,6 +1,4 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
<?php if ( ! defined( 'ABSPATH' ) ) exit;
/**
@@ -101,8 +99,6 @@ add_action( 'um_submit_form_errors_hook_login', 'um_submit_form_errors_hook_logi
* @param $args
*/
function um_display_login_errors( $args ) {
$error = '';
if ( UM()->form()->count_errors() > 0 ) {
$errors = UM()->form()->errors;
// hook for other plugins to display error
@@ -340,9 +336,10 @@ add_action( 'um_submit_form_login', 'um_submit_form_login', 10 );
*/
function um_add_submit_button_to_login( $args ) {
// DO NOT add when reviewing user's details
if ( UM()->user()->preview == true && is_admin() ) return;
if ( UM()->user()->preview == true && is_admin() ) {
return;
}
$primary_btn_word = $args['primary_btn_word'];
/**
* UM hook
*
@@ -365,9 +362,8 @@ function um_add_submit_button_to_login( $args ) {
* }
* ?>
*/
$primary_btn_word = apply_filters('um_login_form_button_one', $primary_btn_word, $args );
$primary_btn_word = apply_filters('um_login_form_button_one', $args['primary_btn_word'], $args );
$secondary_btn_word = $args['secondary_btn_word'];
/**
* UM hook
*
@@ -390,7 +386,7 @@ function um_add_submit_button_to_login( $args ) {
* }
* ?>
*/
$secondary_btn_word = apply_filters('um_login_form_button_two', $secondary_btn_word, $args );
$secondary_btn_word = apply_filters('um_login_form_button_two', $args['secondary_btn_word'], $args );
$secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('register');
/**
@@ -420,18 +416,26 @@ function um_add_submit_button_to_login( $args ) {
<div class="um-col-alt">
<?php if ( isset( $args['show_rememberme'] ) && $args['show_rememberme'] ) {
UM()->fields()->checkbox( 'rememberme', __( 'Keep me signed in', 'ultimate-member' ), false );
echo '<div class="um-clear"></div>';
} ?>
UM()->fields()->checkbox( 'rememberme', __( 'Keep me signed in', 'ultimate-member' ), false ); ?>
<div class="um-clear"></div>
<?php }
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
if ( isset( $args['secondary_btn'] ) && $args['secondary_btn'] != 0 ) { ?>
<div class="um-left um-half"><input type="submit" value="<?php esc_attr_e( $primary_btn_word, 'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" /></div>
<div class="um-right um-half"><a href="<?php echo esc_attr( $secondary_btn_url ); ?>" class="um-button um-alt"><?php esc_attr_e( $secondary_btn_word,'ultimate-member'); ?></a></div>
<div class="um-left um-half">
<input type="submit" value="<?php esc_attr_e( $primary_btn_word, 'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" />
</div>
<div class="um-right um-half">
<a href="<?php echo esc_attr( $secondary_btn_url ); ?>" class="um-button um-alt">
<?php esc_attr_e( $secondary_btn_word, 'ultimate-member' ); ?>
</a>
</div>
<?php } else { ?>
<div class="um-center"><input type="submit" value="<?php esc_attr_e( $args['primary_btn_word'],'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" /></div>
<div class="um-center">
<input type="submit" value="<?php esc_attr_e( $args['primary_btn_word'],'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" />
</div>
<?php } ?>
@@ -450,16 +454,18 @@ add_action( 'um_after_login_fields', 'um_add_submit_button_to_login', 1000 );
* @param $args
*/
function um_after_login_submit( $args ) {
if ( $args['forgot_pass_link'] == 0 ) return;
?>
if ( $args['forgot_pass_link'] == 0 ) {
return;
} ?>
<div class="um-col-alt-b">
<a href="<?php echo um_get_core_page('password-reset'); ?>" class="um-link-alt"><?php _e('Forgot your password?','ultimate-member'); ?></a>
</div>
<a href="<?php echo um_get_core_page('password-reset'); ?>" class="um-link-alt">
<?php _e( 'Forgot your password?', 'ultimate-member' ); ?>
</a>
</div>
<?php
}
<?php
}
add_action( 'um_after_login_fields', 'um_after_login_submit', 1001 );
@@ -468,10 +474,10 @@ add_action( 'um_after_login_fields', 'um_after_login_submit', 1001 );
*
* @param $args
*/
function um_add_login_fields($args){
function um_add_login_fields( $args ) {
echo UM()->fields()->display( 'login', $args );
}
add_action('um_main_login_fields', 'um_add_login_fields', 100);
add_action( 'um_main_login_fields', 'um_add_login_fields', 100 );
/**