projects
/
living-lab-site.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CIS: CIWorker works; now we need communication via web services
[living-lab-site.git]
/
application
/
config
/
form_validation.php
diff --git
a/application/config/form_validation.php
b/application/config/form_validation.php
index
a52115c
..
67ed55c
100644
(file)
--- 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]'
)
),
'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]'
'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',
),
array(
'field'=>'password',
@@
-35,7
+42,7
@@
$config = array(
array(
'field'=>'old-password',
'label'=>'lang:user_old_password',
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',
),
array(
'field'=>'new-password',
@@
-62,6
+69,11
@@
$config = array(
'label'=>'lang:user_last_name',
'rules'=>'trim|required|ucwords|xss_clean|prep_for_form'
),
'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',
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'
'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(
)
),
'activate'=> array(