2 commits - lib/api lib/kolab_recipient_policy.php
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Thu Mar 15 13:30:40 CET 2012
lib/api/kolab_api_service_form_value.php | 7 +++++++
lib/kolab_recipient_policy.php | 11 ++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 20627dd60bddb44046cd75769bb7ed9927396eb1
Merge: 93887ce e850aeb
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Mar 15 13:30:37 2012 +0100
Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap
commit 93887cea61b6f322057b0f3896a360286dcdddcc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Mar 15 13:29:49 2012 +0100
Use preferredlanguage to normalize some values that are supposed to be ascii
diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 752057c..92b4a15 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -284,6 +284,13 @@ class kolab_api_service_form_value extends kolab_api_service
}
// TODO: Use preferredlanguage
+ if (isset($postdata['preferredlanguage'])) {
+ console("Using locale for " . $postdata['preferredlanguage']);
+ setlocale(LC_ALL, $postdata['preferredlanguage']);
+ } else {
+ console("No locale specified...!");
+ }
+
$uid = iconv('UTF-8', 'ASCII//TRANSLIT', $postdata['sn']);
$uid = strtolower($uid);
$uid = preg_replace('/[^a-z-_]/i', '', $uid);
diff --git a/lib/kolab_recipient_policy.php b/lib/kolab_recipient_policy.php
index 2bd647c..f7b9558 100644
--- a/lib/kolab_recipient_policy.php
+++ b/lib/kolab_recipient_policy.php
@@ -51,7 +51,16 @@ class kolab_recipient_policy {
$_key = $key;
}
- $userdata[$_key] = str_replace(' ', '', $userdata[$key]);
+ if (isset($userdata['preferredlanguage'])) {
+ setlocale(LC_ALL, $userdata['preferredlanguage']);
+ }
+
+ if (!is_array($userdata[$_key])) {
+ $orig_value = $userdata[$key];
+
+ $userdata[$_key] = iconv('UTF-8', 'ASCII//TRANSLIT', $userdata[$key]);
+ $userdata[$_key] = preg_replace('/[^a-z0-9-_]/i', '', $userdata[$_key]);
+ }
}
return $userdata;
More information about the commits
mailing list