X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=1935e2a8ccedda9cacd01492dec25e57fe0f4df6;hb=0b4c98232a5c9c5b934a5049dc3c84ad32ab1125;hp=b6083824ef45981a8d8d594c5bd3b9a03a6832f1;hpb=ad97b034f89416e998f04e045d7f37009e5d1b80;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index b6083824ef..1935e2a8cc 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -92,6 +92,9 @@ function generatePassword ($length = '0', $exclude =  array()) {
 	// Exclude some entries
 	$localAbc = array_diff($GLOBALS['_abc'], $exclude);
 
+	// $localAbc must have at least 10 entries
+	assert(count($localAbc) >= 10);
+
 	// Start creating password
 	$password = '';
 	while (strlen($password) < $length) {
@@ -645,7 +648,7 @@ function createFancyTime ($stamp) {
 	} // END - foreach
 
 	// Is something there?
-	if (strlen($ret) > 0) {
+	if (!empty($ret)) {
 		// Remove leading commata and space
 		$ret = substr($ret, 2);
 	} else {
@@ -796,7 +799,9 @@ function scrambleString ($str) {
 	}
 
 	// Compare both lengths and abort if different
-	if (strlen($str) != count($scrambleNums)) return $str;
+	if (strlen($str) != count($scrambleNums)) {
+		return $str;
+	} // END - if
 
 	// Scramble string here
 	//* DEBUG: */ debugOutput('***Original=' . $str.'***<br />');
@@ -901,7 +906,7 @@ function encodeHashForCookie ($passHash) {
 
 			$mod = substr($mod, 0, 2);
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',part1=' . $part1 . '/part2=' . $part2 . '/mod=' . $mod . '(' . strlen($mod) . ')');
-			$mod = str_repeat('0', (2 - strlen($mod))) . $mod;
+			$mod = str_pad($mod, 2, '0', STR_PAD_LEFT);
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mod(' . ($idx * 2) . ')=' . $mod . '*');
 			$start += 2;
 			$newHash .= $mod;
@@ -1242,7 +1247,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
 					if ($next > -1) {
 						if ($next === $seek) {
 							$next = -1;
-							$line = $prefix . $inserted . $suffix . chr(10);
+							$line = $prefix . $inserted . $suffix . PHP_EOL;
 						} else {
 							$next++;
 						}
@@ -1286,7 +1291,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) {
 	// Is debug mode enabled?
 	if ((isDebugModeEnabled()) || ($force === TRUE)) {
 		// Remove CRLF
-		$message = str_replace(array(chr(13), chr(10)), array('', ''), $message);
+		$message = str_replace(array(chr(13), PHP_EOL), array('', ''), $message);
 
 		// Log this message away
 		appendLineToFile(getPath() . getCachePath() . 'debug.log', generateDateTime(time(), '4') . '|' . getModule(FALSE) . '|' . basename($funcFile) . '|' . $line . '|' . $message);
@@ -1340,19 +1345,22 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 }
 
 // Tries to determine if call-back functions and/or extra values shall be parsed
-function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search) {
-	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries=' . $entries . ',userIdColumn=' . $userIdColumn[0] . ',search=' . $search . ',filterFunctions=' . print_r($filterFunctions, TRUE) . ',extraValues=' . print_r($extraValues, TRUE));
+function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search, $id = NULL) {
+	// Debug mode enabled?
+	if (isDebugModeEnabled()) {
+		// Debug message
+		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries=' . $entries . ',userIdColumn=' . $userIdColumn[0] . ',search=' . $search . ',filterFunctions=' . print_r($filterFunctions, TRUE) . ',extraValues=' . print_r($extraValues, TRUE));
+	} // END - if
 
 	// Send data through the filter function if found
-	if ($key == $userIdColumn[0]) {
+	if ($key === $userIdColumn[0]) {
 		// Is the userid, we have to process it with convertZeroToNull()
 		$entries = convertZeroToNull($entries);
 	} elseif ((!empty($filterFunctions[$key])) && (isset($extraValues[$key]))) {
 		// Debug mode enabled?
 		if (isDebugModeEnabled()) {
 			// Then log it
-			/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',extraValues=' . $extraValues[$key] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries) . ']=' . $entries . ' - BEFORE!');
+			/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . $extraValues[$key] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries) . ']=' . $entries . ' - BEFORE!');
 		} // END - if
 
 		// Filter function + extra value set
@@ -1361,8 +1369,26 @@ function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $u
 		// Debug mode enabled?
 		if (isDebugModeEnabled()) {
 			// Then log it
-			/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',extraValues=' . $extraValues[$key] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries) . ']=' . $entries . ' - AFTER!');
+			/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . $extraValues[$key] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries) . ']=' . $entries . ' - AFTER!');
 		} // END - if
+	} elseif ((!empty($filterFunctions[$search])) && (!empty($extraValues[$search]))) {
+		// Debug mode enabled?
+		if (isDebugModeEnabled()) {
+			// Then log it
+			/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',search=' . $search . ',entries[' . gettype($entries) . ']=' . $entries . ' - BEFORE!');
+		} // END - if
+
+		// Handle extra values
+		$entries = handleExtraValues($filterFunctions[$search], $entries, $extraValues[$search]);
+
+		// Debug mode enabled?
+		if (isDebugModeEnabled()) {
+			// Then log it
+			/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',search=' . $search . ',entries[' . gettype($entries) . ']=' . $entries . ' - AFTER!');
+		} // END - if
+
+		// Make sure entries is not bool, then something went wrong
+		assert(!is_bool($entries));
 	} elseif (!empty($filterFunctions[$search])) {
 		// Debug mode enabled?
 		if (isDebugModeEnabled()) {
@@ -1802,7 +1828,6 @@ function mapModuleToTable ($moduleName) {
 		case 'login': // ... and 'login' the member's menu
 			$moduleName = 'member';
 			break;
-
 		// Anything else will not be mapped, silently.
 	} // END - switch
 
@@ -1922,7 +1947,7 @@ function encodeUrl ($url, $outputMode = '0') {
 	} // END - if
 
 	// Is there a valid session?
-	if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === FALSE) || (!isset($_COOKIE[session_name()]))) && (isSpider() === FALSE)) {
+	if ((!isSessionValid()) && (!isSpider())) {
 		// Determine right separator
 		$separator = '&amp;';
 		if (!isInString('?', $url)) {
@@ -1930,11 +1955,8 @@ function encodeUrl ($url, $outputMode = '0') {
 			$separator = '?';
 		} // END - if
 
-		// Is the session id set?
-		if (session_id() != '') {
-			// Then add it to URL
-			$url .= $separator . session_name() . '=' . session_id();
-		} // END - if
+		// Then add it to URL
+		$url .= $separator . session_name() . '=' . session_id();
 	} // END - if
 
 	// Add {?URL?} ?
@@ -2057,13 +2079,10 @@ function convertZeroToNull ($number) {
 // Converts a NULL to zero
 function convertNullToZero ($number) {
 	// Is it a valid username?
-	if ((!is_null($number)) && (!empty($number)) && ($number > 0)) {
-		// Always secure it
-		$number = bigintval($number);
-	} else {
+	if ((is_null($number)) || (empty($number)) || ($number < 1)) {
 		// Is not valid or zero
 		$number = '0';
-	}
+	} // END - if
 
 	// Return it
 	return $number;
@@ -2178,7 +2197,7 @@ function isHexadecimal ($hex) {
 }
 
 /**
- * Replace chr(13) with "[r]" and chr(10) with "[n]" and add a final new-line to make
+ * Replace chr(13) with "[r]" and PHP_EOL with "[n]" and add a final new-line to make
  * them visible to the developer. Use this function to debug e.g. buggy HTTP
  * response handler functions.
  *
@@ -2186,7 +2205,7 @@ function isHexadecimal ($hex) {
  * @return	$str	Overworked string
  */
 function replaceReturnNewLine ($str) {
-	return str_replace(array(chr(13), chr(10)), array('[r]', '[n]'), $str);
+	return str_replace(array(chr(13), PHP_EOL), array('[r]', '[n]'), $str);
 }
 
 // Converts a given string by splitting it up with given delimiter similar to
@@ -2298,7 +2317,7 @@ function convertStringToBoolean ($str) {
 		} // END - if
 
 		// Determine it
-		$GLOBALS[__FUNCTION__][$str] = (($strTrimmed == 'true') ? true : false);
+		$GLOBALS[__FUNCTION__][$str] = ($strTrimmed == 'true');
 	} // END - if
 
 	// Return cache
@@ -2371,7 +2390,7 @@ function memberAddEntries ($tableName, $columns = array(), $filterFunctions = ar
 }
 
 // Edit rows by given id numbers
-function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
 	// $tableName must be an array
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
@@ -2405,12 +2424,12 @@ function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFuncti
 		}
 	} else {
 		// List for editing
-		memberListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+		memberListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
 	}
 }
 
 // Delete rows by given id numbers
-function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
 	// Do this only for members
 	assert(isMember());
 
@@ -2447,17 +2466,18 @@ function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunc
 		}
 	} else {
 		// List for deletion confirmation
-		memberListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+		memberListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUSerId, $content);
 	}
 }
 
 // Build a special template list
-function memberListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function memberListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
 	// Do this only for logged in member
 	assert(isMember());
 
 	// Call inner (general) function
-	doGenericListBuilder('member', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId);
+	doGenericListBuilder('member', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
 }
 
 // Checks whether given address is IPv4