X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=0f96686c20698392812a06755c7db34096dde385;hb=0e104a9282a1cdc7d769bbccb03bd3462aa8f4e0;hp=fdf4b97ecf6c66de6c01f12e98c2176e4acf7c71;hpb=cf911469f718afb27ef9d239d375c7fe002cdc5e;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index fdf4b97ecf..0f96686c20 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -295,7 +295,7 @@ function generateDateTime ($time, $mode = '0') {
 				default:
 					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
 					break;
-			}
+			} // END - switch
 			break;
 
 		default: // Default is the US date / time format!
@@ -594,26 +594,26 @@ function redirectToUrl ($url, $allowSpider = true) {
  *                                                                      *
  ************************************************************************/
 function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) {
-	$dummy = $array;
+	$temporaryArray = $array;
 	while ($primary_key < count($a_sort)) {
-		foreach ($dummy[$a_sort[$primary_key]] as $key => $value) {
-			foreach ($dummy[$a_sort[$primary_key]] as $key2 => $value2) {
+		foreach ($temporaryArray[$a_sort[$primary_key]] as $key => $value) {
+			foreach ($temporaryArray[$a_sort[$primary_key]] as $key2 => $value2) {
 				$match = false;
 				if ($nums === false) {
 					// Sort byte-by-byte (also numbers will be interpreted as chars! E.g.: "9" > "10")
-					if (($key != $key2) && (strcmp(strtolower($dummy[$a_sort[$primary_key]][$key]), strtolower($dummy[$a_sort[$primary_key]][$key2])) == $order)) $match = true;
+					if (($key != $key2) && (strcmp(strtolower($temporaryArray[$a_sort[$primary_key]][$key]), strtolower($temporaryArray[$a_sort[$primary_key]][$key2])) == $order)) $match = true;
 				} elseif ($key != $key2) {
 					// Sort numbers (E.g.: 9 < 10)
-					if (($dummy[$a_sort[$primary_key]][$key] < $dummy[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true;
-					if (($dummy[$a_sort[$primary_key]][$key] > $dummy[$a_sort[$primary_key]][$key2]) && ($order == 1))  $match = true;
+					if (($temporaryArray[$a_sort[$primary_key]][$key] < $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true;
+					if (($temporaryArray[$a_sort[$primary_key]][$key] > $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == 1))  $match = true;
 				}
 
 				if ($match) {
 					// We have found two different values, so let's sort whole array
-					foreach ($dummy as $sort_key => $sort_val) {
-						$t                       = $dummy[$sort_key][$key];
-						$dummy[$sort_key][$key]  = $dummy[$sort_key][$key2];
-						$dummy[$sort_key][$key2] = $t;
+					foreach ($temporaryArray as $sort_key => $sort_val) {
+						$t                       = $temporaryArray[$sort_key][$key];
+						$temporaryArray[$sort_key][$key]  = $temporaryArray[$sort_key][$key2];
+						$temporaryArray[$sort_key][$key2] = $t;
 						unset($t);
 					} // END - foreach
 				} // END - if
@@ -625,7 +625,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums
 	} // END - while
 
 	// Write back sorted array
-	$array = $dummy;
+	$array = $temporaryArray;
 }
 
 
@@ -645,7 +645,7 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
 	if (isConfigEntrySet('file_hash')) {
 		$keys .= getEncryptSeperator() . getFileHash();
 	} // END - if
-	$keys .= getEncryptSeperator() . getDateFromPatchTime();
+	$keys .= getEncryptSeperator() . getDateFromRepository();
 	if (isConfigEntrySet('master_salt')) {
 		$keys .= getEncryptSeperator() . getMasterSalt();
 	} // END - if
@@ -676,7 +676,7 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
 	}
 
 	// Create number from hash
-	$rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
+	$rcode = hexdec(substr($saltedHash, getSaltLength(), 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
 
 	// At least 10 numbers shall be secure enought!
 	if (isExtensionActive('other')) {
@@ -689,8 +689,8 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
 		$len = 10;
 	} // END - if
 
-	// Cut off requested counts of number
-	$return = substr(str_replace('.', '', $rcode), 0, $len);
+	// Cut off requested counts of number, but skip first digit (which is mostly a zero)
+	$return = substr($rcode, (strpos($rcode, '.') + 1), $len);
 
 	// Done building code
 	return $return;
@@ -868,7 +868,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
 	// Is the required extension 'sql_patches' there and a salt is not given?
 	// 123                            4                      43    3     4     432    2                  3             32    2                             3                32    2      3     3      21
 	if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) && (empty($salt))) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5')) || (strlen($salt) == 32)) {
-		// Extension sql_patches is missing/outdated so we hash the plain text with MD5
+		// Extension ext-sql_patches is missing/outdated so we hash the plain text with MD5
 		if ($hash === true) {
 			// Is plain password
 			return md5($plainText);
@@ -890,7 +890,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
 		$server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr();
 
 		// Build key string
-		$keys   = getSiteKey() . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . getSecretKey() . getEncryptSeperator() . getFileHash() . getEncryptSeperator() . getDateFromPatchTime() . getEncryptSeperator() . getMasterSalt();
+		$keys   = getSiteKey() . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . getSecretKey() . getEncryptSeperator() . getFileHash() . getEncryptSeperator() . getDateFromRepository() . getEncryptSeperator() . getMasterSalt();
 
 		// Additional data
 		$data = $plainText . getEncryptSeperator() . uniqid(mt_rand(), true) . getEncryptSeperator() . time();
@@ -1406,7 +1406,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
 }
 
 // Send notification to admin
-function sendAdminNotification ($subject, $templateName, $content = array(), $userid = '0') {
+function sendAdminNotification ($subject, $templateName, $content = array(), $userid = NULL) {
 	if ((isExtensionInstalledAndNewer('admins', '0.4.1')) && (function_exists('sendAdminsEmails'))) {
 		// Send new way
 		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'admins=Y,subject=' . $subject . ',templateName=' . $templateName);
@@ -1465,7 +1465,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 }
 
 // Converts timestamp selections into a timestamp
-function convertSelectionsToEpocheTime (array &$postData, array &$DATA, &$id, &$skip) {
+function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id, &$skip) {
 	// Init test variable
 	$skip  = false;
 	$test2 = '';
@@ -1480,7 +1480,7 @@ function convertSelectionsToEpocheTime (array &$postData, array &$DATA, &$id, &$
 		if ((isset($postData[$test.'_ye'])) && (isset($postData[$test.'_mo'])) && (isset($postData[$test.'_we'])) && (isset($postData[$test.'_da'])) && (isset($postData[$test.'_ho'])) && (isset($postData[$test.'_mi'])) && (isset($postData[$test.'_se'])) && ($test != $test2)) {
 			// Generate timestamp
 			$postData[$test] = createEpocheTimeFromSelections($test, $postData);
-			$DATA[] = sprintf("`%s`='%s'", $test, $postData[$test]);
+			$content[] = sprintf("`%s`='%s'", $test, $postData[$test]);
 			$GLOBALS['skip_config'][$test] = true;
 
 			// Remove data from array
@@ -1654,34 +1654,43 @@ function determineReferalId () {
 	// Check if refid is set
 	if (isReferalIdValid()) {
 		// This is fine...
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferalId() . ')');
 	} elseif (isPostRequestParameterSet('refid')) {
 		// Get referal id from POST element refid
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestParameter('refid') . ')');
 		setReferalId(secureString(postRequestParameter('refid')));
 	} elseif (isGetRequestParameterSet('refid')) {
 		// Get referal id from GET parameter refid
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestParameter('refid') . ')');
 		setReferalId(secureString(getRequestParameter('refid')));
 	} elseif (isGetRequestParameterSet('ref')) {
 		// Set refid=ref (the referal link uses such variable)
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestParameter('refid') . ')');
 		setReferalId(secureString(getRequestParameter('ref')));
 	} elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
 		// The variable user comes from  click.php
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestParameter('user') . ')');
 		setReferalId(bigintval(getRequestParameter('user')));
 	} elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
-		// Set session refid als global
+		// Set session refid as global
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from SESSION data (' . getSession('refid') . ')');
 		setReferalId(bigintval(getSession('refid')));
 	} elseif (isRandomReferalIdEnabled()) {
 		// Select a random user which has confirmed enougth mails
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referal id');
 		setReferalId(determineRandomReferalId());
 	} elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid()))) {
 		// Set default refid as refid in URL
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
 		setReferalId(getDefRefid());
 	} else {
 		// No default id when sql_patches is not installed or none set
-		setReferalId(null);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using NULL as refid');
+		setReferalId(NULL);
 	}
 
 	// Set cookie when default refid > 0
-	if (!isSessionVariableSet('refid') || (!isValidUserId(getReferalId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
+	if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferalId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
 		// Default is not found
 		$found = false;
 
@@ -1693,24 +1702,34 @@ function determineReferalId () {
 			// If we found it, use the userid as referal id
 			if ($found === true) {
 				// Set the userid as 'refid'
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from user account by nickname (' . getUserData('userid') . ')');
 				setReferalId(getUserData('userid'));
 			} // END - if
 		} elseif (isValidUserId(getReferalId())) {
 			// Direct userid entered
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferalId() . ')');
 			$found = fetchUserData(getReferalId());
 		}
 
 		// Is the record valid?
 		if ((($found === false) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) {
 			// No, then reset referal id
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
 			setReferalId(getDefRefid());
 		} // END - if
 
 		// Set cookie
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #1');
 		setSession('refid', getReferalId());
-	} elseif (!isReferalIdValid()) {
+	} elseif ((!isReferalIdValid()) || (!fetchUserData(getReferalId()))) {
 		// Not valid!
-		setSession('refid', 0);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referal id (' . getReferalId() . '), setting NULL in session');
+		setReferalId(NULL);
+		setSession('refid', NULL);
+	} else {
+		// Set it from GLOBALS array in session
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #2');
+		setSession('refid', getReferalId());
 	}
 
 	// Return determined refid
@@ -2233,7 +2252,7 @@ function generateAdminMailLinks ($mailType, $mailId) {
 	// Is the mail type supported?
 	if (!empty($table)) {
 		// Query for the mail
-		$result = SQL_QUERY_ESC("SELECT `id`, `%s` AS `mail_status` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `id`=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `id`,`%s` AS `mail_status` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `id`=%s LIMIT 1",
 			array(
 				$statusColumn,
 				$table,