X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;ds=sidebyside;f=application%2Fconfig%2Fform_validation.php;h=67ed55c25585e59b17164874491bae4e46d8ba26;hb=e1f154780b5b004e047977b6582dd19bf85d4e4d;hp=1e7c787e23cd0cf1424ec897524330eeb62be1af;hpb=6679566ca99a72ab9243e4eaef8e071f89283918;p=living-lab-site.git

diff --git a/application/config/form_validation.php b/application/config/form_validation.php
index 1e7c787..67ed55c 100644
--- a/application/config/form_validation.php
+++ b/application/config/form_validation.php
@@ -1,7 +1,7 @@
 <?php
 
 $config = array(
-	'signin'=> array(
+	'login'=> array(
 		array(
 			'field'=>'username',
 			'label'=>'lang:user_username_or_email',
@@ -15,12 +15,19 @@ $config = array(
 			'rules'=>'required|min_length[5]|max_length[32]'
 		)
 	),
+	'login_openid'=> array(
+		array(
+			'field'=>'openid',
+			'label'=>'lang:user_openid',
+			'rules'=>'trim|required'
+		)
+	),
 	'register'=> array(
 		array(
 			'field'=>'username',
 			'label'=>'lang:user_username',
 			'rules'=>'trim|callback__required_by_register|min_length[5]|max_length[32]'
-				. '|strtolower|xss_clean|callback__valid_username'
+				. '|strtolower|xss_clean|callback__is_username_unique|callback__valid_username'
 		),
 		array(
 			'field'=>'password',
@@ -35,7 +42,7 @@ $config = array(
 		array(
 			'field'=>'old-password',
 			'label'=>'lang:user_old_password',
-			'rules'=>'min_length[5]|max_length[32]|callback__valid_old_password[username]'
+			'rules'=>'min_length[5]|max_length[32]|callback__valid_old_password'
 		),
 		array(
 			'field'=>'new-password',
@@ -62,15 +69,60 @@ $config = array(
 			'label'=>'lang:user_last_name',
 			'rules'=>'trim|required|ucwords|xss_clean|prep_for_form'
 		),
+		array(
+			'field'=>'sex',
+			'label'=>'lang:user_sex',
+			'rules'=>'required|xss_clean|prep_for_form'
+		),
 		array(
 			'field'=>'birth-date',
 			'label'=>'lang:user_birth_date',
-			'rules'=>'trim|callback__valid_date'
+			'rules'=>'trim|callback__valid_date|callback__postprocess_birth_date'
 		),
 		array(
 			'field'=>'locality',
 			'label'=>'lang:user_locality',
 			'rules'=>'trim|ucwords|xss_clean|prep_for_form'
+		),
+		array(
+			'field'=>'captcha',
+			'label'=>'lang:captcha',
+			'rules'=>'callback__required_by_register|callback__check_captcha'
+		)
+	),
+	'activate'=> array(
+		array(
+			'field'=>'activation-code',
+			'label'=>'lang:user_activation_code',
+			'rules'=>'trim|required|strtolower|callback__valid_activation_code|callback__do_activate'
+		)
+	),
+	'resend_activation'=> array(
+		array(
+			'field'=>'email',
+			'label'=>'lang:user_email',
+			'rules'=>'trim|required|xss_clean|valid_email|callback__do_resend_activation'
+		)
+	),
+	'recover_password'=> array(
+		array(
+			'field'=>'username',
+			'label'=>'lang:user_username',
+			'rules'=>'trim|required|min_length[5]|max_length[32]'
+				. '|strtolower|callback__valid_username|callback__username_exists|callback__internal_account'
+				. '|callback__do_recover_password'
+		),
+		array(
+			'field'=>'email',
+			'label'=>'lang:user_email',
+			'rules'=>'trim|required|xss_clean|valid_email'
+		)
+	),
+	'comment_video'=> array(
+		array(
+			'field'=>'comment',
+			'label'=>'lang:video_comment',
+			'rules'=>'trim|required|xss_clean|callback__is_user_loggedin'
 		)
 	)
 );