X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fwrapper-functions.php;h=bb570f585aeee4b92253ce8aef94166df8c36d45;hb=290937aff2aca93361a8bdb02a7c8ca5f16897fa;hp=43b1b306c4959d7982beb780ddac64ca98fc3cc9;hpb=4e5020660b07f30b7bf3ccc0a2ca664a19a21c0d;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 43b1b306c4..bb570f585a 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -671,7 +671,18 @@ function addPointsDirectly ($subject, $userid, $points) {
 // Wrapper function to redirect from member-only modules to index
 function redirectToIndexMemberOnlyModule () {
 	// Do the redirect here
-	redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEM_ONLY') . '&mod=' . getModule());
+	redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEM_ONLY') . '&mod=' . getModule());
+}
+
+// Wrapper function to redirect to current URL
+function redirectToRequestUri () {
+	redirectToUrl(basename(detectRequestUri()));
+}
+
+// Wrapper function to redirect to de-refered URL
+function redirectToDereferedUrl ($URL) {
+	// Redirect to to
+	redirectToUrl(generateDerefererUrl($URL));
 }
 
 // Wrapper function for checking if extension is installed and newer or same version
@@ -725,15 +736,6 @@ function isDemoModeActive () {
 	return ((isExtensionActive('demo')) && (getSession('admin_login') == 'demo'));
 }
 
-// Wrapper function to redirect to de-refered URL
-function redirectToDereferedUrl ($URL) {
-	// De-refer the URL
-	$URL = generateDerefererUrl($URL);
-
-	// Redirect to to
-	redirectToUrl($URL);
-}
-
 // Getter for PHP caching value
 function getPhpCaching () {
 	return $GLOBALS['php_caching'];
@@ -741,7 +743,28 @@ function getPhpCaching () {
 
 // Checks wether the admin hash is set
 function isAdminHashSet ($admin) {
-	if (!isset($GLOBALS['cache_array']['admin'])) debug_report_bug('Cache not set.');
+	/**
+	 * @TODO Do we really need this check? If yes, try to fix this:
+	 * 1.:functions.php:2504, debug_get_mailable_backtrace(0)
+	 * 2.:wrapper-functions.php:744, debug_report_bug(1)
+	 * 3.:mysql-manager.php:728, isAdminHashSet(1)
+	 * 4.:filters.php:384, isAdmin(0)
+	 * 5.:debug_get_mailable_backtrace:2457, FILTER_DETERMINE_USERNAME(1)
+	 * 6.:filter-functions.php:280, call_user_func_array(2)
+	 * 7.:load_cache.php:74, runFilterChain(1)
+	 * 8.:inc-functions.php:131, include(1)
+	 * 9.:inc-functions.php:145, loadInclude(1)
+	 * 10.:mysql-connect.php:104, loadIncludeOnce(1)
+	 * 11.:inc-functions.php:131, include(1)
+	 * 12.:inc-functions.php:145, loadInclude(1)
+	 * 13.:config-global.php:106, loadIncludeOnce(1)
+	 * 14.:js.php:57, require(1)
+	 */
+	if (!isset($GLOBALS['cache_array']['admin'])) {
+		debug_report_bug('Cache not set.');
+	} // END - if
+
+	// Check for admin hash
 	return isset($GLOBALS['cache_array']['admin']['password'][$admin]);
 }
 
@@ -840,13 +863,14 @@ function getFetchedUserData ($keyColumn, $userId, $valueColumn) {
 
 // Wrapper for strpos() to ease porting from deprecated ereg() function
 function isInString ($needle, $haystack) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'needle=' . $needle . ', haystack=' . $haystack . ', returned=' . intval(strpos($haystack, $needle) !== false));
 	return (strpos($haystack, $needle) !== false);
 }
 
 // Wrapper for strpos() to ease porting from deprecated eregi() function
 // This function is case-insensitive
 function isInStringIgnoreCase ($needle, $haystack) {
-	return (isInString(strtolower($haystack), strtolower($needle)));
+	return (isInString(strtolower($needle), strtolower($haystack)));
 }
 
 // [EOF]