From ceb5b56c3b8db37425338e9c2661c5c4bc4ac069 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 15 May 2012 07:48:13 -0400
Subject: [PATCH] Move rcube_addressbook::normalize_string() to rcube_utils::normalize_string() for general purpose
---
program/include/rcube_addressbook.php | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php
index 2f264f9..8e104dd 100644
--- a/program/include/rcube_addressbook.php
+++ b/program/include/rcube_addressbook.php
@@ -447,29 +447,12 @@
*
* @param string Input string (UTF-8)
* @return string Normalized string
+ * @deprecated since 0.9-beta
*/
protected static function normalize_string($str)
{
- // split by words
- $arr = explode(" ", preg_replace(
- array('/[\s;\+\-\/]+/i', '/(\d)[-.\s]+(\d)/', '/\s\w{1,3}\s/'),
- array(' ', '\\1\\2', ' '),
- $str));
-
- foreach ($arr as $i => $part) {
- if (utf8_encode(utf8_decode($part)) == $part) { // is latin-1 ?
- $arr[$i] = utf8_encode(strtr(strtolower(strtr(utf8_decode($part),
- '��������������������������������������������������',
- 'ccaaaaeeeeiiiaeooouuuyooaiounnaaaaaeeeiiioooouuuyy')),
- array('�' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u')));
- }
- else
- $arr[$i] = mb_strtolower($part);
- }
-
- return join(" ", $arr);
+ return rcbe_utils::normalize_string($str);
}
-
/**
* Compose a valid display name from the given structured contact data
--
Gitblit v1.9.1