From 4e5020660b07f30b7bf3ccc0a2ca664a19a21c0d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 2 Mar 2010 15:59:25 +0000
Subject: [PATCH] Further rewrites due to deprecated functions in 5.3.1

---
 DOCS/de/THANK_YOU.txt                     |  2 +-
 inc/classes/rdf.class.php                 |  2 +-
 inc/functions.php                         | 40 +++++++++++------------
 inc/language/nickname_de.php              |  2 +-
 inc/libs/html_mail_functions.php          |  8 ++---
 inc/libs/newsletter_functions.php         |  6 ++--
 inc/libs/rewrite_functions.php            |  4 +--
 inc/libs/security_functions.php           |  2 +-
 inc/modules/admin/what-config_rewrite.php |  2 +-
 inc/modules/admin/what-updates.php        |  2 +-
 inc/modules/member/what-nickname.php      |  2 +-
 inc/phpmailer/class.phpmailer.php         |  2 +-
 inc/pool/pool-bonus.php                   |  2 +-
 inc/pool/pool-user.php                    |  2 +-
 inc/wrapper-functions.php                 | 11 +++++++
 15 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/DOCS/de/THANK_YOU.txt b/DOCS/de/THANK_YOU.txt
index 5e17dc516e..a214dc6e39 100644
--- a/DOCS/de/THANK_YOU.txt
+++ b/DOCS/de/THANK_YOU.txt
@@ -31,7 +31,7 @@ Personen:
   (http://www.onlinewerbebombe.de)
 - Der User profi-concept aus meinem Forum hat mir sehr viele gute Patches zur
   Verfuegung gestellt (http://www.stelzi.net)
-- Irgentjemand, den ich noch vergessen habe...
+- Irgent jemand, den ich noch vergessen habe...
 
 Websites / Programmierer / etc.:
 - SF.net: Hosten meine Projektdateien (nur Archive)
diff --git a/inc/classes/rdf.class.php b/inc/classes/rdf.class.php
index 8233aba8cc..d71ca447dd 100644
--- a/inc/classes/rdf.class.php
+++ b/inc/classes/rdf.class.php
@@ -693,7 +693,7 @@ class fase4_rdf {
 		$this->_item['link'] = trim($this->_item['link']);
 		if ((!empty($this->_display_opt['refid'])) && (!empty($this->_item['link'])))
 		{
-			if (!ereg('refid=', $this->_item['link'])) $this->_item['link'] .= '?refid=' . $this->_display_opt['refid'];
+			if (!isInString('refid=', $this->_item['link'])) $this->_item['link'] .= '?refid=' . $this->_display_opt['refid'];
 		}
 		switch ($name) {
 			case 'item':
diff --git a/inc/functions.php b/inc/functions.php
index 9eedda3e43..278c570375 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -539,7 +539,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	eval("\$subject = decodeEntities(\"".compileRawCode(escapeQuotes($subject))."\");");
 
 	// Set from header
-	if ((!eregi('@', $toEmail)) && ($toEmail > 0)) {
+	if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
 		// Value detected, is the message extension installed?
 		// @TODO Extension 'msg' does not exist
 		if (isExtensionActive('msg')) {
@@ -1462,38 +1462,38 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 		$OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"timebox_table dashed\">\n";
 		$OUT .= "<tr>\n";
 
-		if (ereg('Y', $display) || (empty($display))) {
+		if (isInString('Y', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
 		}
 
-		if (ereg('M', $display) || (empty($display))) {
+		if (isInString('M', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
 		}
 
-		if (ereg('W', $display) || (empty($display))) {
+		if (isInString('W', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_WEEKS--}</strong></td>\n";
 		}
 
-		if (ereg('D', $display) || (empty($display))) {
+		if (isInString('D', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_DAYS--}</strong></td>\n";
 		}
 
-		if (ereg('h', $display) || (empty($display))) {
+		if (isInString('h', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
 		}
 
-		if (ereg('m', $display) || (empty($display))) {
+		if (isInString('m', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
 		}
 
-		if (ereg('s', $display) || (empty($display))) {
+		if (isInString('s', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
 		}
 
 		$OUT .= "</tr>\n";
 		$OUT .= "<tr>\n";
 
-		if (ereg('Y', $display) || (empty($display))) {
+		if (isInString('Y', $display) || (empty($display))) {
 			// Generate year selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ye\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 10; $idx++) {
@@ -1506,7 +1506,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_ye" value="0" />';
 		}
 
-		if (ereg('M', $display) || (empty($display))) {
+		if (isInString('M', $display) || (empty($display))) {
 			// Generate month selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mo\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 11; $idx++)
@@ -1520,7 +1520,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_mo" value="0" />';
 		}
 
-		if (ereg('W', $display) || (empty($display))) {
+		if (isInString('W', $display) || (empty($display))) {
 			// Generate week selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_we\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 4; $idx++) {
@@ -1533,7 +1533,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_we" value="0" />';
 		}
 
-		if (ereg('D', $display) || (empty($display))) {
+		if (isInString('D', $display) || (empty($display))) {
 			// Generate day selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_da\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 31; $idx++) {
@@ -1546,7 +1546,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_da" value="0" />';
 		}
 
-		if (ereg('h', $display) || (empty($display))) {
+		if (isInString('h', $display) || (empty($display))) {
 			// Generate hour selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ho\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 23; $idx++) 	{
@@ -1559,7 +1559,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_ho" value="0" />';
 		}
 
-		if (ereg('m', $display) || (empty($display))) {
+		if (isInString('m', $display) || (empty($display))) {
 			// Generate minute selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mi\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 59; $idx++) {
@@ -1572,7 +1572,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_mi" value="0" />';
 		}
 
-		if (ereg('s', $display) || (empty($display))) {
+		if (isInString('s', $display) || (empty($display))) {
 			// Generate second selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_se\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 59; $idx++) {
@@ -1716,7 +1716,7 @@ function extractHostnameFromUrl (&$script) {
 
 	// Extract host name
 	$host = str_replace('http://', '', $url);
-	if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
+	if (isInString('/', $host)) $host = substr($host, 0, strpos($host, '/'));
 
 	// Generate relative URL
 	//* DEBUG: */ print("SCRIPT=" . $script.'<br />');
@@ -1968,7 +1968,7 @@ function sendRawRequest ($host, $request) {
 	} // END - if
 
 	// Was the request successfull?
-	if ((!eregi('200 OK', $response[0])) || (empty($response[0]))) {
+	if ((!isInStringIgnoreCase('200 OK', $response[0])) || (empty($response[0]))) {
 		// Not found / access forbidden
 		$response = array('', '', '');
 	} // END - if
@@ -1977,7 +1977,7 @@ function sendRawRequest ($host, $request) {
 	return $response;
 }
 
-// Taken from www.php.net eregi() user comments
+// Taken from www.php.net isInStringIgnoreCase() user comments
 function isEmailValid ($email) {
 	// Check first part of email address
 	$first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
@@ -1992,7 +1992,7 @@ function isEmailValid ($email) {
 	return preg_match($regex, $email);
 }
 
-// Function taken from user comments on www.php.net / function eregi()
+// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
 function isUrlValid ($URL, $compile=true) {
 	// Trim URL a little
 	$URL = trim(urldecode($URL));
@@ -2633,7 +2633,7 @@ function compileUriCode ($code, $simple = true) {
 	return $code;
 }
 
-// Function taken from user comments on www.php.net / function eregi()
+// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
 function isUrlValidSimple ($url) {
 	// Prepare URL
 	$url = secureString(str_replace("\\", '', compileRawCode(urldecode($url))));
diff --git a/inc/language/nickname_de.php b/inc/language/nickname_de.php
index e727d054a3..7d1ecf1ace 100644
--- a/inc/language/nickname_de.php
+++ b/inc/language/nickname_de.php
@@ -58,7 +58,7 @@ addMessages(array(
 	'PLEASE_CLICK_NICKNAME_FORM' => "Hier k&ouml;nnen Sie sich nun einen einrichten...",
 	'NICKNAME_ADMIN_CONFIG_HEADER' => "Einstellungen am Nicknamen",
 	'ADMIN_NICKNAME_MIN_LENGTH' => "Minimale L&auml;nge",
-	'ADMIN_NICKNAME_PATTERN' => "Pattern f&uuml;r ereg()-Befehl",
+	'ADMIN_NICKNAME_PATTERN' => "Pattern f&uuml;r isInString()-Befehl",
 	'ADMIN_NICKNAME_LANG_CHARS' => "Zeichenfolge f&uuml;r Sprachdatei",
 ));
 
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index a3c176691d..8630b68128 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -56,7 +56,7 @@ function addValidHtmlTags() {
 //
 function checkHtmlTags ($html) {
 	$test = stripslashes($html);
-	while (ereg('<', $test) && ereg('>', $test)) {
+	while (isInString('<', $test) && isInString('>', $test)) {
 		$check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1));
 		$check = str_replace('/', '', $check);
 		if (!in_array($check, $GLOBALS['html_tags'])) {
@@ -74,12 +74,12 @@ function insertUrlsIntoHtml ($text) {
 	$test = $text;
 
 	// First replace URLs...
-	while (ereg('http://', $test)) {
+	while (isInString('http://', $test)) {
 		$check = substr($test, strpos($test, 'http://')); $check2 = $check;
 
 		// See ext-html.php if you want to add more URL ends...
 		foreach ($GLOBALS['url_ends'] as $end) {
-			if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
+			if (isInString($end, $check)) $check = substr($check, 0, strpos($check, $end));
 		} // END - foreach
 
 		// Now replace the URL against anchor container and pray...
@@ -97,7 +97,7 @@ function insertUrlsIntoHtml ($text) {
 
 	// ... what will the email address be out the @... ;-)
 	$PARTS = array();
-	while (ereg('@', $test)) {
+	while (isInString('@', $test)) {
 		$pos = strpos($test, '@');
 		$test2 = substr($test, 0, $pos);
 
diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index fe1d990e5b..8ecfe7373d 100644
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -47,12 +47,12 @@ function insertNewsletterUrls ($text) {
 	$test = $text;
 
 	// First replace URLs...
-	while (ereg('http://', $test)) {
+	while (isInString('http://', $test)) {
 		$check = substr($test, strpos($test, 'http://')); $check2 = $check;
 
 		// See ext-html.php if you want to add more URL ends...
 		foreach ($GLOBALS['url_ends'] as $end) {
-			if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
+			if (isInString($end, $check)) $check = substr($check, 0, strpos($check, $end));
 		} // END - foreach
 
 		// Now replace the URL against anchor container and pray...
@@ -70,7 +70,7 @@ function insertNewsletterUrls ($text) {
 
 	// ... what will the email address be out the @... ;-)
 	$PARTS = array();
-	while (ereg('@', $test)) {
+	while (isInString('@', $test)) {
 		$pos = strpos($test, '@');
 		$test2 = substr($test, 0, $pos);
 
diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index 68a1ea633d..6a23cf91bf 100644
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Rewrite links in HTML for better SEO (ugly part of mx!)
 function rewriteLinksInCode ($HTML) {
 	// Skip rewriting for configured modules
-	if (eregi(getModule(), getConfig('rewrite_skip')) !== false) return $HTML;
+	if (isInStringIgnoreCase(getModule(), getConfig('rewrite_skip')) !== false) return $HTML;
 
 	// Generate target URL
 	$target = '{?URL?}/cms/';
@@ -61,7 +61,7 @@ function rewriteLinksInCode ($HTML) {
 	} // END - foreach
 
 	// Do we have an URL linked to mxchange.org?
-	if (eregi(getConfig('SERVER_URL'), $output)) {
+	if (isInStringIgnoreCase(getConfig('SERVER_URL'), $output)) {
 		// Convert URLs from my server
 		$output = str_replace('{?URL?}/modules.php?module=', getConfig('SERVER_URL') . '/cms/', $output);
 
diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index 7309965b5b..193ddb9fb4 100644
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -89,7 +89,7 @@ function securePhpSelf () {
 	$phpSelfFile      = basename($_SERVER['PHP_SELF']);
 
 	// Check for a .php inside the $phpSelfDirectory...
-	while (ereg('.php', $phpSelfDirectory)) {
+	while (strpos($phpSelfDirectory, '.php') !== false) {
 		// Correct the dirname
 		$phpSelfDirectory = substr($phpSelfDirectory, 0, (strpos($phpSelfDirectory, '.php') + 4));
 		// Rewrite filename...
diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php
index e8c95004de..f5218da010 100644
--- a/inc/modules/admin/what-config_rewrite.php
+++ b/inc/modules/admin/what-config_rewrite.php
@@ -71,7 +71,7 @@ if (isFormSent()) {
 		if (empty($content['title'])) $content['title'] = '---';
 
 		// Already registered module?
-		if (ereg($content['module'], getConfig('rewrite_skip'))) {
+		if (isInString($content['module'], getConfig('rewrite_skip'))) {
 			// Found
 			$y = ' checked="checked"';
 			$n = '';
diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 461eabe931..580c57bcbe 100644
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -56,7 +56,7 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 	$response = array('', '', '');
 } else {
 	// Analyse header for response code
-	if (eregi('200 OK', $response[0])) {
+	if (isInStringIgnoreCase('200 OK', $response[0])) {
 		// Found, kill header
 		$pos = '0';
 		foreach($response as $k => $v) {
diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 7680b89d3e..bd40a66b78 100644
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -59,7 +59,7 @@ if (isFormSent()) {
 	if (isPostRequestParameterSet('nickname')) {
 		// Check if nickname is valid
 		$PATTERN = '[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}';
-		if (ereg($PATTERN, postRequestParameter('nickname'), $array)) {
+		if (isInString($PATTERN, postRequestParameter('nickname'), $array)) {
 			// Entered nickname is valid?
 			$isValid = ($array[0] == postRequestParameter('nickname'));
 		} // END - if
diff --git a/inc/phpmailer/class.phpmailer.php b/inc/phpmailer/class.phpmailer.php
index 6939fc2c8a..6fa18175b1 100644
--- a/inc/phpmailer/class.phpmailer.php
+++ b/inc/phpmailer/class.phpmailer.php
@@ -589,7 +589,7 @@ class PHPMailer {
     /* Retry while there is no connection */
     while($index < count($hosts) && $connection == false) {
       $hostinfo = array();
-      if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
+      if(isInStringIgnoreCase('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
         $host = $hostinfo[1];
         $port = $hostinfo[2];
       } else {
diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index d5084bee6b..0787499781 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -72,7 +72,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 				array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
 			// "Explode" all receivers into an array
-			if (ereg(';', $DATA['receivers'])) {
+			if (isInString(';', $DATA['receivers'])) {
 				// There's more than one receiver in the list...
 				$receiverS = explode(';', $DATA['receivers']);
 			} elseif (!empty($DATA['points'])) {
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index d3e009cb1f..1abf8a079b 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -77,7 +77,7 @@ if (SQL_NUMROWS($result_main) > 0) {
 		// Entry updated?
 		if (SQL_AFFECTEDROWS() == 1) {
 			// "Explode" all receivers into an array
-			if (ereg(';', $DATA['receivers'])) {
+			if (isInString(';', $DATA['receivers'])) {
 				// There's more than one receiver in the list...
 				$receiverS = explode(';', $DATA['receivers']);
 			} elseif (!empty($DATA['receivers'])) {
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 665cb5ed50..43b1b306c4 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -838,5 +838,16 @@ function getFetchedUserData ($keyColumn, $userId, $valueColumn) {
 	return $data;
 }
 
+// Wrapper for strpos() to ease porting from deprecated ereg() function
+function isInString ($needle, $haystack) {
+	return (strpos($haystack, $needle) !== false);
+}
+
+// Wrapper for strpos() to ease porting from deprecated eregi() function
+// This function is case-insensitive
+function isInStringIgnoreCase ($needle, $haystack) {
+	return (isInString(strtolower($haystack), strtolower($needle)));
+}
+
 // [EOF]
 ?>
-- 
2.30.2