X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=9eedda3e4329d93a189c476efdcf34d40564bfb9;hb=718b0e4fa583fd61764d9be2657445f50265dcdc;hp=122ba1204c33ee850f8e59f79cb414d8c4a04d3e;hpb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 122ba1204c..9eedda3e43 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -1793,7 +1794,7 @@ function sendPostRequest ($script, $postData) {
 	// Extract host name from script
 	$host = extractHostnameFromUrl($script);
 
-	// Construct request
+	// Construct request body
 	$body = http_build_query($postData, '', '&');
 
 	// Generate POST request header
@@ -1801,8 +1802,11 @@ function sendPostRequest ($script, $postData) {
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getConfig('URL') . '/admin.php' . getConfig('HTTP_EOL');
 	$request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('FULL_VERSION') . getConfig('HTTP_EOL');
+	$request .= 'Accept: text/plain;q=0.8' . getConfig('HTTP_EOL');
+	$request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL');
 	$request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
 	$request .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL');
+	$request .= 'Content-Length: ' . strlen($body) . getConfig('HTTP_EOL');
 	$request .= 'Connection: close' . getConfig('HTTP_EOL');
 	$request .= getConfig('HTTP_EOL');
 
@@ -1863,7 +1867,7 @@ function sendRawRequest ($host, $request) {
 		// 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')));
+			$encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . ':' . compileRawCode(getConfig('proxy_password')));
 			$proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
 		} // END - if
 
@@ -1950,6 +1954,7 @@ function sendRawRequest ($host, $request) {
 		}
 	} // END - foreach
 
+	//* DEBUG: */ print('<strong>Request:</strong><pre>'.print_r($request, true).'</pre>');
 	//* DEBUG: */ print('<strong>Response:</strong><pre>'.print_r($response, true).'</pre>');
 
 	// Proxy agent found or something went wrong?
@@ -2073,6 +2078,9 @@ function generateEmailLink ($email, $table = 'admins') {
 
 // Generate a hash for extra-security for all passwords
 function generateHash ($plainText, $salt = '', $hash = true) {
+	// Debug output
+	//* DEBUG: */ outputHtml('plainText=' . $plainText . ',salt=' . $salt . ',hash='.intval($hash).'<br />');
+
 	// Is the required extension 'sql_patches' there and a salt is not given?
 	// 0123                            4                      43    3     4     432    2                  3             32    2                             3                3210
 	if ((((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) && (empty($salt))) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5')))) {
@@ -2119,9 +2127,9 @@ function generateHash ($plainText, $salt = '', $hash = true) {
 		//* DEBUG: */ outputHtml($salt.' ('.strlen($salt).')<br />');
 	} else {
 		// Use given salt
-		//* DEBUG: */ print 'salt=' . $salt . '<br />';
+		//* DEBUG: */ outputHtml('salt=' . $salt . '<br />');
 		$salt = substr($salt, 0, getConfig('salt_length'));
-		//* DEBUG: */ print 'salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')<br />';
+		//* DEBUG: */ outputHtml('salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')<br />');
 
 		// Sanity check on salt
 		if (strlen($salt) != getConfig('salt_length')) {
@@ -2130,8 +2138,14 @@ function generateHash ($plainText, $salt = '', $hash = true) {
 		} // END - if
 	}
 
+	// Generate final hash (for debug output)
+	$finalHash = $salt . sha1($salt . $plainText);
+
+	// Debug output
+	//* DEBUG: */ outputHtml('finalHash=' . $finalHash);
+
 	// Return hash
-	return $salt.sha1($salt . $plainText);
+	return $finalHash;
 }
 
 // Scramble a string
@@ -2223,19 +2237,22 @@ function encodeHashForCookie ($passHash) {
 	$ret = $passHash;
 
 	// Is a secret key and master salt already initialized?
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, intval(isExtensionInstalled('sql_patches')) . '/' . intval(isConfigEntrySet('_PRIME')) . '/' . intval(isConfigEntrySet('secret_key')) . '/' . intval(isConfigEntrySet('master_salt')));
 	if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) {
 		// Only calculate when the secret key is generated
-		if (strlen($passHash) != getConfig('secret_key')) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, strlen($passHash) . '/' . strlen(getConfig('secret_key')));
+		if ((strlen($passHash) != 49) || (strlen(getConfig('secret_key')) != 40)) {
 			// Both keys must have same length so return unencrypted
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, strlen($passHash) . '!=49/' . strlen(getConfig('secret_key')) . '!=40');
 			return $ret;
 		} // END - if
 
 		$newHash = ''; $start = 9;
-		//* DEBUG: */ outputHtml('passHash=' . $passHash . '(' . strlen($passHash) . ')<br />');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'passHash=' . $passHash . '(' . strlen($passHash) . ')');
 		for ($idx = 0; $idx < 20; $idx++) {
-			$part1 = hexdec(substr($passHash, ($idx * 2), 2));
+			$part1 = hexdec(substr($passHash, ($idx * 2) + (strlen($passHash) - strlen(getConfig('secret_key'))), 2));
 			$part2 = hexdec(substr(getConfig('secret_key'), $start, 2));
-			//* DEBUG: */ outputHtml('part1='.$part1.'/part2='.$part2.'<br />');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'part1=' . $part1 . '/part2=' . $part2);
 			$mod = dechex($idx);
 			if ($part1 > $part2) {
 				$mod = dechex(sqrt(($part1 - $part2) * getConfig('_PRIME') / pi()));
@@ -2243,19 +2260,19 @@ function encodeHashForCookie ($passHash) {
 				$mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi()));
 			}
 			$mod = substr($mod, 0, 2);
-			//* DEBUG: */ outputHtml('part1='.$part1.'/part2='.$part2.'/mod=' . $mod . '('.strlen($mod).')<br />');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'part1=' . $part1 . '/part2=' . $part2 . '/mod=' . $mod . '(' . strlen($mod) . ')');
 			$mod = str_repeat(0, (2 - strlen($mod))) . $mod;
-			//* DEBUG: */ outputHtml('mod(' . ($idx * 2) . ')=' . $mod . '*<br />');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mod(' . ($idx * 2) . ')=' . $mod . '*');
 			$start += 2;
 			$newHash .= $mod;
 		} // END - for
 
-		//* DEBUG: */ print($passHash . '<br />' . $newHash . ' (' . strlen($newHash) . ')<br />');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $passHash . ',' . $newHash . ' (' . strlen($newHash) . ')');
 		$ret = generateHash($newHash, getConfig('master_salt'));
-		//* DEBUG: */ print('ret=' . $ret . '<br />');
 	} // END - if
 
 	// Return result
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret . '');
 	return $ret;
 }
 
@@ -2280,11 +2297,8 @@ function app_die ($F, $L, $message) {
 		// Make sure, that the script realy realy diese here and now
 		$GLOBALS['app_died'] = true;
 
-		// Set content type if not set
-		if (!isContentTypeSet()) {
-			// text/html is the right one
-			setContentType('text/html');
-		} // END - if
+		// Set content type as text/html
+		setContentType('text/html');
 
 		// Load header
 		loadIncludeOnce('inc/header.php');
@@ -2534,6 +2548,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;
 
@@ -2904,7 +2919,7 @@ function handleLoginFailures ($accessLevel) {
 }
 
 // Rebuild cache
-function rebuildCacheFile ($cache, $inc = '', $force = false) {
+function rebuildCache ($cache, $inc = '', $force = false) {
 	// Debug message
 	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
 
@@ -3673,7 +3688,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent) {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent='') {
 	// Start the output
 	$OUT = '<select name="' . $name . '" size="1" class="admin_select">
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
@@ -3681,7 +3696,13 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
 	// Walk through all options
 	foreach ($options as $option) {
 		// Add the <option> entry
-		$OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
+		if (empty($optionContent)) {
+			// ... from template
+			$OUT .= loadTemplate('select_' . $name . '_option', true, $option);
+		} else {
+			// Direct HTML code
+			$OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
+		}
 	} // END - foreach
 
 	// Finish selection box
@@ -3767,37 +3788,23 @@ function isSpider () {
 	if (empty($userAgent)) return true;
 
 	// Is it a spider?
-	return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false));
+	return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false) || (strpos($userAgent, 'archiver') !== false));
 }
 
 // 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