Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 61e669c

Browse files
committed
BUG: Refs #271. Removed zend validator for firstname and lastname in installForm (server-side);
removed zend validator for firstname, lastname, company, city and country in createAcountForm (server-side); added '+' as valid character in installForm validation (client-side); added '+' ad valid character in registerForm validataion (client-side)
1 parent c60fa12 commit 61e669c

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

core/controllers/forms/InstallForm.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,12 @@ public function createDBForm($type)
6565
$firstname = new Zend_Form_Element_Text('firstname');
6666
$firstname
6767
->setRequired(true)
68-
->addValidator('NotEmpty', true)
69-
->addValidator(new Zend_Validate_Alnum());
68+
->addValidator('NotEmpty', true);
7069

7170
$lastname = new Zend_Form_Element_Text('lastname');
7271
$lastname
7372
->setRequired(true)
74-
->addValidator('NotEmpty', true)
75-
->addValidator(new Zend_Validate_Alnum());
73+
->addValidator('NotEmpty', true);
7674

7775
$submit = new Zend_Form_Element_Submit('submit');
7876
$submit ->setLabel('Set up database');

core/controllers/forms/UserForm.php

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,13 @@ public function createRegisterForm()
6969
$firstname
7070
->setRequired(true)
7171
->addValidator('NotEmpty', true)
72-
->setAttrib('maxLength', 255)
73-
->addValidator(new Zend_Validate_Alnum());
72+
->setAttrib('maxLength', 255);
7473

7574
$lastname = new Zend_Form_Element_Text('lastname');
7675
$lastname
7776
->setRequired(true)
7877
->addValidator('NotEmpty', true)
79-
->setAttrib('maxLength', 255)
80-
->addValidator(new Zend_Validate_Alnum());
78+
->setAttrib('maxLength', 255);
8179

8280
$password1 = new Zend_Form_Element_Password('password1');
8381
$password1
@@ -111,30 +109,25 @@ public function createAccountForm($defaultValue = array())
111109
$firstname
112110
->setRequired(true)
113111
->addValidator('NotEmpty', true)
114-
->setAttrib('maxLength', 255)
115-
->addValidator(new Zend_Validate_Alnum());
112+
->setAttrib('maxLength', 255);
116113

117114
$lastname = new Zend_Form_Element_Text('lastname');
118115
$lastname
119116
->setRequired(true)
120117
->addValidator('NotEmpty', true)
121-
->setAttrib('maxLength', 255)
122-
->addValidator(new Zend_Validate_Alnum());
118+
->setAttrib('maxLength', 255);
123119

124120
$company = new Zend_Form_Element_Text('company');
125121
$company
126-
->setAttrib('maxLength', 255)
127-
->addValidator(new Zend_Validate_Alnum());
122+
->setAttrib('maxLength', 255);
128123

129124
$city = new Zend_Form_Element_Text('city');
130125
$city
131-
->setAttrib('maxLength', 100)
132-
->addValidator(new Zend_Validate_Alnum());
126+
->setAttrib('maxLength', 100);
133127

134128
$country = new Zend_Form_Element_Text('country');
135129
$country
136-
->setAttrib('maxLength', 100)
137-
->addValidator(new Zend_Validate_Alnum());
130+
->setAttrib('maxLength', 100);
138131

139132
$validator = new Zend_Validate_Callback(array('Zend_Uri', 'check'));
140133
$website = new Zend_Form_Element_Text('website');
@@ -189,7 +182,7 @@ public function createAccountForm($defaultValue = array())
189182
{
190183
$biography->setValue($defaultValue['biography']);
191184
}
192-
185+
193186
$form->addElements(array($website, $city, $country, $biography, $firstname, $lastname, $company, $privacy, $submit));
194187

195188
return $form;

core/public/js/install/install.step2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494
function checkEmail(mailteste)
9595
{
96-
var reg = new RegExp('^[a-z0-9]+([_|\.|-]{1}[a-z0-9]+)*@[a-z0-9]+([_|\.|-]{1}[a-z0-9]+)*[\.]{1}[a-z]{2,6}$', 'i');
96+
var reg = new RegExp('^[a-z0-9]+([_|\.|-|\+]{1}[a-z0-9]+)*@[a-z0-9]+([_|\.|-]{1}[a-z0-9]+)*[\.]{1}[a-z]{2,6}$', 'i');
9797

9898
if(reg.test(mailteste))
9999
{

core/public/js/user/user.register.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ $('form#registerForm').submit(function(){
123123

124124
function checkEmail(mailteste)
125125
{
126-
var reg = new RegExp('^[a-z0-9]+([_|\.|-]{1}[a-z0-9]+)*@[a-z0-9]+([_|\.|-]{1}[a-z0-9]+)*[\.]{1}[a-z]{2,6}$', 'i');
126+
var reg = new RegExp('^[a-z0-9]+([_|\.|-|\+]{1}[a-z0-9]+)*@[a-z0-9]+([_|\.|-]{1}[a-z0-9]+)*[\.]{1}[a-z]{2,6}$', 'i');
127127

128128
if(reg.test(mailteste))
129129
{

0 commit comments

Comments
 (0)