Merge branch 'issue-ereg' of https://github.com/remicollet/horde

horde · Jun 27, 2016 · 771e5c3 · 771e5c3
2 parents a7d4d9e + 70efe63
commit 771e5c3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Pt.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Pt.php
@@ -130,14 +130,14 @@ public function parse($text, $specifiedOptions = array())
 	public function normalize_special_characters( $str )
 	{
 	    # Quotes cleanup
-	    $str = ereg_replace( chr(ord("`")), "'", $str );        # `
-	    $str = ereg_replace( chr(ord("´")), "'", $str );        # ´
-	    $str = ereg_replace( chr(ord("„")), ",", $str );        # „
-	    $str = ereg_replace( chr(ord("`")), "'", $str );        # `
-	    $str = ereg_replace( chr(ord("´")), "'", $str );        # ´
-	    $str = ereg_replace( chr(ord("“")), "\"", $str );       # “
-	    $str = ereg_replace( chr(ord("”")), "\"", $str );       # ”
-	    $str = ereg_replace( chr(ord("´")), "'", $str );        # ´
+	    $str = str_replace( chr(ord("`")), "'", $str );        # `
+	    $str = str_replace( chr(ord("´")), "'", $str );        # ´
+	    $str = str_replace( chr(ord("„")), ",", $str );        # „
+	    $str = str_replace( chr(ord("`")), "'", $str );        # `
+	    $str = str_replace( chr(ord("´")), "'", $str );        # ´
+	    $str = str_replace( chr(ord("“")), "\"", $str );       # “
+	    $str = str_replace( chr(ord("”")), "\"", $str );       # ”
+	    $str = str_replace( chr(ord("´")), "'", $str );        # ´
 
 	    $unwanted_array = array('Š'=>'S', 'š'=>'s', 'Ž'=>'Z', 'ž'=>'z', 'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'A', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
 		                        'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O', 'Õ'=>'O', 'Ö'=>'O', 'Ø'=>'O', 'Ù'=>'U',
@@ -147,12 +147,12 @@ public function normalize_special_characters( $str )
 	    $str = strtr( $str, $unwanted_array );
 
 	    # Bullets, dashes, and trademarks
-	    $str = ereg_replace( chr(149), "&#8226;", $str );    # bullet •
-	    $str = ereg_replace( chr(150), "&ndash;", $str );    # en dash
-	    $str = ereg_replace( chr(151), "&mdash;", $str );    # em dash
-	    $str = ereg_replace( chr(153), "&#8482;", $str );    # trademark
-	    $str = ereg_replace( chr(169), "&copy;", $str );     # copyright mark
-	    $str = ereg_replace( chr(174), "&reg;", $str );      # registration mark
+	    $str = str_replace( chr(149), "&#8226;", $str );    # bullet •
+	    $str = str_replace( chr(150), "&ndash;", $str );    # en dash
+	    $str = str_replace( chr(151), "&mdash;", $str );    # em dash
+	    $str = str_replace( chr(153), "&#8482;", $str );    # trademark
+	    $str = str_replace( chr(169), "&copy;", $str );     # copyright mark
+	    $str = str_replace( chr(174), "&reg;", $str );      # registration mark
 
 	    return $str;
 	}

diff --git a/framework/Db/lib/Horde/Db/SearchParser.php b/framework/Db/lib/Horde/Db/SearchParser.php
@@ -156,7 +156,7 @@ protected static function _parseKeywords4($column, &$tokens)
         }
 
         $val = Horde_String::lower(substr(array_shift($tokens), 1));
-        $val = addslashes(ereg_replace("([\\%])", "\\\\1", $val));
+        $val = addslashes(str_replace("%", "\\%", $val));
 
         return "(LOWER($column) LIKE '%$val%')";
     }

diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php
@@ -59,7 +59,7 @@ protected function _load(&$children)
 
         $result = array();
         foreach ($object['annotation'] as $annotation) {
-            list($key, $value)           = split('#', $annotation, 2);
+            list($key, $value)           = explode('#', $annotation, 2);
             $result[base64_decode($key)] = base64_decode($value);
         }