API functions renamed:

- getOutputMode() is now known as getScriptOutputMode()
- getCachedOutputMode() is now known as getOutputMode()
- This solves a conflict shown in previous commit

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 4776a89ed11b24f24be894b660a27aa5c0464405..63d458b082cbf22a26ea15d10fcc02fbf0370ced 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -282,11 +282,11 @@ class CacheSystem {
                // Is the cache file not yet rebuilt?
                if ((!isset($this->rebuilt[$this->name])) && ($this->isCacheReadable())) {
                        // Only run in regular output mode
-                       if ((getOutputMode() != 0) && ($force === false)) {
+                       if ((getScriptOutputMode() != 0) && ($force === false)) {
                                // Debug message if allowed
                                if (isDebugModeEnabled()) {
                                        // Debug message
-                                       logDebugMessage(__METHOD__, __LINE__, 'Not removing cache ' . $this->name . ' in output_mode=' . getOutputMode());
+                                       logDebugMessage(__METHOD__, __LINE__, 'Not removing cache ' . $this->name . ' in output_mode=' . getScriptOutputMode());
                                } // END - if
 
                                // Abort here

diff --git a/inc/config-functions.php b/inc/config-functions.php
index b81e1633ae18f45a6f4b600e12543366767a51f7..55d530bc891be35ce9e0897b023dc88465c4e0ac 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -278,7 +278,7 @@ function updateOldConfigFile () {
 // Update config entries
 function updateConfiguration ($entries, $values, $updateMode='', $config = '0') {
        // Do not update config in CSS mode
-       if ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) {
+       if ((getScriptOutputMode() == 1) || (getScriptOutputMode() == -1) || (isInstallationPhase())) {
                return;
        } // END - if
 

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index b079a48e5ad4414f3260b3f5fb0e266edf5bb3ac..13dc80bb446c8136b70a7ebcdb4bfec02e2a4fb0 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -101,7 +101,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
        incrementConfigEntry('sql_count');
 
        // Debug output
-       if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
+       if ((getScriptOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
                //
                // Debugging stuff...
                //

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index a680cc148770565a9499f898a22aed5253c204f3..ee5ff4908fc385e56f38c08793343a316683917c 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -125,7 +125,7 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run =
                        // Download functions file
                        loadIncludeOnce($funcsInclude);
                } // END - if
-       } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
+       } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getScriptOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
                // No functions file is not so good...
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no own functions file or we cannot read from it. mode=%s",
                        $ext_name,
@@ -593,7 +593,7 @@ function getExtensionVersion ($ext_name, $force = false) {
 
                // Count cache hits
                incrementStatsEntry('cache_hits');
-       } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getOutputMode() != 0)) {
+       } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getScriptOutputMode() != 0)) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT `ext_version` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
                        array($ext_name), __FUNCTION__, __LINE__);

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index a4997d35b3e3199f17c82989711d7136a729f69d..44f1fb1e77b27cb160e4610c85bdc7cf180372b9 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -329,7 +329,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
        case 'init': // Do stuff when extension is initialized
                // Do stuff only when not in CSS mode
                // @TODO Move this code into rallye_functions.php
-               if (getOutputMode() != 1) {
+               if (getScriptOutputMode() != 1) {
                        // Get total member count
                        $total = getTotalConfirmedUser();
 

diff --git a/inc/filters.php b/inc/filters.php
index a470fa1275088c7894a2d0231068c9911e53a6e9..5dd7d6999025ddec270572adfccaf23db5ca54d3 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -452,7 +452,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
        //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.print_r($matches, true).'</pre>');
 
        // Default is from outputHtml()
-       $outputMode = getOutputMode();
+       $outputMode = getScriptOutputMode();
 
        // Some entries found?
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
@@ -510,7 +510,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
        } // END - if
 
        // Do we have non-HTML mode?
-       if ((getOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
+       if ((getScriptOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
 
        // Return compiled code
        //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.($code).'</pre>');
@@ -534,7 +534,7 @@ function FILTER_UPDATE_EXTENSION_DATA ($ext_name) {
 // Load more reset scripts
 function FILTER_RUN_RESET_INCLUDES () {
        // Is the reset set or old sql_patches?
-       if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == '0')) {
+       if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getScriptOutputMode() == '0')) {
                // Then abort here
                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks');
        } // END - if
@@ -624,14 +624,14 @@ function FILTER_DETERMINE_WHAT_ACTION () {
        } // END - if
 
        // Get all values
-       if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
+       if ((getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
                // Fix module
                if (!isModuleSet()) {
                        // Is the request element set?
                        if (isGetRequestParameterSet('module')) {
                                // Set module from request
                                setModule(getRequestParameter('module'));
-                       } elseif (getOutputMode() == '0') {
+                       } elseif (getScriptOutputMode() == '0') {
                                // Set default module 'index'
                                setModule('index');
                        } else {
@@ -653,7 +653,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 
        // Set default 'what' value
        //* DEBUG: */ debugOutput('-' . getModule() . '/' . getWhat() . '-');
-       if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+       if ((!isWhatSet()) && (!isActionSet()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
                if (getModule() == 'admin') {
                        // Set 'action' value to 'login' in admin menu
                        setAction(getActionFromModuleWhat(getModule(), getWhat()));
@@ -670,7 +670,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 // Sends out pooled mails
 function FILTER_TRIGGER_SENDING_POOL () {
        // Are we in normal output mode?
-       if (getOutputMode() != 0) {
+       if (getScriptOutputMode() != 0) {
                // Only in normal output mode to prevent race-conditons!
        } // END - if
 
@@ -708,7 +708,7 @@ function FILTER_RUN_DAILY_RESET () {
        if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return;
 
        // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-       if (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getOutputMode() != 1)) {
+       if (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getScriptOutputMode() != 1)) {
                // Tell every module we are in reset-mode!
                doReset();
        } // END - if
@@ -770,7 +770,7 @@ function FILTER_COUNT_MODULE () {
 // Handles fatal errors
 function FILTER_HANDLE_FATAL_ERRORS () {
        // Do we have errors to handle and right output mode?
-       if ((!ifFatalErrorsDetected()) || (getOutputMode() != '0')) {
+       if ((!ifFatalErrorsDetected()) || (getScriptOutputMode() != '0')) {
                // Abort executing here
                return false;
        } // END - if
@@ -871,7 +871,7 @@ function FILTER_DISPLAY_COPYRIGHT () {
 function FILTER_DISPLAY_PARSING_TIME () {
        // Shall we display the parsing time and number of queries?
        // 1234                            5                      54    4         5              5       4    4                       5       543    3                   4432    2             33     2    2                              21
-       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
+       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getScriptOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                displayParsingTime();
        } // END - if

diff --git a/inc/footer.php b/inc/footer.php
index a9bf76f5fe27c321e43e32f1087a4b6effc94df1..7d8b93402e5589a07d0a40919b020d305ccd16ca 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -47,7 +47,7 @@ $GLOBALS['page_footer'] = '';
 
 // Footer disabled or already sent?
 // 1234      5                       54    45                            5    5                            543    3                    321
-if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (getOutputMode() != 1))) {
+if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (getScriptOutputMode() != 1))) {
        // Run the filter, sweet huh?
        runFilterChain('page_footer');
 

diff --git a/inc/functions.php b/inc/functions.php
index a81f011107945350090a43acd2a935e0dcf15504..fbfc36201714a216853d3f13295b90e057134500 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1902,7 +1902,7 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
 // Determines referal id and sets it
 function determineReferalId () {
        // Skip this in non-html-mode and outside ref.php
-       if ((getOutputMode() != 0) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false;
+       if ((getScriptOutputMode() != 0) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false;
 
        // Check if refid is set
        if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
@@ -2265,7 +2265,7 @@ function getModuleFromFileName ($file, $accessLevel) {
 // Encodes an URL for adding session id, etc.
 function encodeUrl ($url, $outputMode = '0') {
        // Do we have already have a PHPSESSID inside or view.php is called? Then abort here
-       if ((strpos($url, session_name()) !== false) || (getOutputMode() == -3)) return $url;
+       if ((strpos($url, session_name()) !== false) || (getScriptOutputMode() == -3)) return $url;
 
        // Do we have a valid session?
        if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
@@ -2275,7 +2275,7 @@ function encodeUrl ($url, $outputMode = '0') {
                if (strpos($url, '?') === false) {
                        // No question mark
                        $seperator = '?';
-               } elseif ((getOutputMode() != '0') || ($outputMode != '0')) {
+               } elseif ((getScriptOutputMode() != '0') || ($outputMode != '0')) {
                        // Non-HTML mode
                        $seperator = '&';
                }

diff --git a/inc/header.php b/inc/header.php
index 0313f88583d39f2c2deefa01e9f7bd96095b6b77..785ddd8ebb049233262cb328527a84e7bbe1f4ec 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -53,7 +53,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
        setHttpStatus('200 OK');
 
        // If not in CSS mode generate the header
-       if (getOutputMode() != 1) {
+       if (getScriptOutputMode() != 1) {
                // Prepare the header for HTML output
                loadHtmlHeader();
        } // END - if
@@ -63,7 +63,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
 } // END - if
 
 // Add BODY tag or not?
-if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
+if ((getScriptOutputMode() != 1) && (getScriptOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 5e227601343167b93e1abf8498300bc724e76910..303fa09d11050b5387fa31ccc9dd63fe5ad60fa8 100644 (file)
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -192,7 +192,7 @@ function loadLanguageFile ($ext_name = 'none') {
        if (isLanguageIncludeReadable($ext_name)) {
                // Load language file
                loadLanguageInclude($ext_name);
-       } elseif ((isDebugModeEnabled()) && (getOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
+       } elseif ((isDebugModeEnabled()) && (getScriptOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
                // No language file is not so good...
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no language file or we cannot read from it. lang=%s, mode=%s",
                        $ext_name,

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index a6f61c9a37c86015b5dbd4c8d1d098cb76fe45e8..895ef86bf2798cc96181b411beb4c58c6582b122 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -242,7 +242,7 @@ function getActualTheme () {
                        // Fix it to default
                        $ret = 'default';
                } // END - if
-       } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+       } elseif ((!isInstalled()) && ((isInstalling()) || (getScriptOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
                // Prepare filename for checking
                $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
 

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index ec2a54626b848fdc40d386e1fbe99fbec9c6d326..33d00a3a890676550861ffb715669766bcf9aa07 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -83,7 +83,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
                $GLOBALS['cache_instance']->removeCacheFile();
                unset($GLOBALS['cache_array']['admin']);
        }
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 
@@ -116,7 +116,7 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
        if (($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
                // Load referal system from cache
                $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
-       } elseif (getOutputMode() != 1) {
+       } elseif (getScriptOutputMode() != 1) {
                // Create cache file here
                $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index fd16f1206fe6f9b978dae9fb2332c5e53877968a..952110fa9b23abfa28bca3360beaa48a16f41bde 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -60,7 +60,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_in
 
        // Remove dummy array
        unset($config);
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-extension.php b/inc/loader/load_cache-extension.php
index 95dd73c7bf55f4b369652fb0012f9f5346bd2f08..cb0b30589d6e1a712b046cbbaecdbe77da85bdce 100644 (file)
--- a/inc/loader/load_cache-extension.php
+++ b/inc/loader/load_cache-extension.php
@@ -132,7 +132,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
        // Remove array and mark cache as loaded
        unset($EXT_POOL);
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-filter.php b/inc/loader/load_cache-filter.php
index 300bdd64f981f2ee2176ba218602b891411a66c4..f8096858178b41dbb201593536c79c2c1b87cb55 100644 (file)
--- a/inc/loader/load_cache-filter.php
+++ b/inc/loader/load_cache-filter.php
@@ -52,7 +52,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('filter')) && ($GLOBALS['cache_in
 
        // Prepare the array here
        prepareFilterArray();
-} elseif ((getOutputMode() != 1) && (isExtensionInstalled('sql_patches'))) {
+} elseif ((getScriptOutputMode() != 1) && (isExtensionInstalled('sql_patches'))) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-impressum.php b/inc/loader/load_cache-impressum.php
index ccdf5901d8a14b17b2a313d703e6d9df87b9e0e3..1e448562ab8660f88e99831c5d6f28d964b1b1d1 100644 (file)
--- a/inc/loader/load_cache-impressum.php
+++ b/inc/loader/load_cache-impressum.php
@@ -52,7 +52,7 @@ if (isInstallationPhase()) return;
 if (($GLOBALS['cache_instance']->loadCacheFile('imprint')) && ($GLOBALS['cache_instance']->extensionVersionMatches('imprint'))) {
        // Load cache
        $GLOBALS['cache_array']['imprint'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index b572a183d72d73a4b0feb51a539c6a46e9880d17..f0f48d8326f287e9dd43f5d0977ac4ee9ed62aa4 100644 (file)
--- a/inc/loader/load_cache-modules.php
+++ b/inc/loader/load_cache-modules.php
@@ -86,7 +86,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                } // END - foreach
        } // END - foreach
        unset($modArray);
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-refdepths.php b/inc/loader/load_cache-refdepths.php
index 010c51066e1ba711376bb6ef3cfa8983fbc08c9a..f4a8c2180b1aa9b6a5c60e92b22431a3bce87fa3 100644 (file)
--- a/inc/loader/load_cache-refdepths.php
+++ b/inc/loader/load_cache-refdepths.php
@@ -49,7 +49,7 @@ if (isInstallationPhase()) return;
 if (($GLOBALS['cache_instance']->loadCacheFile('refdepths')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
        // Load referal system from cache
        $GLOBALS['cache_array']['refdepths'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-refsystem.php b/inc/loader/load_cache-refsystem.php
index 76f709d07ba0a36bd86ac264cf42b308acc2de07..049a8d8143176bcb2bebfd7400e8d54b2c0ca8a5 100644 (file)
--- a/inc/loader/load_cache-refsystem.php
+++ b/inc/loader/load_cache-refsystem.php
@@ -49,7 +49,7 @@ if (isInstallationPhase()) return;
 if (($GLOBALS['cache_instance']->loadCacheFile('refsystem')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
        // Load referal system from cache
        $GLOBALS['cache_array']['refsystem'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-revision.php b/inc/loader/load_cache-revision.php
index 260b928919fd9eb49afd28885f57c0a16439dfe6..c6322d567a257658073c18a149a8274878c52f71 100644 (file)
--- a/inc/loader/load_cache-revision.php
+++ b/inc/loader/load_cache-revision.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 if ($GLOBALS['cache_instance']->loadCacheFile('revision')) {
        // Load revision from cache
        $GLOBALS['cache_array']['revision'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif ((getOutputMode() != 1)) {
+} elseif ((getScriptOutputMode() != 1)) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index ad4766dfbd67eeb7979ebc6f04f479e3967156f2..3400831d45a464a3b131a4e0bef6c607d8f1d070 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -72,7 +72,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 
        // Remove dummy array
        unset($cache);
-} elseif (getOutputMode() != 1) {
+} elseif (getScriptOutputMode() != 1) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/mails/_mails.php b/inc/mails/_mails.php
index df6dd791bc814e123137f72cb3d1a69b07358f56..47136caee4b18c8ec13e9d1fe3a4fb4952901067 100644 (file)
--- a/inc/mails/_mails.php
+++ b/inc/mails/_mails.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (getScriptOutputMode() != 0) return;
 
 // [EOF]
 ?>

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 148404fff0e5cd8be5618739d440663a18a9294b..cb5fc1c2835551a66e1c11a44f47bbfb7ae89103 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (getScriptOutputMode() != 0) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 84f30688dcf8e13466ecf21cda5e23fe092d649a..7696dbf933b9c909efeab36a48d417dcceb0ad9a 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (getScriptOutputMode() != 0) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 10d2b4e4ec839c7b23a0553065df6196a298f896..d5259c3c28c0d9dd834d6dab385f6c293d46cb71 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (getScriptOutputMode() != 0) return;
 
 // Initialize variables
 $jackpotPoints = '0'; $userPoints = '0';

diff --git a/inc/module-functions.php b/inc/module-functions.php
index 98eb9c1b46395521eed7fe86aad316f0aa5b4bb5..7918a233e8533e8237ce3c398a873fc1b1025b68 100644 (file)
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -230,7 +230,7 @@ function checkModulePermissions ($module = '') {
 
                        // Destroy cache here
                        // @TODO Rewrite this to a filter
-                       if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCache('modules', 'modules');
+                       if ((getScriptOutputMode() == '0') || (getScriptOutputMode() == -1)) rebuildCache('modules', 'modules');
 
                        // And reload data
                        unset($GLOBALS['module_status'][$module]);
@@ -239,7 +239,7 @@ function checkModulePermissions ($module = '') {
                        // Module not found we don't add it to the database
                        $ret = '404';
                }
-       } elseif (($ret == 'cache_miss') && (getOutputMode() == '0')) {
+       } elseif (($ret == 'cache_miss') && (getScriptOutputMode() == '0')) {
                // Rebuild the cache files
                rebuildCache('modules', 'modules');
        } elseif ($found === false) {
@@ -251,7 +251,7 @@ function checkModulePermissions ($module = '') {
                        $data['hidden'],
                        $data['mem_only'],
                        $data['admin_only'],
-                       getOutputMode()
+                       getScriptOutputMode()
                ));
        }
 

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 2e664ec27bf1bec0968d47914ffdba7ea8d613ce..1bdd5295acefb7eec61396a49d810ff367774b66 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif ((!isExtensionActive('beg')) || (getConfig('beg_rallye') != 'Y')) {
@@ -52,7 +52,7 @@ if (!defined('__SECURITY')) {
 $curr = getMonth();
 
 // Check if month is done
-if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (getOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (getScriptOutputMode() != 1)) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = '';
 

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 14640c1a2b67c09150fcb728d053617937dabe05..7ad2c9fdd61472cbbb6c8db1bb136c016908f6c2 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('bonus')) {
@@ -51,7 +51,7 @@ if (!defined('__SECURITY')) {
 // Get current month (2 digits)
 $curr = getMonth();
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getScriptOutputMode() != 1)) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE `status`='CONFIRMED'";
 

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 6527461b32c3a19481a1ee606cade8705b7bb341..8c36f32bc3632e3969d6672bb7cc7efae9b5b802 100644 (file)
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('newsletter')) {

diff --git a/inc/monthly/monthly_surfbar.php b/inc/monthly/monthly_surfbar.php
index 9e886c67d0bec53271c3a318a1afab32cfce1847..1d95e5bca6aa336957335c771e0a0f00012c5693 100644 (file)
--- a/inc/monthly/monthly_surfbar.php
+++ b/inc/monthly/monthly_surfbar.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('surfbar')) {

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 82e55ff7195d9c9de1c474ded915104adbdf9398..e18c8cec126d799f2a042497a424bc603f193e16 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -140,7 +140,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if (getOutputMode() == 1) {
+       if (getScriptOutputMode() == 1) {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
@@ -161,7 +161,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        runFilterChain('init');
 
        // Are we installation routine?
-       if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+       if ((!isInstalling()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index 7b480c1eafe03893be71f66feee8b21a9923f234..523df6bf0da1311a84118daca1706cf5c8840407 100644 (file)
--- a/inc/reset/reset_100_bonus.php
+++ b/inc/reset/reset_100_bonus.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('bonus')) {

diff --git a/inc/reset/reset_autopurge.php b/inc/reset/reset_autopurge.php
index 586dfbb4b6883f09303b6fc6ea6e83c29cf4f5c9..6598d56c539c0b40a1a7827e4950d3c74817cf7a 100644 (file)
--- a/inc/reset/reset_autopurge.php
+++ b/inc/reset/reset_autopurge.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('autopurge')) {

diff --git a/inc/reset/reset_beg.php b/inc/reset/reset_beg.php
index 6a28959a95efd8b3e976f15949cefcf574104cc6..b5b7fda7edfaf52b132fcebc66f9bf74adacbaad 100644 (file)
--- a/inc/reset/reset_beg.php
+++ b/inc/reset/reset_beg.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif ((!isExtensionActive('beg')) || (getConfig('beg_rallye') == 'Y')) {

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index 493e9ee43c371da7714b11609b08a8e6dda20def..9f02208566e3b5e628f51b0fb316f3383b2f00dc 100644 (file)
--- a/inc/reset/reset_birthday.php
+++ b/inc/reset/reset_birthday.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode
        return;
 } elseif (!isExtensionActive('birthday')) {

diff --git a/inc/reset/reset_bonus.php b/inc/reset/reset_bonus.php
index 9a5d8a77f19d6159b96b55c1bd00404732c6e04b..f57a665cf63555f21550fe3080572020fdc74ef2 100644 (file)
--- a/inc/reset/reset_bonus.php
+++ b/inc/reset/reset_bonus.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('bonus')) {

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index 2694fb51aa5532b351e96d63ef2715c27d2326e4..371b4c4ecf69effb92a9ad956e4a2d83621bbf4d 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('sql_patches')) {

diff --git a/inc/reset/reset_doubler.php b/inc/reset/reset_doubler.php
index a31687289d54a64e9b1c5308307bb0ddc40a0e84..64e6348a4aa1653f9402201ade253882fa391e4f 100644 (file)
--- a/inc/reset/reset_doubler.php
+++ b/inc/reset/reset_doubler.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif ((!isExtensionActive('doubler')) || (getConfig('doubler_send_mode') != 'RESET')) {

diff --git a/inc/reset/reset_engine.php b/inc/reset/reset_engine.php
index 096c96b79189238489f46b85651a0df9a756eff7..be1eb1b9eaf0ecd72b52e5b9fa10d329f294e7ff 100644 (file)
--- a/inc/reset/reset_engine.php
+++ b/inc/reset/reset_engine.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('engine')) {

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 62afa6a80ef5f510b2163bc24ca2964eccfd4e6c..6e7116e2c1c9bd23e6bbbe1ca64d830a60757e97 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+} elseif ((getScriptOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('holiday')) {

diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index efb8658339dd8cc4d661b083d8fe5acb3a3553a3..5cfe43e12ef90754986eb019e6dd5edf7fb28708 100644 (file)
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -41,7 +41,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('profile')) {

diff --git a/inc/reset/reset_surfbar.php b/inc/reset/reset_surfbar.php
index 06161fbeb279096c25ad62bb2e3b63635448fca8..73cb3ac4735a0491646bc62dde7bfbe9574be52f 100644 (file)
--- a/inc/reset/reset_surfbar.php
+++ b/inc/reset/reset_surfbar.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('surfbar')) {

diff --git a/inc/reset/reset_yoomedia.php b/inc/reset/reset_yoomedia.php
index bfd494ff9ef4c043c39d2ad9f7cb9134f4422bfb..65f1fb165eb75cb86688937836df4d0ed69c94a9 100644 (file)
--- a/inc/reset/reset_yoomedia.php
+++ b/inc/reset/reset_yoomedia.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('yoomedia')) {

diff --git a/inc/session-functions.php b/inc/session-functions.php
index 4928f80f083a274e62e16d6d8c080b8570d7e105..4bb1253503a78e45755ec2a106909f6d75f73491 100644 (file)
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Unset/set session variables
 function setSession ($var, $value) {
        // Abort in CSS mode here
-       if (getOutputMode() == 1) return true;
+       if (getScriptOutputMode() == 1) return true;
 
        // Trim value and session variable
        $var = trim(secureString($var)); $value = trim($value);

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 644ff0c6073bc689f2966d149991cf96f5ab9465..c8c0565234a89abe8b49683e821bc926dc6fe18e 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -54,7 +54,7 @@ if ((isInstallationPhase())) $stylesList[] = 'install.css';
 if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
 
 // Output CSS files or content or link to css.php ?
-if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
+if ((getScriptOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        // Load CSS files
        $stylesList = merge_array($stylesList, getExtensionCssFiles());
 
@@ -83,7 +83,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
                        } // END - switch
                } // END - if
        } // END - foreach
-} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((getScriptOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
        // Load CSS files
        $stylesList = merge_array($stylesList, getExtensionCssFiles());
 

diff --git a/inc/template-functions.php b/inc/template-functions.php
index d520c5f0b83c595f886b2574fe7d236db49293c8..aea217a7fa08e9253dee6faa4c6086b48658f6af 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -56,7 +56,7 @@ function enableTemplateHtml ($enable = true) {
 // Default: true
 function isTemplateHtml () {
        // Is the output_mode other than 0 (HTML), then no comments are enabled
-       if (getOutputMode() != 0) {
+       if (getScriptOutputMode() != 0) {
                // No HTML
                return false;
        } else {
@@ -126,7 +126,7 @@ function outputHtml ($htmlCode, $newLine = true) {
        // Do we have HTML-Code here?
        if (!empty($htmlCode)) {
                // Yes, so we handle it as you have configured
-               switch (getCachedOutputMode()) {
+               switch (getOutputMode()) {
                        case 'render':
                                // That's why you don't need any \n at the end of your HTML code... :-)
                                if (getPhpCaching() == 'on') {
@@ -175,7 +175,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 
                // Output code here, DO NOT REMOVE! ;-)
                outputRawCode($GLOBALS['output']);
-       } elseif ((getCachedOutputMode() == 'render') && (!empty($GLOBALS['output']))) {
+       } elseif ((getOutputMode() == 'render') && (!empty($GLOBALS['output']))) {
                // Send all HTTP headers
                sendHttpHeaders();
 
@@ -199,7 +199,7 @@ function compileFinalOutput () {
        $GLOBALS['output'] = doFinalCompilation($GLOBALS['output']);
 
        // Extension 'rewrite' installed?
-       if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
+       if ((isExtensionActive('rewrite')) && (getScriptOutputMode() != 1)) {
                $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
        } // END - if
 
@@ -322,7 +322,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
                        $ret = '';
                        if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
                                // Normal HTML output?
-                               if (getOutputMode() == '0') {
+                               if (getScriptOutputMode() == '0') {
                                        // Add surrounding HTML comments to help finding bugs faster
                                        $ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['tpl_content'] . '<!-- Template ' . $template . ' - End //-->';
 

diff --git a/inc/weekly/weekly_surfbar.php b/inc/weekly/weekly_surfbar.php
index 06a306d54115df80680743838150078fbc36bfcc..bb11e6ceafa8e97cca10d514c20d64999f676919 100644 (file)
--- a/inc/weekly/weekly_surfbar.php
+++ b/inc/weekly/weekly_surfbar.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('surfbar')) {

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 2a64684ed44874018d4272f62782baee48a25d5e..1abc3ca5de7261f0e0e92c04bd91e3cef6889cff 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -568,7 +568,7 @@ function getAction ($strict = true) {
        $action = null;
 
        // Is the value set?
-       if (isActionSet(($strict) && (getOutputMode() == 0))) {
+       if (isActionSet(($strict) && (getScriptOutputMode() == 0))) {
                // Then use it
                $action = $GLOBALS['action'];
        } // END - if
@@ -634,7 +634,7 @@ function isModuleSet ($strict =  false) {
 }
 
 // Getter for 'output_mode' value
-function getOutputMode () {
+function getScriptOutputMode () {
        // Default is null
        $output_mode = null;
 
@@ -1416,7 +1416,7 @@ function getSaltLength () {
 }
 
 // "Getter" for output_mode
-function getCachedOutputMode () {
+function getOutputMode () {
        // Do we have cache?
        if (!isset($GLOBALS['cached_output_mode'])) {
                // Determine it