X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=9c3cc70ca6855b450deb5079a06a57878d35b3c7;hb=9aac7d01362ca5336f0fb1129164c4139339f9c6;hp=da1d2508a2afe7707f4165b829c49018f4159201;hpb=d46421c7c499d5fdaeadf58f454063444cdb9fca;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index da1d2508a2..9c3cc70ca6 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 />');
@@ -1837,14 +1837,26 @@ function sendRawRequest ($host, $request) {
 		$useProxy = true;
 	} // END - if
 
+	// Load include
+	loadIncludeOnce('inc/classes/resolver.class.php');
+
+	// Get resolver instance
+	$resolver = new HostnameResolver();
+
 	// Open connection
 	//* DEBUG: */ die("SCRIPT=" . $script.'<br />');
 	if ($useProxy === true) {
+		// Resolve hostname into IP address
+		$ip = $resolver->resolveHostname(compileRawCode(getConfig('proxy_host')));
+
 		// Connect to host through proxy connection
-		$fp = fsockopen(compileRawCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
+		$fp = fsockopen($ip, bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
 	} else {
+		// Resolve hostname into IP address
+		$ip = $resolver->resolveHostname($host);
+
 		// Connect to host directly
-		$fp = fsockopen($host, 80, $errno, $errdesc, 30);
+		$fp = fsockopen($ip, 80, $errno, $errdesc, 30);
 	}
 
 	// Is there a link?
@@ -1860,35 +1872,13 @@ function sendRawRequest ($host, $request) {
 
 	// Do we use proxy?
 	if ($useProxy === true) {
-		// Generate CONNECT request header
-		$proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL');
-		$proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
-
-		// Use login data to proxy? (username at least!)
-		if (getConfig('proxy_username') != '') {
-			// Add it as well
-			$encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . compileRawCode(getConfig('proxy_password')));
-			$proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
-		} // END - if
+		// Setup proxy tunnel
+		$response = setupProxyTunnel($host, $fp);
 
-		// Add last new-line
-		$proxyTunnel .= getConfig('HTTP_EOL');
-		//* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
-
-		// Write request
-		fwrite($fp, $proxyTunnel);
-
-		// Got response?
-		if (feof($fp)) {
-			// No response received
-			return $response;
-		} // END - if
-
-		// Read the first line
-		$resp = trim(fgets($fp, 10240));
-		$respArray = explode(' ', $resp);
-		if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
+		// If the response is invalid, abort
+		if ((count($response) == 3) && (empty($response[0])) && (empty($response[1])) && (empty($response[2]))) {
 			// Invalid response!
+			logDebugMessage(__FUNCTION__, __LINE__, 'Proxy tunnel not working?');
 			return $response;
 		} // END - if
 	} // END - if
@@ -1935,7 +1925,7 @@ function sendRawRequest ($host, $request) {
 	// Time request if debug-mode is enabled
 	if (isDebugModeEnabled()) {
 		// Add debug message...
-		logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds.');
+		logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds and returned ' . count($response) . ' line(s).');
 	} // END - if
 
 	// Skip first empty lines
@@ -1961,6 +1951,7 @@ function sendRawRequest ($host, $request) {
 	if (!isset($response[0])) {
 		// No response, maybe timeout
 		$response = array('', '', '');
+		logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
 	} elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
 		// Proxy header detected, so remove two lines
 		array_shift($response);
@@ -1968,8 +1959,9 @@ 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
+		logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected status code ' . $response[0] . ' detected. "200 OK" was expected.');
 		$response = array('', '', '');
 	} // END - if
 
@@ -1977,7 +1969,48 @@ function sendRawRequest ($host, $request) {
 	return $response;
 }
 
-// Taken from www.php.net eregi() user comments
+// Sets up a proxy tunnel for given hostname and through resource
+function setupProxyTunnel ($host, $resource) {
+	// Initialize array
+	$response = array('', '', '');
+
+	// Generate CONNECT request header
+	$proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL');
+	$proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
+
+	// Use login data to proxy? (username at least!)
+	if (getConfig('proxy_username') != '') {
+		// Add it as well
+		$encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . ':' . compileRawCode(getConfig('proxy_password')));
+		$proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
+	} // END - if
+
+	// Add last new-line
+	$proxyTunnel .= getConfig('HTTP_EOL');
+	//* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
+
+	// Write request
+	fwrite($fp, $proxyTunnel);
+
+	// Got response?
+	if (feof($fp)) {
+		// No response received
+		return $response;
+	} // END - if
+
+	// Read the first line
+	$resp = trim(fgets($fp, 10240));
+	$respArray = explode(' ', $resp);
+	if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
+		// Invalid response!
+		return $response;
+	} // END - if
+
+	// All fine!
+	return $respArray;
+}
+
+// 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 +2025,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));
@@ -2548,6 +2581,7 @@ function getMessageFromErrorCode ($code) {
 		case getCode('MORE_RECEIVERS2')    : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
 		case getCode('MORE_RECEIVERS3')    : $message = getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'); break;
 		case getCode('INVALID_URL')        : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
+		case getCode('NO_MAIL_TYPE')       : $message = getMessage('MEMBER_NO_MAIL_TYPE_SELECTED'); break;
 		case getCode('UNKNOWN_ERROR')      : $message = getMessage('LOGIN_UNKNOWN_ERROR'); break;
 		case getCode('UNKNOWN_STATUS')     : $message = getMessage('LOGIN_UNKNOWN_STATUS'); break;
 
@@ -2632,7 +2666,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))));
@@ -3792,32 +3826,18 @@ function isSpider () {
 
 // Prepares the header for HTML output
 function loadHtmlHeader () {
-	// Determine the page title
-	$content['header_title'] = determinePageTitle();
-
-	// Output page header code
-	$GLOBALS['page_header'] = loadTemplate('page_header', true, $content);
-
-	// Include meta data in 'guest' module
-	if (getModule() == 'index') {
-		// Load meta data template
-		$GLOBALS['page_header'] .= loadTemplate('metadata', true);
+	// Run two filters:
+	// 1.) pre_page_header (mainly loads the page_header template and includes
+	//     meta description)
+	runFilterChain('pre_page_header');
 
-		// Add meta description to header
-		if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
-			// Add meta description not in admin and login module and when the script is installed
-			generateMetaDescriptionCode();
-		} // END - if
-	} // END - if
+	// Here can be something be added, but normally one of the two filters
+	// around this line should do the job for you.
 
+	// 2.) post_page_header (mainly to load stylesheet, extra JavaScripts and
+	//     to close the head-tag)
 	// Include more header data here
-	$GLOBALS['page_header'] .= loadTemplate('header', true);
-
-	// Include stylesheet
-	loadIncludeOnce('inc/stylesheet.php');
-
-	// Closing HEAD tag
-	$GLOBALS['page_header'] .= '</head>';
+	runFilterChain('post_page_header');
 }
 
 // Adds page header and footer to output array element