Changeset 890

Timestamp:

01/30/07 13:21:04 (2 years ago)

Author:

ben

Message:

When there's a problem with a required field not being included, the profile reloads with all submitted values intact (previously it would reset to blank). This is to prevent the user from doing damage to his or herself, the screen, other people, or, ultimately, us.

Files:

• devel/profile/edit.php (modified) (5 diffs)
• devel/profile/profile.class.php (modified) (2 diffs)

devel/profile/edit.php

@@ -31 +31 @@
-protect(1);
-
-
+
+
+
+
+
+
+
+
+
+
-        
-$title = run("profile:display:name", $page_owner) . " :: ". __gettext("Edit profile") ."";
@@ -90 +99 @@
-                        $flabel = !empty($field[0]) ? $field[0] : '';
-                        $frequired = false;
+                        $fcat = __gettext("Main");
-                    // Otherwise map things the new way!
-                    } else {
@@ -95 +105 @@
-                        $flabel = $datatype->name;
-                        $frequired = $datatype->required;
+                        if (empty($datatype->category)) {
+                            $fcat = __gettext("Main");
+                        } else {
+                            $fcat = $datatype->category;
+                        }
-                    }
-                    if ($fname == $field && $frequired == true) {
-$flabel
+sprintf(__gettext("%s (in category %s)"),$flabel,$fcat)
-                    }
-                }
@@ -132 +147 @@
-        } else {
-            
+            $savedata = array();
+            
+            foreach($insertvalues as $insertvalue) {
+                $savedata['profile:preload'][$insertvalue->name] = $insertvalue->value;
+                $savedata['profile:preload:access'][$insertvalue->name] = $insertvalue->access;
+            }
-            foreach($requiredmissing as $key=> $missinglabel) {
-                $message = "";
@@ -139 +160 @@
-                $message .= $missinglabel;
-            }
+            
-            $messages[] = sprintf(__gettext("You need to fill in the following required fields: %s"),$message);
-            
-            $updatedok = false;
+            $_SESSION['profile:preload'] = $savedata['profile:preload'];
+            $_SESSION['profile:preload:access'] = $savedata['profile:preload:access'];
-        }
-    }

devel/profile/profile.class.php

@@ -237 +237 @@
-        }
-            
-label
+name
-            if (!$value = get_record('profile_data','name',$fname,'owner',$page_owner)) {
-                $value = "";
@@ -246 +246 @@
-            $value = "";
-            $value->value = $data['profile:preload'][$fname];
-
+
+
+
+
+
-            
-        }