Skip to content

Commit

Permalink
Continuing work on #151, #146
Browse files Browse the repository at this point in the history
  • Loading branch information
JasWSInc committed Jun 3, 2014
1 parent f689dc7 commit 82fb0d5
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 42 deletions.
5 changes: 1 addition & 4 deletions s2member/includes/classes/list-servers.inc.php
View file
Expand Up @@ -111,7 +111,7 @@ public static function process_list_servers ($role = FALSE, $level = FALSE, $log
$mailchimp["list_id"] = $mailchimp["list"];

$mailchimp["merge_array"] = array("MERGE1" => $fname, "MERGE2" => $lname, "OPTIN_IP" => $ip, "OPTIN_TIME" => date ("Y-m-d H:i:s"));
$mailchimp["merge_array"] = ($mailchimp["interest_groups"]) ? array_merge ($mailchimp["merge_array"], $mailchimp["interest_groups"]) : $mailchimp["merge_array"];
$mailchimp["merge_array"] = (!empty($mailchimp["interest_groups"])) ? array_merge ($mailchimp["merge_array"], $mailchimp["interest_groups"]) : $mailchimp["merge_array"];
$mailchimp["merge_array"] = apply_filters( /* Deprecated. */"ws_plugin__s2member_mailchimp_array", $mailchimp["merge_array"], get_defined_vars ());
// Filter: `ws_plugin__s2member_mailchimp_array` deprecated in v110523. Please use Filter: `ws_plugin__s2member_mailchimp_merge_array`.

Expand Down Expand Up @@ -429,7 +429,6 @@ public static function process_list_server_removals ($role = FALSE, $level = FAL
* @param string $mod_new_role Required if ``$event_spec === "modification"`` (but can be empty). Role the User is being modified to.
* @param string $mod_new_user Optional. If ``$event_spec === "modification"``, the new User object with current details.
* @param string $mod_old_user Optional. If ``$event_spec === "modification"``, the old/previous User obj with old details.
* @return null This function does not have a return value.
*/
public static function auto_process_list_server_removals ($user_id = FALSE, $vars = FALSE, $event = FALSE, $event_spec = FALSE, $mod_new_role = FALSE, $mod_new_user = FALSE, $mod_old_user = FALSE)
{
Expand Down Expand Up @@ -473,8 +472,6 @@ public static function auto_process_list_server_removals ($user_id = FALSE, $var
foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
do_action("ws_plugin__s2member_after_auto_process_list_server_removals", get_defined_vars ());
unset($__refs, $__v);

return /* Return for uniformity. */;
}
}
}
Expand Down
42 changes: 23 additions & 19 deletions s2member/includes/classes/profile-in.inc.php
View file
Expand Up @@ -211,31 +211,14 @@ public static function profile()
unset($__refs, $__v);
}
}
if($GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in'] && c_ws_plugin__s2member_list_servers::list_servers_integrated())
{
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_before_opt_in', get_defined_vars());
unset($__refs, $__v);

echo '<tr>'."\n";
echo '<td>'."\n";
echo '<label for="ws-plugin--s2member-profile-opt-in">'."\n";
echo '<input type="checkbox" name="ws_plugin__s2member_profile_opt_in" id="ws-plugin--s2member-profile-opt-in" class="ws-plugin--s2member-profile-field" value="1"'.((get_user_option('s2member_opt_in', $user_id)) ? ' checked="checked"' : '').' tabindex="'.esc_attr(($tabindex = $tabindex + 10)).'" />'."\n";
echo $GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in_label']."\n";
echo '</label>'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";

foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_after_opt_in', get_defined_vars());
unset($__refs, $__v);
}
if(apply_filters('ws_plugin__s2member_during_profile_during_fields_display_password', TRUE, get_defined_vars()))
{
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_before_password', get_defined_vars());
unset($__refs, $__v);

echo '<tr><td><div class="ws-plugin--s2member-profile-field-divider-section"></div></td></tr>';

echo '<tr>'."\n";
echo '<td>'."\n";

Expand All @@ -258,6 +241,27 @@ public static function profile()
do_action('ws_plugin__s2member_during_profile_during_fields_after_password', get_defined_vars());
unset($__refs, $__v);
}
if($GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in'] && c_ws_plugin__s2member_list_servers::list_servers_integrated())
{
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_before_opt_in', get_defined_vars());
unset($__refs, $__v);

echo '<tr><td><div class="ws-plugin--s2member-profile-field-divider-section"></div></td></tr>';

echo '<tr>'."\n";
echo '<td>'."\n";
echo '<label for="ws-plugin--s2member-profile-opt-in">'."\n";
echo '<input type="checkbox" name="ws_plugin__s2member_profile_opt_in" id="ws-plugin--s2member-profile-opt-in" class="ws-plugin--s2member-profile-field" value="1"'.((get_user_option('s2member_opt_in', $user_id)) ? ' checked="checked"' : '').' tabindex="'.esc_attr(($tabindex = $tabindex + 10)).'" />'."\n";
echo $GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in_label']."\n";
echo '</label>'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";

foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_after_opt_in', get_defined_vars());
unset($__refs, $__v);
}
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_after_fields', get_defined_vars());
unset($__refs, $__v);
Expand Down
42 changes: 23 additions & 19 deletions s2member/includes/classes/sc-profile-in.inc.php
View file
Expand Up @@ -229,31 +229,14 @@ public static function sc_profile($attr = FALSE, $content = FALSE, $shortcode =
unset($__refs, $__v);
}
}
if($GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in'] && c_ws_plugin__s2member_list_servers::list_servers_integrated())
{
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_before_opt_in', get_defined_vars());
unset($__refs, $__v);

echo '<tr>'."\n";
echo '<td>'."\n";
echo '<label for="ws-plugin--s2member-profile-opt-in">'."\n";
echo '<input type="checkbox" name="ws_plugin__s2member_profile_opt_in" id="ws-plugin--s2member-profile-opt-in" class="ws-plugin--s2member-profile-field" value="1"'.((get_user_option('s2member_opt_in', $user_id)) ? ' checked="checked"' : '').' tabindex="'.esc_attr(($tabindex = $tabindex + 10)).'" />'."\n";
echo $GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in_label']."\n";
echo '</label>'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";

foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_after_opt_in', get_defined_vars());
unset($__refs, $__v);
}
if(apply_filters('ws_plugin__s2member_during_profile_during_fields_display_password', TRUE, get_defined_vars()))
{
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_before_password', get_defined_vars());
unset($__refs, $__v);

echo '<tr><td><div class="ws-plugin--s2member-profile-field-divider-section"></div></td></tr>';

echo '<tr>'."\n";
echo '<td>'."\n";

Expand All @@ -276,6 +259,27 @@ public static function sc_profile($attr = FALSE, $content = FALSE, $shortcode =
do_action('ws_plugin__s2member_during_profile_during_fields_after_password', get_defined_vars());
unset($__refs, $__v);
}
if($GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in'] && c_ws_plugin__s2member_list_servers::list_servers_integrated())
{
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_before_opt_in', get_defined_vars());
unset($__refs, $__v);

echo '<tr><td><div class="ws-plugin--s2member-profile-field-divider-section"></div></td></tr>';

echo '<tr>'."\n";
echo '<td>'."\n";
echo '<label for="ws-plugin--s2member-profile-opt-in">'."\n";
echo '<input type="checkbox" name="ws_plugin__s2member_profile_opt_in" id="ws-plugin--s2member-profile-opt-in" class="ws-plugin--s2member-profile-field" value="1"'.((get_user_option('s2member_opt_in', $user_id)) ? ' checked="checked"' : '').' tabindex="'.esc_attr(($tabindex = $tabindex + 10)).'" />'."\n";
echo $GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_opt_in_label']."\n";
echo '</label>'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";

foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_during_fields_after_opt_in', get_defined_vars());
unset($__refs, $__v);
}
foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v;
do_action('ws_plugin__s2member_during_profile_after_fields', get_defined_vars());
unset($__refs, $__v);
Expand Down

0 comments on commit 82fb0d5

Please sign in to comment.