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

- 2.0.34 release;

Browse Source
This commit is contained in:
nikitasinelnikov
2018-12-07 10:29:05 +02:00
parent 960ab8bdab
commit 8ea3584ff1
10 changed files with 121 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-logout.php
+30 -18
View File
@@ -1,9 +1,11 @@
<?php
namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'um\core\Logout' ) ) {
@@ -18,9 +20,19 @@ if ( ! class_exists( 'um\core\Logout' ) ) {
* Logout constructor.
*/
function __construct() {
add_action( 'template_redirect', array( &$this, 'logout_page' ), 10000 );
}
add_action('template_redirect', array(&$this, 'logout_page'), 10000 );
/**
* @param $redirect_url
* @param $status
*
* @return false|string
*/
function safe_redirect_default( $redirect_url, $status ) {
$login_page_id = UM()->config()->permalinks['login'];
return get_permalink( $login_page_id );
}
@@ -28,44 +40,44 @@ if ( ! class_exists( 'um\core\Logout' ) ) {
* Logout via logout page
*/
function logout_page() {
$language_code = '';
$current_page_ID = get_the_ID();
$logout_page_id = UM()->config()->permalinks['logout'];
$trid = 0;
if ( is_home() /*|| is_front_page()*/ ) {
if ( is_home() ) {
return;
}
$trid = 0;
$language_code = '';
if ( UM()->external_integrations()->is_wpml_active() ) {
global $sitepress;
$default_lang = $sitepress->get_default_language();
$language_code = $sitepress->get_current_language();
$language_code = $sitepress->get_current_language();
if ( $language_code == $default_lang ) {
$language_code = '';
}
$current_page_ID = get_the_ID();
if ( function_exists( 'icl_object_id' ) ) {
$trid = icl_object_id( $current_page_ID, 'page', true, $default_lang );
} else {
$trid = wpml_object_id_filter( $current_page_ID, 'page', true, $default_lang );
}
if ( $language_code == $default_lang ) {
$language_code = '';
}
}
$logout_page_id = UM()->config()->permalinks['logout'];
if ( um_is_core_page( 'logout' ) || ( $trid > 0 && $trid == $logout_page_id ) ) {
if ( is_user_logged_in() ) {
add_filter( 'wp_safe_redirect_fallback', array( &$this, 'safe_redirect_default' ), 10, 2 );
if ( isset( $_REQUEST['redirect_to'] ) && $_REQUEST['redirect_to'] !== '' ) {
wp_logout();
session_unset();
exit( wp_redirect( $_REQUEST['redirect_to'] ) );
exit( wp_safe_redirect( $_REQUEST['redirect_to'] ) );
} else if ( um_user('after_logout') == 'redirect_home' ) {
wp_logout();
session_unset();
exit( wp_redirect( home_url( $language_code ) ) );
exit( wp_safe_redirect( home_url( $language_code ) ) );
} else {
/**
* UM hook
@@ -92,12 +104,12 @@ if ( ! class_exists( 'um\core\Logout' ) ) {
$redirect_url = apply_filters( 'um_logout_redirect_url', um_user( 'logout_redirect_url' ), um_user( 'ID' ) );
wp_logout();
session_unset();
exit( wp_redirect( $redirect_url ) );
exit( wp_safe_redirect( $redirect_url ) );
}
} else {
exit( wp_redirect( home_url( $language_code ) ) );
add_filter( 'wp_safe_redirect_fallback', array( &$this, 'safe_redirect_default' ), 10, 2 );
exit( wp_safe_redirect( home_url( $language_code ) ) );
}
}
includes/core/class-plugin-updater.php
+5
View File
@@ -126,10 +126,15 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
// Per site activated
$sites = get_sites();
$sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
$sitewide_plugins = array_keys( $sitewide_plugins );
foreach ( $sites as $site ) {
switch_to_blog( $site->blog_id );
$the_plugs = get_option( 'active_plugins' );
$the_plugs = array_merge( $the_plugs, $sitewide_plugins );
foreach ( $the_plugs as $key => $value ) {
if ( in_array( $value, array_keys( $paid_extensions ) ) ) {
includes/core/um-actions-login.php
+4 -4
View File
@@ -386,7 +386,7 @@ function um_add_submit_button_to_login( $args ) {
* }
* ?>
*/
$secondary_btn_word = apply_filters('um_login_form_button_two', $args['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');
/**
@@ -423,18 +423,18 @@ function um_add_submit_button_to_login( $args ) {
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" />
<input type="submit" value="<?php esc_attr_e( wp_unslash( $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' ); ?>
<?php _e( wp_unslash( $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" />
<input type="submit" value="<?php esc_attr_e( wp_unslash( $primary_btn_word ), 'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" />
</div>
<?php } ?>
includes/core/um-actions-profile.php
+11 -7
View File
@@ -1191,18 +1191,22 @@ function um_add_submit_button_to_profile( $args ) {
<div class="um-col-alt">
<?php if (isset( $args['secondary_btn'] ) && $args['secondary_btn'] != 0) { ?>
<?php if ( isset( $args['secondary_btn'] ) && $args['secondary_btn'] != 0 ) { ?>
<div class="um-left um-half"><input type="submit" value="<?php esc_attr_e( $args['primary_btn_word'], 'ultimate-member' ); ?>"
class="um-button"/></div>
<div class="um-right um-half"><a href="<?php echo esc_attr( um_edit_my_profile_cancel_uri() ); ?>"
class="um-button um-alt"><?php esc_attr_e( $args['secondary_btn_word'], 'ultimate-member' ); ?></a>
<div class="um-left um-half">
<input type="submit" value="<?php esc_attr_e( wp_unslash( $args['primary_btn_word'] ), 'ultimate-member' ); ?>" class="um-button" />
</div>
<div class="um-right um-half">
<a href="<?php echo esc_attr( um_edit_my_profile_cancel_uri() ); ?>" class="um-button um-alt">
<?php _e( wp_unslash( $args['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"/></div>
<div class="um-center">
<input type="submit" value="<?php esc_attr_e( wp_unslash( $args['primary_btn_word'] ), 'ultimate-member' ); ?>" class="um-button" />
</div>
<?php } ?>
includes/core/um-actions-register.php
+13 -5
View File
@@ -509,7 +509,7 @@ function um_add_submit_button_to_register( $args ) {
* }
* ?>
*/
$secondary_btn_word = apply_filters('um_register_form_button_two', $secondary_btn_word, $args );
$secondary_btn_word = apply_filters( 'um_register_form_button_two', $secondary_btn_word, $args );
$secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('login');
/**
@@ -538,14 +538,22 @@ function um_add_submit_button_to_register( $args ) {
<div class="um-col-alt">
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
<?php 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( wp_unslash( $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 _e( wp_unslash( $secondary_btn_word ),'ultimate-member' ); ?>
</a>
</div>
<?php } else { ?>
<div class="um-center"><input type="submit" value="<?php esc_attr_e( $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( wp_unslash( $primary_btn_word ), 'ultimate-member' ) ?>" class="um-button" id="um-submit-btn" />
</div>
<?php } ?>