New extension added, more EL-rewrites, naming-convention applied:

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c91f93e88c2ff2dacb6ec88956f376df6c1f8ae7..8e7ae4c14e8c415e0d501d64beb44129b1d0a966 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -117,7 +117,7 @@ function writeToFile ($FQFN, $content, $aquireLock = false) {
 // Clears the output buffer. This function does *NOT* backup sent content.
 function clearOutputBuffer () {
        // Trigger an error on failure
-       if (!ob_end_clean()) {
+       if ((ob_get_length() > 0) && (!ob_end_clean())) {
                // Failed!
                debug_report_bug(__FUNCTION__.': Failed to clean output buffer.');
        } // END - if
@@ -151,7 +151,7 @@ function merge_array ($array1, $array2) {
        // Are both an array?
        if ((!is_array($array1)) && (!is_array($array2))) {
                // Both are not arrays
-               debug_report_bug(__FUNCTION__ . ': No arrays provided!');
+               debug_report_bug(__FUNCTION__, __LINE__, 'No arrays provided!');
        } elseif (!is_array($array1)) {
                // Left one is not an array
                debug_report_bug(__FILE__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
@@ -661,7 +661,7 @@ function isOutputModeSet ($strict =  false) {
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               debug_report_bug(__FUNCTION__, __LINE__, 'output_mode is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Output_mode is empty.');
        } // END - if
 
        // Return it
@@ -678,7 +678,7 @@ function isBlockModeEnabled () {
        // Abort if not set
        if (!isset($GLOBALS['block_mode'])) {
                // Needs to be fixed
-               debug_report_bug(__FUNCTION__ . ': block_mode is not set.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Block_mode is not set.');
        } // END - if
 
        // Return it
@@ -697,7 +697,7 @@ 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_MEMBER_ONLY') . '&mod=' . getModule());
 }
 
 // Wrapper function to redirect to current URL
@@ -722,7 +722,7 @@ function isExtensionInstalledAndNewer ($ext_name, $version) {
        }
 
        // Return it
-       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'=&gt;'.$version.':'.intval($GLOBALS['ext_installed_newer'][$ext_name][$version]).'<br />';
+       //* DEBUG: */ debugOutput(__FUNCTION__.':'.$ext_name.'=&gt;'.$version.':'.intval($GLOBALS['ext_installed_newer'][$ext_name][$version]));
        return $GLOBALS['ext_installed_newer'][$ext_name][$version];
 }
 
@@ -737,7 +737,7 @@ function isExtensionInstalledAndOlder ($ext_name, $version) {
        }
 
        // Return it
-       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'&lt;'.$version.':'.intval($GLOBALS['ext_installed_older'][$ext_name][$version]).'<br />';
+       //* DEBUG: */ debugOutput(__FUNCTION__.':'.$ext_name.'&lt;'.$version.':'.intval($GLOBALS['ext_installed_older'][$ext_name][$version]));
        return $GLOBALS['ext_installed_older'][$ext_name][$version];
 }
 
@@ -956,18 +956,6 @@ 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;
-}
-
 // Setter for 'is_template_html'
 function enableTemplateHtml ($enable = true) {
        $GLOBALS['is_template_html'] = (bool) $enable;
@@ -1044,5 +1032,34 @@ function determineCountry ($userid) {
        return $country;
 }
 
+// "Getter" for total confirmed user accounts
+function getTotalConfirmedUser () {
+       // Is it cached?
+       if (!isset($GLOBALS['total_confirmed_users'])) {
+               // Then do it
+               $GLOBALS['total_confirmed_users'] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+       } // END - if
+
+       // Return cached value
+       return $GLOBALS['total_confirmed_users'];
+}
+
+// Wrapper for writing debug informations to the browser
+function debugOutput ($message) {
+       outputHtml('<div class="debug_message">' . $message . '</div>');
+}
+
+// Is given userid valid?
+function isValidUserId ($userid) {
+       // Do we have cache?
+       if (!isset($GLOBALS['is_valid_userid'][$userid])) {
+               // Check it out
+               $GLOBALS['is_valid_userid'][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid > 0));
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['is_valid_userid'][$userid];
+}
+
 // [EOF]
 ?>