Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add required_value attribute to s2MOP shortcode. #51

Merged
merged 3 commits into from
Sep 15, 2014
Merged

Add required_value attribute to s2MOP shortcode. #51

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fa28e2
Add required_value attribute to s2MOP shortcode.
raamdev Sep 13, 2014
0b6ebb4
Use single-quotes for required_value attribute array
raamdev Sep 13, 2014
94fad3a
Several code improvements to sc-mop-vars-notice-in.inc.php
raamdev Sep 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions s2member-pro/includes/classes/sc-mop-vars-notice-in.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
exit ('Do not access this file directly.');

/*
* Working shortcode examples (as of Raam's changes on 2014-03-30 02:18:45 EDT):
* Working shortcode examples (as of Raam's changes on 2014-09-12 21:27:40 EDT):
*
* [s2MOP]You were trying to access a protected: %%SEEKING_TYPE%%[/s2MOP]
* [s2MOP]You were trying to access content that requires a %%REQUIRED_TYPE%% that you don't have.[/s2MOP]
* [s2MOP]You were trying to access content protected via s2Member: %%RESTRICTION_TYPE%% restrictions[/s2MOP]
* [s2MOP seeking_type="post" required_type="level" restriction_type="post"]You were trying to access a restricted post with Post ID #%%SEEKING_POST_ID%% which requires that you be a Member at Level #%%REQUIRED_LEVEL%%[/s2MOP]
* [s2MOP required_type="level"]"%%POST_TITLE%%" is a protected %%SEEKING_TYPE%% that requires Membership Level #%%REQUIRED_LEVEL%%[/s2MOP]
* [s2MOP required_type="ccap" required_value="free_gift"]This content is restricted to Custom Capability <code>free_gift</code>[/s2MOP]
*/

if(!class_exists('c_ws_plugin__s2member_pro_sc_mop_vars_notice_in'))
Expand All @@ -51,25 +52,31 @@ public static function shortcode($attr = array(), $content = '', $shortcode = ''
$valid_required_types = array('level', 'ccap', 'sp');
$valid_seeking_types = array('page', 'post', 'catg', 'ptag', 'file', 'ruri');
$valid_restriction_types = array('page', 'post', 'catg', 'ptag', 'file', 'ruri', 'ccap', 'sp', 'sys');
$attr = shortcode_atts(array('seeking_type' => '', 'required_type' => '', 'restriction_type' => ''), $attr, $shortcode);
$attr = shortcode_atts(array('seeking_type' => '', 'required_type' => '', 'required_value' => '', 'restriction_type' => ''), $attr, $shortcode);

# ---------------------------------------------------------------------------------------------------

if($attr['seeking_type'] !== '' || $attr['required_type'] !== '' || $attr['restriction_type'] !== '')
{
$attr['seeking_type'] = array_unique(preg_split('/[|;,\s]+/', $attr['seeking_type'], NULL, PREG_SPLIT_NO_EMPTY));
$attr['required_type'] = array_unique(preg_split('/[|;,\s]+/', $attr['required_type'], NULL, PREG_SPLIT_NO_EMPTY));
$attr['required_value'] = array_unique(preg_split('/[|;,\s]+/', $attr['required_value'], NULL, PREG_SPLIT_NO_EMPTY));
$attr['restriction_type'] = array_unique(preg_split('/[|;,\s]+/', $attr['restriction_type'], NULL, PREG_SPLIT_NO_EMPTY));

if(isset($attr['seeking_type']) && array_intersect($attr['seeking_type'], $valid_seeking_types))
if(array_intersect($attr['seeking_type'], $valid_seeking_types))
if(empty($_g['_s2member_seeking']['type']) || !in_array($_g['_s2member_seeking']['type'], $attr['seeking_type'], TRUE))
return '';

if(isset($attr['required_type']) && array_intersect($attr['required_type'], $valid_required_types))
if(array_intersect($attr['required_type'], $valid_required_types)) {
if(empty($_g['_s2member_req']['type']) || !in_array($_g['_s2member_req']['type'], $attr['required_type'], TRUE))
return '';

if(isset($attr['restriction_type']) && array_intersect($attr['restriction_type'], $valid_restriction_types))
$required_type = $_g['_s2member_req']['type'];
if(count($attr['required_type']) !== 1 || !in_array($_g['_s2member_req'][$required_type], $attr['required_value'], TRUE))
return '';
}

if(array_intersect($attr['restriction_type'], $valid_restriction_types))
if(empty($_g['_s2member_res']['type']) || !in_array($_g['_s2member_res']['type'], $attr['restriction_type'], TRUE))
return '';
}
Expand Down