Further rewrites due to deprecated functions in 5.3.1

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 9eedda3e4329d93a189c476efdcf34d40564bfb9..278c570375f636a7c09022d03a7fcadb2c1d0c32 100644 (file)
--- 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))));