Skip to content

Commit

Permalink
Merge branch 'release/150719-RC' into 000000-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jaswsinc committed Jul 22, 2015
2 parents 83fef9b + c255751 commit b739beb
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 45 deletions.
57 changes: 31 additions & 26 deletions s2member/includes/classes/login-redirects-r.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* @since 3.5
*/
if(!defined('WPINC')) // MUST have WordPress.
exit("Do not access this file directly.");
exit('Do not access this file directly.');

if (!class_exists ("c_ws_plugin__s2member_login_redirects_r"))
if (!class_exists ('c_ws_plugin__s2member_login_redirects_r'))
{
/**
* Login redirect removals.
Expand All @@ -30,65 +30,70 @@ class c_ws_plugin__s2member_login_redirects_r
/**
* Handles completely empty ``login_redirect`` values.
*
* @attaches-to ``add_filter("login_redirect");``
* @attaches-to ``add_filter('login_redirect');``
*
* @package s2Member\Login_Redirects
* @since 110926
*
* @param string $redirect_to Expects the current ``$redirect_to`` value, passed in by the Filter.
* @param string $redirect_to Expects the current ``$redirect_to`` passed in by the Filter.
* @return string A non-empty string value. s2Member will NEVER allow this to be completely empty.
*/
public static function _empty_login_redirect_filter ($redirect_to)
public static function _empty_login_redirect_filter($redirect_to)
{
return (!$redirect_to) ? admin_url () : $redirect_to;
return $redirect_to ? $redirect_to : admin_url ();
}

/**
* Handles HTTP/HTTPS ``login_redirect`` values.
*
* @attaches-to ``add_filter("login_redirect");``
* @attaches-to ``add_filter('login_redirect');``
*
* @package s2Member\Login_Redirects
* @since 130819
*
* @param string $redirect_to Expects the current ``$redirect_to`` value, passed in by the Filter.
* @param string $redirect_to Expects the current ``$redirect_to`` passed in by the Filter.
* @return string Updated `redirect_to` value.
*/
public static function _http_login_redirect_filter ($redirect_to)
public static function _http_login_redirect_filter($redirect_to)
{
if($GLOBALS["WS_PLUGIN__"]["s2member"]["o"]["login_redirection_always_http"])
if($redirect_to && is_string ($redirect_to) && strpos($redirect_to, "wp-admin") === FALSE)
$ci = $GLOBALS['WS_PLUGIN__']['s2member']['o']['ruris_case_sensitive'] ? '' : 'i';

if($GLOBALS['WS_PLUGIN__']['s2member']['o']['login_redirection_always_http'])
if($redirect_to && is_string($redirect_to) && strpos($redirect_to, 'wp-admin') === FALSE)
{
$redirect_to = preg_replace("/^https\:\/\//i", "http://", $redirect_to);
if(stripos($redirect_to, "http://") !== 0) // Force absolute.
$redirect_to = preg_replace('/^https\:\/\//i', 'http://', $redirect_to);
if(stripos($redirect_to, 'http://') !== 0) // Force full URL.
{
$home_path = trim((string)@parse_url(home_url('/'), PHP_URL_PATH), '/');
$http_home_base = trim(preg_replace('/\/'.preg_quote($home_path, '/').'\/$/', '', home_url('/', 'http')), '/');
$redirect_to = $http_home_base.'/'.ltrim($redirect_to, '/');
$redirect_uri = $redirect_to; // e.g., `/path/with/?query=args`
$home_path = trim((string)@parse_url(home_url('/'), PHP_URL_PATH), '/');
$http_home_base = trim(preg_replace('/\/'.preg_quote($home_path, '/').'\/$/'.$ci, '', home_url('/', 'http')), '/');
$redirect_to = $http_home_base.'/'.ltrim($redirect_uri, '/');
}
}
return $redirect_to;
}

/**
* Removes all other ``login_redirect`` Filters to prevent conflicts with s2Member.
*
* @attaches-to ``add_action("init");``
* @attaches-to ``add_action('init');``
*
* @package s2Member\Login_Redirects
* @since 3.5
*/
public static function remove_login_redirect_filters ()
public static function remove_login_redirect_filters()
{
do_action("ws_plugin__s2member_before_remove_login_redirect_filters", get_defined_vars ());
do_action('ws_plugin__s2member_before_remove_login_redirect_filters', get_defined_vars ());

if (!apply_filters("ws_plugin__s2member_allow_other_login_redirect_filters", false, get_defined_vars ()))
if (!apply_filters('ws_plugin__s2member_allow_other_login_redirect_filters', false, get_defined_vars ()))
{
remove_all_filters("login_redirect");
add_filter ("login_redirect", "c_ws_plugin__s2member_login_redirects_r::_empty_login_redirect_filter");
add_filter ("login_redirect", "c_ws_plugin__s2member_login_redirects_r::_http_login_redirect_filter");

do_action("ws_plugin__s2member_during_remove_login_redirect_filters", get_defined_vars ());
remove_all_filters('login_redirect'); // Remove all others.
do_action('ws_plugin__s2member_during_remove_login_redirect_filters', get_defined_vars ());
}
do_action("ws_plugin__s2member_after_remove_login_redirect_filters", get_defined_vars ());
add_filter('login_redirect', 'c_ws_plugin__s2member_login_redirects_r::_empty_login_redirect_filter');
add_filter('login_redirect', 'c_ws_plugin__s2member_login_redirects_r::_http_login_redirect_filter');

do_action('ws_plugin__s2member_after_remove_login_redirect_filters', get_defined_vars ());
}
}
}
53 changes: 34 additions & 19 deletions s2member/includes/classes/login-redirects.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,20 @@ public static function login_redirect($username = '', $user = NULL)
{
update_user_option($user_id, 's2member_last_login_time', time());

$logins = (int)get_user_option('s2member_login_counter', $user_id) + 1;
update_user_option($user_id, 's2member_login_counter', $logins);

if(!get_user_option('s2member_registration_ip', $user_id))
update_user_option($user_id, 's2member_registration_ip', $_SERVER['REMOTE_ADDR']);

if(($logins = (int)get_user_option('s2member_login_counter', $user_id) + 1) >= 1 || ($logins = 1))
update_user_option($user_id, 's2member_login_counter', $logins);

if($GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_password'])
delete_user_setting('default_password_nag').update_user_option($user_id, 'default_password_nag', FALSE, TRUE);

if(($ok = TRUE) && !is_super_admin($user_id) && $username !== 'demo' // Exclude super admins, the `demo` user, and anyone who can edit posts.
&& !apply_filters('ws_plugin__s2member_disable_login_ip_restrictions', (($user->has_cap('edit_posts')) ? TRUE : FALSE), get_defined_vars())
{
delete_user_setting('default_password_nag');
update_user_option($user_id, 'default_password_nag', FALSE, TRUE);
}
$ok = TRUE; // Initialize IP restriction being OK here. This is for filters.
if($username !== 'demo' && !is_super_admin($user_id) // Exclude the `demo` user, super admins, and anyone who can edit posts.
&& !apply_filters('ws_plugin__s2member_disable_login_ip_restrictions', $user->has_cap('edit_posts') ? TRUE : FALSE, get_defined_vars())
) $ok = c_ws_plugin__s2member_ip_restrictions::ip_restrictions_ok($_SERVER['REMOTE_ADDR'], strtolower($username));

if($GLOBALS['WS_PLUGIN__']['s2member']['o']['login_redirection_always_http']) // Alter value of `redirect_to`?
Expand All @@ -71,12 +74,13 @@ public static function login_redirect($username = '', $user = NULL)
$_REQUEST['redirect_to'] = preg_replace('/^https\:\/\//i', 'http://', $_REQUEST['redirect_to']);
if(stripos($_REQUEST['redirect_to'], 'http://') !== 0) // Force an absolute URL in this case.
{
$redirect_uri = $_REQUEST['redirect_to']; // e.g., `/path/with/?query=args`
$home_path = trim((string)@parse_url(home_url('/'), PHP_URL_PATH), '/');
$http_home_base = trim(preg_replace('/\/'.preg_quote($home_path, '/').'\/$/'.$ci, '', home_url('/', 'http')), '/');
$_REQUEST['redirect_to'] = $http_home_base.'/'.ltrim($_REQUEST['redirect_to'], '/');
$_REQUEST['redirect_to'] = $http_home_base.'/'.ltrim($redirect_uri, '/');
}
}
if(($redirect = apply_filters('ws_plugin__s2member_login_redirect', (($user->has_cap('edit_posts')) ? FALSE : TRUE), get_defined_vars())))
if(($redirect = apply_filters('ws_plugin__s2member_login_redirect', $user->has_cap('edit_posts') ? FALSE : TRUE, get_defined_vars())))
{
$obey_redirect_to = apply_filters('ws_plugin__s2member_obey_login_redirect_to', TRUE, get_defined_vars());

Expand All @@ -93,28 +97,39 @@ public static function login_redirect($username = '', $user = NULL)
do_action('ws_plugin__s2member_during_login_redirect', get_defined_vars());
unset($__refs, $__v); // Housekeeping.

if($redirect && is_string($redirect)) $redirect = $redirect;
$is_lwp = FALSE; // Initialize LWP detection flag.

else if($redirection_url = c_ws_plugin__s2member_login_redirects::login_redirection_url($user))
$redirect = $redirection_url; // Special redirection URL (overrides LWP).
if($redirect && is_string($redirect))
$redirect = $redirect;

else if(($login_redirection_url = c_ws_plugin__s2member_login_redirects::login_redirection_url($user)))
{
$is_lwp = TRUE; // Flag as being a hard-coded LWP URL in this case.
$redirect = $login_redirection_url; // Special redirection URL.
}
else if($GLOBALS['WS_PLUGIN__']['s2member']['o']['login_welcome_page'])
// Else we use the Login Welcome Page configured for s2Member.
$redirect = get_page_link($GLOBALS['WS_PLUGIN__']['s2member']['o']['login_welcome_page']);

{
$is_lwp = TRUE; // Flag as being a hard-coded LWP URL in this case.
$redirect = get_page_link($GLOBALS['WS_PLUGIN__']['s2member']['o']['login_welcome_page']);
}
else $redirect = home_url('/'); // Default to the home page.

if($GLOBALS['WS_PLUGIN__']['s2member']['o']['login_redirection_always_http'])
{
$redirect = preg_replace('/^https\:\/\//i', 'http://', $redirect);
if(stripos($redirect, 'http://') !== 0) // Force absolute.
{
$home_path = trim((string)@parse_url(home_url('/'), PHP_URL_PATH), '/');
$http_home_base = trim(preg_replace('/\/'.preg_quote($home_path, '/').'\/$/'.$ci, '', home_url('/', 'http')), '/');
$redirect = $http_home_base.'/'.ltrim($redirect, '/');
$redirect_uri = $redirect; // e.g., `/path/with/?query=args`
$home_path = trim((string)@parse_url(home_url('/'), PHP_URL_PATH), '/');
$http_home_base = trim(preg_replace('/\/'.preg_quote($home_path, '/').'\/$/'.$ci, '', home_url('/', 'http')), '/');
$redirect = $http_home_base.'/'.ltrim($redirect_uri, '/');
}
}
wp_redirect($redirect).exit();
if($is_lwp) // Allow offsite redirection?
wp_redirect($redirect); // Perhaps an offsite location.
else wp_safe_redirect($redirect); // Default behavior.

exit(); // Stop here; redirecting now.
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions s2member/includes/classes/sc-eots-in.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ public static function sc_eot_details($attr = array(), $content = '', $shortcode
$details = $attr['empty_format']; // Empty this.
$eot['debug'] = 'No more payments needed from this user.';
}
// Wrapper and debug info...

if($details) // Wrapper for CSS styling.
$details = '<span class="ws-plugin--s2member-sc-eot">'.$details.'</span>';

if(filter_var($attr['debug'], FILTER_VALIDATE_BOOLEAN))
$details .= '<pre>'.esc_html($eot['debug'] ? $eot['debug'] : 'Unknown error.').'</pre>';

Expand Down

0 comments on commit b739beb

Please sign in to comment.