New wrapper functions introduced

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 63d458b082cbf22a26ea15d10fcc02fbf0370ced..b3d9154c8cbc22716283aafed81e83ca4b96555b 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -282,7 +282,7 @@ class CacheSystem {
                // Is the cache file not yet rebuilt?
                if ((!isset($this->rebuilt[$this->name])) && ($this->isCacheReadable())) {
                        // Only run in regular output mode
-                       if ((getScriptOutputMode() != 0) && ($force === false)) {
+                       if ((!isHtmlOutputMode()) && ($force === false)) {
                                // Debug message if allowed
                                if (isDebugModeEnabled()) {
                                        // Debug message
@@ -452,7 +452,7 @@ class CacheSystem {
                                        $GLOBALS[__METHOD__][$ext_name] = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver));
                                } elseif ($this->isCacheReadable()) {
                                        // No cache version found!
-                                       logDebugMessage(__METHOD__, __LINE__, "Cache {$this->name} has missing version entry for extension {$ext_name}! Purging cache...");
+                                       logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ' . $ext_name . '! Purging cache...');
        
                                        // Remove the cache file
                                        $this->removeCacheFile(true);

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 55d530bc891be35ce9e0897b023dc88465c4e0ac..db003aaf9e824e1dec3b2add7bca41467705a657 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 ((getScriptOutputMode() == 1) || (getScriptOutputMode() == -1) || (isInstallationPhase())) {
+       if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
                return;
        } // END - if
 
@@ -344,10 +344,10 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
        }
 
        // Run database update
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries}");
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries);
        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1",
                        array(bigintval($config)), __FUNCTION__, __LINE__);
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries},affectedRows={$affectedRows}<br />");
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries . ',affectedRows=' . SQL_AFFECTEDROWS());
 
        // Rebuild cache
        rebuildCache('config', 'config');

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

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index a7067ec00590ce869d5206c7b197117d10eb225a..9abe929fef108e1fa1aa0f1dfcda87d1347488a0 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -128,7 +128,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '', $dry_run = false) {
                        // Download functions file
                        loadIncludeOnce($funcsInclude);
                } // END - if
-       } 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')) {
+       } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (isHtmlOutputMode()) && ($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,
@@ -604,7 +604,7 @@ function getExtensionVersion ($ext_name, $force = false) {
 
                // Count cache hits
                incrementStatsEntry('cache_hits');
-       } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getScriptOutputMode() != 0)) {
+       } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (!isHtmlOutputMode())) {
                // 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 8b05ceb6095d60be860e42551fd3661aa44b0e87..6b2fb3bdf00f5c8b3a040e23f7aac624cfc7edc7 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 (getScriptOutputMode() != 1) {
+               if (!isCssOutputMode()) {
                        // Get total member count
                        $total = getTotalConfirmedUser();
 

diff --git a/inc/filters.php b/inc/filters.php
index 77a02c56cab62268ca3545ee5b3eaf5722ed7e84..254630b39eb25aca5da88beeb32fc74b9b8a978f 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -524,7 +524,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
        } // END - if
 
        // Do we have non-HTML mode?
-       if ((getScriptOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
+       if ((!isHtmlOutputMode()) || ($outputMode != '0')) $code = decodeEntities($code);
 
        // Return compiled code
        //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.($code).'</pre>');
@@ -548,7 +548,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'))) && (getScriptOutputMode() == '0')) {
+       if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (isHtmlOutputMode())) {
                // 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
@@ -638,14 +638,14 @@ function FILTER_DETERMINE_WHAT_ACTION () {
        } // END - if
 
        // Get all values
-       if ((getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
+       if ((!isCssOutputMode()) && (!isRawOutputMode())) {
                // Fix module
                if (!isModuleSet()) {
                        // Is the request element set?
                        if (isGetRequestParameterSet('module')) {
                                // Set module from request
                                setModule(getRequestParameter('module'));
-                       } elseif (getScriptOutputMode() == '0') {
+                       } elseif (isHtmlOutputMode()) {
                                // Set default module 'index'
                                setModule('index');
                        } else {
@@ -655,10 +655,14 @@ function FILTER_DETERMINE_WHAT_ACTION () {
                } // END - if
 
                // Fix 'what' if not yet set
-               if (!isWhatSet())   setWhat(getWhatFromModule(getModule()));
+               if (!isWhatSet()) {
+                       setWhat(getWhatFromModule(getModule()));
+               } // END - if
 
                // Fix 'action' if not yet set
-               if (!isActionSet()) setAction(getActionFromModuleWhat(getModule(), getWhat()));
+               if (!isActionSet()) {
+                       setAction(getActionFromModuleWhat(getModule(), getWhat()));
+               } // END - if
        } else {
                // Set action/what to empty
                setAction('');
@@ -667,7 +671,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 
        // Set default 'what' value
        //* DEBUG: */ debugOutput('-' . getModule() . '/' . getWhat() . '-');
-       if ((!isWhatSet()) && (!isActionSet()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
+       if ((!isWhatSet()) && (!isActionSet()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
                if (getModule() == 'admin') {
                        // Set 'action' value to 'login' in admin menu
                        setAction(getActionFromModuleWhat(getModule(), getWhat()));
@@ -684,7 +688,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 // Sends out pooled mails
 function FILTER_TRIGGER_SENDING_POOL () {
        // Are we in normal output mode?
-       if (getScriptOutputMode() != 0) {
+       if (!isHtmlOutputMode()) {
                // Only in normal output mode to prevent race-conditons!
        } // END - if
 
@@ -722,7 +726,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')) && (getScriptOutputMode() != 1)) {
+       if (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) {
                // Tell every module we are in reset-mode!
                doReset();
        } // END - if
@@ -784,7 +788,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()) || (getScriptOutputMode() != '0')) {
+       if ((!ifFatalErrorsDetected()) || (!isHtmlOutputMode())) {
                // Abort executing here
                return false;
        } // END - if
@@ -885,7 +889,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())) && (getScriptOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
+       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                displayParsingTime();
        } // END - if

diff --git a/inc/footer.php b/inc/footer.php
index 7d8b93402e5589a07d0a40919b020d305ccd16ca..a036830ee2aaeb15b850d1b87b53f3eadc97f12e 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))) && (getScriptOutputMode() != 1))) {
+if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (!isCssOutputMode()))) {
        // Run the filter, sweet huh?
        runFilterChain('page_footer');
 

diff --git a/inc/functions.php b/inc/functions.php
index 296f031e7027a767dc33f3234d622f4d03c5f976..f50a594a58a21f8feec74f756c87a495a5cdd49c 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -104,7 +104,7 @@ function getTotalFatalErrors () {
 
 // Send mail out to an email address
 function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject}<br />");
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'toEmail=' . $toEmail . ',subject=' . $subject . ',isHtml=' . $isHtml);
 
        // Compile subject line (for POINTS constant etc.)
        eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
@@ -1839,7 +1839,7 @@ function rebuildCache ($cache, $inc = '', $force = false) {
                                loadInclude($inc);
                        } else {
                                // Include not found!
-                               logDebugMessage(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Include ' . $inc . ' not found. cache=' . $cache);
                        }
                } // END - if
        } // END - if
@@ -1909,7 +1909,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 ((getScriptOutputMode() != 0) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false;
+       if ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false;
 
        // Check if refid is set
        if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
@@ -2272,7 +2272,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) || (getScriptOutputMode() == -3)) return $url;
+       if ((strpos($url, session_name()) !== false) || (isRawOutputMode())) return $url;
 
        // Do we have a valid session?
        if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
@@ -2282,7 +2282,7 @@ function encodeUrl ($url, $outputMode = '0') {
                if (strpos($url, '?') === false) {
                        // No question mark
                        $seperator = '?';
-               } elseif ((getScriptOutputMode() != '0') || ($outputMode != '0')) {
+               } elseif ((!isHtmlOutputMode()) || ($outputMode != '0')) {
                        // Non-HTML mode
                        $seperator = '&';
                }

diff --git a/inc/header.php b/inc/header.php
index 785ddd8ebb049233262cb328527a84e7bbe1f4ec..2f5f4a1527d4f337041dd42ab66fd1b707f1da39 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 (getScriptOutputMode() != 1) {
+       if (!isCssOutputMode()) {
                // 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 ((getScriptOutputMode() != 1) && (getScriptOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
+if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($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 303fa09d11050b5387fa31ccc9dd63fe5ad60fa8..96f5e0c01b3aec998306112b5509e534451ede1d 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()) && (getScriptOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
+       } elseif ((isDebugModeEnabled()) && (isHtmlOutputMode()) && ($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 2b82becd18b9b73726e549b96f075eb0b30f139a..b9e61dbe09ee0b45629ce405b43e788bd1433230 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()) || (getScriptOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+       } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
                // Prepare filename for checking
                $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
 

diff --git a/inc/loader/load_cache- b/inc/loader/load_cache-
index 16c17c6eacdb1cbda95eef0e2d60b585e7cbba44..2b61ce279e27cfb83bd125bc70d571af28829f09 100644 (file)
--- a/inc/loader/load_cache-
+++ b/inc/loader/load_cache-
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 if (($GLOBALS['cache_instance']->loadCacheFile('foo')) && ($GLOBALS['cache_instance']->extensionVersionMatches('foo'))) {
        // Load cache
        $GLOBALS['cache_array']['foo'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (getOutputMode() != 1) {
+} elseif (isHtmlMode()) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 33d00a3a890676550861ffb715669766bcf9aa07..a0b883bce3306ee472d92172329c091c441c5f69 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // 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 (getScriptOutputMode() != 1) {
+       } elseif (isHtmlOutputMode()) {
                // 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 952110fa9b23abfa28bca3360beaa48a16f41bde..83866fe2792a1fcb32d6daabe568f40ac6b4a5a2 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // 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 cb0b30589d6e1a712b046cbbaecdbe77da85bdce..3dc4a04629c8a678893b39c077e1fd07e5970aac 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // 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 f8096858178b41dbb201593536c79c2c1b87cb55..8bf35004814d28c74783e834a39aef5855cb08d1 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 ((getScriptOutputMode() != 1) && (isExtensionInstalled('sql_patches'))) {
+} elseif ((isHtmlOutputMode()) && (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 1e448562ab8660f88e99831c5d6f28d964b1b1d1..2896bf127f66a1bc69d9743b8f3edfb9ef1ed536 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index cdace7bce7b4b6ad00e96f0cd5624db440de152b..7945b028afbb04525eb66fbfa12dd1fc9810dcde 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // 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 f4a8c2180b1aa9b6a5c60e92b22431a3bce87fa3..8441ea54e1bac9177437ed67d7a61b17c7623aa5 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // 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 049a8d8143176bcb2bebfd7400e8d54b2c0ca8a5..3128736316ed7c279786637f74330e2407810456 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // 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 c6322d567a257658073c18a149a8274878c52f71..7cfa22f9a9f75b020d8a22ab4a6f9507c9d468db 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 ((getScriptOutputMode() != 1)) {
+} elseif ((isHtmlOutputMode())) {
        // 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 3400831d45a464a3b131a4e0bef6c607d8f1d070..d9b949e3a884f2e981f1ae140be390433ee93813 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 (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 

diff --git a/inc/mails/_mails.php b/inc/mails/_mails.php
index 47136caee4b18c8ec13e9d1fe3a4fb4952901067..8c96a1fc5fd6a0cc6885b87626b2c8674cfffcfb 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 (getScriptOutputMode() != 0) return;
+if (!isHtmlOutputMode()) return;
 
 // [EOF]
 ?>

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 936bbc8b44c12e1675074bbc69cbc58a8e2f545a..abd0aff85e14b3a5e3ede43020cf87d293870f4b 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 (getScriptOutputMode() != 0) return;
+if (!isHtmlOutputMode()) 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 2b9ff117c477fa7130f3fc476e62017a78633f18..12bba3219e6b94d963d9d782da0ebd18851266b8 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 (getScriptOutputMode() != 0) return;
+if (!isHtmlOutputMode()) 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 2cabb5f49050aa8739b796761e7ca24fd27dffa4..85d852979a940eb045b7a93c1ff497b9872c6c8f 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 (getScriptOutputMode() != 0) return;
+if (!isHtmlOutputMode()) return;
 
 // Initialize variables
 $jackpotPoints = '0'; $userPoints = '0';

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

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index b95b6a2523e4e2f4c43634bb6a038a82de585f32..c457b8489ee19f5f0fae92027b81cfca77074f7e 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -863,7 +863,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
                                        } // END - if
                                } elseif (isset($content[$column])) {
                                        // Unfinished!
-                                       debug_report_bug(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+                                       debug_report_bug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
                                }
                        } // END - foreach
 

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 2ce572fc9d418b869ee0c2c742b70908c1702532..950b94884e94f10cb1305e007083c13fabadcf81 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 ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {
@@ -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) && (getScriptOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (!isCssOutputMode())) {
        // 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 0210ff69b6937235db61045d930546db0e8bf4d6..41e50053c063eaff630e568238f89501840d777b 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 ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!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) && (getScriptOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
        // 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 8c36f32bc3632e3969d6672bb7cc7efae9b5b802..d43f4e902492c0aa727e91ca0dc0247544c2bd44 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 ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!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 1d95e5bca6aa336957335c771e0a0f00012c5693..0fc646ba235dac76c9e4d5abdf39e61dd4fbeefd 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 ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!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 8243597d6629cef12ed24e8bb615e0c7d14ee839..959ccfd6828f3a2ce686034dc161f3c95daebb55 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -136,7 +136,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if (getScriptOutputMode() == 1) {
+       if (isCssOutputMode()) {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
@@ -157,7 +157,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        runFilterChain('init');
 
        // Are we installation routine?
-       if ((!isInstalling()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
+       if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if

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

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index 87c197c2daf42757154e4c81d1793600c43ca509..4686d552966307861782619d0f09bb243c30e02f 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 6598d56c539c0b40a1a7827e4950d3c74817cf7a..95424a6395c5ae6145defc8980dd88d7711d8c28 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 a629fb122f0960fd71e6b529c1e7b302d2947bc6..7ce84856c4b14e01ee96dc6637886b2b1d3fde34 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index 4321e31bd4f0819b4a7938487e4687e36e6773d8..3eeee01dfda03c5aa609eae9e3a8f6e7ad3b5354 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 52d886ba809035e020426fbf9eb6cb9dc13359d0..c8370019f5b13b8d4f1d1a4cee7d3f2f7c21ea75 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 0d6c6b7fda124675a6efd436d1ed70b8cc7503be..6b159cbcb245ce5acb4be647f93e9ced36c7ade4 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 64e6348a4aa1653f9402201ade253882fa391e4f..198d3c73e8060d98e56202f9597bb72ae434eed2 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 be1eb1b9eaf0ecd72b52e5b9fa10d329f294e7ff..a8e9bc84e398ba529f4e4bed12ac7eb36a9a75b9 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 8afdbb80b5302552ed3c35bcedaef43a6a02e802..f31c6f52a1266583ccbf65a0485a723d8c28cdad 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 ((getScriptOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+} elseif ((!isHtmlOutputMode()) || ((!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 42d95ce89b233677645fcee2ca067600df960937..9c112856fa76cb5d5ef07ed1623f0d7e22764b6f 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 73cb3ac4735a0491646bc62dde7bfbe9574be52f..411e2731448ce05d1444b54b5c5edcc9d01acf78 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 65f1fb165eb75cb86688937836df4d0ed69c94a9..05da7efd03cba3b04f47f18f0963643a8f6d4742 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 ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!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 4bb1253503a78e45755ec2a106909f6d75f73491..4bd00ec494081aacd42a3b1fc5b20bdf67c0737b 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 (getScriptOutputMode() == 1) return true;
+       if (isCssOutputMode()) 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 c8c0565234a89abe8b49683e821bc926dc6fe18e..14e30495454a9a0857703ae9282ba29a050f2704 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 ((getScriptOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
        // Load CSS files
        $stylesList = merge_array($stylesList, getExtensionCssFiles());
 
@@ -83,7 +83,7 @@ if ((getScriptOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
                        } // END - switch
                } // END - if
        } // END - foreach
-} elseif ((getScriptOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (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 7134e1f0f2ef68e9ff05e9271d7c37e63153ff8d..1fe104422b7b5b360dae7de3f87fbb9765ce28fe 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 (getScriptOutputMode() != 0) {
+       if (!isHtmlOutputMode()) {
                // No HTML
                return false;
        } else {
@@ -180,7 +180,7 @@ function compileFinalOutput () {
        $GLOBALS['output'] = doFinalCompilation($GLOBALS['output']);
 
        // Extension 'rewrite' installed?
-       if ((isExtensionActive('rewrite')) && (getScriptOutputMode() != 1)) {
+       if ((isExtensionActive('rewrite')) && (!isCssOutputMode())) {
                $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
        } // END - if
 
@@ -301,7 +301,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 (getScriptOutputMode() == '0') {
+                               if (isHtmlOutputMode()) {
                                        // 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_ b/inc/weekly/weekly_
index ae51c50ab985e76c97311ec0cd71ae27dcb21e6e..31941949aa4fffb7bd1f89460219efad1449228a 100644 (file)
--- a/inc/weekly/weekly_
+++ b/inc/weekly/weekly_
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('')) {

diff --git a/inc/weekly/weekly_surfbar.php b/inc/weekly/weekly_surfbar.php
index bb11e6ceafa8e97cca10d514c20d64999f676919..744ced65e06ef2ffa0bb0007944944cd770cbce6 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 ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!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 b101e22c8f9632b9575fd889ff8e0f80dcc09227..cdc48f6c5466c2e32e61e31b63d71417bbc56836 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -559,7 +559,7 @@ function getAction ($strict = true) {
        $action = null;
 
        // Is the value set?
-       if (isActionSet(($strict) && (getScriptOutputMode() == 0))) {
+       if (isActionSet(($strict) && (isHtmlOutputMode()))) {
                // Then use it
                $action = $GLOBALS['action'];
        } // END - if
@@ -1898,5 +1898,23 @@ function isExtensionTask ($content) {
        return $GLOBALS['is_extension_task'][$content['task_type'] . '_' . $content['infos']];
 }
 
+// Wrapper to check if output mode is CSS
+function isCssOutputMode () {
+       // Determine it
+       return (getScriptOutputMode() == 1);
+}
+
+// Wrapper to check if output mode is HTML
+function isHtmlOutputMode () {
+       // Determine it
+       return (getScriptOutputMode() == 0);
+}
+
+// Wrapper to check if output mode is RAW
+function isRawOutputMode () {
+       // Determine it
+       return (getScriptOutputMode() == -1);
+}
+
 // [EOF]
 ?>

diff --git a/view.php b/view.php
index 16a41a7f0293aa589c7e80774400758e3d9d8861..d9cc6acfa642fb71d752e8ddd4356227abf06c96 100644 (file)
--- a/view.php
+++ b/view.php
@@ -42,7 +42,7 @@ require('inc/libs/security_functions.php');
 
 // Set module
 $GLOBALS['module'] = 'view';
-$GLOBALS['output_mode'] = -3;
+$GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
 require('inc/config-global.php');