Changeset 6

Timestamp:

04/01/2008 10:55:22 PM (18 years ago)

Author:

apeatling

Message:

Andy P: fixed validation on radio button fields that don't post a value and are required

Location:

trunk

Files:

• bp_default_theme (modified) (1 prop)
• bp_default_theme/archive.php (modified) (1 prop)
• bp_default_theme/archives.php (modified) (1 prop)
• bp_default_theme/attachment.php (modified) (1 prop)
• bp_default_theme/blog.php (modified) (1 prop)
• bp_default_theme/comments-popup.php (modified) (1 prop)
• bp_default_theme/comments.php (modified) (1 prop)
• bp_default_theme/footer.php (modified) (1 prop)
• bp_default_theme/functions.php (modified) (1 prop)
• bp_default_theme/header.php (modified) (1 prop)
• bp_default_theme/images (modified) (1 prop)
• bp_default_theme/index.php (modified) (1 prop)
• bp_default_theme/links.php (modified) (1 prop)
• bp_default_theme/page.php (modified) (1 prop)
• bp_default_theme/rtl.css (modified) (1 prop)
• bp_default_theme/screenshot.png (modified) (1 prop) ( previous)
• bp_default_theme/search.php (modified) (1 prop)
• bp_default_theme/searchform.php (modified) (1 prop)
• bp_default_theme/sidebar.php (modified) (1 prop)
• bp_default_theme/single.php (modified) (1 prop)
• bp_default_theme/style.css (modified) (1 prop)
• bp_default_theme/tweaked_style.css (modified) (1 prop)
• bp_friends.php (modified) (1 prop)
• bp_groups (modified) (1 prop)
• bp_groups.php (modified) (1 prop)
• bp_messages (modified) (1 prop)
• bp_messages.php (modified) (1 prop)
• bp_xprofile (modified) (1 prop)
• bp_xprofile.php (modified) (3 diffs, 1 prop)
• bp_xprofile/bp_xprofile.classes.php (modified) (2 diffs, 1 prop)
• bp_xprofile/bp_xprofile.cssjs.php (modified) (1 prop)
• bp_xprofile/bp_xprofile.setup.php (modified) (1 prop)
• bp_xprofile/bp_xprofile.signup.php (modified) (1 prop)
• bp_xprofile/images (modified) (1 prop)

trunk/bp_xprofile.php

@@ -218 +218 @@
 
                 <?php
-                
+                        
                         if($group->fields)
                         {
@@ -227 +227 @@
                                 {       
                                         $field = new BP_XProfile_Field($group->fields[$j]->id); 
+                                        $field_ids[] = $group->fields[$j]->id;
                                         
                                         if(isset($_GET['mode']) && $_GET['mode'] == "save")
                                         {
                                                 $post_field_string = ( $group->fields[$j]->type == 'datebox' ) ? '_day' : null;
-                                                $current_field = $_POST['field_' . $group->fields[$j]->id . $post_field_string];
-                                        
-                                                if(isset($current_field) /*&& ($field->data->value != $current_field)*/)
+                                                $posted_fields = explode(",", $_POST['field_ids']);
+                                                $current_field = $_POST['field_' . $posted_fields[$j] . $post_field_string];
+
+                                                if(($field->is_required && !isset($current_field)) ||
+                                                   ($field->is_required && $current_field == ''))
                                                 {
-                                                        if($field->is_required && $current_field == '')
+                                                        // Validate the field.
+                                                        $field->message = __($field->name . ' cannot be left blank.');
+                                                        $errors[] = $field->message . "<br />";
+                                                }
+                                                else if(!$field->is_required && $current_field == '')
+                                                {
+                                                        // data removed, so delete the field data from the DB.                                                          
+                                                        $profile_data = new BP_Xprofile_ProfileData($group->fields[$j]->id);
+                                                        $profile_data->delete();
+                                                        $field->data->value = null;
+                                                }
+                                                else
+                                                {
+                                                        // Field validates, save.
+                                                        $profile_data = new BP_Xprofile_ProfileData;
+                                                        $profile_data->field_id = $group->fields[$j]->id;
+                                                        $profile_data->user_id = $userdata->ID;
+                                                        $profile_data->last_updated = time();
+
+                                                        if($post_field_string != null)
                                                         {
-                                                                // Validate the field.
-                                                                $field->message = __($field->name . ' cannot be left blank.');
-                                                                $errors[] = $field->message . "<br />";
+                                                                $date_value = $_POST['field_' . $group->fields[$j]->id . '_day'] . 
+                                                                                      $_POST['field_' . $group->fields[$j]->id . '_month'] . 
+                                                                                          $_POST['field_' . $group->fields[$j]->id . '_year'];
+
+                                                                $profile_data->value = strtotime($date_value);
                                                         }
-                                                        else if(!$field->is_required && $current_field == '')
+                                                        else 
                                                         {
-                                                                // data removed, so delete the field data from the DB.                                                          
-                                                                $profile_data = new BP_Xprofile_ProfileData($group->fields[$j]->id);
-                                                                $profile_data->delete();
-                                                                $field->data->value = null;
+                                                                $profile_data->value = $current_field;
+                                                        }
+
+                                                        if(!$profile_data->save())
+                                                        {
+                                                                $field->message = __('There was a problem saving changes to this field, please try again.');
                                                         }
                                                         else
                                                         {
-                                                                // Field validates, save.
-                                                                $profile_data = new BP_Xprofile_ProfileData;
-                                                                $profile_data->field_id = $group->fields[$j]->id;
-                                                                $profile_data->user_id = $userdata->ID;
-                                                                $profile_data->last_updated = time();
-
-                                                                if($post_field_string != null)
-                                                                {
-                                                                        $date_value = $_POST['field_' . $group->fields[$j]->id . '_day'] . 
-                                                                                              $_POST['field_' . $group->fields[$j]->id . '_month'] . 
-                                                                                                  $_POST['field_' . $group->fields[$j]->id . '_year'];
-
-                                                                        $profile_data->value = strtotime($date_value);
-                                                                }
-                                                                else 
-                                                                {
-                                                                        $profile_data->value = $current_field;
-                                                                }
-
-                                                                if(!$profile_data->save())
-                                                                {
-                                                                        $field->message = __('There was a problem saving changes to this field, please try again.');
-                                                                }
-                                                                else
-                                                                {
-                                                                        $field->data->value = $profile_data->value;
-                                                                }
+                                                                $field->data->value = $profile_data->value;
                                                         }
                                                 }
@@ -322 +322 @@
 
                 <form action="admin.php?page=<?php echo $_GET['page'] ?>&amp;mode=save" method="post">
-
+                <?php $field_ids = implode(",", $field_ids); ?>
+                <input type="hidden" name="field_ids" id="field_ids" value="<?php echo $field_ids; ?>" />
+                
                 <?php echo $list_html; ?>
 

trunk/bp_xprofile/bp_xprofile.classes.php

@@ -611 +611 @@
         {
                 $options = $this->get_children();
+
         ?>
         
@@ -616 +617 @@
                 
                 <h2><?php _e("Profile Settings") ?> &raquo; <?php _e('Add Field') ?></h2>
-                                        
-                <p>You are adding a new field to the group "<?php echo $this->name; ?>".</p>
 
                 <?php if($message != '') { ?>