Stop using deprecated ereg() functions (#2820952)

[squirrelmail.git] / functions / url_parser.php

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 32fdc392f04ce52c9eb92fb279e44256bcb4b28d..73ef9843afaf3d6c0a37bd085b5fd609e467f7bc 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -6,7 +6,7 @@
  * This code provides various string manipulation functions that are
  * used by the rest of the SquirrelMail code.
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2009 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -55,7 +55,7 @@ function parseEmail (&$body) {
     $addresses = array();
 
     /* Find all the email addresses in the body */
-    while(eregi($Email_RegExp_Match, $sbody, $regs)) {
+    while (preg_match('/' . $Email_RegExp_Match . '/i', $sbody, $regs)) {
         $addresses[$regs[0]] = strtr($regs[0], array('&' => '&'));
         $start = strpos($sbody, $regs[0]) + strlen($regs[0]);
         $sbody = substr($sbody, $start);
@@ -133,8 +133,8 @@ function parseUrl (&$body) {
             $target_pos = strlen($check_str) + $start;
         }
 
-        /* If there was a token to replace, replace it */
-        if ($target_token == 'mailto:') {    // rfc 2368 (mailto URL)
+        // rfc 2368 (mailto URL)
+        if ($target_token == 'mailto:') {
             $target_pos += 7;    //skip mailto:
             $end = $blength;
 
@@ -163,6 +163,7 @@ function parseUrl (&$body) {
             }
         }
         else
+        /* If there was a token to replace, replace it */
         if ($target_token != '') {
             /* Find the end of the URL */
             $end = $blength;
@@ -182,7 +183,7 @@ function parseUrl (&$body) {
             $url = substr($body, $target_pos, $end-$target_pos);
 
             /* Needed since lines are not passed with \n or \r */
-            while ( ereg("[,\.]$", $url) ) {
+            while ( preg_match('/[,.]$/', $url) ) {
                 $url = substr( $url, 0, -1 );
                 $end--;
             }
@@ -216,7 +217,7 @@ function getEmail($string) {
     $addresses = array();
 
     /* Find all the email addresses in the body */
-    while (eregi($Email_RegExp_Match, $string, $regs)) {
+    while (preg_match('/' . $Email_RegExp_Match . '/i', $string, $regs)) {
         $addresses[$regs[0]] = strtr($regs[0], array('&' => '&'));
         $start = strpos($string, $regs[0]) + strlen($regs[0]);
         $string = substr($string, $start);