X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fconfig%2Fform_validation.php;h=67ed55c25585e59b17164874491bae4e46d8ba26;hb=42b8f76ab32990f2668a4e3346374de7bad91be2;hp=a3f9df32c2d56a6474a21b7d06d7d7d92eb39668;hpb=faf92fa039c2be353c94d0d0e8e488e56eaa5058;p=living-lab-site.git

diff --git a/application/config/form_validation.php b/application/config/form_validation.php
index a3f9df3..67ed55c 100644
--- a/application/config/form_validation.php
+++ b/application/config/form_validation.php
@@ -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,6 +69,11 @@ $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',
@@ -71,6 +83,11 @@ $config = 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(
@@ -105,7 +122,7 @@ $config = array(
 		array(
 			'field'=>'comment',
 			'label'=>'lang:video_comment',
-			'rules'=>'trim|required|xss_clean|callback__is_user_loggedin|callback__do_comment'
+			'rules'=>'trim|required|xss_clean|callback__is_user_loggedin'
 		)
 	)
 );