call validate before saving objects

darcs-hash:20080520191032-84dde-64197121c93cd4cf3cbc614badff0bd44547f9f9.gz

1 files changed, 15 insertions, 0 deletions

diff --git a/actions/register.php b/actions/register.php
index f9402b98f..2fa663389 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -83,6 +83,12 @@ class RegisterAction extends Action {
 		$profile->nickname = $nickname;
 		$profile->profileurl = common_profile_url($nickname);
 		$profile->created = DB_DataObject_Cast::dateTime(); # current time
+		
+		$val = $profile->validate();
+		if ($val !== TRUE) {
+			# XXX: some feedback here, please!
+			return FALSE;
+		}
 		$id = $profile->insert();
 		if (!$id) {
 			return FALSE;
@@ -93,6 +99,15 @@ class RegisterAction extends Action {
 		$user->password = common_munge_password($password, $id);
 		$user->email = $email;
 		$user->created =  DB_DataObject_Cast::dateTime(); # current time
+		
+		$val = $user->validate();
+		if ($val !== TRUE) {
+			# XXX: some feedback here, please!
+			# Try to clean up...
+			$profile->delete();
+			return FALSE;
+		}
+		
 		$result = $user->insert();
 		if (!$result) {
 			# Try to clean up...