Possible fix for 'Unknown gender 1 detected.' in autopurge

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 2127a208e7e62d1e6b70ade8346aa97d1f12fdd9..a184c20331912e39e1c1e0651c62ed124c88bd51 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -92,7 +92,7 @@ function writeToFile ($FQFN, $content, $aquireLock = false) {
                }
        } else {
                // Write it with fopen
-               $fp = fopen($FQFN, 'w') or app_die(__FUNCTION__, __LINE__, "Cannot write file ".basename($FQFN).'!');
+               $fp = fopen($FQFN, 'w') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($FQFN) . '!');
 
                // Aquire lock
                if ($aquireLock === true) flock($fp, LOCK_EX);
@@ -154,10 +154,10 @@ function merge_array ($array1, $array2) {
                debug_report_bug(__FUNCTION__ . ': No arrays provided!');
        } elseif (!is_array($array1)) {
                // Left one is not an array
-               debug_report_bug(sprintf("[%s:%s] array1 is not an array. array != %s", __FUNCTION__, __LINE__, gettype($array1)));
+               debug_report_bug(__FILE__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
        } elseif (!is_array($array2)) {
                // Right one is not an array
-               debug_report_bug(sprintf("[%s:%s] array2 is not an array. array != %s", __FUNCTION__, __LINE__, gettype($array2)));
+               debug_report_bug(__FILE__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2)));
        }
 
        // Merge all together
@@ -393,19 +393,19 @@ function copyFileVerified ($source, $dest, $chmod = '') {
        // Is the source file there?
        if (!isFileReadable($source)) {
                // Then abort here
-               debug_report_bug('Cannot read from source file ' . basename($source) . '.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read from source file ' . basename($source) . '.');
        } // END - if
 
        // Is the target directory there?
        if (!isDirectory(dirname($dest))) {
                // Then abort here
-               debug_report_bug('Cannot find directory ' . str_replace(getConfig('PATH'), '', dirname($dest)) . '.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Cannot find directory ' . str_replace(getConfig('PATH'), '', dirname($dest)) . '.');
        } // END - if
 
        // Now try to copy it
        if (!copy($source, $dest)) {
                // Something went wrong
-               debug_report_bug('copy() has failed to copy the file.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'copy() has failed to copy the file.');
        } else {
                // Reset cache
                $GLOBALS['file_readable'][$dest] = true;
@@ -437,7 +437,7 @@ function flushHeaders () {
        // Is the header already sent?
        if (headers_sent()) {
                // Then abort here
-               debug_report_bug('Headers already sent!');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Headers already sent!');
        } // END - if
 
        // Flush all headers if found
@@ -457,7 +457,7 @@ function changeMode ($FQFN, $mode) {
        // Is the file/directory there?
        if ((!isFileReadable($FQFN)) && (!isDirectory($FQFN))) {
                // Neither, so abort here
-               debug_report_bug('Cannot chmod() on ' . basename($FQFN) . '.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Cannot chmod() on ' . basename($FQFN) . '.');
        } // END - if
 
        // Try to set them
@@ -555,7 +555,7 @@ function isWhatSet ($strict =  false) {
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               debug_report_bug('what is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'what is empty.');
        } // END - if
 
        // Return it
@@ -563,12 +563,12 @@ function isWhatSet ($strict =  false) {
 }
 
 // Getter for 'action' value
-function getAction () {
+function getAction ($strict = true) {
        // Default is null
        $action = null;
 
        // Is the value set?
-       if (isActionSet(true)) {
+       if (isActionSet(($strict) && (getOutputMode() == 0))) {
                // Then use it
                $action = $GLOBALS['action'];
        } // END - if
@@ -590,7 +590,7 @@ function isActionSet ($strict =  false) {
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               debug_report_bug('action is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'action is empty.');
        } // END - if
 
        // Return it
@@ -626,7 +626,7 @@ function isModuleSet ($strict =  false) {
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               debug_report_bug('module is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'module is empty.');
        } // END - if
 
        // Return it
@@ -661,7 +661,7 @@ function isOutputModeSet ($strict =  false) {
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               debug_report_bug('output_mode is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'output_mode is empty.');
        } // END - if
 
        // Return it
@@ -716,7 +716,10 @@ function isExtensionInstalledAndNewer ($ext_name, $version) {
        // Is an cache entry found?
        if (!isset($GLOBALS['ext_installed_newer'][$ext_name][$version])) {
                $GLOBALS['ext_installed_newer'][$ext_name][$version] = ((isExtensionInstalled($ext_name)) && (getExtensionVersion($ext_name) >= $version));
-       } // END - if
+       } else {
+               // Cache hits should be incremented twice
+               incrementStatsEntry('cache_hits', 2);
+       }
 
        // Return it
        //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'=&gt;'.$version.':'.intval($GLOBALS['ext_installed_newer'][$ext_name][$version]).'<br />';
@@ -728,7 +731,10 @@ function isExtensionInstalledAndOlder ($ext_name, $version) {
        // Is an cache entry found?
        if (!isset($GLOBALS['ext_installed_older'][$ext_name][$version])) {
                $GLOBALS['ext_installed_older'][$ext_name][$version] = ((isExtensionInstalled($ext_name)) && (isExtensionOlder($ext_name, $version)));
-       } // END - if
+       } else {
+               // Cache hits should be incremented twice
+               incrementStatsEntry('cache_hits', 2);
+       }
 
        // Return it
        //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'&lt;'.$version.':'.intval($GLOBALS['ext_installed_older'][$ext_name][$version]).'<br />';
@@ -801,7 +807,7 @@ function isAdminHashSet ($admin) {
         * 14.:js.php:57, require(1)
         */
        if (!isset($GLOBALS['cache_array']['admin'])) {
-               debug_report_bug('Cache not set.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Cache not set.');
        } // END - if
 
        // Check for admin hash
@@ -879,7 +885,7 @@ function getCurrentUserId () {
        // Userid must be set before it can be used
        if (!isCurrentUserIdSet()) {
                // Not set
-               debug_report_bug('User id is not set.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'User id is not set.');
        } // END - if
 
        // Return the userid
@@ -935,5 +941,32 @@ function ifFatalErrorsDetected () {
        return (getTotalFatalErrors() > 0);
 }
 
+// Wrapper until we merged to the EL branch
+function preCompileCode ($code, $template = '', $compiled = false, $full = true, $overwrite = false) {
+       return compileCode($code, false, true, $full);
+}
+
+// Setter for HTTP status
+function setHttpStatus ($status) {
+       $GLOBALS['http_status'] = (string) $status;
+}
+
+// Getter for HTTP status
+function getHttpStatus () {
+       return $GLOBALS['http_status'];
+}
+
+// Compiles config entries for SQL queries
+function compileSqlConfig ($sqlString) {
+       // Replace all
+       foreach (array('_MYSQL_PREFIX', '_TABLE_TYPE') as $configEntry) {
+               // "Compile" it
+               $sqlString = str_replace('{?' . $configEntry . '?}', getConfig($configEntry), $sqlString);
+       } // END - foreach
+
+       // Return the compiled SQL string
+       return $sqlString;
+}
+
 // [EOF]
 ?>