lib/client public_html/js
Torsten Grote
grote at kolabsys.com
Mon Dec 3 18:28:02 CET 2012
lib/client/kolab_client_task_signup.php | 2 +-
public_html/js/kolab_hosted.js | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 891426465906702760012839e72f65fb17ce85ea
Author: Torsten Grote <grote at kolabsys.com>
Date: Mon Dec 3 18:27:35 2012 +0100
don't validate email address with JavaScript
diff --git a/lib/client/kolab_client_task_signup.php b/lib/client/kolab_client_task_signup.php
index 7b8ec0c..2746928 100644
--- a/lib/client/kolab_client_task_signup.php
+++ b/lib/client/kolab_client_task_signup.php
@@ -271,7 +271,7 @@ class kolab_client_task_signup extends kolab_client_task
$form->set_title($this->translate('signup.formtitle'));
- $this->output->add_translation('user.password.mismatch', 'signup.wronguid', 'signup.userexists', 'signup.wrongmailalternateaddress', 'internalerror', 'servererror');
+ $this->output->add_translation('user.password.mismatch', 'signup.wronguid', 'signup.userexists', 'internalerror', 'servererror');
return $form->output();
}
diff --git a/public_html/js/kolab_hosted.js b/public_html/js/kolab_hosted.js
index aa4ab81..6fdb43e 100644
--- a/public_html/js/kolab_hosted.js
+++ b/public_html/js/kolab_hosted.js
@@ -26,13 +26,6 @@ kadm.user_save = function(reload, section)
{
var data = kadm.serialize_form('#'+this.env.form_id);
- // check email address
- if(typeof data.mailalternateaddress != 'undefined' && !isValidEmailAddress(data.mailalternateaddress)) {
- kadm.display_message('signup.wrongmailalternateaddress', 'error');
- kadm.form_value_error('mailalternateaddress');
- return;
- }
-
if (!kadm.check_required_fields(data)) {
kadm.display_message('form.required.empty', 'error');
return;
@@ -121,7 +114,7 @@ function password_match()
}
}
-// TODO use form.validate api call for that
+// this is only used to update GUI only when it makes sense, for real validation we rely on form_value.validate
function isValidEmailAddress(emailAddress) {
var pattern = new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);
return pattern.test(emailAddress);
More information about the commits
mailing list