From 55817a73a8c2e8191f21136e777a353b61b866b2 Mon Sep 17 00:00:00 2001 From: Trevor Slocum Date: Tue, 22 Jun 2010 00:46:00 -0700 Subject: [PATCH] Upgraded ereg functions to preg for users with PHP version >= 5.3.0 --- inc/functions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 2d79f40..1da5ae1 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -53,7 +53,7 @@ function convertBytes($number) { function nameAndTripcode($name) { global $tinyib; - if (ereg("(#|!)(.*)", $name, $regs)) { + if (preg_match("/(#|!)(.*)/", $name, $regs)) { $cap = $regs[2]; $cap_full = '#' . $regs[2]; @@ -72,7 +72,7 @@ function nameAndTripcode($name) { $cap_delimiter = (strpos($name, '#') < strpos($name, '!')) ? '#' : '!'; } - if (ereg("(.*)(" . $cap_delimiter . ")(.*)", $cap, $regs_secure)) { + if (preg_match("/(.*)(" . $cap_delimiter . ")(.*)/", $cap, $regs_secure)) { $cap = $regs_secure[1]; $cap_secure = $regs_secure[3]; $is_secure_trip = true; @@ -86,7 +86,7 @@ function nameAndTripcode($name) { $cap = strtr($cap, "&", "&"); $cap = strtr($cap, ",", ", "); $salt = substr($cap."H.", 1, 2); - $salt = ereg_replace("[^\.-z]", ".", $salt); + $salt = preg_replace("/[^\.-z]/", ".", $salt); $salt = strtr($salt, ":;<=>?@[\\]^_`", "ABCDEFGabcdef"); $tripcode = substr(crypt($cap, $salt), -10); } @@ -96,10 +96,10 @@ function nameAndTripcode($name) { $tripcode .= "!"; } - $tripcode .= "!" . substr(md5($cap_secure . $tinyib['tripcodeseed']), 2, 10); + $tripcode .= "!" . substr(md5($cap_secure . $tinyib['tripseed']), 2, 10); } - return array(ereg_replace("(" . $cap_delimiter . ")(.*)", "", $name), $tripcode); + return array(preg_replace("/(" . $cap_delimiter . ")(.*)/", "", $name), $tripcode); } return array($name, "");