Skip to content

Commit

Permalink
Continuing work on server-side validation routine for custom reg/prof…
Browse files Browse the repository at this point in the history 
…ile fields.

#99
  • Loading branch information
JasWSInc committed May 18, 2014
1 parent dda61d2 commit cd7aa24
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion s2member/includes/classes/custom-reg-fields.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ public static function custom_registration_fields()
* If there are errors, the array keys are the custom registration field variable names.
* Each array value is an error message with basic HTML markup.
*/
public static function validate_custom_registration_fields($input, $fields_to_validate)
public static function validation_errors($input, $fields_to_validate)
{
$input = (array)$input;
$fields_to_validate = (array)$fields_to_validate;
Expand Down
15 changes: 8 additions & 7 deletions s2member/includes/classes/profile-mods-in.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ public static function handle_profile_modifications ()
else // Else ``unset()``.
unset($fields[$field_var]);
}
else if ($field["required"] === "yes"
&& (!isset ($_p["ws_plugin__s2member_profile_" . $field_var])
|| (!is_array ($_p["ws_plugin__s2member_profile_" . $field_var]) && !is_string ($_p["ws_plugin__s2member_profile_" . $field_var]))
|| (is_array ($_p["ws_plugin__s2member_profile_" . $field_var]) && empty ($_p["ws_plugin__s2member_profile_" . $field_var]))
|| (is_string ($_p["ws_plugin__s2member_profile_" . $field_var]) && !strlen ($_p["ws_plugin__s2member_profile_" . $field_var]))
))
else if ( // If the field is required but missing; or it was provided but invalid...
($field["required"] === "yes" && (!isset ($_p["ws_plugin__s2member_profile_" . $field_var])
|| (!is_array ($_p["ws_plugin__s2member_profile_" . $field_var]) && !is_string ($_p["ws_plugin__s2member_profile_" . $field_var]))
|| (is_array ($_p["ws_plugin__s2member_profile_" . $field_var]) && empty ($_p["ws_plugin__s2member_profile_" . $field_var]))
|| (is_string ($_p["ws_plugin__s2member_profile_" . $field_var]) && !strlen ($_p["ws_plugin__s2member_profile_" . $field_var]))))
|| (isset ($_p["ws_plugin__s2member_profile_" . $field_var]) && c_ws_plugin__s2member_custom_reg_fields::validation_errors(array($field_var => $_p["ws_plugin__s2member_profile_" . $field_var]), array($field)))
)
{
if (isset ($_existing_fields[$field_var]) && ((is_array ($_existing_fields[$field_var]) && !empty ($_existing_fields[$field_var])) || (is_string ($_existing_fields[$field_var]) && strlen ($_existing_fields[$field_var]))))
$fields[$field_var] = $_existing_fields[$field_var];
Expand All @@ -109,7 +110,7 @@ public static function handle_profile_modifications ()
{
if (((is_array ($_p["ws_plugin__s2member_profile_" . $field_var]) && !empty ($_p["ws_plugin__s2member_profile_" . $field_var]))
|| (is_string ($_p["ws_plugin__s2member_profile_" . $field_var]) && strlen ($_p["ws_plugin__s2member_profile_" . $field_var])))
&& !c_ws_plugin__s2member_custom_reg_fields::validate_custom_registration_fields(array($field_var => $_p["ws_plugin__s2member_profile_" . $field_var]), array($field)))
&& !c_ws_plugin__s2member_custom_reg_fields::validation_errors(array($field_var => $_p["ws_plugin__s2member_profile_" . $field_var]), array($field)))
$fields[$field_var] = $_p["ws_plugin__s2member_profile_" . $field_var];
else // Else ``unset()``.
unset($fields[$field_var]);
Expand Down

0 comments on commit cd7aa24

Please sign in to comment.