Code style changed, ext-user continued:

- Changed true/false to TRUE/FALSE
- Introduced validateSubId() and prepareFoundSubId()
- Add validation of edited sub id by member
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index ed8609e4ae70cb179ddbdbab65f5cebaf7fa3e23..2926d7139fdaccbc69c08fdd3c707f457ddd181a 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -57,9 +57,9 @@
 ./inc/functions.php:1090:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
 ./inc/functions.php:1176:                      // @TODO Are these convertions still required?
 ./inc/functions.php:1197:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/functions.php:1090:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
 ./inc/functions.php:1176:                      // @TODO Are these convertions still required?
 ./inc/functions.php:1197:// @TODO Rewrite this function to use readFromFile() and writeToFile()

-./inc/functions.php:1732:      // @TODO Find a way to cache this
-./inc/functions.php:1837:      // @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2041:      // @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:1733:      // @TODO Find a way to cache this
+./inc/functions.php:1838:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2042:      // @TODO Rename column data_type to e.g. mail_status

 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
 ./inc/install-functions.php:91:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
 ./inc/install-functions.php:91:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);


@@ -95,7 +95,7 @@
 ./inc/libs/theme_functions.php:94:     // @TODO Can't this be rewritten to an API function?
 ./inc/libs/user_functions.php:325:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
 ./inc/libs/user_functions.php:354:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
 ./inc/libs/theme_functions.php:94:     // @TODO Can't this be rewritten to an API function?
 ./inc/libs/user_functions.php:325:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
 ./inc/libs/user_functions.php:354:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));

-./inc/libs/yoomedia_functions.php:108: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
+./inc/libs/yoomedia_functions.php:108: $response = YOOMEDIA_QUERY_API('out_textmail.php', TRUE); // @TODO Ask Yoo!Media for test script

 ./inc/load_config.php:75:      // @TODO Rewrite them to avoid this else block
 ./inc/loader/load-extension.php:13: * @TODO Rewrite this whole file                                        *
 ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter?
 ./inc/load_config.php:75:      // @TODO Rewrite them to avoid this else block
 ./inc/loader/load-extension.php:13: * @TODO Rewrite this whole file                                        *
 ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter?

diff --git a/DOCS/tpl-validator.php b/DOCS/tpl-validator.php
index 737d10675f4274d73f5a43257d5b53851445b586..6fb9e3c21d226227e8fa82d031c31ab4bc631822 100644 (file)
--- a/DOCS/tpl-validator.php
+++ b/DOCS/tpl-validator.php
@@ -48,8 +48,8 @@ if ($_SERVER['argc'] < 2) {
 print "Validating template ".$_SERVER['argv'][1]."...\n";
 
 $doc = new DOMDocument();
 print "Validating template ".$_SERVER['argv'][1]."...\n";
 
 $doc = new DOMDocument();

-$doc->formatOutput = true;
-$doc->preserveWhiteSpace = false;
+$doc->formatOutput = TRUE;
+$doc->preserveWhiteSpace = FALSE;

 $doc->encoding = 'UTF-8';
 $doc->xmlVersion = '1.1';
 $doc->loadHTMLFile($_SERVER['argv'][1]);
 $doc->encoding = 'UTF-8';
 $doc->xmlVersion = '1.1';
 $doc->loadHTMLFile($_SERVER['argv'][1]);

diff --git a/admin.php b/admin.php
index 9505fa7de730431dca6928472e8f48bb1a7ef4e9..c2a9b725269c6a0ade4968ab38b80659ec39050e 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module
 $GLOBALS['__module']      = 'admin';
 
 // Set module
 $GLOBALS['__module']      = 'admin';

diff --git a/agb.php b/agb.php
index a47be37f6d09966c01f676ef5fecd7f6135e1f2e..d36ebc3ed713d895272393faca0b24a72901698c 100644 (file)
--- a/agb.php
+++ b/agb.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module and output mode (raw)
 $GLOBALS['__module']      = 'agb';
 
 // Set module and output mode (raw)
 $GLOBALS['__module']      = 'agb';

diff --git a/ajax.php b/ajax.php
index 3dcd835c8d29104fceba3bcbe86d38de80dba4da..f6c06483392262583de762d78b0bae666892a39d 100644 (file)
--- a/ajax.php
+++ b/ajax.php
@@ -42,7 +42,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 /*
  * Set output to "AJAX mode", proper module and prevent HTML headers/footers
 
 /*
  * Set output to "AJAX mode", proper module and prevent HTML headers/footers

diff --git a/autoreg.php b/autoreg.php
index de3548d39987575e2a4e7baf6d16d0f85c68ffbe..a5bf978dcfc2c6239041eb0d6f0dba8be13ab85c 100644 (file)
--- a/autoreg.php
+++ b/autoreg.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module
 $GLOBALS['__module']      = 'autoreg';
 
 // Set module
 $GLOBALS['__module']      = 'autoreg';

diff --git a/beg.php b/beg.php
index 1e8ef5f93e6e7c66bb99033ad24a1f66ef14b346..ba9bc75965ec4280f75ae37173764a524dccbb9e 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module and output mode (HTML)
 $GLOBALS['__module']      = 'beg';
 
 // Set module and output mode (HTML)
 $GLOBALS['__module']      = 'beg';


@@ -61,7 +61,7 @@ if (isGetRequestElementSet('userid')) {
        $points = '0';
 
        // Don't pay is the default...
        $points = '0';
 
        // Don't pay is the default...

-       $pay = false;
+       $pay = FALSE;

 
        // Validate if it is not a number
        if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestElement('userid')))) {
 
        // Validate if it is not a number
        if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestElement('userid')))) {


@@ -90,8 +90,8 @@ if (isGetRequestElementSet('userid')) {
                // Set nickname / userid for template
                $content['userid']        = getRequestElement('userid');
                $content['clicks']        = (getUserData('beg_clicks') + 1);
                // Set nickname / userid for template
                $content['userid']        = getRequestElement('userid');
                $content['clicks']        = (getUserData('beg_clicks') + 1);

-               $content['header_banner'] = loadTemplate('beg_header_banner', true);
-               $content['footer_banner'] = loadTemplate('beg_footer_banner', true);
+               $content['header_banner'] = loadTemplate('beg_header_banner', TRUE);
+               $content['footer_banner'] = loadTemplate('beg_footer_banner', TRUE);

                $content['points']        = $points;
        } // END - if
 
                $content['points']        = $points;
        } // END - if
 


@@ -135,29 +135,29 @@ if (isGetRequestElementSet('userid')) {
 
                        // Pay points?
                        //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'pay=' . intval($pay));
 
                        // Pay points?
                        //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'pay=' . intval($pay));

-                       if ($pay === true) {
+                       if ($pay === TRUE) {

                                // Add points to user or begging rallye account
                                if (addPointsBeg(getUserData('userid'), $points)) {
                                        // Set 'done' message
                                // Add points to user or begging rallye account
                                if (addPointsBeg(getUserData('userid'), $points)) {
                                        // Set 'done' message

-                                       $content['message'] = loadTemplate('beg_done', true, $content);
+                                       $content['message'] = loadTemplate('beg_done', TRUE, $content);

                                } else {
                                        // Error!
                                } else {
                                        // Error!

-                                       $content['message'] = loadTemplate('beg_failed', true, $content);
+                                       $content['message'] = loadTemplate('beg_failed', TRUE, $content);

                                }
                        } else {
                                // Error!
                                }
                        } else {
                                // Error!

-                               $content['message'] = loadTemplate('beg_failed', true, $content);
+                               $content['message'] = loadTemplate('beg_failed', TRUE, $content);

                        }
                } elseif (isMember()) {
                        // Logged in user found
                        }
                } elseif (isMember()) {
                        // Logged in user found

-                       $content['message'] = loadTemplate('beg_login', true, $content);
+                       $content['message'] = loadTemplate('beg_login', TRUE, $content);

                } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active!
                        // Load message template depending on pay-mode
                } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active!
                        // Load message template depending on pay-mode

-                       $content['message'] = loadTemplate('beg_pay_mode_' . strtolower(getBegPayMode()), true, $content);
-                       $pay = true;
+                       $content['message'] = loadTemplate('beg_pay_mode_' . strtolower(getBegPayMode()), TRUE, $content);
+                       $pay = TRUE;

                } else {
                        // Clicked received while reload lock is active
                } else {
                        // Clicked received while reload lock is active

-                       $content['message'] = loadTemplate('beg_failed', true, $content);
+                       $content['message'] = loadTemplate('beg_failed', TRUE, $content);

                }
 
                // Free memory
                }
 
                // Free memory


@@ -167,20 +167,20 @@ if (isGetRequestElementSet('userid')) {
                loadIncludeOnce('inc/header.php');
 
                // Load final template
                loadIncludeOnce('inc/header.php');
 
                // Load final template

-               loadTemplate('beg_link', false, $content);
+               loadTemplate('beg_link', FALSE, $content);

 
                // Tracker code enabled? (We don't track users here!
 
                // Tracker code enabled? (We don't track users here!

-               if ((getBegPayMode() != 'NONE') && ($pay === true)) {
+               if ((getBegPayMode() != 'NONE') && ($pay === TRUE)) {

                        // Prepare content for template
                        // @TODO Opps, what is missing here???
                        $content = array(
                        );
 
                        // Include config-depending template
                        // Prepare content for template
                        // @TODO Opps, what is missing here???
                        $content = array(
                        );
 
                        // Include config-depending template

-                       loadTemplate('beg_pay_code_' . strtolower(getBegPayMode()), false, $content);
-               } elseif (($pay === false) && (!isset($content['message']))) {
+                       loadTemplate('beg_pay_code_' . strtolower(getBegPayMode()), FALSE, $content);
+               } elseif (($pay === FALSE) && (!isset($content['message']))) {

                        // Cannot pay! :-(
                        // Cannot pay! :-(

-                       $content['message'] = loadTemplate('beg_failed', true);
+                       $content['message'] = loadTemplate('beg_failed', TRUE);

                }
 
                // Include footer
                }
 
                // Include footer

diff --git a/birthday_confirm.php b/birthday_confirm.php
index f1193741f44e26e6a960320b0534daec9391e7e7..469104d454243cbbd4804577dd0b36451e998d28 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module
 $GLOBALS['__module']      = 'birthday_confirm';
 
 // Set module
 $GLOBALS['__module']      = 'birthday_confirm';


@@ -58,7 +58,7 @@ redirectOnUninstalledExtension('birthday');
 $userid = bigintval(getRequestElement('userid'));
 
 // Only allow numbers here...
 $userid = bigintval(getRequestElement('userid'));
 
 // Only allow numbers here...

-$chk = bigintval(getRequestElement('check'), false);
+$chk = bigintval(getRequestElement('check'), FALSE);

 
 // Check if link is not clicked so far
 $result = SQL_QUERY_ESC("SELECT
 
 // Check if link is not clicked so far
 $result = SQL_QUERY_ESC("SELECT


@@ -85,7 +85,7 @@ $content = array();
 // Is an entry there?
 if (SQL_NUMROWS($result) == 1) {
        // Ok, congratulation again! Here's your gift from us...
 // Is an entry there?
 if (SQL_NUMROWS($result) == 1) {
        // Ok, congratulation again! Here's your gift from us...

-       $data = SQL_FETCHARRAY($result, false);
+       $data = SQL_FETCHARRAY($result, FALSE);

 
        // Is the account confirmed?
        if ($data['status'] == 'CONFIRMED') {
 
        // Is the account confirmed?
        if ($data['status'] == 'CONFIRMED') {


@@ -98,7 +98,7 @@ if (SQL_NUMROWS($result) == 1) {
                        array($userid, $chk), __FILE__, __LINE__);
 
                // Load message from template
                        array($userid, $chk), __FILE__, __LINE__);
 
                // Load message from template

-               $content['message'] = loadTemplate('birthday_msg', true, $data);
+               $content['message'] = loadTemplate('birthday_msg', TRUE, $data);

        } else {
                // Unconfirmed / locked accounts cannot get points
                $content['message'] = '{%message,MEMBER_BIRTHDAY_CANNOT_STATUS=' . $data['status'] . '%}';
        } else {
                // Unconfirmed / locked accounts cannot get points
                $content['message'] = '{%message,MEMBER_BIRTHDAY_CANNOT_STATUS=' . $data['status'] . '%}';


@@ -118,13 +118,13 @@ $GLOBALS['__module'] = 'birthday_confirm';
 loadIncludeOnce('inc/header.php');
 
 // Load birthday header template (for your banners, e.g.?)
 loadIncludeOnce('inc/header.php');
 
 // Load birthday header template (for your banners, e.g.?)

-$content['header'] =  loadTemplate('birthday_header', true);
+$content['header'] =  loadTemplate('birthday_header', TRUE);

 
 // Load birthday footer template (for your banners, e.g.?)
 
 // Load birthday footer template (for your banners, e.g.?)

-$content['footer'] =  loadTemplate('birthday_footer', true);
+$content['footer'] =  loadTemplate('birthday_footer', TRUE);

 
 // Load final template and output it
 
 // Load final template and output it

-loadTemplate('birthday_confirm', false, $content);
+loadTemplate('birthday_confirm', FALSE, $content);

 
 // Include footer
 loadIncludeOnce('inc/footer.php');
 
 // Include footer
 loadIncludeOnce('inc/footer.php');

diff --git a/click.php b/click.php
index 7a35e98a54bcd930c477ac3b7b31c9c1ceae2cd1..2647b5f7fa3fa0ca319e8410dba1d8c890b37d7c 100644 (file)
--- a/click.php
+++ b/click.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module
 $GLOBALS['__module']      = 'click';
 
 // Set module
 $GLOBALS['__module']      = 'click';

diff --git a/confirm.php b/confirm.php
index 5df3718fb692a67b8c22deff6fdaed84fd502da2..baddd4e53d349e45cc4b32febefd2e6b525517b0 100644 (file)
--- a/confirm.php
+++ b/confirm.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module to confirm and output-mode to raw
 $GLOBALS['__module']      = 'confirm';
 
 // Set module to confirm and output-mode to raw
 $GLOBALS['__module']      = 'confirm';

diff --git a/css.php b/css.php
index c75762c63cf9b7de95d063d0cf33a9642ff58797..f3ba59c4d6b2f816dc284f652964d04aa049c7ef 100644 (file)
--- a/css.php
+++ b/css.php
@@ -42,7 +42,7 @@ require('inc/libs/security_functions.php');
 $GLOBALS['__footer_sent'] = -1;
 
 // Init start time
 $GLOBALS['__footer_sent'] = -1;
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // This is a CSS file loader
 $GLOBALS['__module']      = 'css';
 
 // This is a CSS file loader
 $GLOBALS['__module']      = 'css';

diff --git a/debug.php b/debug.php
index 77443cf126c017f0a2061c88ef768da5964faf08..694f377a7b551e7411117ae31bae0ccf798f7c2d 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module and fake "CSS mode"
 $GLOBALS['__module']      = 'debug';
 
 // Set module and fake "CSS mode"
 $GLOBALS['__module']      = 'debug';

diff --git a/doubler.php b/doubler.php
index fae376478ff05213eb2850e3b9059e66bdadc537..b640d54d79e5640e47b1b084e6ee0eab61fdc48a 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module and output mode
 $GLOBALS['__module']      = 'doubler';
 
 // Set module and output mode
 $GLOBALS['__module']      = 'doubler';


@@ -132,7 +132,7 @@ if (isFormSent()) {
                                updateConfiguration('doubler_counter', 1, '+');
 
                                // Set constant
                                updateConfiguration('doubler_counter', 1, '+');
 
                                // Set constant

-                               $content['message'] = loadTemplate('doubler_reflink', true, postRequestElement('userid'));
+                               $content['message'] = loadTemplate('doubler_reflink', TRUE, postRequestElement('userid'));

                        } else {
                                // Not enougth points left
                                $content['message'] = '{--DOUBLER_FORM_NO_POINTS_LEFT--}';
                        } else {
                                // Not enougth points left
                                $content['message'] = '{--DOUBLER_FORM_NO_POINTS_LEFT--}';


@@ -180,11 +180,11 @@ if (getConfig('doubler_send_mode') == 'DIRECT') {
 loadIncludeOnce('inc/header.php');
 
 // Banner in text
 loadIncludeOnce('inc/header.php');
 
 // Banner in text

-$content['banner'] = loadTemplate('doubler_banner', true);
+$content['banner'] = loadTemplate('doubler_banner', TRUE);

 
 // Load header/footer templates
 
 // Load header/footer templates

-$content['header'] = loadTemplate('doubler_header', true);
-$content['footer'] = loadTemplate('doubler_footer', true);
+$content['header'] = loadTemplate('doubler_header', TRUE);
+$content['footer'] = loadTemplate('doubler_footer', TRUE);

 
 if (isUserDataValid()) {
        // Transfer userid/nickname to constant
 
 if (isUserDataValid()) {
        // Transfer userid/nickname to constant


@@ -210,7 +210,7 @@ $content['payout_time'] = '{--DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mo
 $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC');
 
 // Output neccessary form for this
 $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC');
 
 // Output neccessary form for this

-loadTemplate('doubler_index', false, $content);
+loadTemplate('doubler_index', FALSE, $content);

 
 // Output footer
 loadIncludeOnce('inc/footer.php');
 
 // Output footer
 loadIncludeOnce('inc/footer.php');

diff --git a/img.php b/img.php
index 6cb9043b6691ec5681ff4e7d0b8f73657681dc4c..0325c3f12a15c1917cbebe66a3c472a129740935 100644 (file)
--- a/img.php
+++ b/img.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module and output mode
 $GLOBALS['__module']      = 'img';
 
 // Set module and output mode
 $GLOBALS['__module']      = 'img';

diff --git a/inc/ajax-functions.php b/inc/ajax-functions.php
index 47db96ca0bfdf4bf6d6992bc06064cee0e2fd1a7..6524909cfc6d082e4a9a1276d6a4b00c1ad4afcb 100644 (file)
--- a/inc/ajax-functions.php
+++ b/inc/ajax-functions.php
@@ -67,7 +67,7 @@ function initAjax () {
 // Setter for AJAX reply content
 function setAjaxReplyContent ($content) {
        // Set it, but with URL encoding
 // Setter for AJAX reply content
 function setAjaxReplyContent ($content) {
        // Set it, but with URL encoding

-       $GLOBALS['ajax_reply']['reply_content'] = urlencode(doFinalCompilation($content, false));
+       $GLOBALS['ajax_reply']['reply_content'] = urlencode(doFinalCompilation($content, FALSE));

 }
 
 /**
 }
 
 /**


@@ -76,7 +76,7 @@ function setAjaxReplyContent ($content) {
  */
 function isAjaxRequestLevelValid () {
        // By default nothing is valid
  */
 function isAjaxRequestLevelValid () {
        // By default nothing is valid

-       $isValid = false;
+       $isValid = FALSE;

 
        // Switch on the 'level' value
        switch (postRequestElement('level')) {
 
        // Switch on the 'level' value
        switch (postRequestElement('level')) {

diff --git a/inc/ajax/ajax_admin.php b/inc/ajax/ajax_admin.php
index ae95def44ce8c87eefb1bc6fda56883287ae55d5..05d9d690f1248b2bf9eff0d83399db937df98aa4 100644 (file)
--- a/inc/ajax/ajax_admin.php
+++ b/inc/ajax/ajax_admin.php
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // "Generates" admin content by loading a message template
 function generateAdminContent () {
        // Return it
 // "Generates" admin content by loading a message template
 function generateAdminContent () {
        // Return it

-       return displayMessage('{--ADMIN_AJAX_MENU_IS_LOADING--}', true);
+       return displayMessage('{--ADMIN_AJAX_MENU_IS_LOADING--}', TRUE);

 }
 
 // Processes AJAX requests for admin menu
 }
 
 // Processes AJAX requests for admin menu


@@ -96,7 +96,7 @@ function doAjaxAdminRequestContent () {
        // Is the HTTP status still the same? (204 No Content)
        if (getHttpStatus() == '204 No Content') {
                // We use the current access level 'install' as prefix and construct a template name
        // Is the HTTP status still the same? (204 No Content)
        if (getHttpStatus() == '204 No Content') {
                // We use the current access level 'install' as prefix and construct a template name

-               setAjaxReplyContent(loadTemplate('admin_area_' . trim(postRequestElement('tab')), true));
+               setAjaxReplyContent(loadTemplate('admin_area_' . trim(postRequestElement('tab')), TRUE));

 
                // Has the template been loaded?
                if (isset($GLOBALS['template_content']['html']['admin_page_' . trim(postRequestElement('tab'))])) {
 
                // Has the template been loaded?
                if (isset($GLOBALS['template_content']['html']['admin_page_' . trim(postRequestElement('tab'))])) {

diff --git a/inc/ajax/ajax_installer.php b/inc/ajax/ajax_installer.php
index f9c50322d0119c20a4853349607cd17a7843d056..d6041f458c1aae399de680d296ecc30352c5ef8e 100644 (file)
--- a/inc/ajax/ajax_installer.php
+++ b/inc/ajax/ajax_installer.php
@@ -77,7 +77,7 @@ function doAjaxProcessInstall () {
 // Processes installer request for testing
 function doAjaxInstallerTest () {
        // Load the "test passed" template
 // Processes installer request for testing
 function doAjaxInstallerTest () {
        // Load the "test passed" template

-       setAjaxReplyContent(loadTemplate('ajax_test_passed', true));
+       setAjaxReplyContent(loadTemplate('ajax_test_passed', TRUE));

 
        // All okay if we reach this point
        setHttpStatus('200 OK');
 
        // All okay if we reach this point
        setHttpStatus('200 OK');


@@ -147,7 +147,7 @@ function doAjaxInstallerRequestContent () {
        // Is the HTTP status still the same? (204 No Content)
        if (getHttpStatus() == '204 No Content') {
                // We use the current access level 'install' as prefix and construct a template name
        // Is the HTTP status still the same? (204 No Content)
        if (getHttpStatus() == '204 No Content') {
                // We use the current access level 'install' as prefix and construct a template name

-               setAjaxReplyContent(loadTemplate('install_page_' . trim(postRequestElement('tab')), true));
+               setAjaxReplyContent(loadTemplate('install_page_' . trim(postRequestElement('tab')), TRUE));

 
                // Has the template been loaded?
                if (isset($GLOBALS['template_content']['html']['install_page_' . trim(postRequestElement('tab'))])) {
 
                // Has the template been loaded?
                if (isset($GLOBALS['template_content']['html']['install_page_' . trim(postRequestElement('tab'))])) {


@@ -185,10 +185,10 @@ function doAjaxInstallerChangeWarning () {
 
        if (in_array(postRequestElement('button'), array('previous', 'next'))) {
                // Load 'prefixed' template
 
        if (in_array(postRequestElement('button'), array('previous', 'next'))) {
                // Load 'prefixed' template

-               setAjaxReplyContent(loadTemplate('install_warning_' . postRequestElement('button'), true, $content));
+               setAjaxReplyContent(loadTemplate('install_warning_' . postRequestElement('button'), TRUE, $content));

        } else {
                // Load 'tab' template
        } else {
                // Load 'tab' template

-               setAjaxReplyContent(loadTemplate('install_warning_tab', true, $content));
+               setAjaxReplyContent(loadTemplate('install_warning_tab', TRUE, $content));

        }
 
        // All okay if we reach this point
        }
 
        // All okay if we reach this point


@@ -217,12 +217,12 @@ function doAjaxInstallerSaveChanges () {
                'status'        => 'failed',
                'message'       => '{--INSTALLER_SAVE_CHANGES_FAILED--}',
                // Don't set this to false, or else it will be returned as 'failed' but is saved
                'status'        => 'failed',
                'message'       => '{--INSTALLER_SAVE_CHANGES_FAILED--}',
                // Don't set this to false, or else it will be returned as 'failed' but is saved

-               'is_saved'      => true,
+               'is_saved'      => TRUE,

                'failed_fields' => array()
        );
 
        // Init overall status
                'failed_fields' => array()
        );
 
        // Init overall status

-       $isAllSaved = true;
+       $isAllSaved = TRUE;

 
        // Now set all remaining data in session
        foreach (postRequestArray() as $key => $value) {
 
        // Now set all remaining data in session
        foreach (postRequestArray() as $key => $value) {


@@ -236,12 +236,12 @@ function doAjaxInstallerSaveChanges () {
                );
 
                // Save the overall status for below final check
                );
 
                // Save the overall status for below final check

-               $isAllSaved = (($isAllSaved === true) && ($saveStatus['is_saved'] === true));
+               $isAllSaved = (($isAllSaved === TRUE) && ($saveStatus['is_saved'] === TRUE));

                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',is_saved=' . intval($saveStatus['is_saved']) . ',isAllSaved=' . intval($isAllSaved));
        } // END - foreach
 
        // 'is_saved' is still true?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',is_saved=' . intval($saveStatus['is_saved']) . ',isAllSaved=' . intval($isAllSaved));
        } // END - foreach
 
        // 'is_saved' is still true?

-       if ($isAllSaved === true) {
+       if ($isAllSaved === TRUE) {

                // Set 'done' and message
                $saveStatus['status']  = 'done';
                $saveStatus['message'] = '{--INSTALLER_SAVE_CHANGES_DONE--}';
                // Set 'done' and message
                $saveStatus['status']  = 'done';
                $saveStatus['message'] = '{--INSTALLER_SAVE_CHANGES_DONE--}';


@@ -390,13 +390,13 @@ function doAjaxPrepareInstallerOverview () {
                // Status message (e.g. for output)
                'message'       => '{--INSTALLER_OVERVIEW_FINAL_CHECK_FAILED--}',
                // Don't set this to false, or else it will be returned as 'failed' but is saved
                // Status message (e.g. for output)
                'message'       => '{--INSTALLER_OVERVIEW_FINAL_CHECK_FAILED--}',
                // Don't set this to false, or else it will be returned as 'failed' but is saved

-               'is_valid'      => true,
+               'is_valid'      => TRUE,

                // Failed fields
                'failed_fields' => array()
        );
 
        // Init overall status and final output
                // Failed fields
                'failed_fields' => array()
        );
 
        // Init overall status and final output

-       $isAllValid = true;
+       $isAllValid = TRUE;

        $output     = '';
 
        // Check all data in session
        $output     = '';
 
        // Check all data in session


@@ -411,18 +411,18 @@ function doAjaxPrepareInstallerOverview () {
                $verificationStatus['is_valid'] = (isInstallerDataValid($verificationStatus, $key, $value));
 
                // Is this step okay?
                $verificationStatus['is_valid'] = (isInstallerDataValid($verificationStatus, $key, $value));
 
                // Is this step okay?

-               if ($verificationStatus['is_valid'] === true) {
+               if ($verificationStatus['is_valid'] === TRUE) {

                        // Add this key/value pair to a overview group
                        addKeyValueToInstallerOverviewGroup($key, $value);
                } // END - if
 
                // Save the overall status for below final check
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',is_valid=' . intval($verificationStatus['is_valid']) . ',isAllValid=' . intval($isAllValid));
                        // Add this key/value pair to a overview group
                        addKeyValueToInstallerOverviewGroup($key, $value);
                } // END - if
 
                // Save the overall status for below final check
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',is_valid=' . intval($verificationStatus['is_valid']) . ',isAllValid=' . intval($isAllValid));

-               $isAllValid = (($isAllValid === true) && ($verificationStatus['is_valid'] === true));
+               $isAllValid = (($isAllValid === TRUE) && ($verificationStatus['is_valid'] === TRUE));

        } // END - foreach
 
        // Is it still true?
        } // END - foreach
 
        // Is it still true?

-       if ($isAllValid === true) {
+       if ($isAllValid === TRUE) {

                // Set 'done' and message
                $verificationStatus['status']  = 'done';
                $verificationStatus['message'] = '{--INSTALLER_OVERVIEW_FINAL_CHECK_DONE--}';
                // Set 'done' and message
                $verificationStatus['status']  = 'done';
                $verificationStatus['message'] = '{--INSTALLER_OVERVIEW_FINAL_CHECK_DONE--}';

diff --git a/inc/callback-functions.php b/inc/callback-functions.php
index 042781b9c1873f795de92fb6f2cb721460ccbac2..4b9c5c8b59d3e47075661a435bab603662f1215e 100644 (file)
--- a/inc/callback-functions.php
+++ b/inc/callback-functions.php
@@ -1272,7 +1272,7 @@ function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '',
                $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][] = $attributes['VALUE'];
        } elseif (isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['NAME']])) {
                // Already created
                $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][] = $attributes['VALUE'];
        } elseif (isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['NAME']])) {
                // Already created

-               reportBug(__FUNCTION__, __LINE__, 'NAME=' . $attributes['NAME'] . ' already addded to ' . $element . ' attributes=<pre>' . print_r($attributes, true) . '</pre>');
+               reportBug(__FUNCTION__, __LINE__, 'NAME=' . $attributes['NAME'] . ' already addded to ' . $element . ' attributes=<pre>' . print_r($attributes, TRUE) . '</pre>');

        } else {
                // Use from NAME
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',NAME=' . $attributes['NAME'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NAME!');
        } else {
                // Use from NAME
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',NAME=' . $attributes['NAME'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NAME!');


@@ -1294,7 +1294,7 @@ function doXmlCallbackFunctionExecute ($callbackName, $args, $columnIndex) {
        } // END - if
 
        // Just call it
        } // END - if
 
        // Just call it

-       //* DEBUG: */ die('callbackFunction=' . $callbackName . ',columnIndex=' . $columnIndex . ',args=<pre>'.print_r($args, true).'</pre>');
+       //* DEBUG: */ die('callbackFunction=' . $callbackName . ',columnIndex=' . $columnIndex . ',args=<pre>'.print_r($args, TRUE).'</pre>');

        call_user_func_array($callbackName, $args);
 }
 
        call_user_func_array($callbackName, $args);
 }
 

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 713c1696ce14d7247cff5d4d6d4c35ae859d5c3e..df3c14578cd5f107ab04269dba99f960aeb1fe99 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -49,7 +49,7 @@ class CacheSystem {
        var $fqfn = '';
 
        // Resource to cache file
        var $fqfn = '';
 
        // Resource to cache file

-       var $pointer = false;
+       var $pointer = FALSE;

 
        // Data array from cache
        var $data = array();
 
        // Data array from cache
        var $data = array();


@@ -174,7 +174,7 @@ class CacheSystem {
                                        // Filter
                                        $GLOBALS['cache_array']['filter']['chains'][$data['filter_name']][$data['filter_function']] = $data['filter_active'];
                                        $GLOBALS['cache_array']['filter']['counter'][$data['filter_name']][$data['filter_function']] = $data['filter_counter'];
                                        // Filter
                                        $GLOBALS['cache_array']['filter']['chains'][$data['filter_name']][$data['filter_function']] = $data['filter_active'];
                                        $GLOBALS['cache_array']['filter']['counter'][$data['filter_name']][$data['filter_function']] = $data['filter_counter'];

-                                       $GLOBALS['cache_array']['filter']['loaded'][$data['filter_name']][$data['filter_function']] = true;
+                                       $GLOBALS['cache_array']['filter']['loaded'][$data['filter_name']][$data['filter_function']] = TRUE;

                                } elseif ($this->name == 'modules') {
                                        // Modules
                                        $GLOBALS['cache_array']['modules'][$k][$data['module']] = $v;
                                } elseif ($this->name == 'modules') {
                                        // Modules
                                        $GLOBALS['cache_array']['modules'][$k][$data['module']] = $v;


@@ -224,10 +224,10 @@ class CacheSystem {
                                        $this->finalize();
 
                                        // Remove cache
                                        $this->finalize();
 
                                        // Remove cache

-                                       $this->removeCacheFile(true);
+                                       $this->removeCacheFile(TRUE);

 
                                        // Unsupported/unhandled cache detected
 
                                        // Unsupported/unhandled cache detected

-                                       reportBug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected, data=' . print_r($data, true) . ',k=' . $k . ',v=' . $v);
+                                       reportBug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected, data=' . print_r($data, TRUE) . ',k=' . $k . ',v=' . $v);

                                }
 
                                // Write cache line to file
                                }
 
                                // Write cache line to file


@@ -259,7 +259,7 @@ class CacheSystem {
 
                        // Remove pointer and status
                        unset($this->status[$this->name]);
 
                        // Remove pointer and status
                        unset($this->status[$this->name]);

-                       $this->pointer = false;
+                       $this->pointer = FALSE;

                        //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'name=' . $this->name . ' - FINALIZED!');
                } // END - if
        }
                        //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'name=' . $this->name . ' - FINALIZED!');
                } // END - if
        }


@@ -310,7 +310,7 @@ class CacheSystem {
        }
 
        // Destroy an existing cache file
        }
 
        // Destroy an existing cache file

-       function removeCacheFile ($force = false) {
+       function removeCacheFile ($force = FALSE) {

                // Reset read status
                $this->resetCacheReadStatus();
 
                // Reset read status
                $this->resetCacheReadStatus();
 


@@ -320,7 +320,7 @@ class CacheSystem {
                // Is the cache file not yet rebuilt?
                if ((!isset($this->rebuilt[$this->name])) && ($this->isCacheReadable())) {
                        // Only run in regular output mode
                // Is the cache file not yet rebuilt?
                if ((!isset($this->rebuilt[$this->name])) && ($this->isCacheReadable())) {
                        // Only run in regular output mode

-                       if ((!isHtmlOutputMode()) && ($force === false)) {
+                       if ((!isHtmlOutputMode()) && ($force === FALSE)) {

                                // Debug message if allowed
                                if (isDebugModeEnabled()) {
                                        // Debug message
                                // Debug message if allowed
                                if (isDebugModeEnabled()) {
                                        // Debug message


@@ -352,7 +352,7 @@ class CacheSystem {
                                // The cache does no longer exist so kill the content
                                unset($this->data[$this->name]);
                                unset($this->version[$this->name]);
                                // The cache does no longer exist so kill the content
                                unset($this->data[$this->name]);
                                unset($this->version[$this->name]);

-                               $this->rebuilt[$this->name] = true;
+                               $this->rebuilt[$this->name] = TRUE;

                        } else {
                                // Not removed!
                                reportBug(__METHOD__, __LINE__, '{%message,CACHE_CANNOT_UNLINK=' . $this->name . '%}');
                        } else {
                                // Not removed!
                                reportBug(__METHOD__, __LINE__, '{%message,CACHE_CANNOT_UNLINK=' . $this->name . '%}');


@@ -424,7 +424,7 @@ class CacheSystem {
                        if ((is_array($dummy)) && (isset($dummy[$search])) && (is_array($dummy[$search]))) {
                                // Search for key in array
                                $key_found = array_key_exists($search_key, $dummy[$search]);
                        if ((is_array($dummy)) && (isset($dummy[$search])) && (is_array($dummy[$search]))) {
                                // Search for key in array
                                $key_found = array_key_exists($search_key, $dummy[$search]);

-                               if ($key_found == true) {
+                               if ($key_found == TRUE) {

                                        $key = $search_key;
                                        // Key (hopefully) found?
                                        foreach ($dummy as $a => $v) {
                                        $key = $search_key;
                                        // Key (hopefully) found?
                                        foreach ($dummy as $a => $v) {


@@ -464,7 +464,7 @@ class CacheSystem {
                                $this->version[$this->name][$ext_name] = $ext_ver;
 
                                // Write cache line to file
                                $this->version[$this->name][$ext_name] = $ext_ver;
 
                                // Write cache line to file

-                               $this->writeLine($this->rewriteEntry($ext_name, $ext_ver, 'version', true));
+                               $this->writeLine($this->rewriteEntry($ext_name, $ext_ver, 'version', TRUE));

                        } // END - if
                        //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'name=' . $this->name . ',ext_name=' . $ext_name . ',ext_ver=' . $ext_ver);
                } else {
                        } // END - if
                        //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'name=' . $this->name . ',ext_name=' . $ext_name . ',ext_ver=' . $ext_ver);
                } else {


@@ -478,7 +478,7 @@ class CacheSystem {
                // Check cache
                if (!isset($GLOBALS[__METHOD__][$ext_name])) {
                        // Does never match by default
                // Check cache
                if (!isset($GLOBALS[__METHOD__][$ext_name])) {
                        // Does never match by default

-                       $GLOBALS[__METHOD__][$ext_name] = false;
+                       $GLOBALS[__METHOD__][$ext_name] = FALSE;

 
                        // Compare only if installed
                        if (isExtensionInstalled($ext_name)) {
 
                        // Compare only if installed
                        if (isExtensionInstalled($ext_name)) {


@@ -494,11 +494,11 @@ class CacheSystem {
                                        logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ' . $ext_name . '! Purging cache...');
        
                                        // Remove the cache file
                                        logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ' . $ext_name . '! Purging cache...');
        
                                        // Remove the cache file

-                                       $this->removeCacheFile(true);
+                                       $this->removeCacheFile(TRUE);

                                }
                        } else {
                                // Not installed, does always match
                                }
                        } else {
                                // Not installed, does always match

-                               $GLOBALS[__METHOD__][$ext_name] = true;
+                               $GLOBALS[__METHOD__][$ext_name] = TRUE;

                        }
                } else {
                        // Cache entry found, log debug message
                        }
                } else {
                        // Cache entry found, log debug message


@@ -511,12 +511,12 @@ class CacheSystem {
 
        // Rewrit the entry so it can be stored in cache file
        // @TODO Add support for more types which break in last else-block
 
        // Rewrit the entry so it can be stored in cache file
        // @TODO Add support for more types which break in last else-block

-       function rewriteEntry ($key, $value, $prefix = 'data', $single = false) {
+       function rewriteEntry ($key, $value, $prefix = 'data', $single = FALSE) {

                // Default is not single entry
                $extender = '[]';
 
                // Add only for single array entry?
                // Default is not single entry
                $extender = '[]';
 
                // Add only for single array entry?

-               if ($single === true) {
+               if ($single === TRUE) {

                        $extender = '';
                } // END - if
 
                        $extender = '';
                } // END - if
 


@@ -532,12 +532,12 @@ class CacheSystem {
                        $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = NULL;';
                } elseif (is_bool($value)) {
                        // Boolean value
                        $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = NULL;';
                } elseif (is_bool($value)) {
                        // Boolean value

-                       if ($value === true) {
+                       if ($value === TRUE) {

                                // True
                                // True

-                               $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = true;';
+                               $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = TRUE;';

                        } else {
                                // False
                        } else {
                                // False

-                               $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = false;';
+                               $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = FALSE;';

                        }
                } elseif (isset($value[0])) {
                        // These lines needs fixing
                        }
                } elseif (isset($value[0])) {
                        // These lines needs fixing

diff --git a/inc/classes/primera_api.class.php b/inc/classes/primera_api.class.php
index c91d81ef9bcbe9253820fd2f60707779319251ea..25e18681c40f3885097773c036f28d9fbdc3ffa8 100644 (file)
--- a/inc/classes/primera_api.class.php
+++ b/inc/classes/primera_api.class.php
@@ -175,7 +175,7 @@ class PrimeraApi {
         * @param string $Description Beschreibung (Sichtbar in Einzelauflistung)
         */
        function payPrimera ($Receiver, $Amount, $Description = '') {
         * @param string $Description Beschreibung (Sichtbar in Einzelauflistung)
         */
        function payPrimera ($Receiver, $Amount, $Description = '') {

-               $valid = false;
+               $valid = FALSE;

                $postData = array('PrimusInterface_Action' => 'Pay',
                        'PrimusInterface_Receiver' => base64_encode($Receiver),
                        'PrimusInterface_Amount' => base64_encode($Amount),
                $postData = array('PrimusInterface_Action' => 'Pay',
                        'PrimusInterface_Receiver' => base64_encode($Receiver),
                        'PrimusInterface_Amount' => base64_encode($Amount),


@@ -185,7 +185,7 @@ class PrimeraApi {
 
                $this->data = $postReturn;
                if ($postReturn['status'] == '200') {
 
                $this->data = $postReturn;
                if ($postReturn['status'] == '200') {

-                       $valid = true;
+                       $valid = TRUE;

                }
                return $valid;
        }
                }
                return $valid;
        }


@@ -197,7 +197,7 @@ class PrimeraApi {
         * @param string/int $User Userid / Username
         */
        function CheckPrimusUser($User) {
         * @param string/int $User Userid / Username
         */
        function CheckPrimusUser($User) {

-               $valid = false;
+               $valid = FALSE;

                $postData = array('PrimusInterface_Action'=> 'CheckPrimusUser',
                        'PrimusInterface_CheckPrimusUser' => $User);
 
                $postData = array('PrimusInterface_Action'=> 'CheckPrimusUser',
                        'PrimusInterface_CheckPrimusUser' => $User);
 


@@ -206,7 +206,7 @@ class PrimeraApi {
                $this->data = $postReturn;
 
                if ($postReturn['status'] == self::PI_USER_CHECK_OK) {
                $this->data = $postReturn;
 
                if ($postReturn['status'] == self::PI_USER_CHECK_OK) {

-                       $valid = true;
+                       $valid = TRUE;

                }
                return $valid;
        }
                }
                return $valid;
        }


@@ -215,7 +215,7 @@ class PrimeraApi {
         * Die Funktion liefer den aktuellen Primerastand
         */
        function getPrimera() {
         * Die Funktion liefer den aktuellen Primerastand
         */
        function getPrimera() {

-               $primera = false;
+               $primera = FALSE;

                $postData = array( 'PrimusInterface_Action' => 'GetPrimera' );
                $postReturn = $this->parseContent( $this->queryApi($postData) );
 
                $postData = array( 'PrimusInterface_Action' => 'GetPrimera' );
                $postReturn = $this->parseContent( $this->queryApi($postData) );
 

diff --git a/inc/classes/rdf.class.php b/inc/classes/rdf.class.php
index 78c7e95fbbd267e132e9a4d5745f6161b6b44615..296e7d592e5338cc39349c6b3dcb51fd9c88896c 100644 (file)
--- a/inc/classes/rdf.class.php
+++ b/inc/classes/rdf.class.php
@@ -61,7 +61,7 @@ class fase4_rdf {
         * @access private
         * @var    boolean
         */
         * @access private
         * @var    boolean
         */

-       var $_use_nl2br = true;
+       var $_use_nl2br = TRUE;

 
        /**
         * Sets the decoding mode of the read data (UTF8 scrambles some german umlauts here!)
 
        /**
         * Sets the decoding mode of the read data (UTF8 scrambles some german umlauts here!)


@@ -125,7 +125,7 @@ class fase4_rdf {
         * @see      set_proxy()
         * @var      bool
         */
         * @see      set_proxy()
         * @var      bool
         */

-       var $_use_proxy = false;
+       var $_use_proxy = FALSE;

 
        /**
         * just a flag for checking if proxy-support with authentication
 
        /**
         * just a flag for checking if proxy-support with authentication


@@ -136,7 +136,7 @@ class fase4_rdf {
         * @see      set_proxy()
         * @var      boolean
         */
         * @see      set_proxy()
         * @var      boolean
         */

-       var $_use_proxy_auth = false;
+       var $_use_proxy_auth = FALSE;

 
        /**
         * The time the Files will be cached (in seconds).
 
        /**
         * The time the Files will be cached (in seconds).


@@ -160,7 +160,7 @@ class fase4_rdf {
         * @access private
         * @var    boolean
         */
         * @access private
         * @var    boolean
         */

-       var $_use_cached_file = true;
+       var $_use_cached_file = TRUE;

 
        /**
         * (fast|normal) depends on _use_dynamic_display(). _use_dynamic_display( TRUE ) -> 'normal', otherwise 'fast'
 
        /**
         * (fast|normal) depends on _use_dynamic_display(). _use_dynamic_display( TRUE ) -> 'normal', otherwise 'fast'


@@ -192,7 +192,7 @@ class fase4_rdf {
         * @access private
         * @var    boolean
         */
         * @access private
         * @var    boolean
         */

-       var $_cache_dir_ok = false;
+       var $_cache_dir_ok = FALSE;

 
        /**
         * Type of the file to be parsed (RSS or RDF).
 
        /**
         * Type of the file to be parsed (RSS or RDF).


@@ -239,7 +239,7 @@ class fase4_rdf {
         * @access private
         * @var    array
         */
         * @access private
         * @var    array
         */

-       var $_use_dynamic_display = false;
+       var $_use_dynamic_display = FALSE;

 
        /**
         * <item> count
 
        /**
         * <item> count


@@ -255,7 +255,7 @@ class fase4_rdf {
         * @access private
         * @var    boolean
         */
         * @access private
         * @var    boolean
         */

-       var $_max_count = false;
+       var $_max_count = FALSE;

 
        /**
         * Array containing the content of <channel />
 
        /**
         * Array containing the content of <channel />


@@ -401,7 +401,7 @@ class fase4_rdf {
                $this->out .= "</table>";
                $this->_output = '';
                $this->_item_count = '0';
                $this->out .= "</table>";
                $this->_output = '';
                $this->_item_count = '0';

-               return true;
+               return TRUE;

        }
 
        /**
        }
 
        /**


@@ -413,7 +413,7 @@ class fase4_rdf {
         * @return    string Displays RDF Content ( using _display() )
         * @see          _remote_file, cache()
         */
         * @return    string Displays RDF Content ( using _display() )
         * @see          _remote_file, cache()
         */

-       function finish($return = false) {
+       function finish($return = FALSE) {

                $this->out = str_replace('$', '&#36;', $this->out);
 
                if (!$return) {
                $this->out = str_replace('$', '&#36;', $this->out);
 
                if (!$return) {


@@ -441,7 +441,7 @@ class fase4_rdf {
         */
        function use_dynamic_display( $bool ) {
                $this->_use_dynamic_display = $bool;
         */
        function use_dynamic_display( $bool ) {
                $this->_use_dynamic_display = $bool;

-               return true;
+               return TRUE;

        }
 
        /**
        }
 
        /**


@@ -479,12 +479,12 @@ class fase4_rdf {
         */
        function set_refresh( $seconds ) {
                $this->_refresh = (time() - $seconds);
         */
        function set_refresh( $seconds ) {
                $this->_refresh = (time() - $seconds);

-               return true;
+               return TRUE;

        }
 
        function set_salt( $saltPara ) {
                $this->salt = $saltPara;
        }
 
        function set_salt( $saltPara ) {
                $this->salt = $saltPara;

-               return true;
+               return TRUE;

        }
 
        /**
        }
 
        /**


@@ -499,7 +499,7 @@ class fase4_rdf {
        function set_max_item( $int )
        {
                $this->_max_count = $int;
        function set_max_item( $int )
        {
                $this->_max_count = $int;

-               return true;
+               return TRUE;

        }
 
        /**
        }
 
        /**


@@ -529,7 +529,7 @@ class fase4_rdf {
        function _throw_exception( $msg )
        {
                $this->out .= "<div style=\"font-family: verdana, helvetica, arial, sans-serif;font-size:11px; color: #6699cc;margin-top:10px;margin-bottom:10px;\" align=\"center\">fase4 RDF Error: ".$msg."</div>";
        function _throw_exception( $msg )
        {
                $this->out .= "<div style=\"font-family: verdana, helvetica, arial, sans-serif;font-size:11px; color: #6699cc;margin-top:10px;margin-bottom:10px;\" align=\"center\">fase4 RDF Error: ".$msg."</div>";

-               return true;
+               return TRUE;

        }
 
        /**
        }
 
        /**


@@ -703,7 +703,7 @@ class fase4_rdf {
                                                if (($this->_word_wrap > 0) && (strlen($this->_item['description']) > $this->_word_wrap))
                                                {
                                                        // Switch off _use_nl2br
                                                if (($this->_word_wrap > 0) && (strlen($this->_item['description']) > $this->_word_wrap))
                                                {
                                                        // Switch off _use_nl2br

-                                                       $this->_use_nl2br = false;
+                                                       $this->_use_nl2br = FALSE;

                                                        // First remove all \n
                                                        $this->_item['description'] = str_replace('\n', ' ', $this->_item['description']);
                                                        // Wrap with <br />\n
                                                        // First remove all \n
                                                        $this->_item['description'] = str_replace('\n', ' ', $this->_item['description']);
                                                        // Wrap with <br />\n


@@ -952,10 +952,10 @@ class fase4_rdf {
        {
                if(is_array( $options )) {
                        $this->_display_opt = $options;
        {
                if(is_array( $options )) {
                        $this->_display_opt = $options;

-                       return true;
+                       return TRUE;

                } else {
                        unset($this->_display_opt);
                } else {
                        unset($this->_display_opt);

-                       return false;
+                       return FALSE;

                }
        }
 
                }
        }
 


@@ -970,7 +970,7 @@ class fase4_rdf {
        function set_table_width( $width = 400 )
        {
                $this->_table_width = $width;
        function set_table_width( $width = 400 )
        {
                $this->_table_width = $width;

-               return true;
+               return TRUE;

        }
 
        /**
        }
 
        /**


@@ -1011,7 +1011,7 @@ class fase4_rdf {
                if(!$this->_cache_dir_ok) {
                        $this->_create_cache_dir();
                }
                if(!$this->_cache_dir_ok) {
                        $this->_create_cache_dir();
                }

-               if($this->_use_dynamic_display == true) {
+               if($this->_use_dynamic_display == TRUE) {

                        $this->_cached_file = md5('dynamic'.$this->salt.$this->_remote_file) . '.cache';
                        $this->_cache_type = 'normal';
                } else {
                        $this->_cached_file = md5('dynamic'.$this->salt.$this->_remote_file) . '.cache';
                        $this->_cache_type = 'normal';
                } else {


@@ -1023,11 +1023,11 @@ class fase4_rdf {
 
                if ( (!file_exists($_cache_f)) || (filemtime($_cache_f) < $this->_refresh) || (filesize($_cache_f) == 0)) {
                        // We have to parse the remote file
 
                if ( (!file_exists($_cache_f)) || (filemtime($_cache_f) < $this->_refresh) || (filesize($_cache_f) == 0)) {
                        // We have to parse the remote file

-                       $this->_use_cached_file = false;
+                       $this->_use_cached_file = FALSE;

                        // --> we want to provide proper Information for Use in
                        // get_cache_update_time()
                        clearstatcache();
                        // --> we want to provide proper Information for Use in
                        // get_cache_update_time()
                        clearstatcache();

-                       if($this->_use_dynamic_display == true) {
+                       if($this->_use_dynamic_display == TRUE) {

                                $_rdf = implode(' ', $this->_rdf_data()); // -> proxy
                                if(!$_rdf) {
                                        $this->_throw_exception( $this->_remote_file.' is not available' );
                                $_rdf = implode(' ', $this->_rdf_data()); // -> proxy
                                if(!$_rdf) {
                                        $this->_throw_exception( $this->_remote_file.' is not available' );


@@ -1046,8 +1046,8 @@ class fase4_rdf {
                        }
                } else {
                        // we can use the cached file
                        }
                } else {
                        // we can use the cached file

-                       $this->_use_cached_file = true;
-                       if($this->_use_dynamic_display == true) {
+                       $this->_use_cached_file = TRUE;
+                       if($this->_use_dynamic_display == TRUE) {

                                $this->_parse_xRDF( implode(' ', file($_cache_f)) );
                                $data = $this->_output;
                        } else {
                                $this->_parse_xRDF( implode(' ', file($_cache_f)) );
                                $data = $this->_output;
                        } else {


@@ -1081,16 +1081,16 @@ class fase4_rdf {
                                        if(!@is_dir($path)) {
                                                if(!@mkdir($path, 0777)) {
                                                        $this->_throw_exception("failed to create directory:<b>".$this->_cache_dir."</b>.<br /><br />Exception on Line: ".__LINE__);
                                        if(!@is_dir($path)) {
                                                if(!@mkdir($path, 0777)) {
                                                        $this->_throw_exception("failed to create directory:<b>".$this->_cache_dir."</b>.<br /><br />Exception on Line: ".__LINE__);

-                                                       return false;
+                                                       return FALSE;

                                                }
                                        }
                                }
                        }
                                                }
                                        }
                                }
                        }

-                       $this->_cache_dir_ok = true;
-                       return true;
+                       $this->_cache_dir_ok = TRUE;
+                       return TRUE;

                } else {
                } else {

-                       $this->_cache_dir_ok = true;
-                       return true;
+                       $this->_cache_dir_ok = TRUE;
+                       return TRUE;

                }
        }   // END _create_cache_dir()
 
                }
        }   // END _create_cache_dir()
 


@@ -1107,15 +1107,15 @@ class fase4_rdf {
                $_local = @fopen( $this->_cache_dir.$this->_cached_file, 'w' );
                if(!$_local) {
                        $this->_throw_exception( 'Cannot open '.$this->_cached_file.'<br /><br />Exception at Line: '.__LINE__ );
                $_local = @fopen( $this->_cache_dir.$this->_cached_file, 'w' );
                if(!$_local) {
                        $this->_throw_exception( 'Cannot open '.$this->_cached_file.'<br /><br />Exception at Line: '.__LINE__ );

-                       return false;
+                       return FALSE;

                }
                }

-               if (fwrite( $_local, $content) === false) {
+               if (fwrite( $_local, $content) === FALSE) {

                        $this->_throw_exception( 'Cannot write to '.$this->_cached_file.'<br /<br />Exeception at Line: '.__LINE__);
                        $this->_throw_exception( 'Cannot write to '.$this->_cached_file.'<br /<br />Exeception at Line: '.__LINE__);

-                       return false;
+                       return FALSE;

                }
                fclose( $_local );
                @chmod( $this->_cache_dir.$this->_cached_file, 0666);
                }
                fclose( $_local );
                @chmod( $this->_cache_dir.$this->_cached_file, 0666);

-               return true;
+               return TRUE;

        }   // END _update_cache()
 
        /**
        }   // END _update_cache()
 
        /**


@@ -1177,12 +1177,12 @@ class fase4_rdf {
                        if (is_file($dir->path.$file) && substr($file, -6, 6) != '.cache' && substr($file, -4, 4) != '.log')  {
                                if(!@unlink($dir->path.$file)) {
                                        $this->_throw_exception("Unable to unlink ".$dir->path.$file."<br />\n<br />\nException at Line: ".__LINE__ );
                        if (is_file($dir->path.$file) && substr($file, -6, 6) != '.cache' && substr($file, -4, 4) != '.log')  {
                                if(!@unlink($dir->path.$file)) {
                                        $this->_throw_exception("Unable to unlink ".$dir->path.$file."<br />\n<br />\nException at Line: ".__LINE__ );

-                                       return false;
+                                       return FALSE;

                                } // END - if
                        } // END - if
                } // END - while
                $dir->close();
                                } // END - if
                        } // END - if
                } // END - while
                $dir->close();

-               return true;
+               return TRUE;

        }   // END clear_cache()
 
        /**
        }   // END clear_cache()
 
        /**


@@ -1235,7 +1235,7 @@ class fase4_rdf {
         */
        function set_proxy($phost, $pport)
        {
         */
        function set_proxy($phost, $pport)
        {

-               $this->_use_proxy = true;
+               $this->_use_proxy = TRUE;

 
                if ($phost != '')
                $this->_phost = $phost;
 
                if ($phost != '')
                $this->_phost = $phost;


@@ -1254,7 +1254,7 @@ class fase4_rdf {
         */
        function set_proxy_auth( $pname, $ppasswd )
        {
         */
        function set_proxy_auth( $pname, $ppasswd )
        {

-               $this->_use_proxy_auth = true;
+               $this->_use_proxy_auth = TRUE;

 
                if ($pname != '')
                $this->_pname = $pname;
 
                if ($pname != '')
                $this->_pname = $pname;


@@ -1277,7 +1277,7 @@ class fase4_rdf {
         */
        function _rdf_data()
        {
         */
        function _rdf_data()
        {

-               if ( $this->_use_proxy == true )
+               if ( $this->_use_proxy == TRUE )

                {
                        // we need a raw socket here to connect to proxy
                        $fp = fsockopen($this->_phost,$this->_pport);
                {
                        // we need a raw socket here to connect to proxy
                        $fp = fsockopen($this->_phost,$this->_pport);


@@ -1285,7 +1285,7 @@ class fase4_rdf {
                        if (!$fp) {
                                $this->_throw_exception( $this->_remote_file.' is not available with proxy' );
                        } else {
                        if (!$fp) {
                                $this->_throw_exception( $this->_remote_file.' is not available with proxy' );
                        } else {

-                               if ( $this->_use_proxy_auth == true ) {
+                               if ( $this->_use_proxy_auth == TRUE ) {

                                        fputs($fp, "GET ".$this->_remote_file." HTTP/1.0\r\nUser-Agent: Fase4 RDF-Reader/1.40 modified by Quix0r\r\n\r\n");
                                } else {
                                        fputs($fp, "GET ".$this->_remote_file." HTTP/1.0\r\nUser-Agent: Fase4 RDF-Reader/1.40 modified by Quix0r\r\nProxy-Authorization: Basic ".base64_encode("$this->_pname:$this->_ppasswd") ."\r\n\r\n");
                                        fputs($fp, "GET ".$this->_remote_file." HTTP/1.0\r\nUser-Agent: Fase4 RDF-Reader/1.40 modified by Quix0r\r\n\r\n");
                                } else {
                                        fputs($fp, "GET ".$this->_remote_file." HTTP/1.0\r\nUser-Agent: Fase4 RDF-Reader/1.40 modified by Quix0r\r\nProxy-Authorization: Basic ".base64_encode("$this->_pname:$this->_ppasswd") ."\r\n\r\n");


@@ -1365,7 +1365,7 @@ class fase4_rdf {
                                $request = sprintf("GET %s HTTP/1.0\r\nHost: %s\r\nUser-Agent: Fase4 RDF-Reader/1.40 modified by Quix0r\r\n\r\n", $get, $host);
                                // Send request out
                                fputs($fp, $request);
                                $request = sprintf("GET %s HTTP/1.0\r\nHost: %s\r\nUser-Agent: Fase4 RDF-Reader/1.40 modified by Quix0r\r\n\r\n", $get, $host);
                                // Send request out
                                fputs($fp, $request);

-                               $reply = ''; $isContent = false; $dummy = '';
+                               $reply = ''; $isContent = FALSE; $dummy = '';

                                // Read reply
                                $i=0;
                                while ( !feof($fp) ) {
                                // Read reply
                                $i=0;
                                while ( !feof($fp) ) {


@@ -1373,7 +1373,7 @@ class fase4_rdf {
                                        if (substr($read, 0, 5) == '<?xml' || $isContent) {
                                                // Add content
                                                $reply[] = $read;
                                        if (substr($read, 0, 5) == '<?xml' || $isContent) {
                                                // Add content
                                                $reply[] = $read;

-                                               $isContent = true;
+                                               $isContent = TRUE;

                                        } else {
                                                // Put in dummy
                                                $dummy[] = $read;
                                        } else {
                                                // Put in dummy
                                                $dummy[] = $read;

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 4b597a204d5ffadcd89d81a116aea04c1a28e0e8..41505b26dd2b17220a4ef6dd05aadb78f285361e 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -231,7 +231,7 @@ function updateOldConfigFile () {
        } // END - foreach
 
        // By default the old array $MySQL was not found
        } // END - foreach
 
        // By default the old array $MySQL was not found

-       $found = false;
+       $found = FALSE;

 
        // Analyze every entry again for the MySQL configuration
        foreach ($oldConfig as $line) {
 
        // Analyze every entry again for the MySQL configuration
        foreach ($oldConfig as $line) {


@@ -241,8 +241,8 @@ function updateOldConfigFile () {
                // Is the $MySQL found?
                if (substr($line, 0, 6) == '$MySQL') {
                        // Okay, found
                // Is the $MySQL found?
                if (substr($line, 0, 6) == '$MySQL') {
                        // Okay, found

-                       $found = true;
-               } elseif ($found === true) {
+                       $found = TRUE;
+               } elseif ($found === TRUE) {

                        // Now check this row
                        if (substr($line, 0, 2) == ');') {
                                // MySQL array is closed so stop looking for it
                        // Now check this row
                        if (substr($line, 0, 2) == ');') {
                                // MySQL array is closed so stop looking for it


@@ -295,7 +295,7 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
                                // Check if string or number but no array
                                if (is_array($values[$idx])) {
                                        // Arrays must be fixed...
                                // Check if string or number but no array
                                if (is_array($values[$idx])) {
                                        // Arrays must be fixed...

-                                       reportBug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], true).'</pre>');
+                                       reportBug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], TRUE).'</pre>');

                                } elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
                                        // Function UNIX_TIMESTAMP() detected
                                        $SQL .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);
                                } elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
                                        // Function UNIX_TIMESTAMP() detected
                                        $SQL .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);

diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php
index b906bd09553ebe09de9295addbb4314cbdf7bc55..2f8ffb29634fdc74b53fa6fa62c5f6bc636aac53 100644 (file)
--- a/inc/daily/daily_holiday.php
+++ b/inc/daily/daily_holiday.php
@@ -107,7 +107,7 @@ SET
 WHERE
        `userid`=%s
 LIMIT 1",
 WHERE
        `userid`=%s
 LIMIT 1",

-                               array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));

                } // END - if
 
                // Free memory
                } // END - if
 
                // Free memory

diff --git a/inc/daily/daily_user.php b/inc/daily/daily_user.php
index f475f805308b2efdd4e659dfb527863977511bfd..fa5e28e1892a126286aaceec40ade5c6b050b2c6 100644 (file)
--- a/inc/daily/daily_user.php
+++ b/inc/daily/daily_user.php
@@ -133,7 +133,7 @@ LIMIT 1",
                                                                $columnName,
                                                                bigintval($content['userid']),
                                                        $content['ref_depth']
                                                                $columnName,
                                                                bigintval($content['userid']),
                                                        $content['ref_depth']

-                                                       ), __FILE__, __LINE__, false)
+                                                       ), __FILE__, __LINE__, FALSE)

                                                );
                                        } else {
                                                // Level zero
                                                );
                                        } else {
                                                // Level zero


@@ -152,7 +152,7 @@ LIMIT 1",
                                                                $content['locked_' . $columnName],
                                                                $columnName,
                                                                bigintval($content['userid'])
                                                                $content['locked_' . $columnName],
                                                                $columnName,
                                                                bigintval($content['userid'])

-                                                       ), __FILE__, __LINE__, false)
+                                                       ), __FILE__, __LINE__, FALSE)

                                                );
                                        }
 
                                                );
                                        }
 

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 660bcb2524f12e1e6693faf7dad821f08732f16f..d5586ba55215418c6ca54704b76d5e702e54f306 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // SQL queries
 } // END - if
 
 // SQL queries

-function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
+function SQL_QUERY ($sqlString, $F, $L, $enableCodes = TRUE) {

        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$sqlString])) {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called: ' . $sqlString);
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$sqlString])) {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called: ' . $sqlString);


@@ -85,7 +85,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
        }
 
        // Starting time
        }
 
        // Starting time

-       $querytimeBefore = microtime(true);
+       $querytimeBefore = microtime(TRUE);

 
        // Run SQL command
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . basename($F) . ',L=' . $L . ',sql=' . $GLOBALS['last_sql']);
 
        // Run SQL command
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . basename($F) . ',L=' . $L . ',sql=' . $GLOBALS['last_sql']);


@@ -94,7 +94,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
        //* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . SQL_AFFECTEDROWS() . ',numRows='.(is_resource($result) ? SQL_NUMROWS($result) : gettype($result)));
 
        // Calculate query time
        //* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . SQL_AFFECTEDROWS() . ',numRows='.(is_resource($result) ? SQL_NUMROWS($result) : gettype($result)));
 
        // Calculate query time

-       $queryTime = microtime(true) - $querytimeBefore;
+       $queryTime = microtime(TRUE) - $querytimeBefore;

 
        // Add this query to array including timing
        addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $F, $L);
 
        // Add this query to array including timing
        addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $F, $L);


@@ -114,7 +114,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
                if (!isset($GLOBALS['sql_first_entry'])) {
                        // Write first entry
                        appendLineToFile(getCachePath() . 'mysql.log', 'Module=' . getModule());
                if (!isset($GLOBALS['sql_first_entry'])) {
                        // Write first entry
                        appendLineToFile(getCachePath() . 'mysql.log', 'Module=' . getModule());

-                       $GLOBALS['sql_first_entry'] = true;
+                       $GLOBALS['sql_first_entry'] = TRUE;

                } // END - if
 
                // Append debug line
                } // END - if
 
                // Append debug line


@@ -131,10 +131,10 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 // SQL num rows
 function SQL_NUMROWS ($resource) {
        // Valid link resource?
 // SQL num rows
 function SQL_NUMROWS ($resource) {
        // Valid link resource?

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // Link is not up, no rows by default
 
        // Link is not up, no rows by default

-       $lines = false;
+       $lines = FALSE;

 
        // Is the result a valid resource?
        if (isset($GLOBALS['sql_numrows'][intval($resource)])) {
 
        // Is the result a valid resource?
        if (isset($GLOBALS['sql_numrows'][intval($resource)])) {


@@ -158,7 +158,7 @@ function SQL_NUMROWS ($resource) {
 // SQL affected rows
 function SQL_AFFECTEDROWS() {
        // Valid link resource?
 // SQL affected rows
 function SQL_AFFECTEDROWS() {
        // Valid link resource?

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // Get affected rows
        $lines = mysql_affected_rows(SQL_GET_LINK());
 
        // Get affected rows
        $lines = mysql_affected_rows(SQL_GET_LINK());


@@ -170,7 +170,7 @@ function SQL_AFFECTEDROWS() {
 // SQL fetch row
 function SQL_FETCHROW ($resource) {
        // Is a result resource set?
 // SQL fetch row
 function SQL_FETCHROW ($resource) {
        // Is a result resource set?

-       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return FALSE;

 
        // Fetch the data and return it
        return mysql_fetch_row($resource);
 
        // Fetch the data and return it
        return mysql_fetch_row($resource);


@@ -179,7 +179,7 @@ function SQL_FETCHROW ($resource) {
 // SQL fetch array
 function SQL_FETCHARRAY ($resource) {
        // Is a result resource set?
 // SQL fetch array
 function SQL_FETCHARRAY ($resource) {
        // Is a result resource set?

-       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return FALSE;

 
        // Load row from database
        $row = mysql_fetch_assoc($resource);
 
        // Load row from database
        $row = mysql_fetch_assoc($resource);


@@ -190,14 +190,14 @@ function SQL_FETCHARRAY ($resource) {
                return $row;
        } else {
                // Return a false, else some loops would go endless...
                return $row;
        } else {
                // Return a false, else some loops would go endless...

-               return false;
+               return FALSE;

        }
 }
 
 // SQL result
 function SQL_RESULT ($resource, $row, $field = '0') {
        // Is $resource valid?
        }
 }
 
 // SQL result
 function SQL_RESULT ($resource, $row, $field = '0') {
        // Is $resource valid?

-       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return FALSE;

 
        // Run the result command
        $result = mysql_result($resource, $row, $field);
 
        // Run the result command
        $result = mysql_result($resource, $row, $field);


@@ -229,7 +229,7 @@ function SQL_CONNECT ($host, $login, $password, $F, $L) {
 // SQL select database
 function SQL_SELECT_DB ($dbName, $F, $L) {
        // Is there still a valid link? If not, skip it.
 // SQL select database
 function SQL_SELECT_DB ($dbName, $F, $L) {
        // Is there still a valid link? If not, skip it.

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // Return the result
        return mysql_select_db($dbName, SQL_GET_LINK()) or SQL_ERROR($F, $L,  mysql_error());
 
        // Return the result
        return mysql_select_db($dbName, SQL_GET_LINK()) or SQL_ERROR($F, $L,  mysql_error());


@@ -239,7 +239,7 @@ function SQL_SELECT_DB ($dbName, $F, $L) {
 function SQL_CLOSE ($F, $L) {
        if (!SQL_IS_LINK_UP()) {
                // Skip double close
 function SQL_CLOSE ($F, $L) {
        if (!SQL_IS_LINK_UP()) {
                // Skip double close

-               return false;
+               return FALSE;

        } // END - if
 
        // Close database link and forget the link
        } // END - if
 
        // Close database link and forget the link


@@ -256,7 +256,7 @@ function SQL_CLOSE ($F, $L) {
 function SQL_FREERESULT ($resource) {
        if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) {
                // Abort here
 function SQL_FREERESULT ($resource) {
        if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) {
                // Abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Free result
        } // END - if
 
        // Free result


@@ -267,12 +267,12 @@ function SQL_FREERESULT ($resource) {
 }
 
 // SQL string escaping
 }
 
 // SQL string escaping

-function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $secure = true) {
+function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $secure = TRUE) {

        // Link is there?
        if ((!SQL_IS_LINK_UP()) || (!is_array($data))) {
                // Link is down or data is not an array
                /* DEBUG: */ logDebugMessage($F, $L, 'SQL_IS_LINK_UP()=' . intval(SQL_IS_LINK_UP()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!');
        // Link is there?
        if ((!SQL_IS_LINK_UP()) || (!is_array($data))) {
                // Link is down or data is not an array
                /* DEBUG: */ logDebugMessage($F, $L, 'SQL_IS_LINK_UP()=' . intval(SQL_IS_LINK_UP()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!');

-               return false;
+               return FALSE;

        } // END - if
 
        // Init array for escaped data with SQL string
        } // END - if
 
        // Init array for escaped data with SQL string


@@ -288,7 +288,7 @@ function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $
        // Generate query
        $query = call_user_func_array('sprintf', $dataSecured);
 
        // Generate query
        $query = call_user_func_array('sprintf', $dataSecured);
 

-       if ($run === true) {
+       if ($run === TRUE) {

                // Run SQL query (default)
                return SQL_QUERY($query, $F, $L);
        } else {
                // Run SQL query (default)
                return SQL_QUERY($query, $F, $L);
        } else {


@@ -299,19 +299,19 @@ function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $
 
 // Get id from last INSERT command
 function SQL_INSERTID () {
 
 // Get id from last INSERT command
 function SQL_INSERTID () {

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

        return mysql_insert_id();
 }
 
 // Escape a string for the database
        return mysql_insert_id();
 }
 
 // Escape a string for the database

-function SQL_ESCAPE ($str, $secureString = true, $strip = true) {
+function SQL_ESCAPE ($str, $secureString = TRUE, $strip = TRUE) {

        // Is there cache?
        if (!isset($GLOBALS['sql_escapes']['' . $str . ''])) {
                // Prepare the string here
                $str = SQL_PREPARE_SQL_STRING($str);
 
                // Secure string first? (which is the default behaviour!)
        // Is there cache?
        if (!isset($GLOBALS['sql_escapes']['' . $str . ''])) {
                // Prepare the string here
                $str = SQL_PREPARE_SQL_STRING($str);
 
                // Secure string first? (which is the default behaviour!)

-               if ($secureString === true) {
+               if ($secureString === TRUE) {

                        // Then do it here
                        $str = secureString($str, $strip);
                } // END - if
                        // Then do it here
                        $str = secureString($str, $strip);
                } // END - if


@@ -350,7 +350,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
                ));
 
                // Abort here with 'false'
                ));
 
                // Abort here with 'false'

-               return false;
+               return FALSE;

        } // END  - if
 
        // Is this is a simple array?
        } // END  - if
 
        // Is this is a simple array?


@@ -379,12 +379,12 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 }
 
 // ALTER TABLE wrapper function
 }
 
 // ALTER TABLE wrapper function

-function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
+function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {

        // Abort if link is down
        // Abort if link is down

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // This is the default result...
 
        // This is the default result...

-       $result = false;
+       $result = FALSE;

 
        // Determine index/fulltext/unique word
        $isAlterIndex = (
 
        // Determine index/fulltext/unique word
        $isAlterIndex = (


@@ -404,10 +404,10 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
        $tableName = str_replace('`', '', $tableArray[2]);
 
        // Debug log
        $tableName = str_replace('`', '', $tableArray[2]);
 
        // Debug log

-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=<pre>' . print_r($tableArray, true) . '</pre>,isAlterIndex=' . intval($isAlterIndex));
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=<pre>' . print_r($tableArray, TRUE) . '</pre>,isAlterIndex=' . intval($isAlterIndex));

 
        // Shall we add/drop?
 
        // Shall we add/drop?

-       if (((isInString('ADD', $sql)) || (isInString('DROP', $sql)) || (isInString('CHANGE', $sql))) && ($isAlterIndex === false)) {
+       if (((isInString('ADD', $sql)) || (isInString('DROP', $sql)) || (isInString('CHANGE', $sql))) && ($isAlterIndex === FALSE)) {

                // Try two columns, one should fix
                foreach (array(4,5) as $idx) {
                        // If an entry is not set, abort here
                // Try two columns, one should fix
                foreach (array(4,5) as $idx) {
                        // If an entry is not set, abort here


@@ -427,7 +427,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
                        if (((!ifSqlColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((ifSqlColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!ifSqlColumnExists($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) {
                                // Do the query
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
                        if (((!ifSqlColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((ifSqlColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!ifSqlColumnExists($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) {
                                // Do the query
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);

-                               $result = SQL_QUERY($sql, $F, $L, false);
+                               $result = SQL_QUERY($sql, $F, $L, FALSE);

 
                                // Skip further attempt(s)
                                break;
 
                                // Skip further attempt(s)
                                break;


@@ -447,10 +447,10 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
        } elseif ((getTableType() == 'InnoDB') && (isInString('FULLTEXT', $sql))) {
                // Skip this query silently because InnoDB does not understand fulltext indexes
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlColumnExists($columnName)), $F, $L));
        } elseif ((getTableType() == 'InnoDB') && (isInString('FULLTEXT', $sql))) {
                // Skip this query silently because InnoDB does not understand fulltext indexes
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlColumnExists($columnName)), $F, $L));

-       } elseif ($isAlterIndex === true) {
+       } elseif ($isAlterIndex === TRUE) {

                // And column name as well without backticks
                $keyName = str_replace('`', '', $tableArray[5]);
                // And column name as well without backticks
                $keyName = str_replace('`', '', $tableArray[5]);

-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . ',tableArray=<pre>' . print_r($tableArray, true) . '</pre>');
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . ',tableArray=<pre>' . print_r($tableArray, TRUE) . '</pre>');

 
                // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
                if (in_array(strtoupper($tableArray[4]), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
 
                // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
                if (in_array(strtoupper($tableArray[4]), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {


@@ -554,14 +554,14 @@ function SQL_HASZEROAFFECTED () {
 }
 
 // Private function to prepare the SQL query string
 }
 
 // Private function to prepare the SQL query string

-function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = true) {
+function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = TRUE) {

        // Is it already cached?
        if (!isset($GLOBALS['sql_strings'][$sqlString])) {
                // Compile URI codes+config+expression code
                $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG(compileUriCode($sqlString)));
 
                // Do final compilation
        // Is it already cached?
        if (!isset($GLOBALS['sql_strings'][$sqlString])) {
                // Compile URI codes+config+expression code
                $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG(compileUriCode($sqlString)));
 
                // Do final compilation

-               $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false, $enableCodes);
+               $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, FALSE, $enableCodes);

        } // END - if
 
        // Return it
        } // END - if
 
        // Return it


@@ -647,12 +647,12 @@ function isSqlTableIndexFound ($tableName, $keyName) {
                $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
 
                // The column is not found by default
                $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
 
                // The column is not found by default

-               $GLOBALS[__FUNCTION__][$tableName][$keyName] = false;
+               $GLOBALS[__FUNCTION__][$tableName][$keyName] = FALSE;

 
                // Walk through all
                while ($content = SQL_FETCHARRAY($result)) {
                        // Add all entries for better caching behavior
 
                // Walk through all
                while ($content = SQL_FETCHARRAY($result)) {
                        // Add all entries for better caching behavior

-                       $GLOBALS[__FUNCTION__][$tableName][$content['Key_name']] = true;
+                       $GLOBALS[__FUNCTION__][$tableName][$content['Key_name']] = TRUE;

                } // END - while
 
                // Free result
                } // END - while
 
                // Free result


@@ -701,7 +701,7 @@ function getArrayFromSupportedSqlEngines ($support = 'YES') {
                } // END - if
        } else {
                // No engines! :(
                } // END - if
        } else {
                // No engines! :(

-               $engines = false;
+               $engines = FALSE;

        }
 
        // Free result
        }
 
        // Free result

diff --git a/inc/email-functions.php b/inc/email-functions.php
index bb4f0e55eb863de23c59bcfdc2a14ac1454b2797..d854a993ad655baa404b108be27f2450aff5da7c 100644 (file)
--- a/inc/email-functions.php
+++ b/inc/email-functions.php
@@ -91,7 +91,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 </pre>');
 
                // This is always fine
 </pre>');
 
                // This is always fine

-               return true;
+               return TRUE;

        } elseif (!empty($toEmail)) {
                // Send Mail away
                return sendRawEmail($toEmail, $subject, $message, $mailHeader);
        } elseif (!empty($toEmail)) {
                // Send Mail away
                return sendRawEmail($toEmail, $subject, $message, $mailHeader);


@@ -116,12 +116,12 @@ function isPhpMailerConfigured () {
 // Send out a raw email with PHPMailer class or plain mail() command
 function sendRawEmail ($toEmail, $subject, $message, $headers) {
        // Just compile all to put out all configs, etc.
 // Send out a raw email with PHPMailer class or plain mail() command
 function sendRawEmail ($toEmail, $subject, $message, $headers) {
        // Just compile all to put out all configs, etc.

-       $eval  = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), false)) . '"); ';
-       $eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), false)) . '"); ';
-       $eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($headers), false)) . '"); ';
+       $eval  = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), FALSE)) . '"); ';
+       $eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), FALSE)) . '"); ';
+       $eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($headers), FALSE)) . '"); ';

 
        // Do not decode entities in the message because we also send HTML mails through this function
 
        // Do not decode entities in the message because we also send HTML mails through this function

-       $eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), false)) . '";';
+       $eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), FALSE)) . '";';

 
        // Run the final eval() command
        eval($eval);
 
        // Run the final eval() command
        eval($eval);


@@ -142,7 +142,7 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
                $mail->PluginDir  = sprintf("%sinc/phpmailer/", getPath());
 
                $mail->IsSMTP();
                $mail->PluginDir  = sprintf("%sinc/phpmailer/", getPath());
 
                $mail->IsSMTP();

-               $mail->SMTPAuth   = true;
+               $mail->SMTPAuth   = TRUE;

                $mail->Host       = getConfig('SMTP_HOSTNAME');
                $mail->Port       = 25;
                $mail->Username   = getConfig('SMTP_USER');
                $mail->Host       = getConfig('SMTP_HOSTNAME');
                $mail->Port       = 25;
                $mail->Username   = getConfig('SMTP_USER');


@@ -158,7 +158,7 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
                        $mail->Body       = $message;
                        $mail->AltBody    = decodeEntities($message);
                        $mail->WordWrap   = 70;
                        $mail->Body       = $message;
                        $mail->AltBody    = decodeEntities($message);
                        $mail->WordWrap   = 70;

-                       $mail->IsHTML(true);
+                       $mail->IsHTML(TRUE);

                } else {
                        $mail->Body       = decodeEntities(strip_tags($message));
                }
                } else {
                        $mail->Body       = decodeEntities(strip_tags($message));
                }


@@ -176,10 +176,10 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
                        logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo);
 
                        // Raise an error
                        logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo);
 
                        // Raise an error

-                       return false;
+                       return FALSE;

                } else {
                        // All fine!
                } else {
                        // All fine!

-                       return true;
+                       return TRUE;

                }
        } else {
                // Use plain mail() command
                }
        } else {
                // Use plain mail() command

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index c8f1bfdf7698c3c1a242cf36605fc14aeb119fa2..4e7c7f264ad73cc89b2786e9051a9b28cd4a53a4 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -71,15 +71,15 @@ function isExpressionFunctionAvaiable ($data) {
                if (function_exists($functionName)) {
                        // Cache it all
                        $GLOBALS['expression_function_name'][$entry]      = $functionName;
                if (function_exists($functionName)) {
                        // Cache it all
                        $GLOBALS['expression_function_name'][$entry]      = $functionName;

-                       $GLOBALS['expression_function_available'][$entry] = true;
+                       $GLOBALS['expression_function_available'][$entry] = TRUE;

                } else {
                        // Not avaiable
                        logDebugMessage(__FUNCTION__, __LINE__, 'Expression function ' . $functionName . ' not found. Please consider adding it to improve execution speed.');
 
                        // And cache it
                } else {
                        // Not avaiable
                        logDebugMessage(__FUNCTION__, __LINE__, 'Expression function ' . $functionName . ' not found. Please consider adding it to improve execution speed.');
 
                        // And cache it

-                       $GLOBALS['expression_function_available'][$entry] = false;
+                       $GLOBALS['expression_function_available'][$entry] = FALSE;

                }
                }

-       } elseif ($GLOBALS['expression_function_available'][$entry] == false) {
+       } elseif ($GLOBALS['expression_function_available'][$entry] == FALSE) {

                // Debug message
                logDebugMessage(__FUNCTION__, __LINE__, 'Expression function for entry ' . $entry . ' requested but does not exist.');
        }
                // Debug message
                logDebugMessage(__FUNCTION__, __LINE__, 'Expression function for entry ' . $entry . ' requested but does not exist.');
        }


@@ -153,7 +153,7 @@ function doExpressionExt ($data) {
                $functionName = 'getExtension' . capitalizeUnderscoreString($data['callback']);
 
                // Construct call of the function
                $functionName = 'getExtension' . capitalizeUnderscoreString($data['callback']);
 
                // Construct call of the function

-               $replacer = "{DQUOTE} . call_user_func_array('" . $functionName . "', array('" . $data['matches'][4][$data['key']] . "', true)) . {DQUOTE}";
+               $replacer = "{DQUOTE} . call_user_func_array('" . $functionName . "', array('" . $data['matches'][4][$data['key']] . "', TRUE)) . {DQUOTE}";

        } // END - if
 
        // Generate replacer
        } // END - if
 
        // Generate replacer


@@ -195,7 +195,7 @@ function doExpressionPipe ($data) {
 
        // Is there a call-back? Should always be there!
        if (!empty($data['callback'])) {
 
        // Is there a call-back? Should always be there!
        if (!empty($data['callback'])) {

-               //* DEBUG: */ if ($data['callback'] == 'getMemberId') die('<pre>'.encodeEntities(print_r($data, true)).'</pre>');
+               //* DEBUG: */ if ($data['callback'] == 'getMemberId') die('<pre>'.encodeEntities(print_r($data, TRUE)).'</pre>');

                // If the value is empty, we don't add it
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value[' . gettype($data['value']) . ']=' . $data['value']);
                if ((empty($data['value'])) && ($data['value'] != '0')) {
                // If the value is empty, we don't add it
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value[' . gettype($data['value']) . ']=' . $data['value']);
                if ((empty($data['value'])) && ($data['value'] != '0')) {


@@ -241,7 +241,7 @@ function doExpressionValidatorLinks ($data) {
        // Should we generally include validator links?
        if ((isExtensionInstalled('validator')) && (getConfig('enable_validator') == 'Y') && (!in_array(getModule(), array('admin', 'login')))) {
                // Load the validator template
        // Should we generally include validator links?
        if ((isExtensionInstalled('validator')) && (getConfig('enable_validator') == 'Y') && (!in_array(getModule(), array('admin', 'login')))) {
                // Load the validator template

-               $replacer = escapeQuotes(loadTemplate('validator_links', true));
+               $replacer = escapeQuotes(loadTemplate('validator_links', TRUE));

        } // END - if
 
        // Replace the code
        } // END - if
 
        // Replace the code


@@ -257,7 +257,7 @@ function doExpressionMessage ($data) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callback=' . $data['callback'] . ',extra_func=' . $data['extra_func'] . ',value=' . $data['value']);
 
        // Message string replacement depends on if message is masked
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callback=' . $data['callback'] . ',extra_func=' . $data['extra_func'] . ',value=' . $data['value']);
 
        // Message string replacement depends on if message is masked

-       if ((isMessageMasked($data['callback'], false)) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
+       if ((isMessageMasked($data['callback'], FALSE)) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {

                // Message should be masked
                $replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . {DQUOTE}";
        } elseif (!empty($data['value'])) {
                // Message should be masked
                $replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . {DQUOTE}";
        } elseif (!empty($data['value'])) {


@@ -296,7 +296,7 @@ function doExpressionTemplate ($data) {
        } else {
                // Do the replacement
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
        } else {
                // Do the replacement
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);

-               $replacer = '{DQUOTE} . ' . $callbackFunction . '(' . chr(39) . $GLOBALS['current_template'] . chr(39) . ', true';
+               $replacer = '{DQUOTE} . ' . $callbackFunction . '(' . chr(39) . $GLOBALS['current_template'] . chr(39) . ', TRUE';

 
                // Is 'value' set?
                if (!empty($data['value'])) {
 
                // Is 'value' set?
                if (!empty($data['value'])) {

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index ca7717c09105e0c5cf1fdd59bc823fff5a352e07..ae3cf47a9024a98f6d44e797a8d610b543ab14f5 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -41,17 +41,17 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load the extension and maybe found language and function files.
 } // END - if
 
 // Load the extension and maybe found language and function files.

-function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = false, $previousExtension = NULL) {
+function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = FALSE, $previousExtension = NULL) {

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_mode=' . $ext_mode . ',ext_ver=' . $ext_ver . ',isDryRun=' . intval($isDryRun) . ' - ENTERED!');
        // Loading an extension in same mode, but not test/update, twice is not
        // good, so is the extension $ext_name already loaded in mode $ext_mode?
        if ((isset($GLOBALS['loaded_extension'][$ext_name][$ext_mode])) && (!in_array($ext_mode, array('update', 'test')))) {
                // If this happens twice, we need the bug report from you, except for updates/tests
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_mode=' . $ext_mode . ',ext_ver=' . $ext_ver . ',isDryRun=' . intval($isDryRun) . ' - ENTERED!');
        // Loading an extension in same mode, but not test/update, twice is not
        // good, so is the extension $ext_name already loaded in mode $ext_mode?
        if ((isset($GLOBALS['loaded_extension'][$ext_name][$ext_mode])) && (!in_array($ext_mode, array('update', 'test')))) {
                // If this happens twice, we need the bug report from you, except for updates/tests

-               reportBug(__FUNCTION__, __LINE__, __FUNCTION__ . '() is called twice: ext_name=' . $ext_name . ', ext_mode='. $ext_mode . ',ext_sqls=' . print_r(getExtensionSqls(), true) . ', ext_register_running=' . print_r($GLOBALS['ext_register_running'], true) . ', ext_running_updates=' . print_r($GLOBALS['ext_running_updates'], true));
+               reportBug(__FUNCTION__, __LINE__, __FUNCTION__ . '() is called twice: ext_name=' . $ext_name . ', ext_mode='. $ext_mode . ',ext_sqls=' . print_r(getExtensionSqls(), TRUE) . ', ext_register_running=' . print_r($GLOBALS['ext_register_running'], TRUE) . ', ext_running_updates=' . print_r($GLOBALS['ext_running_updates'], TRUE));

        } // END - if
 
        // Make sure this situation can only happen once
        } // END - if
 
        // Make sure this situation can only happen once

-       $GLOBALS['loaded_extension'][$ext_name][$ext_mode] = true;
+       $GLOBALS['loaded_extension'][$ext_name][$ext_mode] = TRUE;

 
        // Remember previous extension here
        $GLOBALS['previous_extension'][$ext_name] = $previousExtension;
 
        // Remember previous extension here
        $GLOBALS['previous_extension'][$ext_name] = $previousExtension;


@@ -107,7 +107,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = fa
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name));
 
                // Abort here
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name));
 
                // Abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Is the extension file NOT there?
        } // END - if
 
        // Is the extension file NOT there?


@@ -116,7 +116,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = fa
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable or the PHP script is deprecated.", $ext_name));
 
                // Abort here
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable or the PHP script is deprecated.", $ext_name));
 
                // Abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Load extension's own language file if not in test mode
        } // END - if
 
        // Load extension's own language file if not in test mode


@@ -165,7 +165,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = fa
 
                // Abort here
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension load aborted, ext_name=' . $ext_name . ' - Extension is deprecated.');
 
                // Abort here
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension load aborted, ext_name=' . $ext_name . ' - Extension is deprecated.');

-               return false;
+               return FALSE;

        } // END - if
 
        // Mark it as loaded in normal mode
        } // END - if
 
        // Mark it as loaded in normal mode


@@ -176,11 +176,11 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = fa
 
        // All fine!
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension successfully loaded, ext_name=' . $ext_name);
 
        // All fine!
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension successfully loaded, ext_name=' . $ext_name);

-       return true;
+       return TRUE;

 }
 
 // Registers an extension and possible update dependencies
 }
 
 // Registers an extension and possible update dependencies

-function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdates = false, $previousExtension = NULL) {
+function registerExtension ($ext_name, $taskId, $isDryRun = FALSE, $ignoreUpdates = FALSE, $previousExtension = NULL) {

        // Set current extension name
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . intval($taskId) . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - ENTERED!');
        setCurrentExtensionName($ext_name);
        // Set current extension name
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . intval($taskId) . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - ENTERED!');
        setCurrentExtensionName($ext_name);


@@ -195,15 +195,15 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
        if (((!isAdmin()) && (!isInstallationPhase())) || (isExtensionInstalled($ext_name))) {
                // Abort here with 'false'
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ABORTED: isAdmin()=' . intval(isAdmin()) . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ',isExtensionInstalled()=' . intval(isExtensionInstalled($ext_name)));
        if (((!isAdmin()) && (!isInstallationPhase())) || (isExtensionInstalled($ext_name))) {
                // Abort here with 'false'
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ABORTED: isAdmin()=' . intval(isAdmin()) . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ',isExtensionInstalled()=' . intval(isExtensionInstalled($ext_name)));

-               return false;
+               return FALSE;

        } // END - if
 
        // When this extension is already in registration/update phase, all is fine
        } // END - if
 
        // When this extension is already in registration/update phase, all is fine

-       if ((isExtensionRegistrationRunning($ext_name)) || ((isExtensionUpdateRunning($ext_name)) && ($ignoreUpdates === false))) {
+       if ((isExtensionRegistrationRunning($ext_name)) || ((isExtensionUpdateRunning($ext_name)) && ($ignoreUpdates === FALSE))) {

                // Then abort here with 'true' becaus it is fine
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in registration/update phase, all fine,taskId=' . $taskId . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates));
                //* BUG: */ reportBug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . $taskId . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - Please investigate!');
                // Then abort here with 'true' becaus it is fine
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in registration/update phase, all fine,taskId=' . $taskId . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates));
                //* BUG: */ reportBug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . $taskId . ',isDryRun=' . intval($isDryRun) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - Please investigate!');

-               return true;
+               return TRUE;

        } // END - if
 
        // This registration is running
        } // END - if
 
        // This registration is running


@@ -241,8 +241,8 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
        initExtensionNotes();
 
        // Init variables
        initExtensionNotes();
 
        // Init variables

-       $ret = false;
-       $processResult = false;
+       $ret = FALSE;
+       $processResult = FALSE;

        initIncludePool('extension');
 
        // By default we have no failures
        initIncludePool('extension');
 
        // By default we have no failures


@@ -298,7 +298,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
                                        if (($updateTaskId > 0) || (isInstallationPhase())) {
                                                // Try to register the extension
                                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ',updateTaskId=' . $updateTaskId . ',isExtensionDryRun()=' . intval(isExtensionDryRun()));
                                        if (($updateTaskId > 0) || (isInstallationPhase())) {
                                                // Try to register the extension
                                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_update=' . $ext_update . ',updateTaskId=' . $updateTaskId . ',isExtensionDryRun()=' . intval(isExtensionDryRun()));

-                                               $processResult = registerExtension($ext_update, $updateTaskId, isExtensionDryRun(), true, $ext_name);
+                                               $processResult = registerExtension($ext_update, $updateTaskId, isExtensionDryRun(), TRUE, $ext_name);

 
                                                // Reset extension name
                                                setCurrentExtensionName($ext_name);
 
                                                // Reset extension name
                                                setCurrentExtensionName($ext_name);


@@ -317,14 +317,14 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',currVer=' . getCurrentExtensionVersion());
 
                                        // All okay!
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',currVer=' . getCurrentExtensionVersion());
 
                                        // All okay!

-                                       $processResult = true;
+                                       $processResult = TRUE;

                                } else {
                                        // Nothing to register / update before...
                                } else {
                                        // Nothing to register / update before...

-                                       $processResult = true;
+                                       $processResult = TRUE;

                                }
                        } else {
                                // Required file for update does not exists!
                                }
                        } else {
                                // Required file for update does not exists!

-                               $processResult = true;
+                               $processResult = TRUE;

                                // But this is fine for the first time...
                        }
 
                                // But this is fine for the first time...
                        }
 


@@ -336,7 +336,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
                if (countExtensionUpdateDependencies(getCurrentExtensionName()) == 0) {
                        // Then test is passed!
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=true,countExtensionUpdateDependencies()=0 - Test passed!');
                if (countExtensionUpdateDependencies(getCurrentExtensionName()) == 0) {
                        // Then test is passed!
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=true,countExtensionUpdateDependencies()=0 - Test passed!');

-                       $processResult = true;
+                       $processResult = TRUE;

                } // END - if
 
                // Switch back to register mode
                } // END - if
 
                // Switch back to register mode


@@ -344,20 +344,20 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
 
                // Remains true if extension registration reports no failures
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));
 
                // Remains true if extension registration reports no failures
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));

-               $processResult = (($processResult === true) && (isExtensionReportingFailure() === false));
+               $processResult = (($processResult === TRUE) && (isExtensionReportingFailure() === FALSE));

                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));
 
                // Does everthing before wents ok?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',processResult=' . intval($processResult));
 
                // Does everthing before wents ok?

-               if ($processResult === true) {
+               if ($processResult === TRUE) {

                        // "Dry-run-mode" activated?
                        // "Dry-run-mode" activated?

-                       if ((isExtensionDryRun() === false) && (!isExtensionOnRemovalList())) {
+                       if ((isExtensionDryRun() === FALSE) && (!isExtensionOnRemovalList())) {

                                // Init SQLs and transfer ext->generic
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName());
                                initSqls();
                                setSqlsArray(getExtensionSqls());
 
                                // Run installation pre-installation filters
                                // Init SQLs and transfer ext->generic
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName());
                                initSqls();
                                setSqlsArray(getExtensionSqls());
 
                                // Run installation pre-installation filters

-                               runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false));
+                               runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun(), 'enable_codes' => FALSE));

 
                                // Register extension
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . getCurrentExtensionName() . '/' . getCurrentExtensionVersion() . ' - INSERT!');
 
                                // Register extension
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . getCurrentExtensionName() . '/' . getCurrentExtensionVersion() . ' - INSERT!');


@@ -387,7 +387,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
                                $GLOBALS['cache_array']['extension']['ext_name'][SQL_INSERTID()] = getCurrentExtensionName();
 
                                // Mark it as installed
                                $GLOBALS['cache_array']['extension']['ext_name'][SQL_INSERTID()] = getCurrentExtensionName();
 
                                // Mark it as installed

-                               $GLOBALS['ext_is_installed'][getCurrentExtensionName()] = true;
+                               $GLOBALS['ext_is_installed'][getCurrentExtensionName()] = TRUE;

 
                                // Remove cache file(s) if extension is active
                                runFilterChain('post_extension_installed', array(
 
                                // Remove cache file(s) if extension is active
                                runFilterChain('post_extension_installed', array(


@@ -397,22 +397,22 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
                                ));
 
                                // Re-init queries and notes
                                ));
 
                                // Re-init queries and notes

-                               initExtensionSqls(true);
-                               initExtensionNotes(true);
+                               initExtensionSqls(TRUE);
+                               initExtensionNotes(TRUE);

 
                                // In normal mode return a true on success
 
                                // In normal mode return a true on success

-                               $ret = true;
-                       } elseif (isExtensionDryRun() === true) {
+                               $ret = TRUE;
+                       } elseif (isExtensionDryRun() === TRUE) {

                                // In  "dry-run" mode do always return a true
                                // In  "dry-run" mode do always return a true

-                               $ret = true;
+                               $ret = TRUE;

                        } else {
                                // Extension has been removed for updates, so all is fine!
                        } else {
                                // Extension has been removed for updates, so all is fine!

-                               $ret = true;
+                               $ret = TRUE;

                        }
                } else {
                        // No, an error occurs while registering extension :-(
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName());
                        }
                } else {
                        // No, an error occurs while registering extension :-(
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName());

-                       $ret = false;
+                       $ret = FALSE;

                }
        } elseif (($taskId > 0) && (getCurrentExtensionName() != '')) {
                // Remove task from system when id and extension's name is valid
                }
        } elseif (($taskId > 0) && (getCurrentExtensionName() != '')) {
                // Remove task from system when id and extension's name is valid


@@ -422,7 +422,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = false, $ignoreUpdate
        }
 
        // @TODO This redirect is still needed to register sql_patches! Please try to avoid it
        }
 
        // @TODO This redirect is still needed to register sql_patches! Please try to avoid it

-       if (($ret === true) && ($isDryRun === false) && ($ext_name == 'sql_patches') && (!isInstallationPhase())) {
+       if (($ret === TRUE) && ($isDryRun === FALSE) && ($ext_name == 'sql_patches') && (!isInstallationPhase())) {

                /*
                 * This is a really dirty hack to prevent an error about a missing
                 * configuration entry which should be there after registration of
                /*
                 * This is a really dirty hack to prevent an error about a missing
                 * configuration entry which should be there after registration of


@@ -442,7 +442,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
        // This shall never do a non-admin user but installation phase is okay
        if ((!isAdmin()) && (!isInstallationPhase())) {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_id=' . $ext_id. ',load_mode=' . $load_mode . ',isAdmin()=' . intval(isAdmin()) . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ' - ABORT!');
        // This shall never do a non-admin user but installation phase is okay
        if ((!isAdmin()) && (!isInstallationPhase())) {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_id=' . $ext_id. ',load_mode=' . $load_mode . ',isAdmin()=' . intval(isAdmin()) . ',isInstallationPhase()=' . intval(isInstallationPhase()) . ' - ABORT!');

-               return false;
+               return FALSE;

        } // END - if
 
        // Get extension's name
        } // END - if
 
        // Get extension's name


@@ -458,14 +458,14 @@ function doExtensionSqls ($ext_id, $load_mode) {
        } // END - if
 
        // Init array
        } // END - if
 
        // Init array

-       initExtensionSqls(true);
+       initExtensionSqls(TRUE);

 
        // By default no SQL has been executed
 
        // By default no SQL has been executed

-       $sqlRan = false;
+       $sqlRan = FALSE;

 
        // Load extension in detected mode
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName() . ',load_mode=' . $load_mode);
 
        // Load extension in detected mode
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName() . ',load_mode=' . $load_mode);

-       loadExtension(getCurrentExtensionName(), $load_mode, '0.0.0', false);
+       loadExtension(getCurrentExtensionName(), $load_mode, '0.0.0', FALSE);

 
        // Init these SQLs
        initSqls();
 
        // Init these SQLs
        initSqls();


@@ -484,7 +484,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
        runFilterChain('extension_' . $load_mode);
 
        // Remove cache file(s) if extension is active
        runFilterChain('extension_' . $load_mode);
 
        // Remove cache file(s) if extension is active

-       if (((isExtensionActive('cache')) && ((!SQL_HASZEROAFFECTED()) || ($sqlRan === true) || ($load_mode == 'activate') || ($load_mode == 'deactivate')))) {
+       if (((isExtensionActive('cache')) && ((!SQL_HASZEROAFFECTED()) || ($sqlRan === TRUE) || ($load_mode == 'activate') || ($load_mode == 'deactivate')))) {

                // Run filters
                runFilterChain('post_extension_run_sql', getCurrentExtensionName());
        } // END - if
                // Run filters
                runFilterChain('post_extension_run_sql', getCurrentExtensionName());
        } // END - if


@@ -508,7 +508,7 @@ function isExtensionInstalled ($ext_name) {
        } // END - if
 
        // By default non is installed
        } // END - if
 
        // By default non is installed

-       $isInstalled = false;
+       $isInstalled = FALSE;

 
        // Check if there is a cache entry
        if (isset($GLOBALS['ext_is_installed'][$ext_name])) {
 
        // Check if there is a cache entry
        if (isset($GLOBALS['ext_is_installed'][$ext_name])) {


@@ -518,7 +518,7 @@ function isExtensionInstalled ($ext_name) {
        } elseif (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
                // Found!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - FOUND!');
        } elseif (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
                // Found!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - FOUND!');

-               $isInstalled = true;
+               $isInstalled = TRUE;

 
                // Count cache hits
                incrementStatsEntry('cache_hits');
 
                // Count cache hits
                incrementStatsEntry('cache_hits');


@@ -536,9 +536,9 @@ function isExtensionInstalled ($ext_name) {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_id=' . $ext_id . ',isInstalled=' . intval($isInstalled));
 
                // Is it installed, then cache the entry
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_id=' . $ext_id . ',isInstalled=' . intval($isInstalled));
 
                // Is it installed, then cache the entry

-               if ($isInstalled === true) {
+               if ($isInstalled === TRUE) {

                        // Dummy call (get is okay here)
                        // Dummy call (get is okay here)

-                       getExtensionId($ext_name, true);
+                       getExtensionId($ext_name, TRUE);

                } // END - if
 
                // Remember the status
                } // END - if
 
                // Remember the status


@@ -555,14 +555,14 @@ function isExtensionActive ($ext_name) {
        if (isInstallationPhase()) {
                // Extensions are all inactive during installation
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extensions are always inactive while installation phase. ext_name=' . $ext_name);
        if (isInstallationPhase()) {
                // Extensions are all inactive during installation
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extensions are always inactive while installation phase. ext_name=' . $ext_name);

-               return false;
+               return FALSE;

        } elseif (empty($ext_name)) {
                // Empty extension names must befixed
                reportBug(__FUNCTION__, __LINE__, 'Empty extension name provided.');
        } elseif (!isExtensionInstalled($ext_name)) {
                // Not installed extensions are always inactive
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not installed extensions are always inactive. ext_name=' . $ext_name);
        } elseif (empty($ext_name)) {
                // Empty extension names must befixed
                reportBug(__FUNCTION__, __LINE__, 'Empty extension name provided.');
        } elseif (!isExtensionInstalled($ext_name)) {
                // Not installed extensions are always inactive
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not installed extensions are always inactive. ext_name=' . $ext_name);

-               return false;
+               return FALSE;

        }
 
        // Not active is the default
        }
 
        // Not active is the default


@@ -611,7 +611,7 @@ function isExtensionActive ($ext_name) {
 }
 
 // Get version from extensions
 }
 
 // Get version from extensions

-function getExtensionVersion ($ext_name, $force = false) {
+function getExtensionVersion ($ext_name, $force = FALSE) {

        // By default no extension is found
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ENTERED!');
        $data['ext_version'] = 'false';
        // By default no extension is found
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - ENTERED!');
        $data['ext_version'] = 'false';


@@ -660,7 +660,7 @@ function getExtensionVersion ($ext_name, $force = false) {
        }
 
        // Extension version should not be invalid
        }
 
        // Extension version should not be invalid

-       if (($data['ext_version'] == 'false') && ($force === false)) {
+       if (($data['ext_version'] == 'false') && ($force === FALSE)) {

                // Please report this trouble
                reportBug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> has empty version!", $ext_name));
        } // END - if
                // Please report this trouble
                reportBug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> has empty version!", $ext_name));
        } // END - if


@@ -671,7 +671,7 @@ function getExtensionVersion ($ext_name, $force = false) {
 }
 
 // Updates a given extension with current extension version to latest version
 }
 
 // Updates a given extension with current extension version to latest version

-function updateExtension ($ext_name, $ext_ver, $isDryRun = false, $ignoreDependencies = false) {
+function updateExtension ($ext_name, $ext_ver, $isDryRun = FALSE, $ignoreDependencies = FALSE) {

        // Only admins are allowed to update extensions
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_ver=' . $ext_ver . ',isDryRun=' . intval($isDryRun) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
        if ((!isAdmin()) || (empty($ext_name))) {
        // Only admins are allowed to update extensions
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_ver=' . $ext_ver . ',isDryRun=' . intval($isDryRun) . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
        if ((!isAdmin()) || (empty($ext_name))) {


@@ -683,11 +683,11 @@ function updateExtension ($ext_name, $ext_ver, $isDryRun = false, $ignoreDepende
        setCurrentExtensionName($ext_name);
 
        // Is this extension update already running?
        setCurrentExtensionName($ext_name);
 
        // Is this extension update already running?

-       if ((isExtensionUpdateRunning($ext_name, $ignoreDependencies)) && ($isDryRun === false)) {
+       if ((isExtensionUpdateRunning($ext_name, $ignoreDependencies)) && ($isDryRun === FALSE)) {

                // This is fine but needs logging ATM
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, all fine.');
                //* BUG: */ reportBug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, please investigate!');
                // This is fine but needs logging ATM
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, all fine.');
                //* BUG: */ reportBug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, please investigate!');

-               return true;
+               return TRUE;

        } // END - if
 
        // Init arrays
        } // END - if
 
        // Init arrays


@@ -734,12 +734,12 @@ function updateExtension ($ext_name, $ext_ver, $isDryRun = false, $ignoreDepende
                                                setCurrentExtensionName($ext_depend);
 
                                                // Mark it as already updated before we update it
                                                setCurrentExtensionName($ext_depend);
 
                                                // Mark it as already updated before we update it

-                                               $GLOBALS['ext_updated'][$ext_depend] = true;
+                                               $GLOBALS['ext_updated'][$ext_depend] = TRUE;

 
                                                // Is the extension there?
                                                if (isExtensionInstalled($ext_depend)) {
                                                        // Update another extension first!
 
                                                // Is the extension there?
                                                if (isExtensionInstalled($ext_depend)) {
                                                        // Update another extension first!

-                                                       $processResult = updateExtension($ext_depend, getExtensionVersion($ext_depend), isExtensionDryRun(), true);
+                                                       $processResult = updateExtension($ext_depend, getExtensionVersion($ext_depend), isExtensionDryRun(), TRUE);

                                                } else {
                                                        // Register new extension
                                                        $processResult = registerExtension($ext_depend, NULL, isExtensionDryRun());
                                                } else {
                                                        // Register new extension
                                                        $processResult = registerExtension($ext_depend, NULL, isExtensionDryRun());


@@ -759,7 +759,7 @@ function updateExtension ($ext_name, $ext_ver, $isDryRun = false, $ignoreDepende
                } // END - for
 
                // In real-mode execute any existing includes
                } // END - for
 
                // In real-mode execute any existing includes

-               if (isExtensionDryRun() === false) {
+               if (isExtensionDryRun() === FALSE) {

                        $GLOBALS['ext_inc_pool'][getCurrentExtensionName()] = getIncludePool('extension');
                        runFilterChain('load_includes', 'extension');
                        setIncludePool('extension', $GLOBALS['ext_inc_pool'][getCurrentExtensionName()]);
                        $GLOBALS['ext_inc_pool'][getCurrentExtensionName()] = getIncludePool('extension');
                        runFilterChain('load_includes', 'extension');
                        setIncludePool('extension', $GLOBALS['ext_inc_pool'][getCurrentExtensionName()]);


@@ -771,9 +771,9 @@ function updateExtension ($ext_name, $ext_ver, $isDryRun = false, $ignoreDepende
                setSqlsArray(getExtensionSqls());
 
                // Run SQLs
                setSqlsArray(getExtensionSqls());
 
                // Run SQLs

-               runFilterChain('run_sqls', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false));
+               runFilterChain('run_sqls', array('dry_run' => isExtensionDryRun(), 'enable_codes' => FALSE));

 
 

-               if (isExtensionDryRun() === false) {
+               if (isExtensionDryRun() === FALSE) {

                        // Run filters on success extension update
                        runFilterChain('extension_update', getCurrentExtensionName());
                } // END - if
                        // Run filters on success extension update
                        runFilterChain('extension_update', getCurrentExtensionName());
                } // END - if


@@ -815,7 +815,7 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA
                                                );
 
                                                // Load row template
                                                );
 
                                                // Load row template

-                                               $OUT .= loadTemplate('admin_extension_sql_row', true, $content);
+                                               $OUT .= loadTemplate('admin_extension_sql_row', TRUE, $content);

 
                                                // Count up
                                                $idx++;
 
                                                // Count up
                                                $idx++;


@@ -830,10 +830,10 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA
                        );
 
                        // Load main template
                        );
 
                        // Load main template

-                       $OUT = loadTemplate('admin_extension_sql_table', true, $content);
+                       $OUT = loadTemplate('admin_extension_sql_table', TRUE, $content);

                } else {
                        // No addional SQL commands to run
                } else {
                        // No addional SQL commands to run

-                       $OUT = displayMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}', true);
+                       $OUT = displayMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}', TRUE);

                }
        } // END - if
 
                }
        } // END - if
 


@@ -930,18 +930,18 @@ function isExtensionNameValid ($ext_name) {
 // Determines whether the given extension id is valid
 function isExtensionIdValid ($ext_id) {
        // Default is nothing valid
 // Determines whether the given extension id is valid
 function isExtensionIdValid ($ext_id) {
        // Default is nothing valid

-       $isValid = false;
+       $isValid = FALSE;

 
        // Check in cache then in database
        if (isset($GLOBALS['cache_array']['extension']['ext_name'][$ext_id])) {
                // Valid!
 
        // Check in cache then in database
        if (isset($GLOBALS['cache_array']['extension']['ext_name'][$ext_id])) {
                // Valid!

-               $isValid = true;
+               $isValid = TRUE;

 
                // Count cache hits
                incrementStatsEntry('cache_hits');
        } else {
                // Query database
 
                // Count cache hits
                incrementStatsEntry('cache_hits');
        } else {
                // Query database

-               $isValid = (countSumTotalData($ext_id, 'extensions', 'id', 'id', true) == 1);
+               $isValid = (countSumTotalData($ext_id, 'extensions', 'id', 'id', TRUE) == 1);

        }
 
        // Return result
        }
 
        // Return result


@@ -965,7 +965,7 @@ function doActivateExtension ($ext_name) {
 }
 
 // Deactivate given extension
 }
 
 // Deactivate given extension

-function doDeactivateExtension ($ext_name, $inRebuild = false) {
+function doDeactivateExtension ($ext_name, $inRebuild = FALSE) {

        // Is the extension installed?
        if (!isExtensionInstalled($ext_name)) {
                // Non-installed extensions cannot be activated
        // Is the extension installed?
        if (!isExtensionInstalled($ext_name)) {
                // Non-installed extensions cannot be activated


@@ -983,7 +983,7 @@ function doDeactivateExtension ($ext_name, $inRebuild = false) {
        createExtensionDeactivationTask($ext_name);
 
        // Do not rebuild cache if it is already been rebuild
        createExtensionDeactivationTask($ext_name);
 
        // Do not rebuild cache if it is already been rebuild

-       if ($inRebuild === false) {
+       if ($inRebuild === FALSE) {

                // Rebuild cache
                rebuildCache('extension', 'extension');
        } // END - if
                // Rebuild cache
                rebuildCache('extension', 'extension');
        } // END - if


@@ -1057,14 +1057,14 @@ function createNewExtensionTask ($ext_name) {
                // Load text for task if found
                if (isFileReadable($FQFN)) {
                        // Load extension's description template (but do not compile the code)
                // Load text for task if found
                if (isFileReadable($FQFN)) {
                        // Load extension's description template (but do not compile the code)

-                       $message = loadTemplate('ext_' . $ext_name, true, array(), false);
+                       $message = loadTemplate('ext_' . $ext_name, TRUE, array(), FALSE);

                } else {
                        // Write this in debug.log as well
                        logDebugMessage(__FUNCTION__, __LINE__, $message);
                }
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!
                } else {
                        // Write this in debug.log as well
                        logDebugMessage(__FUNCTION__, __LINE__, $message);
                }
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!

-               $taskId = createNewTask($subject, $message, 'EXTENSION', 0, getCurrentAdminId(), false);
+               $taskId = createNewTask($subject, $message, 'EXTENSION', 0, getCurrentAdminId(), FALSE);

        } // END - if
 
        // Return task id
        } // END - if
 
        // Return task id


@@ -1083,7 +1083,7 @@ function createExtensionDeactivationTask ($ext_name) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId[' . gettype($taskId) . ']=' . $taskId);
        if (((is_null($taskId)) || ($taskId == '0')) && (isExtensionInstalled($ext_name))) {
                // Task not created so add it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId[' . gettype($taskId) . ']=' . $taskId);
        if (((is_null($taskId)) || ($taskId == '0')) && (isExtensionInstalled($ext_name))) {
                // Task not created so add it

-               $taskId = createNewTask($subject, SQL_ESCAPE(loadTemplate('task_EXTENSION_deactivated', true, $ext_name)), 'EXTENSION_DEACTIVATION');
+               $taskId = createNewTask($subject, SQL_ESCAPE(loadTemplate('task_EXTENSION_deactivated', TRUE, $ext_name)), 'EXTENSION_DEACTIVATION');

        } // END - if
 
        // Return task id
        } // END - if
 
        // Return task id


@@ -1182,7 +1182,7 @@ function addExtensionNotes ($ext_ver) {
                }
 
                // Load template
                }
 
                // Load template

-               $out = loadTemplate('admin_extension_notes', true, $content);
+               $out = loadTemplate('admin_extension_notes', TRUE, $content);

        } // END - if
 
        // Add the notes
        } // END - if
 
        // Add the notes


@@ -1353,20 +1353,20 @@ function isExtensionUpdateDependenciesInitialized () {
 }
 
 // Checks whether an update is already running for given extension
 }
 
 // Checks whether an update is already running for given extension

-function isExtensionUpdateRunning ($ext_name, $ignoreDependencies = false) {
+function isExtensionUpdateRunning ($ext_name, $ignoreDependencies = FALSE) {

        // Current and given extensions means whole array
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
        if ($ext_name == getCurrentExtensionName()) {
                // Default is not found
        // Current and given extensions means whole array
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentExtension=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ',ignoreDependencies=' . intval($ignoreDependencies) . ' - ENTERED!');
        if ($ext_name == getCurrentExtensionName()) {
                // Default is not found

-               $isRunning = false;
+               $isRunning = FALSE;

 
                // Walk through whole array
                foreach ($GLOBALS['ext_running_updates'] as $ext1 => $depends) {
                        // Is it found?
 
                // Walk through whole array
                foreach ($GLOBALS['ext_running_updates'] as $ext1 => $depends) {
                        // Is it found?

-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',depends=' . print_r($depends, true));
-                       if (($ext1 == $ext_name) || ((in_array($ext_name, $depends)) && ($ignoreDependencies === false))) {
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',depends=' . print_r($depends, TRUE));
+                       if (($ext1 == $ext_name) || ((in_array($ext_name, $depends)) && ($ignoreDependencies === FALSE))) {

                                // Found
                                // Found

-                               $isRunning = true;
+                               $isRunning = TRUE;

                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=true - FOUND!');
                                break;
                        } // END - if
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=true - FOUND!');
                                break;
                        } // END - if


@@ -1421,7 +1421,7 @@ function removeExtensionDependency ($ext_name) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',key[' . gettype($key) . ']=' . $key);
 
        // Is it valid?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',key[' . gettype($key) . ']=' . $key);
 
        // Is it valid?

-       if ($key !== false) {
+       if ($key !== FALSE) {

                // Then remove it
                unset($GLOBALS['ext_update_depends'][getCurrentExtensionName()][$key]);
 
                // Then remove it
                unset($GLOBALS['ext_update_depends'][getCurrentExtensionName()][$key]);
 


@@ -1456,7 +1456,7 @@ function incrementExtensionUpdateIterator () {
 }
 
 // Setter for EXT_REPORTS_FAILURE flag
 }
 
 // Setter for EXT_REPORTS_FAILURE flag

-function enableExtensionReportingFailure ($reportsFailure = false) {
+function enableExtensionReportingFailure ($reportsFailure = FALSE) {

        $GLOBALS['ext_reports_failure'] = (bool) $reportsFailure;
 }
 
        $GLOBALS['ext_reports_failure'] = (bool) $reportsFailure;
 }
 


@@ -1504,9 +1504,9 @@ function isExtensionUpdateNoteSet ($ext_ver) {
 }
 
 // Init extension notice
 }
 
 // Init extension notice

-function initExtensionNotes ($force = false) {
+function initExtensionNotes ($force = FALSE) {

        // Is it already initialized?
        // Is it already initialized?

-       if (($force === false) && (isset($GLOBALS['ext_notes'][getCurrentExtensionName()]))) {
+       if (($force === FALSE) && (isset($GLOBALS['ext_notes'][getCurrentExtensionName()]))) {

                // This is mostly not wanted, so please report it
                reportBug(__FUNCTION__, __LINE__, 'ext_notes already set for extension ' . getCurrentExtensionName());
        } // END - if
                // This is mostly not wanted, so please report it
                reportBug(__FUNCTION__, __LINE__, 'ext_notes already set for extension ' . getCurrentExtensionName());
        } // END - if


@@ -1543,9 +1543,9 @@ function getCurrentExtensionName () {
 }
 
 // Init SQLs array for current extension
 }
 
 // Init SQLs array for current extension

-function initExtensionSqls ($force = false) {
+function initExtensionSqls ($force = FALSE) {

        // Auto-init the array or if forced
        // Auto-init the array or if forced

-       if (($force === true) || (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()]))) {
+       if (($force === TRUE) || (!isset($GLOBALS['ext_sqls'][getCurrentExtensionName()]))) {

                // Set the array
                $GLOBALS['ext_sqls'][getCurrentExtensionName()] = array();
 
                // Set the array
                $GLOBALS['ext_sqls'][getCurrentExtensionName()] = array();
 


@@ -1685,7 +1685,7 @@ function getExtensionMode () {
 }
 
 // Setter for dry-run
 }
 
 // Setter for dry-run

-function enableExtensionDryRun ($isDryRun = true) {
+function enableExtensionDryRun ($isDryRun = TRUE) {

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',isDryRun='.intval($isDryRun));
        $GLOBALS['ext_isDryRun'] = (bool) $isDryRun;
 }
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getCurrentExtensionName()='.getCurrentExtensionName().',isDryRun='.intval($isDryRun));
        $GLOBALS['ext_isDryRun'] = (bool) $isDryRun;
 }


@@ -1731,7 +1731,7 @@ function removeExtensionFromArray () {
                        $key = array_search($ext_name, $cacheArray);
 
                        // Is it there?
                        $key = array_search($ext_name, $cacheArray);
 
                        // Is it there?

-                       if ($key !== false) {
+                       if ($key !== FALSE) {

                                // Found, so remove it
                                unset($cacheArray[$key]);
                                $GLOBALS['cache_array']['extension'][$cacheName] = $cacheArray;
                                // Found, so remove it
                                unset($cacheArray[$key]);
                                $GLOBALS['cache_array']['extension'][$cacheName] = $cacheArray;


@@ -1864,7 +1864,7 @@ function addDropTableSql ($tableName) {
                addExtensionSql('DROP TABLE `{?_MYSQL_PREFIX?}_' . $tableName . '`');
 
                // Mark it as gone
                addExtensionSql('DROP TABLE `{?_MYSQL_PREFIX?}_' . $tableName . '`');
 
                // Mark it as gone

-               $GLOBALS['ifSqlTableExists'][$tableName] = false;
+               $GLOBALS['ifSqlTableExists'][$tableName] = FALSE;

        } // END - if
 }
 
        } // END - if
 }
 


@@ -1876,8 +1876,8 @@ function addRenameTableSql ($fromTable, $toTable) {
                addExtensionSql('RENAME TABLE `{?_MYSQL_PREFIX?}_' . $fromTable . '` TO `{?_MYSQL_PREFIX?}_' . $toTable . '`');
 
                // Mark both tables
                addExtensionSql('RENAME TABLE `{?_MYSQL_PREFIX?}_' . $fromTable . '` TO `{?_MYSQL_PREFIX?}_' . $toTable . '`');
 
                // Mark both tables

-               $GLOBALS['ifSqlTableExists'][$fromTable] = false;
-               $GLOBALS['ifSqlTableExists'][$toTable]   = true;
+               $GLOBALS['ifSqlTableExists'][$fromTable] = FALSE;
+               $GLOBALS['ifSqlTableExists'][$toTable]   = TRUE;

        } // END - if
 }
 
        } // END - if
 }
 


@@ -2051,7 +2051,7 @@ function registerExtensionPointsData ($subject, $columnName, $lockedMode, $payme
 
        // Is the 'subject' there?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ifSqlTableExists(points_data)=' . ifSqlTableExists('points_data') . ',getExtensionMode()=' . getExtensionMode() . ',add=' . $add);
 
        // Is the 'subject' there?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ifSqlTableExists(points_data)=' . ifSqlTableExists('points_data') . ',getExtensionMode()=' . getExtensionMode() . ',add=' . $add);

-       if (((!ifSqlTableExists('points_data')) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (countSumTotalData($subject, 'points_data', 'id', 'subject', true, $add) == 0)) {
+       if (((!ifSqlTableExists('points_data')) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (countSumTotalData($subject, 'points_data', 'id', 'subject', TRUE, $add) == 0)) {

                // Not found so:
                if ((isset($GLOBALS['previous_extension'][getCurrentExtensionName()])) && (!ifSqlTableExists('points_data'))) {
                        $dummy = $GLOBALS['previous_extension'][getCurrentExtensionName()];
                // Not found so:
                if ((isset($GLOBALS['previous_extension'][getCurrentExtensionName()])) && (!ifSqlTableExists('points_data'))) {
                        $dummy = $GLOBALS['previous_extension'][getCurrentExtensionName()];


@@ -2083,7 +2083,7 @@ function unregisterExtensionPointsData ($subject) {
        } // END - if
 
        // Is the 'subject' there?
        } // END - if
 
        // Is the 'subject' there?

-       if (countSumTotalData($subject, 'points_data', 'id', 'subject', true, $add) == 1) {
+       if (countSumTotalData($subject, 'points_data', 'id', 'subject', TRUE, $add) == 1) {

                // Found one or more, so add an SQL query
                addExtensionSql(sprintf("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s'" . $add . " LIMIT 1",
                        $subject
                // Found one or more, so add an SQL query
                addExtensionSql(sprintf("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s'" . $add . " LIMIT 1",
                        $subject


@@ -2094,7 +2094,7 @@ function unregisterExtensionPointsData ($subject) {
 // Enables/disables productive mode for current extension (used only while
 // registration).
 // @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
 // Enables/disables productive mode for current extension (used only while
 // registration).
 // @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'

-function enableExtensionProductive ($isProductive = true) {
+function enableExtensionProductive ($isProductive = TRUE) {

        // Log debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',isProductive=', intval($isProductive));
 
        // Log debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',isProductive=', intval($isProductive));
 


@@ -2121,7 +2121,7 @@ function isExtensionProductive ($ext_name = '') {
                } // END - if
 
                // Determine it
                } // END - if
 
                // Determine it

-               $GLOBALS[__FUNCTION__][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === true));
+               $GLOBALS[__FUNCTION__][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === TRUE));

        } // END - if
 
        // Return result
        } // END - if
 
        // Return result


@@ -2139,13 +2139,13 @@ function markExtensionAsLoaded ($ext_name) {
 
        // Mark it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_loaded=true');
 
        // Mark it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',ext_loaded=true');

-       $GLOBALS['ext_loaded']['ext_name'][$ext_name] = true;
+       $GLOBALS['ext_loaded']['ext_name'][$ext_name] = TRUE;

 }
 
 // Determine whether the given extension is already loaded
 function isExtensionLoaded ($ext_name) {
        // Is it there?
 }
 
 // Determine whether the given extension is already loaded
 function isExtensionLoaded ($ext_name) {
        // Is it there?

-       return ((isset($GLOBALS['ext_loaded']['ext_name'][$ext_name])) && ($GLOBALS['ext_loaded']['ext_name'][$ext_name] === true));
+       return ((isset($GLOBALS['ext_loaded']['ext_name'][$ext_name])) && ($GLOBALS['ext_loaded']['ext_name'][$ext_name] === TRUE));

 }
 
 // Mark extension's library file as loaded
 }
 
 // Mark extension's library file as loaded


@@ -2157,13 +2157,13 @@ function markExtensionLibraryAsLoaded ($ext_name) {
        } // END - if
 
        // Mark it
        } // END - if
 
        // Mark it

-       $GLOBALS['ext_loaded']['library'][$ext_name] = true;
+       $GLOBALS['ext_loaded']['library'][$ext_name] = TRUE;

 }
 
 // Determine whether the given extension's library is already loaded
 function isExtensionLibraryLoaded ($ext_name) {
        // Is it there?
 }
 
 // Determine whether the given extension's library is already loaded
 function isExtensionLibraryLoaded ($ext_name) {
        // Is it there?

-       return ((isset($GLOBALS['ext_loaded']['library'][$ext_name])) && ($GLOBALS['ext_loaded']['library'][$ext_name] === true));
+       return ((isset($GLOBALS['ext_loaded']['library'][$ext_name])) && ($GLOBALS['ext_loaded']['library'][$ext_name] === TRUE));

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/extensions/ext- b/inc/extensions/ext-
index 6626f11285b00cc34e827d48b429812f9ca6ff09..a0375d5f2fb520364f58aac1e7e35eb0977557e8 100644 (file)
--- a/inc/extensions/ext-
+++ b/inc/extensions/ext-
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php
index 6fda7310df2246fc5f96c6b7243b4d8de8fc78d3..340eeb4592e9cc319886605adebe8457d038b4d8 100644 (file)
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.php
@@ -58,7 +58,7 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_active'");
 
                // Unregister filter
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_active'");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'online_extra_links', 'ADD_LINK_ACTIVE_LIST', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'online_extra_links', 'ADD_LINK_ACTIVE_LIST', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -121,7 +121,7 @@ switch (getExtensionMode()) {
                                addExtensionDependency('online');
 
                                // Register filter
                                addExtensionDependency('online');
 
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'online_extra_links', 'ADD_LINK_ACTIVE_LIST', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'online_extra_links', 'ADD_LINK_ACTIVE_LIST', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter f&uuml;r den &quot;Wer ist Online&quot; Block hinzugef&uuml;gt und ist von <strong>online</strong> abh&auml;ngig.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter f&uuml;r den &quot;Wer ist Online&quot; Block hinzugef&uuml;gt und ist von <strong>online</strong> abh&auml;ngig.");

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index 44a223c773c46ad82dc9d01f23a6db47509ec30e..9f0e42a2606d47e8f7ac0c605559a95b8031f5b0 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -65,10 +65,10 @@ switch (getExtensionMode()) {
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` DROP `default_acl`");
 
                // Remove filters
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` DROP `default_acl`");
 
                // Remove filters

-               unregisterFilter(__FILE__, __LINE__, 'sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'do_admin_login_done', 'RESET_ADMINS_LOGIN_FAILURES', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'do_admin_login_pass', 'COUNT_ADMINS_LOGIN_FAILURE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'do_admin_login_done', 'REHASH_ADMINS_PASSWORD', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'do_admin_login_done', 'RESET_ADMINS_LOGIN_FAILURES', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'do_admin_login_pass', 'COUNT_ADMINS_LOGIN_FAILURE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'do_admin_login_done', 'REHASH_ADMINS_PASSWORD', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -295,7 +295,7 @@ INDEX (`admin_id`)",
                                addExtensionDependency('sql_patches');
 
                                // Add filters
                                addExtensionDependency('sql_patches');
 
                                // Add filters

-                               registerFilter(__FILE__, __LINE__, 'sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");


@@ -321,8 +321,8 @@ INDEX (`admin_id`)",
 
                        case '0.7.4': // SQL queries for v0.7.4
                                // Add filter
 
                        case '0.7.4': // SQL queries for v0.7.4
                                // Add filter

-                               registerFilter(__FILE__, __LINE__, 'do_admin_login_done', 'RESET_ADMINS_LOGIN_FAILURES', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'do_admin_login_pass', 'COUNT_ADMINS_LOGIN_FAILURE', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'do_admin_login_done', 'RESET_ADMINS_LOGIN_FAILURES', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'do_admin_login_pass', 'COUNT_ADMINS_LOGIN_FAILURE', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugefuegt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugefuegt.");


@@ -330,7 +330,7 @@ INDEX (`admin_id`)",
 
                        case '0.7.5': // SQL queries for v0.7.5
                                // Add filter
 
                        case '0.7.5': // SQL queries for v0.7.5
                                // Add filter

-                               registerFilter(__FILE__, __LINE__, 'do_admin_login_done', 'REHASH_ADMINS_PASSWORD', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'do_admin_login_done', 'REHASH_ADMINS_PASSWORD', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Rehashen des Adminpassworts nach erfolgtem Login hinzugef&uuml;gt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Rehashen des Adminpassworts nach erfolgtem Login hinzugef&uuml;gt.");

diff --git a/inc/extensions/ext-announcement.php b/inc/extensions/ext-announcement.php
index 154ccca50147e63974ee9cdc47cfcab53c8f43d9..c4274b44d0f5748490bc0172585556ed3a07ab06 100644 (file)
--- a/inc/extensions/ext-announcement.php
+++ b/inc/extensions/ext-announcement.php
@@ -48,7 +48,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-autoreg.php b/inc/extensions/ext-autoreg.php
index 13c36161b30d14b2fc963b6edcbe57a7d441b969..78c6292d3af1af3bb061349a54d1499d581d8d99 100644 (file)
--- a/inc/extensions/ext-autoreg.php
+++ b/inc/extensions/ext-autoreg.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php
index 7b1f349b2802bf02c59d73e9f540ece82956dacb..0d5779de92aa792d00869a3e3962e0cdc23adb81 100644 (file)
--- a/inc/extensions/ext-bank.php
+++ b/inc/extensions/ext-bank.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index da485c63bed134ff2e10657ac9326478a7ca642e..744a08408cda33731c25d1d9c96dd41a70f5517a 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -90,8 +90,8 @@ INDEX (`userid`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='beg' LIMIT 1");
 
                // Unregister filter
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='beg' LIMIT 1");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'BEG_RALLYE_USER_REGISTRATION_ADD_SQL_COLUMNS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'init', 'BEG_PURGE_IPS_NOTIFY_USER', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'BEG_RALLYE_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'init', 'BEG_PURGE_IPS_NOTIFY_USER', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -347,8 +347,8 @@ INDEX (`userid`)",
 
                        case '0.3.3': // SQL queries for v0.3.3
                                // Register a filter
 
                        case '0.3.3': // SQL queries for v0.3.3
                                // Register a filter

-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'BEG_RALLYE_USER_REGISTRATION_ADD_SQL_COLUMNS', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'init', 'BEG_PURGE_IPS_NOTIFY_USER', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'BEG_RALLYE_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'init', 'BEG_PURGE_IPS_NOTIFY_USER', FALSE, TRUE, isExtensionDryRun());

 
                                // This depends on ext-register
                                addExtensionDependency('register');
 
                                // This depends on ext-register
                                addExtensionDependency('register');

diff --git a/inc/extensions/ext-bitcoins.php b/inc/extensions/ext-bitcoins.php
index 0a32e0262e1a3c2644ec0983e9ea626bd89dfe3f..33e7ccb09de675d2b06c3c22188b3aaf6952e832 100644 (file)
--- a/inc/extensions/ext-bitcoins.php
+++ b/inc/extensions/ext-bitcoins.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index c2ff1730f82836dd52b68b3733fc4fc96afcd1fc..93f9f928094aa68061537dafb0e62737adeb1466 100644 (file)
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -92,11 +92,11 @@ INDEX (`cat_id`)",
                unregisterExtensionPointsData('monthly_bonus');
 
                // Unregister filter
                unregisterExtensionPointsData('monthly_bonus');
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'member_login_check', 'ADD_LOGIN_BONUS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'generate_admin_mail_links', 'GENERATE_BONUS_MAIL_LINKS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'add_bonus_points_user_columns', 'ADD_BONUS_POINTS_USER_COLUMNS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'BONUS_USER_REGISTRATION_ADD_SQL_COLUMNS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'init', 'SEND_BONUS_NOTIFICATIONS', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_login_check', 'ADD_LOGIN_BONUS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'generate_admin_mail_links', 'GENERATE_BONUS_MAIL_LINKS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'add_bonus_points_user_columns', 'ADD_BONUS_POINTS_USER_COLUMNS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'BONUS_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'init', 'SEND_BONUS_NOTIFICATIONS', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -565,7 +565,7 @@ ORDER BY
 
                        case '0.9.0': // SQL queries for v0.9.0
                                // Register filter
 
                        case '0.9.0': // SQL queries for v0.9.0
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'member_login_check', 'ADD_LOGIN_BONUS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'member_login_check', 'ADD_LOGIN_BONUS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes
                                setExtensionUpdateNotes("Filter hinzugefügt der den Login-Bonus aktualisiert (bzw. soll) (internes TODO).");
 
                                // Update notes
                                setExtensionUpdateNotes("Filter hinzugefügt der den Login-Bonus aktualisiert (bzw. soll) (internes TODO).");


@@ -608,7 +608,7 @@ ORDER BY
 
                        case '0.9.5': // SQL queries for v0.9.5
                                // Register filter
 
                        case '0.9.5': // SQL queries for v0.9.5
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'generate_admin_mail_links', 'GENERATE_BONUS_MAIL_LINKS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'generate_admin_mail_links', 'GENERATE_BONUS_MAIL_LINKS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes
                                setExtensionUpdateNotes("Filter zum Generieren von Admin-Links für Bonus-Mails hinzugefügt.");
 
                                // Update notes
                                setExtensionUpdateNotes("Filter zum Generieren von Admin-Links für Bonus-Mails hinzugefügt.");


@@ -633,7 +633,7 @@ ORDER BY
                                addConfigChangeSql('bonus_click_yn', 'include_bonus_click', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
 
                                // Register filter
                                addConfigChangeSql('bonus_click_yn', 'include_bonus_click', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
 
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'add_bonus_points_user_columns', 'ADD_BONUS_POINTS_USER_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'add_bonus_points_user_columns', 'ADD_BONUS_POINTS_USER_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Konfigurationseinträge umbenannt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Konfigurationseinträge umbenannt.");


@@ -641,7 +641,7 @@ ORDER BY
 
                        case '0.9.8': // SQL queries for v0.9.8
                                // Register filter
 
                        case '0.9.8': // SQL queries for v0.9.8
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'BONUS_USER_REGISTRATION_ADD_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'BONUS_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // Add dependency to ext-register
                                addExtensionDependency('register');
 
                                // Add dependency to ext-register
                                addExtensionDependency('register');


@@ -652,7 +652,7 @@ ORDER BY
 
                        case '0.9.9': // SQL queries for v0.9.9
                                // Register filter
 
                        case '0.9.9': // SQL queries for v0.9.9
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'init', 'SEND_BONUS_NOTIFICATIONS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'init', 'SEND_BONUS_NOTIFICATIONS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Hinzufügen von SQL-Spalten bei der Mitgliederanmeldung.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Hinzufügen von SQL-Spalten bei der Mitgliederanmeldung.");

diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php
index 6afac46583c56fc1e5c4143e1f462fee3e8c0cbd..827d4151bfcffea35a7e5f9a10c4650a5e5f07cf 100644 (file)
--- a/inc/extensions/ext-booking.php
+++ b/inc/extensions/ext-booking.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -77,9 +77,9 @@ INDEX (`userid`)",
                addMemberMenuSql('main', 'booking', '{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Kontoauszug', 5);
 
                // Add the filters
                addMemberMenuSql('main', 'booking', '{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Kontoauszug', 5);
 
                // Add the filters

-               registerFilter(__FILE__, __LINE__, 'post_add_points', 'ADD_BOOKING_RECORD', false, true, isExtensionDryRun());
-               registerFilter(__FILE__, __LINE__, 'post_sub_points', 'ADD_BOOKING_RECORD', false, true, isExtensionDryRun());
-               registerFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_BOOKING_MEMBER_ACTION', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_add_points', 'ADD_BOOKING_RECORD', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_sub_points', 'ADD_BOOKING_RECORD', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_BOOKING_MEMBER_ACTION', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                break;
 
        case 'remove': // Do stuff when removing extension


@@ -88,9 +88,9 @@ INDEX (`userid`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='booking'");
 
                // Remove the filters
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='booking'");
 
                // Remove the filters

-               unregisterFilter(__FILE__, __LINE__, 'post_add_points', 'ADD_BOOKING_RECORD', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_sub_points', 'ADD_BOOKING_RECORD', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_BOOKING_MEMBER_ACTION', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_add_points', 'ADD_BOOKING_RECORD', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_sub_points', 'ADD_BOOKING_RECORD', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_BOOKING_MEMBER_ACTION', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index 35010eed7abcebe1df2cf7fc4761964f93b24dfb..152d58cba2083dd27071643b149b6e7d5f5c4892 100644 (file)
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -60,15 +60,15 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what` IN('cache_stats','config_config')");
 
                // Unregister all filters
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what` IN('cache_stats','config_config')");
 
                // Unregister all filters

-               unregisterFilter(__FILE__, __LINE__, 'extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_form_submited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_form_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_form_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'extension_remove', 'CACHE_DESTROY_ALL', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'shutdown', 'CACHE_DESTROY_FILTER', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_form_submited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_form_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_form_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'extension_remove', 'CACHE_DESTROY_ALL', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'shutdown', 'CACHE_DESTROY_FILTER', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -193,14 +193,14 @@ switch (getExtensionMode()) {
 
                        case '0.2.1': // SQL queries for v0.2.1
                                // Register the new filter
 
                        case '0.2.1': // SQL queries for v0.2.1
                                // Register the new filter

-                               registerFilter(__FILE__, __LINE__, 'extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'post_form_submited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'post_form_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'post_form_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'extension_remove', 'CACHE_DESTROY_ALL', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_form_submited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_form_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_form_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'extension_remove', 'CACHE_DESTROY_ALL', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für Erweiterungsmanagement hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für Erweiterungsmanagement hinzugefügt.");


@@ -218,7 +218,7 @@ switch (getExtensionMode()) {
                                setExtensionUpdateNotes("Cachen von Filtern hinzugefügt.");
 
                                // Register a new filter
                                setExtensionUpdateNotes("Cachen von Filtern hinzugefügt.");
 
                                // Register a new filter

-                               registerFilter(__FILE__, __LINE__, 'shutdown', 'CACHE_DESTROY_FILTER', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'shutdown', 'CACHE_DESTROY_FILTER', FALSE, TRUE, isExtensionDryRun());

                                break;
 
                        case '0.2.4': // SQL queries for v0.2.4
                                break;
 
                        case '0.2.4': // SQL queries for v0.2.4

diff --git a/inc/extensions/ext-clickbanner.php b/inc/extensions/ext-clickbanner.php
index 3e21291bcd228b3080cc2fa1ddc912c4c4de357b..3cec8a7b285d0ad33ede044c730cd2bf945b6e29 100644 (file)
--- a/inc/extensions/ext-clickbanner.php
+++ b/inc/extensions/ext-clickbanner.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index cdf0382a34eeaaa643785eee699ff75ff08f743b..5e62d49da6326ac38ad2d756fa3bbd8145ee4227 100644 (file)
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -82,7 +82,7 @@ UNIQUE INDEX (`code`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='country'");
 
                // Unregister filter
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='country'");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -119,7 +119,7 @@ UNIQUE INDEX (`code`)",
 
                        case '0.0.5': // SQL queries for v0.0.5
                                // Register a filter
 
                        case '0.0.5': // SQL queries for v0.0.5
                                // Register a filter

-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // This depends on ext-register
                                addExtensionDependency('register');
 
                                // This depends on ext-register
                                addExtensionDependency('register');

diff --git a/inc/extensions/ext-coupon.php b/inc/extensions/ext-coupon.php
index 6d4428900195fe7dbb629fcc076a601cb047d05c..d1eac3651a2eaa5efe0d9c910afd5812b2292bb7 100644 (file)
--- a/inc/extensions/ext-coupon.php
+++ b/inc/extensions/ext-coupon.php
@@ -102,7 +102,7 @@ UNIQUE INDEX (`coupon_code`)",
                addMemberMenuSql('coupon', 'list_coupon', 'Eingelöste auflisten', 2);
 
                // Add filter (for changing user_points column dynamically
                addMemberMenuSql('coupon', 'list_coupon', 'Eingelöste auflisten', 2);
 
                // Add filter (for changing user_points column dynamically

-               registerFilter(__FILE__, __LINE__, 'determine_points_column_name', 'COUPON_CHANGE_POINTS_COLUMN_NAME', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'determine_points_column_name', 'COUPON_CHANGE_POINTS_COLUMN_NAME', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                break;
 
        case 'remove': // Do stuff when removing extension


@@ -116,8 +116,8 @@ UNIQUE INDEX (`coupon_code`)",
                unregisterExtensionPointsData('coupon_cashed');
 
                // Remove all filters
                unregisterExtensionPointsData('coupon_cashed');
 
                // Remove all filters

-               unregisterFilter(__FILE__, __LINE__, 'determine_points_column_name', 'COUPON_CHANGE_POINTS_COLUMN_NAME', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_cash_coupon', 'POST_CASH_COUPON', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'determine_points_column_name', 'COUPON_CHANGE_POINTS_COLUMN_NAME', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_cash_coupon', 'POST_CASH_COUPON', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -157,7 +157,7 @@ UNIQUE INDEX (`coupon_code`)",
                                break;
 
                        case '0.0.3': // SQL queries for v0.0.3
                                break;
 
                        case '0.0.3': // SQL queries for v0.0.3

-                               registerFilter(__FILE__, __LINE__, 'post_cash_coupon', 'POST_CASH_COUPON', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_cash_coupon', 'POST_CASH_COUPON', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes('Filter zum Post- und Pre-Filter hinzugefügt.');
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes('Filter zum Post- und Pre-Filter hinzugefügt.');

diff --git a/inc/extensions/ext-cprping.php b/inc/extensions/ext-cprping.php
index 6d42efc5ed56cca132cc8a72a099d07354d81cb7..a6f0771ced323d7bd182507972152c2c3f440070 100644 (file)
--- a/inc/extensions/ext-cprping.php
+++ b/inc/extensions/ext-cprping.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-currency.php b/inc/extensions/ext-currency.php
index f79d750a1cccf3ea677c7198f2728212a7316752..23d34dd0ee8615f92e2f91b9239abcde8b3599bd 100644 (file)
--- a/inc/extensions/ext-currency.php
+++ b/inc/extensions/ext-currency.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php
index 2e080a7c99b60f70e1a869ba8c2c92d58f781eb1..13201425dea85e97c41ed072a382d8be98bc7932 100644 (file)
--- a/inc/extensions/ext-debug.php
+++ b/inc/extensions/ext-debug.php
@@ -50,7 +50,7 @@ setExtensionVersionHistory(array('0.0.0'));
 setExtensionAlwaysActive('Y');
 
 // This extension is in development (non-productive)
 setExtensionAlwaysActive('Y');
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-demo.php b/inc/extensions/ext-demo.php
index c24c9e66d088859bd10db482171ea79c68e0b782..33fec7e5bbff9c91f42020a209f465140c0046d0 100644 (file)
--- a/inc/extensions/ext-demo.php
+++ b/inc/extensions/ext-demo.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.1');
 setExtensionVersionHistory(array('0.0.0', '0.0.1'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0', '0.0.1'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-earning.php b/inc/extensions/ext-earning.php
index b9974d7648d0c486e8228a51067e71a38f82d4ae..ac8a212f57e2f08fea7e3d113711ffd7184b4f3f 100644 (file)
--- a/inc/extensions/ext-earning.php
+++ b/inc/extensions/ext-earning.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -86,7 +86,7 @@ INDEX (`earning_userid`)",
                        'User->Earning connections');
 
                // Register filter
                        'User->Earning connections');
 
                // Register filter

-               registerFilter(__FILE__, __LINE__, 'member_footer_extras', 'ADD_EARNING_GROUP_POPUP', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'member_footer_extras', 'ADD_EARNING_GROUP_POPUP', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                break;
 
        case 'remove': // Do stuff when removing extension


@@ -99,7 +99,7 @@ INDEX (`earning_userid`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='list_earning' LIMIT 1");
 
                // Unregister filter
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='list_earning' LIMIT 1");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'member_footer_extras', 'ADD_EARNING_GROUP_POPUP', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_footer_extras', 'ADD_EARNING_GROUP_POPUP', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-events.php b/inc/extensions/ext-events.php
index 0e6559b7299998e5bbced4ced31cab99ee7b88b8..7b2877aa0895dceabb8c78ecff9d58e214e01e7f 100644 (file)
--- a/inc/extensions/ext-events.php
+++ b/inc/extensions/ext-events.php
@@ -48,7 +48,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php
index 18b79dfd7d993e68e5b2d40588f9e5195994aed4..b517e042591ddc3d6817a11a6e7d9a80ce214097 100644 (file)
--- a/inc/extensions/ext-forced.php
+++ b/inc/extensions/ext-forced.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -140,10 +140,10 @@ INDEX (`forced_stats_userid`)",
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_earning_data` (`earning_group`, `earning_provider`, `earning_sorting`) VALUES ('POPUP','FORCED_POPUP',1)");
 
                // Register filters
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_earning_data` (`earning_group`, `earning_provider`, `earning_sorting`) VALUES ('POPUP','FORCED_POPUP',1)");
 
                // Register filters

-               registerFilter(__FILE__, __LINE__, 'add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', false, true, isExtensionDryRun());
-               registerFilter(__FILE__, __LINE__, 'member_earning_table_data', 'FORCED_POPUP_TABLE_DATA', false, true, isExtensionDryRun());
-               registerFilter(__FILE__, __LINE__, 'post_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_STATUS', false, true, isExtensionDryRun());
-               registerFilter(__FILE__, __LINE__, 'pre_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_VALIDATE_DATA', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'member_earning_table_data', 'FORCED_POPUP_TABLE_DATA', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_STATUS', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'pre_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_VALIDATE_DATA', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                break;
 
        case 'remove': // Do stuff when removing extension


@@ -164,10 +164,10 @@ INDEX (`forced_stats_userid`)",
                } // END - if
 
                // Remove filter
                } // END - if
 
                // Remove filter

-               unregisterFilter(__FILE__, __LINE__, 'add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'member_earning_table_data', 'FORCED_POPUP_TABLE_DATA', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_STATUS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'pre_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_VALIDATE_DATA', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_earning_table_data', 'FORCED_POPUP_TABLE_DATA', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_STATUS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_change_forced_campaign_status', 'FORCED_CHANGE_CAMPAIGN_VALIDATE_DATA', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-geoip.php b/inc/extensions/ext-geoip.php
index 75cfe18b9c15a162cb73a07d7ebbbe03680c7a38..00192560cf058b91e59db4e443d70b4fb2e69b8d 100644 (file)
--- a/inc/extensions/ext-geoip.php
+++ b/inc/extensions/ext-geoip.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-grade.php b/inc/extensions/ext-grade.php
index 4f2c430f2be7fff37547aac32cd051b1fc7e0b90..f2a46c62eef7952c775e9d6a72ef8f18f39f67d7 100644 (file)
--- a/inc/extensions/ext-grade.php
+++ b/inc/extensions/ext-grade.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-imprint.php b/inc/extensions/ext-imprint.php
index af8ad211a5c76c1541c697597e004fd867fa91cf..f2f8bf5acfbd623f7399323c011345e218a74622 100644 (file)
--- a/inc/extensions/ext-imprint.php
+++ b/inc/extensions/ext-imprint.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-jackpot.php b/inc/extensions/ext-jackpot.php
index 74beef759f8cecbcabfca70e85d87d9197c7981d..29411f4a74f2f767d9cededfd31f2c6834dfaf1e 100644 (file)
--- a/inc/extensions/ext-jackpot.php
+++ b/inc/extensions/ext-jackpot.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-lead.php b/inc/extensions/ext-lead.php
index ad2186adee0995803f150fae67de9cec9c3cc487..1a97a226000f697ab90a722b8b603ebb455698ee 100644 (file)
--- a/inc/extensions/ext-lead.php
+++ b/inc/extensions/ext-lead.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index 6c7cbd8405bce1cd366bd4f268bba5ae6b64a7c5..64c71107e6113ebdec379df37854d3a459048972 100644 (file)
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -55,8 +55,8 @@ switch (getExtensionMode()) {
                addExtensionSql('');
 
                // Add the filters
                addExtensionSql('');
 
                // Add the filters

-               registerFilter(__FILE__, __LINE__, 'post_add_points', 'UPDATE_MEDIADATA_ENTRY', false, true, isExtensionDryRun());
-               registerFilter(__FILE__, __LINE__, 'post_sub_points', 'UPDATE_MEDIADATA_ENTRY', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_add_points', 'UPDATE_MEDIADATA_ENTRY', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_sub_points', 'UPDATE_MEDIADATA_ENTRY', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                break;
 
        case 'remove': // Do stuff when removing extension


@@ -66,8 +66,8 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='mediadata'");
 
                // Remove the filters
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='mediadata'");
 
                // Remove the filters

-               unregisterFilter(__FILE__, __LINE__, 'post_add_points', 'UPDATE_MEDIADATA_ENTRY', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_sub_points', 'UPDATE_MEDIADATA_ENTRY', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_add_points', 'UPDATE_MEDIADATA_ENTRY', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_sub_points', 'UPDATE_MEDIADATA_ENTRY', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 8a38c4f69eca448c49c2be9a7213f21ec5231e81..1056cb5859b80b580208eb26e720678b1315f403 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -76,7 +76,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index ba672dd7957aae2feefa1c3956fab7a44d5d5444..f262a5889a4975b01afe5da2644473741e05c015 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.2.0');
 setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.2.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.2.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index 9113646dfa60950bfa819eadca6a6a62ce855bcb..6cfe876588ff05787c0388b861c64abf28b8a92a 100644 (file)
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -79,7 +79,7 @@ INDEX `admin_member` (`is_admin`, `is_member`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='online'");
 
                // Unregister filter
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='online'");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'init', 'UPDATE_ONLINE_LIST', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'init', 'UPDATE_ONLINE_LIST', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -119,7 +119,7 @@ INDEX `admin_member` (`is_admin`, `is_member`)",
                                addGuestMenuSql('online', NULL, 'Jetzt Online', 2);
 
                                // Register filter
                                addGuestMenuSql('online', NULL, 'Jetzt Online', 2);
 
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'init', 'UPDATE_ONLINE_LIST', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'init', 'UPDATE_ONLINE_LIST', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Hinzufügen des Menüpunktes "Jetzt Online" wird nun von dieser Erweiterung erledigt. Filter hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Hinzufügen des Menüpunktes "Jetzt Online" wird nun von dieser Erweiterung erledigt. Filter hinzugefügt.");

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index 4c6757f7e415f5243b44ae6a854df9d7e2cc1b20..3c24781bb3e45252598710c58401e6de49f86f1c 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -59,12 +59,12 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='order'");
 
                // Remove these filters
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='order'");
 
                // Remove these filters

-               unregisterFilter(__FILE__, __LINE__, 'get_total_points', 'ORDER_POINTS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'get_own_points', 'ORDER_POINTS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_ORDER_POINTS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_ORDER_POINTS_COLUMN_NAMES', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'ORDER_ZIP_CODE_SQL', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'locked_points_columns_array', 'ORDER_POINTS_COLUMNS', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_total_points', 'ORDER_POINTS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_own_points', 'ORDER_POINTS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_ORDER_POINTS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_ORDER_POINTS_COLUMN_NAMES', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'ORDER_ZIP_CODE_SQL', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'locked_points_columns_array', 'ORDER_POINTS_COLUMNS', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -342,8 +342,8 @@ INDEX (`pool_id`)",
                                addExtensionDependency('user');
 
                                // Register filters for gathering points
                                addExtensionDependency('user');
 
                                // Register filters for gathering points

-                               registerFilter(__FILE__, __LINE__, 'get_total_points', 'ORDER_POINTS', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'get_own_points', 'ORDER_POINTS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_total_points', 'ORDER_POINTS', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_own_points', 'ORDER_POINTS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteres Verwendungszwecke "Werbeguthaben" hinzugefügt (verschoben von ext-user) und neue Filter zum Zurückliefern des Werbeguthabens hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteres Verwendungszwecke "Werbeguthaben" hinzugefügt (verschoben von ext-user) und neue Filter zum Zurückliefern des Werbeguthabens hinzugefügt.");


@@ -351,10 +351,10 @@ INDEX (`pool_id`)",
 
                        case '0.5.4': // SQL queries for v0.5.4
                                // Register filter for handling locked points
 
                        case '0.5.4': // SQL queries for v0.5.4
                                // Register filter for handling locked points

-                               registerFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_ORDER_POINTS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_ORDER_POINTS', FALSE, TRUE, isExtensionDryRun());

 
                                // Register filter for all column names
 
                                // Register filter for all column names

-                               registerFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_ORDER_POINTS_COLUMN_NAMES', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_ORDER_POINTS_COLUMN_NAMES', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für gesperrtes Werbeguthaben hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für gesperrtes Werbeguthaben hinzugefügt.");


@@ -362,7 +362,7 @@ INDEX (`pool_id`)",
 
                        case '0.5.5': // SQL queries for v0.5.5
                                // Register filter
 
                        case '0.5.5': // SQL queries for v0.5.5
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'ORDER_ZIP_CODE_SQL', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'ORDER_ZIP_CODE_SQL', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für gesperrtes Werbeguthaben hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für gesperrtes Werbeguthaben hinzugefügt.");


@@ -370,7 +370,7 @@ INDEX (`pool_id`)",
 
                        case '0.5.6': // SQL queries for v0.5.6
                                // Register filter
 
                        case '0.5.6': // SQL queries for v0.5.6
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'locked_points_columns_array', 'ORDER_POINTS_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'locked_points_columns_array', 'ORDER_POINTS_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für Spaltenname des gesperrten Werbeguthabens hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für Spaltenname des gesperrten Werbeguthabens hinzugefügt.");

diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index 83a90646a07c5aef9c16f7eab0c8c1a39f4057ac..4e6a3faf36efb1059aef87478a742d26474a92fb 100644 (file)
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -60,7 +60,7 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_other'");
 
                // Unregister filter
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_other'");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_DEBUG_SQL', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_DEBUG_SQL', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -215,7 +215,7 @@ switch (getExtensionMode()) {
 
                        case '0.2.4': // SQL queries for v0.2.4
                                // Register filter
 
                        case '0.2.4': // SQL queries for v0.2.4
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_DEBUG_SQL', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_DEBUG_SQL', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Anzeigen (Debug) von ausgeführten SQL-Anweisungen hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Anzeigen (Debug) von ausgeführten SQL-Anweisungen hinzugefügt.");

diff --git a/inc/extensions/ext-partner.php b/inc/extensions/ext-partner.php
index d7d2e68ba02ae33f789ea6a996b7c271edd97c98..7eb2cdbc44e4f2aa36cad80de89c31954ccaa3af 100644 (file)
--- a/inc/extensions/ext-partner.php
+++ b/inc/extensions/ext-partner.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-politician-stop.php b/inc/extensions/ext-politician-stop.php
index 407b0aa6d1f7b95add48433518e8161aaddd8404..5809ed4ae39b711ca7cba80609d3f119906ff7e1 100644 (file)
--- a/inc/extensions/ext-politician-stop.php
+++ b/inc/extensions/ext-politician-stop.php
@@ -53,12 +53,12 @@ switch (getExtensionMode()) {
                addAdminMenuSql('config','config_politician_stop','Politiker-Stopp-Aktion','Einstellungen zur Satire-Aktion "Politiker-Stopp - Jetzt wird zurück zensiert."', 7);
 
                // Register filter
                addAdminMenuSql('config','config_politician_stop','Politiker-Stopp-Aktion','Einstellungen zur Satire-Aktion "Politiker-Stopp - Jetzt wird zurück zensiert."', 7);
 
                // Register filter

-               registerFilter(__FILE__, __LINE__, 'outside_masterbox', 'DISPLAY_POLITICIAN_STOP_SNIPPET', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'outside_masterbox', 'DISPLAY_POLITICIAN_STOP_SNIPPET', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                // Unregister filter
                break;
 
        case 'remove': // Do stuff when removing extension
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'outside_masterbox', 'DISPLAY_POLITICIAN_STOP_SNIPPET', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'outside_masterbox', 'DISPLAY_POLITICIAN_STOP_SNIPPET', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 967cdeb52a8e789dafcf209855b2a26115c58f69..852ac1de842b2367a7166de70facaeb409796d6c 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -117,9 +117,9 @@ INDEX (`userid`)",
                unregisterExtensionPointsData('rallye_winner');
 
                // Unregister filter
                unregisterExtensionPointsData('rallye_winner');
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'init', 'RALLYE_NOTIFY_USERS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'add_rallye_notify_sqls', 'ADD_RALLYE_SQL_COLUMNS', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'init', 'RALLYE_NOTIFY_USERS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'add_rallye_notify_sqls', 'ADD_RALLYE_SQL_COLUMNS', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -317,7 +317,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                addExtensionDependency('sql_patches');
 
                                // Register filter
                                addExtensionDependency('sql_patches');
 
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");


@@ -336,8 +336,8 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 
                        case '0.3.7': // SQL queries for v0.3.7
                                // Register filter
 
                        case '0.3.7': // SQL queries for v0.3.7
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'init', 'RALLYE_NOTIFY_USERS', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'add_rallye_notify_sqls', 'ADD_RALLYE_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'init', 'RALLYE_NOTIFY_USERS', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'add_rallye_notify_sqls', 'ADD_RALLYE_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes
                                setExtensionUpdateNotes("Weitere Filter hinzugef&uuml;gt.");
 
                                // Update notes
                                setExtensionUpdateNotes("Weitere Filter hinzugef&uuml;gt.");

diff --git a/inc/extensions/ext-refsell.php b/inc/extensions/ext-refsell.php
index 1addee44ef324782013585ea05c27260ad8083c7..a43c2050808956e97eceade1f37223dc384a159b 100644 (file)
--- a/inc/extensions/ext-refsell.php
+++ b/inc/extensions/ext-refsell.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index 4f61667a6b2f3951da4c5b0178eb73fb4cb1a911..85bfcb4632b30d77e5a760f6b03d43fa5e4fcb45 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -64,8 +64,8 @@ switch (getExtensionMode()) {
                unregisterExtensionPointsData('referral_bonus_ref');
 
                // Unregister filter
                unregisterExtensionPointsData('referral_bonus_ref');
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'register_must_fillout', 'REGISTER_MUST_FILLOUT', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'PRE_USER_REGISTRATION_GENERIC', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'register_must_fillout', 'REGISTER_MUST_FILLOUT', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'PRE_USER_REGISTRATION_GENERIC', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -321,7 +321,7 @@ PRIMARY KEY (`id`)",
 
                        case '0.5.3': // SQL queries for v0.5.3
                                // Register a filter
 
                        case '0.5.3': // SQL queries for v0.5.3
                                // Register a filter

-                               registerFilter(__FILE__, __LINE__, 'register_must_fillout', 'REGISTER_MUST_FILLOUT', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'register_must_fillout', 'REGISTER_MUST_FILLOUT', FALSE, TRUE, isExtensionDryRun());

 
                                // Run these SQLs
                                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('gender','Y')");
 
                                // Run these SQLs
                                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('gender','Y')");


@@ -360,7 +360,7 @@ PRIMARY KEY (`id`)",
 
                        case '0.5.7': // SQL queries for v0.5.7
                                // Register a filter
 
                        case '0.5.7': // SQL queries for v0.5.7
                                // Register a filter

-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'PRE_USER_REGISTRATION_GENERIC', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'PRE_USER_REGISTRATION_GENERIC', FALSE, TRUE, isExtensionDryRun());

 
                                // Register points data
                                registerExtensionPointsData('referral_bonus', 'points', 'LOCKED', 'DIRECT');
 
                                // Register points data
                                registerExtensionPointsData('referral_bonus', 'points', 'LOCKED', 'DIRECT');

diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php
index 01d29159dfbe2edabb19558ec3c9b4d144d55283..f258946227056a92a5538f004733509143607d96 100644 (file)
--- a/inc/extensions/ext-removeip.php
+++ b/inc/extensions/ext-removeip.php
@@ -66,7 +66,7 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_removeip' LIMIT 1");
 
                // Remove filters
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_removeip' LIMIT 1");
 
                // Remove filters

-               unregisterFilter(__FILE__, __LINE__, 'post_youhere_line', 'ADD_ANONYMITY_NOTICE', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_youhere_line', 'ADD_ANONYMITY_NOTICE', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -84,7 +84,7 @@ switch (getExtensionMode()) {
                                addExtensionDependency('sql_patches');
 
                                // Add filters
                                addExtensionDependency('sql_patches');
 
                                // Add filters

-                               registerFilter(__FILE__, __LINE__, 'post_youhere_line', 'ADD_ANONYMITY_NOTICE', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_youhere_line', 'ADD_ANONYMITY_NOTICE', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");

diff --git a/inc/extensions/ext-report.php b/inc/extensions/ext-report.php
index a835dc0b5f371f0a7c12b90d94d8a2d3be18206f..c1eb6d598f05a8ad2a24d7e08fa7dedb547eae25 100644 (file)
--- a/inc/extensions/ext-report.php
+++ b/inc/extensions/ext-report.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index b783e4cf9ea0f4f939d74172c8396ce3b348cb7a..f4cbf23d6bcc3dc967bc7c107ac23042634990d0 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -53,7 +53,7 @@ switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {
        case 'register': // Do stuff when installation is running
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {

-                       enableExtensionReportingFailure(true);
+                       enableExtensionReportingFailure(TRUE);

                        addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                } // END - if
 
                        addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                } // END - if
 


@@ -70,7 +70,7 @@ switch (getExtensionMode()) {
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);

-                       enableExtensionReportingFailure(true);
+                       enableExtensionReportingFailure(TRUE);

                        addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
         } // END - if
 
                        addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
         } // END - if
 


@@ -148,7 +148,7 @@ switch (getExtensionMode()) {
                        case '0.1.3':
                                // Check if mod_rewrite is loadeded
                                if (!isApacheModuleLoaded('mod_rewrite')) {
                        case '0.1.3':
                                // Check if mod_rewrite is loadeded
                                if (!isApacheModuleLoaded('mod_rewrite')) {

-                                       enableExtensionReportingFailure(true);
+                                       enableExtensionReportingFailure(TRUE);

                                        //addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                                } // END - if
                                setExtensionUpdateNotes("Es wird beim Registrieren und aktivieren geprüft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.");
                                        //addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                                } // END - if
                                setExtensionUpdateNotes("Es wird beim Registrieren und aktivieren geprüft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.");


@@ -165,7 +165,7 @@ switch (getExtensionMode()) {
        case 'init': // Do stuff when extension is initialized
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {
        case 'init': // Do stuff when extension is initialized
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {

-                       enableExtensionReportingFailure(true);
+                       enableExtensionReportingFailure(TRUE);

                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
                        if (!isAdmin()) {
                                addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
                        if (!isAdmin()) {
                                addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');

diff --git a/inc/extensions/ext-safe.php b/inc/extensions/ext-safe.php
index 057f758564dc9322c5bc27988468bbd3c48906fb..4b4a0e51b72b7f03936ae92334b728acee5ca0d8 100644 (file)
--- a/inc/extensions/ext-safe.php
+++ b/inc/extensions/ext-safe.php
@@ -48,7 +48,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-seo.php b/inc/extensions/ext-seo.php
index cc70660e54356f8a88d66309812d7673a6778fc4..ce98b5f7bdd7f38eda7bd3676750d3cf8e5ce1d5 100644 (file)
--- a/inc/extensions/ext-seo.php
+++ b/inc/extensions/ext-seo.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-shredder.php b/inc/extensions/ext-shredder.php
index 56d867e52bf8f7d0d7c19926e7d2ff84d1fb762d..276e507f1271c20d3f19bd6f5340b8c550dc8e12 100644 (file)
--- a/inc/extensions/ext-shredder.php
+++ b/inc/extensions/ext-shredder.php
@@ -49,7 +49,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installtion is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installtion is running

diff --git a/inc/extensions/ext-signup.php b/inc/extensions/ext-signup.php
index 9595313c583f725eeb267d044c061760ba7bf5d4..cb07afe6803e4e4eee3b17029b8ba0b6a62f7c8e 100644 (file)
--- a/inc/extensions/ext-signup.php
+++ b/inc/extensions/ext-signup.php
@@ -49,7 +49,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installtion is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installtion is running

diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index 697a546daebeceeabcee4f0e221764964e871802..7184d636a4e097fac59259f5969f113fe218bfc3 100644 (file)
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 828f4c43df27fa7b616bcf075d26f217059b3460..34dd773e49b78424ed4d7ad6274a6d977092f817 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -104,9 +104,9 @@ IN (
                unregisterExtensionPointsData('admin_add_all_ref');
 
                // Unregister filter
                unregisterExtensionPointsData('admin_add_all_ref');
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'member_login_check', 'RESET_USER_LOGIN_FAILURE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'add_history_entry', 'ADD_HISTORY_ENTRY', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'init', 'GENERATE_FILE_SECRET_HASH', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_login_check', 'RESET_USER_LOGIN_FAILURE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'add_history_entry', 'ADD_HISTORY_ENTRY', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'init', 'GENERATE_FILE_SECRET_HASH', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -717,7 +717,7 @@ UNIQUE INDEX `name_function` (`filter_name`, `filter_function`)",
 
                        case '0.6.9': // SQL queries for 0.6.9
                                // Register filter
 
                        case '0.6.9': // SQL queries for 0.6.9
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'member_login_check', 'RESET_USER_LOGIN_FAILURE', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'member_login_check', 'RESET_USER_LOGIN_FAILURE', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Zurücksetzens des fehlgeschlagenen Mitgliederlogins hinzugefügt (internes TODO).");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Zurücksetzens des fehlgeschlagenen Mitgliederlogins hinzugefügt (internes TODO).");


@@ -738,7 +738,7 @@ INDEX (`ip`)",
                                addConfigAddSql('dns_cache_timeout', 'BIGINT(20) NOT NULL DEFAULT ' . (60*60*24));
 
                                // Register filter
                                addConfigAddSql('dns_cache_timeout', 'BIGINT(20) NOT NULL DEFAULT ' . (60*60*24));
 
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'reset', 'CLEANUP_DNS_CACHE', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'reset', 'CLEANUP_DNS_CACHE', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("IP-Resolver-Klasse hinzugefügt, um bei der Erweiterung ext-network DNS-Anfragen einzusparen.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("IP-Resolver-Klasse hinzugefügt, um bei der Erweiterung ext-network DNS-Anfragen einzusparen.");


@@ -875,7 +875,7 @@ INDEX (`history_last_used` DESC)",
                                        'History of used data');
 
                                // Register filter
                                        'History of used data');
 
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'add_history_entry', 'ADD_HISTORY_ENTRY', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'add_history_entry', 'ADD_HISTORY_ENTRY', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Allgemeine Historie-Tabelle hinzugefügt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Allgemeine Historie-Tabelle hinzugefügt.");


@@ -921,7 +921,7 @@ INDEX (`history_last_used` DESC)",
 
                        case '0.9.0': // SQL queries for v0.9.0
                                // Register filter
 
                        case '0.9.0': // SQL queries for v0.9.0
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'init', 'GENERATE_FILE_SECRET_HASH', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'init', 'GENERATE_FILE_SECRET_HASH', FALSE, TRUE, isExtensionDryRun());

 
                                // Register points data
                                registerExtensionPointsData('admin_add_single', 'points', 'LOCKED', 'DIRECT');
 
                                // Register points data
                                registerExtensionPointsData('admin_add_single', 'points', 'LOCKED', 'DIRECT');

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index bcba549557aeda4702e54b3be4e5b80ac7c9ae97..31e5299cdc499b2cae77dd78878dfa4cde94436f 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -203,8 +203,8 @@ UNIQUE INDEX `status_action` (`actions_status`, `actions_action`)",
                addExtensionDependency('sql_patches');
 
                // Register filters
                addExtensionDependency('sql_patches');
 
                // Register filters

-               registerFilter(__FILE__, __LINE__, 'post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', false, true, isExtensionDryRun());
-               registerFilter(__FILE__, __LINE__, 'pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                break;
 
        case 'remove': // Do stuff when removing extension


@@ -224,8 +224,8 @@ UNIQUE INDEX `status_action` (`actions_status`, `actions_action`)",
                unregisterExtensionPointsData('monthly_surfbar');
 
                // Unregister filter
                unregisterExtensionPointsData('monthly_surfbar');
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-teams.php b/inc/extensions/ext-teams.php
index 57c7433f8657e005244020660fb85b735682c425..91aedfa99e482c730501903fcf66bd1656286ee9 100644 (file)
--- a/inc/extensions/ext-teams.php
+++ b/inc/extensions/ext-teams.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-terms.php b/inc/extensions/ext-terms.php
index a05a88903148fcad56b5deb447715dcc48c4c1a9..16bccda7ae51865e649df46d8a32b2f5dd10a038 100644 (file)
--- a/inc/extensions/ext-terms.php
+++ b/inc/extensions/ext-terms.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php
index 2df24a983b5b7324a989a58eaac33c6866cbc18b..5d8c6743e77fb97ba347e70f180b0503563f6ca8 100644 (file)
--- a/inc/extensions/ext-theme.php
+++ b/inc/extensions/ext-theme.php
@@ -65,9 +65,9 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='themes' OR `what`='themes'");
 
                // Unregister filters
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='themes' OR `what`='themes'");
 
                // Unregister filters

-               unregisterFilter(__FILE__, __LINE__, 'init', 'HANDLE_THEME_CHANGE', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'member_login_check', 'SET_USERS_THEME', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'THEME_USER_REGISTRATION_ADD_SQL_COLUMNS', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'init', 'HANDLE_THEME_CHANGE', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_login_check', 'SET_USERS_THEME', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'THEME_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -163,7 +163,7 @@ INDEX (`theme_active`)", 'Themes');
 
                        case '0.1.0': // SQL queries for v0.1.0
                                // Register filter
 
                        case '0.1.0': // SQL queries for v0.1.0
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'init', 'HANDLE_THEME_CHANGE', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'init', 'HANDLE_THEME_CHANGE', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Ändern des Designs nun im Filter (internes TODO).");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Ändern des Designs nun im Filter (internes TODO).");


@@ -171,7 +171,7 @@ INDEX (`theme_active`)", 'Themes');
 
                        case '0.1.1': // SQL queries for v0.1.1
                                // Register filter
 
                        case '0.1.1': // SQL queries for v0.1.1
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'member_login_check', 'SET_USERS_THEME', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'member_login_check', 'SET_USERS_THEME', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Setzen des Mitgliedes' eigener Design-Auswahl per Filter (internes TODO).");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Setzen des Mitgliedes' eigener Design-Auswahl per Filter (internes TODO).");


@@ -187,7 +187,7 @@ INDEX (`theme_active`)", 'Themes');
 
                        case '0.1.3': // SQL queries for v0.1.3
                                // Register filter
 
                        case '0.1.3': // SQL queries for v0.1.3
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'THEME_USER_REGISTRATION_ADD_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'THEME_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // This depends on ext-register
                                addExtensionDependency('register');
 
                                // This depends on ext-register
                                addExtensionDependency('register');

diff --git a/inc/extensions/ext-timezone.php b/inc/extensions/ext-timezone.php
index fdc7460acda22ed1cc17ba291c8b22b5759eb023..26a779167189a0792233efbd656d2790ef3cece4 100644 (file)
--- a/inc/extensions/ext-timezone.php
+++ b/inc/extensions/ext-timezone.php
@@ -55,7 +55,7 @@ switch (getExtensionMode()) {
                addAdminMenuSql('setup', 'config_timezone', 'Zeitzone', 'Einstellungen an der Zeitzone können hier konfiguriert werden.', 10);
 
                // Register filter
                addAdminMenuSql('setup', 'config_timezone', 'Zeitzone', 'Einstellungen an der Zeitzone können hier konfiguriert werden.', 10);
 
                // Register filter

-               registerFilter(__FILE__, __LINE__, 'init', 'INIT_TIMEZONE', false, true, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'init', 'INIT_TIMEZONE', FALSE, TRUE, isExtensionDryRun());

                break;
 
        case 'remove': // Do stuff when removing extension
                break;
 
        case 'remove': // Do stuff when removing extension


@@ -63,7 +63,7 @@ switch (getExtensionMode()) {
                addExtensionSQL("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_timezone' LIMIT 1");
 
                // Unregister filter
                addExtensionSQL("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_timezone' LIMIT 1");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'init', 'INIT_TIMEZONE', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'init', 'INIT_TIMEZONE', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-uberwach.php b/inc/extensions/ext-uberwach.php
index 49915fd3e89903e84406657a0034ae0cff3efb1f..8c537882b2590ffeb02a37cd8db44c94621ccde9 100644 (file)
--- a/inc/extensions/ext-uberwach.php
+++ b/inc/extensions/ext-uberwach.php
@@ -56,7 +56,7 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_uberwach' LIMIT 1");
 
                // Unregister filter
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_uberwach' LIMIT 1");
 
                // Unregister filter

-               unregisterFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_UBERWACH_SNIPPET', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_UBERWACH_SNIPPET', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -70,7 +70,7 @@ switch (getExtensionMode()) {
        case 'update': // Update an extension
                switch (getCurrentExtensionVersion()) {
                        case '0.0.1': // SQL queries for v0.0.1
        case 'update': // Update an extension
                switch (getCurrentExtensionVersion()) {
                        case '0.0.1': // SQL queries for v0.0.1

-                               registerFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_UBERWACH_SNIPPET', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'page_footer', 'DISPLAY_UBERWACH_SNIPPET', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Anzeigen des Snippets hinzugefügt");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Anzeigen des Snippets hinzugefügt");

diff --git a/inc/extensions/ext-update.php b/inc/extensions/ext-update.php
index f53fd1d922847e2a7061ee7b7f99dc751e8f0086..e0e6b3a446869727c926b1488b81b6d9634deb5e 100644 (file)
--- a/inc/extensions/ext-update.php
+++ b/inc/extensions/ext-update.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 5436f59e6aa5def411f2d0e0dc991db47d30da2b..15db492729bba6a68bbcb3d8950677119c32f6f2 100644 (file)
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -186,20 +186,20 @@ INDEX (`stats_type`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN ('subids')");
 
                // Register new filters for gathering points
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN ('subids')");
 
                // Register new filters for gathering points

-               unregisterFilter(__FILE__, __LINE__, 'get_total_points', 'USER_POINTS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'get_own_points', 'USER_POINTS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_USER_POINTS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_USER_POINTS_COLUMN_NAMES', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'TESTER_USER_EXCLUSION_SQL', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'user_inclusion_sql', 'TESTER_USER_INCLUSION_SQL', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'TESTER_USER_REGISTRATION_ADD_SQL_COLUMNS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'convert_user_data_columns', 'ADD_USER_DATA_CONVERT_SQL_COLUMNS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'post_refid_validation', 'HANDLE_USER_SUBID', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'SUBID_USER_REGISTRATION_ADD_SQL_COLUMNS', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'update_referral_data', 'GENERIC_UPDATE_USER_REFERRAL', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'update_referral_data', 'UPDATE_USER_SUBID', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_USER_SUBID_MEMBER_ACTION', true, isExtensionDryRun());
-               unregisterFilter(__FILE__, __LINE__, 'member_reflink_extra_content', 'MEMBER_REFLINK_USER_SUBIDS_CONTENT', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_total_points', 'USER_POINTS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_own_points', 'USER_POINTS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_USER_POINTS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_USER_POINTS_COLUMN_NAMES', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'TESTER_USER_EXCLUSION_SQL', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'user_inclusion_sql', 'TESTER_USER_INCLUSION_SQL', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'TESTER_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'convert_user_data_columns', 'ADD_USER_DATA_CONVERT_SQL_COLUMNS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_refid_validation', 'HANDLE_USER_SUBID', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'SUBID_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'update_referral_data', 'GENERIC_UPDATE_USER_REFERRAL', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'update_referral_data', 'UPDATE_USER_SUBID', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_USER_SUBID_MEMBER_ACTION', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'member_reflink_extra_content', 'MEMBER_REFLINK_USER_SUBIDS_CONTENT', TRUE, isExtensionDryRun());

                break;
 
        case 'activate': // Do stuff when admin activates this extension
                break;
 
        case 'activate': // Do stuff when admin activates this extension


@@ -439,8 +439,8 @@ INDEX (`userid`)",
 
                        case '0.4.0': // SQL queries for v0.4.0
                                // Register new filters for gathering points
 
                        case '0.4.0': // SQL queries for v0.4.0
                                // Register new filters for gathering points

-                               registerFilter(__FILE__, __LINE__, 'get_total_points', 'USER_POINTS', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'get_own_points', 'USER_POINTS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_total_points', 'USER_POINTS', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_own_points', 'USER_POINTS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter registriert, die das eigene {?POINTS?}-Guthaben des Mitgliedes zurückliefern.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter registriert, die das eigene {?POINTS?}-Guthaben des Mitgliedes zurückliefern.");


@@ -526,10 +526,10 @@ INDEX (`refid`)",
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `last_module` `last_what` VARCHAR(255) NULL DEFAULT NULL');
 
                                // Register filter locked points
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `last_module` `last_what` VARCHAR(255) NULL DEFAULT NULL');
 
                                // Register filter locked points

-                               registerFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_USER_POINTS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_locked_points', 'LOCKED_USER_POINTS', FALSE, TRUE, isExtensionDryRun());

 
                                // Register filter for all column names
 
                                // Register filter for all column names

-                               registerFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_USER_POINTS_COLUMN_NAMES', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'get_all_point_columns', 'GET_ALL_USER_POINTS_COLUMN_NAMES', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Die Spalte <strong>last_module</strong> ist nach <strong>last_what</strong> umbenannt und hat nun NULL als Ausgangswert und Filter f&uuml;r gesperrtes Guthaben hinzugef&uuml;gt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Die Spalte <strong>last_module</strong> ist nach <strong>last_what</strong> umbenannt und hat nun NULL als Ausgangswert und Filter f&uuml;r gesperrtes Guthaben hinzugef&uuml;gt.");


@@ -557,8 +557,8 @@ INDEX (`refid`)",
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `zip` `zip` INT(6) NOT NULL DEFAULT 0');
 
                                // Register filter for WHERE/AND exclusion/inclusion statements
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `zip` `zip` INT(6) NOT NULL DEFAULT 0');
 
                                // Register filter for WHERE/AND exclusion/inclusion statements

-                               registerFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'TESTER_USER_EXCLUSION_SQL', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'user_inclusion_sql', 'TESTER_USER_INCLUSION_SQL', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'TESTER_USER_EXCLUSION_SQL', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'user_inclusion_sql', 'TESTER_USER_INCLUSION_SQL', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Es k&ouml;nnen nun Test-Benutzer angelegt werden. Noch m&uuml;ssen diese &uuml;berall ausgeschlossen werden, damit die Mediadaten nicht unn&ouml;tig verf&auml;lscht werden.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Es k&ouml;nnen nun Test-Benutzer angelegt werden. Noch m&uuml;ssen diese &uuml;berall ausgeschlossen werden, damit die Mediadaten nicht unn&ouml;tig verf&auml;lscht werden.");


@@ -566,7 +566,7 @@ INDEX (`refid`)",
 
                        case '0.5.1': // SQL queries for v0.5.1
                                // Register a filter
 
                        case '0.5.1': // SQL queries for v0.5.1
                                // Register a filter

-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'TESTER_USER_REGISTRATION_ADD_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'TESTER_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Hinzuf&uuml;gen von SQL-Spalten f&uuml;r die Mitgliederanmeldung hinzugef&uuml;gt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Hinzuf&uuml;gen von SQL-Spalten f&uuml;r die Mitgliederanmeldung hinzugef&uuml;gt.");


@@ -574,7 +574,7 @@ INDEX (`refid`)",
 
                        case '0.5.2': // SQL queries for v0.5.2
                                // Register a filter
 
                        case '0.5.2': // SQL queries for v0.5.2
                                // Register a filter

-                               registerFilter(__FILE__, __LINE__, 'convert_user_data_columns', 'ADD_USER_DATA_CONVERT_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'convert_user_data_columns', 'ADD_USER_DATA_CONVERT_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Hinzuf&uuml;gen von SQL-Spalten f&uuml;r die Mitgliederanmeldung hinzugef&uuml;gt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter zum Hinzuf&uuml;gen von SQL-Spalten f&uuml;r die Mitgliederanmeldung hinzugef&uuml;gt.");


@@ -582,8 +582,8 @@ INDEX (`refid`)",
 
                        case '0.5.3': // SQL queries for v0.5.3
                                // Register filter
 
                        case '0.5.3': // SQL queries for v0.5.3
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'post_refid_validation', 'HANDLE_USER_SUBID', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'SUBID_USER_REGISTRATION_ADD_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'post_refid_validation', 'HANDLE_USER_SUBID', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'SUBID_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());

 
                                // Admin menu
                                addAdminMenuSql('user', 'list_user_subid', 'Sub-Ids', 'Listet alle pro vom Mitglied eingegebenen Sub-Ids und ermittelten Referral-URLs auf.', 7);
 
                                // Admin menu
                                addAdminMenuSql('user', 'list_user_subid', 'Sub-Ids', 'Listet alle pro vom Mitglied eingegebenen Sub-Ids und ermittelten Referral-URLs auf.', 7);


@@ -630,8 +630,8 @@ INDEX (`subid`)",
 
                        case '0.5.4': // SQL queries for v0.5.4
                                // Register filter
 
                        case '0.5.4': // SQL queries for v0.5.4
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'update_referral_data', 'GENERIC_UPDATE_USER_REFERRAL', false, true, isExtensionDryRun());
-                               registerFilter(__FILE__, __LINE__, 'update_referral_data', 'UPDATE_USER_SUBID', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'update_referral_data', 'GENERIC_UPDATE_USER_REFERRAL', FALSE, TRUE, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'update_referral_data', 'UPDATE_USER_SUBID', FALSE, TRUE, isExtensionDryRun());

 
                                // Add user agent
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_subid_log` ADD `user_agent` TINYTEXT NOT NULL AFTER `remote_address`');
 
                                // Add user agent
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_subid_log` ADD `user_agent` TINYTEXT NOT NULL AFTER `remote_address`');


@@ -642,7 +642,7 @@ INDEX (`subid`)",
 
                        case '0.5.5': // SQL queries for v0.5.5
                                // Register filter
 
                        case '0.5.5': // SQL queries for v0.5.5
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_USER_SUBID_MEMBER_ACTION', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'member_admin_actions', 'ADD_USER_SUBID_MEMBER_ACTION', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteren Filter f&uuml;r Mitglieder-Aktionen im Adminbereich hinzugef&uuml;gt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteren Filter f&uuml;r Mitglieder-Aktionen im Adminbereich hinzugef&uuml;gt.");


@@ -650,7 +650,7 @@ INDEX (`subid`)",
 
                        case '0.5.6': // SQL queries for v0.5.6
                                // Register filter
 
                        case '0.5.6': // SQL queries for v0.5.6
                                // Register filter

-                               registerFilter(__FILE__, __LINE__, 'member_reflink_extra_content', 'MEMBER_REFLINK_USER_SUBIDS_CONTENT', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'member_reflink_extra_content', 'MEMBER_REFLINK_USER_SUBIDS_CONTENT', FALSE, TRUE, isExtensionDryRun());

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteren Filter f&uuml;r Mitglieder-Aktionen im Adminbereich hinzugef&uuml;gt.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteren Filter f&uuml;r Mitglieder-Aktionen im Adminbereich hinzugef&uuml;gt.");

diff --git a/inc/extensions/ext-yacy.php b/inc/extensions/ext-yacy.php
index 1c3e71d094187af616e8b9cada4c2c395da3e812..ccfb59992dfeecbe1251c6e4954d545b68099a5a 100644 (file)
--- a/inc/extensions/ext-yacy.php
+++ b/inc/extensions/ext-yacy.php
@@ -47,7 +47,7 @@ setThisExtensionVersion('0.0.0');
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)
 setExtensionVersionHistory(array('0.0.0'));
 
 // This extension is in development (non-productive)

-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 2048ba28aedfd5b50da504d9026020a246234a3e..39f980c2674c5a6fa9e577a7ff02e9b07ef8fea6 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -54,7 +54,7 @@ function initFilterSystem () {
                prepareFilterArray();
 
                // Mark it as initialized
                prepareFilterArray();
 
                // Mark it as initialized

-               $GLOBALS['filter_init'] = true;
+               $GLOBALS['filter_init'] = TRUE;

        } elseif ((!isInstallationPhase()) && (isExtensionInstalledAndNewer('sql_patches', '0.5.9'))) {
                // Init add
                $add = '';
        } elseif ((!isInstallationPhase()) && (isExtensionInstalledAndNewer('sql_patches', '0.5.9'))) {
                // Init add
                $add = '';


@@ -85,7 +85,7 @@ ORDER BY
                                $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0';
 
                                // Mark this filter as loaded (from database)
                                $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0';
 
                                // Mark this filter as loaded (from database)

-                               $GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction] = true;
+                               $GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction] = TRUE;

 
                                // Set this filter
                                $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = $filterArray['filter_active'];
 
                                // Set this filter
                                $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = $filterArray['filter_active'];


@@ -201,7 +201,7 @@ ORDER BY
 }
 
 // "Registers" a new filter function
 }
 
 // "Registers" a new filter function

-function registerFilter ($F, $L, $filterName, $filterFunction, $silentAbort = true, $force = false, $isDryRun = false) {
+function registerFilter ($F, $L, $filterName, $filterFunction, $silentAbort = TRUE, $force = FALSE, $isDryRun = FALSE) {

        // Extend the filter function name
        $filterFunction = 'FILTER_' . strtoupper($filterFunction);
 
        // Extend the filter function name
        $filterFunction = 'FILTER_' . strtoupper($filterFunction);
 


@@ -209,24 +209,24 @@ function registerFilter ($F, $L, $filterName, $filterFunction, $silentAbort = tr
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',F=' . basename($F) . ',L=' . $L . ' - ENTERED!');
 
        // Is that filter already there?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',F=' . basename($F) . ',L=' . $L . ' - ENTERED!');
 
        // Is that filter already there?

-       if ((isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === false)) {
+       if ((isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === FALSE)) {

                // In installation phase we always want to abort
                // In installation phase we always want to abort

-               if (($silentAbort === false) || (isInstallationPhase())) {
+               if (($silentAbort === FALSE) || (isInstallationPhase())) {

                        // Add fatal message
                        reportBug(__FUNCTION__, __LINE__, sprintf("Filter chain %s has already filter function %s registered! F=%s,L=%s,force=%d", $filterName, $filterFunction, basename($F), $L, intval($force)));
                } // END - if
 
                // Abort here
                        // Add fatal message
                        reportBug(__FUNCTION__, __LINE__, sprintf("Filter chain %s has already filter function %s registered! F=%s,L=%s,force=%d", $filterName, $filterFunction, basename($F), $L, intval($force)));
                } // END - if
 
                // Abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Shall we add it?
        } // END - if
 
        // Shall we add it?

-       if ($isDryRun === false) {
+       if ($isDryRun === FALSE) {

                // Is the function there?
                if (!function_exists($filterFunction)) {
                        // Then abort here
                        addFatalMessage(__FUNCTION__, __LINE__, sprintf("Filter function %s could not be added to filter chain %s. F=%s,L=%s,force=%d", $filterFunction, $filterName, basename($F), $L, intval($force)));
                // Is the function there?
                if (!function_exists($filterFunction)) {
                        // Then abort here
                        addFatalMessage(__FUNCTION__, __LINE__, sprintf("Filter function %s could not be added to filter chain %s. F=%s,L=%s,force=%d", $filterFunction, $filterName, basename($F), $L, intval($force)));

-                       return false;
+                       return FALSE;

                } // END - if
 
                // Simply add it to the array
                } // END - if
 
                // Simply add it to the array


@@ -239,7 +239,7 @@ function registerFilter ($F, $L, $filterName, $filterFunction, $silentAbort = tr
 }
 
 // "Unregisters" a filter from the given chain
 }
 
 // "Unregisters" a filter from the given chain

-function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false, $isDryRun = false) {
+function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = FALSE, $isDryRun = FALSE) {

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',isDryRun=' . intval($isDryRun) . ' - ENTERED!');
 
        // Extend the filter function name only if not loaded from database
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',isDryRun=' . intval($isDryRun) . ' - ENTERED!');
 
        // Extend the filter function name only if not loaded from database


@@ -248,14 +248,14 @@ function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false,
        } // END - if
 
        // Is that filter there?
        } // END - if
 
        // Is that filter there?

-       if ((!isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === false)) {
+       if ((!isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === FALSE)) {

                // Not found, so abort here
                addFatalMessage(__FUNCTION__, __LINE__, sprintf(getMessage('FILTER_FAILED_NOT_REMOVED'), $filterFunction, $filterName));
                // Not found, so abort here
                addFatalMessage(__FUNCTION__, __LINE__, sprintf(getMessage('FILTER_FAILED_NOT_REMOVED'), $filterFunction, $filterName));

-               return false;
+               return FALSE;

        } // END - if
 
        // Shall we remove? (default, not while just showing an extension removal)
        } // END - if
 
        // Shall we remove? (default, not while just showing an extension removal)

-       if ($isDryRun === false) {
+       if ($isDryRun === FALSE) {

                // Mark for filter removal
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - REMOVE!');
                $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'R';
                // Mark for filter removal
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - REMOVE!');
                $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'R';


@@ -331,7 +331,7 @@ function prepareFilterArray () {
        // Abort here if array is absend (e.g. not cached)
        if (!isset($GLOBALS['cache_array']['filter']['filter_name'])) {
                // Abort silently
        // Abort here if array is absend (e.g. not cached)
        if (!isset($GLOBALS['cache_array']['filter']['filter_name'])) {
                // Abort silently

-               return false;
+               return FALSE;

        } // END - if
 
        // Init dummy array
        } // END - if
 
        // Init dummy array


@@ -348,7 +348,7 @@ function prepareFilterArray () {
 
                // Add the element with mapped index
                $filterArray['counter'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_counter'][$idx];
 
                // Add the element with mapped index
                $filterArray['counter'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_counter'][$idx];

-               $filterArray['loaded'][$filterName][$filterFunction]  = true;
+               $filterArray['loaded'][$filterName][$filterFunction]  = TRUE;

                $filterArray['chains'][$filterName][$filterFunction]  = $GLOBALS['cache_array']['filter']['filter_active'][$idx];
        } // END - foreach
 
                $filterArray['chains'][$filterName][$filterFunction]  = $GLOBALS['cache_array']['filter']['filter_active'][$idx];
        } // END - foreach
 


@@ -370,7 +370,7 @@ function loadExtensionFilters ($ext_name) {
        // Is there a cache entry?
        if (!isset($GLOBALS[__FUNCTION__][$ext_name])) {
                // Default is not found
        // Is there a cache entry?
        if (!isset($GLOBALS[__FUNCTION__][$ext_name])) {
                // Default is not found

-               $GLOBALS[__FUNCTION__][$ext_name] = false;
+               $GLOBALS[__FUNCTION__][$ext_name] = FALSE;

 
                // Construct include file name
                $incFileName = sprintf("inc/filter/%s_filter.php", $ext_name);
 
                // Construct include file name
                $incFileName = sprintf("inc/filter/%s_filter.php", $ext_name);


@@ -381,7 +381,7 @@ function loadExtensionFilters ($ext_name) {
                        loadIncludeOnce($incFileName);
 
                        // Mark the file as loaded
                        loadIncludeOnce($incFileName);
 
                        // Mark the file as loaded

-                       $GLOBALS[__FUNCTION__][$ext_name] = true;
+                       $GLOBALS[__FUNCTION__][$ext_name] = TRUE;

                } elseif (isDebugModeEnabled()) {
                        // Log missing file
                        //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Filter include file ' . $incFileName . ' for extension ' . $ext_name . ' is missing.');
                } elseif (isDebugModeEnabled()) {
                        // Log missing file
                        //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Filter include file ' . $incFileName . ' for extension ' . $ext_name . ' is missing.');

diff --git a/inc/filter/active_filter.php b/inc/filter/active_filter.php
index ecb2506f1d88680e979878c4b22dc690467da906..5c83520648db24aeed0d4813450c87a857a1a9a8 100644 (file)
--- a/inc/filter/active_filter.php
+++ b/inc/filter/active_filter.php
@@ -54,7 +54,7 @@ function FILTER_ADD_LINK_ACTIVE_LIST ($filterData) {
                );
 
                // Add link to "we were active today" page
                );
 
                // Add link to "we were active today" page

-               $GLOBALS['rows'] .= loadTemplate('guest_menu_bottom', true, $content);
+               $GLOBALS['rows'] .= loadTemplate('guest_menu_bottom', TRUE, $content);

        } // END - if
 
        // Return data
        } // END - if
 
        // Return data

diff --git a/inc/filter/beg_filter.php b/inc/filter/beg_filter.php
index c96ba0b254e82f252d2b27d346b439a6d1d79a93..7c3cfc1c45e29289e1fbb3300aa221d221d2fdd4 100644 (file)
--- a/inc/filter/beg_filter.php
+++ b/inc/filter/beg_filter.php
@@ -52,7 +52,7 @@ function FILTER_BEG_RALLYE_USER_REGISTRATION_ADD_SQL_COLUMNS ($filterData) {
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 

diff --git a/inc/filter/bonus_filter.php b/inc/filter/bonus_filter.php
index 63aafff99354db6470c986d60810f664a774cadc..0403890eaec5f6756231430ca346a3a97efd3d33 100644 (file)
--- a/inc/filter/bonus_filter.php
+++ b/inc/filter/bonus_filter.php
@@ -50,7 +50,7 @@ function FILTER_ADD_LOGIN_BONUS ($filterData) {
        } // END - if
 
        // Bonus is not given by default ;-)
        } // END - if
 
        // Bonus is not given by default ;-)

-       $bonus = false;
+       $bonus = FALSE;

        if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (getConfig('include_bonus_login') == 'Y')) {
                // Update last login if far enougth away
                // @TODO This query isn't right, it will only update if the user was for a longer time away!
        if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (getConfig('include_bonus_login') == 'Y')) {
                // Update last login if far enougth away
                // @TODO This query isn't right, it will only update if the user was for a longer time away!


@@ -71,7 +71,7 @@ LIMIT 1',
                $bonus = (!SQL_HASZEROAFFECTED());
        } // END - if
 
                $bonus = (!SQL_HASZEROAFFECTED());
        } // END - if
 

-       if (($bonus === true) && (getRequestElement('do') == 'bonus')) {
+       if (($bonus === TRUE) && (getRequestElement('do') == 'bonus')) {

                // Output message with added points
                $GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
        } else {
                // Output message with added points
                $GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
        } else {


@@ -91,7 +91,7 @@ function FILTER_GENERATE_BONUS_MAIL_LINKS ($filterData) {
        // Is the type 'bid'?
        if ($filterData['type'] == 'bid') {
                // Load template
        // Is the type 'bid'?
        if ($filterData['type'] == 'bid') {
                // Load template

-               $filterData['__output'] .= loadTemplate('admin_links_bonus_mail', true, $filterData);
+               $filterData['__output'] .= loadTemplate('admin_links_bonus_mail', TRUE, $filterData);

        } // END - if
 
        // Return data
        } // END - if
 
        // Return data


@@ -133,7 +133,7 @@ function FILTER_BONUS_USER_REGISTRATION_ADD_SQL_COLUMNS ($filterData) {
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 


@@ -148,7 +148,7 @@ function FILTER_SEND_BONUS_NOTIFICATIONS ($filterData) {
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 

diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php
index 4ec2318e2ecee51e9fa18d2589bc9933d2c2e757..d675aa43bef46ab82edb495e5f5de5685609f864 100644 (file)
--- a/inc/filter/cache_filter.php
+++ b/inc/filter/cache_filter.php
@@ -45,7 +45,7 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($filterData) {
        // Return the data anyway if there is no cache extension
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {
        // Return the data anyway if there is no cache extension
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove cache
        } // END - if
 
        // Remove cache


@@ -67,7 +67,7 @@ function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove cache
        } // END - if
 
        // Remove cache


@@ -85,7 +85,7 @@ function FILTER_CACHE_DESTROY_ALL ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove cache files
        } // END - if
 
        // Remove cache files


@@ -107,7 +107,7 @@ function FILTER_CACHE_DESTROY_FILTER ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if ((!isCacheInstanceValid()) || ((isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') != 'Y'))) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if ((!isCacheInstanceValid()) || ((isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') != 'Y'))) {

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove cache files
        } // END - if
 
        // Remove cache files

diff --git a/inc/filter/country_filter.php b/inc/filter/country_filter.php
index ebf345108bd8fa2e5c8ad91b2adb3ef33d9d493d..9ae90320777d54e8f7f640e02f81e009a594298b 100644 (file)
--- a/inc/filter/country_filter.php
+++ b/inc/filter/country_filter.php
@@ -50,7 +50,7 @@ function FILTER_COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS ($filterData) {
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 

diff --git a/inc/filter/forced_filter.php b/inc/filter/forced_filter.php
index 418746971fd938552f9d3ff759cf80fa18506d13..d3843ca622400ead3fadf37c7efa09d464a9bbea 100644 (file)
--- a/inc/filter/forced_filter.php
+++ b/inc/filter/forced_filter.php
@@ -107,11 +107,11 @@ function FILTER_FORCED_CHANGE_CAMPAIGN_VALIDATE_DATA ($filterData) {
        if ((!is_string($filterData['new_status'])) || (empty($filterData['new_status']))) {
                // Abort here, not fine
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newStatus[' . gettype($filterData['new_status']) . ']=' . $filterData['new_status'] . ' - EXIT!');
        if ((!is_string($filterData['new_status'])) || (empty($filterData['new_status']))) {
                // Abort here, not fine
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newStatus[' . gettype($filterData['new_status']) . ']=' . $filterData['new_status'] . ' - EXIT!');

-               $filterData['abort'] = false;
+               $filterData['abort'] = FALSE;

        } elseif ($filterData['data']['forced_campaign_status'] != $filterData['prev_status']) {
                // Status is not like prevStatus
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterData['data']['forced_campaign_status'] . '!=' . $filterData['prev_status'] . ' - EXIT!');
        } elseif ($filterData['data']['forced_campaign_status'] != $filterData['prev_status']) {
                // Status is not like prevStatus
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterData['data']['forced_campaign_status'] . '!=' . $filterData['prev_status'] . ' - EXIT!');

-               $filterData['abort'] = false;
+               $filterData['abort'] = FALSE;

        } // END - if
 
        // Return filter data
        } // END - if
 
        // Return filter data

diff --git a/inc/filter/mediadata_filter.php b/inc/filter/mediadata_filter.php
index bf811ae78d02bfcfaffd277528470ac38c8c7728..cc60137100894ce58190f592ad0bffacdafbf6bc 100644 (file)
--- a/inc/filter/mediadata_filter.php
+++ b/inc/filter/mediadata_filter.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function FILTER_UPDATE_MEDIADATA_ENTRY ($filterData) {
        // Execute the filter function
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added[' . gettype($filterData['added']) . ']=' . intval($filterData['added']) . ' - Called!');
 function FILTER_UPDATE_MEDIADATA_ENTRY ($filterData) {
        // Execute the filter function
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added[' . gettype($filterData['added']) . ']=' . intval($filterData['added']) . ' - Called!');

-       $filterData['added'] = ($filterData['added'] === true && updateMediadataEntry(array('total_points'), $filterData['points_mode'], $filterData['points']));
+       $filterData['added'] = ($filterData['added'] === TRUE && updateMediadataEntry(array('total_points'), $filterData['points_mode'], $filterData['points']));

 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added[' . gettype($filterData['added']) . ']=' . intval($filterData['added']) . ' - Done!');
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added[' . gettype($filterData['added']) . ']=' . intval($filterData['added']) . ' - Done!');

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index 43c4ed97aaaba8e6a417004eb739be9615c33a75..31c22ee1174f3a28db856ef4b8f07ed8d70eda17 100644 (file)
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -60,7 +60,7 @@ function FILTER_UPDATE_ONLINE_LIST ($filterData) {
        $userid   = NULL;
        $isMember = convertBooleanToYesNo(isMember());
        $isAdmin  = convertBooleanToYesNo(isAdmin());
        $userid   = NULL;
        $isMember = convertBooleanToYesNo(isMember());
        $isAdmin  = convertBooleanToYesNo(isAdmin());

-       $action   = getActionFromModuleWhat(getModule(), getWhat(false));
+       $action   = getActionFromModuleWhat(getModule(), getWhat(FALSE));

 
        // Valid userid?
        if (isMember()) {
 
        // Valid userid?
        if (isMember()) {


@@ -93,7 +93,7 @@ LIMIT 1",
                array(
                        getModule(),
                        $action,
                array(
                        getModule(),
                        $action,

-                       getWhat(false),
+                       getWhat(FALSE),

                        convertZeroToNull($userid),
                        convertZeroToNull(determineReferralId()),
                        $isMember,
                        convertZeroToNull($userid),
                        convertZeroToNull(determineReferralId()),
                        $isMember,


@@ -107,7 +107,7 @@ LIMIT 1",
                        array(
                                getModule(),
                                $action,
                        array(
                                getModule(),
                                $action,

-                               getWhat(false),
+                               getWhat(FALSE),

                                convertZeroToNull($userid),
                                convertZeroToNull(determineReferralId()),
                                $isMember,
                                convertZeroToNull($userid),
                                convertZeroToNull(determineReferralId()),
                                $isMember,

diff --git a/inc/filter/politician-stop_filter.php b/inc/filter/politician-stop_filter.php
index f16dda33819e64a76506569d7acf259230217fc3..915e6613c937e65d13a126386d89f007d5fd614c 100644 (file)
--- a/inc/filter/politician-stop_filter.php
+++ b/inc/filter/politician-stop_filter.php
@@ -49,7 +49,7 @@ function FILTER_DISPLAY_POLITICIAN_STOP_SNIPPET ($filterData) {
        if ((isFullPage()) && (isExtensionActive('politician-stop')) && (getModule() != 'admin') && ($GLOBALS['__header_sent'] == 2)) {
                // Then display it here
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to load template ...');
        if ((isFullPage()) && (isExtensionActive('politician-stop')) && (getModule() != 'admin') && ($GLOBALS['__header_sent'] == 2)) {
                // Then display it here
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to load template ...');

-               $filterData .= loadTemplate('politician_stop_snippet', true);
+               $filterData .= loadTemplate('politician_stop_snippet', TRUE);

        } // END - if
 
        // Return data
        } // END - if
 
        // Return data

diff --git a/inc/filter/register_filter.php b/inc/filter/register_filter.php
index 58a1da787d7bafea1492bf81907280901d7e9780..14adc971c1c0da889a5cb951159e8cde3d9b9664 100644 (file)
--- a/inc/filter/register_filter.php
+++ b/inc/filter/register_filter.php
@@ -110,11 +110,11 @@ function FILTER_PRE_USER_REGISTRATION_GENERIC ($filterData) {
        setPostRequestElement('remote_addr', detectRemoteAddr());
 
        // Generic initialization is done
        setPostRequestElement('remote_addr', detectRemoteAddr());
 
        // Generic initialization is done

-       $filterData['init_done'] = true;
+       $filterData['init_done'] = TRUE;

 
        // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 

diff --git a/inc/filter/surfbar_filter.php b/inc/filter/surfbar_filter.php
index ca61910cf58a53838254e8c92aaf9f7e42558f7c..258954dc9ed4dadca26044d76f6a0c8b6dbfb5ea 100644 (file)
--- a/inc/filter/surfbar_filter.php
+++ b/inc/filter/surfbar_filter.php
@@ -73,11 +73,11 @@ function FILTER_SURFBAR_CHANGE_URL_VALIDATE_DATA ($filterData) {
        if ((!is_string($filterData['new_status'])) || (empty($filterData['new_status']))) {
                // Abort here, but fine!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newStatus[' . gettype($filterData['new_status']) . ']=' . $filterData['new_status'] . ' - EXIT!');
        if ((!is_string($filterData['new_status'])) || (empty($filterData['new_status']))) {
                // Abort here, but fine!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newStatus[' . gettype($filterData['new_status']) . ']=' . $filterData['new_status'] . ' - EXIT!');

-               $filterData['abort'] = true;
+               $filterData['abort'] = TRUE;

        } elseif ($filterData['data'][$filterData['url_id']]['url_status'] != $filterData['prev_status']) {
                // Status is not like prevStatus
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterData['data'][$filterData['url_id']]['url_status'] . '!=' . $filterData['prev_status'] . ' - EXIT!');
        } elseif ($filterData['data'][$filterData['url_id']]['url_status'] != $filterData['prev_status']) {
                // Status is not like prevStatus
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterData['data'][$filterData['url_id']]['url_status'] . '!=' . $filterData['prev_status'] . ' - EXIT!');

-               $filterData['abort'] = false;
+               $filterData['abort'] = FALSE;

        } // END - if
 
        // Return filter data
        } // END - if
 
        // Return filter data

diff --git a/inc/filter/theme_filter.php b/inc/filter/theme_filter.php
index 9cd0749e5ce5ed18c8ceb1102cf15dcc3437334e..742f6b08c8def5eba2e709fac91d0c9a742010f3 100644 (file)
--- a/inc/filter/theme_filter.php
+++ b/inc/filter/theme_filter.php
@@ -95,7 +95,7 @@ function FILTER_THEME_USER_REGISTRATION_ADD_SQL_COLUMNS ($filterData) {
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 

diff --git a/inc/filter/user_filter.php b/inc/filter/user_filter.php
index 150568dbdf752c33a940066e0f893581f1a2ff18..62e6a195fb6c6fe199d98da15701f1d92c7c2e88 100644 (file)
--- a/inc/filter/user_filter.php
+++ b/inc/filter/user_filter.php
@@ -131,7 +131,7 @@ function FILTER_TESTER_USER_REGISTRATION_ADD_SQL_COLUMNS ($filterData) {
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 


@@ -153,7 +153,7 @@ function FILTER_HANDLE_USER_SUBID ($filterData) {
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return filter data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';

        return $filterData;
 }
 
        return $filterData;
 }
 


@@ -194,7 +194,7 @@ function FILTER_UPDATE_USER_SUBID ($filterData) {
        $subId = SQL_ESCAPE(getRequestElement('subid'));
 
        // Is the sub id available and registered with referral id?
        $subId = SQL_ESCAPE(getRequestElement('subid'));
 
        // Is the sub id available and registered with referral id?

-       if (countSumTotalData(getReferralId(), 'user_subids', 'id', 'userid', true, sprintf(" AND `subid`='%s'", $subId)) == 1) {
+       if (countSumTotalData(getReferralId(), 'user_subids', 'id', 'userid', TRUE, sprintf(" AND `subid`='%s'", $subId)) == 1) {

                // Sub id is assigned to referral id, so add a record
                SQL_QUERY_ESC("INSERT INTO
        `{?_MYSQL_PREFIX?}_subid_log`
                // Sub id is assigned to referral id, so add a record
                SQL_QUERY_ESC("INSERT INTO
        `{?_MYSQL_PREFIX?}_subid_log`


@@ -257,11 +257,11 @@ function FILTER_MEMBER_REFLINK_USER_SUBIDS_CONTENT ($content = '') {
                $out = '';
                while ($row = SQL_FETCHARRAY($result)) {
                        // Load row template
                $out = '';
                while ($row = SQL_FETCHARRAY($result)) {
                        // Load row template

-                       $out .= loadTemplate('member_list_reflink_user_subids_row', true, $row);
+                       $out .= loadTemplate('member_list_reflink_user_subids_row', TRUE, $row);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               $content .= loadTemplate('member_list_reflink_user_subids', true, $out);
+               $content .= loadTemplate('member_list_reflink_user_subids', TRUE, $out);

 
                // Free result
                SQL_FREERESULT($result);
 
                // Free result
                SQL_FREERESULT($result);

diff --git a/inc/filters.php b/inc/filters.php
index d69f999d2665876f910ffce9d93b02fa7b4c264a..1a8a984f0c74f10a2fc4913ed7bc938878d122ef 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -62,7 +62,7 @@ function FILTER_FLUSH_FILTERS () {
                } // END - if
 
                // Abort silently here
                } // END - if
 
                // Abort silently here

-               return false;
+               return FALSE;

        } // END - if
 
        // Nothing is added/remove by default
        } // END - if
 
        // Nothing is added/remove by default


@@ -193,7 +193,7 @@ function FILTER_SOLVE_TASK ($filterData) {
                adminSolveTask($filterData['task_id']);
        } else {
                // Not detectable!
                adminSolveTask($filterData['task_id']);
        } else {
                // Not detectable!

-               reportBug(__FUNCTION__, __LINE__, sprintf("Cannot resolve task. data[%s]=<pre>%s</pre>", gettype($filterData), print_r($filterData, true)));
+               reportBug(__FUNCTION__, __LINE__, sprintf("Cannot resolve task. data[%s]=<pre>%s</pre>", gettype($filterData), print_r($filterData, TRUE)));

        }
 
        // Return the data
        }
 
        // Return the data


@@ -248,11 +248,11 @@ function FILTER_RUN_SQLS ($filterData) {
        $count = 0;
 
        // Debug message
        $count = 0;
 
        // Debug message

-       //* DEBUG: */ die('getSqls()=<pre>'.print_r(getSqls(), true).'</pre>ext_update_depends=<pre>'.print_r($GLOBALS['ext_update_depends'], true).'</pre>');
+       //* DEBUG: */ die('getSqls()=<pre>'.print_r(getSqls(), TRUE).'</pre>ext_update_depends=<pre>'.print_r($GLOBALS['ext_update_depends'], TRUE).'</pre>');

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!');
 
        // Is the array there?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!');
 
        // Is the array there?

-       if ((isSqlsValid()) && ((!isset($filterData['dry_run'])) || ($filterData['dry_run'] == false))) {
+       if ((isSqlsValid()) && ((!isset($filterData['dry_run'])) || ($filterData['dry_run'] == FALSE))) {

                // Run SQL commands
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.');
                foreach (getSqls() as $mode => $sqls) {
                // Run SQL commands
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.');
                foreach (getSqls() as $mode => $sqls) {


@@ -266,7 +266,7 @@ function FILTER_RUN_SQLS ($filterData) {
 
                                // Is 'enable_codes' not set? Then set it to true
                                if (!isset($filterData['enable_codes'])) {
 
                                // Is 'enable_codes' not set? Then set it to true
                                if (!isset($filterData['enable_codes'])) {

-                                       $filterData['enable_codes'] = true;
+                                       $filterData['enable_codes'] = TRUE;

                                } // END - if
 
                                // Is there still a query left?
                                } // END - if
 
                                // Is there still a query left?


@@ -311,7 +311,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
 
        // Recheck if logged in
        if ((!isMember()) || ((isAdmin()) && (!isDebugModeEnabled()))) {
 
        // Recheck if logged in
        if ((!isMember()) || ((isAdmin()) && (!isDebugModeEnabled()))) {

-               return false;
+               return FALSE;

        } // END - if
 
        // Secure user id
        } // END - if
 
        // Secure user id


@@ -430,7 +430,7 @@ function FILTER_DETERMINE_USERNAME () {
 }
 
 // Filter for compiling config entries
 }
 
 // Filter for compiling config entries

-function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
+function FILTER_COMPILE_CONFIG ($code, $compiled = FALSE) {

        // Save the uncompiled code
        $uncompiled = $code;
 
        // Save the uncompiled code
        $uncompiled = $code;
 


@@ -472,7 +472,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
        } // END - if
 
        // Should we compile it?
        } // END - if
 
        // Should we compile it?

-       if ($compiled === true) {
+       if ($compiled === TRUE) {

                // Run the code
                $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . '";';
                //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>' . encodeEntities($eval) . '</pre>');
                // Run the code
                $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . '";';
                //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>' . encodeEntities($eval) . '</pre>');


@@ -488,7 +488,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) {
        // Compile {%cmd,callback,extraFunction=some_value%} to get expression code snippets
        // See switch() command below for supported commands
        preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $filterData, $matches);
        // Compile {%cmd,callback,extraFunction=some_value%} to get expression code snippets
        // See switch() command below for supported commands
        preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $filterData, $matches);

-       //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.print_r($matches, true).'</pre>');
+       //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.print_r($matches, TRUE).'</pre>');

 
        // Default is from outputHtml()
        $outputMode = getScriptOutputMode();
 
        // Default is from outputHtml()
        $outputMode = getScriptOutputMode();


@@ -832,7 +832,7 @@ function FILTER_LOAD_RUNTIME_INCLUDES () {
 // Filter for checking admin ACL
 function FILTER_CHECK_ADMIN_ACL () {
        // Extension not installed so it's always allowed to access everywhere!
 // Filter for checking admin ACL
 function FILTER_CHECK_ADMIN_ACL () {
        // Extension not installed so it's always allowed to access everywhere!

-       $ret = true;
+       $ret = TRUE;

 
        // Ok, Cookie-Update done
        if ((isExtensionInstalledAndNewer('admins', '0.3.0')) && (isExtensionActive('admins'))) {
 
        // Ok, Cookie-Update done
        if ((isExtensionInstalledAndNewer('admins', '0.3.0')) && (isExtensionActive('admins'))) {


@@ -880,7 +880,7 @@ function FILTER_HANDLE_FATAL_ERRORS () {
        // Is there errors to handle and right output mode?
        if ((!ifFatalErrorsDetected()) || (!isHtmlOutputMode())) {
                // Abort executing here
        // Is there errors to handle and right output mode?
        if ((!ifFatalErrorsDetected()) || (!isHtmlOutputMode())) {
                // Abort executing here

-               return false;
+               return FALSE;

        } // END - if
 
        // Set content type
        } // END - if
 
        // Set content type


@@ -904,11 +904,11 @@ function FILTER_HANDLE_FATAL_ERRORS () {
                        );
 
                        // Load row template
                        );
 
                        // Load row template

-                       $OUT .= loadTemplate('install_fatal_row', true, $content);
+                       $OUT .= loadTemplate('install_fatal_row', TRUE, $content);

                }
 
                // Load main template
                }
 
                // Load main template

-               $content = loadTemplate('install_fatal_table', true, $OUT);
+               $content = loadTemplate('install_fatal_table', TRUE, $OUT);

        } elseif (isInstalled()) {
                // Display all runtime fatal errors
                $OUT = '';
        } elseif (isInstalled()) {
                // Display all runtime fatal errors
                $OUT = '';


@@ -920,11 +920,11 @@ function FILTER_HANDLE_FATAL_ERRORS () {
                        );
 
                        // Load row template
                        );
 
                        // Load row template

-                       $OUT .= loadTemplate('runtime_fatal_row', true, $content);
+                       $OUT .= loadTemplate('runtime_fatal_row', TRUE, $content);

                }
 
                // Load main template
                }
 
                // Load main template

-               $content = loadTemplate('runtime_fatal_table', true, $OUT);
+               $content = loadTemplate('runtime_fatal_table', TRUE, $OUT);

        }
 
        // Message to regular users (non-admin)
        }
 
        // Message to regular users (non-admin)


@@ -945,7 +945,7 @@ function FILTER_HANDLE_FATAL_ERRORS () {
        loadIncludeOnce('inc/header.php');
 
        // Load main template
        loadIncludeOnce('inc/header.php');
 
        // Load main template

-       loadTemplate('fatal_errors', false, $content);
+       loadTemplate('fatal_errors', FALSE, $content);

 
        // Delete all to prevent double-display
        initFatalMessages();
 
        // Delete all to prevent double-display
        initFatalMessages();


@@ -964,10 +964,10 @@ function FILTER_DISPLAY_COPYRIGHT () {
                // Backlink enabled?
                if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) {
                        // Copyright with backlink, thanks! :-)
                // Backlink enabled?
                if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) {
                        // Copyright with backlink, thanks! :-)

-                       $GLOBALS['__page_footer'] .= loadTemplate('copyright_backlink', true);
+                       $GLOBALS['__page_footer'] .= loadTemplate('copyright_backlink', TRUE);

                } else {
                        // No backlink in Copyright note
                } else {
                        // No backlink in Copyright note

-                       $GLOBALS['__page_footer'] .= loadTemplate('copyright', true);
+                       $GLOBALS['__page_footer'] .= loadTemplate('copyright', TRUE);

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1064,12 +1064,12 @@ function FILTER_DO_LOGIN_ADMIN ($filterData) {
 // Filter for loading page header, this should be ran first!
 function FILTER_LOAD_PAGE_HEADER () {
        // Output page header code
 // Filter for loading page header, this should be ran first!
 function FILTER_LOAD_PAGE_HEADER () {
        // Output page header code

-       $GLOBALS['__page_header'] = loadTemplate('page_header', true);
+       $GLOBALS['__page_header'] = loadTemplate('page_header', TRUE);

 
        // Include meta data in 'guest' module
        if ((isModuleSet()) && (getModule() == 'index')) {
                // Load meta data template
 
        // Include meta data in 'guest' module
        if ((isModuleSet()) && (getModule() == 'index')) {
                // Load meta data template

-               $GLOBALS['__page_header'] .= loadTemplate('metadata', true);
+               $GLOBALS['__page_header'] .= loadTemplate('metadata', TRUE);

 
                // Add meta description to header
                if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
 
                // Add meta description to header
                if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {


@@ -1118,7 +1118,7 @@ function FILTER_SET_CURRENT_DATE () {
 // Filter for marking extension as installed
 function FILTER_EXTENSION_MARK_INSTALLED ($filterData) {
        // Mark it as installed
 // Filter for marking extension as installed
 function FILTER_EXTENSION_MARK_INSTALLED ($filterData) {
        // Mark it as installed

-       $GLOBALS['ext_is_installed'][$filterData['ext_name']] = true;
+       $GLOBALS['ext_is_installed'][$filterData['ext_name']] = TRUE;

 }
 
 // Filter for generating mails links for 'pool' mails
 }
 
 // Filter for generating mails links for 'pool' mails


@@ -1126,7 +1126,7 @@ function FILTER_GENERATE_POOL_MAIL_LINKS ($filterData) {
        // Is type 'mid'?
        if ($filterData['type'] == 'mid') {
                // Load template
        // Is type 'mid'?
        if ($filterData['type'] == 'mid') {
                // Load template

-               $filterData['__output'] .= loadTemplate('admin_links_' . strtolower($filterData['mail_status']) . '_pool_mail', true, $filterData);
+               $filterData['__output'] .= loadTemplate('admin_links_' . strtolower($filterData['mail_status']) . '_pool_mail', TRUE, $filterData);

        } // END - if
 
        // Return data
        } // END - if
 
        // Return data


@@ -1138,7 +1138,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
        // Is the extension 'user' there?
        if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) {
                // Silently abort here
        // Is the extension 'user' there?
        if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) {
                // Silently abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Check total amount of users
        } // END - if
 
        // Check total amount of users

diff --git a/inc/fix_filters.php b/inc/fix_filters.php
index a181b258abedc6199cad7f1b12467c3426fe1a94..299b052f945811f2a1b048a0a7772072b304b671 100644 (file)
--- a/inc/fix_filters.php
+++ b/inc/fix_filters.php
@@ -55,7 +55,7 @@ if (!SQL_HASZERONUMS($result)) {
        // Load row by row
        while ($filter = SQL_FETCHARRAY($result)) {
                // Now search again for this filter and get it's total count
        // Load row by row
        while ($filter = SQL_FETCHARRAY($result)) {
                // Now search again for this filter and get it's total count

-               $count = countSumTotalData($filter['filter_name'], 'filters', 'filter_id', 'filter_name', true, sprintf(" AND `filter_function`='%s'", SQL_ESCAPE($filter['filter_function'])));
+               $count = countSumTotalData($filter['filter_name'], 'filters', 'filter_id', 'filter_name', TRUE, sprintf(" AND `filter_function`='%s'", SQL_ESCAPE($filter['filter_function'])));

 
                // Is there more than one entry?
                if ($count > 1) {
 
                // Is there more than one entry?
                if ($count > 1) {

diff --git a/inc/fix_menu.php b/inc/fix_menu.php
index 02696bb908ab5703094b96e0c96307cf9d7f1cf3..5fbfcab34de67a153b1efe2c87ebc0f0cc2a639c 100644 (file)
--- a/inc/fix_menu.php
+++ b/inc/fix_menu.php
@@ -59,10 +59,10 @@ foreach (array('guest','member','admin') as $menu) {
                        // Double entry, so get count
                        if (is_null($entry['what'])) {
                                // Main menu
                        // Double entry, so get count
                        if (is_null($entry['what'])) {
                                // Main menu

-                               $entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', true, " AND `what` IS NULL");
+                               $entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', TRUE, " AND `what` IS NULL");

                        } else {
                                // Sub menu
                        } else {
                                // Sub menu

-                               $entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', true, sprintf(" AND `what`='%s'", $entry['what']));
+                               $entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', TRUE, sprintf(" AND `what`='%s'", $entry['what']));

                        }
                        //* DEBUG: */ debugOutput('menu='.$menu.',action='.$entry['action'].',what='.$entry['what'].',entries='.$entries);
 
                        }
                        //* DEBUG: */ debugOutput('menu='.$menu.',action='.$entry['action'].',what='.$entry['what'].',entries='.$entries);
 

diff --git a/inc/footer.php b/inc/footer.php
index 58a447e4f57fa00fcc6ebefa6a38383c9415d46c..cd68a84503c668e1be621bc16a988c3ad2266c24 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -50,7 +50,7 @@ if ((((!isset($GLOBALS['__footer_sent'])) || (($GLOBALS['__footer_sent'] != 1) &
        runFilterChain('page_footer');
 
        // Load page footer
        runFilterChain('page_footer');
 
        // Load page footer

-       $GLOBALS['__page_footer'] .= loadTemplate('page_footer', true);
+       $GLOBALS['__page_footer'] .= loadTemplate('page_footer', TRUE);

 } // END - if
 
 // Footer has been reached
 } // END - if
 
 // Footer has been reached

diff --git a/inc/functions.php b/inc/functions.php
index 951f7e0e18285968e922fe0cdf65fa1a2b20af41..2a74c533cf6beaaa92d10b48105ee7fbd8ec10fa 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -192,7 +192,7 @@ function translateYesNo ($yn) {
 
 // Translates the american decimal dot into a german comma
 // OPPOMENT: convertCommaToDot()
 
 // Translates the american decimal dot into a german comma
 // OPPOMENT: convertCommaToDot()

-function translateComma ($dotted, $cut = true, $max = '0') {
+function translateComma ($dotted, $cut = TRUE, $max = '0') {

        // First, cast all to double, due to PHP changes
        $dotted = (double) $dotted;
 
        // First, cast all to double, due to PHP changes
        $dotted = (double) $dotted;
 


@@ -210,7 +210,7 @@ function translateComma ($dotted, $cut = true, $max = '0') {
        } // END - if
 
        // Cut zeros off?
        } // END - if
 
        // Cut zeros off?

-       if (($cut === true) && ($max == '0')) {
+       if (($cut === TRUE) && ($max == '0')) {

                // Test for commata if in cut-mode
                $com = explode('.', $dotted);
                if (count($com) < 2) {
                // Test for commata if in cut-mode
                $com = explode('.', $dotted);
                if (count($com) < 2) {


@@ -306,7 +306,7 @@ function translateMenuVisibleLocked ($content, $prefix = '') {
                        break;
 
                default: // Please report this
                        break;
 
                default: // Please report this

-                       reportBug(__FUNCTION__, __LINE__, 'Unsupported visible value detected. content=<pre>' . print_r($content, true) . '</pre>');
+                       reportBug(__FUNCTION__, __LINE__, 'Unsupported visible value detected. content=<pre>' . print_r($content, TRUE) . '</pre>');

                        break;
        } // END - switch
 
                        break;
        } // END - switch
 


@@ -321,7 +321,7 @@ function translateMenuVisibleLocked ($content, $prefix = '') {
                        break;
 
                default: // Please report this
                        break;
 
                default: // Please report this

-                       reportBug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=<pre>' . print_r($content, true) . '</pre>');
+                       reportBug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=<pre>' . print_r($content, TRUE) . '</pre>');

                        break;
        } // END - switch
 
                        break;
        } // END - switch
 


@@ -401,7 +401,7 @@ function makeTime ($hours, $minutes, $seconds, $stamp) {
 }
 
 // Redirects to an URL and if neccessarry extends it with own base URL
 }
 
 // Redirects to an URL and if neccessarry extends it with own base URL

-function redirectToUrl ($url, $allowSpider = true) {
+function redirectToUrl ($url, $allowSpider = TRUE) {

        // Is the output mode -2?
        if (isAjaxOutputMode()) {
                // This is always (!) an AJAX request and shall not be redirected
        // Is the output mode -2?
        if (isAjaxOutputMode()) {
                // This is always (!) an AJAX request and shall not be redirected


@@ -433,11 +433,11 @@ function redirectToUrl ($url, $allowSpider = true) {
        // We should not sent a redirect if headers are already sent
        if (!headers_sent()) {
                // Load URL when headers are not sent
        // We should not sent a redirect if headers are already sent
        if (!headers_sent()) {
                // Load URL when headers are not sent

-               sendRawRedirect(doFinalCompilation(str_replace('&amp;', '&', $url), false));
+               sendRawRedirect(doFinalCompilation(str_replace('&amp;', '&', $url), FALSE));

        } else {
                // Output error message
                loadInclude('inc/header.php');
        } else {
                // Output error message
                loadInclude('inc/header.php');

-               loadTemplate('redirect_url', false, str_replace('&amp;', '&', $url));
+               loadTemplate('redirect_url', FALSE, str_replace('&amp;', '&', $url));

                loadInclude('inc/footer.php');
        }
 
                loadInclude('inc/footer.php');
        }
 


@@ -454,26 +454,26 @@ function redirectToUrl ($url, $allowSpider = true) {
  * $a_sort - Array, das die Sortiereihenfolge der ersten Elementeben    *
  * $primary_key - Primaerschl.ssel aus $a_sort, nach dem sortiert wird  *
  * $order - Sortiereihenfolge: -1 = a-Z, 0 = keine, 1 = Z-a             *
  * $a_sort - Array, das die Sortiereihenfolge der ersten Elementeben    *
  * $primary_key - Primaerschl.ssel aus $a_sort, nach dem sortiert wird  *
  * $order - Sortiereihenfolge: -1 = a-Z, 0 = keine, 1 = Z-a             *

- * $nums - true = Als Zahlen sortieren, false = Als Zeichen sortieren   *
+ * $nums - TRUE = Als Zahlen sortieren, FALSE = Als Zeichen sortieren   *

  *                                                                      *
  * $a_sort muss Elemente enthalten, deren Wert Schluessel von $array    *
  * sind... Klingt kompliziert, suchen Sie mal mein Beispiel, dann sehen *
  * Sie, dass es doch nicht so schwer ist! :-)                           *
  *                                                                      *
  ************************************************************************/
  *                                                                      *
  * $a_sort muss Elemente enthalten, deren Wert Schluessel von $array    *
  * sind... Klingt kompliziert, suchen Sie mal mein Beispiel, dann sehen *
  * Sie, dass es doch nicht so schwer ist! :-)                           *
  *                                                                      *
  ************************************************************************/

-function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) {
+function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = FALSE) {

        $temporaryArray = $array;
        while ($primary_key < count($a_sort)) {
                foreach ($temporaryArray[$a_sort[$primary_key]] as $key => $value) {
                        foreach ($temporaryArray[$a_sort[$primary_key]] as $key2 => $value2) {
        $temporaryArray = $array;
        while ($primary_key < count($a_sort)) {
                foreach ($temporaryArray[$a_sort[$primary_key]] as $key => $value) {
                        foreach ($temporaryArray[$a_sort[$primary_key]] as $key2 => $value2) {

-                               $match = false;
-                               if ($nums === false) {
+                               $match = FALSE;
+                               if ($nums === FALSE) {

                                        // Sort byte-by-byte (also numbers will be interpreted as chars! E.g.: "9" > "10")
                                        // Sort byte-by-byte (also numbers will be interpreted as chars! E.g.: "9" > "10")

-                                       if (($key != $key2) && (strcmp(strtolower($temporaryArray[$a_sort[$primary_key]][$key]), strtolower($temporaryArray[$a_sort[$primary_key]][$key2])) == $order)) $match = true;
+                                       if (($key != $key2) && (strcmp(strtolower($temporaryArray[$a_sort[$primary_key]][$key]), strtolower($temporaryArray[$a_sort[$primary_key]][$key2])) == $order)) $match = TRUE;

                                } elseif ($key != $key2) {
                                        // Sort numbers (E.g.: 9 < 10)
                                } elseif ($key != $key2) {
                                        // Sort numbers (E.g.: 9 < 10)

-                                       if (($temporaryArray[$a_sort[$primary_key]][$key] < $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true;
-                                       if (($temporaryArray[$a_sort[$primary_key]][$key] > $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == 1))  $match = true;
+                                       if (($temporaryArray[$a_sort[$primary_key]][$key] < $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = TRUE;
+                                       if (($temporaryArray[$a_sort[$primary_key]][$key] > $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == 1))  $match = TRUE;

                                }
 
                                if ($match) {
                                }
 
                                if ($match) {


@@ -567,19 +567,19 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
 }
 
 // Does only allow numbers
 }
 
 // Does only allow numbers

-function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
+function bigintval ($num, $castValue = TRUE, $abortOnMismatch = TRUE) {

        //* DEBUG: */ debugOutput('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . 'num=' . $num . ',castValue=' . intval($castValue) . ',abortOnMismatch=' . intval($abortOnMismatch) . ' - ENTERED!');
        // Filter all numbers out
        $ret = preg_replace('/[^0123456789]/', '', $num);
 
        // Shall we cast?
        //* DEBUG: */ debugOutput('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . 'num=' . $num . ',castValue=' . intval($castValue) . ',abortOnMismatch=' . intval($abortOnMismatch) . ' - ENTERED!');
        // Filter all numbers out
        $ret = preg_replace('/[^0123456789]/', '', $num);
 
        // Shall we cast?

-       if ($castValue === true) {
+       if ($castValue === TRUE) {

                // Cast to biggest numeric type
                $ret = (double) $ret;
        } // END - if
 
        // Has the whole value changed?
                // Cast to biggest numeric type
                $ret = (double) $ret;
        } // END - if
 
        // Has the whole value changed?

-       if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true) && (!is_null($num))) {
+       if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === TRUE) && (!is_null($num))) {

                // Log the values
                reportBug(__FUNCTION__, __LINE__, 'Problem with number found. ret[' . gettype($ret) . ']=' . $ret . ', num[' . gettype($num) . ']='. $num);
        } // END - if
                // Log the values
                reportBug(__FUNCTION__, __LINE__, 'Problem with number found. ret[' . gettype($ret) . ']=' . $ret . ', num[' . gettype($num) . ']='. $num);
        } // END - if


@@ -632,7 +632,7 @@ function createEpocheTimeFromSelections ($prefix, $postData) {
 // Creates a 'fancy' human-readable timestamp from a Uni* stamp
 function createFancyTime ($stamp) {
        // Get data array with years/months/weeks/days/...
 // Creates a 'fancy' human-readable timestamp from a Uni* stamp
 function createFancyTime ($stamp) {
        // Get data array with years/months/weeks/days/...

-       $data = createTimeSelections($stamp, '', '', '', true);
+       $data = createTimeSelections($stamp, '', '', '', TRUE);

        $ret = '';
        foreach ($data as $k => $v) {
                if ($v > 0) {
        $ret = '';
        foreach ($data as $k => $v) {
                if ($v > 0) {


@@ -680,21 +680,21 @@ function isEmailValid ($email) {
 }
 
 // Function taken from user comments on www.php.net / function isInStringIgnoreCase()
 }
 
 // Function taken from user comments on www.php.net / function isInStringIgnoreCase()

-function isUrlValid ($url, $compile = true) {
+function isUrlValid ($url, $compile = TRUE) {

        // Trim URL a little
        $url = trim(urldecode($url));
        //* DEBUG: */ debugOutput($url);
 
        // Compile some chars out...
        // Trim URL a little
        $url = trim(urldecode($url));
        //* DEBUG: */ debugOutput($url);
 
        // Compile some chars out...

-       if ($compile === true) {
-               $url = compileUriCode($url, false, false, false);
+       if ($compile === TRUE) {
+               $url = compileUriCode($url, FALSE, FALSE, FALSE);

        } // END - if
        //* DEBUG: */ debugOutput($url);
 
        // Check for the extension filter
        if (isExtensionActive('filter')) {
                // Use the extension's filter set
        } // END - if
        //* DEBUG: */ debugOutput($url);
 
        // Check for the extension filter
        if (isExtensionActive('filter')) {
                // Use the extension's filter set

-               return FILTER_VALIDATE_URL($url, false);
+               return FILTER_VALIDATE_URL($url, FALSE);

        } // END - if
 
        /*
        } // END - if
 
        /*


@@ -705,7 +705,7 @@ function isUrlValid ($url, $compile = true) {
 }
 
 // Generate a hash for extra-security for all passwords
 }
 
 // Generate a hash for extra-security for all passwords

-function generateHash ($plainText, $salt = '', $hash = true) {
+function generateHash ($plainText, $salt = '', $hash = TRUE) {

        // Debug output
        //* DEBUG: */ debugOutput('plainText('.strlen($plainText).')=' . $plainText . ',salt('.strlen($salt).')=' . $salt . ',hash=' . intval($hash));
 
        // Debug output
        //* DEBUG: */ debugOutput('plainText('.strlen($plainText).')=' . $plainText . ',salt('.strlen($salt).')=' . $salt . ',hash=' . intval($hash));
 


@@ -713,7 +713,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
        // 123                            4                      43    3     4     432    2                  3             32    2                             3                32    2      3     3      21
        if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) && (empty($salt))) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5')) || (strlen($salt) == 32)) {
                // Extension ext-sql_patches is missing/outdated so we hash the plain text with MD5
        // 123                            4                      43    3     4     432    2                  3             32    2                             3                32    2      3     3      21
        if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) && (empty($salt))) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5')) || (strlen($salt) == 32)) {
                // Extension ext-sql_patches is missing/outdated so we hash the plain text with MD5

-               if ($hash === true) {
+               if ($hash === TRUE) {

                        // Is plain password
                        return md5($plainText);
                } else {
                        // Is plain password
                        return md5($plainText);
                } else {


@@ -737,7 +737,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
                $keys   = getSiteKey() . getEncryptSeparator() . getDateKey() . getEncryptSeparator() . getSecretKey() . getEncryptSeparator() . getFileHash() . getEncryptSeparator() . getDateFromRepository() . getEncryptSeparator() . getMasterSalt();
 
                // Additional data
                $keys   = getSiteKey() . getEncryptSeparator() . getDateKey() . getEncryptSeparator() . getSecretKey() . getEncryptSeparator() . getFileHash() . getEncryptSeparator() . getDateFromRepository() . getEncryptSeparator() . getMasterSalt();
 
                // Additional data

-               $data = $plainText . getEncryptSeparator() . uniqid(mt_rand(), true) . getEncryptSeparator() . time();
+               $data = $plainText . getEncryptSeparator() . uniqid(mt_rand(), TRUE) . getEncryptSeparator() . time();

 
                // Calculate number for generating the code
                $a = time() + getConfig('_ADD') - 1;
 
                // Calculate number for generating the code
                $a = time() + getConfig('_ADD') - 1;


@@ -1020,7 +1020,7 @@ function debug_get_mailable_backtrace () {
 
 // Generates a ***weak*** seed
 function generateSeed () {
 
 // Generates a ***weak*** seed
 function generateSeed () {

-       return microtime(true) * 100000;
+       return microtime(TRUE) * 100000;

 }
 
 // Converts a message code to a human-readable message
 }
 
 // Converts a message code to a human-readable message


@@ -1071,7 +1071,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('LOGIN_EMPTY_PASSWORD'): $message = '{--LOGIN_PASSWORD_IS_EMPTY--}'; break;
 
                case getCode('ERROR_MAILID'):
                case getCode('LOGIN_EMPTY_PASSWORD'): $message = '{--LOGIN_PASSWORD_IS_EMPTY--}'; break;
 
                case getCode('ERROR_MAILID'):

-                       if (isExtensionActive('mailid', true)) {
+                       if (isExtensionActive('mailid', TRUE)) {

                                $message = '{--ERROR_CONFIRMING_MAIL--}';
                        } else {
                                $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}';
                                $message = '{--ERROR_CONFIRMING_MAIL--}';
                        } else {
                                $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}';


@@ -1110,7 +1110,7 @@ function getMessageFromErrorCode ($code) {
                        $content['seconds'] = round(getUrlTlock() - $content['hours'] * 60 * 60 - $content['minutes'] * 60);
 
                        // Finally contruct the message
                        $content['seconds'] = round(getUrlTlock() - $content['hours'] * 60 * 60 - $content['minutes'] * 60);
 
                        // Finally contruct the message

-                       $message = loadTemplate('tlock_message', true, $content);
+                       $message = loadTemplate('tlock_message', TRUE, $content);

                        break;
 
                default:
                        break;
 
                default:


@@ -1169,7 +1169,7 @@ function isUrlValidSimple ($url) {
        $pattern['ipg12']  = $http . $ip . $getstring1;
 
        // Test all patterns
        $pattern['ipg12']  = $http . $ip . $getstring1;
 
        // Test all patterns

-       $reg = false;
+       $reg = FALSE;

        foreach ($pattern as $key => $pat) {
                // Debug regex?
                if (isDebugRegularExpressionEnabled()) {
        foreach ($pattern as $key => $pat) {
                // Debug regex?
                if (isDebugRegularExpressionEnabled()) {


@@ -1183,7 +1183,7 @@ function isUrlValidSimple ($url) {
                $reg = ($reg || preg_match(('^' . $pat . '^'), $url));
 
                // Does it match?
                $reg = ($reg || preg_match(('^' . $pat . '^'), $url));
 
                // Does it match?

-               if ($reg === true) {
+               if ($reg === TRUE) {

                        break;
                } // END - if
        } // END - foreach
                        break;
                } // END - if
        } // END - foreach


@@ -1197,10 +1197,10 @@ function isUrlValidSimple ($url) {
 // @TODO Rewrite this function to use readFromFile() and writeToFile()
 function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0) {
        // Initialize some variables
 // @TODO Rewrite this function to use readFromFile() and writeToFile()
 function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0) {
        // Initialize some variables

-       $done = false;
+       $done = FALSE;

        $seek++;
        $next  = -1;
        $seek++;
        $next  = -1;

-       $found = false;
+       $found = FALSE;

 
        // Is the file there and read-/write-able?
        if ((isFileReadable($FQFN)) && (is_writeable($FQFN))) {
 
        // Is the file there and read-/write-able?
        if ((isFileReadable($FQFN)) && (is_writeable($FQFN))) {


@@ -1218,7 +1218,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
                        // Is the resource again valid?
                        if (is_resource($fp_tmp)) {
                                // Mark temporary file as readable
                        // Is the resource again valid?
                        if (is_resource($fp_tmp)) {
                                // Mark temporary file as readable

-                               $GLOBALS['file_readable'][$tmp] = true;
+                               $GLOBALS['file_readable'][$tmp] = TRUE;

 
                                // Start reading
                                while (!feof($fp)) {
 
                                // Start reading
                                while (!feof($fp)) {


@@ -1227,7 +1227,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
 
                                        if (isInString($search, $line)) {
                                                $next = '0';
 
                                        if (isInString($search, $line)) {
                                                $next = '0';

-                                               $found = true;
+                                               $found = TRUE;

                                        } // END - if
 
                                        if ($next > -1) {
                                        } // END - if
 
                                        if ($next > -1) {


@@ -1247,17 +1247,17 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
                                fclose($fp_tmp);
 
                                // Finished writing tmp file
                                fclose($fp_tmp);
 
                                // Finished writing tmp file

-                               $done = true;
+                               $done = TRUE;

                        } // END - if
 
                        // Close source file
                        fclose($fp);
 
                        } // END - if
 
                        // Close source file
                        fclose($fp);
 

-                       if (($done === true) && ($found === true)) {
+                       if (($done === TRUE) && ($found === TRUE)) {

                                // Copy back tmp file and delete tmp :-)
                                copyFileVerified($tmp, $FQFN, 0644);
                                return removeFile($tmp);
                                // Copy back tmp file and delete tmp :-)
                                copyFileVerified($tmp, $FQFN, 0644);
                                return removeFile($tmp);

-                       } elseif ($found === false) {
+                       } elseif ($found === FALSE) {

                                outputHtml('<strong>CHANGE:</strong> 404!');
                        } else {
                                outputHtml('<strong>TMP:</strong> UNDONE!');
                                outputHtml('<strong>CHANGE:</strong> 404!');
                        } else {
                                outputHtml('<strong>TMP:</strong> UNDONE!');


@@ -1269,18 +1269,18 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
        }
 
        // An error was detected!
        }
 
        // An error was detected!

-       return false;
+       return FALSE;

 }
 
 // Debug message logger
 function logDebugMessage ($funcFile, $line, $message, $force=true) {
        // Is debug mode enabled?
 }
 
 // Debug message logger
 function logDebugMessage ($funcFile, $line, $message, $force=true) {
        // Is debug mode enabled?

-       if ((isDebugModeEnabled()) || ($force === true)) {
+       if ((isDebugModeEnabled()) || ($force === TRUE)) {

                // Remove CRLF
                $message = str_replace(array(chr(13), chr(10)), array('', ''), $message);
 
                // Log this message away
                // Remove CRLF
                $message = str_replace(array(chr(13), chr(10)), array('', ''), $message);
 
                // Log this message away

-               appendLineToFile(getPath() . getCachePath() . 'debug.log', generateDateTime(time(), '4') . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message);
+               appendLineToFile(getPath() . getCachePath() . 'debug.log', generateDateTime(time(), '4') . '|' . getModule(FALSE) . '|' . basename($funcFile) . '|' . $line . '|' . $message);

        } // END - if
 }
 
        } // END - if
 }
 


@@ -1294,7 +1294,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
                // Does the filter function exist?
                if (function_exists($filterFunction)) {
                        // Is there extra parameters here?
                // Does the filter function exist?
                if (function_exists($filterFunction)) {
                        // Is there extra parameters here?

-                       if (!empty($extraValue)) {
+                       if ((!is_null($extraValue)) && (!empty($extraValue))) {

                                // Put both parameters in one new array by default
                                $args = array($value, $extraValue);
 
                                // Put both parameters in one new array by default
                                $args = array($value, $extraValue);
 


@@ -1308,16 +1308,17 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
                                $ret = call_user_func_array($filterFunction, $args);
 
                                // Is $ret 'true'?
                                $ret = call_user_func_array($filterFunction, $args);
 
                                // Is $ret 'true'?

-                               if ($ret === true) {
+                               if ($ret === TRUE) {

                                        // Test passed, so write direct value
                                        $ret = $args;
                                } // END - if
                        } else {
                                // One parameter call
                                $ret = call_user_func($filterFunction, $value);
                                        // Test passed, so write direct value
                                        $ret = $args;
                                } // END - if
                        } else {
                                // One parameter call
                                $ret = call_user_func($filterFunction, $value);

+                               //* BUG */ die('ret['.gettype($ret).']=' . $ret . ',value=' . $value.',filterFunction=' . $filterFunction);

 
                                // Is $ret 'true'?
 
                                // Is $ret 'true'?

-                               if ($ret === true) {
+                               if ($ret === TRUE) {

                                        // Test passed, so write direct value
                                        $ret = $value;
                                } // END - if
                                        // Test passed, so write direct value
                                        $ret = $value;
                                } // END - if


@@ -1332,7 +1333,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 // Converts timestamp selections into a timestamp
 function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id, &$skip) {
        // Init test variable
 // Converts timestamp selections into a timestamp
 function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id, &$skip) {
        // Init test variable

-       $skip  = false;
+       $skip  = FALSE;

        $test2 = '';
 
        // Get last three chars
        $test2 = '';
 
        // Get last three chars


@@ -1346,7 +1347,7 @@ function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id,
                        // Generate timestamp
                        $postData[$test] = createEpocheTimeFromSelections($test, $postData);
                        array_push($content, sprintf("`%s`='%s'", $test, $postData[$test]));
                        // Generate timestamp
                        $postData[$test] = createEpocheTimeFromSelections($test, $postData);
                        array_push($content, sprintf("`%s`='%s'", $test, $postData[$test]));

-                       $GLOBALS['skip_config'][$test] = true;
+                       $GLOBALS['skip_config'][$test] = TRUE;

 
                        // Remove data from array
                        foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) {
 
                        // Remove data from array
                        foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) {


@@ -1355,7 +1356,7 @@ function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id,
 
                        // Skip adding
                        unset($id);
 
                        // Skip adding
                        unset($id);

-                       $skip = true;
+                       $skip = TRUE;

                        $test2 = $test;
                } // END - if
        } // END - if
                        $test2 = $test;
                } // END - if
        } // END - if


@@ -1365,7 +1366,7 @@ function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id,
 // OPPOMENT: translateComma()
 function convertCommaToDot ($str) {
        // Default float is not a float... ;-)
 // OPPOMENT: translateComma()
 function convertCommaToDot ($str) {
        // Default float is not a float... ;-)

-       $float = false;
+       $float = FALSE;

 
        // Which language is selected?
        switch (getLanguage()) {
 
        // Which language is selected?
        switch (getLanguage()) {


@@ -1404,7 +1405,7 @@ function handleLoginFailures ($accessLevel) {
                        );
 
                        // Load template
                        );
 
                        // Load template

-                       $OUT = loadTemplate('login_failures', true, $content);
+                       $OUT = loadTemplate('login_failures', TRUE, $content);

                } // END - if
 
                // Reset session data
                } // END - if
 
                // Reset session data


@@ -1417,7 +1418,7 @@ function handleLoginFailures ($accessLevel) {
 }
 
 // Rebuild cache
 }
 
 // Rebuild cache

-function rebuildCache ($cache, $inc = '', $force = false) {
+function rebuildCache ($cache, $inc = '', $force = FALSE) {

        // Debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
 
        // Debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
 


@@ -1448,7 +1449,7 @@ function rebuildCache ($cache, $inc = '', $force = false) {
 }
 
 // Determines the real remote address
 }
 
 // Determines the real remote address

-function determineRealRemoteAddress ($remoteAddr = false) {
+function determineRealRemoteAddress ($remoteAddr = FALSE) {

        // Default is 127.0.0.1
        $address = '127.0.0.1';
 
        // Default is 127.0.0.1
        $address = '127.0.0.1';
 


@@ -1476,7 +1477,7 @@ function determineRealRemoteAddress ($remoteAddr = false) {
 
 // Adds a bonus mail to the queue
 // This is a high-level function!
 
 // Adds a bonus mail to the queue
 // This is a high-level function!

-function addNewBonusMail ($data, $mode = '', $output = true) {
+function addNewBonusMail ($data, $mode = '', $output = TRUE) {

        // Use mode from data if not set and availble ;-)
        if ((empty($mode)) && (isset($data['mail_mode']))) {
                $mode = $data['mail_mode'];
        // Use mode from data if not set and availble ;-)
        if ((empty($mode)) && (isset($data['mail_mode']))) {
                $mode = $data['mail_mode'];


@@ -1501,10 +1502,10 @@ function addNewBonusMail ($data, $mode = '', $output = true) {
                );
 
                // Mail inserted into bonus pool
                );
 
                // Mail inserted into bonus pool

-               if ($output === true) {
+               if ($output === TRUE) {

                        displayMessage('{--ADMIN_BONUS_SEND--}');
                } // END - if
                        displayMessage('{--ADMIN_BONUS_SEND--}');
                } // END - if

-       } elseif ($output === true) {
+       } elseif ($output === TRUE) {

                // More entered than can be reached!
                displayMessage('{--ADMIN_MORE_SELECTED--}');
        } else {
                // More entered than can be reached!
                displayMessage('{--ADMIN_MORE_SELECTED--}');
        } else {


@@ -1516,7 +1517,7 @@ function addNewBonusMail ($data, $mode = '', $output = true) {
 // Enables the reset mode and runs it
 function doReset () {
        // Enable the reset mode
 // Enables the reset mode and runs it
 function doReset () {
        // Enable the reset mode

-       $GLOBALS['reset_enabled'] = true;
+       $GLOBALS['reset_enabled'] = TRUE;

 
        // Run filters
        runFilterChain('reset');
 
        // Run filters
        runFilterChain('reset');


@@ -1525,7 +1526,7 @@ function doReset () {
 // Enables the reset mode (hourly, weekly and monthly) and runs it
 function doHourly () {
        // Enable the hourly reset mode
 // Enables the reset mode (hourly, weekly and monthly) and runs it
 function doHourly () {
        // Enable the hourly reset mode

-       $GLOBALS['hourly_enabled'] = true;
+       $GLOBALS['hourly_enabled'] = TRUE;

 
        // Run filters (one always!)
        runFilterChain('hourly');
 
        // Run filters (one always!)
        runFilterChain('hourly');


@@ -1623,7 +1624,7 @@ function isExtraTitleSet () {
  * @param      $suffix                         Suffix for positive matches ($extension will be appended, too)
  * @return     $foundMatches           All found positive matches for above criteria
  */
  * @param      $suffix                         Suffix for positive matches ($extension will be appended, too)
  * @return     $foundMatches           All found positive matches for above criteria
  */

-function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true, $suffix = '') {
+function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = FALSE, $addBaseDir = TRUE, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = TRUE, $suffix = '') {

        // Add default entries we should always exclude
        array_unshift($excludeArray, '.', '..', '.svn', '.htaccess');
 
        // Add default entries we should always exclude
        array_unshift($excludeArray, '.', '..', '.svn', '.htaccess');
 


@@ -1637,7 +1638,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
        // Read all entries
        while ($baseFile = readdir($dirPointer)) {
                // Exclude '.', '..' and entries in $excludeArray automatically
        // Read all entries
        while ($baseFile = readdir($dirPointer)) {
                // Exclude '.', '..' and entries in $excludeArray automatically

-               if (in_array($baseFile, $excludeArray, true))  {
+               if (in_array($baseFile, $excludeArray, TRUE))  {

                        // Exclude them
                        //* DEBUG: */ debugOutput('excluded=' . $baseFile);
                        continue;
                        // Exclude them
                        //* DEBUG: */ debugOutput('excluded=' . $baseFile);
                        continue;


@@ -1660,7 +1661,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
                } // END - if
 
                // Skip also files with non-matching prefix genericly
                } // END - if
 
                // Skip also files with non-matching prefix genericly

-               if (($recursive === true) && (isDirectory($FQFN))) {
+               if (($recursive === TRUE) && (isDirectory($FQFN))) {

                        // Is a redirectory so read it as well
                        $foundMatches = merge_array($foundMatches, getArrayFromDirectory($baseDir . $baseFile . '/', $prefix, $fileIncludeDirs, $addBaseDir, $excludeArray, $extension, $excludePattern, $recursive));
 
                        // Is a redirectory so read it as well
                        $foundMatches = merge_array($foundMatches, getArrayFromDirectory($baseDir . $baseFile . '/', $prefix, $fileIncludeDirs, $addBaseDir, $excludeArray, $extension, $excludePattern, $recursive));
 


@@ -1692,14 +1693,14 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 
                // Is the file a PHP script or other?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',prefix=' . $prefix . ',baseFile=' . $baseFile);
 
                // Is the file a PHP script or other?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',prefix=' . $prefix . ',baseFile=' . $baseFile);

-               if (($fileExtension == '.php') || (($fileIncludeDirs === true) && (isDirectory($FQFN)))) {
+               if (($fileExtension == '.php') || (($fileIncludeDirs === TRUE) && (isDirectory($FQFN)))) {

                        // Is this a valid include file?
                        if ($extension == '.php') {
                                // Remove both for extension name
                                $extName = substr($baseFile, strlen($prefix), -4);
 
                                // Add file with or without base path
                        // Is this a valid include file?
                        if ($extension == '.php') {
                                // Remove both for extension name
                                $extName = substr($baseFile, strlen($prefix), -4);
 
                                // Add file with or without base path

-                               if ($addBaseDir === true) {
+                               if ($addBaseDir === TRUE) {

                                        // With base path
                                        array_push($foundMatches, $fileName);
                                } else {
                                        // With base path
                                        array_push($foundMatches, $fileName);
                                } else {


@@ -1761,7 +1762,7 @@ function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
        } // END - if
        
        // Don't execute anything here if we don't need or ext-other is missing
        } // END - if
        
        // Don't execute anything here if we don't need or ext-other is missing

-       if ($GLOBALS['debug_sql_available'] === false) {
+       if ($GLOBALS['debug_sql_available'] === FALSE) {

                return;
        } // END - if
 
                return;
        } // END - if
 


@@ -1772,7 +1773,7 @@ function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
        } // END - if
 
        // Remeber this as profiled (or not, but we don't care here)
        } // END - if
 
        // Remeber this as profiled (or not, but we don't care here)

-       $GLOBALS['debug_sqls'][$F][$L][$sqlString] = true;
+       $GLOBALS['debug_sqls'][$F][$L][$sqlString] = TRUE;

 
        // Generate record
        $record = array(
 
        // Generate record
        $record = array(


@@ -1864,7 +1865,7 @@ function encodeUrl ($url, $outputMode = '0') {
        } // END - if
 
        // Is there a valid session?
        } // END - if
 
        // Is there a valid session?

-       if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
+       if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === FALSE) || (!isset($_COOKIE[session_name()]))) && (isSpider() === FALSE)) {

                // Determine right separator
                $separator = '&amp;';
                if (!isInString('?', $url)) {
                // Determine right separator
                $separator = '&amp;';
                if (!isInString('?', $url)) {


@@ -1900,12 +1901,12 @@ function encodeUrl ($url, $outputMode = '0') {
 // Simple check for spider
 function isSpider () {
        // Get the UA and trim it down
 // Simple check for spider
 function isSpider () {
        // Get the UA and trim it down

-       $userAgent = trim(detectUserAgent(true));
+       $userAgent = trim(detectUserAgent(TRUE));

 
        // It should not be empty, if so it is better a spider/bot
        if (empty($userAgent)) {
                // It is a spider/bot
 
        // It should not be empty, if so it is better a spider/bot
        if (empty($userAgent)) {
                // It is a spider/bot

-               return true;
+               return TRUE;

        } // END - if
 
        // Is it a spider?
        } // END - if
 
        // Is it a spider?


@@ -1920,7 +1921,7 @@ function searchDirsRecursive ($dir, &$last_changed, $lookFor = 'Date') {
        // RegexPattern to exclude  ., .., .revision,  .svn, debug.log or .cache in the filenames
        $excludePattern = '@(\.revision|\.svn|debug\.log|\.cache|config\.php)$@';
 
        // RegexPattern to exclude  ., .., .revision,  .svn, debug.log or .cache in the filenames
        $excludePattern = '@(\.revision|\.svn|debug\.log|\.cache|config\.php)$@';
 

-       $ds = getArrayFromDirectory($dir, '', false, true, array(), '.php', $excludePattern);
+       $ds = getArrayFromDirectory($dir, '', FALSE, TRUE, array(), '.php', $excludePattern);

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count(ds)='.count($ds));
 
        // Walk through all entries
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count(ds)='.count($ds));
 
        // Walk through all entries


@@ -2147,7 +2148,7 @@ function detectMultiBytePrefix ($str) {
        $mbPrefix = '';
 
        // Detect multi-byte (strictly)
        $mbPrefix = '';
 
        // Detect multi-byte (strictly)

-       if (mb_detect_encoding($str, 'auto', true) !== false) {
+       if (mb_detect_encoding($str, 'auto', TRUE) !== FALSE) {

                // With multi-byte encoded string
                $mbPrefix = 'mb_';
        } // END - if
                // With multi-byte encoded string
                $mbPrefix = 'mb_';
        } // END - if


@@ -2165,7 +2166,7 @@ function getArrayKeysFromSubStrArray ($heystack, $needles, $offset = 0) {
        foreach ($needles as $key => $needle) {
                // Is there found a partial string?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'heystack='.$heystack.',key='.$key.',needle='.$needle.',offset='.$offset);
        foreach ($needles as $key => $needle) {
                // Is there found a partial string?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'heystack='.$heystack.',key='.$key.',needle='.$needle.',offset='.$offset);

-               if (strpos($heystack, $needle, $offset) !== false) {
+               if (strpos($heystack, $needle, $offset) !== FALSE) {

                        // Add the found key
                        array_push($keys, $key);
                } // END - if
                        // Add the found key
                        array_push($keys, $key);
                } // END - if


@@ -2182,7 +2183,7 @@ function determinePointsColumnFromSubjectLocked ($subject, $locked) {
        $pointsColumn = 'points';
 
        // Which points, locked or normal?
        $pointsColumn = 'points';
 
        // Which points, locked or normal?

-       if ($locked === true) {
+       if ($locked === TRUE) {

                $pointsColumn = 'locked_points';
        } // END - if
 
                $pointsColumn = 'locked_points';
        } // END - if
 


@@ -2208,7 +2209,7 @@ function determinePointsColumnFromSubjectLocked ($subject, $locked) {
 function convertBooleanToYesNo ($boolean) {
        // Default is 'N'
        $converted = 'N';
 function convertBooleanToYesNo ($boolean) {
        // Default is 'N'
        $converted = 'N';

-       if ($boolean === true) {
+       if ($boolean === TRUE) {

                // Set 'Y'
                $converted = 'Y';
        } // END - if
                // Set 'Y'
                $converted = 'Y';
        } // END - if


@@ -2287,7 +2288,7 @@ function memberAddEntries ($tableName, $columns = array(), $filterFunctions = ar
        // Is it a member?
        if (!isMember()) {
                // Then abort here
        // Is it a member?
        if (!isMember()) {
                // Then abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Set POST data generic userid
        } // END - if
 
        // Set POST data generic userid


@@ -2297,7 +2298,7 @@ function memberAddEntries ($tableName, $columns = array(), $filterFunctions = ar
        doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
        // Entry has been added?
        doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
        // Entry has been added?

-       if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
+       if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === TRUE)) {

                // Display success message
                displayMessage('{--MEMBER_ENTRY_ADDED--}');
        } else {
                // Display success message
                displayMessage('{--MEMBER_ENTRY_ADDED--}');
        } else {


@@ -2307,7 +2308,7 @@ function memberAddEntries ($tableName, $columns = array(), $filterFunctions = ar
 }
 
 // Edit rows by given id numbers
 }
 
 // Edit rows by given id numbers

-function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {

        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified


@@ -2324,7 +2325,7 @@ function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFuncti
        } // END - if
 
        // Shall we change here or list for editing?
        } // END - if
 
        // Shall we change here or list for editing?

-       if ($editNow[0] === true) {
+       if ($editNow[0] === TRUE) {

                // Add generic userid field
                setPostRequestElement('userid', getMemberId());
 
                // Add generic userid field
                setPostRequestElement('userid', getMemberId());
 


@@ -2346,7 +2347,7 @@ function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFuncti
 }
 
 // Delete rows by given id numbers
 }
 
 // Delete rows by given id numbers

-function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {

        // Do this only for members
        assert(isMember());
 
        // Do this only for members
        assert(isMember());
 


@@ -2366,7 +2367,7 @@ function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunc
        } // END - if
 
        // Shall we delete here or list for deletion?
        } // END - if
 
        // Shall we delete here or list for deletion?

-       if ($deleteNow[0] === true) {
+       if ($deleteNow[0] === TRUE) {

                // Add generic userid field
                setPostRequestElement('userid', getMemberId());
 
                // Add generic userid field
                setPostRequestElement('userid', getMemberId());
 

diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index 686808daca23514b925e6f16f240ccd9b8d8c79f..6821e945faddbc9c213251e95b2fce320458057f 100644 (file)
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -65,7 +65,7 @@ SQL_FREERESULT($result_media);
 // Check for bonus extension
 if (isExtensionActive('bonus')) {
        // Count bonus mails
 // Check for bonus extension
 if (isExtensionActive('bonus')) {
        // Count bonus mails

-       $bcount = countSumTotalData('', 'bonus', 'id', '', true);
+       $bcount = countSumTotalData('', 'bonus', 'id', '', TRUE);

 
        // Check for bonus mails
        $result_media = SQL_QUERY('SELECT
 
        // Check for bonus mails
        $result_media = SQL_QUERY('SELECT


@@ -88,7 +88,7 @@ loadIncludeOnce('inc/libs/mediadata_functions.php');
 // Insert info to database
 updateMediadataEntry(array('total_send'  , 'normal_send')  , 'init', $content['normal_send']);
 updateMediadataEntry(array('total_clicks', 'normal_clicks'), 'init', $content['normal_clicks']);
 // Insert info to database
 updateMediadataEntry(array('total_send'  , 'normal_send')  , 'init', $content['normal_send']);
 updateMediadataEntry(array('total_clicks', 'normal_clicks'), 'init', $content['normal_clicks']);

-updateMediadataEntry(array('total_orders', 'normal_orders'), 'init', countSumTotalData('', 'user_stats', 'id', '', true));
+updateMediadataEntry(array('total_orders', 'normal_orders'), 'init', countSumTotalData('', 'user_stats', 'id', '', TRUE));

 updateMediadataEntry(array('total_send'  , 'bonus_send' )  , 'init', $content['bonus_send']);
 updateMediadataEntry(array('total_clicks', 'bonus_clicks') , 'init', $content['bonus_clicks']);
 updateMediadataEntry(array('total_orders', 'bonus_orders') , 'init', $bcount);
 updateMediadataEntry(array('total_send'  , 'bonus_send' )  , 'init', $content['bonus_send']);
 updateMediadataEntry(array('total_clicks', 'bonus_clicks') , 'init', $content['bonus_clicks']);
 updateMediadataEntry(array('total_orders', 'bonus_orders') , 'init', $bcount);

diff --git a/inc/handler.php b/inc/handler.php
index 8aa40ee08f7bb5446092fc257a6cd1812fb241c4..84176c10b753b85329d780bc8d5c7da3e4f002c7 100644 (file)
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -56,7 +56,7 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
 
 // Init error handler
 function initErrorHandler () {
 
 // Init error handler
 function initErrorHandler () {

-       enableExitOnError(false);
+       enableExitOnError(FALSE);

 }
 
 // Enable exit on error
 }
 
 // Enable exit on error

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 5715c6edd0a5c48967b7ccd9abb6c0402f55c1aa..4b59018c634cf90109c6cbc5907d97f5944bb80e 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -144,7 +144,7 @@ function removeHttpHostNameFromUrl ($url) {
 }
 
 // Sends a HTTP request (GET, POST, HEAD are currently supported)
 }
 
 // Sends a HTTP request (GET, POST, HEAD are currently supported)

-function sendHttpRequest ($requestType, $baseUrl, $requestData = array(), $removeHeader = false) {
+function sendHttpRequest ($requestType, $baseUrl, $requestData = array(), $removeHeader = FALSE) {

        // Init response
        $response = array();
 
        // Init response
        $response = array();
 


@@ -189,7 +189,7 @@ function sendHeadRequest ($baseUrl, $requestData = array()) {
        $host = extractHostnameFromUrl($baseUrl);
 
        // Generate HEAD request header
        $host = extractHostnameFromUrl($baseUrl);
 
        // Generate HEAD request header

-       $request  = 'HEAD ' . (isProxyUsed() === true ? $baseUrl : '') . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+       $request  = 'HEAD ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');

        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
        if (isConfigEntrySet('FULL_VERSION')) {
        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
        if (isConfigEntrySet('FULL_VERSION')) {


@@ -211,7 +211,7 @@ function sendHeadRequest ($baseUrl, $requestData = array()) {
 }
 
 // Send a GET request
 }
 
 // Send a GET request

-function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false) {
+function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = FALSE) {

        // Generate full GET URL
        $getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
 
        // Generate full GET URL
        $getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
 


@@ -228,7 +228,7 @@ function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false
        $host = extractHostnameFromUrl($baseUrl);
 
        // Generate GET request header
        $host = extractHostnameFromUrl($baseUrl);
 
        // Generate GET request header

-       $request  = 'GET ' . (isProxyUsed() === true ? $baseUrl : '') . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+       $request  = 'GET ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');

        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
        if (isConfigEntrySet('FULL_VERSION')) {
        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
        if (isConfigEntrySet('FULL_VERSION')) {


@@ -246,7 +246,7 @@ function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false
        $response = sendRawRequest($host, $request);
 
        // Should we remove header lines?
        $response = sendRawRequest($host, $request);
 
        // Should we remove header lines?

-       if ($removeHeader === true) {
+       if ($removeHeader === TRUE) {

                // Okay, remove them
                $response = removeHttpHeaderFromResponse($response);
        } // END - if
                // Okay, remove them
                $response = removeHttpHeaderFromResponse($response);
        } // END - if


@@ -256,7 +256,7 @@ function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false
 }
 
 // Send a POST request, sometimes even POST requests have no parameters
 }
 
 // Send a POST request, sometimes even POST requests have no parameters

-function sendPostRequest ($baseUrl, $requestData = array(), $removeHeader = false) {
+function sendPostRequest ($baseUrl, $requestData = array(), $removeHeader = FALSE) {

        // Copy baseUrl to getUrl
        $getUrl = $baseUrl;
 
        // Copy baseUrl to getUrl
        $getUrl = $baseUrl;
 


@@ -276,7 +276,7 @@ function sendPostRequest ($baseUrl, $requestData = array(), $removeHeader = fals
        $body = http_build_query($requestData, '', '&');
 
        // Generate POST request header
        $body = http_build_query($requestData, '', '&');
 
        // Generate POST request header

-       $request  = 'POST ' . (isProxyUsed() === true ? $baseUrl : '') . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
+       $request  = 'POST ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');

        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
        if (isConfigEntrySet('FULL_VERSION')) {
        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
        if (isConfigEntrySet('FULL_VERSION')) {


@@ -299,7 +299,7 @@ function sendPostRequest ($baseUrl, $requestData = array(), $removeHeader = fals
        $response = sendRawRequest($host, $request);
 
        // Should we remove header lines?
        $response = sendRawRequest($host, $request);
 
        // Should we remove header lines?

-       if ($removeHeader === true) {
+       if ($removeHeader === TRUE) {

                // Okay, remove them
                $response = removeHttpHeaderFromResponse($response);
        } // END - if
                // Okay, remove them
                $response = removeHttpHeaderFromResponse($response);
        } // END - if


@@ -322,7 +322,7 @@ function sendRawRequest ($host, $request) {
        $response = array('', '', '');
 
        // Default is non-broken HTTP server implementation
        $response = array('', '', '');
 
        // Default is non-broken HTTP server implementation

-       $GLOBALS['is_http_server_broken'] = false;
+       $GLOBALS['is_http_server_broken'] = FALSE;

 
        // Load include
        loadIncludeOnce('inc/classes/resolver.class.php');
 
        // Load include
        loadIncludeOnce('inc/classes/resolver.class.php');


@@ -345,7 +345,7 @@ function sendRawRequest ($host, $request) {
        $proxyHost = compileRawCode(getProxyHost());
 
        // Open connection
        $proxyHost = compileRawCode(getProxyHost());
 
        // Open connection

-       if (isProxyUsed() === true) {
+       if (isProxyUsed() === TRUE) {

                // Resolve hostname into IP address
                $ip = $resolver->resolveHostname($proxyHost);
 
                // Resolve hostname into IP address
                $ip = $resolver->resolveHostname($proxyHost);
 


@@ -372,7 +372,7 @@ function sendRawRequest ($host, $request) {
        }
 
        // Shall proxy be used?
        }
 
        // Shall proxy be used?

-       if (isProxyUsed() === true) {
+       if (isProxyUsed() === TRUE) {

                // Setup proxy tunnel
                $response = setupProxyTunnel($host, $proxyHost, $port, $resource);
 
                // Setup proxy tunnel
                $response = setupProxyTunnel($host, $proxyHost, $port, $resource);
 


@@ -388,7 +388,7 @@ function sendRawRequest ($host, $request) {
        fwrite($resource, $request);
 
        // Start counting
        fwrite($resource, $request);
 
        // Start counting

-       $start = microtime(true);
+       $start = microtime(TRUE);

 
        // Read response
        while (!feof($resource)) {
 
        // Read response
        while (!feof($resource)) {


@@ -396,7 +396,7 @@ function sendRawRequest ($host, $request) {
                $info = stream_get_meta_data($resource);
 
                // Is it timed out? 15 seconds is a really patient...
                $info = stream_get_meta_data($resource);
 
                // Is it timed out? 15 seconds is a really patient...

-               if (($info['timed_out'] == true) || (microtime(true) - $start) > 15) {
+               if (($info['timed_out'] == TRUE) || (microtime(TRUE) - $start) > 15) {

                        // Timeout
                        logDebugMessage(__FUNCTION__, __LINE__, 'Timed out to get data from host ' . $host);
 
                        // Timeout
                        logDebugMessage(__FUNCTION__, __LINE__, 'Timed out to get data from host ' . $host);
 


@@ -433,7 +433,7 @@ function sendRawRequest ($host, $request) {
        // Time request if debug-mode is enabled
        if (isDebugModeEnabled()) {
                // Add debug message...
        // Time request if debug-mode is enabled
        if (isDebugModeEnabled()) {
                // Add debug message...

-               logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds and returned ' . count($response) . ' line(s).');
+               logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(TRUE) - $start) . ' seconds and returned ' . count($response) . ' line(s).');

        } // END - if
 
        // Skip first empty lines
        } // END - if
 
        // Skip first empty lines


@@ -452,15 +452,15 @@ function sendRawRequest ($host, $request) {
                }
        } // END - foreach
 
                }
        } // END - foreach
 

-       //* DEBUG: */ debugOutput('<strong>Request:</strong><pre>'.print_r($request, true).'</pre>');
-       //* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, true).'</pre>');
+       //* DEBUG: */ debugOutput('<strong>Request:</strong><pre>'.print_r($request, TRUE).'</pre>');
+       //* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, TRUE).'</pre>');

 
        // Proxy agent found or something went wrong?
        if (!isset($response[0])) {
                // No response, maybe timeout
                $response = array('', '', '');
                logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
 
        // Proxy agent found or something went wrong?
        if (!isset($response[0])) {
                // No response, maybe timeout
                $response = array('', '', '');
                logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');

-       } elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && (isProxyUsed() === true)) {
+       } elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && (isProxyUsed() === TRUE)) {

                // Proxy header detected, so remove two lines
                array_shift($response);
                array_shift($response);
                // Proxy header detected, so remove two lines
                array_shift($response);
                array_shift($response);


@@ -525,7 +525,7 @@ function setupProxyTunnel ($host, $proxyHost, $port, $resource) {
 // Check array for chuncked encoding
 function unchunkHttpResponse ($response) {
        // Default is not chunked
 // Check array for chuncked encoding
 function unchunkHttpResponse ($response) {
        // Default is not chunked

-       $isChunked = false;
+       $isChunked = FALSE;

 
        // Check if we have chunks
        foreach ($response as $line) {
 
        // Check if we have chunks
        foreach ($response as $line) {


@@ -535,16 +535,16 @@ function unchunkHttpResponse ($response) {
                // Entry found?
                if ((isInStringIgnoreCase('transfer-encoding', $line)) && (isInStringIgnoreCase('chunked', $line))) {
                        // Found!
                // Entry found?
                if ((isInStringIgnoreCase('transfer-encoding', $line)) && (isInStringIgnoreCase('chunked', $line))) {
                        // Found!

-                       $isChunked = true;
+                       $isChunked = TRUE;

                        break;
                } // END - if
        } // END - foreach
 
        // Is it chunked?
                        break;
                } // END - if
        } // END - foreach
 
        // Is it chunked?

-       if ($isChunked === true) {
+       if ($isChunked === TRUE) {

                // Good, we still have the HTTP headers in there, so we need to get rid
                // of them temporarly
                // Good, we still have the HTTP headers in there, so we need to get rid
                // of them temporarly

-               //* DEBUG: */ die('<pre>'.htmlentities(print_r(removeHttpHeaderFromResponse($response), true)).'</pre>');
+               //* DEBUG: */ die('<pre>'.htmlentities(print_r(removeHttpHeaderFromResponse($response), TRUE)).'</pre>');

                $tempResponse = http_chunked_decode(implode('', removeHttpHeaderFromResponse($response)));
 
                // We got a string back from http_chunked_decode(), so we need to convert it back to an array
                $tempResponse = http_chunked_decode(implode('', removeHttpHeaderFromResponse($response)));
 
                // We got a string back from http_chunked_decode(), so we need to convert it back to an array


@@ -595,7 +595,7 @@ function removeHttpHeaderFromResponse ($response) {
 // Returns the flag if a broken HTTP server implementation was detected
 function isBrokenHttpServerImplentation () {
        // Determine it
 // Returns the flag if a broken HTTP server implementation was detected
 function isBrokenHttpServerImplentation () {
        // Determine it

-       $isBroken = ((isset($GLOBALS['is_http_server_broken'])) && ($GLOBALS['is_http_server_broken'] === true));
+       $isBroken = ((isset($GLOBALS['is_http_server_broken'])) && ($GLOBALS['is_http_server_broken'] === TRUE));

 
        // ... and return it
        return $isBroken;
 
        // ... and return it
        return $isBroken;

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 13ce10c5fdd6dc1695559506a180dccf443ceff4..e65057863644444865c1357a5414347077002576 100644 (file)
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -93,7 +93,7 @@ function removeIncludeFromPool ($pool, $inc) {
        $key = array_search($inc, getIncludePool($pool));
 
        // Is it valid?
        $key = array_search($inc, getIncludePool($pool));
 
        // Is it valid?

-       if ($key !== false) {
+       if ($key !== FALSE) {

                // Then remove it
                unset($GLOBALS['inc_pool'][$pool][$key]);
 
                // Then remove it
                unset($GLOBALS['inc_pool'][$pool][$key]);
 

diff --git a/inc/install-functions.php b/inc/install-functions.php
index 8b9bb808ba5d6c35090fd048ef49850672ae8e5b..3dddbb89a4b9b38769d8554f93cff7b46fdd7c58 100644 (file)
--- a/inc/install-functions.php
+++ b/inc/install-functions.php
@@ -109,7 +109,7 @@ function doInstallWriteLocalConfigurationFile ($path) {
 // Adds a given template with content to install output stream
 function addTemplateToInstallContent ($template, $content = array()) {
        // Load the template
 // Adds a given template with content to install output stream
 function addTemplateToInstallContent ($template, $content = array()) {
        // Load the template

-       $out = loadTemplate($template, true, $content);
+       $out = loadTemplate($template, TRUE, $content);

 
        // Add it to output
        addToInstallContent($out);
 
        // Add it to output
        addToInstallContent($out);


@@ -135,7 +135,7 @@ function getInstallerContent () {
                $content = $GLOBALS['install_content'];
        } else {
                // Nothing found, this needs fixing
                $content = $GLOBALS['install_content'];
        } else {
                // Nothing found, this needs fixing

-               $content = displayMessage('{--INSTALLER_CONTENT_404--}', true);
+               $content = displayMessage('{--INSTALLER_CONTENT_404--}', TRUE);

        }
 
        // Return content
        }
 
        // Return content


@@ -158,7 +158,7 @@ function readSqlDump ($FQFN) {
 // Generates the installer menu by simply loading another template
 function generateInstallerMenu () {
        // Load installer menu template
 // Generates the installer menu by simply loading another template
 function generateInstallerMenu () {
        // Load installer menu template

-       $OUT = loadTemplate('install_menu', true);
+       $OUT = loadTemplate('install_menu', TRUE);

 
        // Return loaded content
        return $OUT;
 
        // Return loaded content
        return $OUT;


@@ -167,7 +167,7 @@ function generateInstallerMenu () {
 // Generate the install footer navigation by simply loading another template
 function generateInstallerFooterNavigation () {
        // Load installer menu template
 // Generate the install footer navigation by simply loading another template
 function generateInstallerFooterNavigation () {
        // Load installer menu template

-       $OUT = loadTemplate('install_footer', true);
+       $OUT = loadTemplate('install_footer', TRUE);

 
        // Return loaded content
        return $OUT;
 
        // Return loaded content
        return $OUT;


@@ -223,7 +223,7 @@ function isInstallerDataValid (&$saveStatus, $key, $value) {
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Call-back function ' . $callbackName . ' not found. saveStatus[status]=' . $saveStatus['status'] . ', key=' . $key . ', value=' . $value);
 
                // All fine (CAREFULL!)
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Call-back function ' . $callbackName . ' not found. saveStatus[status]=' . $saveStatus['status'] . ', key=' . $key . ', value=' . $value);
 
                // All fine (CAREFULL!)

-               return true;
+               return TRUE;

        } // END - if
 
        // Then call it back
        } // END - if
 
        // Then call it back


@@ -231,7 +231,7 @@ function isInstallerDataValid (&$saveStatus, $key, $value) {
 
        // Is it not valid?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',isValid=' . intval($isValid));
 
        // Is it not valid?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',isValid=' . intval($isValid));

-       if ($isValid === false) {
+       if ($isValid === FALSE) {

                // Then add it to saveStatus
                array_push($saveStatus['failed_fields'], $key);
        } // END - if
                // Then add it to saveStatus
                array_push($saveStatus['failed_fields'], $key);
        } // END - if


@@ -269,7 +269,7 @@ function doInstallerPostCheck ($currentTab, &$saveStatus) {
        $isValid = (bool) call_user_func($callbackName, $currentTab);
 
        // Is it not valid?
        $isValid = (bool) call_user_func($callbackName, $currentTab);
 
        // Is it not valid?

-       if (($isValid === false) || (count($GLOBALS['installer_failed_fields'][$currentTab]) > 0)) {
+       if (($isValid === FALSE) || (count($GLOBALS['installer_failed_fields'][$currentTab]) > 0)) {

                // Then change status and message
                $saveStatus['status']  = 'failed';
                $saveStatus['message'] = '{%message,INSTALLER_POST_CHECK_' . strtoupper($currentTab) . '_FAILED=' . $GLOBALS['installer_post_error'][$currentTab] . '%}';
                // Then change status and message
                $saveStatus['status']  = 'failed';
                $saveStatus['message'] = '{%message,INSTALLER_POST_CHECK_' . strtoupper($currentTab) . '_FAILED=' . $GLOBALS['installer_post_error'][$currentTab] . '%}';


@@ -421,8 +421,8 @@ function isInstallerMysqlTypeValid ($value) {
 // Call-back function to check if database configuration in POST is valid
 function isInstallerPostDatabaseConfigValid ($currentTab) {
        // By default nothing is valid
 // Call-back function to check if database configuration in POST is valid
 function isInstallerPostDatabaseConfigValid ($currentTab) {
        // By default nothing is valid

-       $isValid       = false;
-       $engineValid   = false;
+       $isValid       = FALSE;
+       $engineValid   = FALSE;

        $missingTables = 0;
 
        // Do both passwords match?
        $missingTables = 0;
 
        // Do both passwords match?


@@ -430,17 +430,17 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
                // Password 1 not set
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_PASSWORD1_EMPTY--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_password1');
                // Password 1 not set
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_PASSWORD1_EMPTY--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_password1');

-               return false;
+               return FALSE;

        } elseif ((isPostRequestElementSet('mysql_password1')) && (!isPostRequestElementSet('mysql_password2'))) {
                // Password 2 not set
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_PASSWORD2_EMPTY--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_password2');
        } elseif ((isPostRequestElementSet('mysql_password1')) && (!isPostRequestElementSet('mysql_password2'))) {
                // Password 2 not set
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_PASSWORD2_EMPTY--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_password2');

-               return false;
+               return FALSE;

        } elseif (postRequestElement('mysql_password1') != postRequestElement('mysql_password2')) {
                // Passwords mismatch
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_PASSWORDS_MISMATCH--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_password1', 'mysql_password2');
        } elseif (postRequestElement('mysql_password1') != postRequestElement('mysql_password2')) {
                // Passwords mismatch
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_PASSWORDS_MISMATCH--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_password1', 'mysql_password2');

-               return false;
+               return FALSE;

        } // END - if
 
        // Restore PHP's own error handler
        } // END - if
 
        // Restore PHP's own error handler


@@ -460,7 +460,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
                // Cannot connect to database
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_CONNECT_ERROR--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_login', 'mysql_password1', 'mysql_password2');
                // Cannot connect to database
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_CONNECT_ERROR--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_login', 'mysql_password1', 'mysql_password2');

-               return false;
+               return FALSE;

        } // END - if
 
        // Then attempt to select the database
        } // END - if
 
        // Then attempt to select the database


@@ -471,7 +471,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
                // Could not find database
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_SELECT_FAILED--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_dbase');
                // Could not find database
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_SELECT_FAILED--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_dbase');

-               return false;
+               return FALSE;

        } // END - if
 
        // Set database name and prefix
        } // END - if
 
        // Set database name and prefix


@@ -492,7 +492,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
                // Something bad happened
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_ENGINES_SQL_ERROR--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_type');
                // Something bad happened
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_ENGINES_SQL_ERROR--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_type');

-               return false;
+               return FALSE;

        } elseif (count($engines) == 0) {
                // Restore own error handler again
                set_error_handler('__errorHandler');
        } elseif (count($engines) == 0) {
                // Restore own error handler again
                set_error_handler('__errorHandler');


@@ -500,65 +500,65 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
                // No engine is active
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_NO_ENGINES_ACTIVE--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_type');
                // No engine is active
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_NO_ENGINES_ACTIVE--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_type');

-               return false;
+               return FALSE;

        }
 
        // Then check all, if the requested is working
        foreach ($engines as $engineArray) {
                // By default the selected engine is not valid
        }
 
        // Then check all, if the requested is working
        foreach ($engines as $engineArray) {
                // By default the selected engine is not valid

-               $engineValid = false;
+               $engineValid = FALSE;

 
                // Is the engine there?
                if (strtolower($engineArray['Engine']) == strtolower(postRequestElement('mysql_type'))) {
                        // Okay, engine is found
 
                // Is the engine there?
                if (strtolower($engineArray['Engine']) == strtolower(postRequestElement('mysql_type'))) {
                        // Okay, engine is found

-                       $engineValid = true;
+                       $engineValid = TRUE;

                        break;
                } // END - if
        } // END - foreach
 
        // So, is the engine found?
                        break;
                } // END - if
        } // END - foreach
 
        // So, is the engine found?

-       if ($engineValid === false) {
+       if ($engineValid === FALSE) {

                // Restore own error handler again
                set_error_handler('__errorHandler');
 
                // Requested engine is not active
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_ENGINE_UNSUPPORTED--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_type');
                // Restore own error handler again
                set_error_handler('__errorHandler');
 
                // Requested engine is not active
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_ENGINE_UNSUPPORTED--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_type');

-               return false;
+               return FALSE;

        } // END - if
 
        // Init some known tables
        $tables = array(
                // Admins
        } // END - if
 
        // Init some known tables
        $tables = array(
                // Admins

-               'admins'      => true,
+               'admins'      => TRUE,

                // Admin menu
                // Admin menu

-               'admin_menu'  => true,
+               'admin_menu'  => TRUE,

                // Categories
                // Categories

-               'cats'        => true,
+               'cats'        => TRUE,

                // Configuration
                // Configuration

-               'config'      => true,
+               'config'      => TRUE,

                // Extensions
                // Extensions

-               'extensions'  => true,
+               'extensions'  => TRUE,

                // Guest menu
                // Guest menu

-               'guest_menu'  => true,
+               'guest_menu'  => TRUE,

                // Max receive
                // Max receive

-               'max_receive' => true,
+               'max_receive' => TRUE,

                // Member menu
                // Member menu

-               'member_menu' => true,
+               'member_menu' => TRUE,

                // Module registry
                // Module registry

-               'mod_reg'     => true,
+               'mod_reg'     => TRUE,

                // Payments
                // Payments

-               'payments'    => true,
+               'payments'    => TRUE,

                // Sending pool
                // Sending pool

-               'pool'        => true,
+               'pool'        => TRUE,

                // Referral banner
                // Referral banner

-               'refbanner'   => true,
+               'refbanner'   => TRUE,

                // Referral levels
                // Referral levels

-               'refdepths'   => true,
+               'refdepths'   => TRUE,

                // Referral system
                // Referral system

-               'refsystem'   => true,
+               'refsystem'   => TRUE,

                // Task system
                // Task system

-               'task_system' => true,
+               'task_system' => TRUE,

        );
 
        // So check if all tables are not there
        );
 
        // So check if all tables are not there


@@ -567,7 +567,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
                $tables[$tableName] = ifSqlTableExists($tableName);
 
                // Is it (hopefully not) there?
                $tables[$tableName] = ifSqlTableExists($tableName);
 
                // Is it (hopefully not) there?

-               if ($tables[$tableName] === false) {
+               if ($tables[$tableName] === FALSE) {

                        // This does not exist
                        $missingTables++;
                } // END - if
                        // This does not exist
                        $missingTables++;
                } // END - if


@@ -583,7 +583,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
        set_error_handler('__errorHandler');
 
        // If the status is true, disconnect the database
        set_error_handler('__errorHandler');
 
        // If the status is true, disconnect the database

-       if ($isValid === false) {
+       if ($isValid === FALSE) {

                // Still something bad happened (e.g. tables found)
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_IN_USE--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_dbase');
                // Still something bad happened (e.g. tables found)
                $GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_IN_USE--}';
                array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_dbase');

diff --git a/inc/install/install_page_finalize.php b/inc/install/install_page_finalize.php
index 5c1e09ee112cd43e7d01fe6997f597cad3dd5edc..0b6229945d306039628d9077164338882f87954e 100644 (file)
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -58,7 +58,7 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
        // Is the link up?
        if (SQL_IS_LINK_UP()) {
                // Seems to work, also right database?
        // Is the link up?
        if (SQL_IS_LINK_UP()) {
                // Seems to work, also right database?

-               if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+               if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === TRUE) {

                        // Check for dumps
                        if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                // Installation area not found
                        // Check for dumps
                        if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                // Installation area not found


@@ -90,7 +90,7 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                                                reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
                                        }
                                } // END - foreach
                                                reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
                                        }
                                } // END - foreach

-                               //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
+                               //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), TRUE).'</pre>');

 
                                // Are some SQLs found?
                                if (countSqls() == 0) {
 
                                // Are some SQLs found?
                                if (countSqls() == 0) {

diff --git a/inc/js/js-admin_ajax.php b/inc/js/js-admin_ajax.php
index b1bc377d2c4b8e3c1c08b9e768f492dc8fb06d3e..8c2d38f86ba4c47e7b7411b17f6e959415681c3d 100644 (file)
--- a/inc/js/js-admin_ajax.php
+++ b/inc/js/js-admin_ajax.php
@@ -48,7 +48,7 @@ $content = array(
 );
 
 // Simply load the JavaScript here
 );
 
 // Simply load the JavaScript here

-loadTemplate('js_admin_ajax', false, $content);
+loadTemplate('js_admin_ajax', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/js/js-install_ajax.php b/inc/js/js-install_ajax.php
index 39c54a66c49de074753f167b2819043402450b43..75da4c4e37437cd8ef2c639b80c00298b8ae2dca 100644 (file)
--- a/inc/js/js-install_ajax.php
+++ b/inc/js/js-install_ajax.php
@@ -48,7 +48,7 @@ $content = array(
 );
 
 // Simply load the JavaScript here
 );
 
 // Simply load the JavaScript here

-loadTemplate('js_install_ajax', false, $content);
+loadTemplate('js_install_ajax', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/js/js-surfbar_frame_top.php b/inc/js/js-surfbar_frame_top.php
index 2013426452398db8242bdf715504dc3f72f5fa7a..0ad734427721d82be77fd871b673ae79cf81ee3b 100644 (file)
--- a/inc/js/js-surfbar_frame_top.php
+++ b/inc/js/js-surfbar_frame_top.php
@@ -59,7 +59,7 @@ $content = array(
 );
 
 // Load template
 );
 
 // Load template

-loadTemplate('js_surfbar_frame_top', false, $content);
+loadTemplate('js_surfbar_frame_top', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/js/js-surfbar_member_edit.php b/inc/js/js-surfbar_member_edit.php
index 88b66423fbbc2961ce4ce7e4e5d6d0696dbdb7b3..21b366e891eb0738d2309dfef9c8e676850c3dae 100644 (file)
--- a/inc/js/js-surfbar_member_edit.php
+++ b/inc/js/js-surfbar_member_edit.php
@@ -49,7 +49,7 @@ $content = array(
 );
 
 // Simply load the JavaScript here
 );
 
 // Simply load the JavaScript here

-loadTemplate('js_surfbar_member_edit', false, $content);
+loadTemplate('js_surfbar_member_edit', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 5e393b722519d8ee0bb5cb9153cc1e70db0455a7..c85cf52faf1c681752e653ad76c80d7472a77cdf 100644 (file)
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -275,7 +275,7 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
        } // END - if
 
        // *Does* match by default
        } // END - if
 
        // *Does* match by default

-       $matches = true;
+       $matches = TRUE;

 
        // Is one not readable?
        if (!isIncludeReadable($source)) {
 
        // Is one not readable?
        if (!isIncludeReadable($source)) {


@@ -295,7 +295,7 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
        $GLOBALS['messages'][$backupLang] = array();
 
        // Both are readable so include current language file
        $GLOBALS['messages'][$backupLang] = array();
 
        // Both are readable so include current language file

-       $GLOBALS['count'] = false;
+       $GLOBALS['count'] = FALSE;

        loadInclude($source);
        $GLOBALS['msgs'][$source] = $GLOBALS['messages'][$backupLang];
        unset($GLOBALS['count']);
        loadInclude($source);
        $GLOBALS['msgs'][$source] = $GLOBALS['messages'][$backupLang];
        unset($GLOBALS['count']);


@@ -322,7 +322,7 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
        // Do they mismatch?
        if ((count($GLOBALS['msgs'][$source])) != (count($GLOBALS['msgs'][$target]))) {
                // Does not match
        // Do they mismatch?
        if ((count($GLOBALS['msgs'][$source])) != (count($GLOBALS['msgs'][$target]))) {
                // Does not match

-               $matches = false;
+               $matches = FALSE;

 
                // Check all differences
                foreach ($GLOBALS['msgs'][$source] as $key => $value) {
 
                // Check all differences
                foreach ($GLOBALS['msgs'][$source] as $key => $value) {


@@ -348,9 +348,9 @@ function getLanguageComparisonDifference ($target) {
 }
 
 // Checks whether the given message is masked
 }
 
 // Checks whether the given message is masked

-function isMessageMasked ($messageId, $strict = true) {
+function isMessageMasked ($messageId, $strict = TRUE) {

        // Is the message id valid?
        // Is the message id valid?

-       if (($strict === true) && (!isMessageIdValid($messageId))) {
+       if (($strict === TRUE) && (!isMessageIdValid($messageId))) {

                // No, then abort here
                reportBug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
        } // END - if
                // No, then abort here
                reportBug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
        } // END - if

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index a3ff87855c6b9e0f673e233cc026b63bba371021..663c0ab399cf58ad406ec3804edd61eb1eecceee 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -47,14 +47,14 @@ function isAdminsAllowedByAcl ($action, $what) {
 
        if (($action == 'login') || ($action == 'logout')) {
                // If action is login or logout allow allways!
 
        if (($action == 'login') || ($action == 'logout')) {
                // If action is login or logout allow allways!

-               return true;
+               return TRUE;

        } elseif (isset($GLOBALS[__FUNCTION__][$adminId][$action][$what])) {
                // If we have cache, use it
                return $GLOBALS[__FUNCTION__][$adminId][$action][$what];
        }
 
        // But default result is failed
        } elseif (isset($GLOBALS[__FUNCTION__][$adminId][$action][$what])) {
                // If we have cache, use it
                return $GLOBALS[__FUNCTION__][$adminId][$action][$what];
        }
 
        // But default result is failed

-       $GLOBALS[__FUNCTION__][$action][$what] = false;
+       $GLOBALS[__FUNCTION__][$action][$what] = FALSE;

 
        // Get admin's defult access right
        $default = getAdminDefaultAcl($adminId);
 
        // Get admin's defult access right
        $default = getAdminDefaultAcl($adminId);


@@ -68,7 +68,7 @@ function isAdminsAllowedByAcl ($action, $what) {
                $parent = isAdminsAllowedByAcl($parent_action, '');
        } else {
                // Anything else is true!
                $parent = isAdminsAllowedByAcl($parent_action, '');
        } else {
                // Anything else is true!

-               $parent = false;
+               $parent = FALSE;

        }
 
        // Shall I test for a main or sub menu? (action or what?)
        }
 
        // Shall I test for a main or sub menu? (action or what?)


@@ -102,7 +102,7 @@ function isAdminsAllowedByAcl ($action, $what) {
                }
        } elseif (!isExtensionActive('cache')) {
                // Extension ext-cache is absent, so load it from database
                }
        } elseif (!isExtensionActive('cache')) {
                // Extension ext-cache is absent, so load it from database

-               $result = false;
+               $result = FALSE;

                if (!empty($action)) {
                        // Main menu
                        $result = SQL_QUERY_ESC("SELECT `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' LIMIT 1",
                if (!empty($action)) {
                        // Main menu
                        $result = SQL_QUERY_ESC("SELECT `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' LIMIT 1",


@@ -125,9 +125,9 @@ function isAdminsAllowedByAcl ($action, $what) {
 
        // Check ACL and (maybe) allow
        //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$aclMode.',parent='.intval($parent));
 
        // Check ACL and (maybe) allow
        //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$aclMode.',parent='.intval($parent));

-       if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === true) || (($default == 'NO-ACL') && ($aclMode == 'failed') && ($parent === false))) {
+       if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === TRUE) || (($default == 'NO-ACL') && ($aclMode == 'failed') && ($parent === FALSE))) {

                // Access is granted
                // Access is granted

-               $GLOBALS[__FUNCTION__][$adminId][$action][$what] = true;
+               $GLOBALS[__FUNCTION__][$adminId][$action][$what] = TRUE;

        } // END - if
 
        // Return value
        } // END - if
 
        // Return value


@@ -172,7 +172,7 @@ LIMIT 1",
 }
 
 // Change a lot admin account
 }
 
 // Change a lot admin account

-function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = true) {
+function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = TRUE) {

        // Begin the update
        $cache_update = '0';
        $message = '';
        // Begin the update
        $cache_update = '0';
        $message = '';


@@ -298,7 +298,7 @@ LIMIT 1",
        } // END - foreach
 
        // Display message if not empty and allowed
        } // END - foreach
 
        // Display message if not empty and allowed

-       if ((!empty($message)) && ($displayMessage === true)) {
+       if ((!empty($message)) && ($displayMessage === TRUE)) {

                // Display it
                displayMessage($message);
        } // END - if
                // Display it
                displayMessage($message);
        } // END - if


@@ -341,7 +341,7 @@ function adminsEditAdminAccount ($postData) {
                        }
 
                        // Load row template and switch color
                        }
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_edit_admins_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_admins_row', TRUE, $content);

                } // END - if
 
                // Free result
                } // END - if
 
                // Free result


@@ -349,7 +349,7 @@ function adminsEditAdminAccount ($postData) {
        } // END - foreach
 
        // Load template
        } // END - foreach
 
        // Load template

-       loadTemplate('admin_edit_admins', false, $OUT);
+       loadTemplate('admin_edit_admins', FALSE, $OUT);

 }
 
 // Generate access mode selection box for given admin id
 }
 
 // Generate access mode selection box for given admin id


@@ -407,7 +407,7 @@ function generateAdminMenuModeSelectionBox ($adminId = NULL) {
 // Delete given admin accounts
 function adminsDeleteAdminAccount ($postData) {
        // Check if this account is the last one which cannot be deleted...
 // Delete given admin accounts
 function adminsDeleteAdminAccount ($postData) {
        // Check if this account is the last one which cannot be deleted...

-       if (countSumTotalData('', 'admins', 'id', '', true) > 1) {
+       if (countSumTotalData('', 'admins', 'id', '', TRUE) > 1) {

                // Delete accounts
                $OUT = '';
                foreach ($postData['sel'] as $id => $selected) {
                // Delete accounts
                $OUT = '';
                foreach ($postData['sel'] as $id => $selected) {


@@ -429,7 +429,7 @@ function adminsDeleteAdminAccount ($postData) {
                                $content['id'] = $id;
 
                                // Load row template and switch color
                                $content['id'] = $id;
 
                                // Load row template and switch color

-                               $OUT .= loadTemplate('admin_delete_admins_row', true, $content);
+                               $OUT .= loadTemplate('admin_delete_admins_row', TRUE, $content);

                        } // END - if
 
                        // Free result
                        } // END - if
 
                        // Free result


@@ -437,7 +437,7 @@ function adminsDeleteAdminAccount ($postData) {
                } // END - foreach
 
                // Load template
                } // END - foreach
 
                // Load template

-               loadTemplate('admin_delete_admins', false, $OUT);
+               loadTemplate('admin_delete_admins', FALSE, $OUT);

        } else {
                // Cannot delete last account!
                displayMessage('{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');
        } else {
                // Cannot delete last account!
                displayMessage('{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');


@@ -488,14 +488,14 @@ ORDER BY
                $content['la_mode']     = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                // Load row template and switch color
                $content['la_mode']     = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_list_admins_row', true, $content);
+               $OUT .= loadTemplate('admin_list_admins_row', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load template
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load template

-       loadTemplate('admin_list_admins', false, $OUT);
+       loadTemplate('admin_list_admins', FALSE, $OUT);

 }
 
 // Sends out mail to all administrators
 }
 
 // Sends out mail to all administrators


@@ -532,7 +532,7 @@ function sendAdminsEmails ($subject, $template, $content, $userid) {
                SQL_FREERESULT($result);
 
                // Init result
                SQL_FREERESULT($result);
 
                // Init result

-               $result = false;
+               $result = FALSE;

 
                // "implode" ids and query string
                $adminId = implode(',', $adminIds);
 
                // "implode" ids and query string
                $adminId = implode(',', $adminIds);

diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php
index 149a96b5f4b940f3dd0fd05aafb983c65b990231..94fbd26d3488fd5951b5acf47f363bf0728bfab8 100644 (file)
--- a/inc/libs/beg_functions.php
+++ b/inc/libs/beg_functions.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Add points to user or begging rallye account
 function addPointsBeg ($userid, $points) {
        // Default is not added
 // Add points to user or begging rallye account
 function addPointsBeg ($userid, $points) {
        // Default is not added

-       $added = false;
+       $added = FALSE;

 
        // Is begging rallye active?
        if (isBegRallyeEnabled()) {
 
        // Is begging rallye active?
        if (isBegRallyeEnabled()) {


@@ -60,7 +60,7 @@ function addPointsBeg ($userid, $points) {
        }
 
        // Subtract begged points from member account if the admin has selected one
        }
 
        // Subtract begged points from member account if the admin has selected one

-       if (($added === true) && (isValidUserId(getBegUserid()))) {
+       if (($added === TRUE) && (isValidUserId(getBegUserid()))) {

                // Subtract from this account
                $added = ($added && subtractPoints('beg_payout', getBegUserid(), $points));
        } // END - if
                // Subtract from this account
                $added = ($added && subtractPoints('beg_payout', getBegUserid(), $points));
        } // END - if


@@ -74,7 +74,7 @@ function addPointsBeg ($userid, $points) {
 //-----------------------------------------------------------------------------
 
 // Outputs points which a member can get
 //-----------------------------------------------------------------------------
 
 // Outputs points which a member can get

-function doTemplateOutputBegPoints ($templateName, $clear = false) {
+function doTemplateOutputBegPoints ($templateName, $clear = FALSE) {

        // Default is not the same
        $return = '{--BEG_POINTS_MIN_MAX--}';
 
        // Default is not the same
        $return = '{--BEG_POINTS_MIN_MAX--}';
 

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 22c6f07d4ae698ae87e8994ff88d3ed86891ab1c..3b3ad6a5fb1a2245225428cebc86499e8c601e84 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function addTurboBonus ($mid, $userid, $type) {
        // Shall we add bonus points?
        if (!isBonusRallyeActive()) {
 function addTurboBonus ($mid, $userid, $type) {
        // Shall we add bonus points?
        if (!isBonusRallyeActive()) {

-               return false;
+               return FALSE;

        } // END - if
 
        // Init variables
        } // END - if
 
        // Init variables


@@ -70,11 +70,11 @@ function addTurboBonus ($mid, $userid, $type) {
        // Is a column name set?
        if (empty($column)) {
                // No, then abort here
        // Is a column name set?
        if (empty($column)) {
                // No, then abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Check for entry
        } // END - if
 
        // Check for entry

-       $rank = countSumTotalData($mid, 'bonus_turbo', 'id', $column, true) + 1;
+       $rank = countSumTotalData($mid, 'bonus_turbo', 'id', $column, TRUE) + 1;

 
        // Which rank?
        if ($rank == 1) {
 
        // Which rank?
        if ($rank == 1) {


@@ -117,7 +117,7 @@ function addTurboBonus ($mid, $userid, $type) {
 //
 function addBonusRanks ($data, $type, $userid) {
        // Init variables
 //
 function addBonusRanks ($data, $type, $userid) {
        // Init variables

-       $self = false; $OUT = ''; $GLOBALS['ranking_content'] = array();
+       $self = FALSE; $OUT = ''; $GLOBALS['ranking_content'] = array();

 
        // Clear rankings by default
        $GLOBALS['ranking_content']['rankings'] = '';
 
        // Clear rankings by default
        $GLOBALS['ranking_content']['rankings'] = '';


@@ -139,13 +139,13 @@ function addBonusRanks ($data, $type, $userid) {
                $GLOBALS['ranking_content'] = merge_array($GLOBALS['ranking_content'], SQL_FETCHARRAY($result));
 
                // Remember all values for later use
                $GLOBALS['ranking_content'] = merge_array($GLOBALS['ranking_content'], SQL_FETCHARRAY($result));
 
                // Remember all values for later use

-               $self  = true;
+               $self  = TRUE;

 
                // Transfer data to template
                $GLOBALS['ranking_content']['timemark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
 
                // Load template
 
                // Transfer data to template
                $GLOBALS['ranking_content']['timemark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
 
                // Load template

-               $GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', true, $GLOBALS['ranking_content']);
+               $GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', TRUE, $GLOBALS['ranking_content']);

        } // END - if
 
        // Load rankings
        } // END - if
 
        // Load rankings


@@ -183,10 +183,10 @@ LIMIT 1",
                        $rows['rank'] = $rank;
 
                        // Load row template
                        $rows['rank'] = $rank;
 
                        // Load row template

-                       $OUT .= loadTemplate('member_bonus_turbo_row', true, $rows);
+                       $OUT .= loadTemplate('member_bonus_turbo_row', TRUE, $rows);

                } // END - for
 
                } // END - for
 

-               if ($self === false) {
+               if ($self === FALSE) {

                        // If current user was not found set constant
                        $GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}';
                } // END - if
                        // If current user was not found set constant
                        $GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}';
                } // END - if


@@ -212,7 +212,7 @@ function handleBonusPoints ($mode, $userid) {
        } // END - if
 
        // Default is not working
        } // END - if
 
        // Default is not working

-       $return = false;
+       $return = FALSE;

 
        // Switch to jackpot-mode when no UID is supplied but userid-mode is selected
        if ((getBonusMode() == 'UID') && ($userid == '0') && (isExtensionActive('jackpot'))) {
 
        // Switch to jackpot-mode when no UID is supplied but userid-mode is selected
        if ((getBonusMode() == 'UID') && ($userid == '0') && (isExtensionActive('jackpot'))) {


@@ -238,7 +238,7 @@ function handleBonusPoints ($mode, $userid) {
                        break;
 
                case 'JACKPOT': // ... jackpot
                        break;
 
                case 'JACKPOT': // ... jackpot

-                       if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === false) && (isValidUserId($userid))) {
+                       if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === FALSE) && (isValidUserId($userid))) {

                                if ($total >= $points) {
                                        // Subtract points from userid's account
                                        $return = subtractPointsFromJackpot('bonus_payout_jackpot', $userid, $points);
                                if ($total >= $points) {
                                        // Subtract points from userid's account
                                        $return = subtractPointsFromJackpot('bonus_payout_jackpot', $userid, $points);

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index 0f4201057f48eaa9dc7fd708850406243428fc22..2dfd60e3b0fbb08113cd346e5080970a9b70c22c 100644 (file)
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -60,7 +60,7 @@ LIMIT 1",
        if (SQL_NUMROWS($result) == 1) {
                // Load entry
                $content = SQL_FETCHARRAY($result);
        if (SQL_NUMROWS($result) == 1) {
                // Load entry
                $content = SQL_FETCHARRAY($result);

-               //* DEBUG: */ print($id.'=<pre>'.print_r($content, true).'</pre>');
+               //* DEBUG: */ print($id.'=<pre>'.print_r($content, TRUE).'</pre>');

 
                // Construct human-readable description
                $ret = sprintf("%s (%s)", $content['descr'], $content['code']);
 
                // Construct human-readable description
                $ret = sprintf("%s (%s)", $content['descr'], $content['code']);

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index d5e9ba00ed154993d00fdea539c846c0eca026c4..4d8b7cf5c81cc842d7e99d216ef575b70c7354a2 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -108,7 +108,7 @@ LIMIT %s",
                        $content['timemark'] = generateDateTime($content['timemark'], $DT_MODE);
 
                        // Load template and switch color
                        $content['timemark'] = generateDateTime($content['timemark'], $DT_MODE);
 
                        // Load template and switch color

-                       $OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content);
+                       $OUT .= loadTemplate($mode . '_doubler_list_rows', TRUE, $content);

                } // END - while
 
                // Free memory
                } // END - while
 
                // Free memory


@@ -117,13 +117,13 @@ LIMIT %s",
                // List no entries
                $OUT = '<tr>
   <td colspan="' . $COLS . '" align="center" class="bottom">
                // List no entries
                $OUT = '<tr>
   <td colspan="' . $COLS . '" align="center" class="bottom">

-    ' . displayMessage($message, true) . '
+    ' . displayMessage($message, TRUE) . '

   </td>
 </tr>';
        }
 
        // Return template
   </td>
 </tr>';
        }
 
        // Return template

-       return loadTemplate($mode . '_doubler_list', true, $OUT);
+       return loadTemplate($mode . '_doubler_list', TRUE, $OUT);

 }
 
 // Get total points left in doubler pot
 }
 
 // Get total points left in doubler pot

diff --git a/inc/libs/earning_functions.php b/inc/libs/earning_functions.php
index 507db350bb7500fa082c44d997cfc85975572d13..3f747490bfa1fd97e3aa5250c057ecf301444c42 100644 (file)
--- a/inc/libs/earning_functions.php
+++ b/inc/libs/earning_functions.php
@@ -79,7 +79,7 @@ function generateMemberEarningDataTable ($earningProvider) {
        $filterData = runFilterChain('member_earning_table_data', $filterData);
 
        // Load the proper template and return it
        $filterData = runFilterChain('member_earning_table_data', $filterData);
 
        // Load the proper template and return it

-       $output = loadTemplate('member_earning_data_' . strtolower($filterData['earning_group']), true, $filterData);
+       $output = loadTemplate('member_earning_data_' . strtolower($filterData['earning_group']), TRUE, $filterData);

 
        // Return it
        return $output;
 
        // Return it
        return $output;


@@ -177,7 +177,7 @@ LIMIT 1", array(
        $status = (!SQL_HASZEROAFFECTED());
 
        // Has the record changed?
        $status = (!SQL_HASZEROAFFECTED());
 
        // Has the record changed?

-       if ($status === true) {
+       if ($status === TRUE) {

                // Prepare content
                $content = array(
                        'earning_id'   => bigintval($earningId),
                // Prepare content
                $content = array(
                        'earning_id'   => bigintval($earningId),

diff --git a/inc/libs/forced_functions.php b/inc/libs/forced_functions.php
index b7ee9a8d81e5a21f447aebc0572f8755948c0997..e596264e3cb0aa44c7cf537c3504d5a2d53d197c 100644 (file)
--- a/inc/libs/forced_functions.php
+++ b/inc/libs/forced_functions.php
@@ -123,7 +123,7 @@ function translateForcedCostsVisibility ($visibility) {
 
 // "Getter" for an array of data from all Forced-PopUps except user's
 function getForcedPopupDataByEarningArray ($content) {
 
 // "Getter" for an array of data from all Forced-PopUps except user's
 function getForcedPopupDataByEarningArray ($content) {

-       die('content=<pre>' . print_r($content, true) . '</pre>' . debug_get_printable_backtrace());
+       die('content=<pre>' . print_r($content, TRUE) . '</pre>' . debug_get_printable_backtrace());

 
        // Finally return the content
        return $content;
 
        // Finally return the content
        return $content;


@@ -321,24 +321,24 @@ function doForcedAdminActivateCampaigns () {
        // Do some sanity checks
        if (!isAdmin()) {
                // Not allowed to call
        // Do some sanity checks
        if (!isAdmin()) {
                // Not allowed to call

-               return false;
+               return FALSE;

        } elseif (countPostSelection('forced_campaign_id') == 0) {
                // No selections made
        } elseif (countPostSelection('forced_campaign_id') == 0) {
                // No selections made

-               return false;
+               return FALSE;

        }
 
        // Get an array from all pending campaigns
        $forcedCampaigns = getArrayFromForcedCampaignsByArray(array_keys(postRequestElement('forced_campaign_id')), 'PENDING');
 
        // By default all worked (at this point)
        }
 
        // Get an array from all pending campaigns
        $forcedCampaigns = getArrayFromForcedCampaignsByArray(array_keys(postRequestElement('forced_campaign_id')), 'PENDING');
 
        // By default all worked (at this point)

-       $activated = true;
+       $activated = TRUE;

 
        // Run through all entries
        foreach ($forcedCampaigns as $campaignId => $campaignData) {
                // Change the status of this campaign
                if (!changeForcedCampaignStatus($campaignId, 'PENDING', 'ACTIVE', $campaignData)) {
                        // One didn't work, but continue with others
 
        // Run through all entries
        foreach ($forcedCampaigns as $campaignId => $campaignData) {
                // Change the status of this campaign
                if (!changeForcedCampaignStatus($campaignId, 'PENDING', 'ACTIVE', $campaignData)) {
                        // One didn't work, but continue with others

-                       $activated = false;
+                       $activated = FALSE;

                } // END - if
        } // END - foreach
 
                } // END - if
        } // END - foreach
 


@@ -383,7 +383,7 @@ function changeForcedCampaignStatus ($campaignId, $prevStatus, $newStatus, $data
        // ---------- Comment out for debugging/developing member actions! ---------
        if (SQL_AFFECTEDROWS() != 1) {
                // No, something went wrong
        // ---------- Comment out for debugging/developing member actions! ---------
        if (SQL_AFFECTEDROWS() != 1) {
                // No, something went wrong

-               return false;
+               return FALSE;

        } // END - if
        // ---------- Comment out for debugging/developing member actions! ---------
 
        } // END - if
        // ---------- Comment out for debugging/developing member actions! ---------
 


@@ -395,7 +395,7 @@ function changeForcedCampaignStatus ($campaignId, $prevStatus, $newStatus, $data
 
        // All done!
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'campaignId=' . $campaignId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - EXIT!');
 
        // All done!
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'campaignId=' . $campaignId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - EXIT!');

-       return true;
+       return TRUE;

 }
 
 // Notify admin(s) with a selected message and content
 }
 
 // Notify admin(s) with a selected message and content


@@ -426,7 +426,7 @@ function doForcedNotifyMember ($messageType, $content) {
        // Skip notification if userid is NULL
        if (is_null($content['forced_campaign_userid'])) {
                // NULL is silently ignored
        // Skip notification if userid is NULL
        if (is_null($content['forced_campaign_userid'])) {
                // NULL is silently ignored

-               return true;
+               return TRUE;

        } // END - if
 
        // Prepare template name
        } // END - if
 
        // Prepare template name


@@ -468,7 +468,7 @@ function prepareForcedContentForTemplate ($content) {
 // ----------------------------------------------------------------------------
 
 // Template helper function to create selection box for all forced-ad types
 // ----------------------------------------------------------------------------
 
 // Template helper function to create selection box for all forced-ad types

-function doTemplateForcedAdTypeSelectionBox ($templateName, $clear = false, $default = NULL) {
+function doTemplateForcedAdTypeSelectionBox ($templateName, $clear = FALSE, $default = NULL) {

        // Add all types through the filter
        $forcedAdTypes = runFilterChain('add_forced_ads_types', array());
 
        // Add all types through the filter
        $forcedAdTypes = runFilterChain('add_forced_ads_types', array());
 


@@ -480,7 +480,7 @@ function doTemplateForcedAdTypeSelectionBox ($templateName, $clear = false, $def
 }
 
 // Template helper function to create selection box for costs visibility
 }
 
 // Template helper function to create selection box for costs visibility

-function doTemplateForcedCostsVisiblitySelectionBox ($templateName, $clear = false, $default = NULL) {
+function doTemplateForcedCostsVisiblitySelectionBox ($templateName, $clear = FALSE, $default = NULL) {

        // Init array
        $costsVisibility = array(
                0 => array('visibility' => 'ALL'),
        // Init array
        $costsVisibility = array(
                0 => array('visibility' => 'ALL'),


@@ -514,7 +514,7 @@ function doTemplateForcedCostsSelectionBox ($templateName, $clear, $default = NU
        $forcedCosts = getArrayFromForcedCostsByVisibility();
 
        // Handle it over to generateSelectionBoxFromArray()
        $forcedCosts = getArrayFromForcedCostsByVisibility();
 
        // Handle it over to generateSelectionBoxFromArray()

-       $content = generateSelectionBoxFromArray($forcedCosts, 'forced_costs_id', 'forced_costs_id', '', '', '', $default, '', true);
+       $content = generateSelectionBoxFromArray($forcedCosts, 'forced_costs_id', 'forced_costs_id', '', '', '', $default, '', TRUE);

 
        // Return prepared content
        return $content;
 
        // Return prepared content
        return $content;


@@ -523,7 +523,7 @@ function doTemplateForcedCostsSelectionBox ($templateName, $clear, $default = NU
 // Template helper function to create selection box for foreced campaign userid
 function doTemplateForcedCampaignUseridSelectionBox ($templateName, $clear, $default = NULL) {
        // Generate the selection box without all
 // Template helper function to create selection box for foreced campaign userid
 function doTemplateForcedCampaignUseridSelectionBox ($templateName, $clear, $default = NULL) {
        // Generate the selection box without all

-       $content = addMemberSelectionBox($default, false, true, true, 'forced_campaign_userid');
+       $content = addMemberSelectionBox($default, FALSE, TRUE, TRUE, 'forced_campaign_userid');

 
        // Return prepared content
        return $content;
 
        // Return prepared content
        return $content;

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index a27a59720a4a8e85d795322501e4e1400ed9bf12..11ea6194cbb54d78dcf4548e4dae12951d039a3f 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -65,7 +65,7 @@ ORDER BY
                while ($content = SQL_FETCHARRAY($result_stop)) {
                        // Stop holiday
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
                while ($content = SQL_FETCHARRAY($result_stop)) {
                        // Stop holiday
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",

-                               array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));

 
                        // Unlock account
                        addSql(SQL_QUERY_ESC("UPDATE
 
                        // Unlock account
                        addSql(SQL_QUERY_ESC("UPDATE


@@ -76,7 +76,7 @@ SET
 WHERE
        `userid`=%s
 LIMIT 1",
 WHERE
        `userid`=%s
 LIMIT 1",

-                               array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));

 
                        // Prepare array
                        $content = merge_array($content, array(
 
                        // Prepare array
                        $content = merge_array($content, array(

diff --git a/inc/libs/jackpot_functions.php b/inc/libs/jackpot_functions.php
index a71f843b6534434aafbe4edc87852a4651092cb2..1ab1efed809f2c4cec66716143cd2fb31bdb42e8 100644 (file)
--- a/inc/libs/jackpot_functions.php
+++ b/inc/libs/jackpot_functions.php
@@ -78,7 +78,7 @@ function addPointsToJackpot ($points) {
 // Subtracts points from the jackpot
 function subtractPointsFromJackpot ($points) {
        // First failed
 // Subtracts points from the jackpot
 function subtractPointsFromJackpot ($points) {
        // First failed

-       $ret = false;
+       $ret = FALSE;

 
        // Get jackpot points for dummy
        $jackpot = getJackpotPoints();
 
        // Get jackpot points for dummy
        $jackpot = getJackpotPoints();

diff --git a/inc/libs/mediadata_functions.php b/inc/libs/mediadata_functions.php
index 617d69d38ccdedfa89acc8553bdc775bcb60b16f..c1240a8171327744f2d2ed2adc9626b16d0e605e 100644 (file)
--- a/inc/libs/mediadata_functions.php
+++ b/inc/libs/mediadata_functions.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function updateMediadataEntry ($keys_array, $mode, $value) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keys_array[]=' . gettype($keys_array) . ',mode=' . $mode . ',value=' . $value . ' - ENTERED!');
        // Default is nothing added/updated
 function updateMediadataEntry ($keys_array, $mode, $value) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keys_array[]=' . gettype($keys_array) . ',mode=' . $mode . ',value=' . $value . ' - ENTERED!');
        // Default is nothing added/updated

-       $added = false;
+       $added = FALSE;

 
        // Are there entries?
        if (is_array($keys_array) && ($value > 0)) {
 
        // Are there entries?
        if (is_array($keys_array) && ($value > 0)) {


@@ -90,7 +90,7 @@ LIMIT 1", array($key), __FUNCTION__, __LINE__);
        // Zero entries are always added
        if ($value == 0) {
                // Is zero value, so we need to set $added here to avoid wrong false result
        // Zero entries are always added
        if ($value == 0) {
                // Is zero value, so we need to set $added here to avoid wrong false result

-               $added = true;
+               $added = TRUE;

        } // END - if
 
        // Return result
        } // END - if
 
        // Return result

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 0e184b9d39ca5e48df9a5000f20b6a44490935be..11ffff20e57c3b108602e02c1bdc44b3b67e1958 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -103,7 +103,7 @@ function doAdminNetworkProcessForm () {
        // Is the function valid?
        if (!function_exists($functionName)) {
                // Invalid function name
        // Is the function valid?
        if (!function_exists($functionName)) {
                // Invalid function name

-               reportBug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false);
+               reportBug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', FALSE);

        } // END - if
 
        // Init global arrays
        } // END - if
 
        // Init global arrays


@@ -118,7 +118,7 @@ function isNetworkNameValid ($name) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$name])) {
                // Does it exist?
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$name])) {
                // Does it exist?

-               $GLOBALS[__FUNCTION__][$name] = (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', true) == 1);
+               $GLOBALS[__FUNCTION__][$name] = (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE) == 1);

        } // END - if
 
        // Return result
        } // END - if
 
        // Return result


@@ -130,7 +130,7 @@ function isNetworkActiveByShortName ($name) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$name])) {
                // Does it exist?
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$name])) {
                // Does it exist?

-               $GLOBALS[__FUNCTION__][$name] = ((isNetworkNameValid($name)) && (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', true, " AND `network_active`='Y'") == 1));
+               $GLOBALS[__FUNCTION__][$name] = ((isNetworkNameValid($name)) && (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE, " AND `network_active`='Y'") == 1));

        } // END - if
 
        // Return result
        } // END - if
 
        // Return result


@@ -142,7 +142,7 @@ function isNetworkActiveById ($networkId) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$networkId])) {
                // Does it exist?
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$networkId])) {
                // Does it exist?

-               $GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData(bigintval($networkId), 'network_data', 'network_id', 'network_id', true, " AND `network_active`='Y'") == 1);
+               $GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData(bigintval($networkId), 'network_data', 'network_id', 'network_id', TRUE, " AND `network_active`='Y'") == 1);

        } // END - if
 
        // Return result
        } // END - if
 
        // Return result


@@ -498,7 +498,7 @@ function doNetworkUpdateDataByArray ($networkId, $networkData) {
        } // END - if
 
        // Just call our inner method
        } // END - if
 
        // Just call our inner method

-       return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), false, false);
+       return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), FALSE, FALSE);

 }
 
 // Updates given network type handler (id) with data from array
 }
 
 // Updates given network type handler (id) with data from array


@@ -510,7 +510,7 @@ function doNetworkUpdateTypeByArray ($networkTypeId, $networkTypeData) {
        } // END - if
 
        // Just call our inner method
        } // END - if
 
        // Just call our inner method

-       return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkTypeId)), array(), false, false);
+       return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkTypeId)), array(), FALSE, FALSE);

 }
 
 // Updates given network request parameters (id) with data from array
 }
 
 // Updates given network request parameters (id) with data from array


@@ -522,7 +522,7 @@ function doNetworkUpdateParamsByArray ($networkParamsId, $networkParamsData) {
        } // END - if
 
        // Just call our inner method
        } // END - if
 
        // Just call our inner method

-       return adminSaveSettings($networkParamsData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkParamsId)), array(), false, false);
+       return adminSaveSettings($networkParamsData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkParamsId)), array(), FALSE, FALSE);

 }
 
 // Updates given network array translations (id) with data from array
 }
 
 // Updates given network array translations (id) with data from array


@@ -534,7 +534,7 @@ function doNetworkUpdateArrayTranslationsByArray ($networkTranslationsId, $netwo
        } // END - if
 
        // Just call our inner method
        } // END - if
 
        // Just call our inner method

-       return adminSaveSettings($networkTranslationsData, '_network_array_translation', sprintf("`network_array_id`=%s", bigintval($networkTranslationsId)), array(), false, false);
+       return adminSaveSettings($networkTranslationsData, '_network_array_translation', sprintf("`network_array_id`=%s", bigintval($networkTranslationsId)), array(), FALSE, FALSE);

 }
 
 // Removes given network entry
 }
 
 // Removes given network entry


@@ -584,7 +584,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network');
        } else {
                // Nothing selected
                $content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network');
        } else {
                // Nothing selected

-               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');

        }
 
        // Free the result
        }
 
        // Free the result


@@ -630,7 +630,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
        } else {
                // Nothing selected
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
        } else {
                // Nothing selected

-               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');

        }
 
        // Free the result
        }
 
        // Free the result


@@ -677,7 +677,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
        } else {
                // Nothing selected
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
        } else {
                // Nothing selected

-               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');

        }
 
        // Free the result
        }
 
        // Free the result


@@ -1127,12 +1127,12 @@ function doAdminNetworkProcessAddNetwork () {
        // We can say here, the form is sent, so check if the network is already added
        if (isNetworkNameValid(postRequestElement('network_short_name'))) {
                // Already there
        // We can say here, the form is sent, so check if the network is already added
        if (isNetworkNameValid(postRequestElement('network_short_name'))) {
                // Already there

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
-               return false;
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
+               return FALSE;

        } elseif (!isNetworkActiveByShortName(postRequestElement('network_short_name'))) {
                // Network is not active
        } elseif (!isNetworkActiveByShortName(postRequestElement('network_short_name'))) {
                // Network is not active

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_NOT_ACTIVE=' . postRequestElement('network_short_name') . '%}');
-               return false;
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_NOT_ACTIVE=' . postRequestElement('network_short_name') . '%}');
+               return FALSE;

        }
 
        // Remove the 'ok' part
        }
 
        // Remove the 'ok' part


@@ -1147,10 +1147,10 @@ function doAdminNetworkProcessAddNetwork () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added

-               loadTemplate('admin_network_added', false, postRequestArray());
+               loadTemplate('admin_network_added', FALSE, postRequestArray());

        } else {
                // Not added
        } else {
                // Not added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');

        }
 }
 
        }
 }
 


@@ -1169,7 +1169,7 @@ function doAdminNetworkProcessHandleNetworks () {
                                // Is there found the network?
                                if (count($networkData) > 0) {
                                        // Add row template with given form name
                                // Is there found the network?
                                if (count($networkData) > 0) {
                                        // Add row template with given form name

-                                       $OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks_row', true, $networkData);
+                                       $OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks_row', TRUE, $networkData);

                                } // END - if
                        } // END - if
                } // END - foreach
                                } // END - if
                        } // END - if
                } // END - foreach


@@ -1177,13 +1177,13 @@ function doAdminNetworkProcessHandleNetworks () {
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Output main template
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Output main template

-                       loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', false, $OUT);
+                       loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $OUT);

 
                        // Don't display the list/add new form
 
                        // Don't display the list/add new form

-                       $GLOBALS['network_display'] = false;
+                       $GLOBALS['network_display'] = FALSE;

                } else {
                        // Nothing selected/found
                } else {
                        // Nothing selected/found

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_FOUND--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1207,10 +1207,10 @@ function doAdminNetworkProcessHandleNetworkTypes () {
                                if (count($networkTypeData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                if (count($networkTypeData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
+                                               $OUT .= loadTemplate('admin_edit_network_types_row', TRUE, $networkTypeData);

                                        } elseif (isFormSent('delete')) {
                                                // Add row template for deleting
                                        } elseif (isFormSent('delete')) {
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData);
+                                               $OUT .= loadTemplate('admin_delete_network_types_row', TRUE, $networkTypeData);

                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');


@@ -1223,19 +1223,19 @@ function doAdminNetworkProcessHandleNetworkTypes () {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {

-                               loadTemplate('admin_edit_network_types', false, $OUT);
+                               loadTemplate('admin_edit_network_types', FALSE, $OUT);

                        } elseif (isFormSent('delete')) {
                        } elseif (isFormSent('delete')) {

-                               loadTemplate('admin_delete_network_types', false, $OUT);
+                               loadTemplate('admin_delete_network_types', FALSE, $OUT);

                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                        }
 
                        // Don't display the list/add new form
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                        }
 
                        // Don't display the list/add new form

-                       $GLOBALS['network_display'] = false;
+                       $GLOBALS['network_display'] = FALSE;

                } else {
                        // Nothing selected/found
                } else {
                        // Nothing selected/found

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1262,13 +1262,13 @@ function doAdminNetworkProcessHandleRequestParams () {
                                if (count($networkRequestData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                if (count($networkRequestData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('admin_edit_network_request_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_edit_network_request_params_row', TRUE, $networkRequestData);

                                        } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
                                                // Add row template for deleting
                                        } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('admin_delete_network_request_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_delete_network_request_params_row', TRUE, $networkRequestData);

                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');


@@ -1281,19 +1281,19 @@ function doAdminNetworkProcessHandleRequestParams () {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {

-                               loadTemplate('admin_edit_network_request_params', false, $OUT);
+                               loadTemplate('admin_edit_network_request_params', FALSE, $OUT);

                        } elseif (isFormSent('delete')) {
                        } elseif (isFormSent('delete')) {

-                               loadTemplate('admin_delete_network_request_params', false, $OUT);
+                               loadTemplate('admin_delete_network_request_params', FALSE, $OUT);

                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                        }
 
                        // Don't display the list/add new form
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                        }
 
                        // Don't display the list/add new form

-                       $GLOBALS['network_display'] = false;
+                       $GLOBALS['network_display'] = FALSE;

                } else {
                        // Nothing selected/found
                } else {
                        // Nothing selected/found

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1340,7 +1340,7 @@ function doAdminNetworkProcessChangeNetworks () {
                        displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1367,7 +1367,7 @@ function doAdminNetworkProcessRemoveNetworks () {
                        displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1377,10 +1377,10 @@ function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestElement('network_type_handler'), getRequestElement('network_id'))) {
                // Already added
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestElement('network_type_handler'), getRequestElement('network_id'))) {
                // Already added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');

 
                // ... so abort here
 
                // ... so abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove the 'ok' part
        } // END - if
 
        // Remove the 'ok' part


@@ -1401,10 +1401,10 @@ function doAdminNetworkProcessAddNetworkType () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added

-               loadTemplate('admin_network_type_added', false, postRequestArray());
+               loadTemplate('admin_network_type_added', FALSE, postRequestArray());

        } else {
                // Not added
        } else {
                // Not added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');

        }
 }
 
        }
 }
 


@@ -1456,7 +1456,7 @@ function doAdminNetworkProcessChangeHandlerTypes () {
                        displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1509,7 +1509,7 @@ function doAdminNetworkProcessChangeRequestParams () {
                        displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1562,7 +1562,7 @@ function doAdminNetworkProcessChangeArrayTranslations () {
                        displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1589,7 +1589,7 @@ function doAdminNetworkProcessRemoveNetworkTypes () {
                        displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1616,7 +1616,7 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () {
                        displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1643,7 +1643,7 @@ function doAdminNetworkProcessRemoveNetworkArrayTranslation () {
                        displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1653,10 +1653,10 @@ function doAdminNetworkProcessAddRequestParam () {
        // Is the request parameter already used with given network?
        if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
        // Is the request parameter already used with given network?
        if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}');

 
                // ... so abort here
 
                // ... so abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove the 'ok' part
        } // END - if
 
        // Remove the 'ok' part


@@ -1677,10 +1677,10 @@ function doAdminNetworkProcessAddRequestParam () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added

-               loadTemplate('admin_network_request_param_added', false, postRequestArray());
+               loadTemplate('admin_network_request_param_added', FALSE, postRequestArray());

        } else {
                // Not added
        } else {
                // Not added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');

        }
 }
 
        }
 }
 


@@ -1689,10 +1689,10 @@ function doAdminNetworkProcessAddVcheckParam () {
        // Is the request parameter already used with given network?
        if (isNetworkVcheckElementValid(postRequestElement('network_vcheck_param_key'), getRequestElement('network_id'))) {
                // Already added
        // Is the request parameter already used with given network?
        if (isNetworkVcheckElementValid(postRequestElement('network_vcheck_param_key'), getRequestElement('network_id'))) {
                // Already added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');

 
                // ... so abort here
 
                // ... so abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove the 'ok' part
        } // END - if
 
        // Remove the 'ok' part


@@ -1713,10 +1713,10 @@ function doAdminNetworkProcessAddVcheckParam () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added

-               loadTemplate('admin_network_vcheck_param_added', false, postRequestArray());
+               loadTemplate('admin_network_vcheck_param_added', FALSE, postRequestArray());

        } else {
                // Not added
        } else {
                // Not added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');

        }
 }
 
        }
 }
 


@@ -1725,10 +1725,10 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
        // Is the request parameter already used with given network?
        if (isNetworkArrayTranslationValid(postRequestElement('network_array_index'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
        // Is the request parameter already used with given network?
        if (isNetworkArrayTranslationValid(postRequestElement('network_array_index'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}');

 
                // ... so abort here
 
                // ... so abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove the 'ok' part
        } // END - if
 
        // Remove the 'ok' part


@@ -1753,10 +1753,10 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added

-               loadTemplate('admin_network_array_translation_added', false, postRequestArray());
+               loadTemplate('admin_network_array_translation_added', FALSE, postRequestArray());

        } else {
                // Not added
        } else {
                // Not added

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}');

        }
 }
 
        }
 }
 


@@ -1782,13 +1782,13 @@ function doAdminNetworkProcessHandleArrayTranslations () {
                                if (count($networkTranslationsData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                if (count($networkTranslationsData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('admin_edit_network_array_translation_row', true, $networkTranslationsData);
+                                               $OUT .= loadTemplate('admin_edit_network_array_translation_row', TRUE, $networkTranslationsData);

                                        } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkTranslationsData['network_type_data'] = getNetworkTypeDataById($networkTranslationsData['network_type_id']);
 
                                                // Add row template for deleting
                                        } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkTranslationsData['network_type_data'] = getNetworkTypeDataById($networkTranslationsData['network_type_id']);
 
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('admin_delete_network_array_translation_row', true, $networkTranslationsData);
+                                               $OUT .= loadTemplate('admin_delete_network_array_translation_row', TRUE, $networkTranslationsData);

                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');


@@ -1801,19 +1801,19 @@ function doAdminNetworkProcessHandleArrayTranslations () {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {

-                               loadTemplate('admin_edit_network_array_translation', false, $OUT);
+                               loadTemplate('admin_edit_network_array_translation', FALSE, $OUT);

                        } elseif (isFormSent('delete')) {
                        } elseif (isFormSent('delete')) {

-                               loadTemplate('admin_delete_network_array_translation', false, $OUT);
+                               loadTemplate('admin_delete_network_array_translation', FALSE, $OUT);

                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                        }
 
                        // Don't display the list/add new form
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
                        }
 
                        // Don't display the list/add new form

-                       $GLOBALS['network_display'] = false;
+                       $GLOBALS['network_display'] = FALSE;

                } else {
                        // Nothing selected/found
                } else {
                        // Nothing selected/found

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');

                }
        } // END - if
 }
                }
        } // END - if
 }


@@ -1850,12 +1850,12 @@ function doAdminNetworkProcessNetworkApiConfig () {
                displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}');
        } else {
                // Not added
                displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}');
        } else {
                // Not added

-               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');

        }
 }
 
 // Only adds network type configuration if not yet present
        }
 }
 
 // Only adds network type configuration if not yet present

-function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
+function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) {

        // Remove the 'ok' part
        unsetPostRequestElement('ok');
 
        // Remove the 'ok' part
        unsetPostRequestElement('ok');
 


@@ -1890,7 +1890,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
        unsetPostRequestElement('set_all');
 
        // Shall we set for all?
        unsetPostRequestElement('set_all');
 
        // Shall we set for all?

-       if ($setAll === true) {
+       if ($setAll === TRUE) {

                // Get all handlers
                $result = SQL_QUERY_ESC('SELECT `network_type_id` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s ORDER BY `network_type_id` ASC',
                        array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);
                // Get all handlers
                $result = SQL_QUERY_ESC('SELECT `network_type_id` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s ORDER BY `network_type_id` ASC',
                        array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);


@@ -1911,7 +1911,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
                        setGetRequestElement('network_type_id', $typeId);
 
                        // Call this function again
                        setGetRequestElement('network_type_id', $typeId);
 
                        // Call this function again

-                       $numRows += doAdminNetworkProcessAddHandlerTypesConfig(false);
+                       $numRows += doAdminNetworkProcessAddHandlerTypesConfig(FALSE);

                } // END - while
 
                // Free result
                } // END - while
 
                // Free result


@@ -1923,7 +1923,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
                        displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}');
                } else {
                        // Nothing has been saved
                        displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}');
                } else {
                        // Nothing has been saved

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');

                }
        } else {
                // Get SQL query for new entry
                }
        } else {
                // Get SQL query for new entry


@@ -1933,14 +1933,14 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
                // Shall we display the message?
                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
                // Shall we display the message?

-               if ($displayMessage === true) {
+               if ($displayMessage === TRUE) {

                        // Output message
                        if (!SQL_HASZEROAFFECTED()) {
                                // Successfully added
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added
                        // Output message
                        if (!SQL_HASZEROAFFECTED()) {
                                // Successfully added
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added

-                               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');

                        }
                } else {
                        // Return amount of affected rows (1 or 2)
                        }
                } else {
                        // Return amount of affected rows (1 or 2)


@@ -1950,7 +1950,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
 }
 
 // Only changes network type configuration if not yet present
 }
 
 // Only changes network type configuration if not yet present

-function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
+function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {

        // Remove the 'ok' part
        unsetPostRequestElement('ok');
 
        // Remove the 'ok' part
        unsetPostRequestElement('ok');
 


@@ -1981,7 +1981,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
        unsetPostRequestElement('set_all');
 
        // Shall we set for all?
        unsetPostRequestElement('set_all');
 
        // Shall we set for all?

-       if ($setAll === true) {
+       if ($setAll === TRUE) {

                // Get all data entries
                $result = SQL_QUERY_ESC('SELECT `network_data_id` FROM `{?_MYSQL_PREFIX?}_network_types_config` WHERE `network_id`=%s ORDER BY `network_type_id` ASC',
                        array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);
                // Get all data entries
                $result = SQL_QUERY_ESC('SELECT `network_data_id` FROM `{?_MYSQL_PREFIX?}_network_types_config` WHERE `network_id`=%s ORDER BY `network_type_id` ASC',
                        array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);


@@ -2002,7 +2002,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
                        setPostRequestElement('network_data_id', $dataId);
 
                        // Call this function again
                        setPostRequestElement('network_data_id', $dataId);
 
                        // Call this function again

-                       $numRows += doAdminNetworkProcessEditHandlerTypesConfig(false);
+                       $numRows += doAdminNetworkProcessEditHandlerTypesConfig(FALSE);

                } // END - while
 
                // Free result
                } // END - while
 
                // Free result


@@ -2014,7 +2014,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
                        displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}');
                } else {
                        // Nothing has been saved
                        displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}');
                } else {
                        // Nothing has been saved

-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');

                }
        } else {
                // Get SQL query for new entry
                }
        } else {
                // Get SQL query for new entry


@@ -2024,14 +2024,14 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
                // Shall we display the message?
                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
                // Shall we display the message?

-               if ($displayMessage === true) {
+               if ($displayMessage === TRUE) {

                        // Output message
                        if (!SQL_HASZEROAFFECTED()) {
                                // Successfully added
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added
                        // Output message
                        if (!SQL_HASZEROAFFECTED()) {
                                // Successfully added
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added

-                               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');

                        }
                } else {
                        // Return amount of affected rows (1 or 2)
                        }
                } else {
                        // Return amount of affected rows (1 or 2)


@@ -2102,10 +2102,10 @@ function doAdminNetworkProcessExport () {
        call_user_func($callbackName);
 
        // Mark it as called
        call_user_func($callbackName);
 
        // Mark it as called

-       $GLOBALS[__FUNCTION__][$callbackName] = true;
+       $GLOBALS[__FUNCTION__][$callbackName] = TRUE;

 
        // Don't display the list/add new form
 
        // Don't display the list/add new form

-       $GLOBALS['network_display'] = false;
+       $GLOBALS['network_display'] = FALSE;

 }
 
 // Exports (and displays) the table 'network_data'
 }
 
 // Exports (and displays) the table 'network_data'


@@ -2154,7 +2154,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
        SQL_FREERESULT($result);
 
        // Output the SQL query

-       loadTemplate('admin_export_network_data', false, $SQL);
+       loadTemplate('admin_export_network_data', FALSE, $SQL);

 }
 
 // Exports (and displays) the table 'network_types'
 }
 
 // Exports (and displays) the table 'network_types'


@@ -2218,7 +2218,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
        SQL_FREERESULT($result);
 
        // Output the SQL query

-       loadTemplate('admin_export_network_types', false, $SQL);
+       loadTemplate('admin_export_network_types', FALSE, $SQL);

 }
 
 // Exports (and displays) the table 'network_request_params'
 }
 
 // Exports (and displays) the table 'network_request_params'


@@ -2276,7 +2276,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
        SQL_FREERESULT($result);
 
        // Output the SQL query

-       loadTemplate('admin_export_network_request_params', false, $SQL);
+       loadTemplate('admin_export_network_request_params', FALSE, $SQL);

 }
 
 // Exports (and displays) the table 'network_vcheck_params'
 }
 
 // Exports (and displays) the table 'network_vcheck_params'


@@ -2331,7 +2331,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
        SQL_FREERESULT($result);
 
        // Output the SQL query

-       loadTemplate('admin_export_network_vcheck_params', false, $SQL);
+       loadTemplate('admin_export_network_vcheck_params', FALSE, $SQL);

 }
 
 // Exports (and displays) the table 'network_array_translation'
 }
 
 // Exports (and displays) the table 'network_array_translation'


@@ -2379,7 +2379,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
        SQL_FREERESULT($result);
 
        // Output the SQL query

-       loadTemplate('admin_export_network_array_translation', false, $SQL);
+       loadTemplate('admin_export_network_array_translation', FALSE, $SQL);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 1e8084013b5bda6e6476dfc21549da236ffea576..f66ade8e1c0227a7d578b3ef5ac1cbbfa4fa0b92 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Checks whether the nickname is active
 function isNicknameOrUserid ($useridNick) {
        // By default nothing is found...
 // Checks whether the nickname is active
 function isNicknameOrUserid ($useridNick) {
        // By default nothing is found...

-       $ret = false;
+       $ret = FALSE;

 
        // Found in cache?
        if (isset($GLOBALS['nickname_active'][$useridNick])) {
 
        // Found in cache?
        if (isset($GLOBALS['nickname_active'][$useridNick])) {


@@ -75,10 +75,10 @@ function getNickname ($userid) {
                $ret = $GLOBALS['nicknames'][$userid];
        } else {
                // Init result
                $ret = $GLOBALS['nicknames'][$userid];
        } else {
                // Init result

-               $result = false;
+               $result = FALSE;

 
                // Nickname or userid used?
 
                // Nickname or userid used?

-               if ('' . bigintval($userid, true, false) . '' === '' . $userid . '') {
+               if ('' . bigintval($userid, TRUE, FALSE) . '' === '' . $userid . '') {

                        // Userid given, so try to load user data
                        if (fetchUserData($userid)) {
                                // Load nickname from database
                        // Userid given, so try to load user data
                        if (fetchUserData($userid)) {
                                // Load nickname from database

diff --git a/inc/libs/other_functions.php b/inc/libs/other_functions.php
index 98d1858473556a13005a71347d42ab3f8aa9a50d..f6ee8282e35d90bc209a67724e9545778362b0d9 100644 (file)
--- a/inc/libs/other_functions.php
+++ b/inc/libs/other_functions.php
@@ -50,14 +50,14 @@ function displayDebugSqls () {
                $content['timing']   = translateComma($content['timing'] * 1000);
 
                // Load row template
                $content['timing']   = translateComma($content['timing'] * 1000);
 
                // Load row template

-               $OUT .= loadTemplate('admin_other_sqls_row', true, $content);
+               $OUT .= loadTemplate('admin_other_sqls_row', TRUE, $content);

 
                // Count one up
                $i++;
        } // END - foreach
 
        // Load main template
 
                // Count one up
                $i++;
        } // END - foreach
 
        // Load main template

-       $GLOBALS['__page_footer'] .= loadTemplate('admin_other_sqls', true, $OUT);
+       $GLOBALS['__page_footer'] .= loadTemplate('admin_other_sqls', TRUE, $OUT);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index 805b9d9ee0efd7ecebf57c1b139f953870c2cd3e..1447dda5b4bef0ca9aaf100b3d27897c07d46e9b 100644 (file)
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -69,22 +69,22 @@ ORDER BY
                                        $content['points'] = translateComma($points * $content['rate'] - 0.5);
 
                                        // Load row template
                                        $content['points'] = translateComma($points * $content['rate'] - 0.5);
 
                                        // Load row template

-                                       $OUT .= loadTemplate('member_payout_li', true, $content);
+                                       $OUT .= loadTemplate('member_payout_li', TRUE, $content);

                                } // END - if
                        } // END - while
 
                        // Load main template
                                } // END - if
                        } // END - while
 
                        // Load main template

-                       loadTemplate('member_payout_list', true, $OUT);
+                       loadTemplate('member_payout_list', TRUE, $OUT);

                } else {
                        // No payout types setup so far
                } else {
                        // No payout types setup so far

-                       loadTemplate('admin_settings_unsaved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');

                }
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // Points is empty
                }
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // Points is empty

-               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_PAYOUT_NO_POINTS_ENTERED--}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_PAYOUT_NO_POINTS_ENTERED--}');

        }
 }
 
        }
 }
 

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index e768e226c7acd48069c0715663cdaf245e6ee8a7..3e3bbadb9f9488442f00dee8cde3dc5e41b56b24 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -74,7 +74,7 @@ ORDER BY
                // Merge both arrays
                $content = merge_array($content, $row);
 
                // Merge both arrays
                $content = merge_array($content, $row);
 

-               $un = false;
+               $un = FALSE;

 
                // Get refs by userid
                $count = getReferralRallyeRefsCount($content['userid']);
 
                // Get refs by userid
                $count = getReferralRallyeRefsCount($content['userid']);


@@ -140,7 +140,7 @@ WHERE
                                        bigintval($count),
                                        $cpoints
                                ), __FUNCTION__, __LINE__);
                                        bigintval($count),
                                        $cpoints
                                ), __FUNCTION__, __LINE__);

-                       $un = true;
+                       $un = TRUE;

                } // END - if
 
                // Free memory
                } // END - if
 
                // Free memory


@@ -150,7 +150,7 @@ WHERE
                $content['refs']  = $count;
 
                // Shall I notify this member?
                $content['refs']  = $count;
 
                // Shall I notify this member?

-               if (($content['send_notify'] == 'Y') && ($un === true)) {
+               if (($content['send_notify'] == 'Y') && ($un === TRUE)) {

                        // Load email template and send it to the user
                        $message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
                        sendEmail($content['userid'], '{%message,MEMBER_RALLYE_NOTIFY_SUBJECT=' . $content['title'] . '%}', $message);
                        // Load email template and send it to the user
                        $message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
                        sendEmail($content['userid'], '{%message,MEMBER_RALLYE_NOTIFY_SUBJECT=' . $content['title'] . '%}', $message);


@@ -324,7 +324,7 @@ LIMIT 1",
        SQL_FREERESULT($result);
 
        // Sort whole array
        SQL_FREERESULT($result);
 
        // Sort whole array

-       array_pk_sort($content, array('cpoints', 'ref'), 0, 1, true);
+       array_pk_sort($content, array('cpoints', 'ref'), 0, 1, TRUE);

 
        // Generate table
        $OUT = '';
 
        // Generate table
        $OUT = '';


@@ -346,7 +346,7 @@ LIMIT 1",
                );
 
                // Load row template and switch color
                );
 
                // Load row template and switch color

-               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $row);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', TRUE, $row);

        } // END - for
 
        // Add min_prices/users
        } // END - for
 
        // Add min_prices/users


@@ -355,7 +355,7 @@ LIMIT 1",
        $content['min_users']  = bigintval($min_users);
 
        // And finnally return the output
        $content['min_users']  = bigintval($min_users);
 
        // And finnally return the output

-       return loadTemplate($mode . '_list_rallye', true, $content);
+       return loadTemplate($mode . '_list_rallye', TRUE, $content);

 }
 
 // Sends out a notification about the rallye
 }
 
 // Sends out a notification about the rallye


@@ -466,7 +466,7 @@ function getTotalRallyeWinners ($rallyeId) {
                // "Walk" through all entries
                foreach ($prices['userid'] as $key => $userid) {
                        // Check for userid
                // "Walk" through all entries
                foreach ($prices['userid'] as $key => $userid) {
                        // Check for userid

-                       $active = countSumTotalData($userid, 'user_data', 'userid', 'userid', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+                       $active = countSumTotalData($userid, 'user_data', 'userid', 'userid', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));

 
                        // Allow valid and active users with at least one ref
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'rallyeId=' . $rallyeId . ',userid=' . $userid . ',ref=' . $prices['ref'][$key] . ',cpoints=' . $prices['cpoints'][$key]);
 
                        // Allow valid and active users with at least one ref
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'rallyeId=' . $rallyeId . ',userid=' . $userid . ',ref=' . $prices['ref'][$key] . ',cpoints=' . $prices['cpoints'][$key]);


@@ -506,7 +506,7 @@ function stopRallyeByResult ($result) {
                 *   active = 1: account is still confirmed
                 *   active = 0: account is deleted or locked
                 */
                 *   active = 1: account is still confirmed
                 *   active = 0: account is deleted or locked
                 */

-               $active = countSumTotalData($userid, 'user_data', 'userid', 'userid', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+               $active = countSumTotalData($userid, 'user_data', 'userid', 'userid', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));

 
                $prices['active'][$key] = $active;
 
 
                $prices['active'][$key] = $active;
 


@@ -749,7 +749,7 @@ LIMIT 1",
        SQL_FREERESULT($result_user);
 
        // Sort array for refs (descending)
        SQL_FREERESULT($result_user);
 
        // Sort array for refs (descending)

-       array_pk_sort($users, array('cpoints', 'ref'), 0, 1, true);
+       array_pk_sort($users, array('cpoints', 'ref'), 0, 1, TRUE);

 
        // Load prices array (!)
        $prices = getArrayFromReferralRallyePrices($rallye);
 
        // Load prices array (!)
        $prices = getArrayFromReferralRallyePrices($rallye);


@@ -784,7 +784,7 @@ function addReferralRallyeWinners ($mode, $rallye, $default=0) {
                 *   active = 1: account is still confirmed
                 *   active = 0: account is deleted or locked
                 */
                 *   active = 1: account is still confirmed
                 *   active = 0: account is deleted or locked
                 */

-               $active = countSumTotalData($content['userid'][$idx], 'user_data', 'userid', 'userid', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+               $active = countSumTotalData($content['userid'][$idx], 'user_data', 'userid', 'userid', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));

 
                if ((empty($content['ref'][$idx])) || ($content['ref'][$idx] == '0') || ($active == '0') || ('' . round($content['cpoints'][$idx]) . '' == '0') || (empty($content['cpoints'][$idx]))) {
                        // Allow valid and active users with at least one ref to get points
 
                if ((empty($content['ref'][$idx])) || ($content['ref'][$idx] == '0') || ($active == '0') || ('' . round($content['cpoints'][$idx]) . '' == '0') || (empty($content['cpoints'][$idx]))) {
                        // Allow valid and active users with at least one ref to get points


@@ -818,7 +818,7 @@ function addReferralRallyeWinners ($mode, $rallye, $default=0) {
                );
 
                // Load row template
                );
 
                // Load row template

-               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $row);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', TRUE, $row);

        } // END - for
 
        // Prepare content
        } // END - for
 
        // Prepare content


@@ -829,7 +829,7 @@ function addReferralRallyeWinners ($mode, $rallye, $default=0) {
        );
 
        // Load main template and finnally return the output
        );
 
        // Load main template and finnally return the output

-       return loadTemplate($mode . '_list_rallye', true, $content);
+       return loadTemplate($mode . '_list_rallye', TRUE, $content);

 }
 
 //
 }
 
 //


@@ -864,11 +864,11 @@ WHERE
 
                        // Purge whole rallye
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
 
                        // Purge whole rallye
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",

-                               array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
+                               array(bigintval($content['id'])), __FUNCTION__, __LINE__, FALSE));

                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s LIMIT 1",
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s LIMIT 1",

-                               array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
+                               array(bigintval($content['id'])), __FUNCTION__, __LINE__, FALSE));

                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s LIMIT 1",
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s LIMIT 1",

-                               array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
+                               array(bigintval($content['id'])), __FUNCTION__, __LINE__, FALSE));

 
                        // Add task (we ignore the task id here
                        createNewTask('{--ADMIN_RALLYE_PURGED_TASK--}: ' . $content['title'], '{--ADMIN_RALLYE_PURGED_TEXT--}', 'RALLYE_PURGED');
 
                        // Add task (we ignore the task id here
                        createNewTask('{--ADMIN_RALLYE_PURGED_TASK--}: ' . $content['title'], '{--ADMIN_RALLYE_PURGED_TEXT--}', 'RALLYE_PURGED');


@@ -892,7 +892,7 @@ function addReferralRallyeTemplateSelection ($name = 'template', $default = '')
        $basePath = sprintf("templates/%s/html/rallye/", getLanguage());
 
        // Read the directory
        $basePath = sprintf("templates/%s/html/rallye/", getLanguage());
 
        // Read the directory

-       $templates = getArrayFromDirectory($basePath, 'rallye_', false, true, array(), '.tpl');
+       $templates = getArrayFromDirectory($basePath, 'rallye_', FALSE, TRUE, array(), '.tpl');

 
        // And walk through
        foreach ($templates as $read) {
 
        // And walk through
        foreach ($templates as $read) {


@@ -952,7 +952,7 @@ function getReferralRallyeRefsCount ($currUserid, $oldReferralCount = '0') {
                        } // END - if
                } // END - foreach
 
                        } // END - if
                } // END - foreach
 

-               //* DEBUG: */ debugOutput('<pre>'.print_r($GLOBALS['cache_array']['refsystem'], true).'</pre>');
+               //* DEBUG: */ debugOutput('<pre>'.print_r($GLOBALS['cache_array']['refsystem'], TRUE).'</pre>');

                //* DEBUG: */ doShutdown();
 
                if ($count > 0) {
                //* DEBUG: */ doShutdown();
 
                if ($count > 0) {


@@ -1030,7 +1030,7 @@ function getTotalRallyePrices ($rallyeId) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$rallyeId])) {
                // Determine it
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$rallyeId])) {
                // Determine it

-               $GLOBALS[__FUNCTION__][$rallyeId] = countSumTotalData($rallyeId, 'rallye_prices', 'id', 'rallye_id', true);
+               $GLOBALS[__FUNCTION__][$rallyeId] = countSumTotalData($rallyeId, 'rallye_prices', 'id', 'rallye_id', TRUE);

        } // END - if
 
        // Return it
        } // END - if
 
        // Return it

diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index d993ebaf94216f9916a7faef7ea2a414c3c6fd95..82746fe51dc5e5d6d03c8e0de926f16604682f87 100644 (file)
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -354,7 +354,7 @@ function updateMemberRefbackPercents ($id, $percents, $note) {
        sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $content, $content['refid']);
 
        // All fine!
        sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $content, $content['refid']);
 
        // All fine!

-       $status['ok'] = true;
+       $status['ok'] = TRUE;

 
        // Return status array
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',percents=' . $percents . ' - EXIT!');
 
        // Return status array
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',percents=' . $percents . ' - EXIT!');

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 3a3d1f2dd3cd99c02665676d73825b0cca7ff053..0b8f952157f535e8a1e5fea182c7d0e0a05a1aab 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Checks whether all required registration fields are set
 function ifRequiredRegisterFieldsAreSet (&$array) {
        // By default all is fine
 // Checks whether all required registration fields are set
 function ifRequiredRegisterFieldsAreSet (&$array) {
        // By default all is fine

-       $ret = true;
+       $ret = TRUE;

        foreach ($array as $key => $value) {
                // Check all fields that must register
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='%s' AND `field_required`='Y' LIMIT 1",
        foreach ($array as $key => $value) {
                // Check all fields that must register
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='%s' AND `field_required`='Y' LIMIT 1",


@@ -55,10 +55,10 @@ function ifRequiredRegisterFieldsAreSet (&$array) {
                        // if extensions is present check if country code was selected
                        //         01              2         21    12             3         32    234     5      54    4               43    34                      4    4      5      5432    2      3                      3210
                        $country = ((!isExtensionActive('country')) || ((isExtensionActive('country')) && (((empty($value)) && ($key == 'cntry')) || (($key == 'country_code') && (!empty($value)))) && (!empty($array['country_code']))));
                        // if extensions is present check if country code was selected
                        //         01              2         21    12             3         32    234     5      54    4               43    34                      4    4      5      5432    2      3                      3210
                        $country = ((!isExtensionActive('country')) || ((isExtensionActive('country')) && (((empty($value)) && ($key == 'cntry')) || (($key == 'country_code') && (!empty($value)))) && (!empty($array['country_code']))));

-                       if ((empty($value)) && ($country === false)) {
+                       if ((empty($value)) && ($country === FALSE)) {

                                // Required field not set
                                $array[$key] = '!';
                                // Required field not set
                                $array[$key] = '!';

-                               $ret = false;
+                               $ret = FALSE;

                        } // END - if
                } // END - if
 
                        } // END - if
                } // END - if
 


@@ -114,7 +114,7 @@ ORDER BY
                        }
 
                        // Load template and switch color
                        }
 
                        // Load template and switch color

-                       $OUT .= loadTemplate('guest_cat_row', true, $content);
+                       $OUT .= loadTemplate('guest_cat_row', TRUE, $content);

                } // END - while
                $OUT .= '</table>';
 
                } // END - while
                $OUT .= '</table>';
 


@@ -122,7 +122,7 @@ ORDER BY
                SQL_FREERESULT($result);
        } else {
                // No categories setted up so far...
                SQL_FREERESULT($result);
        } else {
                // No categories setted up so far...

-               $OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', true);
+               $OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', TRUE);

        }
 
        // Return generated HTML code
        }
 
        // Return generated HTML code


@@ -141,12 +141,12 @@ function registerOutputFailedMessage ($messageId, $extra='') {
 // Checks whether the registration data is complete
 function isRegistrationDataComplete () {
        // Init elements
 // Checks whether the registration data is complete
 function isRegistrationDataComplete () {
        // Init elements

-       $GLOBALS['registration_ip_timeout']     = false;
-       $GLOBALS['registration_short_password'] = false;
+       $GLOBALS['registration_ip_timeout']     = FALSE;
+       $GLOBALS['registration_short_password'] = FALSE;

        $GLOBALS['registration_selected_cats']  = '0';
 
        // Default is okay
        $GLOBALS['registration_selected_cats']  = '0';
 
        // Default is okay

-       $isOkay = true;
+       $isOkay = TRUE;

 
        // First we only check the submitted data then we continue... :)
        //
 
        // First we only check the submitted data then we continue... :)
        //


@@ -154,7 +154,7 @@ function isRegistrationDataComplete () {
        if (postRequestElement('agree') != 'Y') {
                setPostRequestElement('agree', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'agree=N - User did not agree with terms of usage.');
        if (postRequestElement('agree') != 'Y') {
                setPostRequestElement('agree', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'agree=N - User did not agree with terms of usage.');

-               $isOkay = false;
+               $isOkay = FALSE;

        } // END - if
 
        // Did he enter a valid email address? (we really don't care about
        } // END - if
 
        // Did he enter a valid email address? (we really don't care about


@@ -162,19 +162,19 @@ function isRegistrationDataComplete () {
        if ((!isAdmin()) && ((!isPostRequestElementSet('email')) || (!isEmailValid(postRequestElement('email'))))) {
                setPostRequestElement('email', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter proper email address.');
        if ((!isAdmin()) && ((!isPostRequestElementSet('email')) || (!isEmailValid(postRequestElement('email'))))) {
                setPostRequestElement('email', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter proper email address.');

-               $isOkay = false;
+               $isOkay = FALSE;

        } // END - if
 
        // And what about surname and family's name?
        if (!isPostRequestElementSet('surname')) {
                setPostRequestElement('surname', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter surname.');
        } // END - if
 
        // And what about surname and family's name?
        if (!isPostRequestElementSet('surname')) {
                setPostRequestElement('surname', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter surname.');

-               $isOkay = false;
+               $isOkay = FALSE;

        } // END - if
        if (!isPostRequestElementSet('family')) {
                setPostRequestElement('family', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter family name.');
        } // END - if
        if (!isPostRequestElementSet('family')) {
                setPostRequestElement('family', '!');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter family name.');

-               $isOkay = false;
+               $isOkay = FALSE;

        } // END - if
 
        // Get temporary array for modification
        } // END - if
 
        // Get temporary array for modification


@@ -187,7 +187,7 @@ function isRegistrationDataComplete () {
        setPostRequestArray($postArray);
 
        // Are both passwords zero length?
        setPostRequestArray($postArray);
 
        // Are both passwords zero length?

-       if ((strlen(postRequestElement('pass1')) == 0) && (strlen(postRequestElement('pass2')) == 0) && ($isOkay === true)) {
+       if ((strlen(postRequestElement('pass1')) == 0) && (strlen(postRequestElement('pass2')) == 0) && ($isOkay === TRUE)) {

                // Is the extension 'register' newer or equal 0.5.5?
                if ((isExtensionInstalledAndNewer('register', '0.5.5')) && (isRegisterGeneratePasswordEmptyEnabled())) {
                        // Generate a random password
                // Is the extension 'register' newer or equal 0.5.5?
                if ((isExtensionInstalledAndNewer('register', '0.5.5')) && (isRegisterGeneratePasswordEmptyEnabled())) {
                        // Generate a random password


@@ -203,7 +203,7 @@ function isRegistrationDataComplete () {
 
                        // ... which is both not okay
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Random password generation not possible, isExtensionInstalledAndNewer(register, 0.5.5)=' . intval(isExtensionInstalledAndNewer('register', '0.5.5')) . ',isRegisterGeneratePasswordEmptyEnabled()=' . intval(isRegisterGeneratePasswordEmptyEnabled()));
 
                        // ... which is both not okay
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Random password generation not possible, isExtensionInstalledAndNewer(register, 0.5.5)=' . intval(isExtensionInstalledAndNewer('register', '0.5.5')) . ',isRegisterGeneratePasswordEmptyEnabled()=' . intval(isRegisterGeneratePasswordEmptyEnabled()));

-                       $isOkay = false;
+                       $isOkay = FALSE;

                }
        } // END - if
 
                }
        } // END - if
 


@@ -232,14 +232,14 @@ function isRegistrationDataComplete () {
                                setPostRequestElement('pass2', '');
                        }
                }
                                setPostRequestElement('pass2', '');
                        }
                }

-               $isOkay = false;
+               $isOkay = FALSE;

        } // END - if
 
        // Is the password long enouth?
        } // END - if
 
        // Is the password long enouth?

-       if ((strlen(postRequestElement('pass1')) < getPassLen()) && ($isOkay === true)) {
-               $GLOBALS['registration_short_password'] = true;
+       if ((strlen(postRequestElement('pass1')) < getPassLen()) && ($isOkay === TRUE)) {
+               $GLOBALS['registration_short_password'] = TRUE;

                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did enter a short password.');
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did enter a short password.');

-               $isOkay = false;
+               $isOkay = FALSE;

        } // END - if
 
        // Do this check only when no admin is logged in
        } // END - if
 
        // Do this check only when no admin is logged in


@@ -262,7 +262,7 @@ function isRegistrationDataComplete () {
                if ((isEmailTaken(postRequestElement('email'))) && (!isAdmin())) {
                        setPostRequestElement('email', '?');
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did enter a already used email address.');
                if ((isEmailTaken(postRequestElement('email'))) && (!isAdmin())) {
                        setPostRequestElement('email', '?');
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did enter a already used email address.');

-                       $isOkay = false;
+                       $isOkay = FALSE;

                } // END - if
        } // END - if
 
                } // END - if
        } // END - if
 


@@ -270,7 +270,7 @@ function isRegistrationDataComplete () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay=' . intval($isOkay));
        if ((!isAdmin()) && (getIpTimeout() > 0)) {
                // Check his IP number
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay=' . intval($isOkay));
        if ((!isAdmin()) && (getIpTimeout() > 0)) {
                // Check his IP number

-               $GLOBALS['registration_ip_timeout'] = (countSumTotalData(detectRemoteAddr()  , 'user_data', 'userid', 'REMOTE_ADDR', true, ' AND ((UNIX_TIMESTAMP() - `joined`) < {?ip_timeout?} OR (UNIX_TIMESTAMP() - `last_update`) < {?ip_timeout?})') == 1);
+               $GLOBALS['registration_ip_timeout'] = (countSumTotalData(detectRemoteAddr()  , 'user_data', 'userid', 'REMOTE_ADDR', TRUE, ' AND ((UNIX_TIMESTAMP() - `joined`) < {?ip_timeout?} OR (UNIX_TIMESTAMP() - `last_update`) < {?ip_timeout?})') == 1);

                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay=' . intval($isOkay).',timeout='.intval($GLOBALS['registration_ip_timeout']));
                $isOkay = (($isOkay) && (!$GLOBALS['registration_ip_timeout']));
        } // END - if
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay=' . intval($isOkay).',timeout='.intval($GLOBALS['registration_ip_timeout']));
                $isOkay = (($isOkay) && (!$GLOBALS['registration_ip_timeout']));
        } // END - if


@@ -291,7 +291,7 @@ function doUserRegistration () {
        // Init filter data
        $filterData = array(
                // Initialization not done by default
        // Init filter data
        $filterData = array(
                // Initialization not done by default

-               'init_done' => false
+               'init_done' => FALSE

        );
 
        // Init extra SQL data
        );
 
        // Init extra SQL data


@@ -301,12 +301,12 @@ function doUserRegistration () {
        $filterData = runFilterChain('pre_user_registration', $filterData);
 
        // Did the initialization work?
        $filterData = runFilterChain('pre_user_registration', $filterData);
 
        // Did the initialization work?

-       if ($filterData['init_done'] === false) {
+       if ($filterData['init_done'] === FALSE) {

                // Something bad happened!
                displayMessage('{--PRE_USER_REGISTRATION_FAILED--}');
 
                // Stop here
                // Something bad happened!
                displayMessage('{--PRE_USER_REGISTRATION_FAILED--}');
 
                // Stop here

-               return false;
+               return FALSE;

        } // END - if
 
        // Create user's account...
        } // END - if
 
        // Create user's account...


@@ -389,7 +389,7 @@ function doUserRegistration () {
                displayMessage('{--USER_NOT_REGISTERED--}');
 
                // Stop here
                displayMessage('{--USER_NOT_REGISTERED--}');
 
                // Stop here

-               return false;
+               return FALSE;

        } // END - if
 
        // Shall we reset random refid? Only possible with latest ext-user
        } // END - if
 
        // Shall we reset random refid? Only possible with latest ext-user


@@ -433,7 +433,7 @@ function doUserRegistration () {
        // Registration phase is done here, so for tester accounts we end here
        if (((getExtensionVersion('user') >= '0.5.0')) && (isTesterUserName(postRequestElement('surname'))) && (ifTesterAccountsAllowed())) {
                // All fine here
        // Registration phase is done here, so for tester accounts we end here
        if (((getExtensionVersion('user') >= '0.5.0')) && (isTesterUserName(postRequestElement('surname'))) && (ifTesterAccountsAllowed())) {
                // All fine here

-               return true;
+               return TRUE;

        } // END - if
 
        // ... rewrite a zero referral id to the main title
        } // END - if
 
        // ... rewrite a zero referral id to the main title


@@ -489,7 +489,7 @@ function doUserRegistration () {
        } // END - switch
 
        // Display information to the user that he got mail and send it away
        } // END - switch
 
        // Display information to the user that he got mail and send it away

-       $messageGuest = loadEmailTemplate('guest_register_done', $content, $filterData['register_insert_id'], false);
+       $messageGuest = loadEmailTemplate('guest_register_done', $content, $filterData['register_insert_id'], FALSE);

 
        // Send mail to user (confirmation link!)
        sendEmail($filterData['register_insert_id'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest);
 
        // Send mail to user (confirmation link!)
        sendEmail($filterData['register_insert_id'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest);


@@ -498,7 +498,7 @@ function doUserRegistration () {
        sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'admin_register_done', $content, $filterData['register_insert_id']);
 
        // All fine
        sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'admin_register_done', $content, $filterData['register_insert_id']);
 
        // All fine

-       return true;
+       return TRUE;

 }
 
 // Initialize extra registration SQL
 }
 
 // Initialize extra registration SQL


@@ -612,7 +612,7 @@ function isRegisterGeneratePasswordEmptyEnabled () {
 // ----------------------------------------------------------------------------
 
 // Template helper for generating a category selection table for admin area with given configuration entry
 // ----------------------------------------------------------------------------
 
 // Template helper for generating a category selection table for admin area with given configuration entry

-function doTemplateAdminRegisterCategoryTable ($templateName, $clear = false, $configEntry) {
+function doTemplateAdminRegisterCategoryTable ($templateName, $clear = FALSE, $configEntry) {

        // Call the inner function
        return registerGenerateCategoryTable('admin', $configEntry);
 }
        // Call the inner function
        return registerGenerateCategoryTable('admin', $configEntry);
 }

diff --git a/inc/libs/removeip_functions.php b/inc/libs/removeip_functions.php
index 509828e926bef2db528269c76ba61d0d2aa558fc..647c88a085240d99f2757802ab3a3542cbefe7fa 100644 (file)
--- a/inc/libs/removeip_functions.php
+++ b/inc/libs/removeip_functions.php
@@ -138,7 +138,7 @@ function addAnonymityLevel () {
        $message = sprintf("{--REMOVEIP_LEVEL_%s--}", strtoupper($suffix));
 
        // Output message in template
        $message = sprintf("{--REMOVEIP_LEVEL_%s--}", strtoupper($suffix));
 
        // Output message in template

-       return loadTemplate('removeip_level', true, $message);
+       return loadTemplate('removeip_level', TRUE, $message);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index 9fd8873505c8528b7fdb7e5146335df27c8851b1..314f1ca55156f4a515f86569cd94a01f0bc077f0 100644 (file)
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Rewrite links in HTML for better SEO (ugly part of mx!)
 function rewriteLinksInCode ($code) {
        // Skip rewriting for configured or empty modules
 // Rewrite links in HTML for better SEO (ugly part of mx!)
 function rewriteLinksInCode ($code) {
        // Skip rewriting for configured or empty modules

-       if ((getModule() == '') || (isInStringIgnoreCase(getModule(), getConfig('rewrite_skip')) !== false)) {
+       if ((getModule() == '') || (isInStringIgnoreCase(getModule(), getConfig('rewrite_skip')) !== FALSE)) {

                return $code;
        } // END - if
 
                return $code;
        } // END - if
 

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index 8409e0c72742e092d8c91239b9052f21d21fa538..67aea962195e7b8057a4b67031b6ceaf57afb906 100644 (file)
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -41,7 +41,7 @@ if (defined('__SECURITY')) {
 } // END - if
 
 // Some security stuff...
 } // END - if
 
 // Some security stuff...

-if (strpos($_SERVER['PHP_SELF'], basename(__FILE__)) !== false) {
+if (strpos($_SERVER['PHP_SELF'], basename(__FILE__)) !== FALSE) {

        die();
 } // END - if
 
        die();
 } // END - if
 


@@ -56,9 +56,9 @@ if (strpos($_SERVER['PHP_SELF'], basename(__FILE__)) !== false) {
  * @param      $stripTags      Strip tags
  * @return     $str            A (hopefully) secured string against XSS and other bad things
  */
  * @param      $stripTags      Strip tags
  * @return     $str            A (hopefully) secured string against XSS and other bad things
  */

-function secureString ($str, $stripTags = true, $encode = false) {
+function secureString ($str, $stripTags = TRUE, $encode = FALSE) {

        // Shall we strip HTML code?
        // Shall we strip HTML code?

-       if ($stripTags === true) {
+       if ($stripTags === TRUE) {

                $str = strip_tags($str);
        } // END - if
 
                $str = strip_tags($str);
        } // END - if
 


@@ -66,7 +66,7 @@ function secureString ($str, $stripTags = true, $encode = false) {
        $str = trim($str);
 
        // Encode in entities if requested
        $str = trim($str);
 
        // Encode in entities if requested

-       if ($encode === true) {
+       if ($encode === TRUE) {

                // Encode in entities (this breakes UTF-8!)
                $str = htmlentities($str, ENT_QUOTES);
        } // END - if
                // Encode in entities (this breakes UTF-8!)
                $str = htmlentities($str, ENT_QUOTES);
        } // END - if


@@ -98,7 +98,7 @@ function securePhpSelf () {
        $phpSelfFile      = basename($_SERVER['PHP_SELF']);
 
        // Check for a .php inside the $phpSelfDirectory...
        $phpSelfFile      = basename($_SERVER['PHP_SELF']);
 
        // Check for a .php inside the $phpSelfDirectory...

-       while (strpos($phpSelfDirectory, '.php') !== false) {
+       while (strpos($phpSelfDirectory, '.php') !== FALSE) {

                // Correct the dirname
                $phpSelfDirectory = substr($phpSelfDirectory, 0, (strpos($phpSelfDirectory, '.php') + 4));
                // Rewrite filename...
                // Correct the dirname
                $phpSelfDirectory = substr($phpSelfDirectory, 0, (strpos($phpSelfDirectory, '.php') + 4));
                // Rewrite filename...


@@ -111,7 +111,7 @@ function securePhpSelf () {
        $_SERVER['PHP_SELF'] = $phpSelfDirectory . '/' . $phpSelfFile;
 
        // Did run...
        $_SERVER['PHP_SELF'] = $phpSelfDirectory . '/' . $phpSelfFile;
 
        // Did run...

-       $GLOBALS['php_self_secured'] = true;
+       $GLOBALS['php_self_secured'] = TRUE;

 
        // Remove uneccessary variables
        unset($phpSelfDirectory);
 
        // Remove uneccessary variables
        unset($phpSelfDirectory);


@@ -151,8 +151,8 @@ function detectPhpCaching () {
 }
 
 // Runtime/GPC quoting is off now...
 }
 
 // Runtime/GPC quoting is off now...

-ini_set('magic_quotes_runtime', false);
-ini_set('magic_quotes_gpc', false); // This may not work on some systems
+ini_set('magic_quotes_runtime', FALSE);
+ini_set('magic_quotes_gpc', FALSE); // This may not work on some systems

 
 /*
  * No compatibility with Zend Engine 1, else an error like 'Implicit cloning'
 
 /*
  * No compatibility with Zend Engine 1, else an error like 'Implicit cloning'

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 00e8bd66f78047c11b8d4189a32c718ca95ff59e..b60e222682f0fbf7eb3c80e2ff23a0aeb0a9e961 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 //
 function handleSponsorRequest ($postData, $update=false, $messageArray = array(), $RET_STATUS=false) {
        // Init a lot variables
 //
 function handleSponsorRequest ($postData, $update=false, $messageArray = array(), $RET_STATUS=false) {
        // Init a lot variables

-       $SAVE = true;
-       $UPDATE = false;
-       $skip = false;
-       $ALREADY = false;
+       $SAVE = TRUE;
+       $UPDATE = FALSE;
+       $skip = FALSE;
+       $ALREADY = FALSE;

        $ret = 'unused';
 
        // Skip these entries
        $ret = 'unused';
 
        // Skip these entries


@@ -66,10 +66,10 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                                // Check only posted input entries not the submit button
                                switch ($k) {
                                        case 'email':
                                // Check only posted input entries not the submit button
                                switch ($k) {
                                        case 'email':

-                                               $ALREADY = false;
+                                               $ALREADY = FALSE;

                                                if (!isEmailValid($v)) {
                                                        // Email address is not valid
                                                if (!isEmailValid($v)) {
                                                        // Email address is not valid

-                                                       $SAVE = false;
+                                                       $SAVE = FALSE;

                                                } else {
                                                        // Add a new sponsor or update his data?
                                                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE email='%s' LIMIT 1",
                                                } else {
                                                        // Add a new sponsor or update his data?
                                                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE email='%s' LIMIT 1",


@@ -80,10 +80,10 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                                                                // Yes, he is!
                                                                if ((getWhat() == 'add_sponsor') || ($update)) {
                                                                        // Already found
                                                                // Yes, he is!
                                                                if ((getWhat() == 'add_sponsor') || ($update)) {
                                                                        // Already found

-                                                                       $ALREADY = true;
+                                                                       $ALREADY = TRUE;

                                                                } else {
                                                                        // Update his data
                                                                } else {
                                                                        // Update his data

-                                                                       $UPDATE = true;
+                                                                       $UPDATE = TRUE;

                                                                }
                                                        }
 
                                                                }
                                                        }
 


@@ -103,7 +103,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                                        case 'url':
                                                if (!isUrlValid($v)) {
                                                        // Don't save the URL
                                        case 'url':
                                                if (!isUrlValid($v)) {
                                                        // Don't save the URL

-                                                       $SAVE = false;
+                                                       $SAVE = FALSE;

                                                } // END - if
                                                break;
 
                                                } // END - if
                                                break;
 


@@ -113,7 +113,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                                                break;
                                } // END - switch
 
                                                break;
                                } // END - switch
 

-                               if ((!empty($k)) && ($skip == false)) {
+                               if ((!empty($k)) && ($skip == FALSE)) {

                                        // Add data
                                        array_push($DATA['keys']  , $k);
                                        array_push($DATA['values'], $v);
                                        // Add data
                                        array_push($DATA['keys']  , $k);
                                        array_push($DATA['values'], $v);


@@ -122,7 +122,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                } // END - foreach
 
                // Save sponsor?
                } // END - foreach
 
                // Save sponsor?

-               if ($SAVE === true) {
+               if ($SAVE === TRUE) {

                        // Default is no force even when a guest want to abuse this force switch
                        if ((empty($postData['force'])) || (!isAdmin())) $postData['force'] = '0';
 
                        // Default is no force even when a guest want to abuse this force switch
                        if ((empty($postData['force'])) || (!isAdmin())) $postData['force'] = '0';
 


@@ -144,10 +144,10 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                                // Generate message
                                $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray);
                                $ret = 'updated';
                                // Generate message
                                $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray);
                                $ret = 'updated';

-                       } elseif (($ALREADY === false) || (($postData['force'] == 1) && (isAdmin()))) {
+                       } elseif (($ALREADY === FALSE) || (($postData['force'] == 1) && (isAdmin()))) {

                                // Add new sponsor, first add more data
                                array_push($DATA['keys'], 'status');
                                // Add new sponsor, first add more data
                                array_push($DATA['keys'], 'status');

-                               if (($update === true) && (isAdmin()) && (getWhat() == 'add_sponsor')) {
+                               if (($update === TRUE) && (isAdmin()) && (getWhat() == 'add_sponsor')) {

                                        // Only allowed for admin
                                        array_push($DATA['values'], 'PENDING');
 
                                        // Only allowed for admin
                                        array_push($DATA['values'], 'PENDING');
 


@@ -183,7 +183,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                                // Generate message
                                $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_ADDED--}', 'added', $messageArray);
                                $ret = 'added';
                                // Generate message
                                $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_ADDED--}', 'added', $messageArray);
                                $ret = 'added';

-                       } elseif (($update === true) && (isAdmin())) {
+                       } elseif (($update === TRUE) && (isAdmin())) {

                                // Add all data as hidden data
                                $OUT = '';
                                foreach ($postData as $k => $v) {
                                // Add all data as hidden data
                                $OUT = '';
                                foreach ($postData as $k => $v) {


@@ -198,7 +198,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
                                $content['email']  = $postData['email'];
 
                                // Ask for adding a sponsor with same email address
                                $content['email']  = $postData['email'];
 
                                // Ask for adding a sponsor with same email address

-                               loadTemplate('admin_add_sponsor_already', false, $content);
+                               loadTemplate('admin_add_sponsor_already', FALSE, $content);

                                return;
                        } else {
                                // Already added!
                                return;
                        } else {
                                // Already added!


@@ -243,7 +243,7 @@ function translateSponsorStatus ($status) {
 // Search for an email address in the database
 function isSponsorRegisteredWithEmail ($email) {
        // Is there already the provided email address in database?
 // Search for an email address in the database
 function isSponsorRegisteredWithEmail ($email) {
        // Is there already the provided email address in database?

-       $ret = (countSumTotalData($email, 'sponsor_data', 'id', 'email', true) == 1);
+       $ret = (countSumTotalData($email, 'sponsor_data', 'id', 'email', TRUE) == 1);

 
        // Return result
        return $ret;
 
        // Return result
        return $ret;


@@ -252,7 +252,7 @@ function isSponsorRegisteredWithEmail ($email) {
 // Wether the current user is a sponsor
 function isSponsor () {
        // Failed is default
 // Wether the current user is a sponsor
 function isSponsor () {
        // Failed is default

-       $ret = false;
+       $ret = FALSE;

 
        // Determine it
        $ret = (
 
        // Determine it
        $ret = (


@@ -307,17 +307,17 @@ ORDER BY
                                        if ($current == $content2['sub_what']) $content2['sub_title'] = '<strong>' . $content2['sub_title'] . '</strong>';
 
                                        // Load row template
                                        if ($current == $content2['sub_what']) $content2['sub_title'] = '<strong>' . $content2['sub_title'] . '</strong>';
 
                                        // Load row template

-                                       $SUB .= loadTemplate('sponsor_what', true, $content2);
+                                       $SUB .= loadTemplate('sponsor_what', TRUE, $content2);

                                } // END - while
 
                                // Prepare data for the main template
                                $content['menu'] = $SUB;
 
                                // Load menu template
                                } // END - while
 
                                // Prepare data for the main template
                                $content['menu'] = $SUB;
 
                                // Load menu template

-                               $OUT .= loadTemplate('sponsor_action', true, $content);
+                               $OUT .= loadTemplate('sponsor_action', TRUE, $content);

                        } else {
                                // No sub menus active
                        } else {
                                // No sub menus active

-                               $OUT .= displayMessage('{--SPONSOR_NO_SUB_MENUS_ACTIVE--}', true);
+                               $OUT .= displayMessage('{--SPONSOR_NO_SUB_MENUS_ACTIVE--}', TRUE);

                        }
 
                        // Free memory
                        }
 
                        // Free memory


@@ -325,7 +325,7 @@ ORDER BY
                } // END - while
        } else {
                // No main menus active
                } // END - while
        } else {
                // No main menus active

-               $OUT .= displayMessage('{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}', true);
+               $OUT .= displayMessage('{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}', TRUE);

        }
 
        // Free memory
        }
 
        // Free memory


@@ -347,7 +347,7 @@ function addSponsorContent ($what) {
                loadIncludeOnce($INC);
        } else {
                // File not found
                loadIncludeOnce($INC);
        } else {
                // File not found

-               $GLOBALS['sponsor_output'] .= displayMessage('{%message,SPONSOR_CONTENT_404=' . $what . '%}', true);
+               $GLOBALS['sponsor_output'] .= displayMessage('{%message,SPONSOR_CONTENT_404=' . $what . '%}', TRUE);

        }
 
        // Return content
        }
 
        // Return content


@@ -357,7 +357,7 @@ function addSponsorContent ($what) {
 //
 function updateSponsorLogin () {
        // Failed by default
 //
 function updateSponsorLogin () {
        // Failed by default

-       $login = false;
+       $login = FALSE;

 
        // Is sponsor?
        if (isSponsor()) {
 
        // Is sponsor?
        if (isSponsor()) {


@@ -385,7 +385,7 @@ LIMIT 1",
 
 // Saves sponsor's data
 function saveSponsorData ($postData, $content) {
 
 // Saves sponsor's data
 function saveSponsorData ($postData, $content) {

-       $EMAIL = false;
+       $EMAIL = FALSE;

 
        // Unsecure data which we don't want
        $UNSAFE = array('password', 'id', 'remote_addr', 'sponsor_created', 'last_online', 'status', 'ref_count',
 
        // Unsecure data which we don't want
        $UNSAFE = array('password', 'id', 'remote_addr', 'sponsor_created', 'last_online', 'status', 'ref_count',


@@ -427,7 +427,7 @@ function saveSponsorData ($postData, $content) {
        if ((!empty($content['email'])) && (!empty($postData['email']))) {
                if ($content['email'] != $postData['email']) {
                        // Change email address
        if ((!empty($content['email'])) && (!empty($postData['email']))) {
                if ($content['email'] != $postData['email']) {
                        // Change email address

-                       $EMAIL = true;
+                       $EMAIL = TRUE;

 
                        // Okay, has changed then add status with UNCONFIRMED and new hash code
                        $sql .= " `status`='EMAIL',`hash`='%s',";
 
                        // Okay, has changed then add status with UNCONFIRMED and new hash code
                        $sql .= " `status`='EMAIL',`hash`='%s',";


@@ -451,7 +451,7 @@ function saveSponsorData ($postData, $content) {
        // Saving data was completed... ufff...
        switch (getWhat()) {
                case 'account': // Change account data
        // Saving data was completed... ufff...
        switch (getWhat()) {
                case 'account': // Change account data

-                       if ($EMAIL === true) {
+                       if ($EMAIL === TRUE) {

                                $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}';
                                $templ   = 'admin_sponsor_change_email';
                                $subject    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}';
                                $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}';
                                $templ   = 'admin_sponsor_change_email';
                                $subject    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}';


@@ -503,7 +503,7 @@ function saveSponsorData ($postData, $content) {
                                                $email_msg = loadEmailTemplate('sponsor_change_data', $content);
                                                sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg);
 
                                                $email_msg = loadEmailTemplate('sponsor_change_data', $content);
                                                sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg);
 

-                                               if ($EMAIL === true) {
+                                               if ($EMAIL === TRUE) {

                                                        // Add hash code to content array
                                                        $content['hash'] = $HASH;
 
                                                        // Add hash code to content array
                                                        $content['hash'] = $HASH;
 


@@ -565,7 +565,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
        $message = '';
 
        // Handle the request
        $message = '';
 
        // Handle the request

-       $status = handleSponsorRequest(postRequestArray(), true, $messageArray, true);
+       $status = handleSponsorRequest(postRequestArray(), TRUE, $messageArray, TRUE);

 
        // Check the status of the registration process
        switch ($status) {
 
        // Check the status of the registration process
        switch ($status) {


@@ -672,15 +672,15 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
                        reportBug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.');
                } elseif (isSponsorDataValid()) {
                        // Use cache, so it is fine
                        reportBug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.');
                } elseif (isSponsorDataValid()) {
                        // Use cache, so it is fine

-                       return true;
+                       return TRUE;

                }
        } elseif (isSponsorDataValid()) {
                // Use cache, so it is fine
                }
        } elseif (isSponsorDataValid()) {
                // Use cache, so it is fine

-               return true;
+               return TRUE;

        }
 
        // By default none was found
        }
 
        // By default none was found

-       $found = false;
+       $found = FALSE;

 
        // Extra statements
        $ADD = '';
 
        // Extra statements
        $ADD = '';


@@ -768,7 +768,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
 // in, but you should use isMember() if you want to find that out.
 function isSponsorDataValid () {
        // Sponsor id should not be zero so abort here
 // in, but you should use isMember() if you want to find that out.
 function isSponsorDataValid () {
        // Sponsor id should not be zero so abort here

-       if (!isCurrentSponsorIdSet()) return false;
+       if (!isCurrentSponsorIdSet()) return FALSE;

 
        // Is it cached?
        if (!isset($GLOBALS['is_sponsor_data_valid'][getCurrentSponsorId()])) {
 
        // Is it cached?
        if (!isset($GLOBALS['is_sponsor_data_valid'][getCurrentSponsorId()])) {

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 6b62afbc0cc3866ca8dd21b015bfe1482773b0ce..bcb6e6ca07f577ed3743c92cf805a6c7393c447a 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -50,27 +50,27 @@ function doSurfbarAdminAddUrl ($url, $limit, $reload) {
        if (!isAdmin()) {
                // Not an admin
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Not admin.", $url, $limit, $reload));
        if (!isAdmin()) {
                // Not an admin
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Not admin.", $url, $limit, $reload));

-               return false;
+               return FALSE;

        } elseif (!isUrlValid($url)) {
                // URL invalid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid URL.", $url, $limit, $reload));
        } elseif (!isUrlValid($url)) {
                // URL invalid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid URL.", $url, $limit, $reload));

-               return false;
+               return FALSE;

        } elseif (ifSurfbarHasUrlUserId($url, 0)) {
                // URL already found in surfbar!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Already added.", $url, $limit, $reload));
        } elseif (ifSurfbarHasUrlUserId($url, 0)) {
                // URL already found in surfbar!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Already added.", $url, $limit, $reload));

-               return false;
+               return FALSE;

        } elseif (!ifSurfbarMemberAllowedMoreUrls()) {
                // No more allowed!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: No more URLs allowed.", $url, $limit, $reload));
        } elseif (!ifSurfbarMemberAllowedMoreUrls()) {
                // No more allowed!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: No more URLs allowed.", $url, $limit, $reload));

-               return false;
+               return FALSE;

        } elseif ('' . ($limit + 0) . '' != '' . $limit . '') {
                // Invalid limit entered
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid limit entered.", $url, $limit, $reload));
        } elseif ('' . ($limit + 0) . '' != '' . $limit . '') {
                // Invalid limit entered
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid limit entered.", $url, $limit, $reload));

-               return false;
+               return FALSE;

        } elseif ('' . ($reload + 0) . '' != '' . $reload . '') {
                // Invalid amount entered
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid reload entered.", $url, $limit, $reload));
        } elseif ('' . ($reload + 0) . '' != '' . $reload . '') {
                // Invalid amount entered
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid reload entered.", $url, $limit, $reload));

-               return false;
+               return FALSE;

        }
 
        // Register the new URL
        }
 
        // Register the new URL


@@ -83,19 +83,19 @@ function doSurfbarAdminMigrateUrl ($url, $userid) {
        if (!isAdmin()) {
                // Not an admin
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Not admin, url=' . $url . ',userid=' . $userid);
        if (!isAdmin()) {
                // Not an admin
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Not admin, url=' . $url . ',userid=' . $userid);

-               return false;
+               return FALSE;

        } elseif (!isUrlValid($url)) {
                // URL invalid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Invalid URL, url=' . $url . ',userid=' . $userid);
        } elseif (!isUrlValid($url)) {
                // URL invalid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Invalid URL, url=' . $url . ',userid=' . $userid);

-               return false;
+               return FALSE;

        } elseif (ifSurfbarHasUrlUserId($url, $userid)) {
                // URL already found in surfbar!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Already added, url=' . $url . ',userid=' . $userid);
        } elseif (ifSurfbarHasUrlUserId($url, $userid)) {
                // URL already found in surfbar!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Already added, url=' . $url . ',userid=' . $userid);

-               return false;
+               return FALSE;

        } elseif (!ifSurfbarMemberAllowedMoreUrls($userid)) {
                // No more allowed!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Maximum exceeded, url=' . $url . ',userid=' . $userid);
        } elseif (!ifSurfbarMemberAllowedMoreUrls($userid)) {
                // No more allowed!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Maximum exceeded, url=' . $url . ',userid=' . $userid);

-               return false;
+               return FALSE;

        }
 
        // Register the new URL
        }
 
        // Register the new URL


@@ -108,19 +108,19 @@ function doSurfbarAdminUnlockUrlIds ($IDs) {
        if (!isAdmin()) {
                // Not admin or invalid ids array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');
        if (!isAdmin()) {
                // Not admin or invalid ids array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');

-               return false;
+               return FALSE;

        } elseif (!is_array($IDs)) {
                // No array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
        } elseif (!is_array($IDs)) {
                // No array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');

-               return false;
+               return FALSE;

        } elseif (count($IDs) == 0) {
                // Empty array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
        } elseif (count($IDs) == 0) {
                // Empty array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');

-               return false;
+               return FALSE;

        }
 
        // Set to true to make AND expression valid if first URL got unlocked
        }
 
        // Set to true to make AND expression valid if first URL got unlocked

-       $done = true;
+       $done = TRUE;

 
        // Update the status for all ids
        foreach ($IDs as $id => $dummy) {
 
        // Update the status for all ids
        foreach ($IDs as $id => $dummy) {


@@ -138,19 +138,19 @@ function doSurfbarAdminRejectUrlIds ($IDs) {
        if (!isAdmin()) {
                // Not admin or invalid ids array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');
        if (!isAdmin()) {
                // Not admin or invalid ids array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');

-               return false;
+               return FALSE;

        } elseif (!is_array($IDs)) {
                // No array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
        } elseif (!is_array($IDs)) {
                // No array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');

-               return false;
+               return FALSE;

        } elseif (count($IDs) == 0) {
                // Empty array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
        } elseif (count($IDs) == 0) {
                // Empty array
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');

-               return false;
+               return FALSE;

        }
 
        // Set to true to make AND expression valid if first URL got unlocked
        }
 
        // Set to true to make AND expression valid if first URL got unlocked

-       $done = true;
+       $done = TRUE;

 
        // Update the status for all ids
        foreach ($IDs as $id => $dummy) {
 
        // Update the status for all ids
        foreach ($IDs as $id => $dummy) {


@@ -172,23 +172,23 @@ function doSurfbarMemberAddUrl ($url, $limit) {
        if (!isMember()) {
                // Not a member
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');
        if (!isMember()) {
                // Not a member
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');

-               return false;
+               return FALSE;

        } elseif ((!isUrlValid($url)) && (!isAdmin())) {
                // URL invalid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid, url=' . $url . ',limit=' . $limit);
        } elseif ((!isUrlValid($url)) && (!isAdmin())) {
                // URL invalid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid, url=' . $url . ',limit=' . $limit);

-               return false;
+               return FALSE;

        } elseif (ifSurfbarHasUrlUserId($url, getMemberId())) {
                // URL already found in surfbar!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Already found, url=' . $url . ',limit=' . $limit);
        } elseif (ifSurfbarHasUrlUserId($url, getMemberId())) {
                // URL already found in surfbar!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Already found, url=' . $url . ',limit=' . $limit);

-               return false;
+               return FALSE;

        } elseif (!ifSurfbarMemberAllowedMoreUrls(getMemberId())) {
                // No more allowed!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Maximum exceeded, url=' . $url . ',limit=' . $limit);
        } elseif (!ifSurfbarMemberAllowedMoreUrls(getMemberId())) {
                // No more allowed!
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Maximum exceeded, url=' . $url . ',limit=' . $limit);

-               return false;
+               return FALSE;

        } elseif (''.($limit + 0).'' != ''.$limit.'') {
                // Invalid amount entered
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid limit, url=' . $url . ',limit=' . $limit);
        } elseif (''.($limit + 0).'' != ''.$limit.'') {
                // Invalid amount entered
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid limit, url=' . $url . ',limit=' . $limit);

-               return false;
+               return FALSE;

        }
 
        // Register the new URL
        }
 
        // Register the new URL


@@ -207,7 +207,7 @@ function generateSurfbarMemberActions ($urlId, $status) {
        $OUT = '';
        foreach ($actionArray as $actionId => $action) {
                // Add form for this action
        $OUT = '';
        foreach ($actionArray as $actionId => $action) {
                // Add form for this action

-               $OUT .= loadTemplate('member_list_surfbar_form', true, array(
+               $OUT .= loadTemplate('member_list_surfbar_form', TRUE, array(

                        'width'  => $width,
                        'url_id' => bigintval($urlId),
                        'action' => strtolower($action)
                        'width'  => $width,
                        'url_id' => bigintval($urlId),
                        'action' => strtolower($action)


@@ -215,7 +215,7 @@ function generateSurfbarMemberActions ($urlId, $status) {
        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       $output = loadTemplate('member_list_surfbar_table', true, $OUT);
+       $output = loadTemplate('member_list_surfbar_table', TRUE, $OUT);

 
        // Return code
        return $output;
 
        // Return code
        return $output;


@@ -224,25 +224,25 @@ function generateSurfbarMemberActions ($urlId, $status) {
 // Do the member form request
 function doSurfbarMemberByFormData ($formData, $urlArray) {
        // By default no action is performed
 // Do the member form request
 function doSurfbarMemberByFormData ($formData, $urlArray) {
        // By default no action is performed

-       $performed = false;
+       $performed = FALSE;

 
        // Is this a member?
        if (!isMember()) {
                // No member!
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');
 
        // Is this a member?
        if (!isMember()) {
                // No member!
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');

-               return false;
+               return FALSE;

        } elseif ((!isset($formData['url_id'])) || (!isset($formData['action']))) {
                // Important form elements are missing!
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid form data, required field id/action not found');
        } elseif ((!isset($formData['url_id'])) || (!isset($formData['action']))) {
                // Important form elements are missing!
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid form data, required field id/action not found');

-               return false;
+               return FALSE;

        } elseif (!isset($urlArray[$formData['url_id']])) {
                // Id not found in cache
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Field url_id not found in cache');
        } elseif (!isset($urlArray[$formData['url_id']])) {
                // Id not found in cache
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Field url_id not found in cache');

-               return false;
+               return FALSE;

        } elseif (!isSurfbarMemberActionStatusValid($formData['action'], $urlArray[$formData['url_id']]['url_status'])) {
                // Action not allowed for current URL status
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Action not allowed to perform. action=' . $formData['action'] . ',url_status=' . $urlArray[$formData['url_id']]['url_status'] . ',url_id=' . $formData['url_id']);
        } elseif (!isSurfbarMemberActionStatusValid($formData['action'], $urlArray[$formData['url_id']]['url_status'])) {
                // Action not allowed for current URL status
                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Action not allowed to perform. action=' . $formData['action'] . ',url_status=' . $urlArray[$formData['url_id']]['url_status'] . ',url_id=' . $formData['url_id']);

-               return false;
+               return FALSE;

        }
 
        // Secure action
        }
 
        // Secure action


@@ -251,7 +251,7 @@ function doSurfbarMemberByFormData ($formData, $urlArray) {
        // Has it changed?
        if ($action != $formData['action']) {
                // Invalid data in action found
        // Has it changed?
        if ($action != $formData['action']) {
                // Invalid data in action found

-               return false;
+               return FALSE;

        } // END - if
 
        // Create the function name for selected action
        } // END - if
 
        // Create the function name for selected action


@@ -320,7 +320,7 @@ function isSurfbarMemberActionStatusValid ($action, $status) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',status=' . $status . ',isValid=' . intval($isValid));
 
        // Fetch the new status if found
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',status=' . $status . ',isValid=' . intval($isValid));
 
        // Fetch the new status if found

-       if ($isValid === true) {
+       if ($isValid === TRUE) {

                // Load new status
                list($GLOBALS['surfbar_cache']['new_status']) = SQL_FETCHROW($result);
        } // END - if
                // Load new status
                list($GLOBALS['surfbar_cache']['new_status']) = SQL_FETCHROW($result);
        } // END - if


@@ -425,16 +425,16 @@ function displaySurfbarMemberActionForm ($action, $urlData) {
        } // END - if
 
        // Load the form and display it
        } // END - if
 
        // Load the form and display it

-       loadTemplate(sprintf("member_surfbar_%s_action_form", $action), false, $urlData);
+       loadTemplate(sprintf("member_surfbar_%s_action_form", $action), FALSE, $urlData);

 
        // All fine by default ... ;-)
 
        // All fine by default ... ;-)

-       return true;
+       return TRUE;

 }
 
 // Execute choosen action
 function executeSurfbarMemberAction ($action, $urlData) {
        // By default nothing is executed
 }
 
 // Execute choosen action
 function executeSurfbarMemberAction ($action, $urlData) {
        // By default nothing is executed

-       $executed = false;
+       $executed = FALSE;

 
        // Is limitation "no" and "limit" is > 0?
        if ((isset($urlData[$action]['limited'])) && ($urlData[$action]['limited'] != 'Y') && ((isset($urlData[$action]['limit'])) && ($urlData[$action]['limit'] > 0)) || (!isset($urlData[$action]['limit']))) {
 
        // Is limitation "no" and "limit" is > 0?
        if ((isset($urlData[$action]['limited'])) && ($urlData[$action]['limited'] != 'Y') && ((isset($urlData[$action]['limit'])) && ($urlData[$action]['limit'] > 0)) || (!isset($urlData[$action]['limit']))) {


@@ -448,7 +448,7 @@ function executeSurfbarMemberAction ($action, $urlData) {
        // Is that function there?
        if (function_exists($functionName)) {
                // Execute the function
        // Is that function there?
        if (function_exists($functionName)) {
                // Execute the function

-               if (call_user_func_array($functionName, array($urlData)) == true) {
+               if (call_user_func_array($functionName, array($urlData)) == TRUE) {

                        // Update status as well
                        $executed = changeSurfbarUrlStatus($urlData['url_id'], $urlData['url_status'], $urlData['new_status'], array($urlData['url_id'] => $urlData));
                } // END - if
                        // Update status as well
                        $executed = changeSurfbarUrlStatus($urlData['url_id'], $urlData['url_status'], $urlData['new_status'], array($urlData['url_id'] => $urlData));
                } // END - if


@@ -464,10 +464,10 @@ function executeSurfbarMemberAction ($action, $urlData) {
 // "Execute edit" function: Update changed data
 function executeSurfbarMemberEditAction ($urlData) {
        // Default is nothing done
 // "Execute edit" function: Update changed data
 function executeSurfbarMemberEditAction ($urlData) {
        // Default is nothing done

-       $status = false;
+       $status = FALSE;

 
        // Has the URL or limit changed?
 
        // Has the URL or limit changed?

-       if (true) {
+       if (TRUE) {

                //if (($urlData['url_views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query
                SQL_QUERY_ESC("UPDATE
                //if (($urlData['url_views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query
                SQL_QUERY_ESC("UPDATE


@@ -489,7 +489,7 @@ LIMIT 1",
                        ), __FUNCTION__, __LINE__);
 
                // All fine
                        ), __FUNCTION__, __LINE__);
 
                // All fine

-               $status = true;
+               $status = TRUE;

        } // END - if
 
        // Return status
        } // END - if
 
        // Return status


@@ -499,7 +499,7 @@ LIMIT 1",
 // "Execute delete" function: Does nothing...
 function executeSurfbarMemberDeleteAction ($urlData) {
        // Nothing special to do (see above function for such "special actions" to perform)
 // "Execute delete" function: Does nothing...
 function executeSurfbarMemberDeleteAction ($urlData) {
        // Nothing special to do (see above function for such "special actions" to perform)

-       return true;
+       return TRUE;

 }
 
 //------------------------------------------------------------------------------
 }
 
 //------------------------------------------------------------------------------


@@ -676,7 +676,7 @@ function doSurfbarRegisterUrl ($url, $userid, $status = 'PENDING', $addMode = 'r
        // Is this id valid?
        if ($content['insert_id'] == '0') {
                // INSERT did not insert any data!
        // Is this id valid?
        if ($content['insert_id'] == '0') {
                // INSERT did not insert any data!

-               return false;
+               return FALSE;

        } // END - if
 
        // If in reg-mode we notify admin
        } // END - if
 
        // If in reg-mode we notify admin


@@ -745,7 +745,7 @@ function doSurfbarNotifyAdmin ($messageType, $content) {
 function doSurfbarNotifyMember ($messageType, $content) {
        // Skip notification if userid is zero
        if ($content['url_userid'] == '0') {
 function doSurfbarNotifyMember ($messageType, $content) {
        // Skip notification if userid is zero
        if ($content['url_userid'] == '0') {

-               return false;
+               return FALSE;

        } // END - if
 
        // Prepare template name
        } // END - if
 
        // Prepare template name


@@ -853,14 +853,14 @@ function translateMemberSurfbarActionToSubmit ($action) {
 }
 
 // Determine reward
 }
 
 // Determine reward

-function determineSurfbarReward ($onlyMin = false) {
+function determineSurfbarReward ($onlyMin = FALSE) {

        // Static values are default
        $reward = getConfig('surfbar_static_reward');
 
        // Is there static or dynamic?
        if (getSurfbarPaymentModel() == 'DYNAMIC') {
                // "Calculate" dynamic reward
        // Static values are default
        $reward = getConfig('surfbar_static_reward');
 
        // Is there static or dynamic?
        if (getSurfbarPaymentModel() == 'DYNAMIC') {
                // "Calculate" dynamic reward

-               if ($onlyMin === true) {
+               if ($onlyMin === TRUE) {

                        $reward += calculateSurfbarDynamicMininumValue();
                } else {
                        $reward += calculateSurfbarDynamicAddValue();
                        $reward += calculateSurfbarDynamicMininumValue();
                } else {
                        $reward += calculateSurfbarDynamicAddValue();


@@ -924,7 +924,7 @@ function determineSurfbarTemplateName() {
 function isSurfbarReloadFull () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is ' . getConfig('surfbar_static_lock') . ' - ENTERED!');
        // Default is full!
 function isSurfbarReloadFull () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is ' . getConfig('surfbar_static_lock') . ' - ENTERED!');
        // Default is full!

-       $isFull = true;
+       $isFull = TRUE;

 
        // Cache static reload lock
        $GLOBALS['surfbar_cache']['surf_lock'] = getConfig('surfbar_static_lock');
 
        // Cache static reload lock
        $GLOBALS['surfbar_cache']['surf_lock'] = getConfig('surfbar_static_lock');


@@ -1058,7 +1058,7 @@ function getSurfbarTotalUserUrls ($userid = NULL, $status = '', $exclude = '') {
        }
 
        // Get amount from database
        }
 
        // Get amount from database

-       $count = countSumTotalData($userid, 'surfbar_urls', 'url_id', 'url_userid', true, $add);
+       $count = countSumTotalData($userid, 'surfbar_urls', 'url_id', 'url_userid', TRUE, $add);

 
        // Return result
        return $count;
 
        // Return result
        return $count;


@@ -1071,11 +1071,11 @@ function generateSurfbarValidationCode ($urlId, $salt = '') {
        if (empty($salt)) {
                 // Generate random hashed string
                $GLOBALS['surfbar_cache']['salt'] = sha1(generatePassword(mt_rand(200, 255)));
        if (empty($salt)) {
                 // Generate random hashed string
                $GLOBALS['surfbar_cache']['salt'] = sha1(generatePassword(mt_rand(200, 255)));

-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.gerSurfbarSalt().'', false);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.gerSurfbarSalt().'', FALSE);

        } else {
                // Use this as salt!
                $GLOBALS['surfbar_cache']['salt'] = $salt;
        } else {
                // Use this as salt!
                $GLOBALS['surfbar_cache']['salt'] = $salt;

-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.gerSurfbarSalt().'', false);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.gerSurfbarSalt().'', FALSE);

        }
 
        // Hash it with md5() and salt it with the random string
        }
 
        // Hash it with md5() and salt it with the random string


@@ -1107,7 +1107,7 @@ function isSurfbarValidationCodeValid ($urlId, $check, $salt) {
 function addSurfbarReloadLockById ($urlId) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',getMemberId()=' . getMemberId() . ' - ENTERED!');
        // Search for an entry
 function addSurfbarReloadLockById ($urlId) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',getMemberId()=' . getMemberId() . ' - ENTERED!');
        // Search for an entry

-       $countLock = countSumTotalData(getMemberId(), 'surfbar_locks', 'locks_id', 'locks_userid', true, ' AND `locks_url_id`=' . bigintval($urlId));
+       $countLock = countSumTotalData(getMemberId(), 'surfbar_locks', 'locks_id', 'locks_userid', TRUE, ' AND `locks_url_id`=' . bigintval($urlId));

 
        // Is there no record?
        if ($countLock == 0) {
 
        // Is there no record?
        if ($countLock == 0) {


@@ -1431,7 +1431,7 @@ function changeSurfbarUrlStatus ($urlId, $prevStatus, $newStatus, $data = array(
        // ---------- Comment out for debugging/developing member actions! ---------
        if (SQL_AFFECTEDROWS() != 1) {
                // No, something went wrong
        // ---------- Comment out for debugging/developing member actions! ---------
        if (SQL_AFFECTEDROWS() != 1) {
                // No, something went wrong

-               return false;
+               return FALSE;

        } // END - if
        // ---------- Comment out for debugging/developing member actions! ---------
 
        } // END - if
        // ---------- Comment out for debugging/developing member actions! ---------
 


@@ -1443,7 +1443,7 @@ function changeSurfbarUrlStatus ($urlId, $prevStatus, $newStatus, $data = array(
 
        // All done!
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - EXIT!');
 
        // All done!
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - EXIT!');

-       return true;
+       return TRUE;

 }
 
 // Calculate minimum value for dynamic payment model
 }
 
 // Calculate minimum value for dynamic payment model


@@ -1807,9 +1807,9 @@ LIMIT 1",
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
        if (SQL_NUMROWS($result) == 1) {
                // Load/cache data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
        if (SQL_NUMROWS($result) == 1) {
                // Load/cache data

-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - BEFORE', false);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - BEFORE', FALSE);

                $GLOBALS['surfbar_cache'] = merge_array($GLOBALS['surfbar_cache'], SQL_FETCHARRAY($result));
                $GLOBALS['surfbar_cache'] = merge_array($GLOBALS['surfbar_cache'], SQL_FETCHARRAY($result));

-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - AFTER', false);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - AFTER', FALSE);

 
                // Determine waiting time
                $GLOBALS['surfbar_cache']['time'] = determineSurfbarWaitingTime();
 
                // Determine waiting time
                $GLOBALS['surfbar_cache']['time'] = determineSurfbarWaitingTime();


@@ -1817,14 +1817,14 @@ LIMIT 1",
                // Is the last salt there?
                if (is_null($GLOBALS['surfbar_cache']['salts_last_salt'])) {
                        // Then repair it wit the static!
                // Is the last salt there?
                if (is_null($GLOBALS['surfbar_cache']['salts_last_salt'])) {
                        // Then repair it wit the static!

-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_salt - FIXED!', false);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_salt - FIXED!', FALSE);

                        $GLOBALS['surfbar_cache']['salts_last_salt'] = '';
                } // END - if
 
                // Fix missing last_surfed
                if ((!isset($GLOBALS['surfbar_cache']['last_surfed'])) || (is_null($GLOBALS['surfbar_cache']['last_surfed']))) {
                        // Fix it here
                        $GLOBALS['surfbar_cache']['salts_last_salt'] = '';
                } // END - if
 
                // Fix missing last_surfed
                if ((!isset($GLOBALS['surfbar_cache']['last_surfed'])) || (is_null($GLOBALS['surfbar_cache']['last_surfed']))) {
                        // Fix it here

-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_surfed - FIXED!', false);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_surfed - FIXED!', FALSE);

                        $GLOBALS['surfbar_cache']['last_surfed'] = '0';
                } // END - if
 
                        $GLOBALS['surfbar_cache']['last_surfed'] = '0';
                } // END - if
 


@@ -1922,7 +1922,7 @@ function getSurfbarPaymentModel () {
 //------------------------------------------------------------------------------
 
 // Template helper to generate a selection box for surfbar actions
 //------------------------------------------------------------------------------
 
 // Template helper to generate a selection box for surfbar actions

-function doTemplateSurfbarActionsActionSelectionBox ($templateName, $clear = false, $default = NULL) {
+function doTemplateSurfbarActionsActionSelectionBox ($templateName, $clear = FALSE, $default = NULL) {

        // Init array
        $actionsAction = array(
                0 => array('actions_action' => 'EDIT'),
        // Init array
        $actionsAction = array(
                0 => array('actions_action' => 'EDIT'),


@@ -1936,14 +1936,14 @@ function doTemplateSurfbarActionsActionSelectionBox ($templateName, $clear = fal
        );
 
        // Handle it over to generateSelectionBoxFromArray()
        );
 
        // Handle it over to generateSelectionBoxFromArray()

-       $content = generateSelectionBoxFromArray($actionsAction, 'surfbar_actions_action', 'actions_action', '', '', '', $default, '', false, true);
+       $content = generateSelectionBoxFromArray($actionsAction, 'surfbar_actions_action', 'actions_action', '', '', '', $default, '', FALSE, TRUE);

 
        // Return prepared content
        return $content;
 }
 
 // Template helper to generate a selection box for surfbar status
 
        // Return prepared content
        return $content;
 }
 
 // Template helper to generate a selection box for surfbar status

-function doTemplateSurfbarActionsStatusSelectionBox ($templateName, $clear = false, $default = NULL) {
+function doTemplateSurfbarActionsStatusSelectionBox ($templateName, $clear = FALSE, $default = NULL) {

        // Init array
        $status = array(
                0 => array('actions_status' => 'PENDING'),
        // Init array
        $status = array(
                0 => array('actions_status' => 'PENDING'),


@@ -1957,14 +1957,14 @@ function doTemplateSurfbarActionsStatusSelectionBox ($templateName, $clear = fal
        );
 
        // Handle it over to generateSelectionBoxFromArray()
        );
 
        // Handle it over to generateSelectionBoxFromArray()

-       $content = generateSelectionBoxFromArray($status, 'surfbar_actions_status', 'actions_status', '', '', '', $default, '', false, true);
+       $content = generateSelectionBoxFromArray($status, 'surfbar_actions_status', 'actions_status', '', '', '', $default, '', FALSE, TRUE);

 
        // Return prepared content
        return $content;
 }
 
 // Template helper to generate a selection box for surfbar status
 
        // Return prepared content
        return $content;
 }
 
 // Template helper to generate a selection box for surfbar status

-function doTemplateSurfbarActionsNewStatusSelectionBox ($templateName, $clear = false, $default = NULL) {
+function doTemplateSurfbarActionsNewStatusSelectionBox ($templateName, $clear = FALSE, $default = NULL) {

        // Init array
        $status = array(
                0 => array('actions_new_status' => 'PENDING'),
        // Init array
        $status = array(
                0 => array('actions_new_status' => 'PENDING'),


@@ -1978,7 +1978,7 @@ function doTemplateSurfbarActionsNewStatusSelectionBox ($templateName, $clear =
        );
 
        // Handle it over to generateSelectionBoxFromArray()
        );
 
        // Handle it over to generateSelectionBoxFromArray()

-       $content = generateSelectionBoxFromArray($status, 'surfbar_actions_new_status', 'actions_new_status', '', '', '', $default, '', true, true);
+       $content = generateSelectionBoxFromArray($status, 'surfbar_actions_new_status', 'actions_new_status', '', '', '', $default, '', TRUE, TRUE);

 
        // Return prepared content
        return $content;
 
        // Return prepared content
        return $content;

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index b8258a4d0d13dca5cb7d4d0ac73a926cea83efee..4184c6722ae2742475a671e5ea35ec8db72d85d5 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -82,7 +82,7 @@ function outputAdvancedOverview (&$result_main) {
        } // END - foreach
 
        // Extension updates found
        } // END - foreach
 
        // Extension updates found

-       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
+       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', TRUE, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");

 
        if ($value > 0) {
                $content['update_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=updates%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['update_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=updates%}">' . $value . '</a>';


@@ -128,7 +128,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Unassigned tasks
        //
        //
        // Unassigned tasks
        //

-       $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
+       $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', TRUE, " AND `status` != 'DELETED'");

 
        if ($value > 0) {
                $content['new_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=unassigned%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['new_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=unassigned%}">' . $value . '</a>';


@@ -137,7 +137,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Closed tasks
        //
        //
        // Closed tasks
        //

-       $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
+       $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', TRUE);

 
        if ($value > 0) {
                $content['closed_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=closed%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['closed_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=closed%}">' . $value . '</a>';


@@ -146,7 +146,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Deleted tasks
        //
        //
        // Deleted tasks
        //

-       $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
+       $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', TRUE);

 
        if ($value > 0) {
                $content['deleted_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=deleted%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['deleted_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=deleted%}">' . $value . '</a>';


@@ -155,7 +155,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Solved tasks
        //
        //
        // Solved tasks
        //

-       $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
+       $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', TRUE, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));

 
        if ($value > 0) {
                $content['solved_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=solved%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['solved_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=solved%}">' . $value . '</a>';


@@ -164,7 +164,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Your tasks
        //
        //
        // Your tasks
        //

-       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
+       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', TRUE, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");

 
        if ($value > 0) {
                $content['your_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['your_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task%}">' . $value . '</a>';


@@ -173,7 +173,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Mails waiting to be approved
        //
        //
        // Mails waiting to be approved
        //

-       $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true);
+       $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', TRUE);

 
        if ($value > 0) {
                $content['pending_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=unlock_emails%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['pending_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=unlock_emails%}">' . $value . '</a>';


@@ -182,7 +182,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Unfinished mail orders
        //
        //
        // Unfinished mail orders
        //

-       $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true);
+       $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', TRUE);

 
        if ($value > 0) {
                $content['canceled_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['canceled_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';


@@ -191,7 +191,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Sent mail orders
        //
        //
        // Sent mail orders
        //

-       $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true);
+       $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', TRUE);

 
        if ($value > 0) {
                $content['send_emails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_archiv%}">' . $value . '</a>';
 
        if ($value > 0) {
                $content['send_emails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_archiv%}">' . $value . '</a>';


@@ -202,7 +202,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        if (isExtensionActive('autopurge')) {
                // Get auto-purged mails
        //
        if (isExtensionActive('autopurge')) {
                // Get auto-purged mails

-               $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true);
+               $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', TRUE);

 
                if ($value > 0) {
                        $content['purged_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 
                if ($value > 0) {
                        $content['purged_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';


@@ -213,7 +213,7 @@ function outputAdvancedOverview (&$result_main) {
                //
                if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
                        // Get auto-purged bonus mails
                //
                if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
                        // Get auto-purged bonus mails

-                       $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true);
+                       $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', TRUE);

 
                        if ($value > 0) {
                                $content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 
                        if ($value > 0) {
                                $content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';


@@ -233,7 +233,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
                // Get sent bonus mails (but not notifications)
        //
        if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
                // Get sent bonus mails (but not notifications)

-               $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'");
+               $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', TRUE, " AND `is_notify`='N'");

 
                if ($value > 0) {
                        $content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 
                if ($value > 0) {
                        $content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';


@@ -532,7 +532,7 @@ ORDER BY
        $content['extra_table'] = $EXTRAS;
 
        // Simply load the template... :-)
        $content['extra_table'] = $EXTRAS;
 
        // Simply load the template... :-)

-       loadTemplate('admin_overview_task', false, $content);
+       loadTemplate('admin_overview_task', FALSE, $content);

 }
 
 //
 }
 
 //


@@ -571,12 +571,12 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
                        SQL_FREERESULT($result);
 
                        // And insert the final string into extras template
                        SQL_FREERESULT($result);
 
                        // And insert the final string into extras template

-                       $OUT .= loadTemplate('admin_overview_task_rows', true, $content);
+                       $OUT .= loadTemplate('admin_overview_task_rows', TRUE, $content);

                } // END- foreach
        } // END - foreach
 
        // Return output in the template
                } // END- foreach
        } // END - foreach
 
        // Return output in the template

-       return loadTemplate('admin_overview_task_extras', true, $OUT);
+       return loadTemplate('admin_overview_task_extras', TRUE, $OUT);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index a044e8a06c2aeb84b049a401378a4715a3cd5e4f..1a8e05bba28b6aa0656cfaa46313db2c1d1c577d 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -106,7 +106,7 @@ ORDER BY
        );
 
        // Return generated selection
        );
 
        // Return generated selection

-       return loadTemplate('theme_select_form', true, $content);
+       return loadTemplate('theme_select_form', TRUE, $content);

 }
 
 // Get version from name
 }
 
 // Get version from name


@@ -157,11 +157,11 @@ function isThemeActive ($name) {
        // Is the extension 'theme' installed?
        if (!isExtensionActive('theme')) {
                // Then abort here
        // Is the extension 'theme' installed?
        if (!isExtensionActive('theme')) {
                // Then abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Default is nothing active
        } // END - if
 
        // Default is nothing active

-       $active = false;
+       $active = FALSE;

 
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) {
 
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) {


@@ -234,7 +234,7 @@ function getActualTheme () {
                // Set default theme
                setMailerTheme($ret);
        } elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
                // Set default theme
                setMailerTheme($ret);
        } elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {

-               //die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
+               //die("<pre>".print_r($GLOBALS['cache_array']['themes'], TRUE)."</pre>");

                // Get theme from cookie
                $ret = getSession('mailer_theme');
 
                // Get theme from cookie
                $ret = getSession('mailer_theme');
 

diff --git a/inc/libs/uberwach_functions.php b/inc/libs/uberwach_functions.php
index bcd6764eb1bb780d19c989adfa4e27409cda3259..77a9c2ba85293b0ec229b41d6a4ef70fb366c3d1 100644 (file)
--- a/inc/libs/uberwach_functions.php
+++ b/inc/libs/uberwach_functions.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Loads the snippet for the uberwach action
 function loadUberwachSnippet () {
        // Simply load the template here
 // Loads the snippet for the uberwach action
 function loadUberwachSnippet () {
        // Simply load the template here

-       $GLOBALS['__page_footer'] .= loadTemplate('uberwach_snippet', true);
+       $GLOBALS['__page_footer'] .= loadTemplate('uberwach_snippet', TRUE);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index bce9fc75795dec3ccd350679fa1a5af7d6545d39..a8718292e43c448f0b280f646a970a85d3f2ca6e 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -77,7 +77,7 @@ function addAlphabeticalSorting ($sortby) {
        );
 
        // Load template
        );
 
        // Load template

-       $OUT = loadTemplate('admin_list_user_alpha', true, $content);
+       $OUT = loadTemplate('admin_list_user_alpha', TRUE, $content);

 
        // Return generated code
        return $OUT;
 
        // Return generated code
        return $OUT;


@@ -129,7 +129,7 @@ function addSortLinks ($letter, $sortby) {
        $content['list'] = substr($OUT, 0, -1);
 
        // Load template
        $content['list'] = substr($OUT, 0, -1);
 
        // Load template

-       $OUT = loadTemplate('admin_list_user_sort', true, $content);
+       $OUT = loadTemplate('admin_list_user_sort', TRUE, $content);

 
        // Return code
        return $OUT;
 
        // Return code
        return $OUT;


@@ -181,7 +181,7 @@ function addPageNavigation ($numPages) {
                $content['list'] = $OUT;
 
                // Load template
                $content['list'] = $OUT;
 
                // Load template

-               $OUT = loadTemplate('admin_list_user_pagenav', true, $content);
+               $OUT = loadTemplate('admin_list_user_pagenav', TRUE, $content);

        } // END - if
 
        // Return code
        } // END - if
 
        // Return code


@@ -233,7 +233,7 @@ function determineRandomReferralId () {
        // Is the extension version fine?
        if ((isRandomReferralIdEnabled()) && (isExtensionInstalledAndNewer('user', '0.3.4'))) {
                // Get all user ids
        // Is the extension version fine?
        if ((isRandomReferralIdEnabled()) && (isExtensionInstalledAndNewer('user', '0.3.4'))) {
                // Get all user ids

-               $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, runFilterChain('user_exclusion_sql', ' AND `rand_confirmed` >= {?user_min_confirmed?}'));
+               $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', TRUE, runFilterChain('user_exclusion_sql', ' AND `rand_confirmed` >= {?user_min_confirmed?}'));

 
                // Is there at least one?
                if ($totalUsers > 0) {
 
                // Is there at least one?
                if ($totalUsers > 0) {


@@ -269,7 +269,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
        $add = '';
        $errorCode = '0';
        $ext = '';
        $add = '';
        $errorCode = '0';
        $ext = '';

-       $isFound = false;
+       $isFound = FALSE;

 
        // Init array
        $content = array(
 
        // Init array
        $content = array(


@@ -294,7 +294,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
        }
 
        // No error found?
        }
 
        // No error found?

-       if (($errorCode == '0') && ($isFound === true)) {
+       if (($errorCode == '0') && ($isFound === TRUE)) {

                // Get user data array and set userid (e.g. important if we login with nickname)
                $content = getUserDataArray();
                if (!empty($content['userid'])) {
                // Get user data array and set userid (e.g. important if we login with nickname)
                $content = getUserDataArray();
                if (!empty($content['userid'])) {


@@ -327,7 +327,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                array($content['hash'], $userid), __FUNCTION__, __LINE__);
 
                        // No login bonus by default
                                array($content['hash'], $userid), __FUNCTION__, __LINE__);
 
                        // No login bonus by default

-                       $GLOBALS['bonus_payed'] = false;
+                       $GLOBALS['bonus_payed'] = FALSE;

 
                        // Is bonus up-to-date?
                        if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {
 
                        // Is bonus up-to-date?
                        if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {


@@ -342,7 +342,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                if ($probe >= getConfig('login_timeout')) {
                                        // Add login bonus to user's account
                                        $add = ',`login_bonus`=`login_bonus`+{?login_bonus?}';
                                if ($probe >= getConfig('login_timeout')) {
                                        // Add login bonus to user's account
                                        $add = ',`login_bonus`=`login_bonus`+{?login_bonus?}';

-                                       $GLOBALS['bonus_payed'] = true;
+                                       $GLOBALS['bonus_payed'] = TRUE;

 
                                        // Subtract login bonus from userid's account or jackpot
                                        if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD')) {
 
                                        // Subtract login bonus from userid's account or jackpot
                                        if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD')) {


@@ -366,7 +366,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                        // Is a success URL set?
                                        if (empty($successUrl)) {
                                                // Procedure to checking for login data
                                        // Is a success URL set?
                                        if (empty($successUrl)) {
                                                // Procedure to checking for login data

-                                               if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
+                                               if (($GLOBALS['bonus_payed'] === TRUE) && (isExtensionActive('bonus'))) {

                                                        // Bonus added (just displaying!)
                                                        $url = 'modules.php?module=chk_login&do=bonus';
                                                } else {
                                                        // Bonus added (just displaying!)
                                                        $url = 'modules.php?module=chk_login&do=bonus';
                                                } else {


@@ -427,7 +427,7 @@ function doNewUserPassword ($email, $userid) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'email=' . $email . ',userid=' . $userid . ' - ENTERED!');
        // Init found-status and error
        $errorCode = '';
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'email=' . $email . ',userid=' . $userid . ' - ENTERED!');
        // Init found-status and error
        $errorCode = '';

-       $accountFound = false;
+       $accountFound = FALSE;

 
        // Probe userid/nickname
        if (!empty($email)) {
 
        // Probe userid/nickname
        if (!empty($email)) {


@@ -445,7 +445,7 @@ function doNewUserPassword ($email, $userid) {
        }
 
        // Any entry found?
        }
 
        // Any entry found?

-       if ($accountFound === true) {
+       if ($accountFound === TRUE) {

                // Is the account confirmed
                if (getUserData('status') == 'CONFIRMED') {
                        // Generate new password
                // Is the account confirmed
                if (getUserData('status') == 'CONFIRMED') {
                        // Generate new password


@@ -534,11 +534,11 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
        // Is the extension installed and updated?
        if ((!isExtensionActive('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.6'))) {
                // Return zero here
        // Is the extension installed and updated?
        if ((!isExtensionActive('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.6'))) {
                // Return zero here

-               return false;
+               return FALSE;

        } // END - if
 
        // Default is not working
        } // END - if
 
        // Default is not working

-       $return = false;
+       $return = FALSE;

 
        // Does it exist?
        if ((!getEpocheTimeFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
 
        // Does it exist?
        if ((!getEpocheTimeFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {


@@ -728,7 +728,7 @@ function getTotalTesterUsers () {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it

-               $GLOBALS[__FUNCTION__] = countSumTotalData('', 'user_data', 'userid', '', true, runFilterChain('user_inclusion_sql'));
+               $GLOBALS[__FUNCTION__] = countSumTotalData('', 'user_data', 'userid', '', TRUE, runFilterChain('user_inclusion_sql'));

        } // END - if
 
        // Return cache
        } // END - if
 
        // Return cache


@@ -765,7 +765,7 @@ function getNextFreeTesterUserNumber () {
 // Wrapper function to return a selection box for tester user default referral id
 function addTesterUserDefaultRefidSelectionBox ($fieldName = 'tester_user_default_refid') {
        // Return it
 // Wrapper function to return a selection box for tester user default referral id
 function addTesterUserDefaultRefidSelectionBox ($fieldName = 'tester_user_default_refid') {
        // Return it

-       return addMemberSelectionBox(getConfig('tester_user_default_refid'), false, true, true, $fieldName, " WHERE `surname` LIKE '{?tester_user_surname_prefix?}%'");
+       return addMemberSelectionBox(getConfig('tester_user_default_refid'), FALSE, TRUE, TRUE, $fieldName, " WHERE `surname` LIKE '{?tester_user_surname_prefix?}%'");

 }
 
 // Checks whether given surname is a test user name
 }
 
 // Checks whether given surname is a test user name


@@ -783,7 +783,7 @@ function createTesterUserAccount () {
        if (!isRegistrationDataComplete()) {
                // Then abort here
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isRegistrationDataComplete()=false, please check if you e.g. have selected the required minimum of categories.');
        if (!isRegistrationDataComplete()) {
                // Then abort here
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isRegistrationDataComplete()=false, please check if you e.g. have selected the required minimum of categories.');

-               return false;
+               return FALSE;

        } // END - if
 
        // Do registration
        } // END - if
 
        // Do registration


@@ -802,24 +802,54 @@ function isMemberSubIdFree ($subId) {
        assert(isMember());
 
        // Check it
        assert(isMember());
 
        // Check it

-       $isFree = (countSumTotalData(getMemberId(), 'user_subids', 'id', 'userid', true, sprintf(" AND `subid`='%s'", $subId)) == 0);
+       $isFree = (countSumTotalData(getMemberId(), 'user_subids', 'id', 'userid', TRUE, sprintf(" AND `subid`='%s'", $subId)) == 0);

 
        // Return result
        return $isFree;
 }
 
 
        // Return result
        return $isFree;
 }
 

-// Prepares given sub id for storage in database
-function prepareSubId ($subId) {
+// Checks whether the sub id is valid
+function isValidSubId ($subId) {

        // First convert any spaces/dashes to underscores
        $subId = str_replace(' ', '_', str_replace('-', '_', $subId));
 
        // Then filter out any unwanted characters
        // First convert any spaces/dashes to underscores
        $subId = str_replace(' ', '_', str_replace('-', '_', $subId));
 
        // Then filter out any unwanted characters

-       $subId = preg_replace('/([^a-zA-Z0-9_])/', '', $subId);
+       $subIdTest = preg_replace('/([^a-zA-Z0-9_])/', '', $subId);
+
+       // Is it valid?
+       return ($subId == $subIdTest);
+} // END - if
+
+// Prepares found sub id for updating in database
+function prepareFoundSubId ($subId) {
+       // Then check if it is valid and available
+       if ((!isValidSubId($subId)) || (isMemberSubIdFree($subId))) {
+               // Is not free or invalid
+               $subId = FALSE;
+       } // END - if
+
+       // Return prepared sub id
+       return $subId;
+}
+
+// Validates sub id and returns FALSE if not valid
+function validateSubId ($subId) {
+       // Then check if it is valid and available
+       if (!isValidSubId($subId)) {
+               // Is not free or invalid
+               $subId = FALSE;
+       } // END - if
+
+       // Return prepared sub id
+       return $subId;
+}

 
 

-       // Then Check if it is available
-       if (!isMemberSubIdFree($subId)) {
-               // Is not free
-               $subId = false;
+// Prepares given sub id for inserting into database
+function prepareSubId ($subId) {
+       // Then check if it is valid and available
+       if ((!isValidSubId($subId)) || (!isMemberSubIdFree($subId))) {
+               // Is not free or invalid
+               $subId = FALSE;

        } // END - if
 
        // Return prepared sub id
        } // END - if
 
        // Return prepared sub id


@@ -883,7 +913,7 @@ function getTotalMemberSubIds () {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it

-               $GLOBALS[__FUNCTION__] = countSumTotalData(getMemberId(), 'user_subids', 'id', 'userid', true);
+               $GLOBALS[__FUNCTION__] = countSumTotalData(getMemberId(), 'user_subids', 'id', 'userid', TRUE);

        } // END - if
 
        // Return cache
        } // END - if
 
        // Return cache


@@ -942,7 +972,7 @@ function doExpressionUser ($data) {
 //-----------------------------------------------------------------------------
 
 // Template call-back function for list_user admin function
 //-----------------------------------------------------------------------------
 
 // Template call-back function for list_user admin function

-function doTemplateAdminListUserTitle ($template, $clear = false) {
+function doTemplateAdminListUserTitle ($template, $clear = FALSE) {

        // Init title with "all accounts"
        $code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 
        // Init title with "all accounts"
        $code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 


@@ -960,7 +990,7 @@ function doTemplateAdminListUserTitle ($template, $clear = false) {
 }
 
 // Template call-back function for displaying "username"
 }
 
 // Template call-back function for displaying "username"

-function doTemplateDisplayUsername ($template, $clear = false, $userid = NULL) {
+function doTemplateDisplayUsername ($template, $clear = FALSE, $userid = NULL) {

        // Is a userid set?
        if (!isValidUserId($userid)) {
                // Please don't call this without a valid userid
        // Is a userid set?
        if (!isValidUserId($userid)) {
                // Please don't call this without a valid userid

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 11ecf02670f93d856b6194629fc196722adda02d..513d455dbb43fbe54930d558495fb4621869605e 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -98,7 +98,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        // Is a purpose there?
        if (isset($requestData['purpose'])) {
                // Eval the purpose
        // Is a purpose there?
        if (isset($requestData['purpose'])) {
                // Eval the purpose

-               eval('$purpose = "' . doFinalCompilation($requestData['purpose'], false) . '";');
+               eval('$purpose = "' . doFinalCompilation($requestData['purpose'], FALSE) . '";');

 
                // Prepare the purpose, it needs encoding
                $requestData['purpose'] = encodeString($purpose);
 
                // Prepare the purpose, it needs encoding
                $requestData['purpose'] = encodeString($purpose);


@@ -212,7 +212,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
 // Tests the function by calling balance.php on the API
 function WERNIS_TEST_API () {
        // Result is always failed
 // Tests the function by calling balance.php on the API
 function WERNIS_TEST_API () {
        // Result is always failed

-       $result = false;
+       $result = FALSE;

 
        // Return the result from the lower functions
        $return = WERNIS_SEND_REQUEST('balance.php');
 
        // Return the result from the lower functions
        $return = WERNIS_SEND_REQUEST('balance.php');


@@ -220,7 +220,7 @@ function WERNIS_TEST_API () {
        // Did it went smoothly?
        if ($return['status'] == 'OK') {
                // All fine!
        // Did it went smoothly?
        if ($return['status'] == 'OK') {
                // All fine!

-               $result = true;
+               $result = TRUE;

        } else {
                // Status failure text
                WERNIS_STATUS_MESSAGE($return['message'], $return['status']);
        } else {
                // Status failure text
                WERNIS_STATUS_MESSAGE($return['message'], $return['status']);


@@ -236,15 +236,15 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        if (!isWernisWithdrawActive()) {
                if (!isExtensionActive('sponsor')) {
                        // No, abort here
        if (!isWernisWithdrawActive()) {
                if (!isExtensionActive('sponsor')) {
                        // No, abort here

-                       return false;
+                       return FALSE;

                } elseif (!isSponsor()) {
                        // No sponsor, not allowed to withdraw!
                } elseif (!isSponsor()) {
                        // No sponsor, not allowed to withdraw!

-                       return false;
+                       return FALSE;

                }
        } // END - if
 
        // Default is failed attempt
                }
        } // END - if
 
        // Default is failed attempt

-       $result = false;
+       $result = FALSE;

 
        // Prepare the request data
        $requestData = array(
 
        // Prepare the request data
        $requestData = array(


@@ -261,7 +261,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
 
        if ($return['status'] == 'OK') {
                // All fine!
 
        if ($return['status'] == 'OK') {
                // All fine!

-               $result = true;
+               $result = TRUE;

 
                // Log the transfer
                WERNIS_LOG_TRANSFER($wdsId, $amount, 'WITHDRAW');
 
                // Log the transfer
                WERNIS_LOG_TRANSFER($wdsId, $amount, 'WITHDRAW');


@@ -281,7 +281,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
 // Payout this amount
 function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        // Default is failed attempt
 // Payout this amount
 function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        // Default is failed attempt

-       $result = false;
+       $result = FALSE;

 
        // Prepare the request data
        $requestData = array(
 
        // Prepare the request data
        $requestData = array(


@@ -298,7 +298,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
 
        if ($return['status'] == 'OK') {
                // All fine!
 
        if ($return['status'] == 'OK') {
                // All fine!

-               $result = true;
+               $result = TRUE;

 
                // Log the transfer
                WERNIS_LOG_TRANSFER($wdsId, $amount, 'PAYOUT');
 
                // Log the transfer
                WERNIS_LOG_TRANSFER($wdsId, $amount, 'PAYOUT');


@@ -353,7 +353,7 @@ function WERNIS_TAKE_FEE ($points, $mode) {
        if (!in_array($mode, array('payout', 'withdraw'))) {
                // Log error and abort
                logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getMemberId() . ',mode=' . $mode . ',points=' . $points . ' - unknown mode detected.');
        if (!in_array($mode, array('payout', 'withdraw'))) {
                // Log error and abort
                logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getMemberId() . ',mode=' . $mode . ',points=' . $points . ' - unknown mode detected.');

-               return false;
+               return FALSE;

        } // END - if
 
        // Is there a percentage or fixed fee?
        } // END - if
 
        // Is there a percentage or fixed fee?

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index dad248da2a846258012df0f2d2b3f69de0b59e93..213b7fab04e99d8e043d950e5faca774a062fee2 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -41,12 +41,12 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Queries the given Yoo!Media API 2.0 script
 } // END - if
 
 // Queries the given Yoo!Media API 2.0 script

-function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
+function YOOMEDIA_QUERY_API ($script, $countQuery = TRUE) {

        // Init response array
        $response = array();
 
        // Enougth queries left?
        // Init response array
        $response = array();
 
        // Enougth queries left?

-       if ((getConfig('yoomedia_requests_remain') > 0) || ($countQuery === false)) {
+       if ((getConfig('yoomedia_requests_remain') > 0) || ($countQuery === FALSE)) {

                // Prepare request array
                $requestData = array(
                        'id'         => getConfig('yoomedia_id'),
                // Prepare request array
                $requestData = array(
                        'id'         => getConfig('yoomedia_id'),


@@ -60,7 +60,7 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
                );
 
                // Run the query
                );
 
                // Run the query

-               $response = sendGetRequest('http://www.yoomedia.de/interface_2.0/' . $script, $requestData, true);
+               $response = sendGetRequest('http://www.yoomedia.de/interface_2.0/' . $script, $requestData, TRUE);

 
                // Convert from ISO to UTF-8 only if count is > 3 because <= 3 means timeout
                if (count($response) > 3) {
 
                // Convert from ISO to UTF-8 only if count is > 3 because <= 3 means timeout
                if (count($response) > 3) {


@@ -72,7 +72,7 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
                } // END - if
 
                // Shall we count the query as used?
                } // END - if
 
                // Shall we count the query as used?

-               if ($countQuery === true) {
+               if ($countQuery === TRUE) {

                        // Then update the config!
                        updateConfiguration('yoomedia_requests_remain', 1, '-');
                } // END - if
                        // Then update the config!
                        updateConfiguration('yoomedia_requests_remain', 1, '-');
                } // END - if


@@ -87,7 +87,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
        // Is this admin?
        if (!isAdmin()) {
                // No admin!
        // Is this admin?
        if (!isAdmin()) {
                // No admin!

-               return false;
+               return FALSE;

        } // END - if
 
        // Remove 'ok'
        } // END - if
 
        // Remove 'ok'


@@ -105,7 +105,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 
        // Query the API with a test request without couting it
        // If zero reply comes back the data is invalid!
 
        // Query the API with a test request without couting it
        // If zero reply comes back the data is invalid!

-       $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
+       $response = YOOMEDIA_QUERY_API('out_textmail.php', TRUE); // @TODO Ask Yoo!Media for test script

 
        // Default error code is 0 = all fine!
        $errorCode = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($response);
 
        // Default error code is 0 = all fine!
        $errorCode = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($response);


@@ -201,10 +201,10 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
        // Is this an admin?
        if (!isAdmin()) {
                // Abort here
        // Is this an admin?
        if (!isAdmin()) {
                // Abort here

-               return false;
+               return FALSE;

        } elseif (!isExtensionActive('bonus')) {
                // Abort here
        } elseif (!isExtensionActive('bonus')) {
                // Abort here

-               return false;
+               return FALSE;

        }
 
        // Is the waiting time below one second? Then fix it to one (zero seconds are not yet supported!)
        }
 
        // Is the waiting time below one second? Then fix it to one (zero seconds are not yet supported!)


@@ -221,7 +221,7 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
        } // END - if
 
        // Load template
        } // END - if
 
        // Load template

-       loadTemplate('admin_send_yoomedia', false, $data);
+       loadTemplate('admin_send_yoomedia', FALSE, $data);

 }
 
 // Adds the mail to the bonus mail pool
 }
 
 // Adds the mail to the bonus mail pool


@@ -229,10 +229,10 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mailMode) {
        // Is this an admin?
        if (!isAdmin()) {
                // Abort here
        // Is this an admin?
        if (!isAdmin()) {
                // Abort here

-               return false;
+               return FALSE;

        } elseif (!isExtensionActive('bonus')) {
                // Abort here
        } elseif (!isExtensionActive('bonus')) {
                // Abort here

-               return false;
+               return FALSE;

        }
 
        // Add dummy receiver to avoid notice
        }
 
        // Add dummy receiver to avoid notice


@@ -259,7 +259,7 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mailMode) {
 // Lockdown given id
 function YOOMEDIA_EXCLUDE_MAIL ($data, $mailMode) {
        // Search for the entry
 // Lockdown given id
 function YOOMEDIA_EXCLUDE_MAIL ($data, $mailMode) {
        // Search for the entry

-       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
+       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === FALSE) {

                // Convert mode for mails
                $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
                // Convert mode for mails
                $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 


@@ -322,7 +322,7 @@ function translateYooMediaError ($errorCode) {
 // Checks if the mail id is in reload lock
 function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
        // Default is not in reload lock
 // Checks if the mail id is in reload lock
 function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
        // Default is not in reload lock

-       $reloaded = false;
+       $reloaded = FALSE;

 
        // Query database
        $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
 
        // Query database
        $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",


@@ -354,7 +354,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 // Lock given mail down for reload lock
 function YOOMEDIA_RELOAD_LOCK ($data, $mailMode) {
        // Search for the entry
 // Lock given mail down for reload lock
 function YOOMEDIA_RELOAD_LOCK ($data, $mailMode) {
        // Search for the entry

-       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
+       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === FALSE) {

                // Convert mode for mails
                $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
                // Convert mode for mails
                $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 


@@ -431,7 +431,7 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                $code = '0';
        } else {
                // Should not happen!
                $code = '0';
        } else {
                // Should not happen!

-               reportBug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
+               reportBug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, TRUE) . '</pre>');

        }
 
        // Return error code
        }
 
        // Return error code

diff --git a/inc/load_config.php b/inc/load_config.php
index 0bb8a7aa3615d0f41c4cfdce9d10e1fcec1c7305..483a4d270b76a17ef49f250a65ee75345d710fd1 100644 (file)
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -46,12 +46,12 @@ setConfigEntry('WRITE_FOOTER', 'Y');
 setConfigEntry('_DB_TYPE'    , 'mysql3');
 
 // Mark configuration as NOT loaded which is the default
 setConfigEntry('_DB_TYPE'    , 'mysql3');
 
 // Mark configuration as NOT loaded which is the default

-$GLOBALS['config_local_loaded'] = false;
+$GLOBALS['config_local_loaded'] = FALSE;

 
 // Is the local configuration there?
 if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
        // We are better in installation mode
 
 // Is the local configuration there?
 if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
        // We are better in installation mode

-       $GLOBALS['__mailer_installing'] = true;
+       $GLOBALS['__mailer_installing'] = TRUE;

 
        // Define default main_title here
        setConfigEntry('MAIN_TITLE', 'Your mail-exchange title');
 
        // Define default main_title here
        setConfigEntry('MAIN_TITLE', 'Your mail-exchange title');


@@ -66,7 +66,7 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
        loadIncludeOnce(getCachePath() . 'config-local.php');
 
        // Mark configuration as loaded
        loadIncludeOnce(getCachePath() . 'config-local.php');
 
        // Mark configuration as loaded

-       $GLOBALS['config_local_loaded'] = true;
+       $GLOBALS['config_local_loaded'] = TRUE;

 } elseif (isIncludeReadable('inc/config.php')) {
        // Out-dated inc/config.php found, falling back to load and "wrap" it
        updateOldConfigFile();
 } elseif (isIncludeReadable('inc/config.php')) {
        // Out-dated inc/config.php found, falling back to load and "wrap" it
        updateOldConfigFile();

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index 746957a8ccc473e9f646bba855c42b3e33ec04e8..a2cd8a9d17b952cd9871a083861a08fa917fdaad 100644 (file)
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -123,7 +123,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        unset($EXT_DUMMY);
 
        // No database load needed
        unset($EXT_DUMMY);
 
        // No database load needed

-       $res_ext_crt = false;
+       $res_ext_crt = FALSE;

 
        // Load all extension files in test-mode (we initialize them later)
        foreach ($EXT_POOL as $ext) {
 
        // Load all extension files in test-mode (we initialize them later)
        foreach ($EXT_POOL as $ext) {


@@ -165,7 +165,7 @@ ORDER BY
                                        array($content['ext_name']), __FILE__, __LINE__);
                        } else {
                                // Didn't load so deactivate it
                                        array($content['ext_name']), __FILE__, __LINE__);
                        } else {
                                // Didn't load so deactivate it

-                               doDeactivateExtension($content['ext_name'], true);
+                               doDeactivateExtension($content['ext_name'], TRUE);

                        }
 
                        // ... and skip it
                        }
 
                        // ... and skip it


@@ -173,7 +173,7 @@ ORDER BY
                } // END - if
 
                // Get menu entry
                } // END - if
 
                // Get menu entry

-               $content['ext_menu'] = convertBooleanToYesNo(ifModuleHasMenu($content['ext_name'], true));
+               $content['ext_menu'] = convertBooleanToYesNo(ifModuleHasMenu($content['ext_name'], TRUE));

 
                // Get language entry
                $content['ext_lang'] = convertBooleanToYesNo(isLanguageIncludeReadable($content['ext_name']));
 
                // Get language entry
                $content['ext_lang'] = convertBooleanToYesNo(isLanguageIncludeReadable($content['ext_name']));

diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php
index 18777fc59f261bbc62eb790de44779d3e0e304eb..03fd6c9bd36fac15eeec3b1b70eee3921d244be1 100644 (file)
--- a/inc/loader/load-modules.php
+++ b/inc/loader/load-modules.php
@@ -57,7 +57,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                $GLOBALS['cache_instance']->removeCacheFile();
 
                // We should fix this
                $GLOBALS['cache_instance']->removeCacheFile();
 
                // We should fix this

-               reportBug(__FILE__, __LINE__, 'modArray=<pre>' . print_r($modArray, true) . '</pre>Please try to reload to fix this.');
+               reportBug(__FILE__, __LINE__, 'modArray=<pre>' . print_r($modArray, TRUE) . '</pre>Please try to reload to fix this.');

        } // END - if
 
        // Rewrite some parts
        } // END - if
 
        // Rewrite some parts

diff --git a/inc/loader/load-themes.php b/inc/loader/load-themes.php
index 41f43e5a080565a6d93124e92816fd1570bbfd0a..c482fc53e8696524b9f96aebe9aca654f8df2e75 100644 (file)
--- a/inc/loader/load-themes.php
+++ b/inc/loader/load-themes.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isExtensionActive('theme')) {
        // Skip this loader
        return;
 } elseif (!isExtensionActive('theme')) {
        // Skip this loader

-       return false;
+       return FALSE;

 }
 
 // Next cached table are the themes
 }
 
 // Next cached table are the themes

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 902997e72954985f496c63b83d8f25708e7af677..97cd5205a735a0d1c65ed4258a1de768f4f894bf 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -117,7 +117,7 @@ LIMIT 1",
                                ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
                                ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!

-                       if ($sentBonusMails === true) {
+                       if ($sentBonusMails === TRUE) {

                                // Add userid to queue
                                array_push($userids, $content['userid']);
                        } else {
                                // Add userid to queue
                                array_push($userids, $content['userid']);
                        } else {


@@ -128,7 +128,7 @@ LIMIT 1",
                } // END - while
 
                // Shall I send out bonus mails?
                } // END - while
 
                // Shall I send out bonus mails?

-               if ($sentBonusMails === true) {
+               if ($sentBonusMails === TRUE) {

                        // Okay, make array to string
                        $receiver = implode(';', $userids);
 
                        // Okay, make array to string
                        $receiver = implode(';', $userids);
 

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 1014e7497fed9a9bb3f83cf029ec7d5acb1bff1c..2493a25e5918252d47ce4df5b82ce225b31d2b8f 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -106,7 +106,7 @@ LIMIT 1",
                                ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
                                ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!

-                       if ($sentBonusMails === true) {
+                       if ($sentBonusMails === TRUE) {

                                // Add userid to queue
                                array_push($userids, $content['userid']);
                        } else {
                                // Add userid to queue
                                array_push($userids, $content['userid']);
                        } else {


@@ -117,7 +117,7 @@ LIMIT 1",
                } // END - while
 
                // Shall I send out bonus mails?
                } // END - while
 
                // Shall I send out bonus mails?

-               if ($sentBonusMails === true) {
+               if ($sentBonusMails === TRUE) {

                        // Okay, make array to string
                        $receiver = implode(';', $userids);
 
                        // Okay, make array to string
                        $receiver = implode(';', $userids);
 

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 2055a6b938df563e396c2395c6870093b232a9b4..6babb35b1880d90a4563396ae719de11f2e1c426 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -130,7 +130,7 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
                // Only double when points are enougth!
                if ($DOUBLER_POINTS >= $content['points']) {
                        // Check for his ref points
                // Only double when points are enougth!
                if ($DOUBLER_POINTS >= $content['points']) {
                        // Check for his ref points

-                       $refPoints = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', false, " AND `completed`='N' AND `is_ref`='Y'");
+                       $refPoints = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', FALSE, " AND `completed`='N' AND `is_ref`='Y'");

 
                        // Zero refid when empty (might be helpful!)
                        if (empty($refPoints)) {
 
                        // Zero refid when empty (might be helpful!)
                        if (empty($refPoints)) {


@@ -158,7 +158,7 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `id`=%s LIMIT 1",
                                array(bigintval($content['id'])), __FILE__, __LINE__);
 
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `id`=%s LIMIT 1",
                                array(bigintval($content['id'])), __FILE__, __LINE__);
 

-                       $okay = false;
+                       $okay = FALSE;

 
                        // Check for jackpot inclusion in doubling process
                        if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
 
                        // Check for jackpot inclusion in doubling process
                        if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {


@@ -168,13 +168,13 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
                        } // END - if
 
                        // Exclude also webmaster's id in taking points from webmaster's account
                        } // END - if
 
                        // Exclude also webmaster's id in taking points from webmaster's account

-                       if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
+                       if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === FALSE) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {

                                // Subtract points
                                $okay = subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
                        } // END - if
 
                        // Update doubler's account only when others are not updated
                                // Subtract points
                                $okay = subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
                        } // END - if
 
                        // Update doubler's account only when others are not updated

-                       if ($okay === false) {
+                       if ($okay === FALSE) {

                                // Add points to used doubler points
                                updateConfiguration('doubler_used', $content['points'], '+');
                        } // END - if
                                // Add points to used doubler points
                                updateConfiguration('doubler_used', $content['points'], '+');
                        } // END - if

diff --git a/inc/module-functions.php b/inc/module-functions.php
index 9c1c823b6428e5719345c9e556ce854afab029a5..c9c417467284459504b0c0a13ac40e517de469d9 100644 (file)
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -46,7 +46,7 @@ function getModuleTitle ($module) {
        if (!isset($GLOBALS[__FUNCTION__][$module])) {
                // Init variables
                $data['title'] = '';
        if (!isset($GLOBALS[__FUNCTION__][$module])) {
                // Init variables
                $data['title'] = '';

-               $result = false;
+               $result = FALSE;

 
                // Is the script installed?
                if ((isInstalled()) && ($module != 'error')) {
 
                // Is the script installed?
                if ((isInstalled()) && ($module != 'error')) {


@@ -126,7 +126,7 @@ function getModuleStatus ($module) {
 // Checks whether the given module is registered
 function isModuleRegistered ($module) {
        // By default nothing is found
 // Checks whether the given module is registered
 function isModuleRegistered ($module) {
        // By default nothing is found

-       $found  = false;
+       $found  = FALSE;

 
        // Check if cache is latest version
        if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
 
        // Check if cache is latest version
        if (isExtensionInstalledAndNewer('cache', '0.1.2')) {


@@ -137,7 +137,7 @@ function isModuleRegistered ($module) {
                        incrementStatsEntry('cache_hits');
 
                        // Is found
                        incrementStatsEntry('cache_hits');
 
                        // Is found

-                       $found = true;
+                       $found = TRUE;

                } else {
                        // No, then we have to update it!
                        setModuleStatus($module, 'cache_miss');
                } else {
                        // No, then we have to update it!
                        setModuleStatus($module, 'cache_miss');


@@ -157,7 +157,7 @@ function isModuleRegistered ($module) {
                        } // END - foreach
 
                        // Mark as found
                        } // END - foreach
 
                        // Mark as found

-                       $found = true;
+                       $found = TRUE;

                } elseif (isDebugModeEnabled()) {
                        // Debug message only in debug-mode...
                        logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module . ' not found.');
                } elseif (isDebugModeEnabled()) {
                        // Debug message only in debug-mode...
                        logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module . ' not found.');


@@ -253,7 +253,7 @@ function checkModulePermissions ($module = '') {
        $found = isModuleRegistered($module_chk);
 
        // Is the module found?
        $found = isModuleRegistered($module_chk);
 
        // Is the module found?

-       if ($found === true) {
+       if ($found === TRUE) {

                // Check returned values against current access permissions
                //
                // Admin access                                                              ----- Guest access -----                                                                                                                         --- Guest   or   member? ---
                // Check returned values against current access permissions
                //
                // Admin access                                                              ----- Guest access -----                                                                                                                         --- Guest   or   member? ---


@@ -282,7 +282,7 @@ function checkModulePermissions ($module = '') {
        } // END - if
 
        // Still no luck or not found?
        } // END - if
 
        // Still no luck or not found?

-       if (($found === false) && (!isExtensionActive('cache')) && (getModuleStatus($module_chk) != 'done'))  {
+       if (($found === FALSE) && (!isExtensionActive('cache')) && (getModuleStatus($module_chk) != 'done'))  {

                //              ----- Default module -----                                  ---- Module in base folder  ----                       --- Module with extension's name ---
                if ((isIncludeReadable(sprintf("inc/modules/%s.php", $module))) || (isIncludeReadable(sprintf("%s.php", $module))) || (isIncludeReadable(sprintf("%s/%s.php", $extension, $module)))) {
                        // Data is missing so we add it
                //              ----- Default module -----                                  ---- Module in base folder  ----                       --- Module with extension's name ---
                if ((isIncludeReadable(sprintf("inc/modules/%s.php", $module))) || (isIncludeReadable(sprintf("%s.php", $module))) || (isIncludeReadable(sprintf("%s/%s.php", $extension, $module)))) {
                        // Data is missing so we add it


@@ -326,7 +326,7 @@ VALUES
        } elseif ((getModuleStatus($module_chk) == 'cache_miss') && (isHtmlOutputMode())) {
                // Rebuild the cache files
                rebuildCache('modules', 'modules');
        } elseif ((getModuleStatus($module_chk) == 'cache_miss') && (isHtmlOutputMode())) {
                // Rebuild the cache files
                rebuildCache('modules', 'modules');

-       } elseif ($found === false) {
+       } elseif ($found === FALSE) {

                // Problem with module detected
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. getModuleStatus()=%s,locked=%d,hidden=%d,mem=%d,admin=%d,output_mode=%s",
                        $module_chk,
                // Problem with module detected
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. getModuleStatus()=%s,locked=%d,hidden=%d,mem=%d,admin=%d,output_mode=%s",
                        $module_chk,


@@ -347,9 +347,9 @@ VALUES
 }
 
 // Checks if the module has a menu
 }
 
 // Checks if the module has a menu

-function ifModuleHasMenu ($module, $forceDb = false) {
+function ifModuleHasMenu ($module, $forceDb = FALSE) {

        // All is false by default
        // All is false by default

-       $ret = false;
+       $ret = FALSE;

 
        // Extension installed and newer than or has version 0.1.2?
        if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
 
        // Extension installed and newer than or has version 0.1.2?
        if (isExtensionInstalledAndNewer('cache', '0.1.2')) {


@@ -366,7 +366,7 @@ function ifModuleHasMenu ($module, $forceDb = false) {
                        // Admin/guest/member/sponsor modules have always a menu!
                        $ret = in_array($module, array('admin', 'index', 'login', 'sponsor'));
                }
                        // Admin/guest/member/sponsor modules have always a menu!
                        $ret = in_array($module, array('admin', 'index', 'login', 'sponsor'));
                }

-       } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && ((!isExtensionActive('cache')) || ($forceDb === true))) {
+       } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && ((!isExtensionActive('cache')) || ($forceDb === TRUE))) {

                // Check database for entry
                $result = SQL_QUERY_ESC("SELECT `has_menu` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
                        array($module), __FUNCTION__, __LINE__);
                // Check database for entry
                $result = SQL_QUERY_ESC("SELECT `has_menu` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
                        array($module), __FUNCTION__, __LINE__);


@@ -418,7 +418,7 @@ function addModuleSql ($module, $title, $locked, $hidden, $adminOnly, $memOnly)
 // Load the currently set module
 function loadModule () {
        // By default all modules are invalid
 // Load the currently set module
 function loadModule () {
        // By default all modules are invalid

-       $isModuleValid = false;
+       $isModuleValid = FALSE;

 
        // Construct module name
        $GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
 
        // Construct module name
        $GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());


@@ -435,7 +435,7 @@ function loadModule () {
                        // Does the module exists on local file system?
                        if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) {
                                // Module is valid, active and located on the local disk...
                        // Does the module exists on local file system?
                        if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) {
                                // Module is valid, active and located on the local disk...

-                               $isModuleValid = true;
+                               $isModuleValid = TRUE;

                        } elseif (!ifFatalErrorsDetected()) {
                                // Set HTTP status
                                setHttpStatus('404');
                        } elseif (!ifFatalErrorsDetected()) {
                                // Set HTTP status
                                setHttpStatus('404');


@@ -492,7 +492,7 @@ function doIncludeModule () {
        loadIncludeOnce('inc/header.php');
 
        // Modules are by default not valid!
        loadIncludeOnce('inc/header.php');
 
        // Modules are by default not valid!

-       $isModuleValid = false;
+       $isModuleValid = FALSE;

 
        // By default NULL is used
        $GLOBALS['module_inc'] = NULL;
 
        // By default NULL is used
        $GLOBALS['module_inc'] = NULL;


@@ -510,7 +510,7 @@ function doIncludeModule () {
        }
 
        // Is the module valid?
        }
 
        // Is the module valid?

-       if (($isModuleValid === true) && (!is_null($GLOBALS['module_inc']))) {
+       if (($isModuleValid === TRUE) && (!is_null($GLOBALS['module_inc']))) {

                // Run pre-filter
                runFilterChain('pre_module_load');
 
                // Run pre-filter
                runFilterChain('pre_module_load');
 

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index b9578683dd45dc676848432c5aade2730492d51e..761d9181aa0a6ab11251c6a1374f0af26ac73ff6 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -64,7 +64,7 @@ if (!isAdminRegistered()) {
                $hashedPass = md5(postRequestElement('admin_pass1'));
 
                // Kill maybe existing session variables
                $hashedPass = md5(postRequestElement('admin_pass1'));
 
                // Kill maybe existing session variables

-               destroyAdminSession(false);
+               destroyAdminSession(FALSE);

 
                // Do registration
                $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster());
 
                // Do registration
                $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster());


@@ -76,7 +76,7 @@ if (!isAdminRegistered()) {
                                $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 
                                // Was it successfull?
                                $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 
                                // Was it successfull?

-                               if ($done === true) {
+                               if ($done === TRUE) {

                                        // Registering is done
                                        redirectToUrl('modules.php?module=admin&register=done');
                                } else {
                                        // Registering is done
                                        redirectToUrl('modules.php?module=admin&register=done');
                                } else {


@@ -166,17 +166,17 @@ if (!isAdminRegistered()) {
                        } // END - if
 
                        // Output error messages
                        } // END - if
 
                        // Output error messages

-                       $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
-                       $content['pass1_message'] = loadTemplate('admin_login_msg', true, $pass1Message);
-                       $content['pass2_message'] = loadTemplate('admin_login_msg', true, $pass2Message);
-                       $content['error_message'] = loadTemplate('admin_login_msg', true, $errorMessage);
+                       $content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage);
+                       $content['pass1_message'] = loadTemplate('admin_login_msg', TRUE, $pass1Message);
+                       $content['pass2_message'] = loadTemplate('admin_login_msg', TRUE, $pass2Message);
+                       $content['error_message'] = loadTemplate('admin_login_msg', TRUE, $errorMessage);

                } // END - if
 
                // Output message in seperate template
                displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
                // Load register template
                } // END - if
 
                // Output message in seperate template
                displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
                // Load register template

-               loadTemplate('admin_reg_form', false, $content);
+               loadTemplate('admin_reg_form', FALSE, $content);

        } // END - if
 } elseif (isGetRequestElementSet('reset_pass')) {
        // Is the form submitted?
        } // END - if
 } elseif (isGetRequestElementSet('reset_pass')) {
        // Is the form submitted?


@@ -185,13 +185,13 @@ if (!isAdminRegistered()) {
                displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
        } elseif (isGetRequestElementSet('hash')) {
                // Output form for hash validation
                displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
        } elseif (isGetRequestElementSet('hash')) {
                // Output form for hash validation

-               loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash'));
+               loadTemplate('admin_validate_reset_hash_form', FALSE, getRequestElement('hash'));

        } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('hash'))) {
                // Validate the login data and hash
                $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'));
 
                // Valid?
        } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('hash'))) {
                // Validate the login data and hash
                $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'));
 
                // Valid?

-               if ($valid === true) {
+               if ($valid === TRUE) {

                        // Prepare content first
                        $content = array(
                                'hash'        => postRequestElement('hash'),
                        // Prepare content first
                        $content = array(
                                'hash'        => postRequestElement('hash'),


@@ -199,7 +199,7 @@ if (!isAdminRegistered()) {
                        );
 
                        // Validation okay so display form for final password change
                        );
 
                        // Validation okay so display form for final password change

-                       loadTemplate('admin_reset_password_form', false, $content);
+                       loadTemplate('admin_reset_password_form', FALSE, $content);

                } else {
                        // Cannot validate the login data and hash
                        displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
                } else {
                        // Cannot validate the login data and hash
                        displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');


@@ -208,7 +208,7 @@ if (!isAdminRegistered()) {
                // Okay, we shall the admin password here. So first revalidate the hash
                if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) {
                        // Output result
                // Okay, we shall the admin password here. So first revalidate the hash
                if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) {
                        // Output result

-                       loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1')));
+                       loadTemplate('admin_reset_password_done', FALSE, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1')));

                } else {
                        // Validation failed
                        displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
                } else {
                        // Validation failed
                        displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');


@@ -305,10 +305,10 @@ if (!isAdminRegistered()) {
 
                        // Load message templates if the messages have been set
                        if (!empty($loginMessage)) {
 
                        // Load message templates if the messages have been set
                        if (!empty($loginMessage)) {

-                               $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
+                               $content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage);

                        } // END - if
                        if (!empty($passwdMessage)) {
                        } // END - if
                        if (!empty($passwdMessage)) {

-                               $content['pass_message']  = loadTemplate('admin_login_msg', true, $passwdMessage);
+                               $content['pass_message']  = loadTemplate('admin_login_msg', TRUE, $passwdMessage);

                        } // END - if
                } // END - if
 
                        } // END - if
                } // END - if
 


@@ -316,7 +316,7 @@ if (!isAdminRegistered()) {
                $content['all_parameter'] = addAllGetRequestParameters();
 
                // Load login form template
                $content['all_parameter'] = addAllGetRequestParameters();
 
                // Load login form template

-               loadTemplate('admin_login_form', false, $content);
+               loadTemplate('admin_login_form', FALSE, $content);

        } // END - if
 } elseif (isGetRequestElementSet('logout')) {
        // Only try to remove cookies
        } // END - if
 } elseif (isGetRequestElementSet('logout')) {
        // Only try to remove cookies


@@ -340,7 +340,7 @@ if (!isAdminRegistered()) {
                }
        } else {
                // Something went wrong here...
                }
        } else {
                // Something went wrong here...

-               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_LOGOUT_FAILED--}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_LOGOUT_FAILED--}');

 
                // Add fatal message
                addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
 
                // Add fatal message
                addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 10afaf399b09ca8333cbc5c74e11be439638d219..7e4e709c95d1b5a613bc474537a19e499fb8d194 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -158,18 +158,18 @@ function doAdminAction () {
        // Load welcome template
        if (isExtensionActive('admins')) {
                // @TODO This and the next getCurrentAdminId() call might be moved into the templates?
        // Load welcome template
        if (isExtensionActive('admins')) {
                // @TODO This and the next getCurrentAdminId() call might be moved into the templates?

-               $content['welcome'] = loadTemplate('admin_welcome_admins', true, getCurrentAdminId());
+               $content['welcome'] = loadTemplate('admin_welcome_admins', TRUE, getCurrentAdminId());

        } else {
        } else {

-               $content['welcome'] = loadTemplate('admin_welcome', true, getCurrentAdminId());
+               $content['welcome'] = loadTemplate('admin_welcome', TRUE, getCurrentAdminId());

        }
 
        // Load header, footer, render menu
        }
 
        // Load header, footer, render menu

-       $content['header'] = loadTemplate('admin_header' , true, $content);
-       $content['footer'] = loadTemplate('admin_footer' , true, $content);
+       $content['header'] = loadTemplate('admin_header' , TRUE, $content);
+       $content['footer'] = loadTemplate('admin_footer' , TRUE, $content);

        $content['menu']   = addAdminMenu($action, $what);
 
        // Load main template
        $content['menu']   = addAdminMenu($action, $what);
 
        // Load main template

-       loadTemplate('admin_main', false, $content);
+       loadTemplate('admin_main', FALSE, $content);

 
        // Check if action/what pair is valid
        $result_action = SQL_QUERY_ESC("SELECT
 
        // Check if action/what pair is valid
        $result_action = SQL_QUERY_ESC("SELECT


@@ -200,26 +200,26 @@ LIMIT 1",
        if (SQL_NUMROWS($result_action) == 1) {
                // Is valid but does the inlcude file exists?
                $inc = sprintf("inc/modules/admin/action-%s.php", $action);
        if (SQL_NUMROWS($result_action) == 1) {
                // Is valid but does the inlcude file exists?
                $inc = sprintf("inc/modules/admin/action-%s.php", $action);

-               if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) {
+               if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === TRUE)) {

                        // Ok, we finally load the admin action module
                        loadInclude($inc);
                        // Ok, we finally load the admin action module
                        loadInclude($inc);

-               } elseif ($GLOBALS['acl_allow'] === false) {
+               } elseif ($GLOBALS['acl_allow'] === FALSE) {

                        // Access denied
                        // Access denied

-                       loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
+                       loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');

                } else {
                        // Include file not found :-(
                } else {
                        // Include file not found :-(

-                       loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
+                       loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_404=' . $action . '%}');

                }
        } else {
                // Invalid action/what pair found
                }
        } else {
                // Invalid action/what pair found

-               loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
+               loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');

        }
 
        // Free memory
        SQL_FREERESULT($result_action);
 
        // Tableset footer
        }
 
        // Free memory
        SQL_FREERESULT($result_action);
 
        // Tableset footer

-       loadTemplate('admin_main_footer', false, $content);
+       loadTemplate('admin_main_footer', FALSE, $content);

 }
 
 /**
 }
 
 /**


@@ -241,7 +241,7 @@ function isAdminAllowedAccessMenu ($action, $what = NULL) {
 // Adds an admin menu
 function addAdminMenu ($action, $what) {
        // Init variables
 // Adds an admin menu
 function addAdminMenu ($action, $what) {
        // Init variables

-       $SUB = false;
+       $SUB = FALSE;

        $OUT = '';
 
        // Menu descriptions
        $OUT = '';
 
        // Menu descriptions


@@ -272,7 +272,7 @@ ORDER BY
 
                        // Is the current admin allowed to access this 'action' menu?
                        if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
 
                        // Is the current admin allowed to access this 'action' menu?
                        if (isAdminAllowedAccessMenu($mainContent['main_action'])) {

-                               if ($SUB === false) {
+                               if ($SUB === FALSE) {

                                        // Insert compiled menu title and description
                                        $GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
                                        $GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
                                        // Insert compiled menu title and description
                                        $GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
                                        $GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];


@@ -353,7 +353,7 @@ ORDER BY
        // Are there entries?
        if (ifAdminMenuHasEntries($mainContent['main_action'])) {
                // Sub menu has been called
        // Are there entries?
        if (ifAdminMenuHasEntries($mainContent['main_action'])) {
                // Sub menu has been called

-               $SUB = true;
+               $SUB = TRUE;

 
                // Are there entries?
                if (!SQL_HASZERONUMS($result_what)) {
 
                // Are there entries?
                if (!SQL_HASZERONUMS($result_what)) {


@@ -443,7 +443,7 @@ ORDER BY
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
                // Add the entry
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
                // Add the entry

-               $OUT .= loadTemplate('select_admins_option', true, $content);
+               $OUT .= loadTemplate('select_admins_option', TRUE, $content);

        } // END - if
 
        // Free memory
        } // END - if
 
        // Free memory


@@ -453,11 +453,11 @@ ORDER BY
        $content['form_selection'] = $OUT;
 
        // Output form
        $content['form_selection'] = $OUT;
 
        // Output form

-       loadTemplate('select_admins_box', false, $content);
+       loadTemplate('select_admins_box', FALSE, $content);

 }
 
 // Create a member selection box
 }
 
 // Create a member selection box

-function addMemberSelectionBox ($userid = NULL, $add_all = false, $return = false, $none = false, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
+function addMemberSelectionBox ($userid = NULL, $add_all = FALSE, $return = FALSE, $none = FALSE, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {

        // Output selection form with all confirmed user accounts listed
        $result = SQL_QUERY('SELECT
        `userid`,
        // Output selection form with all confirmed user accounts listed
        $result = SQL_QUERY('SELECT
        `userid`,


@@ -473,9 +473,9 @@ ORDER BY
        $OUT = '';
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )
        $OUT = '';
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )

-       if ($add_all === true) {
+       if ($add_all === TRUE) {

                $OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
                $OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';

-       } elseif ($none === true) {
+       } elseif ($none === TRUE) {

                $OUT = '      <option value="0">{--SELECT_NONE--}</option>';
        }
 
                $OUT = '      <option value="0">{--SELECT_NONE--}</option>';
        }
 


@@ -492,13 +492,13 @@ ORDER BY
        // Free memory
        SQL_FREERESULT($result);
 
        // Free memory
        SQL_FREERESULT($result);
 

-       if ($return === false) {
+       if ($return === FALSE) {

                // Remeber options in constant
                $content['form_selection'] = $OUT;
                $content['what']           = '{%pipe,getWhat%}';
 
                // Load template
                // Remeber options in constant
                $content['form_selection'] = $OUT;
                $content['what']           = '{%pipe,getWhat%}';
 
                // Load template

-               loadTemplate('admin_form_selection_box', false, $content);
+               loadTemplate('admin_form_selection_box', FALSE, $content);

        } else {
                // Return content in selection frame
                return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
        } else {
                // Return content in selection frame
                return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';


@@ -544,7 +544,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 }
 
 // Wrapper for $_POST and adminSaveSettings
 }
 
 // Wrapper for $_POST and adminSaveSettings

-function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {

        // Get the array
        $postData = postRequestArray();
 
        // Get the array
        $postData = postRequestArray();
 


@@ -553,10 +553,10 @@ function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement
 }
 
 // Save settings to the database
 }
 
 // Save settings to the database

-function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {

        // Prepare all arrays, variables
        $tableData = array();
        // Prepare all arrays, variables
        $tableData = array();

-       $skip = false;
+       $skip = FALSE;

 
        // Now, walk through all entries and prepare them for saving
        foreach ($postData as $id => $val) {
 
        // Now, walk through all entries and prepare them for saving
        foreach ($postData as $id => $val) {


@@ -570,7 +570,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
                convertSelectionsToEpocheTime($postData, $tableData, $id, $skip);
 
                // Shall we process this id? It muss not be empty, of course
                convertSelectionsToEpocheTime($postData, $tableData, $id, $skip);
 
                // Shall we process this id? It muss not be empty, of course

-               if (($skip === false) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
+               if (($skip === FALSE) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {

                        // Translate the value? (comma to dot!)
                        if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
                                // Then do it here... :)
                        // Translate the value? (comma to dot!)
                        if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
                                // Then do it here... :)


@@ -591,7 +591,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
                        }
 
                        // Do not add a config entry twice
                        }
 
                        // Do not add a config entry twice

-                       $GLOBALS['skip_config'][$id] = true;
+                       $GLOBALS['skip_config'][$id] = TRUE;

 
                        // Update current configuration
                        setConfigEntry($id, $val);
 
                        // Update current configuration
                        setConfigEntry($id, $val);


@@ -599,8 +599,8 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
        } // END - foreach
 
        // Check if entry does exist
        } // END - foreach
 
        // Check if entry does exist

-       $result = false;
-       if ($alwaysAdd === false) {
+       $result = FALSE;
+       if ($alwaysAdd === FALSE) {

                if (!empty($whereStatement)) {
                        $result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
                } else {
                if (!empty($whereStatement)) {
                        $result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
                } else {


@@ -653,7 +653,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
        rebuildCache('config', 'config');
 
        // Settings saved, so display message?
        rebuildCache('config', 'config');
 
        // Settings saved, so display message?

-       if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
+       if ($displayMessage === TRUE) displayMessage('{--SETTINGS_SAVED--}');

 
        // Return affected rows
        return $affected;
 
        // Return affected rows
        return $affected;


@@ -662,7 +662,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 // Generate a selection box
 function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
        // Open the requested menu directory
 // Generate a selection box
 function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
        // Open the requested menu directory

-       $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', false, false);
+       $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', FALSE, FALSE);

 
        // Init the selection box
        $OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
 
        // Init the selection box
        $OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';


@@ -946,7 +946,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 }
 
 // Delete rows by given id numbers
 }
 
 // Delete rows by given id numbers

-function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {

        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified


@@ -963,7 +963,7 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
        } // END - if
 
        // Shall we delete here or list for deletion?
        } // END - if
 
        // Shall we delete here or list for deletion?

-       if ($deleteNow[0] === true) {
+       if ($deleteNow[0] === TRUE) {

                // Call generic function
                $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
                // Call generic function
                $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 


@@ -982,7 +982,7 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
 }
 
 // Edit rows by given id numbers
 }
 
 // Edit rows by given id numbers

-function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {

        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified


@@ -999,7 +999,7 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
        } // END - if
 
        // Shall we change here or list for editing?
        } // END - if
 
        // Shall we change here or list for editing?

-       if ($editNow[0] === true) {
+       if ($editNow[0] === TRUE) {

                // Call generic change method
                $affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
                // Call generic change method
                $affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 


@@ -1018,7 +1018,7 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 }
 
 // Un-/lock rows by given id numbers
 }
 
 // Un-/lock rows by given id numbers

-function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {

        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified


@@ -1032,7 +1032,7 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
        } // END - if
 
        // Shall we un-/lock here or list for locking?
        } // END - if
 
        // Shall we un-/lock here or list for locking?

-       if ($lockNow[0] === true) {
+       if ($lockNow[0] === TRUE) {

                // Un-/lock entries
                adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
        } else {
                // Un-/lock entries
                adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
        } else {


@@ -1042,7 +1042,7 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 }
 
 // Undelete rows by given id numbers
 }
 
 // Undelete rows by given id numbers

-function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {

        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified


@@ -1056,7 +1056,7 @@ function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFun
        } // END - if
 
        // Shall we un-/lock here or list for locking?
        } // END - if
 
        // Shall we un-/lock here or list for locking?

-       if ($undeleteNow[0] === true) {
+       if ($undeleteNow[0] === TRUE) {

                // Undelete entries
                adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
        } else {
                // Undelete entries
                adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
        } else {


@@ -1071,7 +1071,7 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr
        doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
        // Entry has been added?
        doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
        // Entry has been added?

-       if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
+       if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === TRUE)) {

                // Display success message
                displayMessage('{--ADMIN_ENTRY_ADDED--}');
        } else {
                // Display success message
                displayMessage('{--ADMIN_ENTRY_ADDED--}');
        } else {


@@ -1136,7 +1136,7 @@ function sendAdminPasswordResetLink ($email) {
 // Validate hash and login for password reset
 function adminResetValidateHashLogin ($hash, $login) {
        // By default nothing validates... ;)
 // Validate hash and login for password reset
 function adminResetValidateHashLogin ($hash, $login) {
        // By default nothing validates... ;)

-       $valid = false;
+       $valid = FALSE;

 
        // Then try to find that user
        $result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
 
        // Then try to find that user
        $result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",


@@ -1173,7 +1173,7 @@ function doResetAdminPassword ($login, $password) {
        );
 
        // Update database
        );
 
        // Update database

-       $message = adminsChangeAdminAccount($postData, '', false);
+       $message = adminsChangeAdminAccount($postData, '', FALSE);

 
        // Run filters
        runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash, 'message' => $message));
 
        // Run filters
        runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash, 'message' => $message));


@@ -1226,7 +1226,7 @@ function ifAdminMenuHasEntries ($action) {
                        isset($GLOBALS['admin_menu_has_entries'][$action])
                ) && (
                        // And do we have a menu for this action?
                        isset($GLOBALS['admin_menu_has_entries'][$action])
                ) && (
                        // And do we have a menu for this action?

-                       $GLOBALS['admin_menu_has_entries'][$action] === true
+                       $GLOBALS['admin_menu_has_entries'][$action] === TRUE

                )) || (
                        // Login has always a menu
                        $action == 'login'
                )) || (
                        // Login has always a menu
                        $action == 'login'


@@ -1377,7 +1377,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
        } // END - if
 
        $TOP = '';
        } // END - if
 
        $TOP = '';

-       if ($show_form === false) {
+       if ($show_form === FALSE) {

                $TOP = ' top';
        } // END - if
 
                $TOP = ' top';
        } // END - if
 


@@ -1419,9 +1419,9 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
        $content['top']  = $TOP;
 
        // Load navigation template
        $content['top']  = $TOP;
 
        // Load navigation template

-       $OUT = loadTemplate('admin_email_nav_row', true, $content);
+       $OUT = loadTemplate('admin_email_nav_row', TRUE, $content);

 
 

-       if ($return === true) {
+       if ($return === TRUE) {

                // Return generated HTML-Code
                return $OUT;
        } else {
                // Return generated HTML-Code
                return $OUT;
        } else {

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 1f5127967b5f13c88764d189f450ebdd1af67d61..19cb263f5b3c25970ecc3a3c33dd757971ec67f7 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -48,10 +48,10 @@ function outputStandardOverview (&$result_tasks) {
 
        // We currently don't want to install an extension so let's find out if we need...
        setExtensionMode('test');
 
        // We currently don't want to install an extension so let's find out if we need...
        setExtensionMode('test');

-       $jobsDone = true;
+       $jobsDone = TRUE;

 
        // Open the extension directory
 
        // Open the extension directory

-       $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', false, false);
+       $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', FALSE, FALSE);

        foreach ($extensionList as $file) {
                // Only file name is required... :(
                $file = basename($file);
        foreach ($extensionList as $file) {
                // Only file name is required... :(
                $file = basename($file);


@@ -62,16 +62,16 @@ function outputStandardOverview (&$result_tasks) {
                        $ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
 
                        // Init variables
                        $ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
 
                        // Init variables

-                       $result = false;
+                       $result = FALSE;

 
                        // Check if extension is installed or not
                        $extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name)));
 
                        // Is the extension not yet installed?
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',extInstalled=' . intval($extInstalled));
 
                        // Check if extension is installed or not
                        $extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name)));
 
                        // Is the extension not yet installed?
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',extInstalled=' . intval($extInstalled));

-                       if ($extInstalled === false) {
+                       if ($extInstalled === FALSE) {

                                // We maybe want to install an extension so let's test-drive it...
                                // We maybe want to install an extension so let's test-drive it...

-                               if (loadExtension($ext_name, 'test', '0.0.0', true)) {
+                               if (loadExtension($ext_name, 'test', '0.0.0', TRUE)) {

                                        // Create a task for newly installed extension (we ignore the task id here)
                                        createNewExtensionTask($ext_name);
                                } // END - if
                                        // Create a task for newly installed extension (we ignore the task id here)
                                        createNewExtensionTask($ext_name);
                                } // END - if


@@ -123,7 +123,7 @@ ORDER BY
 
        if (!SQL_HASZERONUMS($result_tasks)) {
                // New jobs found
 
        if (!SQL_HASZERONUMS($result_tasks)) {
                // New jobs found

-               $jobsDone = false;
+               $jobsDone = FALSE;

        } // END - if
 
        // Free the result
        } // END - if
 
        // Free the result


@@ -200,7 +200,7 @@ LIMIT 1",
                                $taskData['text'] = decodeEntities($taskData['text']);
 
                                // Compile and insert text from task into table template
                                $taskData['text'] = decodeEntities($taskData['text']);
 
                                // Compile and insert text from task into table template

-                               $taskData['text'] = loadTemplate('admin_extensions_text', true, $taskData['text']);
+                               $taskData['text'] = loadTemplate('admin_extensions_text', TRUE, $taskData['text']);

 
                                // Initialize variables (no title for SQL commands by default)
                                $ext_name = ''; $ext_ver = '';
 
                                // Initialize variables (no title for SQL commands by default)
                                $ext_name = ''; $ext_ver = '';


@@ -214,12 +214,12 @@ LIMIT 1",
                                        // Update task or extension task?
                                        if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
                                                // Load SQL commands for registering in dry-run
                                        // Update task or extension task?
                                        if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
                                                // Load SQL commands for registering in dry-run

-                                               registerExtension($ext_name, $taskId, true);
+                                               registerExtension($ext_name, $taskId, TRUE);

 
                                                // Is this non-productive?
 
                                                // Is this non-productive?

-                                               if (isExtensionProductive() === false) {
+                                               if (isExtensionProductive() === FALSE) {

                                                        // Issue warning
                                                        // Issue warning

-                                                       $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', true) . $taskData['text'];
+                                                       $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', TRUE) . $taskData['text'];

                                                } // END - if
 
                                                // Set current extension name
                                                } // END - if
 
                                                // Set current extension name


@@ -239,7 +239,7 @@ LIMIT 1",
                                                $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
 
                                                // Load SQLs from file
                                                $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
 
                                                // Load SQLs from file

-                                               updateExtension($ext_name, $ext_ver, true);
+                                               updateExtension($ext_name, $ext_ver, TRUE);

 
                                                // Set current extension name
                                                setCurrentExtensionName($ext_name);
 
                                                // Set current extension name
                                                setCurrentExtensionName($ext_name);


@@ -261,7 +261,7 @@ LIMIT 1",
                                        } // END - if
                                } elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
                                        // Run SQL commands in dry mode but only return the notes
                                        } // END - if
                                } elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
                                        // Run SQL commands in dry mode but only return the notes

-                                       updateExtension($ext_name, $ext_ver, true);
+                                       updateExtension($ext_name, $ext_ver, TRUE);

 
                                        // Set current extension name
                                        setCurrentExtensionName($ext_name);
 
                                        // Set current extension name
                                        setCurrentExtensionName($ext_name);


@@ -283,7 +283,7 @@ LIMIT 1",
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_overview_row', true, $content);
+                               $OUT .= loadTemplate('admin_overview_row', TRUE, $content);

 
                                // Which task do we actually have here?
                                // @TODO Rewrite this to something with include files and/or filter
 
                                // Which task do we actually have here?
                                // @TODO Rewrite this to something with include files and/or filter


@@ -292,7 +292,7 @@ LIMIT 1",
                                                $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
                                                if (!isExtensionInstalled($ext_name)) {
                                                        // New (not yet installed) extension found
                                                $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
                                                if (!isExtensionInstalled($ext_name)) {
                                                        // New (not yet installed) extension found

-                                                       $OUT .= loadTemplate('admin_extension_reg_form', true, array(
+                                                       $OUT .= loadTemplate('admin_extension_reg_form', TRUE, array(

                                                                'id'       => bigintval($taskId),
                                                                'ext_name' => $ext_name
                                                        ));
                                                                'id'       => bigintval($taskId),
                                                                'ext_name' => $ext_name
                                                        ));


@@ -345,7 +345,7 @@ LIMIT 1",
                                                                );
 
                                                                // Load template
                                                                );
 
                                                                // Load template

-                                                               $OUT .= loadTemplate('admin_payout_overview_form', true, $content);
+                                                               $OUT .= loadTemplate('admin_payout_overview_form', TRUE, $content);

                                                        } else {
                                                                // Problem obtaining payout id
                                                                $OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}</div>';
                                                        } else {
                                                                // Problem obtaining payout id
                                                                $OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}</div>';


@@ -370,7 +370,7 @@ LIMIT 1",
                                                                        'pid' => $pid,
                                                                        'tid' => $taskData['id'],
                                                                );
                                                                        'pid' => $pid,
                                                                        'tid' => $taskData['id'],
                                                                );

-                                                               $OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
+                                                               $OUT .= loadTemplate('admin_wernis_overview_form', TRUE, $content);

                                                        } else {
                                                                // Problem obtaining wernis id
                                                                $OUT .= '<div class="notice medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';
                                                        } else {
                                                                // Problem obtaining wernis id
                                                                $OUT .= '<div class="notice medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';


@@ -382,11 +382,11 @@ LIMIT 1",
                                                break;
 
                                        case 'HOLIDAY_REQUEST': // Holiday requests
                                                break;
 
                                        case 'HOLIDAY_REQUEST': // Holiday requests

-                                               $OUT .= loadTemplate('admin_task_holiday', true, $taskData['userid']);
+                                               $OUT .= loadTemplate('admin_task_holiday', TRUE, $taskData['userid']);

                                                break;
 
                                        case 'MEMBER_ORDER': // Member mail orders
                                                break;
 
                                        case 'MEMBER_ORDER': // Member mail orders

-                                               $OUT .= loadTemplate('admin_task_order', true, $taskId);
+                                               $OUT .= loadTemplate('admin_task_order', TRUE, $taskId);

                                                break;
 
                                        default: // Unknown task type
                                                break;
 
                                        default: // Unknown task type


@@ -404,7 +404,7 @@ LIMIT 1",
                } // END - foreach
 
                // Load final template
                } // END - foreach
 
                // Load final template

-               loadTemplate('admin_overview_list', false, $OUT);
+               loadTemplate('admin_overview_list', FALSE, $OUT);

        } else {
                if ((isset($postData['sel'])) && ((count($postData['sel']) > 0) || ($postData['sel'][0] == 1))) {
                        // Only unassign / delete tasks when there are selected tasks posted
        } else {
                if ((isset($postData['sel'])) && ((count($postData['sel']) > 0) || ($postData['sel'][0] == 1))) {
                        // Only unassign / delete tasks when there are selected tasks posted


@@ -422,7 +422,7 @@ LIMIT 1",
                                } // END - foreach
                        } else {
                                // Unknown action
                                } // END - foreach
                        } else {
                                // Unknown action

-                               reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
+                               reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, TRUE)));

                        }
 
                        // Update query
                        }
 
                        // Update query


@@ -458,10 +458,10 @@ LIMIT 1",
                        // Is there extension task?
                        if (isExtensionTask($content)) {
                                // Load extension row template
                        // Is there extension task?
                        if (isExtensionTask($content)) {
                                // Load extension row template

-                               $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
+                               $OUT .= loadTemplate('admin_overview_list_ext_rows', TRUE, $content);

                        } else {
                                // Load default row template
                        } else {
                                // Load default row template

-                               $OUT .= loadTemplate('admin_overview_list_rows', true, $content);
+                               $OUT .= loadTemplate('admin_overview_list_rows', TRUE, $content);

                        }
                } // END - while
 
                        }
                } // END - while
 


@@ -469,7 +469,7 @@ LIMIT 1",
                SQL_FREERESULT($result_tasks);
 
                // Load footer template
                SQL_FREERESULT($result_tasks);
 
                // Load footer template

-               loadTemplate('admin_overview_table', false, $OUT);
+               loadTemplate('admin_overview_table', FALSE, $OUT);

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-add_bank_package.php b/inc/modules/admin/what-add_bank_package.php
index 2dc02ed1d5ae58c9ddbf754888bb7dec723e07d7..90e6397f7459f0612f3d278376842aa41f09544b 100644 (file)
--- a/inc/modules/admin/what-add_bank_package.php
+++ b/inc/modules/admin/what-add_bank_package.php
@@ -46,7 +46,7 @@ addYouAreHereLink('admin', __FILE__);
 // Is the formular sent?
 if (isFormSent()) {
        // Save the row to the database
 // Is the formular sent?
 if (isFormSent()) {
        // Save the row to the database

-       adminSaveSettingsFromPostData('_bank_packages', '', array('account_fee', 'interest_plus', 'interest_minus', 'first_payment'), true);
+       adminSaveSettingsFromPostData('_bank_packages', '', array('account_fee', 'interest_plus', 'interest_minus', 'first_payment'), TRUE);

 } else {
        // Display form
        loadTemplate('admin_add_bank_package');
 } else {
        // Display form
        loadTemplate('admin_add_bank_package');

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 8b36b7955569cfa2d1e17e0c42a004916442e188..4450ce9935292465ea4a1a86e3789474d6fadff0 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -119,15 +119,15 @@ if (getRequestElement('userid') == 'all') {
                        $content['userid'] = bigintval(getRequestElement('userid'));
 
                        // Output template
                        $content['userid'] = bigintval(getRequestElement('userid'));
 
                        // Output template

-                       loadTemplate('admin_add_points', false, $content);
+                       loadTemplate('admin_add_points', FALSE, $content);

                }
        } else {
                // User not found
                }
        } else {
                // User not found

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');

        }
 } else {
        // Output selection form with all confirmed user accounts listed
        }
 } else {
        // Output selection form with all confirmed user accounts listed

-       addMemberSelectionBox(0, true);
+       addMemberSelectionBox(0, TRUE);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 3f3406b69011126b643a84b8d10360f114e5a095..c55700b9e53b038b525a87c36b3c636d2cd03321 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -133,7 +133,7 @@ $content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end_ti
 $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end_time');
 
 // Load template
 $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end_time');
 
 // Load template

-loadTemplate('admin_add_rallye', false, $content);
+loadTemplate('admin_add_rallye', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-add_surfbar_url.php b/inc/modules/admin/what-add_surfbar_url.php
index eefa72e692cd0d5748d288442ec24c449c691c48..969aed280f23bf80168d434d9eb68a0ad3c7630e 100644 (file)
--- a/inc/modules/admin/what-add_surfbar_url.php
+++ b/inc/modules/admin/what-add_surfbar_url.php
@@ -64,7 +64,7 @@ $content = array(
 );
 
 // Load template
 );
 
 // Load template

-loadTemplate('admin_add_surfbar_url', false, $content);
+loadTemplate('admin_add_surfbar_url', FALSE, $content);

 
 //
 ?>
 
 //
 ?>

diff --git a/inc/modules/admin/what-add_tester_user.php b/inc/modules/admin/what-add_tester_user.php
index 17577227f342387ec5d1a58a0849c9ee124d78ea..ffa37f7d957b9227a46b19008d8d93c09f5423a6 100644 (file)
--- a/inc/modules/admin/what-add_tester_user.php
+++ b/inc/modules/admin/what-add_tester_user.php
@@ -62,7 +62,7 @@ if (!isNewUserTesterAllowed()) {
 } // END - if
 
 // Display form
 } // END - if
 
 // Display form

-loadTemplate('admin_add_tester_user', false, $content);
+loadTemplate('admin_add_tester_user', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 0fb82ebbd68cc9bd258f2c880b1aba5e5ac55b79..e3124ced44d38fe509c4c2ab9ae3f31fe70bd7cc 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -160,7 +160,7 @@ if (!isFormSent()) {
        $content['action_selection'] = adminAddMenuSelectionBox('admin', 'action', 'menu');
 
        // Display form
        $content['action_selection'] = adminAddMenuSelectionBox('admin', 'action', 'menu');
 
        // Display form

-       loadTemplate('admin_add_admin_menu', false, $content);
+       loadTemplate('admin_add_admin_menu', FALSE, $content);

 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestElementSet('menu')) {
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestElementSet('menu')) {

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index dd450855a5657dc8bcf1bf916cdf1b9017d40581..c446faeccf6bf9ba15a6ef516d05554c006fa552 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -77,7 +77,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load row template
                                );
 
                                // Load row template

-                               $OUT .= loadTemplate('admin_edit_admin_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_edit_admin_menu_row', TRUE, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                        } else {
                                // Entry not found?
                                $content = array(


@@ -85,7 +85,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load row template
                                );
 
                                // Load row template

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
 
                        // Free result and switch color
                        }
 
                        // Free result and switch color


@@ -99,7 +99,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_edit_admin_menu_form', false, $content);
+       loadTemplate('admin_edit_admin_menu_form', FALSE, $content);

 } elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Prepare misc content
        $content['sub'] = $subMenu;
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Prepare misc content
        $content['sub'] = $subMenu;


@@ -122,13 +122,13 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                        'count' => $count,
                                        'sel'   => $sel,
                                );
                                        'count' => $count,
                                        'sel'   => $sel,
                                );

-                               $OUT .= loadTemplate('admin_delete_admin_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_delete_admin_menu_row', TRUE, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                                        'sel' => $sel
                                );
                        } else {
                                // Entry not found?
                                $content = array(
                                        'sel' => $sel
                                );

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
                        SQL_FREERESULT($result);
                } // END - if
                        }
                        SQL_FREERESULT($result);
                } // END - if


@@ -140,7 +140,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_delete_admin_menu', false, $content);
+       loadTemplate('admin_delete_admin_menu', FALSE, $content);

 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An action is done...
        switch (postRequestElement('ok')) {
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An action is done...
        switch (postRequestElement('ok')) {


@@ -227,7 +227,7 @@ LIMIT 1",
                        $content['do'] = 'admin';
 
                        // Load row template and switch colors
                        $content['do'] = 'admin';
 
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
+                       $OUT .= loadTemplate('admin_menu_overview_row', TRUE, $content);

                } // END - switch
 
                // Remember all rows
                } // END - switch
 
                // Remember all rows


@@ -238,7 +238,7 @@ LIMIT 1",
                SQL_FREERESULT($result);
 
                // Load template
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('admin_edit_admin_menu', false, $content);
+               loadTemplate('admin_edit_admin_menu', FALSE, $content);

        } else {
                // Menu entries are missing... (???)
                displayMessage('{--ADMIN_NO_MENUS_FOUND--}');
        } else {
                // Menu entries are missing... (???)
                displayMessage('{--ADMIN_NO_MENUS_FOUND--}');

diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php
index d6916e00dc9db404abac4e47ce73f8e1c350730d..eb146645f2a4c0bf54f91ab49c0a089ab32d75ae 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Display form is default
 addYouAreHereLink('admin', __FILE__);
 
 // Display form is default

-$FORM = true;
+$FORM = TRUE;

 
 // Is the form sent?
 if (isFormSent('add')) {
 
 // Is the form sent?
 if (isFormSent('add')) {


@@ -53,7 +53,7 @@ if (isFormSent('add')) {
                // Add admin when not added already
                if (addAdminAccount(postRequestElement('login'), generateHash(postRequestElement('pass1')), postRequestElement('email')) == 'done') {
                        // Do not ouput any form!
                // Add admin when not added already
                if (addAdminAccount(postRequestElement('login'), generateHash(postRequestElement('pass1')), postRequestElement('email')) == 'done') {
                        // Do not ouput any form!

-                       $FORM = false;
+                       $FORM = FALSE;

 
                        // Admin login saved
                        displayMessage('{--ADMIN_ADMINS_ADD_DONE--}');
 
                        // Admin login saved
                        displayMessage('{--ADMIN_ADMINS_ADD_DONE--}');


@@ -65,7 +65,7 @@ if (isFormSent('add')) {
 } // END - if
 
 // Shall we display the form?
 } // END - if
 
 // Shall we display the form?

-if ($FORM === true) {
+if ($FORM === TRUE) {

        // Prepare content
        $content = merge_array(
                array('login' => '', 'email' => ''),
        // Prepare content
        $content = merge_array(
                array('login' => '', 'email' => ''),


@@ -73,7 +73,7 @@ if ($FORM === true) {
        );
 
        // Load form from template
        );
 
        // Load form from template

-       loadTemplate('admin_add_admins', false, $content);
+       loadTemplate('admin_add_admins', FALSE, $content);

 } // END - if
 
 // [EOF]
 } // END - if
 
 // [EOF]

diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php
index 36f8b9a8e7e000bdbbdefe9662108839e17a68b5..295e303b0872e25454a823a1baed50ccd84fc938 100644 (file)
--- a/inc/modules/admin/what-admins_contct.php
+++ b/inc/modules/admin/what-admins_contct.php
@@ -59,7 +59,7 @@ if ((isFormSent()) && (isGetRequestElementSet('id'))) {
        $content['id'] = getRequestElement('id');
 
        // Load main form
        $content['id'] = getRequestElement('id');
 
        // Load main form

-       loadTemplate('admin_admins_contct_form', false, $content);
+       loadTemplate('admin_admins_contct_form', FALSE, $content);

 } else {
        // Please select an admin!
        addAdminSelectionBox();
 } else {
        // Please select an admin!
        addAdminSelectionBox();

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 6283451b58db88d37f306622b0fb373c516a2dd3..4644c76cf81b7ad33bd6ad7289e27695eb6a4ce5 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -89,18 +89,18 @@ if (isFormSent('edit')) {
 
                        if (isValidUserId($adminId2)) {
                                // Add form for an additional admin
 
                        if (isValidUserId($adminId2)) {
                                // Add form for an additional admin

-                               $OUT .= loadTemplate('admin_admins_mails_edit_form', true, $content);
+                               $OUT .= loadTemplate('admin_admins_mails_edit_form', TRUE, $content);

                        } // END - if
 
                        // Save full rendered content
                        $content['content'] = $OUT;
 
                        // Start outputing line
                        } // END - if
 
                        // Save full rendered content
                        $content['content'] = $OUT;
 
                        // Start outputing line

-                       $rows .= loadTemplate('admin_admins_mails_edit_row', true, $content);
+                       $rows .= loadTemplate('admin_admins_mails_edit_row', TRUE, $content);

                } // END - foreach
 
                // Edit checked entries
                } // END - foreach
 
                // Edit checked entries

-               loadTemplate('admin_admins_mails_edit', false, $rows);
+               loadTemplate('admin_admins_mails_edit', FALSE, $rows);

        } else {
                // Nothing selected
                displayMessage('{--ADMINS_NO_MAIL_CHECKED--}');
        } else {
                // Nothing selected
                displayMessage('{--ADMINS_NO_MAIL_CHECKED--}');


@@ -135,18 +135,18 @@ ORDER BY
 
                                // Update entry
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_mails` SET `admin_id`=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",
 
                                // Update entry
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_mails` SET `admin_id`=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",

-                                       array($content['admin_id'], $id), __FILE__, __LINE__, false));
+                                       array($content['admin_id'], $id), __FILE__, __LINE__, FALSE));

 
                                if ((!isValidUserId($content['admin_id'])) && (isPostRequestElementSet('template', $id))) {
                                        // Remove any other admin entries
                                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
 
                                if ((!isValidUserId($content['admin_id'])) && (isPostRequestElementSet('template', $id))) {
                                        // Remove any other admin entries
                                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE mail_template='%s' AND id != '%s'",

-                                       array(postRequestElement('template', $id), $id), __FILE__, __LINE__, false));
+                                       array(postRequestElement('template', $id), $id), __FILE__, __LINE__, FALSE));

                                } // END - if
 
                                if (postRequestElement('admin_new', postRequestElement('template', $id)) > 0) {
                                        // Add new admin
                                        addSql(SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
                                } // END - if
 
                                if (postRequestElement('admin_new', postRequestElement('template', $id)) > 0) {
                                        // Add new admin
                                        addSql(SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",

-                                       array($content['admin_id'], postRequestElement('template', $id)), __FILE__, __LINE__, false));
+                                       array($content['admin_id'], postRequestElement('template', $id)), __FILE__, __LINE__, FALSE));

                                } // END - if
                        } // END - foreach
 
                                } // END - if
                        } // END - foreach
 


@@ -173,14 +173,14 @@ ORDER BY
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template

-                       $OUT .= loadTemplate('admin_admins_mails_list_row', true, $content);
+                       $OUT .= loadTemplate('admin_admins_mails_list_row', TRUE, $content);

                } // END - while
 
                // Free result
                SQL_FREERESULT($result);
 
                // Load template
                } // END - while
 
                // Free result
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('admin_admins_mails_list', false, $OUT);
+               loadTemplate('admin_admins_mails_list', FALSE, $OUT);

        } else {
                // No entries found
                displayMessage('{--ADMIN_ADMINS_MAILS_NO_ENTRIES--}');
        } else {
                // No entries found
                displayMessage('{--ADMIN_ADMINS_MAILS_NO_ENTRIES--}');

diff --git a/inc/modules/admin/what-cache_stats.php b/inc/modules/admin/what-cache_stats.php
index dfa33c8949e02649a229448ef01ace49a81e5957..cedfb44fe2797ce09973e95b0e8f2d4727e061d5 100644 (file)
--- a/inc/modules/admin/what-cache_stats.php
+++ b/inc/modules/admin/what-cache_stats.php
@@ -50,7 +50,7 @@ if (ifInternalStatsEnabled()) {
        $content['cache_perc'] = (getStatsEntry('cache_hits') / $content['total_hits'] * 100);
 
        // Load template
        $content['cache_perc'] = (getStatsEntry('cache_hits') / $content['total_hits'] * 100);
 
        // Load template

-       loadTemplate('admin_cache_stats', false, $content);
+       loadTemplate('admin_cache_stats', FALSE, $content);

 } else {
        // Deactivated, which is good for performance
        displayMessage('{--ADMIN_CACHE_DB_STATS_DEACTIVATED--}');
 } else {
        // Deactivated, which is good for performance
        displayMessage('{--ADMIN_CACHE_DB_STATS_DEACTIVATED--}');

diff --git a/inc/modules/admin/what-config_admin.php b/inc/modules/admin/what-config_admin.php
index 02b1803549a19e214962e0bf852fba0a9f94eed7..4b9622a2d69bdf24d89f0d9d758af391af5aaaa4 100644 (file)
--- a/inc/modules/admin/what-config_admin.php
+++ b/inc/modules/admin/what-config_admin.php
@@ -53,7 +53,7 @@ if (isFormSent()) {
        $content['admin_menu_' . strtolower(getAdminMenu())] = ' checked="checked"';
 
        // Display form
        $content['admin_menu_' . strtolower(getAdminMenu())] = ' checked="checked"';
 
        // Display form

-       loadTemplate('admin_config_admin', false, $content);
+       loadTemplate('admin_config_admin', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php
index bf00a05fe908b1aa338fc66735557b063fc9f622..0beaf4ddbb3e3a30d439710ce4e803663dc30c67 100644 (file)
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -70,7 +70,7 @@ if (isFormSent()) {
        $content['auto_purge'] = createConfigurationTimeSelections('auto_purge', 'MWD');
 
        // Output template
        $content['auto_purge'] = createConfigurationTimeSelections('auto_purge', 'MWD');
 
        // Output template

-       loadTemplate('admin_config_autopurge', false, $content);
+       loadTemplate('admin_config_autopurge', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index 323428b03da70b9d82faf8f88b4c17300c22993b..3da037dfce9e41b9cd60f9278863fd12f869576a 100644 (file)
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -70,10 +70,10 @@ if (isFormSent()) {
        $content['pay_mode_' . strtolower(getBegPayMode())] = ' selected="selected"';
 
        // Member selection box
        $content['pay_mode_' . strtolower(getBegPayMode())] = ' selected="selected"';
 
        // Member selection box

-       $content['beg_userid'] = addMemberSelectionBox(getBegUserid(), false, true, true, 'beg_userid');
+       $content['beg_userid'] = addMemberSelectionBox(getBegUserid(), FALSE, TRUE, TRUE, 'beg_userid');

 
        // Load form template
 
        // Load form template

-       loadTemplate('admin_config_beg', false, $content);
+       loadTemplate('admin_config_beg', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index 00ab82d3a28b3579b1638ec69a13efd67ff5b5c0..63fcbeecc06c94dc049a46b59d35ff1f26f9182f 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -75,7 +75,7 @@ if (isFormSent()) {
        setConfigEntry('bonus_disable_notify', postRequestElement('bonus_disable_notify'));
 } else {
        // Transfer options to template
        setConfigEntry('bonus_disable_notify', postRequestElement('bonus_disable_notify'));
 } else {
        // Transfer options to template

-       $content['bonus_userid'] = addMemberSelectionBox(getBonusUserid(), false, true, true, 'bonus_userid');
+       $content['bonus_userid'] = addMemberSelectionBox(getBonusUserid(), FALSE, TRUE, TRUE, 'bonus_userid');

 
        // Initialize array for the points list
        $RANKS = explode(';', getTurboRates());
 
        // Initialize array for the points list
        $RANKS = explode(';', getTurboRates());


@@ -111,7 +111,7 @@ if (isFormSent()) {
        $content['wait_selection']          = createConfigurationTimeSelections('bonus_notify_wait', 'ms' );
 
        // Load final template
        $content['wait_selection']          = createConfigurationTimeSelections('bonus_notify_wait', 'ms' );
 
        // Load final template

-       loadTemplate('admin_config_bonus', false, $content);
+       loadTemplate('admin_config_bonus', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 12cc75c01a6411f0dab53f83c52b7f3167161b65..2f50fa4f883388ca981c9b9b64b926e76f496b80 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -114,11 +114,11 @@ if (isFormSent('add')) {
        $OUT = '';
        foreach (postRequestElement('sel') as $id => $value) {
                // Load row template and switch colors
        $OUT = '';
        foreach (postRequestElement('sel') as $id => $value) {
                // Load row template and switch colors

-               $OUT .= loadTemplate('admin_delete_cats_row', true, $id);
+               $OUT .= loadTemplate('admin_delete_cats_row', TRUE, $id);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_delete_cats', false, $OUT);
+       loadTemplate('admin_delete_cats', FALSE, $OUT);

 } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit categories
        $OUT = '';
 } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit categories
        $OUT = '';


@@ -135,11 +135,11 @@ if (isFormSent('add')) {
                $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
                // Load row template and switch colors
                $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('admin_edit_cats_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_cats_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_edit_cats', false, $OUT);
+       loadTemplate('admin_edit_cats', FALSE, $OUT);

 } else {
        // Init variable here
        $CATS = '';
 } else {
        // Init variable here
        $CATS = '';


@@ -158,21 +158,21 @@ if (isFormSent('add')) {
                        $CATS .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';
 
                        // Load row template and switch color
                        $CATS .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_list_cats_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_cats_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template

-               loadTemplate('admin_list_cats', false, $OUT);
+               loadTemplate('admin_list_cats', FALSE, $OUT);

        } // END - if
 
        // Remember in array
        $content['cats'] = $CATS;
 
        // Form to add a new category
        } // END - if
 
        // Remember in array
        $content['cats'] = $CATS;
 
        // Form to add a new category

-       loadTemplate('admin_add_cat', false, $content);
+       loadTemplate('admin_add_cat', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_coupon.php b/inc/modules/admin/what-config_coupon.php
index e21ae269b2c11b367054971d444727d7c175048a..b0a0abea87b0188def59b8a6c2e6156852a6c1c0 100644 (file)
--- a/inc/modules/admin/what-config_coupon.php
+++ b/inc/modules/admin/what-config_coupon.php
@@ -51,14 +51,14 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Add userid selection
        adminSaveSettingsFromPostData();
 } else {
        // Add userid selection

-       $content['coupon_userid'] = addMemberSelectionBox(getCouponUserid(), false, true, true, 'coupon_userid');
+       $content['coupon_userid'] = addMemberSelectionBox(getCouponUserid(), FALSE, TRUE, TRUE, 'coupon_userid');

 
        // Prepare some template data
        $content['coupon_default_time_selection']   = createConfigurationTimeSelections('coupon_default_time'  , 'WDh');
        $content['coupon_autopurge_time_selection'] = createConfigurationTimeSelections('coupon_autopurge_time', 'WDh');
 
        // Load template
 
        // Prepare some template data
        $content['coupon_default_time_selection']   = createConfigurationTimeSelections('coupon_default_time'  , 'WDh');
        $content['coupon_autopurge_time_selection'] = createConfigurationTimeSelections('coupon_autopurge_time', 'WDh');
 
        // Load template

-       loadTemplate('admin_config_coupon', false, $content);
+       loadTemplate('admin_config_coupon', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php
index d207c70492f3f87ef2bf4fa67015c794887ecebd..ae143e0142ad5476f05ec75d1e20fbe2d3d04c49 100644 (file)
--- a/inc/modules/admin/what-config_doubler.php
+++ b/inc/modules/admin/what-config_doubler.php
@@ -61,7 +61,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Transfer options
        } // END - foreach
 
        // Transfer options

-       $content['doubler_userid'] = addMemberSelectionBox(getConfig('doubler_userid'), false, true, true, 'doubler_userid');
+       $content['doubler_userid'] = addMemberSelectionBox(getConfig('doubler_userid'), FALSE, TRUE, TRUE, 'doubler_userid');

 
        // Number of rows to display (option lines!!!)
        foreach (array('new','pay','old') as $entry) {
 
        // Number of rows to display (option lines!!!)
        foreach (array('new','pay','old') as $entry) {


@@ -92,7 +92,7 @@ if (isFormSent()) {
        $content['timeout_selection'] = createConfigurationTimeSelections('doubler_timeout', 'WDh');
 
        // Load template
        $content['timeout_selection'] = createConfigurationTimeSelections('doubler_timeout', 'WDh');
 
        // Load template

-       loadTemplate('admin_config_doubler', false, $content);
+       loadTemplate('admin_config_doubler', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_holiday.php b/inc/modules/admin/what-config_holiday.php
index 288ac131bdb77696319a3f5b1dbcc57efe3ebbef..e84e61db9d5f7c8992b38cde029619de5236a20b 100644 (file)
--- a/inc/modules/admin/what-config_holiday.php
+++ b/inc/modules/admin/what-config_holiday.php
@@ -61,7 +61,7 @@ if (isFormSent()) {
        } // END - if
 
        // Load form template
        } // END - if
 
        // Load form template

-       loadTemplate('admin_config_holiday', false, $content);
+       loadTemplate('admin_config_holiday', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php
index def2a8c5d0309ebf4ffadd971799544611ff5b6c..d224da9f40262fdda7ccf735315d656fe06d447e 100644 (file)
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -66,7 +66,7 @@ switch ($sub) {
                        $content['cookie_selection'] = createConfigurationTimeSelections('index_cookie', 'YMWD');
 
                        // Output form
                        $content['cookie_selection'] = createConfigurationTimeSelections('index_cookie', 'YMWD');
 
                        // Output form

-                       loadTemplate('admin_config_home', false, $content);
+                       loadTemplate('admin_config_home', FALSE, $content);

                }
                break;
 
                }
                break;
 


@@ -110,14 +110,14 @@ ORDER BY
                        $content['link'] = $newHomeLink;
 
                        // Load row template
                        $content['link'] = $newHomeLink;
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_list_home_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_home_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('admin_list_home', false, $OUT);
+               loadTemplate('admin_list_home', FALSE, $OUT);

                break;
 
        default: // Output selection table
                break;
 
        default: // Output selection table

diff --git a/inc/modules/admin/what-config_imprint.php b/inc/modules/admin/what-config_imprint.php
index 2558197013489fd1f56eb3ee906832a373397453..525fc2a5c959cac72711a11befc3470961c69d6d 100644 (file)
--- a/inc/modules/admin/what-config_imprint.php
+++ b/inc/modules/admin/what-config_imprint.php
@@ -62,18 +62,18 @@ ORDER BY
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template

-                       $OUT .= loadTemplate('admin_list_imprint_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_imprint_row', TRUE, $content);

                } // END - while
 
                // Transfer all rows to $content
                $content = $OUT;
        } else {
                // None found
                } // END - while
 
                // Transfer all rows to $content
                $content = $OUT;
        } else {
                // None found

-               $content = loadTemplate('admin_list_imprint_row_none', true);
+               $content = loadTemplate('admin_list_imprint_row_none', TRUE);

        }
 
        // Load template
        }
 
        // Load template

-       loadTemplate('admin_list_imprint', false, $content);
+       loadTemplate('admin_list_imprint', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_mediadata.php b/inc/modules/admin/what-config_mediadata.php
index d5c0f8595fcc07793f70b1460cc3d768a102ae87..aba503e0c9ec1cb5ad1e3bfccc17c6757a7d2a54 100644 (file)
--- a/inc/modules/admin/what-config_mediadata.php
+++ b/inc/modules/admin/what-config_mediadata.php
@@ -85,7 +85,7 @@ if (isFormSent()) {
        }
 
        // Load template
        }
 
        // Load template

-       loadTemplate('admin_config_mediadata', false, $content);
+       loadTemplate('admin_config_mediadata', FALSE, $content);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index 61d35587815c1a903a6a170b8c68fac712884234..db87cf99b9b0f15a065dedf761c63c530a5119f8 100644 (file)
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -69,11 +69,11 @@ if (isFormSent('edit')) {
                        $content['mem_only']   = addSelectionBox('yn', $content['mem_only']  , 'member', $id);
 
                        // Load row template
                        $content['mem_only']   = addSelectionBox('yn', $content['mem_only']  , 'member', $id);
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_edit_mods_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_mods_row', TRUE, $content);

                } // END - foreach
 
                // Load main template
                } // END - foreach
 
                // Load main template

-               loadTemplate('admin_edit_mods', false, $OUT);
+               loadTemplate('admin_edit_mods', FALSE, $OUT);

        } else {
                // Nothing selected
                displayMessage('{--ADMIN_MODS_NOTHING_SELECTED--}');
        } else {
                // Nothing selected
                displayMessage('{--ADMIN_MODS_NOTHING_SELECTED--}');


@@ -110,7 +110,7 @@ LIMIT 1",
                                postRequestElement('admin', $id),
                                postRequestElement('member', $id),
                                $id
                                postRequestElement('admin', $id),
                                postRequestElement('member', $id),
                                $id

-                       ),  __FILE__, __LINE__, false));
+                       ),  __FILE__, __LINE__, FALSE));

        }
 
        // Run all sqls
        }
 
        // Run all sqls


@@ -141,14 +141,14 @@ ORDER BY
                } // END - if
 
                // Load row template
                } // END - if
 
                // Load row template

-               $OUT .= loadTemplate('admin_list_mods_row', true, $content);
+               $OUT .= loadTemplate('admin_list_mods_row', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load main template
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load main template

-       loadTemplate('admin_list_mods', false, $OUT);
+       loadTemplate('admin_list_mods', FALSE, $OUT);

 } // END - if
 
 // [EOF]
 } // END - if
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_network_api.php b/inc/modules/admin/what-config_network_api.php
index 5b8367c197bdc78c43193c64ec4dec481609f8ec..9f213a2a271de12ef7697e9aae87a0fefacb1d08 100644 (file)
--- a/inc/modules/admin/what-config_network_api.php
+++ b/inc/modules/admin/what-config_network_api.php
@@ -44,13 +44,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default we should display list/add new forms
 addYouAreHereLink('admin', __FILE__);
 
 // By default we should display list/add new forms

-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;

 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?

-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {

        // Abort here
        return;
 } // END - if
        // Abort here
        return;
 } // END - if


@@ -119,7 +119,7 @@ LIMIT 1',
                SQL_FREERESULT($result_config);
 
                // Load main template
                SQL_FREERESULT($result_config);
 
                // Load main template

-               loadTemplate('admin_config_network_api', false, $content);
+               loadTemplate('admin_config_network_api', FALSE, $content);

        } else {
                // Please setup some networks first
                displayMessage('{--ADMIN_NETWORK_DATA_MISSING--}');
        } else {
                // Please setup some networks first
                displayMessage('{--ADMIN_NETWORK_DATA_MISSING--}');

diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php
index 38ab8a10537a94a8cc31486d2646fa28804276a1..671e5599a91222c30bbea532d0fb331173c4316b 100644 (file)
--- a/inc/modules/admin/what-config_network_types.php
+++ b/inc/modules/admin/what-config_network_types.php
@@ -44,13 +44,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default we should display list/add new forms
 addYouAreHereLink('admin', __FILE__);
 
 // By default we should display list/add new forms

-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;

 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?

-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {

        // Abort here
        return;
 } // END - if
        // Abort here
        return;
 } // END - if


@@ -140,7 +140,7 @@ LIMIT 1',
                        $content['network_max_reload_time']  = createTimeSelections($content['network_max_reload_time'], 'network_max_reload_time', 'WDhms');
 
                        // Load template
                        $content['network_max_reload_time']  = createTimeSelections($content['network_max_reload_time'], 'network_max_reload_time', 'WDhms');
 
                        // Load template

-                       loadTemplate($templateName, false, $content);
+                       loadTemplate($templateName, FALSE, $content);

 
                        // Abort here
                        return;
 
                        // Abort here
                        return;


@@ -201,17 +201,17 @@ LIMIT 1',
                                $content = merge_array($content, SQL_FETCHARRAY($result_config));
 
                                // Add it with extra template
                                $content = merge_array($content, SQL_FETCHARRAY($result_config));
 
                                // Add it with extra template

-                               $content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', true, $content);
+                               $content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', TRUE, $content);

                        } else {
                                // No configuration found, so display form
                        } else {
                                // No configuration found, so display form

-                               $content['network_type_config_content'] = loadTemplate('admin_add_config_network_type', true, $content);
+                               $content['network_type_config_content'] = loadTemplate('admin_add_config_network_type', TRUE, $content);

                        }
 
                        // Free result
                        SQL_FREERESULT($result_config);
 
                        // Load row template
                        }
 
                        // Free result
                        SQL_FREERESULT($result_config);
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_config_network_types_row', true, $content);
+                       $OUT .= loadTemplate('admin_config_network_types_row', TRUE, $content);

                } // END - while
 
                // Prepare array for main template
                } // END - while
 
                // Prepare array for main template


@@ -221,7 +221,7 @@ LIMIT 1',
                );
 
                // Load main template
                );
 
                // Load main template

-               loadTemplate('admin_config_network_types', false, $content);
+               loadTemplate('admin_config_network_types', FALSE, $content);

        } else {
                // No entries found
                displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPES_404=' . bigintval(getRequestElement('network_id')) . '%}');
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPES_404=' . bigintval(getRequestElement('network_id')) . '%}');

diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php
index e1773f1355facc02ddfab8d676289a8c2eda3771..b98e1db125592e2f302f646a4daa9defa7132382 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -66,7 +66,7 @@ if (isFormSent()) {
        $content['order_selection'] = addOrderSelectionOptions(getConfig('order_select'));
 
        // Load template
        $content['order_selection'] = addOrderSelectionOptions(getConfig('order_select'));
 
        // Load template

-       loadTemplate('admin_config_order', false, $content);
+       loadTemplate('admin_config_order', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index f789d2a38474a5b0f93f504aeede7a2e07798fd0..30509c2edf6fe755e4810ff9a2a9a7b98f30cb81 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -96,7 +96,7 @@ if (isFormSent()) {
        $content['comma_def_' . getConfig('max_comma')] = ' selected="selected"';
 
        // Load template
        $content['comma_def_' . getConfig('max_comma')] = ' selected="selected"';
 
        // Load template

-       loadTemplate('admin_config_other', false, $content);
+       loadTemplate('admin_config_other', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index 11d986d4077b6364d39cd92ff226681b2fc844ab..dc8bb05633cf7ad06ec7a98509a39723afd8ec44 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -84,10 +84,10 @@ if ((isFormSent('add')) && (isPostRequestElementSet('title')) && (postRequestEle
 // Payout requests by your members
 $result_mem = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `status`='NEW' ORDER BY payout_timestamp DESC", __FILE__, __LINE__);
 
 // Payout requests by your members
 $result_mem = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `status`='NEW' ORDER BY payout_timestamp DESC", __FILE__, __LINE__);
 

-$display = true;
+$display = TRUE;

 if ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Make payouts configurable
 if ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Make payouts configurable

-       $display = false; //Suppress any other outputs
+       $display = FALSE; //Suppress any other outputs

        $OUT = '';
        foreach (postRequestElement('sel') as $id => $sel) {
                // Load data
        $OUT = '';
        foreach (postRequestElement('sel') as $id => $sel) {
                // Load data


@@ -100,11 +100,11 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                $content['allow_url'] = addSelectionBox('yn', $content['allow_url'], 'allow_url[' . $content['id'] . ']');
 
                // Load row template and switch color
                $content['allow_url'] = addSelectionBox('yn', $content['allow_url'], 'allow_url[' . $content['id'] . ']');
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_edit_payouts_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_payouts_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_edit_payouts', false, $OUT);
+       loadTemplate('admin_edit_payouts', FALSE, $OUT);

 } elseif ((isFormSent('do_edit')) && (ifPostContainsSelections())) {
        // Change them now
        // Init SQLs
 } elseif ((isFormSent('do_edit')) && (ifPostContainsSelections())) {
        // Change them now
        // Init SQLs


@@ -132,7 +132,7 @@ LIMIT 1",
                                convertCommaToDot(postRequestElement('min_points' , $id)),
                                postRequestElement('allow_url', $id),
                                $id
                                convertCommaToDot(postRequestElement('min_points' , $id)),
                                postRequestElement('allow_url', $id),
                                $id

-                       ),__FILE__, __LINE__, false));
+                       ),__FILE__, __LINE__, FALSE));

                }
        }
 
                }
        }
 


@@ -142,7 +142,7 @@ LIMIT 1",
        // Get message
        $message = '{--ADMIN_PAYOUT_ENTRIES_CHANGED--}';
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
        // Get message
        $message = '{--ADMIN_PAYOUT_ENTRIES_CHANGED--}';
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {

-       $display = false; //Suppress any other outputs
+       $display = FALSE; //Suppress any other outputs

        $OUT = '';
        foreach (postRequestElement('sel') as $id => $sel) {
                // Secure id number
        $OUT = '';
        foreach (postRequestElement('sel') as $id => $sel) {
                // Secure id number


@@ -155,11 +155,11 @@ LIMIT 1",
                SQL_FREERESULT($result);
 
                // Load row template and switch color
                SQL_FREERESULT($result);
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_delete_payouts_row', true, $content);
+               $OUT .= loadTemplate('admin_delete_payouts_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_delete_payouts', false, $OUT);
+       loadTemplate('admin_delete_payouts', FALSE, $OUT);

 } elseif ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
        // Init SQLs
        initSqls();
 } elseif ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
        // Init SQLs
        initSqls();


@@ -167,7 +167,7 @@ LIMIT 1",
        // Delete entries
        foreach (postRequestElement('sel') as $id => $sel) {
                addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
        // Delete entries
        foreach (postRequestElement('sel') as $id => $sel) {
                addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",

-                       array(bigintval($id)), __FILE__, __LINE__, false));
+                       array(bigintval($id)), __FILE__, __LINE__, FALSE));

        } // END - foreach
 
        // Run all SQLs
        } // END - foreach
 
        // Run all SQLs


@@ -199,21 +199,21 @@ if ((!SQL_HASZERONUMS($result_type)) && ($display)) {
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result_type)) {
                // Load row template and switch color
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result_type)) {
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_config_payouts_row', true, $content);
+               $OUT .= loadTemplate('admin_config_payouts_row', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result_type);
 
        // Load main template
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result_type);
 
        // Load main template

-       loadTemplate('admin_config_payouts', false, $OUT);
+       loadTemplate('admin_config_payouts', FALSE, $OUT);

 } // END - if
 
 // Does your members request payouts?
 } // END - if
 
 // Does your members request payouts?

-if ((!SQL_HASZERONUMS($result_mem)) && ($display === true)) {
+if ((!SQL_HASZERONUMS($result_mem)) && ($display === TRUE)) {

        // Members has requested payouts
        displayMessage('<a href="{%url=modules.php?module=admin&amp;what=list_payouts%}">{--ADMIN_PAYOUT_LIST_REQUESTS--}</a>');
        // Members has requested payouts
        displayMessage('<a href="{%url=modules.php?module=admin&amp;what=list_payouts%}">{--ADMIN_PAYOUT_LIST_REQUESTS--}</a>');

-} elseif ($display === true) {
+} elseif ($display === TRUE) {

        // No member requests so far
        displayMessage('{--ADMIN_PAYOUT_NO_MEMBER_REQUESTS--}');
 }
        // No member requests so far
        displayMessage('{--ADMIN_PAYOUT_NO_MEMBER_REQUESTS--}');
 }


@@ -222,7 +222,7 @@ if ((!SQL_HASZERONUMS($result_mem)) && ($display === true)) {
 SQL_FREERESULT($result_mem);
 
 // Add new payout type
 SQL_FREERESULT($result_mem);
 
 // Add new payout type

-if ($display === true) {
+if ($display === TRUE) {

        loadTemplate('admin_add_payout');
 } // END - if
 
        loadTemplate('admin_add_payout');
 } // END - if
 

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index a31a1588a73e8b16d3166bcf3ba537cbc7e9585f..b50f23eb2c40ce206061e3b55e4fbbf1b3325b57 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -169,7 +169,7 @@ WHERE
        } // END - foreach
 
        // Load template
        } // END - foreach
 
        // Load template

-       loadTemplate('admin_config_point_settings', false, $content);
+       loadTemplate('admin_config_point_settings', FALSE, $content);

 } elseif (getRequestElement('sub') == 'ref') {
        // 12          3     32    2                        3321
        if ((isFormSent('delete')) && (ifPostContainsSelections())) {
 } elseif (getRequestElement('sub') == 'ref') {
        // 12          3     32    2                        3321
        if ((isFormSent('delete')) && (ifPostContainsSelections())) {


@@ -182,11 +182,11 @@ WHERE
                        SQL_FREERESULT($result);
 
                        // Load row template and switch color
                        SQL_FREERESULT($result);
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_delete_reflevel_row', true, $content);
+                       $OUT .= loadTemplate('admin_delete_reflevel_row', TRUE, $content);

                } // END - foreach
 
                // Load main template
                } // END - foreach
 
                // Load main template

-               loadTemplate('admin_delete_reflevel', false, $OUT);
+               loadTemplate('admin_delete_reflevel', FALSE, $OUT);

        } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
                // Edit entries
                $OUT = '';
        } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
                // Edit entries
                $OUT = '';


@@ -197,11 +197,11 @@ WHERE
                        SQL_FREERESULT($result);
 
                        // Load row template and switch color
                        SQL_FREERESULT($result);
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_edit_reflevel_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_reflevel_row', TRUE, $content);

                } // END - foreach
 
                // Load main template
                } // END - foreach
 
                // Load main template

-               loadTemplate('admin_edit_reflevel', false, $OUT);
+               loadTemplate('admin_edit_reflevel', FALSE, $OUT);

        } else {
                // Referral levels
                $result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);
        } else {
                // Referral levels
                $result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);


@@ -212,14 +212,14 @@ WHERE
                        // List already existing categories for editing
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Load row template and switch color
                        // List already existing categories for editing
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Load row template and switch color

-                               $OUT .= loadTemplate('admin_list_reflevel_row', true, $content);
+                               $OUT .= loadTemplate('admin_list_reflevel_row', TRUE, $content);

                        } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);
 
                        // Load main template
                        } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);
 
                        // Load main template

-                       loadTemplate('admin_list_reflevel', false, $OUT);
+                       loadTemplate('admin_list_reflevel', FALSE, $OUT);

                }
 
                // Form for adding new referral levels
                }
 
                // Form for adding new referral levels

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 90039eb2fca1fd7fa219feded8e274008b294e99..c3c160ab39fd7ea0fb65f9061f3aa52073c2882a 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -147,7 +147,7 @@ LIMIT 1",
                                $content['rallye_content'] = generateOptions('rallye_data', 'id', 'title', $content['rallye_id']);
 
                                // Load row template and switch color
                                $content['rallye_content'] = generateOptions('rallye_data', 'id', 'title', $content['rallye_id']);
 
                                // Load row template and switch color

-                               $OUT .= loadTemplate('admin_edit_rallye_prices_row', true, $content);
+                               $OUT .= loadTemplate('admin_edit_rallye_prices_row', TRUE, $content);

                        } // END - foreach
 
                        // Remember row content
                        } // END - foreach
 
                        // Remember row content


@@ -157,7 +157,7 @@ LIMIT 1",
                        $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
 
                        // Load main template
                        $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
 
                        // Load main template

-                       loadTemplate('admin_edit_rallye_prices', false, $content);
+                       loadTemplate('admin_edit_rallye_prices', FALSE, $content);

                } else {
                        // Nothing selected
                        displayMessage('{%message,ADMIN_RALLYE_NO_PRICES_SELECTED=' . getRequestElement('rallye_id') . '%}');
                } else {
                        // Nothing selected
                        displayMessage('{%message,ADMIN_RALLYE_NO_PRICES_SELECTED=' . getRequestElement('rallye_id') . '%}');


@@ -189,7 +189,7 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Load row template and switch color
                                SQL_FREERESULT($result);
 
                                // Load row template and switch color

-                               $OUT .= loadTemplate('admin_delete_rallye_prices_row', true, $content);
+                               $OUT .= loadTemplate('admin_delete_rallye_prices_row', TRUE, $content);

                        } // END - foreach
                        $content['rows'] = $OUT;
 
                        } // END - foreach
                        $content['rows'] = $OUT;
 


@@ -197,7 +197,7 @@ LIMIT 1",
                        $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
 
                        // Load main template
                        $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
 
                        // Load main template

-                       loadTemplate('admin_delete_rallye_prices', false, $content);
+                       loadTemplate('admin_delete_rallye_prices', FALSE, $content);

                } else {
                        // Nothing selected
                        $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=' . getRequestElement('rallye_id') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
                } else {
                        // Nothing selected
                        $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=' . getRequestElement('rallye_id') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';


@@ -213,7 +213,7 @@ LIMIT 1",
                        $OUT = '';
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Load row template and switch color
                        $OUT = '';
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Load row template and switch color

-                               $OUT .= loadTemplate('admin_list_rallye_prices_simple_row', true, $content);
+                               $OUT .= loadTemplate('admin_list_rallye_prices_simple_row', TRUE, $content);

                        } // END - while
 
                        // Free memory
                        } // END - while
 
                        // Free memory


@@ -226,13 +226,13 @@ LIMIT 1",
                        $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
 
                        // Load main template
                        $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
 
                        // Load main template

-                       loadTemplate('admin_list_rallye_prices_simple', false, $content);
+                       loadTemplate('admin_list_rallye_prices_simple', FALSE, $content);

                } // END - if
        }
 
        // Add form for adding new price level
        if ((!isFormSent('edit')) && (!isFormSent('delete'))) {
                } // END - if
        }
 
        // Add form for adding new price level
        if ((!isFormSent('edit')) && (!isFormSent('delete'))) {

-               loadTemplate('admin_add_rallye_prices', false, getRequestElement('rallye_id'));
+               loadTemplate('admin_add_rallye_prices', FALSE, getRequestElement('rallye_id'));

        } // END - if
 } else {
        // No rallye selected so display all available without prices
        } // END - if
 } else {
        // No rallye selected so display all available without prices


@@ -261,14 +261,14 @@ ORDER BY
                        $content['end_time']   = generateDateTime($content['end_time']  , '3');
 
                        // Load row template and switch color
                        $content['end_time']   = generateDateTime($content['end_time']  , '3');
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_list_rallye_prices_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_rallye_prices_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template

-               loadTemplate('admin_list_rallye_prices', false, $OUT);
+               loadTemplate('admin_list_rallye_prices', FALSE, $OUT);

        } else {
                // No rallyes setup so far
                displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SETUP--}');
        } else {
                // No rallyes setup so far
                displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SETUP--}');

diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php
index 04b4387c95f0205c2e401e97a38d481f0663f897..ca521c2e58f275d5b84657ea2e98f9bdba413813 100644 (file)
--- a/inc/modules/admin/what-config_refid.php
+++ b/inc/modules/admin/what-config_refid.php
@@ -48,7 +48,7 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Prepare member selection
        adminSaveSettingsFromPostData();
 } else {
        // Prepare member selection

-       $content['def_refid'] = addMemberSelectionBox(getDefRefid(), false, true, true, 'def_refid');
+       $content['def_refid'] = addMemberSelectionBox(getDefRefid(), FALSE, TRUE, TRUE, 'def_refid');

 
        // Prepare contants for the template
        foreach (array('refid_target_index','refid_target_register','select_user_zero_refid_y','select_user_zero_refid_n') as $entry) {
 
        // Prepare contants for the template
        foreach (array('refid_target_index','refid_target_register','select_user_zero_refid_y','select_user_zero_refid_n') as $entry) {


@@ -61,7 +61,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Load template
        } // END - foreach
 
        // Load template

-       loadTemplate('admin_config_refid', false, $content);
+       loadTemplate('admin_config_refid', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php
index 103f12db8ee1f93299bc63e68216c266ad2565ce..f4970baea360036eb519873c4f7185478e3a6e89 100644 (file)
--- a/inc/modules/admin/what-config_register.php
+++ b/inc/modules/admin/what-config_register.php
@@ -73,14 +73,14 @@ while ($content = SQL_FETCHARRAY($result)) {
        $content['selection'] = addSelectionBox('yn', $content['field_required'], 'sel[' . $content['id'] . ']');
 
        // @TODO Move this HTML code into a template
        $content['selection'] = addSelectionBox('yn', $content['field_required'], 'sel[' . $content['id'] . ']');
 
        // @TODO Move this HTML code into a template

-       $OUT .= loadTemplate('admin_config_register_row', true, $content);
+       $OUT .= loadTemplate('admin_config_register_row', TRUE, $content);

 } // END - while
 
 // Free memory
 SQL_FREERESULT($result);
 
 // Load template
 } // END - while
 
 // Free memory
 SQL_FREERESULT($result);
 
 // Load template

-loadTemplate('admin_config_register', false, $OUT);
+loadTemplate('admin_config_register', FALSE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-config_register2.php b/inc/modules/admin/what-config_register2.php
index 340d36aeb4bd2d933be1fd0973ef9ca6d298160c..209a75e89c2830560f00f6d4cfbe192377bcc2bb 100644 (file)
--- a/inc/modules/admin/what-config_register2.php
+++ b/inc/modules/admin/what-config_register2.php
@@ -61,7 +61,7 @@ if (isFormSent()) {
        $content['register_generate_password_empty'] = addSelectionBox('yn', getRegisterGeneratePasswordEmpty(), 'register_generate_password_empty');
 
        // Load normal template
        $content['register_generate_password_empty'] = addSelectionBox('yn', getRegisterGeneratePasswordEmpty(), 'register_generate_password_empty');
 
        // Load normal template

-       loadTemplate('admin_config_register2', false, $content);
+       loadTemplate('admin_config_register2', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_removeip.php b/inc/modules/admin/what-config_removeip.php
index 1954b8fc40688264ca4062fd4f13e76e6ab00f3b..4f8f4236a3f67f335201a6619a015eca5e73fccf 100644 (file)
--- a/inc/modules/admin/what-config_removeip.php
+++ b/inc/modules/admin/what-config_removeip.php
@@ -58,7 +58,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Load template
        } // END - foreach
 
        // Load template

-       loadTemplate('admin_config_removeip', false, $content);
+       loadTemplate('admin_config_removeip', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php
index 90a6caeccd1688eebf6647101de1771be5397f0c..10eee72f0a4011b8b74b6c148f040494d9cbb171 100644 (file)
--- a/inc/modules/admin/what-config_rewrite.php
+++ b/inc/modules/admin/what-config_rewrite.php
@@ -81,14 +81,14 @@ if (isFormSent()) {
                $content['n_default'] = $n;
 
                // Load template and switch colors
                $content['n_default'] = $n;
 
                // Load template and switch colors

-               $OUT .= loadTemplate('admin_config_rewrite_rows', true, $content);
+               $OUT .= loadTemplate('admin_config_rewrite_rows', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load main template
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load main template

-       loadTemplate('admin_config_rewrite', false, $OUT);
+       loadTemplate('admin_config_rewrite', FALSE, $OUT);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_stats.php b/inc/modules/admin/what-config_stats.php
index 6936eb4702c064ddbdafb229d89eeeda2b5799a5..467a3996a6fb8fd9c295d8f98c06705f3ae8f569 100644 (file)
--- a/inc/modules/admin/what-config_stats.php
+++ b/inc/modules/admin/what-config_stats.php
@@ -57,7 +57,7 @@ if (isFormSent()) {
        $content['guest_stats_' . strtolower(getConfig('guest_stats'))]  = ' selected="selected"';
 
        // Load template
        $content['guest_stats_' . strtolower(getConfig('guest_stats'))]  = ' selected="selected"';
 
        // Load template

-       loadTemplate('admin_config_stats', false, $content);
+       loadTemplate('admin_config_stats', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php
index def280a4f84283a3cd3ef9a93d06ea0b0f47af54..27f4b0cfd5cc1dcad90a4705fddfd0aa89b19b7f 100644 (file)
--- a/inc/modules/admin/what-config_surfbar.php
+++ b/inc/modules/admin/what-config_surfbar.php
@@ -73,7 +73,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Load template
        } // END - foreach
 
        // Load template

-       loadTemplate('admin_config_surfbar', false, $content);
+       loadTemplate('admin_config_surfbar', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_title.php b/inc/modules/admin/what-config_title.php
index d591b3c59980975fba902b3298ea8b194c990c05..9be866ab30914d54beb47de778a1c673f901a3e3 100644 (file)
--- a/inc/modules/admin/what-config_title.php
+++ b/inc/modules/admin/what-config_title.php
@@ -53,7 +53,7 @@ if (isFormSent()) {
        $content['enable_what_title'] = addSelectionBox('yn', getConfig('enable_what_title'), 'enable_what_title');
 
        // Load template
        $content['enable_what_title'] = addSelectionBox('yn', getConfig('enable_what_title'), 'enable_what_title');
 
        // Load template

-       loadTemplate('admin_config_title', false, $content);
+       loadTemplate('admin_config_title', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php
index e905ac3300debd444c4e5a2ac0d00302c9e6c2e8..1d94b0f0c290a311a3942b00c68f633e7239cb3b 100644 (file)
--- a/inc/modules/admin/what-config_transfer.php
+++ b/inc/modules/admin/what-config_transfer.php
@@ -52,7 +52,7 @@ if (isFormSent()) {
        $content['timeout_selection'] = createConfigurationTimeSelections('transfer_timeout', 'MWDh');
 
        // Load template
        $content['timeout_selection'] = createConfigurationTimeSelections('transfer_timeout', 'MWDh');
 
        // Load template

-       loadTemplate('admin_config_transfer', false, $content);
+       loadTemplate('admin_config_transfer', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_user.php b/inc/modules/admin/what-config_user.php
index 698c20abaf7a3299dac151ee92d44cdc68f7a500..a46218bacd7b9aeede4b5852239d34143557afa0 100644 (file)
--- a/inc/modules/admin/what-config_user.php
+++ b/inc/modules/admin/what-config_user.php
@@ -51,7 +51,7 @@ if (isFormSent()) {
        $content['tester_user_gender_selection'] = generateGenderSelectionBox(getConfig('tester_user_gender'), 'tester_user_gender');
 
        // Load form template
        $content['tester_user_gender_selection'] = generateGenderSelectionBox(getConfig('tester_user_gender'), 'tester_user_gender');
 
        // Load form template

-       loadTemplate('admin_config_user', false, $content);
+       loadTemplate('admin_config_user', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index 26717ff11516a894bcca569d88fad24dbeda3c54..4212561278fb00aec0e18177ac619adf82a2093e 100644 (file)
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -65,7 +65,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Load template
        } // END - foreach
 
        // Load template

-       loadTemplate('admin_config_yoomedia', false, $content);
+       loadTemplate('admin_config_yoomedia', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index b72c0970b15428361e4c4ecbdb1d717dd1118bfa..6afb0abc4fd894c53991e31e8b4fc57fc6799ca2 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -64,7 +64,7 @@ if (isGetRequestElementSet('mid')) {
                $content['timestamp'] = generateDateTime($content['timestamp'], 0);
 
                // Load template
                $content['timestamp'] = generateDateTime($content['timestamp'], 0);
 
                // Load template

-               loadTemplate('admin_delete_email_normal', false, $content);
+               loadTemplate('admin_delete_email_normal', FALSE, $content);

 
                // Load email template and send the email away
                $message_user = loadEmailTemplate('member_order_deleted', $content, $content['sender']);
 
                // Load email template and send the email away
                $message_user = loadEmailTemplate('member_order_deleted', $content, $content['sender']);


@@ -88,7 +88,7 @@ LIMIT 1",
                        list($stats_id) = SQL_FETCHROW($result_pool);
 
                        // Get all user links
                        list($stats_id) = SQL_FETCHROW($result_pool);
 
                        // Get all user links

-                       $links = countSumTotalData($stats_id, 'user_links', 'userid', 'stats_id', true);
+                       $links = countSumTotalData($stats_id, 'user_links', 'userid', 'stats_id', TRUE);

 
                        // Reset sent mails for recipient(s)
                        reduceRecipientReceivedMails('stats_id', getRequestElement('mid'), $links);
 
                        // Reset sent mails for recipient(s)
                        reduceRecipientReceivedMails('stats_id', getRequestElement('mid'), $links);


@@ -187,7 +187,7 @@ LIMIT 1",
                $content['count']     = $count;
 
                // Load template
                $content['count']     = $count;
 
                // Load template

-               loadTemplate('admin_delete_email_bonus', false, $content);
+               loadTemplate('admin_delete_email_bonus', FALSE, $content);

        } else {
                // Mail already deleted!
                displayMessage('{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
        } else {
                // Mail already deleted!
                displayMessage('{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');


@@ -221,7 +221,7 @@ LIMIT 1",
                $content['count']     = $count;
 
                // Load template
                $content['count']     = $count;
 
                // Load template

-               loadTemplate('admin_delete_email_notify', false, $content);
+               loadTemplate('admin_delete_email_notify', FALSE, $content);

        } else {
                // Mail already deleted!
                displayMessage('{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
        } else {
                // Mail already deleted!
                displayMessage('{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index fa3f68a19d51236f549edd30012cc8a9d374cd27..576e7e1e3b0ce54c0eb6341ac68822eba216ad63 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -81,7 +81,7 @@ if (isGetRequestElementSet('id')) {
                        $content['userid'] = bigintval(getRequestElement('id'));
 
                        // Display form
                        $content['userid'] = bigintval(getRequestElement('id'));
 
                        // Display form

-                       loadTemplate('admin_delete_sponsor', false, $content);
+                       loadTemplate('admin_delete_sponsor', FALSE, $content);

                }
        } else {
                // Sponsor not found
                }
        } else {
                // Sponsor not found

diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index eb79d653e832cbbbd185ead41eda8e63f673e09a..1028d0f70658309915db4ef79a848ebabc4e34d4 100644 (file)
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -52,9 +52,9 @@ if (isFormSent('delete')) {
                // Delete entries...
                foreach (postRequestElement('sel') as $id => $sel) {
                        addSql(SQL_QUERY_ESC('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `trans_id`=%s LIMIT 1',
                // Delete entries...
                foreach (postRequestElement('sel') as $id => $sel) {
                        addSql(SQL_QUERY_ESC('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `trans_id`=%s LIMIT 1',

-                               array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));

                        addSql(SQL_QUERY_ESC('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `trans_id`=%s LIMIT 1',
                        addSql(SQL_QUERY_ESC('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `trans_id`=%s LIMIT 1',

-                               array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));

                } // END - foreach
 
                // Run all SQLs
                } // END - foreach
 
                // Run all SQLs


@@ -84,7 +84,7 @@ if (!SQL_HASZERONUMS($result)) {
                $content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
                // Load row template
                $content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
                // Load row template

-               $OUT .= loadTemplate('admin_delete_transfer_row', true, $content);
+               $OUT .= loadTemplate('admin_delete_transfer_row', TRUE, $content);

 
                // Sum points and switch colors
                $total += $content['points'];
 
                // Sum points and switch colors
                $total += $content['points'];


@@ -96,7 +96,7 @@ if (!SQL_HASZERONUMS($result)) {
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">

-    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', true) . '
+    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', TRUE) . '

   </td>
 </tr>';
 }
   </td>
 </tr>';
 }


@@ -115,7 +115,7 @@ $content['delete'] = '<input type="reset" class="form_reset" value="{--UNDO_SELE
 <input type="submit" name="delete" class="form_delete" value="{--ADMIN_DELETE_TRANSFERS_SUBMIT--}" />';
 
 // Load final template
 <input type="submit" name="delete" class="form_delete" value="{--ADMIN_DELETE_TRANSFERS_SUBMIT--}" />';
 
 // Load final template

-loadTemplate('admin_list_transfer', false, $content);
+loadTemplate('admin_list_transfer', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 69698955e8efde020fcb15ee8728c76ab389feae..ba011d5f5e8ec5d8c030326719fdc9428e704d97 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -54,7 +54,7 @@ if ((isFormSent()) || ((isFormSent('delete')) && (isPostRequestElementSet('reaso
                displayMessage('{--ADMIN_DELETE_COMPLETED--}');
        } else {
                // Account does not exists!
                displayMessage('{--ADMIN_DELETE_COMPLETED--}');
        } else {
                // Account does not exists!

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');

        }
 } elseif (isPostRequestElementSet('no')) {
        // Do not delete him...
        }
 } elseif (isPostRequestElementSet('no')) {
        // Do not delete him...


@@ -72,10 +72,10 @@ if ((isFormSent()) || ((isFormSent('delete')) && (isPostRequestElementSet('reaso
                );
 
                // Display form
                );
 
                // Display form

-               loadTemplate('admin_delete_user', false, $content);
+               loadTemplate('admin_delete_user', FALSE, $content);

        } else {
                // Account does not exists!
        } else {
                // Account does not exists!

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 4d998c0132968ac39764c8d8f9ef919f028e1e0e..911dc01ea085e99279c2efeae41326edfce53a71 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -70,7 +70,7 @@ LIMIT 1',
        SQL_FREERESULT($result);
 
        // Load template
        SQL_FREERESULT($result);
 
        // Load template

-       loadTemplate('admin_edit_email', false, $content);
+       loadTemplate('admin_edit_email', FALSE, $content);

 } elseif (isGetRequestElementSet('mid')) {
        // Make also this email editable
        $result = SQL_QUERY_ESC('SELECT
 } elseif (isGetRequestElementSet('mid')) {
        // Make also this email editable
        $result = SQL_QUERY_ESC('SELECT


@@ -93,7 +93,7 @@ LIMIT 1',
        SQL_FREERESULT($result);
 
        // Load template
        SQL_FREERESULT($result);
 
        // Load template

-       loadTemplate('admin_edit_email', false, $content);
+       loadTemplate('admin_edit_email', FALSE, $content);

 } elseif (isGetRequestElementSet('bid')) {
                // Make also this email editable
                $result = SQL_QUERY_ESC('SELECT
 } elseif (isGetRequestElementSet('bid')) {
                // Make also this email editable
                $result = SQL_QUERY_ESC('SELECT


@@ -115,7 +115,7 @@ LIMIT 1',
        SQL_FREERESULT($result);
 
        // Load template
        SQL_FREERESULT($result);
 
        // Load template

-       loadTemplate('admin_edit_bonus_email', false, $content);
+       loadTemplate('admin_edit_bonus_email', FALSE, $content);

 } elseif (isFormSent('save')) {
        // Save changes
        if (isPostRequestElementSet('mid')) {
 } elseif (isFormSent('save')) {
        // Save changes
        if (isPostRequestElementSet('mid')) {


@@ -190,14 +190,14 @@ ORDER BY
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('admin_edit_email_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_email_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load email template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load email template

-               loadTemplate('admin_edit_email_select', false, $OUT);
+               loadTemplate('admin_edit_email_select', FALSE, $OUT);

        } else {
                // No mail orders left in pool
                displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
        } else {
                // No mail orders left in pool
                displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 29bbdf826d20370b4b4aa3dca7573e9413a302fe..cf61c57c5851a020b3a590c50d29b32d2fdd7249 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -119,12 +119,12 @@ LIMIT 1",
                                        break;
 
                                case 'edit': // Edit sponsor account
                                        break;
 
                                case 'edit': // Edit sponsor account

-                                       $PASS = true;
+                                       $PASS = TRUE;

                                        if ((postRequestElement('pass1') != postRequestElement('pass2')) || ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass1')))) {
                                                // Remove passwords
                                                unsetPostRequestElement('pass1');
                                                unsetPostRequestElement('pass2');
                                        if ((postRequestElement('pass1') != postRequestElement('pass2')) || ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass1')))) {
                                                // Remove passwords
                                                unsetPostRequestElement('pass1');
                                                unsetPostRequestElement('pass2');

-                                               $PASS = false;
+                                               $PASS = FALSE;

                                        } // END - if
 
                                        // Convert time selection
                                        } // END - if
 
                                        // Convert time selection


@@ -137,10 +137,10 @@ LIMIT 1",
                                        postRequestElement('gender'          , '{%pipe,translateGender=' . postRequestElement('gender') . '%}');
                                        postRequestElement('warning_interval', '{%pipe,createFancyTime=' . postRequestElement('warning_interval') . '%}');
 
                                        postRequestElement('gender'          , '{%pipe,translateGender=' . postRequestElement('gender') . '%}');
                                        postRequestElement('warning_interval', '{%pipe,createFancyTime=' . postRequestElement('warning_interval') . '%}');
 

-                                       if ($PASS === false) setPostRequestElement('pass1', '{--SPONSOR_PASS_UNCHANGED--}');
+                                       if ($PASS === FALSE) setPostRequestElement('pass1', '{--SPONSOR_PASS_UNCHANGED--}');

 
                                        // Load email template and send the mail away
 
                                        // Load email template and send the mail away

-                                       $message = loadEmailTemplate('admin_sponsor_edit', postRequestArray(), false);
+                                       $message = loadEmailTemplate('admin_sponsor_edit', postRequestArray(), FALSE);

                                        sendEmail(postRequestElement('email'), '{--ADMIN_SPONSOR_EDIT_SUBJECT--}', $message);
                                        break;
 
                                        sendEmail(postRequestElement('email'), '{--ADMIN_SPONSOR_EDIT_SUBJECT--}', $message);
                                        break;
 


@@ -159,7 +159,7 @@ LIMIT 1",
                        $content['contact'] = '<a href="' . generateSponsorEmailLink($content['email'], 'sponsor_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                        // Load mode template
                        $content['contact'] = '<a href="' . generateSponsorEmailLink($content['email'], 'sponsor_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                        // Load mode template

-                       loadTemplate($TPL, false, $content);
+                       loadTemplate($TPL, FALSE, $content);

                } else {
                        // Template not found
                        displayMessage('{%message,ADMIN_SPONSOR_MODUS_TPL_404', getRequestElement('do') . '%}');
                } else {
                        // Template not found
                        displayMessage('{%message,ADMIN_SPONSOR_MODUS_TPL_404', getRequestElement('do') . '%}');

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 11a4f2677ec98ff66311eb1c6837e8e3ff72b3ae..a241477977f0a8bc24efae224ca7a2434bd43b6a 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Fix a notice
 addYouAreHereLink('admin', __FILE__);
 
 // Fix a notice

-$result_main = false;
+$result_main = FALSE;

 if (isGetRequestElementSet('userid')) {
        // Load user entry
        $result_main = SQL_QUERY_ESC("SELECT
 if (isGetRequestElementSet('userid')) {
        // Load user entry
        $result_main = SQL_QUERY_ESC("SELECT


@@ -71,17 +71,17 @@ if ((!isGetRequestElementSet('userid')) || (SQL_NUMROWS($result_main) == 1)) {
                addMemberSelectionBox();
        } elseif (isFormSent('edit')) {
                // Ok, change the account...
                addMemberSelectionBox();
        } elseif (isFormSent('edit')) {
                // Ok, change the account...

-               $updateUser = false; $add = '';
+               $updateUser = FALSE; $add = '';

                if ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass2'))) {
                        // Don't change the password
                if ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass2'))) {
                        // Don't change the password

-                       $updateUser = true;
+                       $updateUser = TRUE;

                } elseif ((postRequestElement('pass1') == postRequestElement('pass2'))) {
                        // Change the password
                } elseif ((postRequestElement('pass1') == postRequestElement('pass2'))) {
                        // Change the password

-                       $updateUser = true;
+                       $updateUser = TRUE;

                        $add = ",`password`='" . generateHash(postRequestElement('pass1')) . "'";
                }
 
                        $add = ",`password`='" . generateHash(postRequestElement('pass1')) . "'";
                }
 

-               if ($updateUser === true) {
+               if ($updateUser === TRUE) {

                        // We have to add the following things: birthday and max receive mails
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
                        // We have to add the following things: birthday and max receive mails
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`


@@ -122,11 +122,11 @@ LIMIT 1",
                $content = SQL_FETCHARRAY($result_main);
 
                // Load template
                $content = SQL_FETCHARRAY($result_main);
 
                // Load template

-               loadTemplate('admin_edit_user', false, $content);
+               loadTemplate('admin_edit_user', FALSE, $content);

        }
 } else {
        // Account does not exists!
        }
 } else {
        // Account does not exists!

-       loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
+       loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');

 }
 
 // Free the result
 }
 
 // Free the result

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index ede6370692e17a1aa395281ae2421a780054f86b..87e534fbc12397202916f9ba0218380d3fc40c68 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -86,8 +86,8 @@ if (!SQL_HASZERONUMS($result)) {
        // Mail orders are in pool so we can display them
 
        // Add navigation table rows
        // Mail orders are in pool so we can display them
 
        // Add navigation table rows

-       $content['top_email_nav']    = addEmailNavigation($numPages, getMailsPage(), true , 3, true);
-       $content['bottom_email_nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+       $content['top_email_nav']    = addEmailNavigation($numPages, getMailsPage(), TRUE , 3, TRUE);
+       $content['bottom_email_nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);

 
        // List all entries
        $OUT = '';
 
        // List all entries
        $OUT = '';


@@ -112,14 +112,14 @@ if (!SQL_HASZERONUMS($result)) {
                $content = merge_array($content, $pool);
 
                // Load row template and switch colors
                $content = merge_array($content, $pool);
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('admin_email_archiv_row', true, $content);
+               $OUT .= loadTemplate('admin_email_archiv_row', TRUE, $content);

        } // END - while
 
        // Remmber generated rows in array
        $content['rows'] = $OUT;
 
        // Load main template
        } // END - while
 
        // Remmber generated rows in array
        $content['rows'] = $OUT;
 
        // Load main template

-       loadTemplate('admin_email_archiv', false, $content);
+       loadTemplate('admin_email_archiv', FALSE, $content);

 } else {
        // No mail orders fond
        displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 } else {
        // No mail orders fond
        displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index a5a4ab2f1dff4811691b4d3356638ec634802d33..fed64612ec424b9e2da837248dc37ed349e9c676 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -47,7 +47,7 @@ addYouAreHereLink('admin', __FILE__);
 if (!isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
        // No, abort here
        displayMessage(generateExtensionOutdatedMessage('sql_patches', '0.7.4'));
 if (!isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
        // No, abort here
        displayMessage(generateExtensionOutdatedMessage('sql_patches', '0.7.4'));

-       return false;
+       return FALSE;

 } // END - if
 
 // Normal mails ordered by your members
 } // END - if
 
 // Normal mails ordered by your members


@@ -91,7 +91,7 @@ ORDER BY
 }
 
 // Init result_bonus
 }
 
 // Init result_bonus

-$result_bonus = false;
+$result_bonus = FALSE;

 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Check for maximum pages
 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Check for maximum pages


@@ -149,7 +149,7 @@ if (isConfigEntrySet('mails_page')) {
 // Free result
 SQL_FREERESULT($result_normal);
 
 // Free result
 SQL_FREERESULT($result_normal);
 

-$MAIL = false;
+$MAIL = FALSE;

 if (!SQL_HASZERONUMS($result_list)) {
        // Init rows
        $OUT = '';
 if (!SQL_HASZERONUMS($result_list)) {
        // Init rows
        $OUT = '';


@@ -173,23 +173,23 @@ if (!SQL_HASZERONUMS($result_list)) {
                $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                // Load row template
                $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                // Load row template

-               $OUT .= loadTemplate('admin_list_emails_row', true, $content);
+               $OUT .= loadTemplate('admin_list_emails_row', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result_list);
 
        // Add navigation (with change box and colspan=3)
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result_list);
 
        // Add navigation (with change box and colspan=3)

-       $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+       $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);

 
        // Prepare content
        $content['rows'] = $OUT;
        $content['who'] = $WHO;
 
        // Mail orders are in pool so we can display them
 
        // Prepare content
        $content['rows'] = $OUT;
        $content['who'] = $WHO;
 
        // Mail orders are in pool so we can display them

-       loadTemplate('admin_list_emails', false, $content);
+       loadTemplate('admin_list_emails', FALSE, $content);

 
 

-       $MAIL = true;
+       $MAIL = TRUE;

        if ((isExtensionActive('bonus')) && (empty($WHO))) {
                // Only check if bonus extension is active
                if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
        if ((isExtensionActive('bonus')) && (empty($WHO))) {
                // Only check if bonus extension is active
                if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');


@@ -212,22 +212,22 @@ if ((isExtensionActive('bonus')) && (empty($WHO))) {
                        $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                        // Load row template
                        $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_list_bonus_emails_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_bonus_emails_row', TRUE, $content);

                } // END - while
 
                // Add navigation (without change box but with colspan=3)
                } // END - while
 
                // Add navigation (without change box but with colspan=3)

-               $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+               $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);

 
                // Prepare content
                $content['rows'] = $OUT;
 
                // Load main template
 
                // Prepare content
                $content['rows'] = $OUT;
 
                // Load main template

-               loadTemplate('admin_list_bonus_emails', false, $content);
-               $MAIL = true;
+               loadTemplate('admin_list_bonus_emails', FALSE, $content);
+               $MAIL = TRUE;

        } // END - if
 } // END - if
 
        } // END - if
 } // END - if
 

-if ($MAIL === false) {
+if ($MAIL === FALSE) {

        // No mail orders fond
        displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 } // END - if
        // No mail orders fond
        displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 } // END - if

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 48e424977da191a2a83e650edf035c614d2b43a9..7c914cb7cbfdcc764f5716c10dd770bae5bb771c 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -161,12 +161,12 @@ if (isGetRequestElementSet('reg_ext')) {
                                );
 
                                // Load row template and switch color
                                );
 
                                // Load row template and switch color

-                               $OUT .= loadTemplate('admin_edit_extensions_row', true, $content);
+                               $OUT .= loadTemplate('admin_edit_extensions_row', TRUE, $content);

                        } // END - if
                } // END - foreach
 
                // Load template
                        } // END - if
                } // END - foreach
 
                // Load template

-               loadTemplate('admin_edit_extensions', false, $OUT);
+               loadTemplate('admin_edit_extensions', FALSE, $OUT);

                $do = 'edit';
        }
 } elseif ((isPostRequestElementSet('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
                $do = 'edit';
        }
 } elseif ((isPostRequestElementSet('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {


@@ -188,7 +188,7 @@ if (isGetRequestElementSet('reg_ext')) {
                        // Listing of SQLs enabled?
                        if (isVerboseSqlEnabled()) {
                                // Load SQL commands in remove mode
                        // Listing of SQLs enabled?
                        if (isVerboseSqlEnabled()) {
                                // Load SQL commands in remove mode

-                               if (loadExtension($ext_name, 'remove', '0.0.0', true)) {
+                               if (loadExtension($ext_name, 'remove', '0.0.0', TRUE)) {

                                        // Generate extra table with loaded SQL commands
                                        $VERBOSE_OUT = addExtensionVerboseSqlTable();
                                } // END - if
                                        // Generate extra table with loaded SQL commands
                                        $VERBOSE_OUT = addExtensionVerboseSqlTable();
                                } // END - if


@@ -202,7 +202,7 @@ if (isGetRequestElementSet('reg_ext')) {
                        );
 
                        // Load row template and switch color
                        );
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_delete_extensions_row', true, $content);
+                       $OUT .= loadTemplate('admin_delete_extensions_row', TRUE, $content);

                } else {
                        // Prepare data for the row template
                        $content = array(
                } else {
                        // Prepare data for the row template
                        $content = array(


@@ -210,12 +210,12 @@ if (isGetRequestElementSet('reg_ext')) {
                        );
 
                        // Not valid!
                        );
 
                        // Not valid!

-                       $OUT .= loadTemplate('admin_delete_extensions_row_404', true, $content);
+                       $OUT .= loadTemplate('admin_delete_extensions_row_404', TRUE, $content);

                }
        } // END - foreach
 
        // Load template
                }
        } // END - foreach
 
        // Load template

-       loadTemplate('admin_delete_extensions', false, $OUT);
+       loadTemplate('admin_delete_extensions', FALSE, $OUT);

        $do = 'delete';
 } elseif ((isFormSent('do_delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Remove extensions from DB (you have to delete all files manually!)
        $do = 'delete';
 } elseif ((isFormSent('do_delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Remove extensions from DB (you have to delete all files manually!)


@@ -245,12 +245,12 @@ if (isGetRequestElementSet('reg_ext')) {
 
        // Show next link
        if (isExtensionActive('task')) {
 
        // Show next link
        if (isExtensionActive('task')) {

-               loadTemplate('admin_next_link', false, array(
+               loadTemplate('admin_next_link', FALSE, array(

                        'url'   => 'modules.php?module=admin&what=list_task',
                        'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
                ));
        } else {
                        'url'   => 'modules.php?module=admin&what=list_task',
                        'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
                ));
        } else {

-               loadTemplate('admin_next_link', false, array(
+               loadTemplate('admin_next_link', FALSE, array(

                        'url'   => 'modules.php?module=admin',
                        'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
                ));
                        'url'   => 'modules.php?module=admin',
                        'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
                ));


@@ -317,14 +317,14 @@ ORDER BY
                                $content['ext_css'] = $cssSelection;
 
                                // Load row template and switch color
                                $content['ext_css'] = $cssSelection;
 
                                // Load row template and switch color

-                               $OUT .= loadTemplate('admin_list_extensions_row', true, $content);
+                               $OUT .= loadTemplate('admin_list_extensions_row', TRUE, $content);

                        } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);
 
                        // Load template
                        } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);
 
                        // Load template

-                       loadTemplate('admin_list_extensions', false, $OUT);
+                       loadTemplate('admin_list_extensions', FALSE, $OUT);

                } else {
                        // No extensions are registered
                        displayMessage('{--ADMIN_NO_EXTENSION_REGISTERED--}');
                } else {
                        // No extensions are registered
                        displayMessage('{--ADMIN_NO_EXTENSION_REGISTERED--}');


@@ -333,7 +333,7 @@ ORDER BY
 
        case 'register': // Register new extension
                // Are there some tasks?
 
        case 'register': // Register new extension
                // Are there some tasks?

-               $numTasks = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, "AND `task_type`='EXTENSION'");
+               $numTasks = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', TRUE, "AND `task_type`='EXTENSION'");

 
                // Is the id number valid and the task was found?
                if (($taskId > 0) && ($numTasks > 0)) {
 
                // Is the id number valid and the task was found?
                if (($taskId > 0) && ($numTasks > 0)) {

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 43205e66a702bbaa379e1e34dfb5bb4569f18659..81659dc623b0c705dddfe5625b0765a93897e5d2 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -177,7 +177,7 @@ ORDER BY `sort` ASC",
        $content['action_selection'] = adminAddMenuSelectionBox('guest', 'action', 'menu');
 
        // Display form
        $content['action_selection'] = adminAddMenuSelectionBox('guest', 'action', 'menu');
 
        // Display form

-       loadTemplate('admin_add_guest_menu', false, $content);
+       loadTemplate('admin_add_guest_menu', FALSE, $content);

 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestElementSet('menu')) {
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestElementSet('menu')) {

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 10ee27a8c1b1363d4101c11735ac79044fc58731..dad4a78ae48d4a202fd0126d5009c00134725296 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -78,13 +78,13 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load row template
                                );
 
                                // Load row template

-                               $OUT .= loadTemplate('admin_edit_guest_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_edit_guest_menu_row', TRUE, $content);

                        } else {
                                // Entry not found
                                $content = array(
                                        'sel' => $sel
                                );
                        } else {
                                // Entry not found
                                $content = array(
                                        'sel' => $sel
                                );

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
 
                        // Free result and switch color
                        }
 
                        // Free result and switch color


@@ -98,7 +98,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_edit_guest_menu_form', false, $content);
+       loadTemplate('admin_edit_guest_menu_form', FALSE, $content);

 } elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $subMenu;
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $subMenu;


@@ -120,13 +120,13 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                        'menu'  => $content['title'],
                                        'sel'   => $sel,
                                );
                                        'menu'  => $content['title'],
                                        'sel'   => $sel,
                                );

-                               $OUT .= loadTemplate('admin_delete_guest_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_delete_guest_menu_row', TRUE, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                                        'sel' => $sel
                                );
                        } else {
                                // Entry not found?
                                $content = array(
                                        'sel' => $sel
                                );

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
                        SQL_FREERESULT($result);
                } // END - if
                        }
                        SQL_FREERESULT($result);
                } // END - if


@@ -138,7 +138,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_delete_guest_menu', false, $content);
+       loadTemplate('admin_delete_guest_menu', FALSE, $content);

 } elseif ((isPostRequestElementSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $subMenu;
 } elseif ((isPostRequestElementSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $subMenu;


@@ -163,13 +163,13 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_menu_status_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_status_row', TRUE, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                                        'sel' => $sel
                                );
                        } else {
                                // Entry not found?
                                $content = array(
                                        'sel' => $sel
                                );

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
 
                        SQL_FREERESULT($result);
                        }
 
                        SQL_FREERESULT($result);


@@ -182,7 +182,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_guest_menu_status', false, $content);
+       loadTemplate('admin_guest_menu_status', FALSE, $content);

 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An action is done...
        adminProcessMenuEditForm('guest', $subMenu);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An action is done...
        adminProcessMenuEditForm('guest', $subMenu);


@@ -234,7 +234,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                        );
 
                        // Load row template
                        );
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
+                       $OUT .= loadTemplate('admin_menu_overview_row', TRUE, $content);

                } // END - while
 
                // Add rows/sub
                } // END - while
 
                // Add rows/sub


@@ -245,7 +245,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                SQL_FREERESULT($result);
 
                // Load template
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('admin_edit_guest_menu', false, $content);
+               loadTemplate('admin_edit_guest_menu', FALSE, $content);

        } else {
                // Menu entries are missing... (???)
                displayMessage('{--ADMIN_NO_MENUS_FOUND--}');
        } else {
                // Menu entries are missing... (???)
                displayMessage('{--ADMIN_NO_MENUS_FOUND--}');

diff --git a/inc/modules/admin/what-list_ b/inc/modules/admin/what-list_
index 4885a6a28582a6d1e53290b4b1e10998127548aa..c18d48e917f49e5bccffecd0f05fbbb421a61846 100644 (file)
--- a/inc/modules/admin/what-list_
+++ b/inc/modules/admin/what-list_
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for '???_id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('???_id'))) {
 
 // Check for '???_id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('???_id'))) {


@@ -61,7 +61,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_edit_show_!!!s');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_!!!s');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_!!!s');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_!!!s');


@@ -70,7 +70,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_delete_show_!!!s');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_!!!s');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_!!!s');
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_!!!s');


@@ -79,7 +79,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_lock_show_!!!s');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_lock_show_!!!s');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
        showEntriesByXmlCallback('admin_lock_do_!!!s');
 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
        showEntriesByXmlCallback('admin_lock_do_!!!s');


@@ -88,16 +88,16 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_undelete_show_!!!s');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_undelete_show_!!!s');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        showEntriesByXmlCallback('admin_undelete_do_!!!s');
 }
 
 // Show entries?
 } elseif (isFormSent('do_undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        showEntriesByXmlCallback('admin_undelete_do_!!!s');
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all !!!
 } // END - if
 
 // List all !!!

diff --git a/inc/modules/admin/what-list_admins_acls.php b/inc/modules/admin/what-list_admins_acls.php
index acb7783c64e9b5dbe75458864431e34b8ccfdb47..904b458c087d6cc7b20ae124c3f6770419e98464 100644 (file)
--- a/inc/modules/admin/what-list_admins_acls.php
+++ b/inc/modules/admin/what-list_admins_acls.php
@@ -66,11 +66,11 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                );
 
                // Load row template
                );
 
                // Load row template

-               $OUT .= loadTemplate('admin_edit_admins_acls_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_admins_acls_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_edit_admins_acls', false, $OUT);
+       loadTemplate('admin_edit_admins_acls', FALSE, $OUT);

 } elseif ((isFormSent('do_edit')) && (ifPostContainsSelections())) {
        // Change entries
        foreach (postRequestElement('sel') as $id => $selected) {
 } elseif ((isFormSent('do_edit')) && (ifPostContainsSelections())) {
        // Change entries
        foreach (postRequestElement('sel') as $id => $selected) {


@@ -116,11 +116,11 @@ LIMIT 1",
                $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                // Load row template and switch colors
                $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('admin_delete_admins_acls_row', true, $content);
+               $OUT .= loadTemplate('admin_delete_admins_acls_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_delete_admins_acls', false, $OUT);
+       loadTemplate('admin_delete_admins_acls', FALSE, $OUT);

 } elseif ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
        // Remove entries
        // @TODO Rewrite this to filter 'run_sqls'
 } elseif ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
        // Remove entries
        // @TODO Rewrite this to filter 'run_sqls'


@@ -139,18 +139,18 @@ LIMIT 1",
        $mode = getAdminDefaultAcl(bigintval(postRequestElement('admin_id')));
 
        // Default ACL is false
        $mode = getAdminDefaultAcl(bigintval(postRequestElement('admin_id')));
 
        // Default ACL is false

-       $ACL = false;
+       $ACL = FALSE;

        if (isPostRequestElementSet('what_menu')) {
                // Check parent ACL
                $ACL = isAdminsAllowedByAcl(getActionFromModuleWhat('admin', postRequestElement('what_menu')), '');
        } // END - if
 
        if (isPostRequestElementSet('what_menu')) {
                // Check parent ACL
                $ACL = isAdminsAllowedByAcl(getActionFromModuleWhat('admin', postRequestElement('what_menu')), '');
        } // END - if
 

-       if (($mode != postRequestElement('do')) || (($ACL === true) && (postRequestElement('do') == 'deny'))) {
+       if (($mode != postRequestElement('do')) || (($ACL === TRUE) && (postRequestElement('do') == 'deny'))) {

                // Mode is fine
                $BOTH = ((isPostRequestElementSet('action_menu')) && (isPostRequestElementSet('what_menu')) && (postRequestElement('action_menu') != '') && (postRequestElement('what_menu') != ''));
 
                // Check if one has been selected
                // Mode is fine
                $BOTH = ((isPostRequestElementSet('action_menu')) && (isPostRequestElementSet('what_menu')) && (postRequestElement('action_menu') != '') && (postRequestElement('what_menu') != ''));
 
                // Check if one has been selected

-               if ((((isPostRequestElementSet('action_menu')) && (postRequestElement('action_menu') != '')) || ((isPostRequestElementSet('what_menu')) && (postRequestElement('what_menu') != ''))) && ($BOTH === false)) {
+               if ((((isPostRequestElementSet('action_menu')) && (postRequestElement('action_menu') != '')) || ((isPostRequestElementSet('what_menu')) && (postRequestElement('what_menu') != ''))) && ($BOTH === FALSE)) {

                        // Main or sub menu selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' AND `what_menu`='%s' LIMIT 1",
                                array(
                        // Main or sub menu selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' AND `what_menu`='%s' LIMIT 1",
                                array(


@@ -222,14 +222,14 @@ ORDER BY
                        $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                        // Load row template and switch colors
                        $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('admin_list_admins_acls_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_admins_acls_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template

-               loadTemplate('admin_list_admins_acls', false, $OUT);
+               loadTemplate('admin_list_admins_acls', FALSE, $OUT);

        } // END - if
 
        // Prepare some constants for the template
        } // END - if
 
        // Prepare some constants for the template


@@ -238,7 +238,7 @@ ORDER BY
        $content['what_selection']   = adminMenuSelectionBox_DEPRECATED('what');
 
        // Load template for adding new ACL
        $content['what_selection']   = adminMenuSelectionBox_DEPRECATED('what');
 
        // Load template for adding new ACL

-       loadTemplate('admin_add_admins_acl', false, $content);
+       loadTemplate('admin_add_admins_acl', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 5bad1b57795fe3def52dc3bdf95851fdbb1bb33d..60570ece3307b7c434823eb65cb9900d9ee2e586 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -83,7 +83,7 @@ if (!SQL_HASZERONUMS($result)) {
                );
 
                // Load row template
                );
 
                // Load row template

-               $OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
+               $OUT .= loadTemplate('admin_list_autopurge_row', TRUE, $content);

        } // END - while
 
        // Free memory
        } // END - while
 
        // Free memory


@@ -91,7 +91,7 @@ if (!SQL_HASZERONUMS($result)) {
        $content['rows'] = $OUT;
 
        // Load main template
        $content['rows'] = $OUT;
 
        // Load main template

-       loadTemplate('admin_list_autopurge', false, $content);
+       loadTemplate('admin_list_autopurge', FALSE, $content);

 } else {
        // All members are active or you don't have any registered
        displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
 } else {
        // All members are active or you don't have any registered
        displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');

diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php
index 963faa233be2f496879c4a86363b383690f04a2d..f35badc028826a029d6b976f953a7642e7f63b9c 100644 (file)
--- a/inc/modules/admin/what-list_bank_package.php
+++ b/inc/modules/admin/what-list_bank_package.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Check if there is enougth selected
 addYouAreHereLink('admin', __FILE__);
 
 // Check if there is enougth selected

-$show = true;
+$show = TRUE;

 if (ifPostContainsSelections('id')) {
        // Okay, which button was pressed?
        if (isFormSent('change')) {
 if (ifPostContainsSelections('id')) {
        // Okay, which button was pressed?
        if (isFormSent('change')) {


@@ -108,7 +108,7 @@ if (ifPostContainsSelections('id')) {
                                ''
                        )
                );
                                ''
                        )
                );

-               $show = false;
+               $show = FALSE;

        } elseif (isFormSent('do_edit')) {
                // Delete entries (with confirmation)
                adminEditEntriesConfirm(
        } elseif (isFormSent('do_edit')) {
                // Delete entries (with confirmation)
                adminEditEntriesConfirm(


@@ -118,7 +118,7 @@ if (ifPostContainsSelections('id')) {
                        array(),
                        array(),
                        array(),
                        array(),
                        array(),
                        array(),

-                       array(true)
+                       array(TRUE)

                );
        } elseif (isFormSent('delete')) {
                // Delete entries (with confirmation)
                );
        } elseif (isFormSent('delete')) {
                // Delete entries (with confirmation)


@@ -145,7 +145,7 @@ if (ifPostContainsSelections('id')) {
                                ''
                        )
                );
                                ''
                        )
                );

-               $show = false;
+               $show = FALSE;

        } elseif (isFormSent('do_delete')) {
                // Delete entries (with confirmation)
                adminDeleteEntriesConfirm(
        } elseif (isFormSent('do_delete')) {
                // Delete entries (with confirmation)
                adminDeleteEntriesConfirm(


@@ -155,13 +155,13 @@ if (ifPostContainsSelections('id')) {
                        array(),
                        array(),
                        array(),
                        array(),
                        array(),
                        array(),

-                       array(true)
+                       array(TRUE)

                );
        }
 } // END - if
 
 // Skip showing old entries?
                );
        }
 } // END - if
 
 // Skip showing old entries?

-if ($show === false) return;
+if ($show === FALSE) return;

 
 // Load all banking packages from DB
 $result = SQL_QUERY('SELECT
 
 // Load all banking packages from DB
 $result = SQL_QUERY('SELECT


@@ -183,11 +183,11 @@ if (!SQL_HASZERONUMS($result)) {
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Load row template
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Load row template

-               $OUT .= loadTemplate('admin_list_bank_package_row', true, $content);
+               $OUT .= loadTemplate('admin_list_bank_package_row', TRUE, $content);

        } // END - while
 
        // Load main template
        } // END - while
 
        // Load main template

-       loadTemplate('admin_list_bank_package', false, $OUT);
+       loadTemplate('admin_list_bank_package', FALSE, $OUT);

 } else {
        // No packages found
        displayMessage('{--ADMIN_BANK_NO_PACKAGES_FOUND--}');
 } else {
        // No packages found
        displayMessage('{--ADMIN_BANK_NO_PACKAGES_FOUND--}');

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index c168877428d6e60bd9769d2c9f34bb12e2adb222..ad47803a44c7e7c983ea984420b41724fc042cb0 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -106,7 +106,7 @@ ORDER BY
                        );
 
                        // Load template and add it
                        );
 
                        // Load template and add it

-                       $OUT .= loadTemplate('admin_list_beg_rows', true, $row);
+                       $OUT .= loadTemplate('admin_list_beg_rows', TRUE, $row);

                        $count++;
                        $total += $content['beg_points'];
                } // END - while
                        $count++;
                        $total += $content['beg_points'];
                } // END - while


@@ -117,21 +117,21 @@ ORDER BY
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {
                        // Load form
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {
                        // Load form

-                       $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
+                       $content['withdraw_form'] = loadTemplate('admin_list_beg_form', TRUE);

                } else {
                        // Display message "no manual withdraw possible"
                } else {
                        // Display message "no manual withdraw possible"

-                       $content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', true);
+                       $content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', TRUE);

                }
 
                // Prepare constant for timemark
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {
                }
 
                // Prepare constant for timemark
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {

-                       $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', true);
+                       $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', TRUE);

                }
 
                // Load final template
                }
 
                // Load final template

-               loadTemplate('admin_list_beg', false, $content);
+               loadTemplate('admin_list_beg', FALSE, $content);

        } else {
                // No one has joined the begging rallye...
                displayMessage('{--ADMIN_BEG_NO_RALLYE--}');
        } else {
                // No one has joined the begging rallye...
                displayMessage('{--ADMIN_BEG_NO_RALLYE--}');

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 068106e5d4b15cf1e4f882bb047917ff92c2a501..70c57a3a5ee013a6ef08964847ce81a6dfce0e66 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -117,7 +117,7 @@ ORDER BY
                        $content['count']       = $count;
 
                        // Load template and add it
                        $content['count']       = $count;
 
                        // Load template and add it

-                       $OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
+                       $OUT .= loadTemplate('admin_list_bonus_rows', TRUE, $content);

                        $count++;
                } // END - while
 
                        $count++;
                } // END - while
 


@@ -127,10 +127,10 @@ ORDER BY
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {
                        // Load form
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {
                        // Load form

-                       $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', true);
+                       $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', TRUE);

                } else {
                        // Display message "no manual withdraw possible"
                } else {
                        // Display message "no manual withdraw possible"

-                       $content['withdraw_form'] = loadTemplate('admin_settings_unsaved', true, '{--ADMIN_BONUS_ALREADY_WITHDRAW--}');
+                       $content['withdraw_form'] = loadTemplate('admin_settings_unsaved', TRUE, '{--ADMIN_BONUS_ALREADY_WITHDRAW--}');

                }
 
                // Prepare constant for timemark
                }
 
                // Prepare constant for timemark


@@ -142,7 +142,7 @@ ORDER BY
                }
 
                // Load final template
                }
 
                // Load final template

-               loadTemplate('admin_list_bonus', false, $content);
+               loadTemplate('admin_list_bonus', FALSE, $content);

        } else {
                // No one has become an "activity bonus"...
                displayMessage('{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
        } else {
                // No one has become an "activity bonus"...
                displayMessage('{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 15a090bda7cbfdaf3d91522de848eb6f88a1868b..f1574fd56168f17a956a15a66161049ff71dbec8 100644 (file)
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -80,7 +80,7 @@ if (isGetRequestElementSet('userid')) {
                                $content['sel']   = $selection;
 
                                // Load row template and count up
                                $content['sel']   = $selection;
 
                                // Load row template and count up

-                               $OUT .= loadTemplate('admin_list_user_cats_row', true, $content);
+                               $OUT .= loadTemplate('admin_list_user_cats_row', TRUE, $content);

                                $count++;
                        } // END - while
 
                                $count++;
                        } // END - while
 


@@ -91,10 +91,10 @@ if (isGetRequestElementSet('userid')) {
                        $content['rows'] = $OUT;
 
                        // Load main template
                        $content['rows'] = $OUT;
 
                        // Load main template

-                       loadTemplate('admin_list_user_cats', false, $content);
+                       loadTemplate('admin_list_user_cats', FALSE, $content);

                } else {
                        // No categories selected! :-(
                } else {
                        // No categories selected! :-(

-                       loadTemplate('admin_list_user_cats_404', false, $content);
+                       loadTemplate('admin_list_user_cats_404', FALSE, $content);

                }
        } else {
                // User not found
                }
        } else {
                // User not found

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index c27f2284b37833333e73221dd078bc4e0e8e8a26..518ce7690bf1b9883d8a21c23b2de1e54c05b598 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -74,7 +74,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
        adminChangeActivationStatus(postRequestElement('id'), 'countries', 'is_active');
 
        // Show next link
        adminChangeActivationStatus(postRequestElement('id'), 'countries', 'is_active');
 
        // Show next link

-       loadTemplate('admin_next_link', false, array(
+       loadTemplate('admin_next_link', FALSE, array(

                'url'   => 'modules.php?module=admin&what=list_country',
                'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
        ));
                'url'   => 'modules.php?module=admin&what=list_country',
                'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
        ));


@@ -114,7 +114,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
                                $content['is_active'] = $isActive;
 
                                // Insert row template and switch color
                                $content['is_active'] = $isActive;
 
                                // Insert row template and switch color

-                               $OUT .= loadTemplate($row, true, $content);
+                               $OUT .= loadTemplate($row, TRUE, $content);

                        } // END - if
 
                        // Free result
                        } // END - if
 
                        // Free result


@@ -132,7 +132,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
                );
 
                // Load main template
                );
 
                // Load main template

-               loadTemplate('admin_list_country_form', false, $content);
+               loadTemplate('admin_list_country_form', FALSE, $content);

        } // END - if
 } else {
        // Shall we modify / remove entries now?
        } // END - if
 } else {
        // Shall we modify / remove entries now?


@@ -181,24 +181,24 @@ LIMIT 1");
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('admin_list_country_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_country_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // No code setup so far (not possible by this software! 'DE' for 'Deutschland' is default
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // No code setup so far (not possible by this software! 'DE' for 'Deutschland' is default

-               $OUT = loadTemplate('admin_list_country_no_row', true);
+               $OUT = loadTemplate('admin_list_country_no_row', TRUE);

        }
 
        // Add list to constant for the template
        $content['rows'] = $OUT;
 
        // Include add template
        }
 
        // Add list to constant for the template
        $content['rows'] = $OUT;
 
        // Include add template

-       $content['add_form'] = loadTemplate('admin_add_country', true);
+       $content['add_form'] = loadTemplate('admin_add_country', TRUE);

 
        // Load main template
 
        // Load main template

-       loadTemplate('admin_list_country', false, $content);
+       loadTemplate('admin_list_country', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_coupon.php b/inc/modules/admin/what-list_coupon.php
index cd47e625e7ff83ec4bcff59721a706aaffd00988..af6b30d1ac6e48034d5befc6a1a653356e42ee98 100644 (file)
--- a/inc/modules/admin/what-list_coupon.php
+++ b/inc/modules/admin/what-list_coupon.php
@@ -82,11 +82,11 @@ ORDER BY
                        $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2');
 
                        // Add the row template
                        $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2');
 
                        // Add the row template

-                       $OUT .= loadTemplate('admin_list_coupon_usr_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_coupon_usr_row', TRUE, $content);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               loadTemplate('admin_list_coupon_usr', false, $OUT);
+               loadTemplate('admin_list_coupon_usr', FALSE, $OUT);

        } else {
                // No cashed coupons found
                displayMessage('{--ADMIN_LIST_COUPON_404--}');
        } else {
                // No cashed coupons found
                displayMessage('{--ADMIN_LIST_COUPON_404--}');


@@ -121,11 +121,11 @@ ORDER BY
                        $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2');
 
                        // Add the row template
                        $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2');
 
                        // Add the row template

-                       $OUT .= loadTemplate('admin_list_coupon_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_coupon_row', TRUE, $content);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               loadTemplate('admin_list_coupon', false, $OUT);
+               loadTemplate('admin_list_coupon', FALSE, $OUT);

        } else {
                // No cashed coupons found
                displayMessage('{--ADMIN_LIST_COUPON_404--}');
        } else {
                // No cashed coupons found
                displayMessage('{--ADMIN_LIST_COUPON_404--}');

diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php
index 4bcb982a760b9b4f8cddbf371b2501a7fb179445..190be0268fb1c9786c0527a9a3769f7600160a94 100644 (file)
--- a/inc/modules/admin/what-list_doubler.php
+++ b/inc/modules/admin/what-list_doubler.php
@@ -71,7 +71,7 @@ switch (getRequestElement('do')) {
                $sumAlready = '0'; $sumWaiting = '0';
 
                // Number of direct already payouts and referral
                $sumAlready = '0'; $sumWaiting = '0';
 
                // Number of direct already payouts and referral

-               $count = countSumTotalData('Y','doubler','id','completed',true, " AND `is_ref`='N'");
+               $count = countSumTotalData('Y', 'doubler', 'id', 'completed', TRUE, " AND `is_ref`='N'");

 
                if ($count > 0) {
                        // Something was payed out
 
                if ($count > 0) {
                        // Something was payed out


@@ -79,7 +79,7 @@ switch (getRequestElement('do')) {
                        $content['already_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=already&amp;select=direct%}">' . $count . '</a>';
                } // END - if
 
                        $content['already_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=already&amp;select=direct%}">' . $count . '</a>';
                } // END - if
 

-               $count = countSumTotalData('Y','doubler','id','completed',true, " AND `is_ref`='Y'");
+               $count = countSumTotalData('Y', 'doubler', 'id', 'completed', TRUE, " AND `is_ref`='Y'");

 
                if ($count > 0) {
                        // Something was payed out
 
                if ($count > 0) {
                        // Something was payed out


@@ -88,7 +88,7 @@ switch (getRequestElement('do')) {
                } // END - if
 
                // And the same for waiting pouts (direct and referral)
                } // END - if
 
                // And the same for waiting pouts (direct and referral)

-               $count = countSumTotalData('N','doubler','id','completed',true, " AND `is_ref`='N'");
+               $count = countSumTotalData('N', 'doubler', 'id', 'completed', TRUE, " AND `is_ref`='N'");

 
                if ($count > 0) {
                        // Something was payed out
 
                if ($count > 0) {
                        // Something was payed out


@@ -96,7 +96,7 @@ switch (getRequestElement('do')) {
                        $content['waiting_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=waiting&amp;select=direct%}">' . $count . '</a>';
                } // END - if
 
                        $content['waiting_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=waiting&amp;select=direct%}">' . $count . '</a>';
                } // END - if
 

-               $count = countSumTotalData('N','doubler','id','completed',true, " AND `is_ref`='Y'");
+               $count = countSumTotalData('N', 'doubler', 'id', 'completed', TRUE, " AND `is_ref`='Y'");

 
                if ($count > 0) {
                        // Something was payed out
 
                if ($count > 0) {
                        // Something was payed out


@@ -113,7 +113,7 @@ switch (getRequestElement('do')) {
 } // END - switch
 
 // Load mode template
 } // END - switch
 
 // Load mode template

-loadTemplate('admin_list_doubler_' . getRequestElement('do'), false, $content);
+loadTemplate('admin_list_doubler_' . getRequestElement('do'), FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-list_email_max_rec.php b/inc/modules/admin/what-list_email_max_rec.php
index beba87e5e2f4a82bf224f2bd4c703cabfe287fb5..0dc271e48c99f097bd41814df0428af8b3ac1174 100644 (file)
--- a/inc/modules/admin/what-list_email_max_rec.php
+++ b/inc/modules/admin/what-list_email_max_rec.php
@@ -108,12 +108,12 @@ if (isPostRequestElementSet('add_max')) {
                SQL_FREERESULT($result);
 
                // Load row template and switch color
                SQL_FREERESULT($result);
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_delete_email_max_rec_row', true, $content);
+               $OUT .= loadTemplate('admin_delete_email_max_rec_row', TRUE, $content);

        } // END - foreach
        $content['rows'] = $OUT;
 
        // Load main template
        } // END - foreach
        $content['rows'] = $OUT;
 
        // Load main template

-       loadTemplate('admin_delete_email_max_rec', false, $content);
+       loadTemplate('admin_delete_email_max_rec', FALSE, $content);

 } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit entries
        $OUT = '';
 } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit entries
        $OUT = '';


@@ -125,12 +125,12 @@ if (isPostRequestElementSet('add_max')) {
                SQL_FREERESULT($result);
 
                // Load row template and switch color
                SQL_FREERESULT($result);
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_edit_email_max_rec_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_email_max_rec_row', TRUE, $content);

        } // END - foreach
        $content['rows'] = $OUT;
 
        // Load main template
        } // END - foreach
        $content['rows'] = $OUT;
 
        // Load main template

-       loadTemplate('admin_edit_email_max_rec', false, $content);
+       loadTemplate('admin_edit_email_max_rec', FALSE, $content);

 } else {
        $result = SQL_QUERY("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
        __FILE__, __LINE__);
 } else {
        $result = SQL_QUERY("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
        __FILE__, __LINE__);


@@ -139,7 +139,7 @@ if (isPostRequestElementSet('add_max')) {
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch color
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_list_email_max_rec_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_email_max_rec_row', TRUE, $content);

                } // END - while
 
                // Free memory
                } // END - while
 
                // Free memory


@@ -147,7 +147,7 @@ if (isPostRequestElementSet('add_max')) {
                $content['rows'] = $OUT;
 
                // Load main template
                $content['rows'] = $OUT;
 
                // Load main template

-               loadTemplate('admin_list_email_max_rec', false, $content);
+               loadTemplate('admin_list_email_max_rec', FALSE, $content);

        } // END - if
 
        // Display form
        } // END - if
 
        // Display form

diff --git a/inc/modules/admin/what-list_forced_ads.php b/inc/modules/admin/what-list_forced_ads.php
index b728277d3ded9b81e92583d71e28026e34dbfeaa..4771a77db5e25f6447020466741c933e93dfbc2d 100644 (file)
--- a/inc/modules/admin/what-list_forced_ads.php
+++ b/inc/modules/admin/what-list_forced_ads.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('forced_ads_id'))) {
 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('forced_ads_id'))) {


@@ -64,7 +64,7 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_edit_show_forced_ads');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_forced_ads');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_forced_ads');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_forced_ads');


@@ -73,16 +73,16 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_delete_show_forced_ads');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_forced_ads');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_forced_ads');
 }
 
 // Show entries?
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_forced_ads');
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all URLs
 } // END - if
 
 // List all URLs

diff --git a/inc/modules/admin/what-list_forced_campaigns.php b/inc/modules/admin/what-list_forced_campaigns.php
index 3a1ad98836ea9583cabb480e37fff7c339d15d30..50949df58064c9ee8751777f67ea860d956cbaf5 100644 (file)
--- a/inc/modules/admin/what-list_forced_campaigns.php
+++ b/inc/modules/admin/what-list_forced_campaigns.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('forced_campaign_id'))) {
 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('forced_campaign_id'))) {


@@ -64,7 +64,7 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_edit_show_forced_campaigns');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_forced_campaigns');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_forced_campaigns');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_forced_campaigns');


@@ -73,7 +73,7 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_delete_show_forced_campaigns');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_forced_campaigns');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_forced_campaigns');
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_forced_campaigns');


@@ -82,7 +82,7 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_lock_show_forced_campaigns');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_lock_show_forced_campaigns');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected campaigns. This does not work for pending campaigns
        showEntriesByXmlCallback('admin_lock_do_forced_campaigns');
 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected campaigns. This does not work for pending campaigns
        showEntriesByXmlCallback('admin_lock_do_forced_campaigns');


@@ -98,9 +98,9 @@ if (isFormSent('add')) {
 }
 
 // Show entries?
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all campaigns
 } // END - if
 
 // List all campaigns


@@ -112,7 +112,7 @@ $content = array(
 );
 
 // Display form for adding a forced-ad
 );
 
 // Display form for adding a forced-ad

-loadTemplate('admin_add_forced_campaign', false, $content);
+loadTemplate('admin_add_forced_campaign', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-list_forced_costs.php b/inc/modules/admin/what-list_forced_costs.php
index 81c683069e2b9a9fa44cf1221e7a85e58f0ac312..e4f3ae440694ab57afb669a4feb4180a0e0b6ef7 100644 (file)
--- a/inc/modules/admin/what-list_forced_costs.php
+++ b/inc/modules/admin/what-list_forced_costs.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('forced_costs_id'))) {
 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('forced_costs_id'))) {


@@ -64,7 +64,7 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_edit_show_forced_costs');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_forced_costs');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_forced_costs');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_forced_costs');


@@ -73,16 +73,16 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_delete_show_forced_costs');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_forced_costs');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_forced_costs');
 }
 
 // Show entries?
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_forced_costs');
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all URLs
 } // END - if
 
 // List all URLs

diff --git a/inc/modules/admin/what-list_grade_data.php b/inc/modules/admin/what-list_grade_data.php
index 173bcbe72f6f7eee8211173986d1e78dbad4849a..d6eb5bf20f05f1d2c5cd18f35862a033e1912edc 100644 (file)
--- a/inc/modules/admin/what-list_grade_data.php
+++ b/inc/modules/admin/what-list_grade_data.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for '???_id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('grade_id'))) {
 
 // Check for '???_id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('grade_id'))) {


@@ -61,7 +61,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_edit_show_grade_data');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_grade_data');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_grade_data');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_grade_data');


@@ -70,16 +70,16 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_delete_show_grade_data');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_grade_data');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_grade_data');
 }
 
 // Show entries?
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_grade_data');
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all URLs
 } // END - if
 
 // List all URLs

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 772b46616b6af198532cd96d6809e765d101eef5..e3899b351cae6fac7429e5800f4c0e4875f7d0c1 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -71,14 +71,14 @@ if (!SQL_HASZERONUMS($result)) {
                );
 
                // Load row template and switch color
                );
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_list_holiday_row', true, $content);
+               $OUT .= loadTemplate('admin_list_holiday_row', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load main template
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load main template

-       loadTemplate('admin_list_holiday', false, $OUT);
+       loadTemplate('admin_list_holiday', FALSE, $OUT);

 } else {
        // No holiday requests found
        displayMessage('{--ADMIN_HOLIDAY_NOTHING_FOUND--}');
 } else {
        // No holiday requests found
        displayMessage('{--ADMIN_HOLIDAY_NOTHING_FOUND--}');

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 1b024ace196fc6e2c152c9256ffeaba00bd40c5c..4a94c12924c919dbd581f63b634b6fb478b33dfd 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -90,7 +90,7 @@ if (isGetRequestElementSet('userid')) {
                                        // Initializes all other elements
                                        $linkData['mail_id'] = '';
                                        $linkData['problem'] = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
                                        // Initializes all other elements
                                        $linkData['mail_id'] = '';
                                        $linkData['problem'] = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';

-                                       $result_data = false;
+                                       $result_data = FALSE;

 
                                        // Load data from stats table...
                                        // @TODO Rewrite this to includes/filter
 
                                        // Load data from stats table...
                                        // @TODO Rewrite this to includes/filter


@@ -131,10 +131,10 @@ if (isGetRequestElementSet('userid')) {
                                                $mailData['timestamp'] = generateDateTime($mailData['timestamp'], 0);
 
                                                // Load row template
                                                $mailData['timestamp'] = generateDateTime($mailData['timestamp'], 0);
 
                                                // Load row template

-                                               $OUT .= loadTemplate('admin_list_links_row', true, $mailData);
+                                               $OUT .= loadTemplate('admin_list_links_row', TRUE, $mailData);

                                        } else {
                                                // Load template for error
                                        } else {
                                                // Load template for error

-                                               $OUT .= loadTemplate('admin_list_links_problem', true, $linkData);
+                                               $OUT .= loadTemplate('admin_list_links_problem', TRUE, $linkData);

                                        }
 
                                        // Free result
                                        }
 
                                        // Free result


@@ -153,7 +153,7 @@ if (isGetRequestElementSet('userid')) {
                                SQL_FREERESULT($result);
 
                                // Load final template
                                SQL_FREERESULT($result);
 
                                // Load final template

-                               loadTemplate('admin_list_links', false, $content);
+                               loadTemplate('admin_list_links', FALSE, $content);

                        }
                } else {
                        // No mails left to confirm
                        }
                } else {
                        // No mails left to confirm

diff --git a/inc/modules/admin/what-list_network_array_translation.php b/inc/modules/admin/what-list_network_array_translation.php
index 40f63f3cd0000c28bfbd5ed4da81415b39a7b303..506804755fc7ed05d8d5e10d4d7684713ceea3c2 100644 (file)
--- a/inc/modules/admin/what-list_network_array_translation.php
+++ b/inc/modules/admin/what-list_network_array_translation.php
@@ -50,13 +50,13 @@ if (doVerifyExpertSettings() != 'agreed') {
 } // END - if
 
 // By default we should display list/add new forms
 } // END - if
 
 // By default we should display list/add new forms

-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;

 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?

-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {

        // Abort here
        return;
 } // END - if
        // Abort here
        return;
 } // END - if


@@ -116,15 +116,15 @@ ORDER BY
                        // Add it to network if the type matches selected
                        if ($row['network_type_id'] == postRequestElement('network_type_id')) {
                                // Matches, then add it for disabling this entry
                        // Add it to network if the type matches selected
                        if ($row['network_type_id'] == postRequestElement('network_type_id')) {
                                // Matches, then add it for disabling this entry

-                               $GLOBALS['network_array_translation_disabled'][$row['network_array_index']] = true;
+                               $GLOBALS['network_array_translation_disabled'][$row['network_array_index']] = TRUE;

                        } // END - if
 
                        // Add row template and switch color
                        } // END - if
 
                        // Add row template and switch color

-                       $OUT .= loadTemplate('admin_list_network_array_translation_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_network_array_translation_row', TRUE, $row);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               loadTemplate('admin_list_network_array_translation', false, $OUT);
+               loadTemplate('admin_list_network_array_translation', FALSE, $OUT);

        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_404=' . $networkData['network_title'] . '%}');
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_404=' . $networkData['network_title'] . '%}');


@@ -134,7 +134,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Add form for adding new array_translation pair
        SQL_FREERESULT($result);
 
        // Add form for adding new array_translation pair

-       loadTemplate('admin_add_network_array_translation', false, $networkData);
+       loadTemplate('admin_add_network_array_translation', FALSE, $networkData);

 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());
 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());

diff --git a/inc/modules/admin/what-list_network_data.php b/inc/modules/admin/what-list_network_data.php
index aa4a9321bdcb4db94496cd75270a5899ab47b42e..04a6c37da5d04ef2a73342b5609676fe6df29385 100644 (file)
--- a/inc/modules/admin/what-list_network_data.php
+++ b/inc/modules/admin/what-list_network_data.php
@@ -50,13 +50,13 @@ if (doVerifyExpertSettings() != 'agreed') {
 } // END - if
 
 // By default we should display list/add new forms
 } // END - if
 
 // By default we should display list/add new forms

-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;

 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?

-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {

        // Abort here
        return;
 } // END - if
        // Abort here
        return;
 } // END - if


@@ -84,11 +84,11 @@ if (!SQL_HASZERONUMS($result)) {
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Load row template
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Load row template

-               $OUT .= loadTemplate('admin_list_network_data_row', true, $content);
+               $OUT .= loadTemplate('admin_list_network_data_row', TRUE, $content);

        } // END - while
 
        // Load main template
        } // END - while
 
        // Load main template

-       loadTemplate('admin_list_network_data', false, $OUT);
+       loadTemplate('admin_list_network_data', FALSE, $OUT);

 } else {
        // Display a message that there are sponsor networks supported, yet
        displayMessage('{--ADMIN_NETWORK_NONE_SUPPORTED--}');
 } else {
        // Display a message that there are sponsor networks supported, yet
        displayMessage('{--ADMIN_NETWORK_NONE_SUPPORTED--}');

diff --git a/inc/modules/admin/what-list_network_request_params.php b/inc/modules/admin/what-list_network_request_params.php
index 74e1909cd6b2341a062dbe509e118f07cd2407b7..1831d44610303f3646943440a9174e8e8bb6e2c5 100644 (file)
--- a/inc/modules/admin/what-list_network_request_params.php
+++ b/inc/modules/admin/what-list_network_request_params.php
@@ -50,13 +50,13 @@ if (doVerifyExpertSettings() != 'agreed') {
 } // END - if
 
 // By default we should display list/add new forms
 } // END - if
 
 // By default we should display list/add new forms

-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;

 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?

-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {

        // Abort here
        return;
 } // END - if
        // Abort here
        return;
 } // END - if


@@ -112,15 +112,15 @@ ORDER BY
                        // Add it to network if the type matches selected
                        if ($row['network_type_id'] == postRequestElement('network_type_id')) {
                                // Matches, then add it for disabling this entry
                        // Add it to network if the type matches selected
                        if ($row['network_type_id'] == postRequestElement('network_type_id')) {
                                // Matches, then add it for disabling this entry

-                               $GLOBALS['network_request_params_disabled'][$row['network_request_param_key']] = true;
+                               $GLOBALS['network_request_params_disabled'][$row['network_request_param_key']] = TRUE;

                        } // END - if
 
                        // Add row template and switch color
                        } // END - if
 
                        // Add row template and switch color

-                       $OUT .= loadTemplate('admin_list_network_request_params_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_network_request_params_row', TRUE, $row);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               loadTemplate('admin_list_network_request_params', false, $OUT);
+               loadTemplate('admin_list_network_request_params', FALSE, $OUT);

        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_404=' . $networkData['network_title'] . '%}');
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_404=' . $networkData['network_title'] . '%}');


@@ -130,7 +130,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Add form for adding new params
        SQL_FREERESULT($result);
 
        // Add form for adding new params

-       loadTemplate('admin_add_network_request_param', false, $networkData);
+       loadTemplate('admin_add_network_request_param', FALSE, $networkData);

 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());
 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());

diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php
index bb15cf56cbefd4af4de1c7745a25468f3a52d205..91adcd523b79fe5dfbee5286f483eec11ccdc1e1 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -50,13 +50,13 @@ if (doVerifyExpertSettings() != 'agreed') {
 } // END - if
 
 // By default we should display list/add new forms
 } // END - if
 
 // By default we should display list/add new forms

-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;

 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?

-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {

        // Abort here
        return;
 } // END - if
        // Abort here
        return;
 } // END - if


@@ -92,14 +92,14 @@ ORDER BY
                $OUT = '';
                while ($row = SQL_FETCHARRAY($result)) {
                        // Set disabled entry
                $OUT = '';
                while ($row = SQL_FETCHARRAY($result)) {
                        // Set disabled entry

-                       $GLOBALS['network_types_disabled'][$row['network_type_handler']] = true;
+                       $GLOBALS['network_types_disabled'][$row['network_type_handler']] = TRUE;

 
                        // Add row template and switch color
 
                        // Add row template and switch color

-                       $OUT .= loadTemplate('admin_list_network_types_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_network_types_row', TRUE, $row);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               loadTemplate('admin_list_network_types', false, $OUT);
+               loadTemplate('admin_list_network_types', FALSE, $OUT);

        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_404=' . $networkData['network_title'] . '%}');
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_404=' . $networkData['network_title'] . '%}');


@@ -112,7 +112,7 @@ ORDER BY
        $networkData['network_type_reload_time_unit'] = generateTimeUnitSelectionBox('h', 'network_type_reload_time_unit', array('W', 'D', 'h', 'm', 's'));
 
        // Add form for adding new types
        $networkData['network_type_reload_time_unit'] = generateTimeUnitSelectionBox('h', 'network_type_reload_time_unit', array('W', 'D', 'h', 'm', 's'));
 
        // Add form for adding new types

-       loadTemplate('admin_add_network_type', false, $networkData);
+       loadTemplate('admin_add_network_type', FALSE, $networkData);

 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());
 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());

diff --git a/inc/modules/admin/what-list_network_vcheck_params.php b/inc/modules/admin/what-list_network_vcheck_params.php
index b2b77a52481740467ef0617292a849194bfb4bfd..82bf013f46087d6220f91f123a875337e80bed36 100644 (file)
--- a/inc/modules/admin/what-list_network_vcheck_params.php
+++ b/inc/modules/admin/what-list_network_vcheck_params.php
@@ -50,13 +50,13 @@ if (doVerifyExpertSettings() != 'agreed') {
 } // END - if
 
 // By default we should display list/add new forms
 } // END - if
 
 // By default we should display list/add new forms

-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;

 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?

-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {

        // Abort here
        return;
 } // END - if
        // Abort here
        return;
 } // END - if


@@ -89,14 +89,14 @@ ORDER BY
                $OUT = '';
                while ($row = SQL_FETCHARRAY($result)) {
                        // Add this entry
                $OUT = '';
                while ($row = SQL_FETCHARRAY($result)) {
                        // Add this entry

-                       $GLOBALS['network_vcheck_params_disabled'][$row['network_vcheck_param_key']] = true;
+                       $GLOBALS['network_vcheck_params_disabled'][$row['network_vcheck_param_key']] = TRUE;

 
                        // Add row template and switch color
 
                        // Add row template and switch color

-                       $OUT .= loadTemplate('admin_list_network_vcheck_params_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_network_vcheck_params_row', TRUE, $row);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               loadTemplate('admin_list_network_vcheck_params', false, $OUT);
+               loadTemplate('admin_list_network_vcheck_params', FALSE, $OUT);

        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_VCHECK_PARAMETER_404=' . $networkData['network_title'] . '%}');
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_VCHECK_PARAMETER_404=' . $networkData['network_title'] . '%}');


@@ -106,7 +106,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Add form for adding new params
        SQL_FREERESULT($result);
 
        // Add form for adding new params

-       loadTemplate('admin_add_network_vcheck_param', false, $networkData);
+       loadTemplate('admin_add_network_vcheck_param', FALSE, $networkData);

 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());
 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index f61e1785a820450936a09727888aab30d9c71c13..51020c6906bbf97c9b0176b1a8a87dc9d83e5d8a 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 // Init variables
 $SQL2 = '';
 
 // Init variables
 $SQL2 = '';

-$result_max = false;
+$result_max = FALSE;

 
 // Set offset an current page to default values
 if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
 
 // Set offset an current page to default values
 if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);


@@ -95,17 +95,17 @@ if ((isExtensionActive('bonus')) && (!SQL_HASZERONUMS($result_max)) && (!empty($
                        $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                        // Load row template
                        $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_list_notify_emails_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_notify_emails_row', TRUE, $content);

                } // END - if
 
                // Add navigation (without change box but with colspan=3)
                } // END - if
 
                // Add navigation (without change box but with colspan=3)

-               $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+               $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);

 
                // Prepare content
                $content['rows'] = $OUT;
 
                // Load main template
 
                // Prepare content
                $content['rows'] = $OUT;
 
                // Load main template

-               loadTemplate('admin_list_notify_emails', false, $content);
+               loadTemplate('admin_list_notify_emails', FALSE, $content);

        }
 } elseif ((SQL_NUMROWS($result_max) === 0) && (is_resource($result_max))) {
        // No notifications found
        }
 } elseif ((SQL_NUMROWS($result_max) === 0) && (is_resource($result_max))) {
        // No notifications found

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index c52066f03f1029092a67dba65a01cfd7d738d4e3..a4c330c85a5bb352d8c14e665d1a9e6f77a724d0 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -124,7 +124,7 @@ LIMIT 1",
                                                } // END - switch
 
                                                // Transfer variables...
                                                } // END - switch
 
                                                // Transfer variables...

-                                               $reason = encodeString(getMessage('ADMIN_PAYOUT_REASON'), false);
+                                               $reason = encodeString(getMessage('ADMIN_PAYOUT_REASON'), FALSE);

 
                                                // Execute transfer
                                                $ret = sendGetRequest($data['engine_url']);
 
                                                // Execute transfer
                                                $ret = sendGetRequest($data['engine_url']);


@@ -160,11 +160,11 @@ LIMIT 1",
                                        } else {
                                                // Something goes wrong... :-(
                                                $content = implode('<br />', $ret);
                                        } else {
                                                // Something goes wrong... :-(
                                                $content = implode('<br />', $ret);

-                                               loadTemplate('admin_payout_failed_transfer', false, $content);
+                                               loadTemplate('admin_payout_failed_transfer', FALSE, $content);

                                        }
                                } else {
                                        // Cannot load payout id
                                        }
                                } else {
                                        // Cannot load payout id

-                                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}');
+                                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}');

                                }
                        } else {
                                // Prepare content
                                }
                        } else {
                                // Prepare content


@@ -175,7 +175,7 @@ LIMIT 1",
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               loadTemplate('admin_payout_accept_form', false, $content);
+                               loadTemplate('admin_payout_accept_form', FALSE, $content);

                        }
                } elseif ((getRequestElement('do') == 'reject') && (getUserData('email') != '')) {
                        // Ok, now we can output the form or execute rejecting
                        }
                } elseif ((getRequestElement('do') == 'reject') && (getUserData('email') != '')) {
                        // Ok, now we can output the form or execute rejecting


@@ -206,7 +206,7 @@ LIMIT 1",
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               loadTemplate('admin_payout_reject_form', false, $content);
+                               loadTemplate('admin_payout_reject_form', FALSE, $content);

                        }
                } else {
                        // Cannot load user data
                        }
                } else {
                        // Cannot load user data


@@ -254,10 +254,10 @@ ORDER BY
                                // Banner/Textlink views/clicks request
                                if (!empty($content['banner'])) {
                                        // Load template for the banner
                                // Banner/Textlink views/clicks request
                                if (!empty($content['banner'])) {
                                        // Load template for the banner

-                                       $content['target_account'] = loadTemplate('admin_list_payouts_banner', true, $content);
+                                       $content['target_account'] = loadTemplate('admin_list_payouts_banner', TRUE, $content);

                                } else {
                                        // Textlink
                                } else {
                                        // Textlink

-                                       $content['target_account'] = loadTemplate('admin_list_payouts_txt', true, $content);
+                                       $content['target_account'] = loadTemplate('admin_list_payouts_txt', TRUE, $content);

                                }
 
                                // Admins can addionally test the URL for framekillers
                                }
 
                                // Admins can addionally test the URL for framekillers


@@ -268,14 +268,14 @@ ORDER BY
                        $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
 
                        // Add row and switch color
                        $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
 
                        // Add row and switch color

-                       $OUT .= loadTemplate('admin_list_payouts_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_payouts_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load final template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load final template

-               loadTemplate('admin_list_payouts', false, $OUT);
+               loadTemplate('admin_list_payouts', FALSE, $OUT);

        } else {
                // No payout requests are sent so far
                displayMessage('{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');
        } else {
                // No payout requests are sent so far
                displayMessage('{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');

diff --git a/inc/modules/admin/what-list_point_accounts.php b/inc/modules/admin/what-list_point_accounts.php
index b6f542d442643f63c0289d3be02499bd22571653..a605653754b0cb0b4ab022ec051bcaf9bb937e59 100644 (file)
--- a/inc/modules/admin/what-list_point_accounts.php
+++ b/inc/modules/admin/what-list_point_accounts.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('id'))) {
 
 // Check for 'url_id' element
 if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('id'))) {


@@ -70,7 +70,7 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_edit_show_point_accounts');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_point_accounts');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of only custom entries
        showEntriesByXmlCallback('admin_edit_do_point_accounts');
 } elseif (isFormSent('do_edit')) {
        // Change data of only custom entries
        showEntriesByXmlCallback('admin_edit_do_point_accounts');


@@ -79,16 +79,16 @@ if (isFormSent('add')) {
        showEntriesByXmlCallback('admin_delete_show_point_accounts');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_point_accounts');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif ((isFormSent('do_delete')) && (ifPointsAccountTypeMatchesPost('CUSTOM'))) {
        // Remove only custom entries
        showEntriesByXmlCallback('admin_delete_do_point_accounts');
 }
 
 // Show entries?
 } elseif ((isFormSent('do_delete')) && (ifPointsAccountTypeMatchesPost('CUSTOM'))) {
        // Remove only custom entries
        showEntriesByXmlCallback('admin_delete_do_point_accounts');
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all campaigns
 } // END - if
 
 // List all campaigns

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 14c2124e01451da752ae8e4431ed8ff7b87d8e5b..73087c8421bd4f680de1ec71040b6e62fb3cb289 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -56,13 +56,13 @@ if (isGetRequestElementSet('rallye_id')) {
                switch (getRequestElement('activate')) {
                        case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1",
                switch (getRequestElement('activate')) {
                        case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1",

-                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, false)
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)

                                );
                                break;
 
                        case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1",
                                );
                                break;
 
                        case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1",

-                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, false)
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)

                                );
                                break;
                } // END - switch
                                );
                                break;
                } // END - switch


@@ -71,13 +71,13 @@ if (isGetRequestElementSet('rallye_id')) {
                switch (getRequestElement('notify')) {
                        case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1",
                switch (getRequestElement('notify')) {
                        case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1",

-                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, false)
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)

                                );
                                break;
 
                        case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1",
                                );
                                break;
 
                        case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1",

-                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, false)
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)

                                );
                                break;
                } // END - switch
                                );
                                break;
                } // END - switch


@@ -86,13 +86,13 @@ if (isGetRequestElementSet('rallye_id')) {
                switch (getRequestElement('auto')) {
                        case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='Y' WHERE `id`=%s AND `auto_add_new_user`='N' LIMIT 1",
                switch (getRequestElement('auto')) {
                        case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='Y' WHERE `id`=%s AND `auto_add_new_user`='N' LIMIT 1",

-                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, false)
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)

                                );
                                break;
 
                        case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='N' WHERE `id`=%s AND `auto_add_new_user`='Y' LIMIT 1",
                                );
                                break;
 
                        case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='N' WHERE `id`=%s AND `auto_add_new_user`='Y' LIMIT 1",

-                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, false)
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)

                                );
                                break;
                } // END - switch
                                );
                                break;
                } // END - switch


@@ -110,11 +110,11 @@ if (isGetRequestElementSet('rallye_id')) {
                foreach (postRequestElement('sel') as $id => $selected) {
                        // Remove selected rallye entirely...
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
                foreach (postRequestElement('sel') as $id => $selected) {
                        // Remove selected rallye entirely...
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",

-                               array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));

                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s",
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s",

-                               array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));

                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s",
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s",

-                               array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));

                } // END - foreach
 
                // Run SQLS
                } // END - foreach
 
                // Run SQLS


@@ -164,7 +164,7 @@ LIMIT 1",
                                bigintval(postRequestElement('min_users', $id)),
                                bigintval(postRequestElement('min_prices', $id)),
                                $id
                                bigintval(postRequestElement('min_users', $id)),
                                bigintval(postRequestElement('min_prices', $id)),
                                $id

-                       ), __FILE__, __LINE__, false));
+                       ), __FILE__, __LINE__, FALSE));

                }
 
                // Run SQLS
                }
 
                // Run SQLS


@@ -241,11 +241,11 @@ LIMIT 1",
                        $content['rallye_id']         = bigintval($id);
 
                        // Output row
                        $content['rallye_id']         = bigintval($id);
 
                        // Output row

-                       $OUT .= loadTemplate('admin_' . $mode . '_rallyes_row', true, $content);
+                       $OUT .= loadTemplate('admin_' . $mode . '_rallyes_row', TRUE, $content);

                } // END - foreach
 
                // Load final template
                } // END - foreach
 
                // Load final template

-               loadTemplate('admin_' . $mode . '_rallyes', false, $OUT);
+               loadTemplate('admin_' . $mode . '_rallyes', FALSE, $OUT);

        } else {
                // Nothing selected to edit
                displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SELECTED--}');
        } else {
                // Nothing selected to edit
                displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SELECTED--}');


@@ -281,7 +281,7 @@ ORDER BY
                        } // END - if
 
                        // Get user points
                        } // END - if
 
                        // Get user points

-                       $points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1");
+                       $points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', FALSE, " AND `ref_depth`=1");

                        //* DEBUG: */ debugOutput(basename(__FILE__).':userid='.$row['userid'].',points='.$points.',opoints='.$row['curr_points']);
 
                        // Prepare content
                        //* DEBUG: */ debugOutput(basename(__FILE__).':userid='.$row['userid'].',points='.$points.',opoints='.$row['curr_points']);
 
                        // Prepare content


@@ -295,7 +295,7 @@ ORDER BY
                        );
 
                        // Load row template and switch color
                        );
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_list_rallye_usr_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_rallye_usr_row', TRUE, $row);

                } // END - while
 
                // Remember rows
                } // END - while
 
                // Remember rows


@@ -306,7 +306,7 @@ ORDER BY
                SQL_FREERESULT($result);
 
                // Load template
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('admin_list_rallye_usr', false, $content);
+               loadTemplate('admin_list_rallye_usr', FALSE, $content);

        } else {
                // No entries found?
                displayMessage('{--ADMIN_RALLYE_USERS_404--}');
        } else {
                // No entries found?
                displayMessage('{--ADMIN_RALLYE_USERS_404--}');


@@ -338,7 +338,7 @@ ORDER BY
                $OUT = '';
                while ($data = SQL_FETCHARRAY($result)) {
                        // Count joined userids
                $OUT = '';
                while ($data = SQL_FETCHARRAY($result)) {
                        // Count joined userids

-                       $users = countSumTotalData($data['rallye_id'], 'rallye_users', 'rallye_id', 'rallye_id', true);
+                       $users = countSumTotalData($data['rallye_id'], 'rallye_users', 'rallye_id', 'rallye_id', TRUE);

 
                        // Did some users joined this rallye?
                        if ($users > 0) {
 
                        // Did some users joined this rallye?
                        if ($users > 0) {


@@ -360,7 +360,7 @@ ORDER BY
                                'send_notify'       => $data['send_notify'],
                                'auto_add_new_user' => $data['auto_add_new_user'],
                                'notified'          => $data['notified'],
                                'send_notify'       => $data['send_notify'],
                                'auto_add_new_user' => $data['auto_add_new_user'],
                                'notified'          => $data['notified'],

-                               'prices_cnt'        => countSumTotalData($data['rallye_id'], 'rallye_prices', 'rallye_id', 'rallye_id', true),
+                               'prices_cnt'        => countSumTotalData($data['rallye_id'], 'rallye_prices', 'rallye_id', 'rallye_id', TRUE),

                                'descr'             => $data['descr'],
                                'min_users'         => $data['min_users'],
                                'min_prices'        => $data['min_prices'],
                                'descr'             => $data['descr'],
                                'min_users'         => $data['min_users'],
                                'min_prices'        => $data['min_prices'],


@@ -408,7 +408,7 @@ ORDER BY
                        } // END - switch
 
                        // Output row
                        } // END - switch
 
                        // Output row

-                       $OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_rallyes_row', TRUE, $row);

                } // END - while
 
                // Free memory
                } // END - while
 
                // Free memory


@@ -418,7 +418,7 @@ ORDER BY
                $content['rows'] = $OUT;
 
                // Load template
                $content['rows'] = $OUT;
 
                // Load template

-               loadTemplate('admin_list_rallyes', false, $content);
+               loadTemplate('admin_list_rallyes', FALSE, $content);

        } else {
                // No rallyes setup so far
                displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SETUP--}');
        } else {
                // No rallyes setup so far
                displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SETUP--}');

diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php
index 7c4d99b46210c35ce8adb71bff4bb467ec8592e1..3989f940b8edc4ebf7c1e3b65a476123b3ba9dfd 100644 (file)
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -43,7 +43,7 @@ if (isGetRequestElementSet('userid')) {
        $userid = bigintval(getRequestElement('userid'));
 
        // Fix missing variable
        $userid = bigintval(getRequestElement('userid'));
 
        // Fix missing variable

-       $result_levels = false;
+       $result_levels = FALSE;

 
        // User found?
        if (fetchUserData($userid)) {
 
        // User found?
        if (fetchUserData($userid)) {


@@ -95,7 +95,7 @@ ORDER BY
                                                // Is the data there?
                                                if (fetchUserData($content['refid'])) {
                                                        // Check for referrals
                                                // Is the data there?
                                                if (fetchUserData($content['refid'])) {
                                                        // Check for referrals

-                                                       $refs_cnt = countSumTotalData(getUserData('userid'), 'user_refs', 'id', 'userid', true);
+                                                       $refs_cnt = countSumTotalData(getUserData('userid'), 'user_refs', 'id', 'userid', TRUE);

 
                                                        // Prepare data for the template
                                                        // @TODO Try to rewrite some to EL
 
                                                        // Prepare data for the template
                                                        // @TODO Try to rewrite some to EL


@@ -112,10 +112,10 @@ ORDER BY
                                                        } // END - if
 
                                                        // Load template for level one
                                                        } // END - if
 
                                                        // Load template for level one

-                                                       $OUT_REFS .= loadTemplate('admin_list_refs_row', true, $content);
+                                                       $OUT_REFS .= loadTemplate('admin_list_refs_row', TRUE, $content);

                                                } else {
                                                        // No refs found
                                                } else {
                                                        // No refs found

-                                                       $OUT_REFS = loadTemplate('admin_list_refs_nodata', true, $content);
+                                                       $OUT_REFS = loadTemplate('admin_list_refs_nodata', TRUE, $content);

                                                }
 
                                                // Add content
                                                }
 
                                                // Add content


@@ -126,14 +126,14 @@ ORDER BY
                                        $levels['info'] = sprintf(getMessage('ADMIN_USER_TOTAL_REFS'), generateUserProfileLink($userid), 0, 0);
 
                                        // No refs found
                                        $levels['info'] = sprintf(getMessage('ADMIN_USER_TOTAL_REFS'), generateUserProfileLink($userid), 0, 0);
 
                                        // No refs found

-                                       $levels['rows'] = loadTemplate('admin_list_refs_norefs', true, array('userid' => $userid));
+                                       $levels['rows'] = loadTemplate('admin_list_refs_norefs', TRUE, array('userid' => $userid));

                                }
 
                                // Free result
                                SQL_FREERESULT($result_refs);
 
                                // Load level template
                                }
 
                                // Free result
                                SQL_FREERESULT($result_refs);
 
                                // Load level template

-                               $OUT .= loadTemplate('admin_list_refs_level', true, $levels);
+                               $OUT .= loadTemplate('admin_list_refs_level', TRUE, $levels);

                        } // END - while
 
                        // Prepare content
                        } // END - while
 
                        // Prepare content


@@ -143,7 +143,7 @@ ORDER BY
                        );
 
                        // Load main template
                        );
 
                        // Load main template

-                       loadTemplate('admin_list_refs', false, $content);
+                       loadTemplate('admin_list_refs', FALSE, $content);

                } else {
                        // No refs made so far
                        displayMessage('{--USER_REFERRAL_404--}');
                } else {
                        // No refs made so far
                        displayMessage('{--USER_REFERRAL_404--}');

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index c5dc0eb0fdfabb659df58a0b5e3a43f75b361a49..27c8cf75f3c2d274389d7f6b7fb8747f984dec11 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -79,10 +79,10 @@ WHERE
                $content['last_online']     = generateDateTime($content['last_online'], 2);
                $content['last_change']     = generateDateTime($content['last_change'], 2);
                //  Orders total
                $content['last_online']     = generateDateTime($content['last_online'], 2);
                $content['last_change']     = generateDateTime($content['last_change'], 2);
                //  Orders total

-               $content['orders']          = countSumTotalData(bigintval(getRequestElement('id')), 'sponsor_orders', 'id', 'sponsor_id', true);
+               $content['orders']          = countSumTotalData(bigintval(getRequestElement('id')), 'sponsor_orders', 'id', 'sponsor_id', TRUE);

 
                // Load template
 
                // Load template

-               loadTemplate('admin_list_sponsor_details', false, $content);
+               loadTemplate('admin_list_sponsor_details', FALSE, $content);

        } else {
                // Sponsor not found
                displayMessage('{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestElement('id')) . '%}');
        } else {
                // Sponsor not found
                displayMessage('{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestElement('id')) . '%}');


@@ -156,14 +156,14 @@ ORDER BY
                        $content['last_online']     = generateDateTime($content['last_online'], 2);
 
                        // Load row template
                        $content['last_online']     = generateDateTime($content['last_online'], 2);
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_list_sponsor_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_sponsor_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
                // Load final template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
                // Load final template

-               loadTemplate('admin_list_sponsor', false, $OUT);
+               loadTemplate('admin_list_sponsor', FALSE, $OUT);

        } else {
                // No sponsors registered so far
                displayMessage('{--ADMIN_SPONSOR_NONE_REGISTERED--}');
        } else {
                // No sponsors registered so far
                displayMessage('{--ADMIN_SPONSOR_NONE_REGISTERED--}');

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index e4eff806bc86121b3478ce9ff9fa10c4ec242f25..16276c4da5a8079dd09fb0d0ac748dabff40ecf5 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -148,14 +148,14 @@ if (isFormSent('add')) {
 
                        if (isFormSent('edit')) {
                                // Edit entry
 
                        if (isFormSent('edit')) {
                                // Edit entry

-                               $OUT .= loadTemplate('admin_list_sponsor_pay_edit_row', true, $content);
+                               $OUT .= loadTemplate('admin_list_sponsor_pay_edit_row', TRUE, $content);

                        } else {
                                // Delete entry
                        } else {
                                // Delete entry

-                               $OUT .= loadTemplate('admin_list_sponsor_pay_del_row', true, $content);
+                               $OUT .= loadTemplate('admin_list_sponsor_pay_del_row', TRUE, $content);

                        }
                } else {
                        // Entry invalid
                        }
                } else {
                        // Entry invalid

-                       $OUT .= loadTemplate('admin_list_sponsor_pay_404', true, $id);
+                       $OUT .= loadTemplate('admin_list_sponsor_pay_404', TRUE, $id);

                }
 
                // Free result
                }
 
                // Free result


@@ -165,10 +165,10 @@ if (isFormSent('add')) {
        // Load main template depending on mode (edit/delete)
        if (isFormSent('edit')) {
                // Load main edit template
        // Load main template depending on mode (edit/delete)
        if (isFormSent('edit')) {
                // Load main edit template

-               loadTemplate('admin_list_sponsor_pay_edit', false, $OUT);
+               loadTemplate('admin_list_sponsor_pay_edit', FALSE, $OUT);

        } else {
                // Load main delete template
        } else {
                // Load main delete template

-               loadTemplate('admin_list_sponsor_pay_del', false, $OUT);
+               loadTemplate('admin_list_sponsor_pay_del', FALSE, $OUT);

        }
 } else {
        // Load all payment types
        }
 } else {
        // Load all payment types


@@ -192,24 +192,24 @@ ORDER BY
                // List alle found payment types
                while ($content = SQL_FETCHARRAY($result)) {
                        // Add row
                // List alle found payment types
                while ($content = SQL_FETCHARRAY($result)) {
                        // Add row

-                       $OUT .= loadTemplate('admin_list_sponsor_pay_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_sponsor_pay_row', TRUE, $content);

                } // END - while
 
                // Load list template
                } // END - while
 
                // Load list template

-               $content['list_out'] = loadTemplate('admin_list_sponsor_pay', true, $OUT);
+               $content['list_out'] = loadTemplate('admin_list_sponsor_pay', TRUE, $OUT);

        } else {
                // Noting setup so far!
        } else {
                // Noting setup so far!

-               $content['list_out'] = displayMessage('{--ADMIN_SPONSOR_NO_PAYTYPES--}', true);
+               $content['list_out'] = displayMessage('{--ADMIN_SPONSOR_NO_PAYTYPES--}', TRUE);

        }
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Add new payment types here
        }
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Add new payment types here

-       $content['add_out'] = loadTemplate('admin_add_sponsor_paytype', true);
+       $content['add_out'] = loadTemplate('admin_add_sponsor_paytype', TRUE);

 
        // Load final template
 
        // Load final template

-       loadTemplate('admin_sponsor_paytypes', false, $content);
+       loadTemplate('admin_sponsor_paytypes', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index 34865328c8b877823d8d5795e056dec5e8e1b121..53a6e68b5cacd7c7118a7f708b8d2e8510fca113 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Edit or delete button hit?
 if (isFormSent('edit')) {
 
 // Edit or delete button hit?
 if (isFormSent('edit')) {


@@ -52,16 +52,16 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_edit_show_surfbar_actions');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_surfbar_actions');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_surfbar_actions');
 }
 
 // Show entries?
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_surfbar_actions');
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all URLs
 } // END - if
 
 // List all URLs

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index d06b8285a749e9757b66759fae1e06b1cf607ce1..02943e89dfcc1dd9e1741000d968fb91a517ee96 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for 'url_id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('url_id'))) {
 
 // Check for 'url_id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('url_id'))) {


@@ -61,7 +61,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_edit_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_surfbar_urls');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_surfbar_urls');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_surfbar_urls');


@@ -70,7 +70,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_delete_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_surfbar_urls');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_surfbar_urls');
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_surfbar_urls');


@@ -79,7 +79,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_lock_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_lock_show_surfbar_urls');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
        showEntriesByXmlCallback('admin_lock_do_surfbar_urls');
 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
        showEntriesByXmlCallback('admin_lock_do_surfbar_urls');


@@ -88,16 +88,16 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_undelete_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_undelete_show_surfbar_urls');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        showEntriesByXmlCallback('admin_undelete_do_surfbar_urls');
 }
 
 // Show entries?
 } elseif (isFormSent('do_undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        showEntriesByXmlCallback('admin_undelete_do_surfbar_urls');
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all URLs
 } // END - if
 
 // List all URLs

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 0862a618d457b0e58b5bb9530f2c6d33afbf05ff..31389aa8adfb9c810beb521566b89d29a7c6058c 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -121,7 +121,7 @@ ORDER BY
                                } // END - foreach
                        } else {
                                // Unknown action performed
                                } // END - foreach
                        } else {
                                // Unknown action performed

-                               reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));
+                               reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), TRUE)));

                        }
 
                        // Update query
                        }
 
                        // Update query


@@ -167,10 +167,10 @@ ORDER BY
                        // Is there an extension task?
                        if (isExtensionTask($content)) {
                                // Load extension row template
                        // Is there an extension task?
                        if (isExtensionTask($content)) {
                                // Load extension row template

-                               $OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
+                               $OUT .= loadTemplate('admin_list_task_ext_rows', TRUE, $content);

                        } else {
                                // Load default row template
                        } else {
                                // Load default row template

-                               $OUT .= loadTemplate('admin_list_task_rows', true, $content);
+                               $OUT .= loadTemplate('admin_list_task_rows', TRUE, $content);

                        }
                } // END - while
 
                        }
                } // END - while
 


@@ -187,10 +187,10 @@ ORDER BY
                // Load footer template
                if (getRequestElement('type') == 'deleted') {
                        // Delete now button
                // Load footer template
                if (getRequestElement('type') == 'deleted') {
                        // Delete now button

-                       loadTemplate('admin_list_task_delete', false, $content);
+                       loadTemplate('admin_list_task_delete', FALSE, $content);

                } else {
                        // Normal footer
                } else {
                        // Normal footer

-                       loadTemplate('admin_list_task', false, $content);
+                       loadTemplate('admin_list_task', FALSE, $content);

                }
        }
 } // END - if
                }
        }
 } // END - if

diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php
index 52e14432efaa323b7cbbe67c83690a383a9066bb..a83f0ea0ec3892fd1c8bcfa9865bc91a0bbdfc30 100644 (file)
--- a/inc/modules/admin/what-list_transfer.php
+++ b/inc/modules/admin/what-list_transfer.php
@@ -66,7 +66,7 @@ if (!SQL_HASZERONUMS($result)) {
                $content['reason']      = wordwrap($content['reason'], 15);
 
                // Load row template add points and switch color
                $content['reason']      = wordwrap($content['reason'], 15);
 
                // Load row template add points and switch color

-               $OUT .= loadTemplate('admin_list_transfer_row', true, $content);
+               $OUT .= loadTemplate('admin_list_transfer_row', TRUE, $content);

                $total += $content['points'];
        } // END - while
 
                $total += $content['points'];
        } // END - while
 


@@ -76,7 +76,7 @@ if (!SQL_HASZERONUMS($result)) {
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">

-    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', true) . '
+    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', TRUE) . '

   </td>
 </tr>';
 }
   </td>
 </tr>';
 }


@@ -97,7 +97,7 @@ $content['balance'] = '{--TRANSFER_TOTAL_BALANCE--}';
 $content['delete'] = '&nbsp;';
 
 // Load final template
 $content['delete'] = '&nbsp;';
 
 // Load final template

-loadTemplate('admin_list_transfer', false, $content);
+loadTemplate('admin_list_transfer', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index c9177fa93a74dce781d9b8f9928002654ab2ba60..02479af987dbec95d27837c48284c8d0b90cac3c 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -49,7 +49,7 @@ if (!isExtensionActive('mailid')) {
 } // END - if
 
 // Don't load the admin_list_unconfirmed template by default
 } // END - if
 
 // Don't load the admin_list_unconfirmed template by default

-$listed = false;
+$listed = FALSE;

 
 // Init query
 $sql = '';
 
 // Init query
 $sql = '';


@@ -77,7 +77,7 @@ LIMIT 1",
        $ID = -1;
 
        // Load admin_list_unconfirmed template
        $ID = -1;
 
        // Load admin_list_unconfirmed template

-       $listed = true;
+       $listed = TRUE;

        $DATA = getRequestElement('mid');
        $mailType = 'mailid';
 } elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
        $DATA = getRequestElement('mid');
        $mailType = 'mailid';
 } elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {


@@ -107,7 +107,7 @@ LIMIT 1",
        $ID = getRequestElement('bid');
 
        // Load admin_list_unconfirmed template
        $ID = getRequestElement('bid');
 
        // Load admin_list_unconfirmed template

-       $listed = true;
+       $listed = TRUE;

        $DATA = $ID;
        $mailType = 'bonusid';
 } else {
        $DATA = $ID;
        $mailType = 'bonusid';
 } else {


@@ -116,7 +116,7 @@ LIMIT 1",
 }
 
 // Shall I display links or not?
 }
 
 // Shall I display links or not?

-if (($listed === true) && (!empty($sql))) {
+if (($listed === TRUE) && (!empty($sql))) {

        // Load mail data
        $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
 
        // Load mail data
        $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
 


@@ -179,18 +179,18 @@ LIMIT %s",
                                        );
 
                                        // Load row template and switch colors
                                        );
 
                                        // Load row template and switch colors

-                                       $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $row);
+                                       $OUT .= loadTemplate('admin_list_unconfirmed_row', TRUE, $row);

                                } else {
                                        // No user data found
                                } else {
                                        // No user data found

-                                       $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $row);
+                                       $OUT .= loadTemplate('admin_list_unconfirmed_row_404', TRUE, $row);

                                }
                        } // END - while
 
                        // Render it in our new listing
                                }
                        } // END - while
 
                        // Render it in our new listing

-                       $OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
+                       $OUT = loadTemplate('admin_list_unconfirmed_list', TRUE, $OUT);

                } else {
                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
                } else {
                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.

-                       $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', true);
+                       $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', TRUE);

                }
 
                // Prepare content
                }
 
                // Prepare content


@@ -203,13 +203,13 @@ LIMIT %s",
                SQL_FREERESULT($result);
 
                // Load final template
                SQL_FREERESULT($result);
 
                // Load final template

-               loadTemplate('admin_list_unconfirmed', false, $content);
+               loadTemplate('admin_list_unconfirmed', FALSE, $content);

        } elseif (getRequestElement('mid') > 0) {
                // Data in pool or in user_stats not found, so let's find out where data is missing
        } elseif (getRequestElement('mid') > 0) {
                // Data in pool or in user_stats not found, so let's find out where data is missing

-               if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', true) == 1) {
+               if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', TRUE) == 1) {

                        // pool table
                        displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');
                        // pool table
                        displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');

-               } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 1) {
+               } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', TRUE) == 1) {

                        // user_stats table
                        displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
                } else {
                        // user_stats table
                        displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
                } else {

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 9fa32e59f105ccb9c5cc8e5457185e97ebbe7ffd..82728709f2c80aa948fa5bb1f0d173dd3ff50579 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -103,7 +103,7 @@ LIMIT 1',
                // Get count/sum of refs, selected categories, unconfirmed mails
                // @TODO Refacture these old link generation to functions
                $content['refs']  = countSumTotalData($userid, 'refsystem', 'counter');
                // Get count/sum of refs, selected categories, unconfirmed mails
                // @TODO Refacture these old link generation to functions
                $content['refs']  = countSumTotalData($userid, 'refsystem', 'counter');

-               $content['cats']  = countSumTotalData($userid, 'user_cats', 'id', 'userid', true);
+               $content['cats']  = countSumTotalData($userid, 'user_cats', 'id', 'userid', TRUE);

                $content['links'] = getTotalUnconfirmedMails($userid);
 
                // Add links to the numbers
                $content['links'] = getTotalUnconfirmedMails($userid);
 
                // Add links to the numbers


@@ -175,7 +175,7 @@ LIMIT 1',
                $content['userid'] = $userid;
 
                // Load user-details template
                $content['userid'] = $userid;
 
                // Load user-details template

-               loadTemplate('admin_user_details', false, $content);
+               loadTemplate('admin_user_details', FALSE, $content);

        } else {
                // Account does not exist!
                displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}');
        } else {
                // Account does not exist!
                displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}');


@@ -321,7 +321,7 @@ ORDER BY
                        // Transfer data to array
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
                        $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
                        // Transfer data to array
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
                        $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');

-                       $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
+                       $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', TRUE);

 
                        // Prepare array for filter
                        $data = array(
 
                        // Prepare array for filter
                        $data = array(


@@ -363,7 +363,7 @@ ORDER BY
                        }
 
                        // Load row template and switch colors
                        }
 
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('admin_list_user_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_user_row', TRUE, $content);

                } // END - while
 
                // Free memory
                } // END - while
 
                // Free memory


@@ -379,7 +379,7 @@ ORDER BY
                $content = merge_array($content, $templateContent);
 
                // Load main template
                $content = merge_array($content, $templateContent);
 
                // Load main template

-               loadTemplate('admin_list_user', false, $content);
+               loadTemplate('admin_list_user', FALSE, $content);

        } else {
                // No one as registered so far! :-(
                displayMessage('{--ADMIN_NO_NONE_REGISTERED--}');
        } else {
                // No one as registered so far! :-(
                displayMessage('{--ADMIN_NO_NONE_REGISTERED--}');

diff --git a/inc/modules/admin/what-list_user_subid.php b/inc/modules/admin/what-list_user_subid.php
index 75dba7e9b911740ad9277b5af5dfe2546c9d5e7c..4249f2785195019e84264f8b8c21f1d153060708 100644 (file)
--- a/inc/modules/admin/what-list_user_subid.php
+++ b/inc/modules/admin/what-list_user_subid.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for 'id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('id')) && (!ifPostContainsSelections('subid'))) {
 
 // Check for 'id' element
 if ((countRequestPost() > 0) && (!ifPostContainsSelections('id')) && (!ifPostContainsSelections('subid'))) {


@@ -61,7 +61,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_edit_show_user_subid');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_edit_show_user_subid');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_user_subid');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('admin_edit_do_user_subid');


@@ -70,7 +70,7 @@ if (isFormSent('edit')) {
        showEntriesByXmlCallback('admin_delete_show_user_subid');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('admin_delete_show_user_subid');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_user_subid');
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('admin_delete_do_user_subid');


@@ -90,7 +90,7 @@ if (isFormSent('edit')) {
                loadIncludeOnce($incFile);
 
                // Do not show the list of URLs after this template
                loadIncludeOnce($incFile);
 
                // Do not show the list of URLs after this template

-               $show = false;
+               $show = FALSE;

        } else {
                // Display error message
                reportBug(__FILE__, __LINE__, 'Invalid include file ' . basename($incFile) . ' detected.');
        } else {
                // Display error message
                reportBug(__FILE__, __LINE__, 'Invalid include file ' . basename($incFile) . ' detected.');


@@ -98,9 +98,9 @@ if (isFormSent('edit')) {
 }
 
 // Show entries?
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // Is a user id sent?
 } // END - if
 
 // Is a user id sent?

diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php
index 91b7914e14d795a955eeef52401b773121a9e2ae..9c45ff11d358bff306f3c5acb9a57abc5e8989fa 100644 (file)
--- a/inc/modules/admin/what-list_wernis.php
+++ b/inc/modules/admin/what-list_wernis.php
@@ -75,11 +75,11 @@ if (!SQL_HASZERONUMS($result)) {
                } // END - if
 
                // Append it and switch colors
                } // END - if
 
                // Append it and switch colors

-               $OUT .= loadTemplate('admin_list_wernis_row', true, $content);
+               $OUT .= loadTemplate('admin_list_wernis_row', TRUE, $content);

        } // END - while
 
        // Load main template
        } // END - while
 
        // Load main template

-       loadTemplate('admin_list_wernis_main', false, $OUT);
+       loadTemplate('admin_list_wernis_main', FALSE, $OUT);

 } else {
        // Nothing to display!
        displayMessage('{--ADMIN_WERNIS_NO_TRANSFERS--}');
 } else {
        // Nothing to display!
        displayMessage('{--ADMIN_WERNIS_NO_TRANSFERS--}');

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index bf6969fcd8b2bfdf9dd667362fbe99cb3f02679b..84a09db7b413a5a912f63f187932e57c07e6db2b 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -69,7 +69,7 @@ if (getConfig('yoomedia_requests_remain') == '0') {
        displayMessage('{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
 
        // Abort here!
        displayMessage('{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
 
        // Abort here!

-       return false;
+       return FALSE;

 } // END - if
 
 // Get parsed array back
 } // END - if
 
 // Get parsed array back


@@ -79,27 +79,27 @@ $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
        // Invalid result
        displayMessage('{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
 if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
        // Invalid result
        displayMessage('{--ADMIN_YOOMEDIA_INVALID_RESULT--}');

-       return false;
+       return FALSE;

 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
        $code = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($result);
 
        // Output message
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
        $code = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($result);
 
        // Output message

-       loadTemplate('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(translateYooMediaError($code))));
-       return false;
+       loadTemplate('admin_yoomedia_error', FALSE, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(translateYooMediaError($code))));
+       return FALSE;

 }
 
 // Prepare all entries
 $OUT = '';
 foreach ($result as $entry) {
        // Translate some data
 }
 
 // Prepare all entries
 $OUT = '';
 foreach ($result as $entry) {
        // Translate some data

-       $entry['pay']    = translateComma($entry['pay'], true, 5);
+       $entry['pay']    = translateComma($entry['pay'], TRUE, 5);

 
        // Check reload lock
        $reload = YOOMEDIA_CHECK_RELOAD($entry['id'], $entry['reload'], 'textmail');
 
        // Is this mail already sent?
 
        // Check reload lock
        $reload = YOOMEDIA_CHECK_RELOAD($entry['id'], $entry['reload'], 'textmail');
 
        // Is this mail already sent?

-       if ($reload !== false) {
+       if ($reload !== FALSE) {

                // Init countdown
                $countdown = '0';
 
                // Init countdown
                $countdown = '0';
 


@@ -122,15 +122,15 @@ foreach ($result as $entry) {
                }
 
                // Load row template for displaying
                }
 
                // Load row template for displaying

-               $OUT .= loadTemplate('admin_list_yoomedia_tm_already', true, $entry);
+               $OUT .= loadTemplate('admin_list_yoomedia_tm_already', TRUE, $entry);

        } else {
                // Load row template with buttons
        } else {
                // Load row template with buttons

-               $OUT .= loadTemplate('admin_list_yoomedia_tm_row', true, $entry);
+               $OUT .= loadTemplate('admin_list_yoomedia_tm_row', TRUE, $entry);

        }
 } // END - foreach
 
 // Load main template
        }
 } // END - foreach
 
 // Load main template

-loadTemplate('admin_list_yoomedia_tm', false, $OUT);
+loadTemplate('admin_list_yoomedia_tm', FALSE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index 3190cc2c06731aa56e3b8bac52fb79ed87602089..4464c66abc77eb0a23bb7cfd867e29eb3e751ae4 100644 (file)
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -99,7 +99,7 @@ if (isGetRequestElementSet('id')) {
                                $content['email_link'] = '<a href="' . generateEmailLink($content['email'], 'sponsor_data') . '">' . $content['gender'] . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                                // Display form
                                $content['email_link'] = '<a href="' . generateEmailLink($content['email'], 'sponsor_data') . '">' . $content['gender'] . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                                // Display form

-                               loadTemplate('admin_lock_sponsor', false, $content);
+                               loadTemplate('admin_lock_sponsor', FALSE, $content);

                        }
                } else {
                        // Cannot change status on unconfirmed or pending accounts!
                        }
                } else {
                        // Cannot change status on unconfirmed or pending accounts!

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 7fa06f1fcf2947e0e021d2f625b7053b5b0806f1..d750d2e5ca3cde1be8770e47503516d5b14a1d87 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -46,7 +46,7 @@ addYouAreHereLink('admin', __FILE__);
 // Is a userid set?
 if (isGetRequestElementSet('userid')) {
        // Action not performed by default
 // Is a userid set?
 if (isGetRequestElementSet('userid')) {
        // Action not performed by default

-       $isActive = false;
+       $isActive = FALSE;

 
        // Load user's data
        if (fetchUserData(getRequestElement('userid'))) {
 
        // Load user's data
        if (fetchUserData(getRequestElement('userid'))) {


@@ -74,7 +74,7 @@ if (isGetRequestElementSet('userid')) {
 
                        // Prepare message
                        $message = '{%message,ADMIN_USER_ACCOUNT_LOCKED=' . bigintval(getRequestElement('userid')) . '%}';
 
                        // Prepare message
                        $message = '{%message,ADMIN_USER_ACCOUNT_LOCKED=' . bigintval(getRequestElement('userid')) . '%}';

-                       $isActive = true;
+                       $isActive = TRUE;

                } elseif ((isPostRequestElementSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
                        if (isExtensionInstalledAndNewer('user', '0.3.5')) {
                } elseif ((isPostRequestElementSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
                        if (isExtensionInstalledAndNewer('user', '0.3.5')) {


@@ -109,10 +109,10 @@ LIMIT 1",
 
                        // Prepare message
                        $message = '{%message,ADMIN_USER_ACCOUNT_UNLOCKED=' . bigintval(getRequestElement('userid')) . '%}';
 
                        // Prepare message
                        $message = '{%message,ADMIN_USER_ACCOUNT_UNLOCKED=' . bigintval(getRequestElement('userid')) . '%}';

-                       $isActive = true;
+                       $isActive = TRUE;

                } elseif (isFormSent('delete')) {
                        // Delete the account
                } elseif (isFormSent('delete')) {
                        // Delete the account

-                       $isActive = true;
+                       $isActive = TRUE;

                        loadIncludeOnce('inc/modules/admin/what-del_user.php');
                } elseif (isPostRequestElementSet('no')) {
                        // Do not lock him...
                        loadIncludeOnce('inc/modules/admin/what-del_user.php');
                } elseif (isPostRequestElementSet('no')) {
                        // Do not lock him...


@@ -145,10 +145,10 @@ LIMIT 1",
                                }
 
                                // Output form
                                }
 
                                // Output form

-                               loadTemplate('admin_lock_user', false, $content);
+                               loadTemplate('admin_lock_user', FALSE, $content);

                        } else {
                                // Account does not exists!
                        } else {
                                // Account does not exists!

-                               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');

                        }
                }
 
                        }
                }
 


@@ -159,14 +159,14 @@ LIMIT 1",
                } elseif ($isActive) {
                        // An action was performed...
                        if (!empty($message)) {
                } elseif ($isActive) {
                        // An action was performed...
                        if (!empty($message)) {

-                               loadTemplate('admin_settings_unsaved', false, $message);
+                               loadTemplate('admin_settings_unsaved', FALSE, $message);

                        } else {
                                displayMessage('{--ADMIN_USER_UPDATED--}');
                        }
                }
        } else {
                // Account does not exists!
                        } else {
                                displayMessage('{--ADMIN_USER_UPDATED--}');
                        }
                }
        } else {
                // Account does not exists!

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');

        }
 } else {
        // List all users
        }
 } else {
        // List all users

diff --git a/inc/modules/admin/what-maintenance.php b/inc/modules/admin/what-maintenance.php
index 08b729e5390f57a91a5c83b2f37b9a9a3be0d43e..83de3c02422873ac34c0de6948758dfcf6caa213 100644 (file)
--- a/inc/modules/admin/what-maintenance.php
+++ b/inc/modules/admin/what-maintenance.php
@@ -74,7 +74,7 @@ if (isFormSent()) {
        } // END - switch
 
        // Display form
        } // END - switch
 
        // Display form

-       loadTemplate('admin_maintenance_form', false, $message);
+       loadTemplate('admin_maintenance_form', FALSE, $message);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index ae023ac81e1398d939d7507c3c4aa1b5c8a72fda..24c0cbeedfcb21967874c5b6668287babc11acd4 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -166,7 +166,7 @@ if (!isFormSent()) {
        $content['action_selection'] = adminAddMenuSelectionBox('member', 'action', 'menu');
 
        // Display form
        $content['action_selection'] = adminAddMenuSelectionBox('member', 'action', 'menu');
 
        // Display form

-       loadTemplate('admin_add_member_menu', false, $content);
+       loadTemplate('admin_add_member_menu', FALSE, $content);

 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestElementSet('menu')) {
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestElementSet('menu')) {

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index e16002dc3f7db5d5bc3c57f61c20bf9be9ce45da..29c2c9b1eb2327ba8f1a2d1ebd0a8498c90cca8c 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -74,7 +74,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_edit_member_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_edit_member_menu_row', TRUE, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                        } else {
                                // Entry not found?
                                $content = array(


@@ -82,7 +82,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
                        SQL_FREERESULT($result);
                } // END - if
                        }
                        SQL_FREERESULT($result);
                } // END - if


@@ -95,7 +95,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_edit_member_menu', false, $content);
+       loadTemplate('admin_edit_member_menu', FALSE, $content);

 } elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $subMenu;
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $subMenu;


@@ -116,7 +116,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_delete_member_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_delete_member_menu_row', TRUE, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                        } else {
                                // Entry not found?
                                $content = array(


@@ -124,7 +124,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
                        SQL_FREERESULT($result);
                } // END - if
                        }
                        SQL_FREERESULT($result);
                } // END - if


@@ -136,7 +136,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_delete_member_menu', false, $content);
+       loadTemplate('admin_delete_member_menu', FALSE, $content);

 } elseif ((isPostRequestElementSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $subMenu;
 } elseif ((isPostRequestElementSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $subMenu;


@@ -159,7 +159,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_menu_status_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_status_row', TRUE, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                        } else {
                                // Entry not found?
                                $content = array(


@@ -167,7 +167,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);

                        }
                        SQL_FREERESULT($result);
                } // END - if
                        }
                        SQL_FREERESULT($result);
                } // END - if


@@ -179,7 +179,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
        $content['count'] = $count;
 
        // Load template

-       loadTemplate('admin_member_menu_status', false, $content);
+       loadTemplate('admin_member_menu_status', FALSE, $content);

 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // Process menu editing form
        adminProcessMenuEditForm('member', $subMenu);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // Process menu editing form
        adminProcessMenuEditForm('member', $subMenu);


@@ -220,7 +220,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                        $content['do'] = 'mem';
 
                        // Load row template and switch color
                        $content['do'] = 'mem';
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
+                       $OUT .= loadTemplate('admin_menu_overview_row', TRUE, $content);

                } // END - while
 
                // Free memory
                } // END - while
 
                // Free memory


@@ -231,7 +231,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                $content['sub']  = $subMenu;
 
                // Load main template
                $content['sub']  = $subMenu;
 
                // Load main template

-               loadTemplate('admin_member_menu_overview', false, $content);
+               loadTemplate('admin_member_menu_overview', FALSE, $content);

        } else {
                // Menu entries are missing... (???)
                displayMessage('{--ADMIN_NO_MENUS_FOUND--}');
        } else {
                // Menu entries are missing... (???)
                displayMessage('{--ADMIN_NO_MENUS_FOUND--}');

diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php
index 16c12d8826a04d09abf93b44346bb6da1ae40f01..575825702cc0f5decbbc79c2ce2c48ef27d0997e 100644 (file)
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -79,7 +79,7 @@ foreach ($content['tables'] as $row_array) {
        );
 
        // Load row template and switch color
        );
 
        // Load row template and switch color

-       $OUT .= loadTemplate('admin_optimize_row', true, $row);
+       $OUT .= loadTemplate('admin_optimize_row', TRUE, $row);

 } // END - foreach
 
 // Remember rows
 } // END - foreach
 
 // Remember rows


@@ -89,7 +89,7 @@ $content['rows'] = $OUT;
 $content['now_optimized'] = $gain_tabs;
 
 // Load main template
 $content['now_optimized'] = $gain_tabs;
 
 // Load main template

-loadTemplate('admin_optimize', false, $content);
+loadTemplate('admin_optimize', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index 8723a902c23c8cce6418813e900e8346b49093f1..0f11f5fed2984351a16089fedc30a4388e14b462 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -51,7 +51,7 @@ if (isFormSent()) {
        switch (getRequestElement('do')) {
                case 'add':
                        addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES ('".postRequestElement('t_wait')."','".postRequestElement('payment')."','".postRequestElement('title')."','".postRequestElement('price')."')");
        switch (getRequestElement('do')) {
                case 'add':
                        addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES ('".postRequestElement('t_wait')."','".postRequestElement('payment')."','".postRequestElement('title')."','".postRequestElement('price')."')");

-                       if (countSumTotalData(postRequestElement('t_wait'), 'payments', 'id', 'time', true) == 1) {
+                       if (countSumTotalData(postRequestElement('t_wait'), 'payments', 'id', 'time', TRUE) == 1) {

                                // Re-init the array here
                                initSqls();
                        } // END - if
                                // Re-init the array here
                                initSqls();
                        } // END - if


@@ -99,11 +99,11 @@ if (isFormSent()) {
                SQL_FREERESULT($result);
 
                // Load row template and switch colors
                SQL_FREERESULT($result);
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('admin_delete_payments_row', true, $content);
+               $OUT .= loadTemplate('admin_delete_payments_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_delete_payments', false, $OUT);
+       loadTemplate('admin_delete_payments', FALSE, $OUT);

 } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit entries
        $OUT = '';
 } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit entries
        $OUT = '';


@@ -116,11 +116,11 @@ if (isFormSent()) {
                SQL_FREERESULT($result);
 
                // Load row template and switch colors
                SQL_FREERESULT($result);
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('admin_edit_payments_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_payments_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_edit_payments', false, $OUT);
+       loadTemplate('admin_edit_payments', FALSE, $OUT);

 } else {
        // Referral levels
        $result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);
 } else {
        // Referral levels
        $result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);


@@ -131,14 +131,14 @@ if (isFormSent()) {
                // List already existing categories for editing
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors
                // List already existing categories for editing
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('admin_list_payments_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_payments_row', TRUE, $content);

                } // END - switch
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
                } // END - switch
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template

-               loadTemplate('admin_list_payments', false, $OUT);
+               loadTemplate('admin_list_payments', FALSE, $OUT);

        } // END - if
 
        // Form for adding new referral levels
        } // END - if
 
        // Form for adding new referral levels

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index 1f48c21fca25807d71365a8981a5d4f798fc42c6..0982ed3ef8a160b298fe8a91c0fb95994910612f 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -114,11 +114,11 @@ VALUES ('%s','%s','%s')",
                $content['visible'] = addSelectionBox('yn', $content['visible'], 'visible');
 
                // Load row template and switch color
                $content['visible'] = addSelectionBox('yn', $content['visible'], 'visible');
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_edit_refbanner_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_refbanner_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_edit_refbanner', false, $OUT);
+       loadTemplate('admin_edit_refbanner', FALSE, $OUT);

 } else {
        if ((ifPostContainsSelections()) && (isFormSent('delete'))) {
                // Delete banner
 } else {
        if ((ifPostContainsSelections()) && (isFormSent('delete'))) {
                // Delete banner


@@ -137,14 +137,14 @@ VALUES ('%s','%s','%s')",
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch color
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_list_refbanner_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_refbanner_row', TRUE, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template

-               loadTemplate('admin_list_refbanner', false, $OUT);
+               loadTemplate('admin_list_refbanner', FALSE, $OUT);

        } // END - if
 
        // Form for adding new referral levels
        } // END - if
 
        // Form for adding new referral levels

diff --git a/inc/modules/admin/what-repair_lang.php b/inc/modules/admin/what-repair_lang.php
index 176829cb46061dfe29047029d971ef2062d14cef..def55929647f347bdcc896d1d36a268a7ed7afa9 100644 (file)
--- a/inc/modules/admin/what-repair_lang.php
+++ b/inc/modules/admin/what-repair_lang.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Get a list with current language files
 addYouAreHereLink('admin', __FILE__);
 
 // Get a list with current language files

-$langFiles = getArrayFromDirectory('inc/language/', '', false, false, array('_de.php'), '.php', '@(\.|\.\.)$@', true, getCurrentLanguage());
+$langFiles = getArrayFromDirectory('inc/language/', '', FALSE, FALSE, array('_de.php'), '.php', '@(\.|\.\.)$@', TRUE, getCurrentLanguage());

 
 // By default nothing is checked, which is isn't right...
 $OUT = '';
 
 // By default nothing is checked, which is isn't right...
 $OUT = '';


@@ -83,7 +83,7 @@ foreach ($validLanguages as $lang) {
                                );
 
                                // Compares, all fine
                                );
 
                                // Compares, all fine

-                               $OUT .= loadTemplate('admin_repair_lang_row_compares', true, $content);
+                               $OUT .= loadTemplate('admin_repair_lang_row_compares', TRUE, $content);

                        } else {
                                // Generate difference output only if count is smaller/equals 100 entries
                                $diffContent = '<ul>';
                        } else {
                                // Generate difference output only if count is smaller/equals 100 entries
                                $diffContent = '<ul>';


@@ -106,7 +106,7 @@ foreach ($validLanguages as $lang) {
                                );
 
                                // Compares, all fine
                                );
 
                                // Compares, all fine

-                               $OUT .= loadTemplate('admin_repair_lang_row_diff', true, $content);
+                               $OUT .= loadTemplate('admin_repair_lang_row_diff', TRUE, $content);

                        }
                } else {
                        // Not readable, prepare content
                        }
                } else {
                        // Not readable, prepare content


@@ -116,7 +116,7 @@ foreach ($validLanguages as $lang) {
                        );
 
                        // Load template
                        );
 
                        // Load template

-                       $OUT .= loadTemplate('admin_repair_lang_row_404', true, $content);
+                       $OUT .= loadTemplate('admin_repair_lang_row_404', TRUE, $content);

                }
        } // END - foreach
 } // END - foreach
                }
        } // END - foreach
 } // END - foreach


@@ -130,7 +130,7 @@ $content = array(
 );
 
 // Load main template
 );
 
 // Load main template

-loadTemplate('admin_repair_lang', false, $content);
+loadTemplate('admin_repair_lang', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index 852457782e3fc21fc9b5a79e925288437cd3dae0..b1521d481804d8d61ce2751d94fff02acacff2f7 100644 (file)
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -70,7 +70,7 @@ if (isFormSent()) {
        $content['html_select'] = '';
        if (isExtensionActive('html_mail')) {
                // If HTML extension is active
        $content['html_select'] = '';
        if (isExtensionActive('html_mail')) {
                // If HTML extension is active

-               $content['html_select'] = loadTemplate('admin_send_bonus_html', true);
+               $content['html_select'] = loadTemplate('admin_send_bonus_html', TRUE);

        } // END - if
 
        // Default template name is an invalid one
        } // END - if
 
        // Default template name is an invalid one


@@ -89,7 +89,7 @@ if (isFormSent()) {
        } // END - switch
 
        // Load template
        } // END - switch
 
        // Load template

-       loadTemplate($template, false, $content);
+       loadTemplate($template, FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-send_coupon.php b/inc/modules/admin/what-send_coupon.php
index 38244178440f975fbde16a117bd213226d8748e2..86a7ac55bb74485d35cbeb5749ffe7b9afa93fb5 100644 (file)
--- a/inc/modules/admin/what-send_coupon.php
+++ b/inc/modules/admin/what-send_coupon.php
@@ -87,7 +87,7 @@ ORDER BY
                        // Load entry
                        while (list($userid) = SQL_FETCHROW($result)) {
                                // By default no code is unique
                        // Load entry
                        while (list($userid) = SQL_FETCHROW($result)) {
                                // By default no code is unique

-                               $isUnique = false;
+                               $isUnique = FALSE;

                                $couponCode = '';
 
                                // Look for a unique id
                                $couponCode = '';
 
                                // Look for a unique id


@@ -100,7 +100,7 @@ ORDER BY
                                        $couponCode = generatePassword(30, array('-', '+', '_', '/', '.'));
 
                                        // Is it really unique?
                                        $couponCode = generatePassword(30, array('-', '+', '_', '/', '.'));
 
                                        // Is it really unique?

-                                       $isUnique = (countSumTotalData($couponCode, 'user_coupons', 'id', 'coupon_code', true) == 0);
+                                       $isUnique = (countSumTotalData($couponCode, 'user_coupons', 'id', 'coupon_code', TRUE) == 0);

                                } // END - while
 
                                // The above loop should always set $couponCode, so we can now insert it
                                } // END - while
 
                                // The above loop should always set $couponCode, so we can now insert it


@@ -158,7 +158,7 @@ ORDER BY
        $content['coupon_default_time_selection'] = createConfigurationTimeSelections('coupon_default_time', 'WDh');
 
        // Load template
        $content['coupon_default_time_selection'] = createConfigurationTimeSelections('coupon_default_time', 'WDh');
 
        // Load template

-       loadTemplate('admin_send_coupon', false, $content);
+       loadTemplate('admin_send_coupon', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 9661bdcd0ee7188d7888ac1e188b3d32c5e57547..1928e664ad6094e149f46ac4aac4cfd0ba3046bd 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -61,7 +61,7 @@ ORDER BY
                        $template = 'newsletter';
 
                        // Check for extension and sending-mode
                        $template = 'newsletter';
 
                        // Check for extension and sending-mode

-                       if (!isExtensionActive('html_mail', true) && (postRequestElement('mail_mode') == 'html')) {
+                       if (!isExtensionActive('html_mail', TRUE) && (postRequestElement('mail_mode') == 'html')) {

                                // Set mode to text mode
                                postRequestElement('mail_mode') == 'text';
                        } elseif (postRequestElement('mail_mode') == 'html') {
                                // Set mode to text mode
                                postRequestElement('mail_mode') == 'text';
                        } elseif (postRequestElement('mail_mode') == 'html') {


@@ -92,10 +92,10 @@ ORDER BY
        // Extension html_mail installed?
        if (isExtensionActive('html_mail')) {
                // Load template with HTML mode
        // Extension html_mail installed?
        if (isExtensionActive('html_mail')) {
                // Load template with HTML mode

-               loadTemplate('admin_newsletter', false, $content);
+               loadTemplate('admin_newsletter', FALSE, $content);

        } else {
                // Load template with only text mode
        } else {
                // Load template with only text mode

-               loadTemplate('admin_newsletter_nohtml', false, $content);
+               loadTemplate('admin_newsletter_nohtml', FALSE, $content);

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php
index 8c5ae5b1acbba04f0482d9ddef2e6cd92258223c..e274aae5e3e66945d3d164465962a7c78b872e27 100644 (file)
--- a/inc/modules/admin/what-stats_mods.php
+++ b/inc/modules/admin/what-stats_mods.php
@@ -54,14 +54,14 @@ if ((getRequestElement('mod') == 'index') || (getRequestElement('mod') == 'login
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Load row template
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Load row template

-               $OUT .= loadTemplate('admin_list_mods_stats2_row', true, $content);
+               $OUT .= loadTemplate('admin_list_mods_stats2_row', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load final template
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load final template

-       loadTemplate('admin_list_mods_stats2', false, $OUT);
+       loadTemplate('admin_list_mods_stats2', FALSE, $OUT);

 } else {
        // Load module statics
        $result = SQL_QUERY("SELECT `module`, `title`, `clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC,`module` ASC", __FILE__, __LINE__);
 } else {
        // Load module statics
        $result = SQL_QUERY("SELECT `module`, `title`, `clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC,`module` ASC", __FILE__, __LINE__);


@@ -73,14 +73,14 @@ if ((getRequestElement('mod') == 'index') || (getRequestElement('mod') == 'login
                } // END - if
 
                // Load row template
                } // END - if
 
                // Load row template

-               $OUT .= loadTemplate('admin_list_mods_stats_row', true, $content);
+               $OUT .= loadTemplate('admin_list_mods_stats_row', TRUE, $content);

        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load final template
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load final template

-       loadTemplate('admin_list_mods_stats', false, $OUT);
+       loadTemplate('admin_list_mods_stats', FALSE, $OUT);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 77249ba5ca20420648b3a2d1e7af3245cc722345..f894c1934ba19a3373872aea6e57a44214d4fb8a 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -108,15 +108,15 @@ if (getRequestElement('userid') == 'all') {
                        $content['userid'] = bigintval(getRequestElement('userid'));
 
                        // Load form
                        $content['userid'] = bigintval(getRequestElement('userid'));
 
                        // Load form

-                       loadTemplate('admin_sub_points', false, $content);
+                       loadTemplate('admin_sub_points', FALSE, $content);

                }
        } else {
                // User not found
                }
        } else {
                // User not found

-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');

        }
 } else {
        // Output selection form with all confirmed user accounts listed
        }
 } else {
        // Output selection form with all confirmed user accounts listed

-       addMemberSelectionBox(0, true);
+       addMemberSelectionBox(0, TRUE);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php
index 2f52593d773855a50252178685b9a6fb2b2045eb..5296aacc44d955f2708209ebf0c10a1cfba5099e 100644 (file)
--- a/inc/modules/admin/what-surfbar_stats.php
+++ b/inc/modules/admin/what-surfbar_stats.php
@@ -70,7 +70,7 @@ ORDER BY
                        $content['last_surfed']  = generateDateTime($content['last_surfed'], 2);
 
                        // Load row template
                        $content['last_surfed']  = generateDateTime($content['last_surfed'], 2);
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_surfbar_url_stats_row', true, $content);
+                       $OUT .= loadTemplate('admin_surfbar_url_stats_row', TRUE, $content);

                        $count++;;
                } // END - while
 
                        $count++;;
                } // END - while
 


@@ -83,7 +83,7 @@ ORDER BY
 
 
                // Load main template
 
 
                // Load main template

-               loadTemplate('admin_surfbar_url_stats', false, $content);
+               loadTemplate('admin_surfbar_url_stats', FALSE, $content);

        } else {
                // No statistics so far
                displayMessage('{--ADMIN_SURFBAR_NO_URL_STATS--}');
        } else {
                // No statistics so far
                displayMessage('{--ADMIN_SURFBAR_NO_URL_STATS--}');


@@ -111,7 +111,7 @@ ORDER BY
                        $visits   += $content['total_visits'];
 
                        // Load row template
                        $visits   += $content['total_visits'];
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_surfbar_stats_row', true, $content);
+                       $OUT .= loadTemplate('admin_surfbar_stats_row', TRUE, $content);

                } // END - while
 
                // Prepare content
                } // END - while
 
                // Prepare content


@@ -123,7 +123,7 @@ ORDER BY
 
 
                // Load main template
 
 
                // Load main template

-               loadTemplate('admin_surfbar_stats', false, $content);
+               loadTemplate('admin_surfbar_stats', FALSE, $content);

        } else {
                // No statistics so far
                displayMessage('{--ADMIN_SURFBAR_NO_STATS--}');
        } else {
                // No statistics so far
                displayMessage('{--ADMIN_SURFBAR_NO_STATS--}');

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 254c7d9152a9c298c45b6e1bb09e5a60bc069fa4..74f24c839024e7f870efc6bcda65947a66663092 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -127,7 +127,7 @@ if (!SQL_HASZERONUMS($result)) {
                $content['email'] = '<a href="mailto:' . $GLOBALS['theme_data']['email'] . '?Subject=[Theme:] ' . $GLOBALS['theme_data']['name'] . ' (' . $content['theme_path'] . ')\>' . $GLOBALS['theme_data']['author'] . '</a>';
 
                // Load row template and switch color
                $content['email'] = '<a href="mailto:' . $GLOBALS['theme_data']['email'] . '?Subject=[Theme:] ' . $GLOBALS['theme_data']['name'] . ' (' . $content['theme_path'] . ')\>' . $GLOBALS['theme_data']['author'] . '</a>';
 
                // Load row template and switch color

-               $OUT .= loadTemplate('admin_edit_theme_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_theme_row', TRUE, $content);

        } // END - while
 
        // Free memory
        } // END - while
 
        // Free memory


@@ -136,13 +136,13 @@ if (!SQL_HASZERONUMS($result)) {
        // No themes found???
        $OUT .= '<tr>
   <td colspan="7" class="bottom" height="60">
        // No themes found???
        $OUT .= '<tr>
   <td colspan="7" class="bottom" height="60">

-    ' . displayMessage('{--ADMIN_NO_THEMES_FOUND--}', true) . '
+    ' . displayMessage('{--ADMIN_NO_THEMES_FOUND--}', TRUE) . '

   </td>
 </tr>';
 }
 
 // Load template
   </td>
 </tr>';
 }
 
 // Load template

-loadTemplate('admin_edit_theme', false, $OUT);
+loadTemplate('admin_edit_theme', FALSE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 0486556a726e50284734aa01abdd7dca9ee91c50..5c8671e86f6db8d3e90c7705882554c95a1f2815 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -96,7 +96,7 @@ $themes = array(
 );
 
 // Read directory "themes"
 );
 
 // Read directory "themes"

-$includes = getArrayFromDirectory('theme/', '', false, true, array('css', 'images'));
+$includes = getArrayFromDirectory('theme/', '', FALSE, TRUE, array('css', 'images'));

 
 // Walk through all entries and add it
 foreach ($includes as $inc) {
 
 // Walk through all entries and add it
 foreach ($includes as $inc) {


@@ -127,7 +127,7 @@ foreach ($themes['theme_unix'] as $key => $unix) {
        // Check if current theme is already imported or not
        if (!ifThemeExists($unix)) {
                // Theme not installed
        // Check if current theme is already imported or not
        if (!ifThemeExists($unix)) {
                // Theme not installed

-               $formContent = loadTemplate('admin_import_theme_form', true, $unix);
+               $formContent = loadTemplate('admin_import_theme_form', TRUE, $unix);

        } // END - if
 
        // Prepare content
        } // END - if
 
        // Prepare content


@@ -142,16 +142,16 @@ foreach ($themes['theme_unix'] as $key => $unix) {
        );
 
        // Add row template
        );
 
        // Add row template

-       $OUT .= loadTemplate('admin_import_theme_row', true, $content);
+       $OUT .= loadTemplate('admin_import_theme_row', TRUE, $content);

 } // END - foreach
 
 if (empty($OUT)) {
        // No themes found???
 } // END - foreach
 
 if (empty($OUT)) {
        // No themes found???

-       $OUT .= loadTemplate('admin_import_theme_none', true, displayMessage('{--ADMIN_NO_THEMES_FOUND--}', true));
+       $OUT .= loadTemplate('admin_import_theme_none', TRUE, displayMessage('{--ADMIN_NO_THEMES_FOUND--}', TRUE));

 } // END - if
 
 // Load template
 } // END - if
 
 // Load template

-loadTemplate('admin_import_theme', false, $OUT);
+loadTemplate('admin_import_theme', FALSE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 0cf0c8583fe4111124e33cf9895093f05c6c4849..76bc73be566b066b7a200670776184d9eec21538 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -170,11 +170,11 @@ LIMIT 1',
                                );
 
                                // Load row template and switch colors
                                );
 
                                // Load row template and switch colors

-                               $OUT .= loadTemplate('admin_unlock_emails_redir_row', true, $content);
+                               $OUT .= loadTemplate('admin_unlock_emails_redir_row', TRUE, $content);

                        } // END - foreach
 
                        // Load main template
                        } // END - foreach
 
                        // Load main template

-                       loadTemplate('admin_unlock_emails_redir', false, $OUT);
+                       loadTemplate('admin_unlock_emails_redir', FALSE, $OUT);

                } else {
                        // Nothing selected
                        displayMessage('{--ADMIN_MAILS_NOTHING_CHECKED--}');
                } else {
                        // Nothing selected
                        displayMessage('{--ADMIN_MAILS_NOTHING_CHECKED--}');


@@ -208,7 +208,7 @@ LIMIT 1',
                        $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                        // Load row template and switch colors
                        $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('admin_unlock_emails_row', true, $content);
+                       $OUT .= loadTemplate('admin_unlock_emails_row', TRUE, $content);

                } // END - while
 
                // Free memory
                } // END - while
 
                // Free memory


@@ -218,7 +218,7 @@ LIMIT 1',
                $content['rows'] = $OUT;
 
                // Load main template
                $content['rows'] = $OUT;
 
                // Load main template

-               loadTemplate('admin_unlock_emails', false, $content);
+               loadTemplate('admin_unlock_emails', FALSE, $content);

        } elseif ((isFormSent('lock')) && (!isUrlBlacklistEnabled())) {
                // URL blacklist not activated
                displayMessage('{--ADMIN_URL_BLACKLIST_DISABLED--}');
        } elseif ((isFormSent('lock')) && (!isUrlBlacklistEnabled())) {
                // URL blacklist not activated
                displayMessage('{--ADMIN_URL_BLACKLIST_DISABLED--}');

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 831b2827924d2ffd0e37f6db99c03890881c125d..0c6cd90d3a0283888f5ecf3ae4738f80c4c0d270 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -216,11 +216,11 @@ if (!SQL_HASZERONUMS($result)) {
                $content['sponsor_created'] = generateDateTime($content['sponsor_created'], 2);
 
                // Load row template and switch colors
                $content['sponsor_created'] = generateDateTime($content['sponsor_created'], 2);
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('admin_unlock_sponsor_row', true, $content);
+               $OUT .= loadTemplate('admin_unlock_sponsor_row', TRUE, $content);

        } // END - while
 
        // Load template
        } // END - while
 
        // Load template

-       loadTemplate('admin_unlock_sponsor', false, $OUT);
+       loadTemplate('admin_unlock_sponsor', FALSE, $OUT);

 } else {
        // No pending accounts found
        displayMessage('{--ADMIN_SPONSOR_NONE_PENDING--}');
 } else {
        // No pending accounts found
        displayMessage('{--ADMIN_SPONSOR_NONE_PENDING--}');

diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 7e893ecc0c97ca57cbb8e3d178ed2760699c86be..9af3c5b268017eed22d2e3d75e00b5683a6b51ef 100644 (file)
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -74,13 +74,13 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 // Is a newer version available?
 if (empty($ONLINE['version'])) {
        // Disconnected?
 // Is a newer version available?
 if (empty($ONLINE['version'])) {
        // Disconnected?

-       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')');
+       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')');

 } elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrentRepositoryRevision())) {
        // New full-version available (all previous released patches are included in this version!)
        $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2);
 
        // Load template
 } elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrentRepositoryRevision())) {
        // New full-version available (all previous released patches are included in this version!)
        $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2);
 
        // Load template

-       loadTemplate('admin_update_download', false, $ONLINE);
+       loadTemplate('admin_update_download', FALSE, $ONLINE);

 } elseif ($ONLINE['revision'] < getCurrentRepositoryRevision()) {
        // Installed revision is newer than on server
        displayMessage('{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}');
 } elseif ($ONLINE['revision'] < getCurrentRepositoryRevision()) {
        // Installed revision is newer than on server
        displayMessage('{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}');

diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php
index 7ad700cbd1e0ad122bdd46b0119f24b02c92cd3b..2de64b2ac80dc8a25fca45fd592bcfa78b9ed98c 100644 (file)
--- a/inc/modules/admin/what-user_contct.php
+++ b/inc/modules/admin/what-user_contct.php
@@ -68,7 +68,7 @@ if ((isGetRequestElementSet('userid')) && (isValidUserId(getRequestElement('user
                        displayMessage('{--ADMIN_USER_CONTACTED--}');
                } else {
                        // Load contact form template
                        displayMessage('{--ADMIN_USER_CONTACTED--}');
                } else {
                        // Load contact form template

-                       loadTemplate('admin_contct_user_form', false, $content);
+                       loadTemplate('admin_contct_user_form', FALSE, $content);

                }
        } else {
                // Not found?
                }
        } else {
                // Not found?

diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index 199e54c05b16464eec994a73b76aad641bf89a14..29c6b6f502fc5e58cab161baa9f7326333d5718a 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -47,12 +47,12 @@ addYouAreHereLink('admin', __FILE__);
 if (isExtensionActive('online')) {
        // Count guests, members and admins
        // @TODO Add a filter for sponsor
 if (isExtensionActive('online')) {
        // Count guests, members and admins
        // @TODO Add a filter for sponsor

-       $content['guests_online']  = countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='N'");
-       $content['admins_online']  = countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='Y'");
-       $content['members_online'] = countSumTotalData('N', 'online', 'id', 'is_admin', true);
+       $content['guests_online']  = countSumTotalData('N', 'online', 'id', 'is_admin', TRUE, " AND `is_member`='N'");
+       $content['admins_online']  = countSumTotalData('N', 'online', 'id', 'is_admin', TRUE, " AND `is_member`='Y'");
+       $content['members_online'] = countSumTotalData('N', 'online', 'id', 'is_admin', TRUE);

 
        // Load template
 
        // Load template

-       loadTemplate('admin_mini_online', false, $content);
+       loadTemplate('admin_mini_online', FALSE, $content);

 
        // Check for online users
        $result = SQL_QUERY("SELECT `id`, `ip`, `userid`, `refid`, `module`, `action`, `what`, `is_member`, `is_admin`, `timestamp` FROM `{?_MYSQL_PREFIX?}_online` ORDER by `timestamp` DESC",
 
        // Check for online users
        $result = SQL_QUERY("SELECT `id`, `ip`, `userid`, `refid`, `module`, `action`, `what`, `is_member`, `is_admin`, `timestamp` FROM `{?_MYSQL_PREFIX?}_online` ORDER by `timestamp` DESC",


@@ -76,7 +76,7 @@ if (isExtensionActive('online')) {
                        $row['timestamp'] = generateDateTime($row['timestamp'], 2);
 
                        // Load row template and switch color
                        $row['timestamp'] = generateDateTime($row['timestamp'], 2);
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('admin_list_online_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_online_row', TRUE, $row);

                } // END - while
 
                // Free memory
                } // END - while
 
                // Free memory


@@ -86,7 +86,7 @@ if (isExtensionActive('online')) {
                $content['rows']           = $OUT;
 
                // Load footer template
                $content['rows']           = $OUT;
 
                // Load footer template

-               loadTemplate('admin_list_online', false, $content);
+               loadTemplate('admin_list_online', FALSE, $content);

        } // END - if
 } else {
        // Online statistics deactivated!
        } // END - if
 } else {
        // Online statistics deactivated!

diff --git a/inc/modules/admin/what-welcome.php b/inc/modules/admin/what-welcome.php
index 6f993700f0d3d4c213de1c27cb43e1d3d0b11036..1aeb156fcdc5e9845ab1cc7e9cd7f8f65f29e518 100644 (file)
--- a/inc/modules/admin/what-welcome.php
+++ b/inc/modules/admin/what-welcome.php
@@ -50,17 +50,17 @@ if (!isExtensionInstalled('sql_patches')) {
 loadIncludeOnce('inc/modules/admin/overview-inc.php');
 
 // Default is that all jobs are done (why?)
 loadIncludeOnce('inc/modules/admin/overview-inc.php');
 
 // Default is that all jobs are done (why?)

-$jobsDone = true;
+$jobsDone = TRUE;

 
 // Default is that 'task' is not installed
 
 // Default is that 'task' is not installed

-$taskExt = false;
+$taskExt = FALSE;

 
 // When the admin is logging in check several things first (new jobs to complete and so on)
 if (getAction() == 'login') {
        if ((isExtensionActive('task')) && (function_exists('outputAdvancedOverview'))) {
                // When task extension is registered output advanced overview page
                $jobsDone = outputAdvancedOverview($result_tasks); // This function is provided by the extension 'task'
 
 // When the admin is logging in check several things first (new jobs to complete and so on)
 if (getAction() == 'login') {
        if ((isExtensionActive('task')) && (function_exists('outputAdvancedOverview'))) {
                // When task extension is registered output advanced overview page
                $jobsDone = outputAdvancedOverview($result_tasks); // This function is provided by the extension 'task'

-               $taskExt = true;
+               $taskExt = TRUE;

        } else {
                // Output standart overview (provided by overview-inc.php)
                $jobsDone = outputStandardOverview($result_tasks);
        } else {
                // Output standart overview (provided by overview-inc.php)
                $jobsDone = outputStandardOverview($result_tasks);


@@ -71,7 +71,7 @@ if (getAction() == 'login') {
 if (!ifAdminMenuHasEntries(getAction())) {
        // This menu is empty and so no content is displayed
        displayMessage('{--ADMIN_MENU_EMPTY--}');
 if (!ifAdminMenuHasEntries(getAction())) {
        // This menu is empty and so no content is displayed
        displayMessage('{--ADMIN_MENU_EMPTY--}');

-} elseif ($jobsDone === true) {
+} elseif ($jobsDone === TRUE) {

        // Generate overview of all main menus
        if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
                $OUT = '';
        // Generate overview of all main menus
        if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
                $OUT = '';


@@ -83,13 +83,13 @@ if (!ifAdminMenuHasEntries(getAction())) {
                        );
 
                        // Load row template
                        );
 
                        // Load row template

-                       $OUT .= loadTemplate('admin_menu_hints_row', true, $content);
+                       $OUT .= loadTemplate('admin_menu_hints_row', TRUE, $content);

                } // END - foreach
 
                // Load base template
                } // END - foreach
 
                // Load base template

-               loadTemplate('admin_menu_hints', false, $OUT);
+               loadTemplate('admin_menu_hints', FALSE, $OUT);

        }
        }

-} elseif ($taskExt === false) {
+} elseif ($taskExt === FALSE) {

        if (isExtensionActive('task')) {
                // Output warning message
                displayMessage('{%message,EXTENSION_WARNING_EXTENSION_INACTIVE=task%}');
        if (isExtensionActive('task')) {
                // Output warning message
                displayMessage('{%message,EXTENSION_WARNING_EXTENSION_INACTIVE=task%}');

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 5379718129b859abdcd51e79d685b6e01ef823f7..9091319455b8729c784716585af7547b469332cc 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -49,10 +49,10 @@ if (isMember()) {
        runFilterChain('member_login_check');
 
        // Redirect to member area
        runFilterChain('member_login_check');
 
        // Redirect to member area

-       $GLOBALS['message'] .= loadTemplate('member_login_js', true);
+       $GLOBALS['message'] .= loadTemplate('member_login_js', TRUE);

 } else {
        // Login failed!
 } else {
        // Login failed!

-       $GLOBALS['message'] .= loadTemplate('login_failed_js', true);
+       $GLOBALS['message'] .= loadTemplate('login_failed_js', TRUE);

 }
 
 // Output final message
 }
 
 // Output final message

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 9a49fd0cf9fc7d7825f248a29a0c9658645e632a..93c5eb126a212c20ac7e5fff3b88ab9ccfba84a1 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -100,12 +100,12 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isF
                                        // Build frameset
                                        $content['order'] = bigintval(getRequestElement('order'));
                                        $content['url']   = generateDereferrerUrl($url);
                                        // Build frameset
                                        $content['order'] = bigintval(getRequestElement('order'));
                                        $content['url']   = generateDereferrerUrl($url);

-                                       loadTemplate('member_order_frametester', false, $content);
+                                       loadTemplate('member_order_frametester', FALSE, $content);

                                        break;
 
                                case 'guest':
                                        $content['url']   = generateDereferrerUrl($url);
                                        break;
 
                                case 'guest':
                                        $content['url']   = generateDereferrerUrl($url);

-                                       loadTemplate('guest_frametester', false, $content);
+                                       loadTemplate('guest_frametester', FALSE, $content);

                                        break;
                        } // END - switch
                        break;
                                        break;
                        } // END - switch
                        break;


@@ -115,11 +115,11 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isF
                        break;
 
                case 'back': // Back buttom
                        break;
 
                case 'back': // Back buttom

-                       loadTemplate('member_order_back', false, getRequestElement('order'));
+                       loadTemplate('member_order_back', FALSE, getRequestElement('order'));

                        break;
 
                case 'send': // Send mail away
                        break;
 
                case 'send': // Send mail away

-                       loadTemplate('member_order_send', false, getRequestElement('order'));
+                       loadTemplate('member_order_send', FALSE, getRequestElement('order'));

                        break;
        } // END - switch
 } else {
                        break;
        } // END - switch
 } else {

diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php
index 05e5e187200430f1abc826a296275f1dfe4d7897..18db019120df36a2b868b1684c12b3e5f09fe6f7 100644 (file)
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Total visitors online
 }
 
 // Total visitors online

-$total = countSumTotalData('', 'online', 'id', 'userid', true);
+$total = countSumTotalData('', 'online', 'id', 'userid', TRUE);

 
 if (getConfig('mad_count') < $total) {
        // Update counter
 
 if (getConfig('mad_count') < $total) {
        // Update counter


@@ -56,14 +56,14 @@ if (getConfig('mad_count') < $total) {
 
 // Prepare content
 $content = array(
 
 // Prepare content
 $content = array(

-       'guests'  => countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='N'"),
-       'members' => countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='Y'"),
-       'admins'  => countSumTotalData('Y', 'online', 'id', 'is_admin', true),
+       'guests'  => countSumTotalData('N', 'online', 'id', 'is_admin', TRUE, " AND `is_member`='N'"),
+       'members' => countSumTotalData('N', 'online', 'id', 'is_admin', TRUE, " AND `is_member`='Y'"),
+       'admins'  => countSumTotalData('Y', 'online', 'id', 'is_admin', TRUE),

        'total'   => $total
 );
 
 // Output table
        'total'   => $total
 );
 
 // Output table

-$GLOBALS['rows'] .= loadTemplate('online_now', true, $content);
+$GLOBALS['rows'] .= loadTemplate('online_now', TRUE, $content);

 
 // Add more links in this block
 runFilterChain('online_extra_links');
 
 // Add more links in this block
 runFilterChain('online_extra_links');

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index c35eaacc6025e508aaf81804a19135fea1fb136c..d46a99afe13f0b0d4f11a23a6a8a807440a31a84 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -51,10 +51,10 @@ if ((!isExtensionActive('theme')) && (!isAdmin())) {
 // Get total num
 if (isAdmin()) {
        // Load all themes for admin
 // Get total num
 if (isAdmin()) {
        // Load all themes for admin

-       $num_themes = countSumTotalData('', 'themes', 'id', '', true);
+       $num_themes = countSumTotalData('', 'themes', 'id', '', TRUE);

 } else {
        // Load only active designs for user
 } else {
        // Load only active designs for user

-       $num_themes = countSumTotalData('Y', 'themes', 'id', 'theme_active', true);
+       $num_themes = countSumTotalData('Y', 'themes', 'id', 'theme_active', TRUE);

 }
 
 // Default is no box
 }
 
 // Default is no box


@@ -66,14 +66,14 @@ if ($num_themes > 1) {
        $OUT = generateThemeSelectionBox();
 } elseif (($num_themes == 1) || ((!isAdmin()) && ($num_themes == '0'))) {
        // If there's only one just output it's name
        $OUT = generateThemeSelectionBox();
 } elseif (($num_themes == 1) || ((!isAdmin()) && ($num_themes == '0'))) {
        // If there's only one just output it's name

-       $OUT = loadTemplate('theme_one', true, getCurrentThemeName());
+       $OUT = loadTemplate('theme_one', TRUE, getCurrentThemeName());

 } elseif (isAdmin()) {
        // If there is no theme installed and there's an admin notify him!
        $OUT = '{--ADMIN_NO_THEME_INSTALLED_WARNING--}';
 }
 
 // Load final box template
 } elseif (isAdmin()) {
        // If there is no theme installed and there's an admin notify him!
        $OUT = '{--ADMIN_NO_THEME_INSTALLED_WARNING--}';
 }
 
 // Load final box template

-$GLOBALS['rows'] .= loadTemplate('theme_select_box', true, $OUT);
+$GLOBALS['rows'] .= loadTemplate('theme_select_box', TRUE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index df44f6acd75fdec831881799ba8c009e8cab1c80..fc26a49dd3c486f91ee54fdebe0c3ba3952fb0d4 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -76,15 +76,15 @@ if (!SQL_HASZERONUMS($result)) {
                $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load template
                $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load template

-               $OUT .= loadTemplate('guest_list_active_row', true, $content);
+               $OUT .= loadTemplate('guest_list_active_row', TRUE, $content);

        } // END - while
 } else {
        // No member was online today! :-(
        } // END - while
 } else {
        // No member was online today! :-(

-       $OUT = loadTemplate('guest_list_active_row_none', true);
+       $OUT = loadTemplate('guest_list_active_row_none', TRUE);

 }
 
 // Load template
 }
 
 // Load template

-loadTemplate('guest_list_active', false, $OUT);
+loadTemplate('guest_list_active', FALSE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index 4aa07a942b9769aaf0069182cb371e50d148ee73..6ab6efe6c7444be5fed3363e550d2db570cb5909 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -55,7 +55,7 @@ $content['payout_time'] = '{--DOUBLER_PAYOUT_TIME_{?doubler_send_mode?}--}';
 $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC');
 
 // Load template
 $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC');
 
 // Load template

-loadTemplate('guest_doubler', false, $content);
+loadTemplate('guest_doubler', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-extensions.php b/inc/modules/guest/what-extensions.php
index 663ef9ead239c06e76f5961a6511f139c9b483b3..2023adb92c5aad67e2aa21fe3d6e73cf0565bf28 100644 (file)
--- a/inc/modules/guest/what-extensions.php
+++ b/inc/modules/guest/what-extensions.php
@@ -64,15 +64,15 @@ foreach ($extensions as $ext_file) {
        // Prepare data
        $content = array(
                'name'        => substr($template, 4),
        // Prepare data
        $content = array(
                'name'        => substr($template, 4),

-               'description' => loadTemplate($template, true),
+               'description' => loadTemplate($template, TRUE),

        );
 
        // Load the template in a special row template
        );
 
        // Load the template in a special row template

-       $OUT .= loadTemplate('guest_extensions_row', true, $content);
+       $OUT .= loadTemplate('guest_extensions_row', TRUE, $content);

 } // END - foreach
 
 // Load main template
 } // END - foreach
 
 // Load main template

-loadTemplate('guest_extensions', false, $OUT);
+loadTemplate('guest_extensions', FALSE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 708239941d06f04deed6cd2a484f4d378b6f4c9c..ac02edd4887f8eb36290aa4840e3c0fb9dc6c21d 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -51,7 +51,7 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 
 // Initialize variables
 $errorCode = '0';
 
 // Initialize variables
 $errorCode = '0';

-$userid = false;
+$userid = FALSE;

 $hash = '';
 $url = '';
 $add = '';
 $hash = '';
 $url = '';
 $add = '';


@@ -132,14 +132,14 @@ if (!empty($errorCode)) {
        } // END - if
 
        // @TODO Move this HTML code into a template
        } // END - if
 
        // @TODO Move this HTML code into a template

-       $content['message'] = loadTemplate('guest_login_error_message', true, $errorCode);
+       $content['message'] = loadTemplate('guest_login_error_message', TRUE, $errorCode);

 } // END - if
 
 // Display login form with resend-password form
 if (isExtensionActive('nickname')) {
 } // END - if
 
 // Display login form with resend-password form
 if (isExtensionActive('nickname')) {

-       loadTemplate('guest_nickname_login', false, $content);
+       loadTemplate('guest_nickname_login', FALSE, $content);

 } else {
 } else {

-       loadTemplate('guest_login', false, $content);
+       loadTemplate('guest_login', FALSE, $content);

 }
 
 // Was an URL constructed?
 }
 
 // Was an URL constructed?

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index f008903b9ed00273546bd0d497d1e5c9cb109010..cf3ecff32208ca4733d1972a51d0584a21f0f799 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -78,16 +78,16 @@ if ($TEST > time()) {
 }
 
 // User who can receive mails
 }
 
 // User who can receive mails

-$content['user_max_mails'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', true, " AND `max_mails` > 0");
+$content['user_max_mails'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', TRUE, " AND `max_mails` > 0");

 
 // Users who can receive mails today
 
 // Users who can receive mails today

-$content['user_max_rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', true, " AND `receive_mails` > 0");
+$content['user_max_rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', TRUE, " AND `receive_mails` > 0");

 
 // Max mails per day
 
 // Max mails per day

-$content['max'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', false, " AND `max_mails` > 0");
+$content['max'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', FALSE, " AND `max_mails` > 0");

 
 // Max mails for this day
 
 // Max mails for this day

-$content['rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', false, " AND `receive_mails` > 0");
+$content['rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', FALSE, " AND `receive_mails` > 0");

 
 // Initial lots of variables
 $bmails = '0';
 
 // Initial lots of variables
 $bmails = '0';


@@ -158,7 +158,7 @@ $content['total_refclicks'] = $ref;
 $content['total_logins']    = $logins;
 
 // Referral banner
 $content['total_logins']    = $logins;
 
 // Referral banner

-$total = countSumTotalData('Y', 'refbanner', 'id', 'visible', true);
+$total = countSumTotalData('Y', 'refbanner', 'id', 'visible', TRUE);

 
 // Total views and clicks
 $result = SQL_QUERY("SELECT SUM(`counter`) AS cnt, SUM(`clicks`) AS clx FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y'", __FILE__, __LINE__);
 
 // Total views and clicks
 $result = SQL_QUERY("SELECT SUM(`counter`) AS cnt, SUM(`clicks`) AS clx FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y'", __FILE__, __LINE__);


@@ -188,38 +188,38 @@ if (isExtensionActive('beg')) {
        // Clicks on beg links
        $data = array(
                'lang'  => '{--MEDIA_BEG_CLICKS--}',
        // Clicks on beg links
        $data = array(
                'lang'  => '{--MEDIA_BEG_CLICKS--}',

-               'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, ' AND `beg_clicks` > 0')
+               'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', FALSE, ' AND `beg_clicks` > 0')

        );
        );

-       $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_EXTRA .= loadTemplate('mediadata_extra_row', TRUE, $data);

 } // END - if
 
 if (isExtensionActive('doubler')) {
        // Add header
 } // END - if
 
 if (isExtensionActive('doubler')) {
        // Add header

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_DOUBLER_HEADER--}');
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', TRUE, '{--MEDIA_DOUBLER_HEADER--}');

 
        // Add first line (count)
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_COUNT--}',
 
        // Add first line (count)
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_COUNT--}',

-               'value' => countSumTotalData('Y','doubler','id','completed', true, ' AND `points` > 0'),
+               'value' => countSumTotalData('Y','doubler','id','completed', TRUE, ' AND `points` > 0'),

        );
 
        // Add points
        );
 
        // Add points

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', TRUE, $data);

        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_CPOINTS--}',
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_CPOINTS--}',

-               'value' => countSumTotalData('Y','doubler','id','completed', false, ' AND `points` > 0')
+               'value' => countSumTotalData('Y','doubler','id','completed', FALSE, ' AND `points` > 0')

        );
        );

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', TRUE, $data);

        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_WAITING--}',
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_WAITING--}',

-               'value' => countSumTotalData('N','doubler','id','completed', true, ' AND `points` > 0')
+               'value' => countSumTotalData('N','doubler','id','completed', TRUE, ' AND `points` > 0')

        );
        );

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', TRUE, $data);

        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_WPOINTS--}',
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_WPOINTS--}',

-               'value' => countSumTotalData('N','doubler','id','completed', false, ' AND `points` > 0')
+               'value' => countSumTotalData('N','doubler','id','completed', FALSE, ' AND `points` > 0')

        );
        );

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', TRUE, $data);

 } // END - if
 
 if (isExtensionActive('holiday')) {
 } // END - if
 
 if (isExtensionActive('holiday')) {


@@ -242,7 +242,7 @@ WHERE
                'lang'  => '{--MEDIA_HOLIDAY_COUNT--}',
                'value' => $holiday
        );
                'lang'  => '{--MEDIA_HOLIDAY_COUNT--}',
                'value' => $holiday
        );

-       $OUT_USER .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_USER .= loadTemplate('mediadata_extra_row', TRUE, $data);

 } // END - if
 
 if (isExtensionActive('transfer')) {
 } // END - if
 
 if (isExtensionActive('transfer')) {


@@ -276,27 +276,27 @@ ON
        if (empty($points_out)) $points_out = '0';
 
        // Add header
        if (empty($points_out)) $points_out = '0';
 
        // Add header

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_TRANSFER_HEADER--}');
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', TRUE, '{--MEDIA_TRANSFER_HEADER--}');

        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_IN_COUNT--}',
                'value' => $count_in,
        );
        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_IN_COUNT--}',
                'value' => $count_in,
        );

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', TRUE, $data);

        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_IN_POINTS--}',
                'value' => $points_in
        );
        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_IN_POINTS--}',
                'value' => $points_in
        );

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', TRUE, $data);

        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_OUT_COUNT--}',
                'value' => $count_out
        );
        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_OUT_COUNT--}',
                'value' => $count_out
        );

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', TRUE, $data);

        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_OUT_POINTS--}',
                'value' => $points_out
        );
        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_OUT_POINTS--}',
                'value' => $points_out
        );

-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', TRUE, $data);

 } // END - if
 
 $content['out_extra']   = $OUT_EXTRA;
 } // END - if
 
 $content['out_extra']   = $OUT_EXTRA;


@@ -305,7 +305,7 @@ $content['out_user']    = $OUT_USER;
 $content['out_special'] = $OUT_SPECIAL;
 
 // Load template
 $content['out_special'] = $OUT_SPECIAL;
 
 // Load template

-loadTemplate('mediadata', false, $content);
+loadTemplate('mediadata', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 408e2c041adee9ad59b307e7b8a48e215b85debb..0b5c79b6c7a39cf9cfe1412e6a0ac7fbbdb74ef0 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -83,11 +83,11 @@ if (SQL_NUMROWS($result) == 1) {
        // Found some (normally one...
        $content = SQL_FETCHARRAY($result);
 
        // Found some (normally one...
        $content = SQL_FETCHARRAY($result);
 

-       $expired = false;
+       $expired = FALSE;

        if (($content['end_time'] < time()) && (getTotalConfirmedUser() >= $content['min_users']) && (getTotalRallyeWinners($content['id']) >= $content['min_prices'])) {
                // Rallye is expired
                $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
        if (($content['end_time'] < time()) && (getTotalConfirmedUser() >= $content['min_users']) && (getTotalRallyeWinners($content['id']) >= $content['min_prices'])) {
                // Rallye is expired
                $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';

-               $expired = true;
+               $expired = TRUE;

        } elseif (time() >= ($content['end_time'] - getOneDay())) {
                // Rallye will expire in less one day!
                $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
        } elseif (time() >= ($content['end_time'] - getOneDay())) {
                // Rallye will expire in less one day!
                $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';


@@ -101,7 +101,7 @@ if (SQL_NUMROWS($result) == 1) {
        // Handle description...
        if ((empty($content['descr'])) && (!empty($content['template']))) {
                // Use description from template
        // Handle description...
        if ((empty($content['descr'])) && (!empty($content['template']))) {
                // Use description from template

-               $content['descr'] = loadTemplate('rallye_' . $content['template'], true);
+               $content['descr'] = loadTemplate('rallye_' . $content['template'], TRUE);

        } // END - if
 
        // Set start and end time
        } // END - if
 
        // Set start and end time


@@ -114,7 +114,7 @@ if (SQL_NUMROWS($result) == 1) {
        // Determine min prices (now in function)
        $content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']);
 
        // Determine min prices (now in function)
        $content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']);
 

-       if ($expired === true) {
+       if ($expired === TRUE) {

                $content['prices']       = addReferralRallyeWinners('guest', $content['id']);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
                $content['prices']       = addReferralRallyeWinners('guest', $content['id']);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';


@@ -125,7 +125,7 @@ if (SQL_NUMROWS($result) == 1) {
        }
 
        // And load final template
        }
 
        // And load final template

-       loadTemplate('guest_show_rallye', false, $content);
+       loadTemplate('guest_show_rallye', FALSE, $content);

 } else {
        // No rallye found so far
        loadTemplate('guest_rallye_404');
 } else {
        // No rallye found so far
        loadTemplate('guest_rallye_404');

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 1a0b5463d453395417db9f34789e79c7a9f05b2d..96b3265873f1e05e0cd13a89b76b2de608fb4d26 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -92,11 +92,11 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
                        registerOutputFailedMessage('ENTER_PASSWORD2');
                }
 
                        registerOutputFailedMessage('ENTER_PASSWORD2');
                }
 

-               if ((isset($GLOBALS['registration_short_password'])) && ($GLOBALS['registration_short_password'] === true)) {
+               if ((isset($GLOBALS['registration_short_password'])) && ($GLOBALS['registration_short_password'] === TRUE)) {

                        registerOutputFailedMessage('GUEST_SHORT_PASS', ': ' . getPassLen());
                } // END - if
 
                        registerOutputFailedMessage('GUEST_SHORT_PASS', ': ' . getPassLen());
                } // END - if
 

-               if ((isset($GLOBALS['registration_ip_timeout'])) && ($GLOBALS['registration_ip_timeout'] === true)) {
+               if ((isset($GLOBALS['registration_ip_timeout'])) && ($GLOBALS['registration_ip_timeout'] === TRUE)) {

                        registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
                } // END - if
 
                        registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
                } // END - if
 


@@ -119,14 +119,14 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        // Shall I display the refid or shall I make it editable?
        if (isDisplayRefidEnabled()) {
                // Load "hide" form template
        // Shall I display the refid or shall I make it editable?
        if (isDisplayRefidEnabled()) {
                // Load "hide" form template

-               $content['refid_content'] = loadTemplate('guest_register_refid_hide', true);
+               $content['refid_content'] = loadTemplate('guest_register_refid_hide', TRUE);

        } else {
                // Load template to enter it
        } else {
                // Load template to enter it

-               $content['refid_content'] = loadTemplate('guest_register_refid', true);
+               $content['refid_content'] = loadTemplate('guest_register_refid', TRUE);

        }
 
        // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-)
        }
 
        // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-)

-       $content['header_content'] = loadTemplate('register_header', true);
+       $content['header_content'] = loadTemplate('register_header', TRUE);

 
        // ZIP codes are numerical values
        $content['zip'] = '';
 
        // ZIP codes are numerical values
        $content['zip'] = '';


@@ -143,7 +143,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        $content = runFilterChain('register_must_fillout', $content);
 
        // Display registration form
        $content = runFilterChain('register_must_fillout', $content);
 
        // Display registration form

-       loadTemplate('guest_register', false, $content);
+       loadTemplate('guest_register', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index d094f9e21d36a4338e25ec1bc881436d11d4bbbd..dd757d9e3c3ccec1a973b72c26667b6c231580a5 100644 (file)
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -49,8 +49,8 @@ if ((!isExtensionActive('sponsor'))) {
 } // END - if
 
 // Init both results (see footer of this file)
 } // END - if
 
 // Init both results (see footer of this file)

-$result_act = false;
-$result_pay = false;
+$result_act = FALSE;
+$result_pay = FALSE;

 
 // Load all sponsor actions
 $result_act = SQL_QUERY("SELECT
 
 // Load all sponsor actions
 $result_act = SQL_QUERY("SELECT


@@ -76,7 +76,7 @@ if (!SQL_HASZERONUMS($result_act)) {
        $OUT_ACT = '';
        while ($content = SQL_FETCHARRAY($result_act)) {
                // Load row template and switch color
        $OUT_ACT = '';
        while ($content = SQL_FETCHARRAY($result_act)) {
                // Load row template and switch color

-               $OUT_ACT .= loadTemplate('guest_sponsor_act_row', true, $content);
+               $OUT_ACT .= loadTemplate('guest_sponsor_act_row', TRUE, $content);

        } // END - while
 
        // Check for pay types
        } // END - while
 
        // Check for pay types


@@ -86,16 +86,16 @@ if (!SQL_HASZERONUMS($result_act)) {
                $OUT_PAY = '';
                while ($content = SQL_FETCHARRAY($result_pay)) {
                        // Load row template and switch color
                $OUT_PAY = '';
                while ($content = SQL_FETCHARRAY($result_pay)) {
                        // Load row template and switch color

-                       $OUT_PAY .= loadTemplate('guest_sponsor_pay_row', true, $content);
+                       $OUT_PAY .= loadTemplate('guest_sponsor_pay_row', TRUE, $content);

                } // END - while
        } else {
                // No pay types setuped so far!
                } // END - while
        } else {
                // No pay types setuped so far!

-               $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', false, displayMessage('{--SPONSOR_NO_ACTIONS_ACTIVATED--}', true));
+               $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', FALSE, displayMessage('{--SPONSOR_NO_ACTIONS_ACTIVATED--}', TRUE));

        }
 } else {
        // No actions activated so far!
        }
 } else {
        // No actions activated so far!

-       $OUT_ACT = loadTemplate('guest_sponsor_infos_none_row', true, displayMessage('{--SPONSOR_NO_ACTIONS_ACTIVATED--}', true));
-       $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', true, displayMessage('{--SPONSOR_NO_ACTIONS_ACTIVATED--}', true));
+       $OUT_ACT = loadTemplate('guest_sponsor_infos_none_row', TRUE, displayMessage('{--SPONSOR_NO_ACTIONS_ACTIVATED--}', TRUE));
+       $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', TRUE, displayMessage('{--SPONSOR_NO_ACTIONS_ACTIVATED--}', TRUE));

 }
 
 // Free memory
 }
 
 // Free memory


@@ -109,7 +109,7 @@ $content = array(
 );
 
 // Load main template
 );
 
 // Load main template

-loadTemplate('guest_sponsor_infos', false, $content);
+loadTemplate('guest_sponsor_infos', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 4292623ea5f470744eb0d6ac2e6e76f5faf59b03..5fccf754029cf8967e7b8952cf0312e10dbfa634 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -289,7 +289,7 @@ LIMIT 1",
                        (setSession('sponsor_pass', md5(postRequestElement('password'))           ))
                        );
 
                        (setSession('sponsor_pass', md5(postRequestElement('password'))           ))
                        );
 

-                       if ($login === true) {
+                       if ($login === TRUE) {

                                // Cookie setup successfull so we can forward to sponsor area
                                redirectToUrl('modules.php?module=sponsor');
                        } else {
                                // Cookie setup successfull so we can forward to sponsor area
                                redirectToUrl('modules.php?module=sponsor');
                        } else {

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index f283557055cbdc8bf4ad9b57ee983bde41372370..80fee158f55fc79ecc2aa44504a65823a242bee5 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -251,11 +251,11 @@ ORDER BY
                        $content['res'] = translateComma($content['pay_rate'] * $content['pay_min_count']);
 
                        // Load row template and switch color
                        $content['res'] = translateComma($content['pay_rate'] * $content['pay_min_count']);
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('guest_sponsor_payment_row', true, $content);
+                       $OUT .= loadTemplate('guest_sponsor_payment_row', TRUE, $content);

                } // END - while
 
                // Remember the list in table
                } // END - while
 
                // Remember the list in table

-               $content['payment_list'] = loadTemplate('guest_sponsor_payment', true, $OUT);
+               $content['payment_list'] = loadTemplate('guest_sponsor_payment', TRUE, $OUT);

 
                // Init a lot array elements
                foreach (array('company','position','tax_ident','gender_m','gender_f','gender_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) {
 
                // Init a lot array elements
                foreach (array('company','position','tax_ident','gender_m','gender_f','gender_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) {


@@ -279,7 +279,7 @@ ORDER BY
 
                        // Errors found?
                        if (count($formErrors) > 0) {
 
                        // Errors found?
                        if (count($formErrors) > 0) {

-                               $OUT = displayMessage('{--SPONSOR_REGISTER_SOMETHING_MISSING--}', true);
+                               $OUT = displayMessage('{--SPONSOR_REGISTER_SOMETHING_MISSING--}', TRUE);

                                $OUT .= '<ol>';
                                foreach ($formErrors as $error) {
                                        $OUT .= '<li>' . $error . '</li>';
                                $OUT .= '<ol>';
                                foreach ($formErrors as $error) {
                                        $OUT .= '<li>' . $error . '</li>';


@@ -301,7 +301,7 @@ ORDER BY
                } // END - if
 
                // Display registration form
                } // END - if
 
                // Display registration form

-               loadTemplate('guest_sponsor_reg', false, $content);
+               loadTemplate('guest_sponsor_reg', FALSE, $content);

        } else {
                // Nothing added so far
                displayMessage('{--SPONSOR_PAYMENT_LIST_EMPTY--}');
        } else {
                // Nothing added so far
                displayMessage('{--SPONSOR_PAYMENT_LIST_EMPTY--}');

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 552fa76c3512c5a694723d5dbad156333ac8c0c6..81acf6ecdff4d084e6590da34d7efe93eab435bb 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -83,8 +83,8 @@ $ltitle = '{--GUEST_STATS_' . strtoupper($lmode) . '--}';
 switch (getConfig('guest_stats')) {
        case 'MEMBERS': // Statistics about your members
                // Only males / females
 switch (getConfig('guest_stats')) {
        case 'MEMBERS': // Statistics about your members
                // Only males / females

-               $male   = countSumTotalData('M', 'user_data', 'userid', 'gender', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
-               $female = countSumTotalData('F', 'user_data', 'userid', 'gender', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+               $male   = countSumTotalData('M', 'user_data', 'userid', 'gender', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+               $female = countSumTotalData('F', 'user_data', 'userid', 'gender', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));

 
                // List every month
                $months = array();
 
                // List every month
                $months = array();


@@ -98,7 +98,7 @@ switch (getConfig('guest_stats')) {
                        } // END - if
 
                        // Count months
                        } // END - if
 
                        // Count months

-                       $months[$month] = countSumTotalData(bigintval($month), 'user_data', 'userid', 'birth_month', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+                       $months[$month] = countSumTotalData(bigintval($month), 'user_data', 'userid', 'birth_month', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));

                } // END - for
 
                // Members in categories
                } // END - for
 
                // Members in categories


@@ -116,7 +116,7 @@ switch (getConfig('guest_stats')) {
                // Now we have all categories loaded, count members
                foreach ($cats as $id => $dummy) {
                        // We only need id and nothing more to count...
                // Now we have all categories loaded, count members
                foreach ($cats as $id => $dummy) {
                        // We only need id and nothing more to count...

-                       $cat_cnt[$id] = countSumTotalData(bigintval($id), 'user_cats', 'id', 'cat_id', true);
+                       $cat_cnt[$id] = countSumTotalData(bigintval($id), 'user_cats', 'id', 'cat_id', TRUE);

                } // END - foreach
 
                // Prepare data for the template
                } // END - foreach
 
                // Prepare data for the template


@@ -146,7 +146,7 @@ switch (getConfig('guest_stats')) {
                        );
 
                        // Load row template
                        );
 
                        // Load row template

-                       $OUT .= loadTemplate('guest_stats_month_row', true, $row);
+                       $OUT .= loadTemplate('guest_stats_month_row', TRUE, $row);

 
                        if ($SW == 2) {
                                $r2 = '';
 
                        if ($SW == 2) {
                                $r2 = '';


@@ -170,12 +170,12 @@ switch (getConfig('guest_stats')) {
                        );
 
                        // Load row template and switch colors
                        );
 
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('guest_stats_cats_row', true, $row);
+                       $OUT .= loadTemplate('guest_stats_cats_row', TRUE, $row);

                } // END - foreach
                $content['cats_rows'] = $OUT;
 
                // Load final template
                } // END - foreach
                $content['cats_rows'] = $OUT;
 
                // Load final template

-               loadTemplate('guest_stats_member', false, $content);
+               loadTemplate('guest_stats_member', FALSE, $content);

                break;
 
        case 'MODULES': // TOP10 module clicks
                break;
 
        case 'MODULES': // TOP10 module clicks


@@ -190,19 +190,19 @@ switch (getConfig('guest_stats')) {
 
                if (!SQL_HASZERONUMS($guest_t10)) {
                        // Guest clicks
 
                if (!SQL_HASZERONUMS($guest_t10)) {
                        // Guest clicks

-                       $OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_GUEST_STATS--}');
+                       $OUT .= loadTemplate('guest_stats_header', TRUE, '{--GUEST_TOP_GUEST_STATS--}');

                        while ($content = SQL_FETCHARRAY($guest_t10)) {
                                // Load row template
                        while ($content = SQL_FETCHARRAY($guest_t10)) {
                                // Load row template

-                               $OUT .= loadTemplate('guest_stats_row', true, $content);
+                               $OUT .= loadTemplate('guest_stats_row', TRUE, $content);

                        } // END - while
                } // END - if
 
                if (!SQL_HASZERONUMS($mem_t10)) {
                        // Member clicks
                        } // END - while
                } // END - if
 
                if (!SQL_HASZERONUMS($mem_t10)) {
                        // Member clicks

-                       $OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_MEMBER_STATS--}');
+                       $OUT .= loadTemplate('guest_stats_header', TRUE, '{--GUEST_TOP_MEMBER_STATS--}');

                        while ($content = SQL_FETCHARRAY($mem_t10)) {
                                // Load row template
                        while ($content = SQL_FETCHARRAY($mem_t10)) {
                                // Load row template

-                               $OUT .= loadTemplate('guest_stats_row', true, $content);
+                               $OUT .= loadTemplate('guest_stats_row', TRUE, $content);

                        } // END - while
                } // END - if
 
                        } // END - while
                } // END - if
 


@@ -215,7 +215,7 @@ switch (getConfig('guest_stats')) {
                        );
 
                        // Load final template
                        );
 
                        // Load final template

-                       loadTemplate('guest_stats_table', false, $content);
+                       loadTemplate('guest_stats_table', FALSE, $content);

                } else {
                        // No clicks detected
                        displayMessage('{--GUEST_STATS_NO_CLICKS--}');
                } else {
                        // No clicks detected
                        displayMessage('{--GUEST_STATS_NO_CLICKS--}');

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index fe0892ddb042cdef58b07305f68c902e09b9c17c..db8fb817a31ae95e9667179898bd1ee2e9e56119 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -75,7 +75,7 @@ while ($content = SQL_FETCHARRAY($result)) {
        );
 
        // Load row template
        );
 
        // Load row template

-       $OUT .= loadTemplate('guest_top10_row_login', true, $content);
+       $OUT .= loadTemplate('guest_top10_row_login', TRUE, $content);

 
        // Count one up
        $count++;
 
        // Count one up
        $count++;


@@ -90,7 +90,7 @@ if ($count < getConfig('top10_max')) {
                );
 
                // Load row template
                );
 
                // Load row template

-               $OUT .= loadTemplate('guest_top10_empty5', true, $content);
+               $OUT .= loadTemplate('guest_top10_empty5', TRUE, $content);

        } // END - for
 } // END - if
 
        } // END - for
 } // END - if
 


@@ -129,7 +129,7 @@ while ($content = SQL_FETCHARRAY($result)) {
        $content['last_online'] = generateDateTime($content['last_online'], '3');
 
        // Load row template
        $content['last_online'] = generateDateTime($content['last_online'], '3');
 
        // Load row template

-       $OUT .= loadTemplate('guest_top10_row_earner', true, $content);
+       $OUT .= loadTemplate('guest_top10_row_earner', TRUE, $content);

 
        // Count one up
        $count++;
 
        // Count one up
        $count++;


@@ -144,7 +144,7 @@ if ($count < getConfig('top10_max')) {
                );
 
                // Load row template
                );
 
                // Load row template

-               $OUT .= loadTemplate('guest_top10_empty4', true, $content);
+               $OUT .= loadTemplate('guest_top10_empty4', TRUE, $content);

        } // END - for
 } // END - if
 
        } // END - for
 } // END - if
 


@@ -187,7 +187,7 @@ while ($content = SQL_FETCHARRAY($result)) {
        );
 
        // Load row template
        );
 
        // Load row template

-       $OUT .= loadTemplate('guest_top10_row_refs', true, $content);
+       $OUT .= loadTemplate('guest_top10_row_refs', TRUE, $content);

 
        // Count one up
        $count++;
 
        // Count one up
        $count++;


@@ -202,7 +202,7 @@ if ($count < getConfig('top10_max')) {
                );
 
                // Load row template
                );
 
                // Load row template

-               $OUT .= loadTemplate('guest_top10_empty5', true, $content);
+               $OUT .= loadTemplate('guest_top10_empty5', TRUE, $content);

        } // END - for
 } // END - if
 
        } // END - for
 } // END - if
 


@@ -213,7 +213,7 @@ $rows['referrals_out'] = $OUT;
 SQL_FREERESULT($result);
 
 // Load final template
 SQL_FREERESULT($result);
 
 // Load final template

-loadTemplate('guest_top10', false, $rows);
+loadTemplate('guest_top10', FALSE, $rows);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-welcome.php b/inc/modules/guest/what-welcome.php
index 27194d3a927dfccc48ebeb0c38f3a0561bb50ba5..060c24e76ce67aa2033474641cbf6d6c356e25f9 100644 (file)
--- a/inc/modules/guest/what-welcome.php
+++ b/inc/modules/guest/what-welcome.php
@@ -44,10 +44,10 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 // Prepare content
 addYouAreHereLink('guest', __FILE__);
 
 // Prepare content

-$content['ref_levels'] = countSumTotalData('', 'refdepths', 'id', '', true, ' WHERE `level` > 0');
+$content['ref_levels'] = countSumTotalData('', 'refdepths', 'id', '', TRUE, ' WHERE `level` > 0');

 
 // Load default template
 
 // Load default template

-loadTemplate('welcome', false, $content);
+loadTemplate('welcome', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index 586bd10650c1a51426302dd24e6463433e61f80b..45558fa73c7a883839d0b1d7eb76f7062c298f1b 100644 (file)
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -53,8 +53,8 @@ if ((!isExtensionActive('wernis')) && (!isAdmin())) {
 
 outputHtml('<div style="padding-left: 10px; padding-right: 10px">');
 $rdf = new fase4_rdf();
 
 outputHtml('<div style="padding-left: 10px; padding-right: 10px">');
 $rdf = new fase4_rdf();

-$rdf->_use_nl2br = false;
-$rdf->use_dynamic_display(false);
+$rdf->_use_nl2br = FALSE;
+$rdf->use_dynamic_display(FALSE);

 $rdf->set_CacheDir(getCachePath() . '');
 $rdf->set_salt(md5(getSiteKey()));
 $rdf->set_max_item(10);
 $rdf->set_CacheDir(getCachePath() . '');
 $rdf->set_salt(md5(getSiteKey()));
 $rdf->set_max_item(10);


@@ -82,7 +82,7 @@ if (isProxyUsed()) {
 $rdf->parse_RDF('http://www.wds66.com/rss.xml');
 
 // Fix to avoid 'headers already sent' bug. Thanks to Profi-Concept
 $rdf->parse_RDF('http://www.wds66.com/rss.xml');
 
 // Fix to avoid 'headers already sent' bug. Thanks to Profi-Concept

-outputHtml($rdf->finish(true));
+outputHtml($rdf->finish(TRUE));

 outputHtml('</div>');
 
 // [EOF]
 outputHtml('</div>');
 
 // [EOF]

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 928ec04109431ae7c7fa97f053e885e791d3c829..d0a35833c5c9a3413751cadca88185ef9fa55c44 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Generate a tableset for the menu title and content
 }
 
 // Generate a tableset for the menu title and content

-loadTemplate('guest_header', false, array('date_time' => generateDateTime(time(), 1)));
+loadTemplate('guest_header', FALSE, array('date_time' => generateDateTime(time(), 1)));

 
 // Add code-message here
 handleCodeMessage();
 
 // Add code-message here
 handleCodeMessage();


@@ -53,7 +53,7 @@ handleCodeMessage();
 loadTemplate('guest_menu_td');
 
 // Add the guest's menu here...
 loadTemplate('guest_menu_td');
 
 // Add the guest's menu here...

-if ((getConfig('guest_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) {
+if ((getConfig('guest_menu') == 'Y') || (!isExtensionActive('sql_patches', TRUE))) {

        // Show only when guest menu is active
        addMenu('guest', getAction(), getWhat());
 } // END - if
        // Show only when guest menu is active
        addMenu('guest', getAction(), getWhat());
 } // END - if


@@ -62,7 +62,7 @@ if ((getConfig('guest_menu') == 'Y') || (!isExtensionActive('sql_patches', true)
 loadTemplate('guest_menu_content');
 
 // Disable block-mode by default
 loadTemplate('guest_menu_content');
 
 // Disable block-mode by default

-enableBlockMode(false);
+enableBlockMode(FALSE);

 
 // Construct FQFN
 $inc = sprintf("inc/modules/guest/action-%s.php", getAction());
 
 // Construct FQFN
 $inc = sprintf("inc/modules/guest/action-%s.php", getAction());

diff --git a/inc/modules/loader.php b/inc/modules/loader.php
index 3ff6d6d8d7df5efcde4821dcf7225927a754f95a..b3395fa389c8fa4f82982332c506967a2009f5aa 100644 (file)
--- a/inc/modules/loader.php
+++ b/inc/modules/loader.php
@@ -57,7 +57,7 @@ if ((isGetRequestElementSet('url')) && (isGetRequestElementSet('hash'))) {
                logDebugMessage(__FILE__, __LINE__, 'Hash ' . getRequestElement('hash') . ' does not match URL ' . $decodedUrl);
        } elseif (isUrlValid($decodedUrl)) {
                // Generate a JavaScript that redirects us
                logDebugMessage(__FILE__, __LINE__, 'Hash ' . getRequestElement('hash') . ' does not match URL ' . $decodedUrl);
        } elseif (isUrlValid($decodedUrl)) {
                // Generate a JavaScript that redirects us

-               loadTemplate('loader', false, $decodedUrl);
+               loadTemplate('loader', FALSE, $decodedUrl);

        } else {
                // URL invalid
                redirectToUrl('modules.php?module=index');
        } else {
                // URL invalid
                redirectToUrl('modules.php?module=index');

diff --git a/inc/modules/login.php b/inc/modules/login.php
index e859f451db5064023abfce759b93b929b70c45a8..52f09fddc2204f7dffecde656ab7cf96471f3ae2 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -44,10 +44,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Disable block mode by default
 } // END - if
 
 // Disable block mode by default

-enableBlockMode(false);
+enableBlockMode(FALSE);

 
 // Generate a tableset for the menu title and content
 
 // Generate a tableset for the menu title and content

-loadTemplate('member_header', false, array('date_time' => generateDateTime(time(), 1)));
+loadTemplate('member_header', FALSE, array('date_time' => generateDateTime(time(), 1)));

 
 // Add code-message here
 handleCodeMessage();
 
 // Add code-message here
 handleCodeMessage();


@@ -65,12 +65,12 @@ if (!isActionSet()) {
 }
 
 // Add the member's menu here...
 }
 
 // Add the member's menu here...

-if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) {
+if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', TRUE))) {

        addMenu('member', getActionFromModuleWhat('member', getWhat()), getWhat());
 } // END - if
 
 // Disable block-mode again
        addMenu('member', getActionFromModuleWhat('member', getWhat()), getWhat());
 } // END - if
 
 // Disable block-mode again

-enableBlockMode(false);
+enableBlockMode(FALSE);

 
 // Menu -> content
 outputHtml('   </td>
 
 // Menu -> content
 outputHtml('   </td>


@@ -85,7 +85,7 @@ if ((isIncludeReadable($inc)) && (isMenuActionValid('member', getAction(), getWh
        redirectToUrl('modules.php?module=login');
 }
 
        redirectToUrl('modules.php?module=login');
 }
 

-if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) {
+if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', TRUE))) {

        // Right side of content (hint: a good place for 120x600 skyscraper banner!)
        loadTemplate('member_content_right');
 
        // Right side of content (hint: a good place for 120x600 skyscraper banner!)
        loadTemplate('member_content_right');
 

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 1c0f1f7d1c4f2fc21735761ef41471fa6edfc978..b2ce5f8209616d20f4a47e1ae8081e424d81fdec 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -53,10 +53,10 @@ if ((!isExtensionActive('theme')) && (!isAdmin())) {
 // Get total num
 if (isAdmin()) {
        // Load only active designs for user
 // Get total num
 if (isAdmin()) {
        // Load only active designs for user

-       $num_themes = countSumTotalData('Y', 'themes', 'id', 'theme_active', true);
+       $num_themes = countSumTotalData('Y', 'themes', 'id', 'theme_active', TRUE);

 } else {
        // Load all themes for admin
 } else {
        // Load all themes for admin

-       $num_themes = countSumTotalData('', 'themes', 'id', '', true);
+       $num_themes = countSumTotalData('', 'themes', 'id', '', TRUE);

 }
 
 // Default is no box
 }
 
 // Default is no box


@@ -68,14 +68,14 @@ if ($num_themes > 1) {
        $OUT = generateThemeSelectionBox();
 } elseif (($num_themes == 1) || ((!isAdmin()) && ($num_themes == '0'))) {
        // If there's only one just output it's name
        $OUT = generateThemeSelectionBox();
 } elseif (($num_themes == 1) || ((!isAdmin()) && ($num_themes == '0'))) {
        // If there's only one just output it's name

-       $OUT = loadTemplate('theme_one', true, getCurrentThemeName());
+       $OUT = loadTemplate('theme_one', TRUE, getCurrentThemeName());

 } elseif (isAdmin()) {
        // If there is no theme installed and there's an admin notify him!
        $OUT = '{--ADMIN_NO_THEME_INSTALLED_WARNING--}';
 }
 
 // Load final box template
 } elseif (isAdmin()) {
        // If there is no theme installed and there's an admin notify him!
        $OUT = '{--ADMIN_NO_THEME_INSTALLED_WARNING--}';
 }
 
 // Load final box template

-$GLOBALS['rows'] .= loadTemplate('theme_select_box', true, $OUT);
+$GLOBALS['rows'] .= loadTemplate('theme_select_box', TRUE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index 5ba96f97553149497b2089c2bb7b583375e21df8..74cfbd479edf1e4010794a803ad870d0a2df01a3 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -63,7 +63,7 @@ if ((isExtensionActive('nickname')) && (getUserData('nickname') != '')) {
 // @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 
 // Load template
 // @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 
 // Load template

-loadTemplate('member_beg', false, $content);
+loadTemplate('member_beg', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index f6b2fb935992459b9eeadc0c0bfdbc89671cc748..510ddcc45dcdf28c06b09acabdb2c0ca5cb91345 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -91,14 +91,14 @@ if (!SQL_HASZERONUMS($result)) {
                $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load row template
                $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load row template

-               $OUT .= loadTemplate('member_list_beg_row', true, $content);
+               $OUT .= loadTemplate('member_list_beg_row', TRUE, $content);

 
                // Count one up
                $count++;
        } // END - while
 } else {
        // No one is interested in our "begging rallye" ! :-(
 
                // Count one up
                $count++;
        } // END - while
 } else {
        // No one is interested in our "begging rallye" ! :-(

-       $OUT = loadTemplate('member_beg_404', true);
+       $OUT = loadTemplate('member_beg_404', TRUE);

 }
 
 // Prepare content
 }
 
 // Prepare content


@@ -108,7 +108,7 @@ $content['rows'] = $OUT;
 SQL_FREERESULT($result);
 
 // Load final template
 SQL_FREERESULT($result);
 
 // Load final template

-loadTemplate('member_list_beg', false, $content);
+loadTemplate('member_list_beg', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index ee31c8b790e0037ba8d25a17b866198ea346b846..7949c5de9664bca4cdfdd3407e51fb5d9397d5fc 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -99,14 +99,14 @@ if (!SQL_HASZERONUMS($result)) {
                $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load row template
                $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load row template

-               $OUT .= loadTemplate('member_bonus_row', true, $content);
+               $OUT .= loadTemplate('member_bonus_row', TRUE, $content);

 
                // Count one up
                $count++;
        } // END - while
 } else {
        // No one is interested in our "active rallye" ! :-(
 
                // Count one up
                $count++;
        } // END - while
 } else {
        // No one is interested in our "active rallye" ! :-(

-       $OUT = loadTemplate('member_bonus_404', true);
+       $OUT = loadTemplate('member_bonus_404', TRUE);

 }
 
 // Free memory
 }
 
 // Free memory


@@ -116,7 +116,7 @@ SQL_FREERESULT($result);
 $content['rows'] = $OUT;
 
 // Load final template
 $content['rows'] = $OUT;
 
 // Load final template

-loadTemplate('member_bonus', false, $content);
+loadTemplate('member_bonus', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-cash_coupon.php b/inc/modules/member/what-cash_coupon.php
index c1d813321ac43aca12e69f078354c5fde6565857..7fb6dee336c1e84aeacec169367caa877adcbea3 100644 (file)
--- a/inc/modules/member/what-cash_coupon.php
+++ b/inc/modules/member/what-cash_coupon.php
@@ -165,7 +165,7 @@ LIMIT 1",
        }
 } else {
        // Load form template
        }
 } else {
        // Load form template

-       loadTemplate('member_cash_coupon', false);
+       loadTemplate('member_cash_coupon', FALSE);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 7c6b40505570689ca1fd7bff348ae72131d4c99e..35f21dda296047469278ee50c2e8d458d0863fba 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -53,7 +53,7 @@ $result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereSta
 
 // Are there entries?
 if (!SQL_HASZERONUMS($result)) {
 
 // Are there entries?
 if (!SQL_HASZERONUMS($result)) {

-       $LEAST = false;
+       $LEAST = FALSE;

        if (isFormSent()) {
                $count = '0';
                foreach (postRequestElement('cat') as $categoryId => $joined) {
        if (isFormSent()) {
                $count = '0';
                foreach (postRequestElement('cat') as $categoryId => $joined) {


@@ -62,7 +62,7 @@ if (!SQL_HASZERONUMS($result)) {
 
                if ((SQL_NUMROWS($result) - $count) < getLeastCats()) {
                        unsetPostRequestElement('ok');
 
                if ((SQL_NUMROWS($result) - $count) < getLeastCats()) {
                        unsetPostRequestElement('ok');

-                       $LEAST = true;
+                       $LEAST = TRUE;

                } // END - if
        } // END - if
 
                } // END - if
        } // END - if
 


@@ -80,7 +80,7 @@ if (!SQL_HASZERONUMS($result)) {
                        switch ($joined) {
                                case 'Y':
                                        // Check if this category has an entry
                        switch ($joined) {
                                case 'Y':
                                        // Check if this category has an entry

-                                       if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($categoryId))) == 0) {
+                                       if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', TRUE, sprintf(" AND `cat_id`=%s", bigintval($categoryId))) == 0) {

                                                // No, so add it
                                                addSql(sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s,%s)", getMemberId(), bigintval($categoryId)));
                                        } // END - if
                                                // No, so add it
                                                addSql(sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s,%s)", getMemberId(), bigintval($categoryId)));
                                        } // END - if


@@ -107,7 +107,7 @@ if (!SQL_HASZERONUMS($result)) {
                        displayMessage('{--MEMBER_CATEGORIES_NOT_SAVED--}');
                }
        } else {
                        displayMessage('{--MEMBER_CATEGORIES_NOT_SAVED--}');
                }
        } else {

-               if ($LEAST === true) {
+               if ($LEAST === TRUE) {

                        // Also here we have to secure it... :(
                        displayMessage('{--CHOOSE_MORE_CATEGORIES--}');
                } // END - if
                        // Also here we have to secure it... :(
                        displayMessage('{--CHOOSE_MORE_CATEGORIES--}');
                } // END - if


@@ -128,21 +128,21 @@ if (!SQL_HASZERONUMS($result)) {
                                } // END - if
                        } else {
                                // Check if he has an entry
                                } // END - if
                        } else {
                                // Check if he has an entry

-                               if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {
+                               if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', TRUE, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {

                                        $content['jn'] = '';
                                        $content['jy'] = ' checked="checked"';
                                } // END - if
                        }
 
                        // Load row template
                                        $content['jn'] = '';
                                        $content['jy'] = ' checked="checked"';
                                } // END - if
                        }
 
                        // Load row template

-                       $OUT .= loadTemplate('member_cats_row', true, $content);
+                       $OUT .= loadTemplate('member_cats_row', TRUE, $content);

                } // END - while
 
                // Free result
                SQL_FREERESULT($result);
 
                // Load footer template
                } // END - while
 
                // Free result
                SQL_FREERESULT($result);
 
                // Load footer template

-               loadTemplate('member_cats', false, $OUT);
+               loadTemplate('member_cats', FALSE, $OUT);

        }
 } else {
        // No cateogries are defined yet
        }
 } else {
        // No cateogries are defined yet

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index d02038b25763e3054857a0706918e295962770d6..3e25234b8b86bd650bb448b57308d4385efe385d 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -60,7 +60,7 @@ $content['payout_history'] = generateDoublerTable(getMemberId(), 'Y', 'N', 'DESC
 $content['payout_ref'] = generateDoublerTable(getMemberId(), 'N', 'Y', 'DESC');
 
 // Load template
 $content['payout_ref'] = generateDoublerTable(getMemberId(), 'N', 'Y', 'DESC');
 
 // Load template

-loadTemplate('member_doubler', false, $content);
+loadTemplate('member_doubler', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-earning.php b/inc/modules/member/what-earning.php
index a4ad2d67078dbc9936e2afe88bd2e55e5fa32060..d2943e5783d7cc2f8ec8270ccde7916553809cb1 100644 (file)
--- a/inc/modules/member/what-earning.php
+++ b/inc/modules/member/what-earning.php
@@ -102,15 +102,15 @@ LIMIT 1',
                // Is there user_earning data available?
                if (!isset($content['earning_active'])) {
                        // Load row template "open subscription"
                // Is there user_earning data available?
                if (!isset($content['earning_active'])) {
                        // Load row template "open subscription"

-                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_form_row', true, $content);
+                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_form_row', TRUE, $content);

                } else {
                        // Load row template "already subscribed"
                } else {
                        // Load row template "already subscribed"

-                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_row', true, $content);
+                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_row', TRUE, $content);

                }
        } // END - while
 
        // Load main template
                }
        } // END - while
 
        // Load main template

-       loadTemplate('member_earning', false, $OUT);
+       loadTemplate('member_earning', FALSE, $OUT);

 } else {
        // Display message
        displayMessage('{--MEMBER_EARNINGS_404--}');
 } else {
        // Display message
        displayMessage('{--MEMBER_EARNINGS_404--}');

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index ec4fae0ba8e477dad99b2e16f48f69f744eccb6e..e1b6872cff5cec7351aa1fc30a4d1929112dd5a1 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -274,7 +274,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
                                        $content['lock']  = generateDateTime($content['holiday_activated'], 1);
 
                                        // Load template
                                        $content['lock']  = generateDateTime($content['holiday_activated'], 1);
 
                                        // Load template

-                                       loadTemplate('member_holiday_deactivate', false, $content);
+                                       loadTemplate('member_holiday_deactivate', FALSE, $content);

                                } else {
                                        // Free memory
                                        SQL_FREERESULT($result);
                                } else {
                                        // Free memory
                                        SQL_FREERESULT($result);


@@ -312,7 +312,7 @@ LIMIT 1",
                                $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
 
                                // Output form
                                $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
 
                                // Output form

-                               loadTemplate('member_holiday_form', false, $content);
+                               loadTemplate('member_holiday_form', FALSE, $content);

                                break;
                } // END - switch
        } else {
                                break;
                } // END - switch
        } else {

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index d7f695a43c07582055d2764785ca741992c537bb..93d835e7b7d230ba3c1660b2d7070555b6e89bbe 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -63,7 +63,7 @@ if (isFormSent()) {
        $content['html_' . strtolower(getUserData('html'))] = ' checked="checked"';
 
        // Load main template
        $content['html_' . strtolower(getUserData('html'))] = ' checked="checked"';
 
        // Load main template

-       loadTemplate('member_html_mail_settings', false, $content);
+       loadTemplate('member_html_mail_settings', FALSE, $content);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/member/what-list_coupon.php b/inc/modules/member/what-list_coupon.php
index 8b68655b18f6c45af53fa800a4f793beadac4afd..5e9b4b085948c03247b51733cb3ea6c349b084df 100644 (file)
--- a/inc/modules/member/what-list_coupon.php
+++ b/inc/modules/member/what-list_coupon.php
@@ -86,11 +86,11 @@ if (!SQL_HASZERONUMS($result)) {
                $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2');
 
                // Add the row template
                $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2');
 
                // Add the row template

-               $OUT .= loadTemplate('member_list_coupon_row', true, $content);
+               $OUT .= loadTemplate('member_list_coupon_row', TRUE, $content);

        } // END - while
 
        // Load main template
        } // END - while
 
        // Load main template

-       loadTemplate('member_list_coupon', false, $OUT);
+       loadTemplate('member_list_coupon', FALSE, $OUT);

 } else {
        // No cashed coupons found
        displayMessage('{--MEMBER_COUPON_CASHED_404--}');
 } else {
        // No cashed coupons found
        displayMessage('{--MEMBER_COUPON_CASHED_404--}');

diff --git a/inc/modules/member/what-list_surfbar.php b/inc/modules/member/what-list_surfbar.php
index b783520296a91f7b65660d5b3aac8f5ce3378c23..bf13acc78517ab8ef2208aed20bccf460884e205 100644 (file)
--- a/inc/modules/member/what-list_surfbar.php
+++ b/inc/modules/member/what-list_surfbar.php
@@ -80,11 +80,11 @@ if ((isFormSent()) && (isPostRequestElementSet('action')) && (isPostRequestEleme
                $content['actions']         = generateSurfbarMemberActions($content['url_id'], $content['url_status']);
 
                // Load row template
                $content['actions']         = generateSurfbarMemberActions($content['url_id'], $content['url_status']);
 
                // Load row template

-               $OUT .= loadTemplate('member_list_surfbar_row', true, $content);
+               $OUT .= loadTemplate('member_list_surfbar_row', TRUE, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('member_list_surfbar', false, $OUT);
+       loadTemplate('member_list_surfbar', FALSE, $OUT);

 } else {
        // No URLs booked so far
        displayMessage('{--MEMBER_SURFBAR_NO_URLS_FOUND--}');
 } else {
        // No URLs booked so far
        displayMessage('{--MEMBER_SURFBAR_NO_URLS_FOUND--}');

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 3d87be6e11ad5b766e7da221bc9623a38cb856d6..92371167dba9ac9a2a4302480adfc7a9553c2b67 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -73,10 +73,10 @@ switch ($mode) {
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account

-                       $content['change'] = displayMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>', true);
+                       $content['change'] = displayMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>', TRUE);

                } else {
                        // He is allowed to change his profile
                } else {
                        // He is allowed to change his profile

-                       $content['change'] = loadTemplate('member_mydata_button', true);
+                       $content['change'] = loadTemplate('member_mydata_button', TRUE);

                }
 
                if (strlen($content['birth_day'])   == 1) $content['birth_day']   = '0' . $content['birth_day'];
                }
 
                if (strlen($content['birth_day'])   == 1) $content['birth_day']   = '0' . $content['birth_day'];


@@ -93,11 +93,11 @@ switch ($mode) {
                } // END - if
 
                // Load template
                } // END - if
 
                // Load template

-               loadTemplate('member_mydata_overview', false, $content);
+               loadTemplate('member_mydata_overview', FALSE, $content);

                break;
 
        case 'edit': // Edit data
                break;
 
        case 'edit': // Edit data

-               if (isExtensionActive('country', true)) {
+               if (isExtensionActive('country', TRUE)) {

                        // New way
                        $result = SQL_QUERY_ESC("SELECT
        `surname`,
                        // New way
                        $result = SQL_QUERY_ESC("SELECT
        `surname`,


@@ -206,7 +206,7 @@ LIMIT 1",
                        }
 
                        // Load template
                        }
 
                        // Load template

-                       loadTemplate('member_mydata_edit', false, $content);
+                       loadTemplate('member_mydata_edit', FALSE, $content);

                }
                break;
 
                }
                break;
 

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 5cb477c76767c6155c30bd90d4542eb0bffdb5c9..2741f949f2862de78f33d6c20ee8a018b5b12c31 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -50,7 +50,7 @@ if ((!isExtensionActive('nickname')) && (!isAdmin())) {
        return;
 } // END - if
 
        return;
 } // END - if
 

-$isValid = false;
+$isValid = FALSE;

 
 if (isFormSent()) {
        // Nickname was submitted so let's check if it is not already in use
 
 if (isFormSent()) {
        // Nickname was submitted so let's check if it is not already in use


@@ -63,7 +63,7 @@ if (isFormSent()) {
        } // END - if
 } // END - if
 
        } // END - if
 } // END - if
 

-if ($isValid === true) {
+if ($isValid === TRUE) {

        // Nickname already in use which is the default
        $content = '{--MEMBER_NICKNAME_ALREADY_IN_USE--}';
 
        // Nickname already in use which is the default
        $content = '{--MEMBER_NICKNAME_ALREADY_IN_USE--}';
 


@@ -105,7 +105,7 @@ if ($isValid === true) {
 } else {
        // Is there already submit the form?
        if (isPostRequestElementSet('nickname')) {
 } else {
        // Is there already submit the form?
        if (isPostRequestElementSet('nickname')) {

-               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_NICKNAME_IS_INVALID--}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_NICKNAME_IS_INVALID--}');

        } // END - if
 
        // Load Template
        } // END - if
 
        // Load Template

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 8914ad5202f5f25d3ccdba8785d88a8507a966ac..16eb57d7a2afd0f2dee71c34f07e3ef5057c6848 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -294,7 +294,7 @@ LIMIT 1",
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
                                                                bigintval($content['target_send']),
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
                                                                bigintval($content['target_send']),

-                                                               bigintval(postRequestElement('zip'), true, false),
+                                                               bigintval(postRequestElement('zip'), TRUE, FALSE),

                                                                postRequestElement('html')
                                                        ), __FILE__, __LINE__);
                                        } else {
                                                                postRequestElement('html')
                                                        ), __FILE__, __LINE__);
                                        } else {


@@ -335,7 +335,7 @@ LIMIT 1",
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
                                                                bigintval($content['target_send']),
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
                                                                bigintval($content['target_send']),

-                                                               bigintval(postRequestElement('zip'), true, false),
+                                                               bigintval(postRequestElement('zip'), TRUE, FALSE),

                                                        ), __FILE__, __LINE__);
                                        }
 
                                                        ), __FILE__, __LINE__);
                                        }
 


@@ -478,7 +478,7 @@ ORDER BY
                                $userid_cnt = '0';
                                while (list($userid) = SQL_FETCHROW($result_userids)) {
                                        // Check for holiday system
                                $userid_cnt = '0';
                                while (list($userid) = SQL_FETCHROW($result_userids)) {
                                        // Check for holiday system

-                                       $isHolidayActive = false;
+                                       $isHolidayActive = FALSE;

                                        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                                                // Check user's holiday status
                                                $result_holiday = SQL_QUERY_ESC("SELECT
                                        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                                                // Check user's holiday status
                                                $result_holiday = SQL_QUERY_ESC("SELECT


@@ -509,7 +509,7 @@ LIMIT 1",
                                                $isHolidayActive = ($count == 1);
                                        } // END - if
 
                                                $isHolidayActive = ($count == 1);
                                        } // END - if
 

-                                       if ($isHolidayActive === false) {
+                                       if ($isHolidayActive === FALSE) {

                                                // Check if the user want's to receive mails?
                                                $result_ver = SQL_QUERY_ESC("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s".$HTML." AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
                                                        array(bigintval($userid)), __FILE__, __LINE__);
                                                // Check if the user want's to receive mails?
                                                $result_ver = SQL_QUERY_ESC("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s".$HTML." AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
                                                        array(bigintval($userid)), __FILE__, __LINE__);


@@ -578,10 +578,10 @@ LIMIT 1",
                                } // END - switch
 
                                // Load final template
                                } // END - switch
 
                                // Load final template

-                               loadTemplate('member_order_points', false, $content);
+                               loadTemplate('member_order_points', FALSE, $content);

 
                                // Reset variables
 
                                // Reset variables

-                               $OLD_ORDER = false;
+                               $OLD_ORDER = FALSE;

                                $subject = '';
                                $text = '';
                                $target = '';
                                $subject = '';
                                $text = '';
                                $target = '';


@@ -615,7 +615,7 @@ LIMIT 1",
                                        } // END - if
 
                                        // Old order is grabbed
                                        } // END - if
 
                                        // Old order is grabbed

-                                       $OLD_ORDER = true;
+                                       $OLD_ORDER = TRUE;

                                } else {
                                        // Default output for that your members don't forget it...
                                        $content['url']         = 'http://';
                                } else {
                                        // Default output for that your members don't forget it...
                                        $content['url']         = 'http://';


@@ -647,7 +647,7 @@ LIMIT 1",
 
                                        if (isPostRequestElementSet('zip')) {
                                                // Output entered ZIP code
 
                                        if (isPostRequestElementSet('zip')) {
                                                // Output entered ZIP code

-                                               $content['zip_content'] = loadTemplate('member_order_zip2', true, postRequestElement('zip'));
+                                               $content['zip_content'] = loadTemplate('member_order_zip2', TRUE, postRequestElement('zip'));

                                        } // END - if
 
                                        // No HTML extension installed by default
                                        } // END - if
 
                                        // No HTML extension installed by default


@@ -656,11 +656,11 @@ LIMIT 1",
                                        // HTML extension
                                        if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
                                                // Extension is active so output valid HTML tags
                                        // HTML extension
                                        if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
                                                // Extension is active so output valid HTML tags

-                                               $content['html_extension'] = loadTemplate('member_order_html_ext', true);
+                                               $content['html_extension'] = loadTemplate('member_order_html_ext', TRUE);

                                        } // END - if
 
                                        // Output form for page 2
                                        } // END - if
 
                                        // Output form for page 2

-                                       loadTemplate('member_order_page2', false, $content);
+                                       loadTemplate('member_order_page2', FALSE, $content);

                                } else {
                                        // No HTML extension installed by default
                                        $content['html_extension'] = '<input type="hidden" name="html" value="N" />';
                                } else {
                                        // No HTML extension installed by default
                                        $content['html_extension'] = '<input type="hidden" name="html" value="N" />';


@@ -668,7 +668,7 @@ LIMIT 1",
                                        // Remember maybe entered ZIP code in constant
                                        if (isExtensionActive('html_mail')) {
                                                // Add some content when html extension is active
                                        // Remember maybe entered ZIP code in constant
                                        if (isExtensionActive('html_mail')) {
                                                // Add some content when html extension is active

-                                               $content['html_extension'] = loadTemplate('member_order_html_intro', true);
+                                               $content['html_extension'] = loadTemplate('member_order_html_intro', TRUE);

                                        } // END - if
 
                                        // Default is no ZIP code
                                        } // END - if
 
                                        // Default is no ZIP code


@@ -686,11 +686,11 @@ LIMIT 1",
                                                                'zip' => ''
                                                        );
                                                }
                                                                'zip' => ''
                                                        );
                                                }

-                                               $content['zip_content'] = loadTemplate('member_order_zip1', true, $data);
+                                               $content['zip_content'] = loadTemplate('member_order_zip1', TRUE, $data);

                                        } // END - if
 
                                        // Output form for page 1 (ZIP code or HTML)
                                        } // END - if
 
                                        // Output form for page 1 (ZIP code or HTML)

-                                       loadTemplate('member_order_page1', false, $content);
+                                       loadTemplate('member_order_page1', FALSE, $content);

                                }
                        } else {
                                // No mail types defined
                                }
                        } else {
                                // No mail types defined

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index e0bba7eee52b59dda96982013d9c7fd17f8b5c7a..7907f0e22a618a42efb24c14a232334484930cb1 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -119,11 +119,11 @@ ORDER BY
                                $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
 
                                // Load row template and switch colors
                                $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
 
                                // Load row template and switch colors

-                               $OUT .= loadTemplate('member_payout_row', true, $content);
+                               $OUT .= loadTemplate('member_payout_row', TRUE, $content);

                        } // END - while
 
                        // Load template
                        } // END - while
 
                        // Load template

-                       loadTemplate('member_payout', false, $OUT);
+                       loadTemplate('member_payout', FALSE, $OUT);

                } // END - if
 
                // Free memory
                } // END - if
 
                // Free memory


@@ -231,7 +231,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                );
 
                                // Generate banner order form
                                );
 
                                // Generate banner order form

-                               loadTemplate('member_payout_form_banner', false, $content);
+                               loadTemplate('member_payout_form_banner', FALSE, $content);

                        } else {
                                // Prepare content
                                $content = array(
                        } else {
                                // Prepare content
                                $content = array(


@@ -241,7 +241,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                );
 
                                // Generate normal form
                                );
 
                                // Generate normal form

-                               loadTemplate('member_payout_form', false, $content);
+                               loadTemplate('member_payout_form', FALSE, $content);

                        }
                } else {
                        // Not enougth points
                        }
                } else {
                        // Not enougth points

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index dfb51b82524b7a1684de6e6d61f0fa51878c4c72..f6f5d598404259c617a3f4b489532f8a994e187b 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -142,7 +142,7 @@ LIMIT 1',
        SQL_FREERESULT($result_points);
 
        // Output row
        SQL_FREERESULT($result_points);
 
        // Output row

-       $OUT .= loadTemplate('member_points_row', true, $content);
+       $OUT .= loadTemplate('member_points_row', TRUE, $content);

 } // END - while
 
 // Free memory
 } // END - while
 
 // Free memory


@@ -168,10 +168,10 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
        $content['bonus_total_points'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
 
        // Output rows
        $content['bonus_total_points'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
 
        // Output rows

-       $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content);
+       $content['special_rows'] = loadTemplate('member_points_bonus_rows', TRUE, $content);

 } elseif ((isExtensionActive('bonus')) && (!isBonusRallyeActive())) {
        // Bonus active rallye deactivated
 } elseif ((isExtensionActive('bonus')) && (!isBonusRallyeActive())) {
        // Bonus active rallye deactivated

-       $content['special_rows'] = loadTemplate('member_points_bonus_disabled', true);
+       $content['special_rows'] = loadTemplate('member_points_bonus_disabled', TRUE);

 } elseif ((isAdmin()) && (isExtensionInstalledAndOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) {
        // Please upgrade your bonus extension to v0.2.2 or newer!
        $content['special_rows'] = loadTemplate('member_points_upgrade');
 } elseif ((isAdmin()) && (isExtensionInstalledAndOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) {
        // Please upgrade your bonus extension to v0.2.2 or newer!
        $content['special_rows'] = loadTemplate('member_points_upgrade');


@@ -180,7 +180,7 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
 // Load final template
 if (isExtensionActive('user')) {
        // Load template when required extension is there
 // Load final template
 if (isExtensionActive('user')) {
        // Load template when required extension is there

-       loadTemplate('member_points', false, $content);
+       loadTemplate('member_points', FALSE, $content);

 } elseif (isAdmin()) {
        // Missing extension
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
 } elseif (isAdmin()) {
        // Missing extension
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 70d0e433a1a3f252ab9143067aea3543cbec1ef1..0265f94e6f910505dcf99c74b8284c470f1f5f2e 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -82,11 +82,11 @@ if (SQL_NUMROWS($result) == 1) {
        // Found some (normally one...
        $content = SQL_FETCHARRAY($result);
 
        // Found some (normally one...
        $content = SQL_FETCHARRAY($result);
 

-       $expired = false;
+       $expired = FALSE;

        if (($content['end_time'] < time()) && (getTotalConfirmedUser() >= $content['min_users']) && (getTotalRallyeWinners($content['id']) >= $content['min_prices'])) {
                // Rallye is expired
                $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
        if (($content['end_time'] < time()) && (getTotalConfirmedUser() >= $content['min_users']) && (getTotalRallyeWinners($content['id']) >= $content['min_prices'])) {
                // Rallye is expired
                $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';

-               $expired = true;
+               $expired = TRUE;

        } elseif (time() >= ($content['end_time'] - getOneDay())) {
                // Rallye will expire in less one day!
                $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
        } elseif (time() >= ($content['end_time'] - getOneDay())) {
                // Rallye will expire in less one day!
                $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';


@@ -101,7 +101,7 @@ if (SQL_NUMROWS($result) == 1) {
        // Handle description...
        if ((empty($content['descr'])) && (!empty($content['template']))) {
                // Use description from template
        // Handle description...
        if ((empty($content['descr'])) && (!empty($content['template']))) {
                // Use description from template

-               $content['descr'] = loadTemplate('rallye_' . $content['template'], true);
+               $content['descr'] = loadTemplate('rallye_' . $content['template'], TRUE);

        } // END - if
 
        // Determine min_users/prices
        } // END - if
 
        // Determine min_users/prices


@@ -112,7 +112,7 @@ if (SQL_NUMROWS($result) == 1) {
        $content['start_time'] = generateDateTime($content['start_time'], 1);
        $content['end_time']   = generateDateTime($content['end_time']  , 1);
 
        $content['start_time'] = generateDateTime($content['start_time'], 1);
        $content['end_time']   = generateDateTime($content['end_time']  , 1);
 

-       if ($expired === true) {
+       if ($expired === TRUE) {

                $content['prices']       = addReferralRallyeWinners('member', $content['id']);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
                $content['prices']       = addReferralRallyeWinners('member', $content['id']);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';


@@ -123,7 +123,7 @@ if (SQL_NUMROWS($result) == 1) {
        }
 
        // And load final template
        }
 
        // And load final template

-       loadTemplate('member_show_rallye', false, $content);
+       loadTemplate('member_show_rallye', FALSE, $content);

 } else {
        // No rallye found so far
        loadTemplate('member_rallye_404');
 } else {
        // No rallye found so far
        loadTemplate('member_rallye_404');

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index b75ce5da435cff6c05cc29a546274084085cd672..203e4de17009d8af858f412f3d61fe11f52057dd 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
        displayMessage('{--MEMBER_REFBACK_DISABLED--}');
 
        // Abort here
        displayMessage('{--MEMBER_REFBACK_DISABLED--}');
 
        // Abort here

-       return false;
+       return FALSE;

 } // END - if
 
 // Add description as navigation point
 } // END - if
 
 // Add description as navigation point


@@ -91,7 +91,7 @@ if ((isFormSent('edit')) && (isPostRequestElementSet('id'))) {
                $content = getArrayFromUserRefbackData(postRequestElement('id'));
 
                // Load form for editing
                $content = getArrayFromUserRefbackData(postRequestElement('id'));
 
                // Load form for editing

-               loadTemplate('member_edit_refback', false, $content);
+               loadTemplate('member_edit_refback', FALSE, $content);

        }
 } // END - if
 
        }
 } // END - if
 


@@ -118,20 +118,20 @@ if (!SQL_HASZERONUMS($result)) {
                // Check for users ref in this level
                foreach (getArrayFromRefbackUserRefs(getMemberId(), $content['level']) as $refRow) {
                        // Not-deleted account is default
                // Check for users ref in this level
                foreach (getArrayFromRefbackUserRefs(getMemberId(), $content['level']) as $refRow) {
                        // Not-deleted account is default

-                       $deleted = false;
+                       $deleted = FALSE;

                        if (is_null($refRow['status'])) {
                        if (is_null($refRow['status'])) {

-                               $deleted = true;
+                               $deleted = TRUE;

                        } // END - if
 
                        // Add/"translate" more content
                        } // END - if
 
                        // Add/"translate" more content

-                       $refRow['click_rate']  = translateComma($refRow['click_rate'], true, 1);
+                       $refRow['click_rate']  = translateComma($refRow['click_rate'], TRUE, 1);

                        $refRow['joined']      = generateDateTime($refRow['joined'], '3');
 
                        // Load row template
                        $refRow['joined']      = generateDateTime($refRow['joined'], '3');
 
                        // Load row template

-                       if ($deleted === true) {
-                               $rows .= loadTemplate('member_list_refback_deleted_row', true, $refRow);
+                       if ($deleted === TRUE) {
+                               $rows .= loadTemplate('member_list_refback_deleted_row', TRUE, $refRow);

                        } else {
                        } else {

-                               $rows .= loadTemplate('member_list_refback_row', true, $refRow);
+                               $rows .= loadTemplate('member_list_refback_row', TRUE, $refRow);

                        }
 
                        // Count this ref and switch color
                        }
 
                        // Count this ref and switch color


@@ -142,11 +142,11 @@ if (!SQL_HASZERONUMS($result)) {
                $content['rows'] = $rows;
 
                // Load level template
                $content['rows'] = $rows;
 
                // Load level template

-               $OUT .= loadTemplate('member_list_refback_level', true, $content);
+               $OUT .= loadTemplate('member_list_refback_level', TRUE, $content);

        } // END - while
 
        // Load main template
        } // END - while
 
        // Load main template

-       loadTemplate('member_list_refback', false, $OUT);
+       loadTemplate('member_list_refback', FALSE, $OUT);

 } else {
        // No entries
        displayMessage('{--MEMBER_REFBACK_NO_ENTRIES--}');
 } else {
        // No entries
        displayMessage('{--MEMBER_REFBACK_NO_ENTRIES--}');

diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php
index 82a9d43786c456a90d3aff712ee9692492ffa8d8..887a251f54103a8bde5c86b97dcfeef040484a9e 100644 (file)
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -56,10 +56,10 @@ if (isExtensionActive('nickname')) {
 
        if (!empty($nick)) {
                // Display nickname link
 
        if (!empty($nick)) {
                // Display nickname link

-               $content['nickname_content'] = loadTemplate('member_reflink_nickname', true, $nick);
+               $content['nickname_content'] = loadTemplate('member_reflink_nickname', TRUE, $nick);

        } else {
                // Display link to nickname form
        } else {
                // Display link to nickname form

-               $content['nickname_content'] = loadTemplate('member_reflink_no_nickname', true);
+               $content['nickname_content'] = loadTemplate('member_reflink_no_nickname', TRUE);

        }
 } // END - if
 
        }
 } // END - if
 


@@ -103,14 +103,14 @@ if (!SQL_HASZERONUMS($result)) {
                $row['userid'] = getMemberId();
 
                // Add row
                $row['userid'] = getMemberId();
 
                // Add row

-               $OUT .= loadTemplate('member_list_reflinks_row', true, $row);
+               $OUT .= loadTemplate('member_list_reflinks_row', TRUE, $row);

        } // END - while
 
        // Load final template
        } // END - while
 
        // Load final template

-       $content['refbanner_content'] = loadTemplate('member_list_reflinks', true, $OUT);
+       $content['refbanner_content'] = loadTemplate('member_list_reflinks', TRUE, $OUT);

 } else {
        // No refbanner found
 } else {
        // No refbanner found

-       $content['refbanner_content'] = displayMessage('{--MEMBER_REFERRAL_BANNER_404--}', true);
+       $content['refbanner_content'] = displayMessage('{--MEMBER_REFERRAL_BANNER_404--}', TRUE);

 }
 
 // Free result
 }
 
 // Free result


@@ -120,7 +120,7 @@ SQL_FREERESULT($result);
 $content['extra_content'] = runFilterChain('member_reflink_extra_content');
 
 // Load main template
 $content['extra_content'] = runFilterChain('member_reflink_extra_content');
 
 // Load main template

-loadTemplate('member_reflink', false, $content);
+loadTemplate('member_reflink', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php
index 0022880cc162d51eaae0d1098dc79cb04eb6cc8a..dff7f2a93075e88c74a07bab8eedcb2cd528188b 100644 (file)
--- a/inc/modules/member/what-reflist.php
+++ b/inc/modules/member/what-reflist.php
@@ -69,10 +69,10 @@ if (!SQL_HASZERONUMS($result)) {
                // Check for users ref in this level
                foreach (getUserReferralPoints(getMemberId(), $content['level']) as $refRow) {
                        // Add/"translate" more content
                // Check for users ref in this level
                foreach (getUserReferralPoints(getMemberId(), $content['level']) as $refRow) {
                        // Add/"translate" more content

-                       $refRow['click_rate'] = translateComma($refRow['click_rate'], true, 1);
+                       $refRow['click_rate'] = translateComma($refRow['click_rate'], TRUE, 1);

 
                        // Load row template
 
                        // Load row template

-                       $rows .= loadTemplate('member_list_referral_row', true, $refRow);
+                       $rows .= loadTemplate('member_list_referral_row', TRUE, $refRow);

 
                        // Count this ref and switch color
                        $counter++;
 
                        // Count this ref and switch color
                        $counter++;


@@ -80,15 +80,15 @@ if (!SQL_HASZERONUMS($result)) {
 
                // Remember the content
                $content['counter']  = $counter;
 
                // Remember the content
                $content['counter']  = $counter;

-               $content['percents'] = translateComma($content['percents'], true, 1);
+               $content['percents'] = translateComma($content['percents'], TRUE, 1);

                $content['rows']     = $rows;
 
                // Load level template
                $content['rows']     = $rows;
 
                // Load level template

-               $OUT .= loadTemplate('member_list_referral_level', true, $content);
+               $OUT .= loadTemplate('member_list_referral_level', TRUE, $content);

        } // END - while
 
        // Load main template
        } // END - while
 
        // Load main template

-       loadTemplate('member_list_referral', false, $OUT);
+       loadTemplate('member_list_referral', FALSE, $OUT);

 } else {
        // No entries
        displayMessage('{--MEMBER_REFBACK_NO_ENTRIES--}');
 } else {
        // No entries
        displayMessage('{--MEMBER_REFBACK_NO_ENTRIES--}');

diff --git a/inc/modules/member/what-start_surfbar.php b/inc/modules/member/what-start_surfbar.php
index 8f037b6d562d7aed63b9d658ac554e339265e32e..297d8391465ca0f9df1bce15ab4e11a70a9302cf 100644 (file)
--- a/inc/modules/member/what-start_surfbar.php
+++ b/inc/modules/member/what-start_surfbar.php
@@ -64,7 +64,7 @@ if (getSurfbarPaymentModel() == 'DYNAMIC') {
 } // END - if
 
 // Load the template
 } // END - if
 
 // Load the template

-loadTemplate('member_start_surfbar_' . strtolower(getSurfbarPaymentModel()), false, $content);
+loadTemplate('member_start_surfbar_' . strtolower(getSurfbarPaymentModel()), FALSE, $content);

 
 // Load surfbar link template
 loadTemplate('member_surfbar_link');
 
 // Load surfbar link template
 loadTemplate('member_surfbar_link');

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index 51b82ba7e5d51aaea674924aed7e0844dd59f4bc..46afe0b1ef409f01b730eb8ba3ba827a42c4886c 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -77,14 +77,14 @@ if (!SQL_HASZERONUMS($result)) {
                $content['timestamp'] = generateDateTime($content['timestamp'], '2');
 
                // Load template
                $content['timestamp'] = generateDateTime($content['timestamp'], '2');
 
                // Load template

-               $OUT .= loadTemplate('member_pool_row', true, $content);
+               $OUT .= loadTemplate('member_pool_row', TRUE, $content);

        } // END - if
 
        // Load main template
        } // END - if
 
        // Load main template

-       $main_content['pool'] = loadTemplate('member_pool_table', true, $OUT);
+       $main_content['pool'] = loadTemplate('member_pool_table', TRUE, $OUT);

 } else {
        // No mails in pool!
 } else {
        // No mails in pool!

-       $main_content['pool'] = displayMessage('{--MEMBER_NO_MAILS_IN_POOL--}', true);
+       $main_content['pool'] = displayMessage('{--MEMBER_NO_MAILS_IN_POOL--}', TRUE);

 }
 
 // Free result
 }
 
 // Free result


@@ -126,21 +126,21 @@ if (!SQL_HASZERONUMS($result)) {
                } // END - if
 
                // Load row template and switch colors
                } // END - if
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('member_stats_row', true, $content);
+               $OUT .= loadTemplate('member_stats_row', TRUE, $content);

        } // END - while
 
        // Load main template
        } // END - while
 
        // Load main template

-       $main_content['stats'] = loadTemplate('member_stats_table', true, $OUT);
+       $main_content['stats'] = loadTemplate('member_stats_table', TRUE, $OUT);

 } else {
        // No mail orders fond
 } else {
        // No mail orders fond

-       $main_content['stats'] = displayMessage('{--MEMBER_NO_MAILS_IN_STATS--}', true);
+       $main_content['stats'] = displayMessage('{--MEMBER_NO_MAILS_IN_STATS--}', TRUE);

 }
 
 // Free result
 SQL_FREERESULT($result);
 
 // Load main template
 }
 
 // Free result
 SQL_FREERESULT($result);
 
 // Load main template

-loadTemplate('member_stats_pool', false, $main_content);
+loadTemplate('member_stats_pool', FALSE, $main_content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-subids.php b/inc/modules/member/what-subids.php
index 61f295ae035fd1608e1741616831a959f363eb92..1a92045be5b57b51d4c9a93a45556f2f93941aab 100644 (file)
--- a/inc/modules/member/what-subids.php
+++ b/inc/modules/member/what-subids.php
@@ -55,7 +55,7 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 } // END - if
 
 // By default show the list...
 } // END - if
 
 // By default show the list...

-$show = true;
+$show = TRUE;

 
 // Check for 'url_id' element
 //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isFormSent()=' . intval(isFormSent('add_subid')) . ',ifPostContainsSelections()=' . intval(ifPostContainsSelections()) . ',countRequestPost()=' . countRequestPost());
 
 // Check for 'url_id' element
 //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isFormSent()=' . intval(isFormSent('add_subid')) . ',ifPostContainsSelections()=' . intval(ifPostContainsSelections()) . ',countRequestPost()=' . countRequestPost());


@@ -76,7 +76,7 @@ if (isFormSent('add_subid')) {
        showEntriesByXmlCallback('member_edit_show_user_subid');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('member_edit_show_user_subid');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('member_edit_do_user_subid');
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
        showEntriesByXmlCallback('member_edit_do_user_subid');


@@ -85,7 +85,7 @@ if (isFormSent('add_subid')) {
        showEntriesByXmlCallback('member_delete_show_user_subid');
 
        // Do not show the list of URLs after this template
        showEntriesByXmlCallback('member_delete_show_user_subid');
 
        // Do not show the list of URLs after this template

-       $show = false;
+       $show = FALSE;

 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('member_delete_do_user_subid');
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
        showEntriesByXmlCallback('member_delete_do_user_subid');


@@ -102,7 +102,7 @@ if (isFormSent('add_subid')) {
                loadIncludeOnce($incFile);
 
                // Do not show the list of URLs after this template
                loadIncludeOnce($incFile);
 
                // Do not show the list of URLs after this template

-               $show = false;
+               $show = FALSE;

        } else {
                // Display error message
                displayMessage('{--MEMBER_INVALID_DO_USER_SUBID--}');
        } else {
                // Display error message
                displayMessage('{--MEMBER_INVALID_DO_USER_SUBID--}');


@@ -110,9 +110,9 @@ if (isFormSent('add_subid')) {
 }
 
 // Show entries?
 }
 
 // Show entries?

-if ($show === false) {
+if ($show === FALSE) {

        // No, a form has already been show
        // No, a form has already been show

-       return false;
+       return FALSE;

 } // END - if
 
 // List all campaigns
 } // END - if
 
 // List all campaigns

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 3e5d37b154d0ea50daea5a29a1dd9895d14a210c..2234042abff8d121b4cd1c2cc88ba51f9ecde290 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -79,7 +79,7 @@ $themes = array(
 );
 
 // Read directory "themes"
 );
 
 // Read directory "themes"

-$includes = getArrayFromDirectory('theme/', '', false, true, array('css', 'images'));
+$includes = getArrayFromDirectory('theme/', '', FALSE, TRUE, array('css', 'images'));

 
 // Walk through all entries and add it
 foreach ($includes as $inc) {
 
 // Walk through all entries and add it
 foreach ($includes as $inc) {


@@ -127,20 +127,20 @@ foreach ($themes['theme_unix'] as $key => $unix) {
        );
 
        // Load row template
        );
 
        // Load row template

-       $OUT .= loadTemplate('member_themes_row', true, $content);
+       $OUT .= loadTemplate('member_themes_row', TRUE, $content);

 } // END - foreach
 
 if (empty($OUT)) {
        // No themes found???
        $OUT = '<tr>
   <td colspan="5" class="bottom" height="80">
 } // END - foreach
 
 if (empty($OUT)) {
        // No themes found???
        $OUT = '<tr>
   <td colspan="5" class="bottom" height="80">

-    ' . displayMessage('{--MEMBER_NO_THEMES_FOUND--}', true) . '
+    ' . displayMessage('{--MEMBER_NO_THEMES_FOUND--}', TRUE) . '

   </td>
 </tr>';
 } // END - if
 
 // Load template
   </td>
 </tr>';
 } // END - if
 
 // Load template

-loadTemplate('member_themes', false, $OUT);
+loadTemplate('member_themes', FALSE, $OUT);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 5deb526cfa5fbb2d2202c6f481ed820ea127cb42..a0ad05b9e784af090e70d591ee9dc5f8b9553fc4 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -78,7 +78,7 @@ switch ($mode) {
                                $valid_code = ($code == postRequestElement('code'));
                        } else {
                                // Zero length (= disabled) is always valid!
                                $valid_code = ($code == postRequestElement('code'));
                        } else {
                                // Zero length (= disabled) is always valid!

-                               $valid_code = true;
+                               $valid_code = TRUE;

                        }
 
                        // Test password
                        }
 
                        // Test password


@@ -181,29 +181,29 @@ switch ($mode) {
 
                                // Transfer is completed
                                displayMessage('<div>{--MEMBER_TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--MEMBER_TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
 
                                // Transfer is completed
                                displayMessage('<div>{--MEMBER_TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--MEMBER_TRANSFER_CONTINUE_OVERVIEW--}</a></div>');

-                       } elseif ($valid_code === false) {
+                       } elseif ($valid_code === FALSE) {

                                // Invalid Touring code!
                                // Invalid Touring code!

-                               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_TRANSFER_INVALID_CODE--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_CODE--}');

                                unsetPostRequestElement('ok');
                                unsetPostRequestElement('ok');

-                       } elseif ($valid_pass === false) {
+                       } elseif ($valid_pass === FALSE) {

                                // Wrong password entered
                                // Wrong password entered

-                               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_TRANSFER_INVALID_PASSWORD--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_PASSWORD--}');

                                unsetPostRequestElement('ok');
                                unsetPostRequestElement('ok');

-                       } elseif ($valid_amount === false) {
+                       } elseif ($valid_amount === FALSE) {

                                // Too much points entered
                                // Too much points entered

-                               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_TRANSFER_INVALID_POINTS--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_POINTS--}');

                                unsetPostRequestElement('ok');
                                unsetPostRequestElement('ok');

-                       } elseif ($valid_reason === false) {
+                       } elseif ($valid_reason === FALSE) {

                                // No transfer reason entered
                                // No transfer reason entered

-                               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_TRANSFER_INVALID_REASON--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_REASON--}');

                                unsetPostRequestElement('ok');
                                unsetPostRequestElement('ok');

-                       } elseif ($valid_recipient === false) {
+                       } elseif ($valid_recipient === FALSE) {

                                // No recipient selected
                                // No recipient selected

-                               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_TRANSFER_INVALID_RECIPIENT--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_RECIPIENT--}');

                                unsetPostRequestElement('ok');
                                unsetPostRequestElement('ok');

-                       } elseif ($valid_data === false) {
+                       } elseif ($valid_data === FALSE) {

                                // No recipient/sender selected
                                // No recipient/sender selected

-                               loadTemplate('admin_settings_unsaved', false, '{--MEMBER_TRANSFER_INVALID_DATA--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_DATA--}');

                                unsetPostRequestElement('ok');
                        }
 
                                unsetPostRequestElement('ok');
                        }
 


@@ -234,7 +234,7 @@ switch ($mode) {
                                SQL_FREERESULT($result);
                        } else {
                                // No one else is opt-in
                                SQL_FREERESULT($result);
                        } else {
                                // No one else is opt-in

-                               $OUT = displayMessage('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}', true);
+                               $OUT = displayMessage('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}', TRUE);

                                $content['to_disabled'] = ' disabled="disabled"';
                        }
 
                                $content['to_disabled'] = ' disabled="disabled"';
                        }
 


@@ -250,13 +250,13 @@ switch ($mode) {
                                $code = generateRandomCode(getTransferCode(), $rand, getMemberId(), $content['max_transferable']);
 
                                // Generate image (HTML code)
                                $code = generateRandomCode(getTransferCode(), $rand, getMemberId(), $content['max_transferable']);
 
                                // Generate image (HTML code)

-                               $img = generateImageOrCode($code, false);
+                               $img = generateImageOrCode($code, FALSE);

 
                                // Add all and hidden field
                                $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
                        } else {
                                $code = '00000';
 
                                // Add all and hidden field
                                $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
                        } else {
                                $code = '00000';

-                               $content['captcha_code'] = displayMessage('{--MEMBER_TRANSFER_NO_CODE--}', true);
+                               $content['captcha_code'] = displayMessage('{--MEMBER_TRANSFER_NO_CODE--}', TRUE);

                        }
 
                        // Init points/reason
                        }
 
                        // Init points/reason


@@ -271,7 +271,7 @@ switch ($mode) {
                        } // END - if
 
                        // Output form
                        } // END - if
 
                        // Output form

-                       loadTemplate('member_transfer_new', false, $content);
+                       loadTemplate('member_transfer_new', FALSE, $content);

                } // END - if
                break;
 
                } // END - if
                break;
 


@@ -312,7 +312,7 @@ switch ($mode) {
                                $$content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
                                // Load row template
                                $$content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
                                // Load row template

-                               $OUT .= loadTemplate('member_transfer_row2', true, $content);
+                               $OUT .= loadTemplate('member_transfer_row2', TRUE, $content);

 
                                // Add points and switch color
                                $totalPoints += $content['points'];
 
                                // Add points and switch color
                                $totalPoints += $content['points'];


@@ -324,7 +324,7 @@ switch ($mode) {
                        // Nothing for in or out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
                        // Nothing for in or out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">

-    ' . displayMessage($nothingMessage, true) . '
+    ' . displayMessage($nothingMessage, TRUE) . '

   </td>
 </tr>';
                }
   </td>
 </tr>';
                }


@@ -336,7 +336,7 @@ switch ($mode) {
                $content['total_points'] = $totalPoints;
 
                // Load final template
                $content['total_points'] = $totalPoints;
 
                // Load final template

-               loadTemplate('member_transfer_list', false, $content);
+               loadTemplate('member_transfer_list', FALSE, $content);

                break;
 
        case 'list_all': // List all transactions
                break;
 
        case 'list_all': // List all transactions


@@ -399,7 +399,7 @@ INDEX (`party_userid`)
                                $content['time']   = generateDateTime($content['time_trans'], 3);
 
                                // Load row template
                                $content['time']   = generateDateTime($content['time_trans'], 3);
 
                                // Load row template

-                               $OUT .= loadTemplate('member_transfer_row', true, $content);
+                               $OUT .= loadTemplate('member_transfer_row', TRUE, $content);

 
                                // Add points and switch color
                                $total += $content['points'];
 
                                // Add points and switch color
                                $total += $content['points'];


@@ -408,7 +408,7 @@ INDEX (`party_userid`)
                        // Nothing for in and out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
                        // Nothing for in and out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">

-    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', true) . '
+    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', TRUE) . '

   </td>
 </tr>';
                }
   </td>
 </tr>';
                }


@@ -432,7 +432,7 @@ INDEX (`party_userid`)
                $result = SQL_QUERY_ESC("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_%s_transfers_tmp`", array(getMemberId()), __FILE__, __LINE__);
 
                // Load final template
                $result = SQL_QUERY_ESC("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_%s_transfers_tmp`", array(getMemberId()), __FILE__, __LINE__);
 
                // Load final template

-               loadTemplate('member_transfer_list', false, $content);
+               loadTemplate('member_transfer_list', FALSE, $content);

 
                // Free some memory...
                SQL_FREERESULT($result);
 
                // Free some memory...
                SQL_FREERESULT($result);


@@ -440,14 +440,14 @@ INDEX (`party_userid`)
 
        default: // Overview page
                // Check incoming transfers
 
        default: // Overview page
                // Check incoming transfers

-               $totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
+               $totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', TRUE);

                $content['in_link'] = $totalIn;
                if ($totalIn > 0) {
                        $content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_in%}">' . $totalIn . '</a>';
                } // END - if
 
                // Check outgoing transfers
                $content['in_link'] = $totalIn;
                if ($totalIn > 0) {
                        $content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_in%}">' . $totalIn . '</a>';
                } // END - if
 
                // Check outgoing transfers

-               $totalOut = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', true);
+               $totalOut = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', TRUE);

 
                $content['out_link'] = $totalOut;
                if ($totalOut > 0) {
 
                $content['out_link'] = $totalOut;
                if ($totalOut > 0) {


@@ -513,14 +513,14 @@ LIMIT 1",
                        $content['settings'] = '{%message,MEMBER_TRANSFER_LATEST_IS=' . generateDateTime($newest, '3') . '%}';
                } else {
                        // Load template
                        $content['settings'] = '{%message,MEMBER_TRANSFER_LATEST_IS=' . generateDateTime($newest, '3') . '%}';
                } else {
                        // Load template

-                       $content['settings'] = loadTemplate('member_transfer_settings', true, $content);
+                       $content['settings'] = loadTemplate('member_transfer_settings', TRUE, $content);

                }
 
                // Free result
                SQL_FREERESULT($result);
 
                // Load template
                }
 
                // Free result
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('member_transfer_overview', false, $content);
+               loadTemplate('member_transfer_overview', FALSE, $content);

                break;
 } // END - switch
 
                break;
 } // END - switch
 

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 06ababa80706fa4f5bb49ca62aa24e6cb801a89c..03cb14da6ee2d435e4f98ff9d9425eb9ac8de36b 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -96,7 +96,7 @@ LIMIT 1',
        } // END - if
 
        // Display it depending on mail (data) type
        } // END - if
 
        // Display it depending on mail (data) type

-       loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), false, $content);
+       loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), FALSE, $content);

 
        // Free result
        SQL_FREERESULT($result_data);
 
        // Free result
        SQL_FREERESULT($result_data);


@@ -151,7 +151,7 @@ LIMIT 1",
        } // END - if
 
        // Display it depending on mail (data) type
        } // END - if
 
        // Display it depending on mail (data) type

-       loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content);
+       loadTemplate('member_mail_normal_' . strtolower($content['data_type']), FALSE, $content);

 
        // Free result
        SQL_FREERESULT($result_data);
 
        // Free result
        SQL_FREERESULT($result_data);


@@ -179,7 +179,7 @@ if (!SQL_HASZERONUMS($result)) {
        while ($row = SQL_FETCHARRAY($result)) {
                // Load data from stats table...
                $cat = '';
        while ($row = SQL_FETCHARRAY($result)) {
                // Load data from stats table...
                $cat = '';

-               $result_data = false;
+               $result_data = FALSE;

                $message = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
                $data = $row['stats_id'] . '/' . $row['bonus_id'] . '/' . $row['link_type'];
                switch ($row['link_type']) {
                $message = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
                $data = $row['stats_id'] . '/' . $row['bonus_id'] . '/' . $row['link_type'];
                switch ($row['link_type']) {


@@ -255,9 +255,9 @@ LIMIT 1",
 
                        // Load row template
                        if (getConfig('show_points_unconfirmed') == 'Y') {
 
                        // Load row template
                        if (getConfig('show_points_unconfirmed') == 'Y') {

-                               $OUT .= loadTemplate('member_unconfirmed_row', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_row', TRUE, $content);

                        } else {
                        } else {

-                               $OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_row_nopoints', TRUE, $content);

                        }
 
                        // Count points
                        }
 
                        // Count points


@@ -271,9 +271,9 @@ LIMIT 1",
 
                        // Display points or not?
                        if (getConfig('show_points_unconfirmed') == 'Y') {
 
                        // Display points or not?
                        if (getConfig('show_points_unconfirmed') == 'Y') {

-                               $OUT .= loadTemplate('member_unconfirmed_404', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_404', TRUE, $content);

                        } else {
                        } else {

-                               $OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_404_nopoints', TRUE, $content);

                        }
                }
 
                        }
                }
 


@@ -292,9 +292,9 @@ LIMIT 1",
 
        // Load main template
        if (getConfig('show_points_unconfirmed') == 'Y') {
 
        // Load main template
        if (getConfig('show_points_unconfirmed') == 'Y') {

-               loadTemplate('member_unconfirmed_table', false, $content);
+               loadTemplate('member_unconfirmed_table', FALSE, $content);

        } else {
        } else {

-               loadTemplate('member_unconfirmed_table_nopoints', false, $content);
+               loadTemplate('member_unconfirmed_table_nopoints', FALSE, $content);

        }
 } else {
        // No mails left to confirm... :)
        }
 } else {
        // No mails left to confirm... :)

diff --git a/inc/modules/member/what-welcome.php b/inc/modules/member/what-welcome.php
index f507e8461de994bc66bdd9cf3d1e0a563b37308b..3de95ce9330d956ac8ec8a0aaf69f279c3cefb49 100644 (file)
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -52,7 +52,7 @@ $content = array(
 );
 
 // Load header template
 );
 
 // Load header template

-loadTemplate('member_welcome_header', false, $content);
+loadTemplate('member_welcome_header', FALSE, $content);

 
 // Check if he is returning from a profile update notification
 if ((isExtensionActive('profile')) && (getUserData('notified') == 'Y')) {
 
 // Check if he is returning from a profile update notification
 if ((isExtensionActive('profile')) && (getUserData('notified') == 'Y')) {

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index 7d3929862e9cac034bf0360379eb108ca25c5e9b..3ef916ab8c84d5b95e07393caf627dd20cf4d524 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -59,7 +59,7 @@ if ((getWernisApiId() == '') || (getWernisApiMd5() == '')) {
 } // END - if
 
 // Init the content array and points
 } // END - if
 
 // Init the content array and points

-$content = array(); $points = false;
+$content = array(); $points = FALSE;

 
 // Is the mode set (withdraw or payout)
 if ((!isGetRequestElementSet('do')) || (getRequestElement('do') == 'choose')) {
 
 // Is the mode set (withdraw or payout)
 if ((!isGetRequestElementSet('do')) || (getRequestElement('do') == 'choose')) {


@@ -87,7 +87,7 @@ if ((!isGetRequestElementSet('do')) || (getRequestElement('do') == 'choose')) {
                        );
 
                        // Load row template
                        );
 
                        // Load row template

-                       $content['rows'] .= loadTemplate('member_wernis_mode_list_row', true, $rowContent);
+                       $content['rows'] .= loadTemplate('member_wernis_mode_list_row', TRUE, $rowContent);

                } // END - while
 
                // Free result
                } // END - while
 
                // Free result


@@ -173,7 +173,7 @@ if ((isFormSent()) && (isGetRequestElementSet('do'))) {
                                } else {
                                        // All is fine here so do the withdraw
                                        $success = WERNIS_EXECUTE_WITHDRAW(postRequestElement('wernis_userid'), md5(postRequestElement('wds66_password')), postRequestElement('amount'));
                                } else {
                                        // All is fine here so do the withdraw
                                        $success = WERNIS_EXECUTE_WITHDRAW(postRequestElement('wernis_userid'), md5(postRequestElement('wds66_password')), postRequestElement('amount'));

-                                       if ($success === true) {
+                                       if ($success === TRUE) {

                                                // Add it to this amount
                                                initReferralSystem();
                                                addPointsThroughReferralSystem('wernis_withdraw', getMemberId(), bigintval(postRequestElement('amount')));
                                                // Add it to this amount
                                                initReferralSystem();
                                                addPointsThroughReferralSystem('wernis_withdraw', getMemberId(), bigintval(postRequestElement('amount')));


@@ -205,7 +205,7 @@ if ((isFormSent()) && (isGetRequestElementSet('do'))) {
                                } else {
                                        // All is fine here so do the withdraw
                                        $success = WERNIS_EXECUTE_PAYOUT(postRequestElement('wernis_userid'), postRequestElement('amount'));
                                } else {
                                        // All is fine here so do the withdraw
                                        $success = WERNIS_EXECUTE_PAYOUT(postRequestElement('wernis_userid'), postRequestElement('amount'));

-                                       if ($success === true) {
+                                       if ($success === TRUE) {

                                                // Sub points and ignore return status
                                                subtractPoints('wernis_payout', getMemberId(), postRequestElement('amount'));
 
                                                // Sub points and ignore return status
                                                subtractPoints('wernis_payout', getMemberId(), postRequestElement('amount'));
 


@@ -238,7 +238,7 @@ if ((isFormSent()) && (isGetRequestElementSet('do'))) {
 $mode = sprintf("member_wernis_mode_%s", getRequestElement('do'));
 
 // Load the template
 $mode = sprintf("member_wernis_mode_%s", getRequestElement('do'));
 
 // Load the template

-loadTemplate($mode, false, $content);
+loadTemplate($mode, FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php
index 108f1847a9f7d79d4d6c0406b5416bfacb8ca8f3..6299d72674d06c52c18611641c94009358f802d9 100644 (file)
--- a/inc/modules/sponsor.php
+++ b/inc/modules/sponsor.php
@@ -60,16 +60,16 @@ $content['menu'] = addSponsorMenu(getWhat());
 $content['content'] = addSponsorContent(getWhat());
 
 // Load header template
 $content['content'] = addSponsorContent(getWhat());
 
 // Load header template

-$content['header'] = loadTemplate('sponsor_header', true);
+$content['header'] = loadTemplate('sponsor_header', TRUE);

 
 // Load footer template
 
 // Load footer template

-$content['footer'] = loadTemplate('sponsor_footer', true);
+$content['footer'] = loadTemplate('sponsor_footer', TRUE);

 
 // 'You are here' navigation
 
 // 'You are here' navigation

-$content['you_are_here'] = addYouAreHereLink('sponsor', getWhat(), true);
+$content['you_are_here'] = addYouAreHereLink('sponsor', getWhat(), TRUE);

 
 // Load main sponsor template
 
 // Load main sponsor template

-loadTemplate('sponsor_main', false, $content);
+loadTemplate('sponsor_main', FALSE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index fa3cf9904716312630c845053246870856bddc91..85d03fa713fd45c122c3651d52abf587ee5bf657 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -118,22 +118,22 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
 
                        if (!empty($message)) {
                                // Output message

-                               $GLOBALS['sponsor_output'] = displayMessage($message, true);
+                               $GLOBALS['sponsor_output'] = displayMessage($message, TRUE);

                        } else {
                                // No message generated
                        } else {
                                // No message generated

-                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
+                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE);

                        }
                } else {
                        // Output formular
                        }
                } else {
                        // Output formular

-                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_form', true, $content);
+                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_form', TRUE, $content);

                }
        } else {
                // Locked or so?
                }
        } else {
                // Locked or so?

-               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', true);
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE);

        }
 } else {
        // Sponsor account not found
        }
 } else {
        // Sponsor account not found

-       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
+       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE);

 }
 
 // Free memory
 }
 
 // Free memory

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 662cd1641a36890c7e8d0e837c34551d37fef528..fcd683254607b4cfc7f833366385fc015dc8d873 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -105,10 +105,10 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
 
                        if (!empty($message)) {
                                // Output message

-                               $GLOBALS['sponsor_output'] = displayMessage($message, true);
+                               $GLOBALS['sponsor_output'] = displayMessage($message, TRUE);

                        } else {
                                // No message generated
                        } else {
                                // No message generated

-                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
+                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE);

                        }
                } else {
                        // Make yes/no selection
                        }
                } else {
                        // Make yes/no selection


@@ -117,15 +117,15 @@ if (SQL_NUMROWS($result) == 1) {
                        $content['receive_warnings_' . strtolower($content['receive_warnings'])] = ' checked="checked"';
 
                        // Output formular
                        $content['receive_warnings_' . strtolower($content['receive_warnings'])] = ' checked="checked"';
 
                        // Output formular

-                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_settings_form', true, $content);
+                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_settings_form', TRUE, $content);

                }
        } else {
                // Locked or so?
                }
        } else {
                // Locked or so?

-               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', true);
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE);

        }
 } else {
        // Sponsor account not found
        }
 } else {
        // Sponsor account not found

-       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
+       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE);

 }
 
 // Free memory
 }
 
 // Free memory

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index bb08ec125dd5849870c594a3421a052fc88e052d..12bf7861218db2ad2d2233e53c298078afba79cc 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -70,7 +70,7 @@ $content = SQL_FETCHARRAY($result);
 SQL_FREERESULT($result);
 
 // Load main template
 SQL_FREERESULT($result);
 
 // Load main template

-$GLOBALS['sponsor_output'] = loadTemplate('sponsor_welcome', true, $content);
+$GLOBALS['sponsor_output'] = loadTemplate('sponsor_welcome', TRUE, $content);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index defaaeba0dc67b48953e6435b3e6f72e95bc0d9b..df7a3d17513adc11a84cac77023f2be3aab56025 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -70,7 +70,7 @@ foreach (array('filters', 'mysql-manager', 'handler') as $lib) {
 set_error_handler('__errorHandler');
 
 // Disable block-mode by default
 set_error_handler('__errorHandler');
 
 // Disable block-mode by default

-enableBlockMode(false);
+enableBlockMode(FALSE);

 
 // Init error handler
 initErrorHandler();
 
 // Init error handler
 initErrorHandler();


@@ -119,7 +119,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                        enableExitOnError();
 
                        // Is it a valid resource?
                        enableExitOnError();
 
                        // Is it a valid resource?

-                       if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
+                       if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === TRUE) {

                                // Set database name (required for ext-optimize and ifSqlTableExists())
                                setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
                                // Set database name (required for ext-optimize and ifSqlTableExists())
                                setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 3aa4beb6de620e091c911eecf5e59e4bdfe295c1..21ddd007d23b0696aaaa51865f48eae3fbea452c 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -82,7 +82,7 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD = '') {
 }
 
 // Add link into output stream (or return it) for 'You Are Here' navigation
 }
 
 // Add link into output stream (or return it) for 'You Are Here' navigation

-function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
+function addYouAreHereLink ($accessLevel, $FQFN, $return = FALSE) {

        // Use only filename of the FQFN...
        $file = basename($FQFN);
 
        // Use only filename of the FQFN...
        $file = basename($FQFN);
 


@@ -145,7 +145,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 
                // Add default content
                $prefix .= '<div class="you_are_here">{--YOU_ARE_HERE--}&nbsp;<strong><a class="you_are_here" href="{%url=modules.php?module=' . getModule() . $linkAdd . '%}">Home</a></strong>';
 
                // Add default content
                $prefix .= '<div class="you_are_here">{--YOU_ARE_HERE--}&nbsp;<strong><a class="you_are_here" href="{%url=modules.php?module=' . getModule() . $linkAdd . '%}">Home</a></strong>';

-       } elseif ($return === false) {
+       } elseif ($return === FALSE) {

                // Count depth
                $GLOBALS['nav_depth']++;
        }
                // Count depth
                $GLOBALS['nav_depth']++;
        }


@@ -184,7 +184,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
        } // END - if
 
        // Return or output HTML code?
        } // END - if
 
        // Return or output HTML code?

-       if ($return === true) {
+       if ($return === TRUE) {

                // Return HTML code
                return $OUT;
        } else {
                // Return HTML code
                return $OUT;
        } else {


@@ -199,7 +199,7 @@ function addMenu ($mode, $action, $what) {
        $main_cnt = '0';
 
        // is the menu action valid?
        $main_cnt = '0';
 
        // is the menu action valid?

-       if (!isMenuActionValid($mode, $action, $what, true)) {
+       if (!isMenuActionValid($mode, $action, $what, TRUE)) {

                return getCode('MENU_NOT_VALID');
        } // END - if
 
                return getCode('MENU_NOT_VALID');
        } // END - if
 


@@ -233,10 +233,10 @@ ORDER BY
                while ($content = SQL_FETCHARRAY($result_main)) {
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
                        // Disable the block-mode
                while ($content = SQL_FETCHARRAY($result_main)) {
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
                        // Disable the block-mode

-                       enableBlockMode(false);
+                       enableBlockMode(FALSE);

 
                        // Load menu header template
 
                        // Load menu header template

-                       $GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', true, $content);
+                       $GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', TRUE, $content);

 
                        // Sub menu
                        $result_sub = SQL_QUERY_ESC("SELECT
 
                        // Sub menu
                        $result_sub = SQL_QUERY_ESC("SELECT


@@ -321,9 +321,9 @@ ORDER BY
 
                                        // Add regular menu row or bottom row?
                                        if ($count < SQL_NUMROWS($result_sub)) {
 
                                        // Add regular menu row or bottom row?
                                        if ($count < SQL_NUMROWS($result_sub)) {

-                                               $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
+                                               $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', TRUE, $content);

                                        } else {
                                        } else {

-                                               $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
+                                               $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', TRUE, $content);

                                        }
                                } // END - while
                        } else {
                                        }
                                } // END - while
                        } else {


@@ -334,11 +334,11 @@ ORDER BY
                                $INC = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
                                if (isFileReadable($INC)) {
                                        // Load include file
                                $INC = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
                                if (isFileReadable($INC)) {
                                        // Load include file

-                                       if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
+                                       if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', TRUE, $mode);

                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
                                        loadInclude($INC);
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
                                        loadInclude($INC);
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());

-                                       if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
+                                       if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', TRUE, $mode);

                                }
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
                        }
                                }
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
                        }


@@ -352,15 +352,15 @@ ORDER BY
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
                        if (SQL_NUMROWS($result_main) > $main_cnt) {
                                // Add separator
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
                        if (SQL_NUMROWS($result_main) > $main_cnt) {
                                // Add separator

-                               $GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
+                               $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);

 
                                // Should we display adverts in this menu?
                                if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y') && ($action != 'admin')) {
                                        // Display advert template
 
                                // Should we display adverts in this menu?
                                if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y') && ($action != 'admin')) {
                                        // Display advert template

-                                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_' . $action, true);
+                                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_' . $action, TRUE);

 
                                        // Add separator again
 
                                        // Add separator again

-                                       $GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
+                                       $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);

                                } // END - if
                        } // END - if
                } // END - while
                                } // END - if
                        } // END - if
                } // END - while


@@ -371,10 +371,10 @@ ORDER BY
                // Should we display adverts in this menu?
                if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) {
                        // Add separator again
                // Should we display adverts in this menu?
                if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) {
                        // Add separator again

-                       $GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
+                       $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);

 
                        // Display advert template
 
                        // Display advert template

-                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', true);
+                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', TRUE);

                } // END - if
 
                // Prepare data
                } // END - if
 
                // Prepare data


@@ -385,14 +385,14 @@ ORDER BY
 
                // Load main template
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
 
                // Load main template
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());

-               loadTemplate('menu_table', false, $content);
+               loadTemplate('menu_table', FALSE, $content);

        } // END - if
 }
 
 // Checks whether the current user is a member
 function isMember () {
        // By default no member
        } // END - if
 }
 
 // Checks whether the current user is a member
 function isMember () {
        // By default no member

-       $ret = false;
+       $ret = FALSE;

 
        // Fix missing 'last_online' array, damn stupid code :(((
        // @TODO Try to rewrite this to one or more functions
 
        // Fix missing 'last_online' array, damn stupid code :(((
        // @TODO Try to rewrite this to one or more functions


@@ -411,7 +411,7 @@ function isMember () {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
 
                // Abort further processing
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
 
                // Abort further processing

-               return false;
+               return FALSE;

        }
 
        // Get userid secured from session
        }
 
        // Get userid secured from session


@@ -427,7 +427,7 @@ function isMember () {
        fixDeletedCookies(array('userid', 'u_hash'));
 
        // Are cookies set and can the member data be loaded?
        fixDeletedCookies(array('userid', 'u_hash'));
 
        // Are cookies set and can the member data be loaded?

-       if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+       if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === TRUE)) {

                // Validate password by created the difference of it and the secret key
                $valPass = encodeHashForCookie(getUserData('password'));
 
                // Validate password by created the difference of it and the secret key
                $valPass = encodeHashForCookie(getUserData('password'));
 


@@ -438,12 +438,12 @@ function isMember () {
                        $GLOBALS['last_online']['online'] = getUserData('last_online');
 
                        // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
                        $GLOBALS['last_online']['online'] = getUserData('last_online');
 
                        // Account is confirmed and all cookie data is valid so he is definely logged in! :-)

-                       $ret = true;
+                       $ret = TRUE;

                } // END - if
        } // END - if
 
        // Is $ret still false?
                } // END - if
        } // END - if
 
        // Is $ret still false?

-       if ($ret === false) {
+       if ($ret === FALSE) {

                // Yes, so destroy the session
                destroyMemberSession();
        } // END - if
                // Yes, so destroy the session
                destroyMemberSession();
        } // END - if


@@ -461,7 +461,7 @@ function fetchUserData ($value, $column = 'userid') {
        // Extension ext-user must be there at any case
        if (!isExtensionActive('user')) {
                // Absent ext-user is really not good
        // Extension ext-user must be there at any case
        if (!isExtensionActive('user')) {
                // Absent ext-user is really not good

-               return false;
+               return FALSE;

        } elseif (is_null($value)) {
                // This shall never happen, so please report it
                reportBug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL');
        } elseif (is_null($value)) {
                // This shall never happen, so please report it
                reportBug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL');


@@ -485,16 +485,16 @@ function fetchUserData ($value, $column = 'userid') {
                } elseif (isUserDataValid()) {
                        // Use cache, so it is fine
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1');
                } elseif (isUserDataValid()) {
                        // Use cache, so it is fine
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1');

-                       return true;
+                       return TRUE;

                } // END - if
        } elseif (isUserDataValid()) {
                // Using cache is fine
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2');
                } // END - if
        } elseif (isUserDataValid()) {
                // Using cache is fine
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2');

-               return true;
+               return TRUE;

        }
 
        // By default none was found
        }
 
        // By default none was found

-       $found = false;
+       $found = FALSE;

 
        // Extra SQL statements
        $ADD = runFilterChain('convert_user_data_columns', ' ');
 
        // Extra SQL statements
        $ADD = runFilterChain('convert_user_data_columns', ' ');


@@ -564,11 +564,11 @@ function fetchUserData ($value, $column = 'userid') {
 function isAdmin () {
        // No admin in installation phase!
        if ((isInstallationPhase()) || (!isAdminRegistered())) {
 function isAdmin () {
        // No admin in installation phase!
        if ((isInstallationPhase()) || (!isAdminRegistered())) {

-               return false;
+               return FALSE;

        } // END - if
 
        // Init variables
        } // END - if
 
        // Init variables

-       $ret = false;
+       $ret = FALSE;

        $adminId = '0';
        $passwordFromCookie = '';
        $valPass = '';
        $adminId = '0';
        $passwordFromCookie = '';
        $valPass = '';


@@ -588,19 +588,19 @@ function isAdmin () {
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Current adminId is zero. isSessionVariableSet(admin_id)=' . intval(isSessionVariableSet('admin_id')) . ',isSessionVariableSet(admin_md5)=' . intval(isSessionVariableSet('admin_md5')));
 
                // Abort here now
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Current adminId is zero. isSessionVariableSet(admin_id)=' . intval(isSessionVariableSet('admin_id')) . ',isSessionVariableSet(admin_md5)=' . intval(isSessionVariableSet('admin_md5')));
 
                // Abort here now

-               return false;
+               return FALSE;

        } // END - if
 
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
                // Init it with failed
        } // END - if
 
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
                // Init it with failed

-               $GLOBALS[__FUNCTION__][$adminId] = false;
+               $GLOBALS[__FUNCTION__][$adminId] = FALSE;

 
                // Search in array for entry
                if (isset($GLOBALS['admin_hash'])) {
                        // Use cached string
                        $valPass = $GLOBALS['admin_hash'];
 
                // Search in array for entry
                if (isset($GLOBALS['admin_hash'])) {
                        // Use cached string
                        $valPass = $GLOBALS['admin_hash'];

-               } elseif ((!empty($passwordFromCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) {
+               } elseif ((!empty($passwordFromCookie)) && (isAdminHashSet($adminId) === TRUE) && (!empty($adminId))) {

                        // Login data is valid or not?
                        $valPass = encodeHashForCookie(getAdminHash($adminId));
 
                        // Login data is valid or not?
                        $valPass = encodeHashForCookie(getAdminHash($adminId));
 


@@ -609,7 +609,7 @@ function isAdmin () {
 
                        // Count cache hits
                        incrementStatsEntry('cache_hits');
 
                        // Count cache hits
                        incrementStatsEntry('cache_hits');

-               } elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === false))) {
+               } elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === FALSE))) {

                        // Get admin hash and hash it
                        $valPass = encodeHashForCookie(getAdminHash($adminId));
 
                        // Get admin hash and hash it
                        $valPass = encodeHashForCookie(getAdminHash($adminId));
 


@@ -631,7 +631,7 @@ function isAdmin () {
 // Generates a list of "max receiveable emails per day"
 function addMaxReceiveList ($mode, $default = '') {
        $OUT = '';
 // Generates a list of "max receiveable emails per day"
 function addMaxReceiveList ($mode, $default = '') {
        $OUT = '';

-       $result = false;
+       $result = FALSE;

 
        switch ($mode) {
                case 'guest':
 
        switch ($mode) {
                case 'guest':


@@ -668,7 +668,7 @@ function addMaxReceiveList ($mode, $default = '') {
                }
 
                // Load template
                }
 
                // Load template

-               $OUT = loadTemplate(($mode . '_receive_table'), true, $OUT);
+               $OUT = loadTemplate(($mode . '_receive_table'), TRUE, $OUT);

        } else {
                // Maybe the admin has to setup some maximum values?
                reportBug(__FUNCTION__, __LINE__, 'Nothing is being done here?');
        } else {
                // Maybe the admin has to setup some maximum values?
                reportBug(__FUNCTION__, __LINE__, 'Nothing is being done here?');


@@ -720,9 +720,9 @@ LIMIT 1",
 }
 
 // Validate the given menu action
 }
 
 // Validate the given menu action

-function isMenuActionValid ($mode, $action, $what, $updateEntry = false) {
+function isMenuActionValid ($mode, $action, $what, $updateEntry = FALSE) {

        // Is the cache entry there and we shall not update?
        // Is the cache entry there and we shall not update?

-       if ((isset($GLOBALS['action_valid'][$mode][$action][$what])) && ($updateEntry === false)) {
+       if ((isset($GLOBALS['action_valid'][$mode][$action][$what])) && ($updateEntry === FALSE)) {

                // Count cache hit
                incrementStatsEntry('cache_hits');
 
                // Count cache hit
                incrementStatsEntry('cache_hits');
 


@@ -731,21 +731,21 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry = false) {
        } // END - if
 
        // By default nothing is valid
        } // END - if
 
        // By default nothing is valid

-       $ret = false;
+       $ret = FALSE;

 
        // Look in all menus or only unlocked
        $add = '';
        if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',action=' . $action . ',what=' . $what);
 
        // Look in all menus or only unlocked
        $add = '';
        if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',action=' . $action . ',what=' . $what);

-       if (($mode != 'admin') && ($updateEntry === true)) {
+       if (($mode != 'admin') && ($updateEntry === TRUE)) {

                // Update guest or member menu
                $sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
                        array(
                                $mode,
                                $action,
                                $what
                // Update guest or member menu
                $sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
                        array(
                                $mode,
                                $action,
                                $what

-                       ), __FUNCTION__, __LINE__, false);
+                       ), __FUNCTION__, __LINE__, FALSE);

        } elseif (($what != 'welcome') && (!empty($what))) {
                // Other actions
                $sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY `action` DESC LIMIT 1",
        } elseif (($what != 'welcome') && (!empty($what))) {
                // Other actions
                $sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY `action` DESC LIMIT 1",


@@ -753,21 +753,21 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry = false) {
                                $mode,
                                $action,
                                $what
                                $mode,
                                $action,
                                $what

-                       ), __FUNCTION__, __LINE__, false);
+                       ), __FUNCTION__, __LINE__, FALSE);

        } else {
                // Admin login overview
                $sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND (`what`='' OR `what` IS NULL)".$add." ORDER BY `action` DESC LIMIT 1",
                        array(
                                $mode,
                                $action
        } else {
                // Admin login overview
                $sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND (`what`='' OR `what` IS NULL)".$add." ORDER BY `action` DESC LIMIT 1",
                        array(
                                $mode,
                                $action

-                       ), __FUNCTION__, __LINE__, false);
+                       ), __FUNCTION__, __LINE__, FALSE);

        }
 
        // Run SQL command
        $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
        // Should we look for affected rows (only update) or found rows?
        }
 
        // Run SQL command
        $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
        // Should we look for affected rows (only update) or found rows?

-       if ($updateEntry === true) {
+       if ($updateEntry === TRUE) {

                // Check updated/affected rows
                $ret = (!SQL_HASZEROAFFECTED());
        } else {
                // Check updated/affected rows
                $ret = (!SQL_HASZEROAFFECTED());
        } else {


@@ -879,9 +879,9 @@ function getCategory ($cid) {
 }
 
 // Get a string of "mail title" and price back
 }
 
 // Get a string of "mail title" and price back

-function getPaymentTitlePrice ($paymentsId, $full = false) {
+function getPaymentTitlePrice ($paymentsId, $full = FALSE) {

        // Only title or also including price?
        // Only title or also including price?

-       if ($full === false) {
+       if ($full === FALSE) {

                $ret = getPaymentData($paymentsId, 'main_title');
        } else {
                $ret = getPaymentData($paymentsId, 'main_title') . ' / {%pipe,getPaymentData,translateComma=' . $paymentsId . '%} {?POINTS?}';
                $ret = getPaymentData($paymentsId, 'main_title');
        } else {
                $ret = getPaymentData($paymentsId, 'main_title') . ' / {%pipe,getPaymentData,translateComma=' . $paymentsId . '%} {?POINTS?}';


@@ -926,7 +926,7 @@ function getPaymentData ($paymentsId, $lookFor = 'price') {
 }
 
 // Remove a receiver's id from $receivers and add a link for him to confirm
 }
 
 // Remove a receiver's id from $receivers and add a link for him to confirm

-function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isBonusMail = false) {
+function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isBonusMail = FALSE) {

        // Default is not removed
        $ret = 'failed';
 
        // Default is not removed
        $ret = 'failed';
 


@@ -942,7 +942,7 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
                        $rowName = 'stats_id';
 
                        // Only when we got a real stats id continue searching for the entry
                        $rowName = 'stats_id';
 
                        // Only when we got a real stats id continue searching for the entry

-                       if ($isBonusMail === true) {
+                       if ($isBonusMail === TRUE) {

                                $type = 'BONUS';
                                $rowName = 'bonus_id';
                        } // END - if
                                $type = 'BONUS';
                                $rowName = 'bonus_id';
                        } // END - if


@@ -989,14 +989,14 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 }
 
 // Calculate sum (default) or count records of given criteria
 }
 
 // Calculate sum (default) or count records of given criteria

-function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '', $mode = '=') {
+function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = FALSE, $add = '', $mode = '=') {

        // Init count/sum
        $data['res'] = '0';
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',tableName=' . $tableName . ',lookFor=' . $lookFor . ',whereStatement=' . $whereStatement . ',add=' . $add);
        if ((empty($search)) && ($search != '0')) {
                // Count or sum whole table?
        // Init count/sum
        $data['res'] = '0';
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',tableName=' . $tableName . ',lookFor=' . $lookFor . ',whereStatement=' . $whereStatement . ',add=' . $add);
        if ((empty($search)) && ($search != '0')) {
                // Count or sum whole table?

-               if ($countRows === true) {
+               if ($countRows === TRUE) {

                        // Count whole table
                        $result = SQL_QUERY_ESC('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
                                array(
                        // Count whole table
                        $result = SQL_QUERY_ESC('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
                                array(


@@ -1011,7 +1011,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
                                        $tableName
                                ), __FUNCTION__, __LINE__);
                }
                                        $tableName
                                ), __FUNCTION__, __LINE__);
                }

-       } elseif (($countRows === true) || ($lookFor == 'userid')) {
+       } elseif (($countRows === TRUE) || ($lookFor == 'userid')) {

                // Count rows
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
                $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
                // Count rows
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
                $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',


@@ -1059,12 +1059,12 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
  * Sends out mail to all administrators. This function is no longer obsolete
  * because we need it when there is no ext-admins installed
  */
  * Sends out mail to all administrators. This function is no longer obsolete
  * because we need it when there is no ext-admins installed
  */

-function sendAdminEmails ($subject, $message, $isBugReport = false) {
+function sendAdminEmails ($subject, $message, $isBugReport = FALSE) {

        // Default is no special header
        $mailHeader = '';
 
        // Is it a bug report?
        // Default is no special header
        $mailHeader = '';
 
        // Is it a bug report?

-       if ($isBugReport === true) {
+       if ($isBugReport === TRUE) {

                // Then add a reply-to line back to the author (me)
                $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
        } // END - if
                // Then add a reply-to line back to the author (me)
                $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
        } // END - if


@@ -1554,7 +1554,7 @@ ORDER BY
                        // Start adding all
                        while ($data = SQL_FETCHARRAY($result_userids)) {
                                // Add user count
                        // Start adding all
                        while ($data = SQL_FETCHARRAY($result_userids)) {
                                // Add user count

-                               $userid_cnt += countSumTotalData($data['userid'], 'user_data', 'userid', 'userid', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED' AND `receive_mails` > 0"));
+                               $userid_cnt += countSumTotalData($data['userid'], 'user_data', 'userid', 'userid', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED' AND `receive_mails` > 0"));

                        } // END - while
 
                        // Free memory
                        } // END - while
 
                        // Free memory


@@ -1586,10 +1586,10 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
        // Is admin or bonus extension there?
        if (!isAdmin()) {
                // Abort here
        // Is admin or bonus extension there?
        if (!isAdmin()) {
                // Abort here

-               return false;
+               return FALSE;

        } elseif (!isExtensionActive('bonus')) {
                // Abort here
        } elseif (!isExtensionActive('bonus')) {
                // Abort here

-               return false;
+               return FALSE;

        }
 
        // Calculcate target sent
        }
 
        // Calculcate target sent


@@ -1689,7 +1689,7 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
        // Init variables
        $extraColumns = '';
        $receiverList = '';
        // Init variables
        $extraColumns = '';
        $receiverList = '';

-       $result       = false;
+       $result       = FALSE;

 
        // Secure data
        $categoryId = bigintval($categoryId);
 
        // Secure data
        $categoryId = bigintval($categoryId);


@@ -1767,10 +1767,10 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
                        // @TODO Rewrite this to a filter
                        if ((isset($data['stats_id'])) && ($data['stats_id'] > 0)) {
                                // User email
                        // @TODO Rewrite this to a filter
                        if ((isset($data['stats_id'])) && ($data['stats_id'] > 0)) {
                                // User email

-                               $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', true, sprintf(" AND `stats_type`='mailid' AND `stats_data`=%s", bigintval($data['stats_id'])));
+                               $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', TRUE, sprintf(" AND `stats_type`='mailid' AND `stats_data`=%s", bigintval($data['stats_id'])));

                        } elseif ((isset($data['bonus_id'])) && ($data['bonus_id'] > 0)) {
                                // Bonus mail
                        } elseif ((isset($data['bonus_id'])) && ($data['bonus_id'] > 0)) {
                                // Bonus mail

-                               $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', true, sprintf(" AND `stats_type`='bonusid' AND `stats_data`=%s", bigintval($data['bonus_id'])));
+                               $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', TRUE, sprintf(" AND `stats_type`='bonusid' AND `stats_data`=%s", bigintval($data['bonus_id'])));

                        }
 
                        // Reduce this users total received emails?
                        }
 
                        // Reduce this users total received emails?


@@ -1794,7 +1794,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 }
 
 // Creates a new task
 }
 
 // Creates a new task

-function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = NULL, $strip = true) {
+function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = NULL, $strip = TRUE) {

        // Insert the task data into the database
        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
                array(
        // Insert the task data into the database
        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
                array(


@@ -1803,7 +1803,7 @@ function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId =
                        $taskType,
                        $subject,
                        $notes
                        $taskType,
                        $subject,
                        $notes

-               ), __FUNCTION__, __LINE__, true, $strip);
+               ), __FUNCTION__, __LINE__, TRUE, $strip);

 
        // Return insert id which is the task id
        return SQL_INSERTID();
 
        // Return insert id which is the task id
        return SQL_INSERTID();


@@ -1962,17 +1962,17 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
                                } // END - if
 
                                // Call the callback-function
                                } // END - if
 
                                // Call the callback-function

-                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, true).'</pre>');
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, TRUE).'</pre>');

                                // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
                                $content[$columnName] = call_user_func_array($callbackName, $args);
                        } // END - foreach
 
                        // Load row template
                                // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
                                $content[$columnName] = call_user_func_array($callbackName, $args);
                        } // END - foreach
 
                        // Load row template

-                       $OUT .= loadTemplate(trim($rowTemplate[0]), true, $content);
+                       $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $content);

                } // END - while
 
                // Load main template
                } // END - while
 
                // Load main template

-               loadTemplate(trim($tableTemplate[0]), false, $OUT);
+               loadTemplate(trim($tableTemplate[0]), FALSE, $OUT);

        } else {
                // No URLs in surfbar
                displayMessage('{--' .$noEntryMessageId[0] . '--}');
        } else {
                // No URLs in surfbar
                displayMessage('{--' .$noEntryMessageId[0] . '--}');


@@ -1984,7 +1984,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
 
 // Adds a given entry to the database
 function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
 
 // Adds a given entry to the database
 function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {

-       //* DEBUG: */ die('columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,POST=<pre>'.print_r($_POST,true).'</pre>');
+       //* DEBUG: */ die('columns=<pre>'.print_r($columns,TRUE).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,TRUE).'</pre>,extraValues=<pre>'.print_r($extraValues,TRUE).'</pre>,POST=<pre>'.print_r($_POST,TRUE).'</pre>');

        // Verify that tableName and columns are not empty
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
        // Verify that tableName and columns are not empty
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified


@@ -1999,7 +1999,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
        $sqlValues  = array();
 
        // Default is that all went fine
        $sqlValues  = array();
 
        // Default is that all went fine

-       $GLOBALS['__XML_PARSE_RESULT'] = true;
+       $GLOBALS['__XML_PARSE_RESULT'] = TRUE;

 
        // Is there "time columns"?
        if (count($timeColumns) > 0) {
 
        // Is there "time columns"?
        if (count($timeColumns) > 0) {


@@ -2016,7 +2016,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                // Is columnIndex set?
                if (!is_null($columnIndex)) {
                        // Check conditions
                // Is columnIndex set?
                if (!is_null($columnIndex)) {
                        // Check conditions

-                       //* DEBUG: */ die('columnIndex=<pre>'.print_r($columnIndex,true).'</pre>'.debug_get_printable_backtrace());
+                       //* DEBUG: */ die('columnIndex=<pre>'.print_r($columnIndex,TRUE).'</pre>'.debug_get_printable_backtrace());

                        assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex])));
 
                        // Then use that index "blindly"
                        assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex])));
 
                        // Then use that index "blindly"


@@ -2039,7 +2039,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                } elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key]))) {
                        // Run through an extra filter
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
                } elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key]))) {
                        // Run through an extra filter
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');

-                       $sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], '');
+                       $sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], NULL);

                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
                }
 
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
                }
 


@@ -2051,15 +2051,15 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                } // END - if
 
                // Is the value false?
                } // END - if
 
                // Is the value false?

-               if ($sqlValues[$key] === false) {
+               if ($sqlValues[$key] === FALSE) {

                        // One "parser" didn't like it
                        // One "parser" didn't like it

-                       $GLOBALS['__XML_PARSE_RESULT'] = false;
+                       $GLOBALS['__XML_PARSE_RESULT'] = FALSE;

                        break;
                } // END - if
        } // END - foreach
 
        // If all values are okay, continue
                        break;
                } // END - if
        } // END - foreach
 
        // If all values are okay, continue

-       if ($sqlValues[$key] !== false) {
+       if ($sqlValues[$key] !== FALSE) {

                // Build the SQL query
                $sql = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES (" . implode(',', $sqlValues) . ')';
 
                // Build the SQL query
                $sql = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES (" . implode(',', $sqlValues) . ')';
 


@@ -2089,10 +2089,13 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 }
 
 // Edit rows by given id numbers
 }
 
 // Edit rows by given id numbers

-function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $subject = '') {
+function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $subject = '') {

        // Change them all
        $affected = '0';
        foreach (postRequestElement($idColumn[0]) as $id => $sel) {
        // Change them all
        $affected = '0';
        foreach (postRequestElement($idColumn[0]) as $id => $sel) {

+               // Secure id number
+               $id = bigintval($id);
+

                // Prepare content array (new values)
                $content = array();
 
                // Prepare content array (new values)
                $content = array();
 


@@ -2111,10 +2114,14 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                        } // END - if
 
                        // Debug message
                        } // END - if
 
                        // Debug message

-                       //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,true).'</pre>');
+                       //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,TRUE).'</pre>');

 
                        // Is entries an array?
                        if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
 
                        // Is entries an array?
                        if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {

+                               //die($key.'/'.$id.'=<pre>'.print_r($columns,TRUE).'</pre><pre>'.print_r($filterFunctions,TRUE).'</pre>');
+                               // Search for the right array index
+                               $search = key(search_array($columns, 'column', $key));
+

                                // Add this entry to content
                                $content[$key] = $entries[$id];
 
                                // Add this entry to content
                                $content[$key] = $entries[$id];
 


@@ -2123,8 +2130,15 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                                        // Is the userid, we have to process it with convertZeroToNull()
                                        $entries[$id] = convertZeroToNull($entries[$id]);
                                } elseif ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
                                        // Is the userid, we have to process it with convertZeroToNull()
                                        $entries[$id] = convertZeroToNull($entries[$id]);
                                } elseif ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {

-                                       // Filter function set!
+                                       // Filter function + extra value set

                                        $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
                                        $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);

+                               } elseif (isset($filterFunctions[$search])) {
+                                       // Filter function set
+                                       //* BUG: */ die($id.'/'.$key.'='.$entries[$id].'/'.$filterFunctions[$search]);
+                                       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - BEFORE!');
+                                       $entries[$id] = handleExtraValues($filterFunctions[$search], $entries[$id], NULL);
+                                       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - AFTER!');
+                                       assert(!is_bool($entries[$id]));

                                }
 
                                // Is the value NULL?
                                }
 
                                // Is the value NULL?


@@ -2215,12 +2229,12 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 }
 
 // Delete rows by given id numbers
 }
 
 // Delete rows by given id numbers

-function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {

        // The base SQL command:
        $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
 
        // Is a user id provided?
        // The base SQL command:
        $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
 
        // Is a user id provided?

-       //* BUG: */ die('<pre>'.print_r($rawUserId,true).'</pre><pre>'.print_r($userIdColumn,true).'</pre>');
+       //* BUG: */ die('<pre>'.print_r($rawUserId,TRUE).'</pre><pre>'.print_r($userIdColumn,TRUE).'</pre>');

        if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
                // Add user id as well
                $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));
        if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
                // Add user id as well
                $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));


@@ -2233,7 +2247,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
        } // END - if
 
        // Delete them all
        } // END - if
 
        // Delete them all

-       //* BUG: */ die($sql.'<br /><pre>'.print_r($tableName,true).'</pre><pre>'.print_r($columns,true).'</pre><pre>'.print_r($filterFunctions,true).'</pre><pre>'.print_r($extraValues,true).'</pre><pre>'.print_r($deleteNow,true).'</pre><pre>'.print_r($idColumn,true).'</pre>');
+       //* BUG: */ die($sql.'<br /><pre>'.print_r($tableName,TRUE).'</pre><pre>'.print_r($columns,TRUE).'</pre><pre>'.print_r($filterFunctions,TRUE).'</pre><pre>'.print_r($extraValues,TRUE).'</pre><pre>'.print_r($deleteNow,TRUE).'</pre><pre>'.print_r($idColumn,TRUE).'</pre>');

        $idList = '';
        foreach (postRequestElement($idColumn[0]) as $id => $sel) {
                // Is id zero?
        $idList = '';
        foreach (postRequestElement($idColumn[0]) as $id => $sel) {
                // Is id zero?


@@ -2296,7 +2310,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
        $OUT = '';
 
        // "Walk" through all entries
        $OUT = '';
 
        // "Walk" through all entries

-       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,idColumn=<pre>'.print_r($idColumn,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
+       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,TRUE).'</pre>,tableName<pre>'.print_r($tableName,TRUE).'</pre>,columns=<pre>'.print_r($columns,TRUE).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,TRUE).'</pre>,extraValues=<pre>'.print_r($extraValues,TRUE).'</pre>,idColumn=<pre>'.print_r($idColumn,TRUE).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,TRUE).'</pre>,rawUserId=<pre>'.print_r($rawUserId,TRUE).'</pre>');

        foreach (postRequestElement($idColumn[0]) as $id => $selected) {
                // Secure id number
                $id = bigintval($id);
        foreach (postRequestElement($idColumn[0]) as $id => $selected) {
                // Secure id number
                $id = bigintval($id);


@@ -2315,7 +2329,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                $idx = searchXmlArray($key, $columns, 'column');
 
                                // Skip any missing entries
                                $idx = searchXmlArray($key, $columns, 'column');
 
                                // Skip any missing entries

-                               if ($idx === false) {
+                               if ($idx === FALSE) {

                                        // Skip this one
                                        //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
                                        continue;
                                        // Skip this one
                                        //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
                                        continue;


@@ -2366,7 +2380,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                $prefix,
                                $listType,
                                $tableName[0]
                                $prefix,
                                $listType,
                                $tableName[0]

-                               ), true, $content
+                               ), TRUE, $content

                        );
                } // END - if
 
                        );
                } // END - if
 


@@ -2379,19 +2393,19 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                $prefix,
                $listType,
                $tableName[0]
                $prefix,
                $listType,
                $tableName[0]

-               ), false, $OUT
+               ), FALSE, $OUT

        );
 }
 
 // Checks whether given URL is blacklisted
 function isUrlBlacklisted ($url) {
        // Mark it as not listed by default
        );
 }
 
 // Checks whether given URL is blacklisted
 function isUrlBlacklisted ($url) {
        // Mark it as not listed by default

-       $listed = false;
+       $listed = FALSE;

 
        // Is black-listing enbaled?
        if (!isUrlBlacklistEnabled()) {
                // No, then all URLs are not in this list
 
        // Is black-listing enbaled?
        if (!isUrlBlacklistEnabled()) {
                // No, then all URLs are not in this list

-               return false;
+               return FALSE;

        } elseif (!isset($GLOBALS['blacklist_data'][$url])) {
                // Check black-list for given URL
                $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS `blist_timestamp` FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
        } elseif (!isset($GLOBALS['blacklist_data'][$url])) {
                // Check black-list for given URL
                $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS `blist_timestamp` FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",


@@ -2403,14 +2417,14 @@ function isUrlBlacklisted ($url) {
                        $GLOBALS['blacklist_data'][$url] = SQL_FETCHARRAY($result);
 
                        // Mark it as listed
                        $GLOBALS['blacklist_data'][$url] = SQL_FETCHARRAY($result);
 
                        // Mark it as listed

-                       $listed = true;
+                       $listed = TRUE;

                } // END - if
 
                // Free result
                SQL_FREERESULT($result);
        } else {
                // Is found in cache -> black-listed
                } // END - if
 
                // Free result
                SQL_FREERESULT($result);
        } else {
                // Is found in cache -> black-listed

-               $listed = true;
+               $listed = TRUE;

        }
 
        // Return result
        }
 
        // Return result

diff --git a/inc/phpmailer/ChangeLog.txt b/inc/phpmailer/ChangeLog.txt
index 172a85eac61272df62ceb8d7b89169ee384357d2..7f52c4f7225f37e1c65d19fccd0988be1ea2a1c8 100644 (file)
--- a/inc/phpmailer/ChangeLog.txt
+++ b/inc/phpmailer/ChangeLog.txt
@@ -56,7 +56,7 @@ Version 2.0.0 (Sun, Dec 02 2007)
 Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
 * implements new property to control VERP in class.smtp.php
   example (requires instantiating class.smtp.php):
 Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
 * implements new property to control VERP in class.smtp.php
   example (requires instantiating class.smtp.php):

-  $mail->do_verp = true;
+  $mail->do_verp = TRUE;

 * POP-before-SMTP functionality included, thanks to Richard Davey
   (see class.pop3.php & pop3_before_smtp_test.php for examples)
 * included example showing how to use PHPMailer with GMAIL
 * POP-before-SMTP functionality included, thanks to Richard Davey
   (see class.pop3.php & pop3_before_smtp_test.php for examples)
 * included example showing how to use PHPMailer with GMAIL

diff --git a/inc/phpmailer/class.phpmailer.php b/inc/phpmailer/class.phpmailer.php
index afb71b25f508057fb5f9f29c8b982cfca5c40ee6..effe75ed44b102d330cb6d930204a75e77f7dabe 100644 (file)
--- a/inc/phpmailer/class.phpmailer.php
+++ b/inc/phpmailer/class.phpmailer.php
@@ -95,7 +95,7 @@ class PHPMailer {
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.

-   * If HTML then run IsHTML(true).
+   * If HTML then run IsHTML(TRUE).

    * @var string
    */
   var $Body              = '';
    * @var string
    */
   var $Body              = '';


@@ -199,7 +199,7 @@ class PHPMailer {
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */

-  var $SMTPAuth     = false;
+  var $SMTPAuth     = FALSE;

 
   /**
    * Sets SMTP username.
 
   /**
    * Sets SMTP username.


@@ -224,7 +224,7 @@ class PHPMailer {
    * Sets SMTP class debugging on or off.
    * @var bool
    */
    * Sets SMTP class debugging on or off.
    * @var bool
    */

-  var $SMTPDebug    = false;
+  var $SMTPDebug    = FALSE;

 
   /**
    * Prevents the SMTP connection from being closed after each mail
 
   /**
    * Prevents the SMTP connection from being closed after each mail


@@ -232,14 +232,14 @@ class PHPMailer {
    * requires an explicit call to SmtpClose().
    * @var bool
    */
    * requires an explicit call to SmtpClose().
    * @var bool
    */

-  var $SMTPKeepAlive = false;
+  var $SMTPKeepAlive = FALSE;

 
   /**
    * Provides the ability to have the TO field process individual
    * emails, instead of sending to entire TO addresses
    * @var bool
    */
 
   /**
    * Provides the ability to have the TO field process individual
    * emails, instead of sending to entire TO addresses
    * @var bool
    */

-  var $SingleTo = false;
+  var $SingleTo = FALSE;

 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE
 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE


@@ -271,7 +271,7 @@ class PHPMailer {
    * @return void
    */
   function IsHTML($bool) {
    * @return void
    */
   function IsHTML($bool) {

-    if($bool == true) {
+    if($bool == TRUE) {

       $this->ContentType = 'text/html';
     } else {
       $this->ContentType = 'text/plain';
       $this->ContentType = 'text/html';
     } else {
       $this->ContentType = 'text/plain';


@@ -380,11 +380,11 @@ class PHPMailer {
   function Send() {
     $header = '';
     $body = '';
   function Send() {
     $header = '';
     $body = '';

-    $result = true;
+    $result = TRUE;

 
     if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
       $this->SetError($this->Lang('provide_address'));
 
     if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
       $this->SetError($this->Lang('provide_address'));

-      return false;
+      return FALSE;

     }
 
     /* Set whether the message is multipart/alternative */
     }
 
     /* Set whether the message is multipart/alternative */


@@ -398,7 +398,7 @@ class PHPMailer {
     $body = $this->CreateBody();
 
     if($body == '') {
     $body = $this->CreateBody();
 
     if($body == '') {

-      return false;
+      return FALSE;

     }
 
     /* Choose the mailer */
     }
 
     /* Choose the mailer */


@@ -416,7 +416,7 @@ class PHPMailer {
         $result = $this->MailSend($header, $body);
         break;
         //$this->SetError($this->Mailer . $this->Lang('mailer_not_supported'));
         $result = $this->MailSend($header, $body);
         break;
         //$this->SetError($this->Mailer . $this->Lang('mailer_not_supported'));

-        //$result = false;
+        //$result = FALSE;

         //break;
     }
 
         //break;
     }
 


@@ -437,7 +437,7 @@ class PHPMailer {
 
     if(!@$mail = popen($sendmail, 'w')) {
       $this->SetError($this->Lang('execute') . $this->Sendmail);
 
     if(!@$mail = popen($sendmail, 'w')) {
       $this->SetError($this->Lang('execute') . $this->Sendmail);

-      return false;
+      return FALSE;

     }
 
     fputs($mail, $header);
     }
 
     fputs($mail, $header);


@@ -449,9 +449,9 @@ class PHPMailer {
     }
     if($result != 0) {
       $this->SetError($this->Lang('execute') . $this->Sendmail);
     }
     if($result != 0) {
       $this->SetError($this->Lang('execute') . $this->Sendmail);

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -473,7 +473,7 @@ class PHPMailer {
     if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);
     if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);

-      if ($this->SingleTo === true && count($toArr) > 1) {
+      if ($this->SingleTo === TRUE && count($toArr) > 1) {

         foreach ($toArr as $key => $val) {
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         }
         foreach ($toArr as $key => $val) {
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         }


@@ -481,7 +481,7 @@ class PHPMailer {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
       }
     } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
       }
     } else {

-      if ($this->SingleTo === true && count($toArr) > 1) {
+      if ($this->SingleTo === TRUE && count($toArr) > 1) {

         foreach ($toArr as $key => $val) {
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         }
         foreach ($toArr as $key => $val) {
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         }


@@ -496,10 +496,10 @@ class PHPMailer {
 
     if(!$rt) {
       $this->SetError($this->Lang('instantiate'));
 
     if(!$rt) {
       $this->SetError($this->Lang('instantiate'));

-      return false;
+      return FALSE;

     }
 
     }
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -515,7 +515,7 @@ class PHPMailer {
     $bad_rcpt = array();
 
     if(!$this->SmtpConnect()) {
     $bad_rcpt = array();
 
     if(!$this->SmtpConnect()) {

-      return false;
+      return FALSE;

     }
 
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
     }
 
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;


@@ -523,7 +523,7 @@ class PHPMailer {
       $error = $this->Lang('from_failed') . $smtp_from;
       $this->SetError($error);
       $this->smtp->Reset();
       $error = $this->Lang('from_failed') . $smtp_from;
       $this->SetError($error);
       $this->smtp->Reset();

-      return false;
+      return FALSE;

     }
 
     /* Attempt to send attach all recipients */
     }
 
     /* Attempt to send attach all recipients */


@@ -553,21 +553,21 @@ class PHPMailer {
       $error = $this->Lang('recipients_failed') . $error;
       $this->SetError($error);
       $this->smtp->Reset();
       $error = $this->Lang('recipients_failed') . $error;
       $this->SetError($error);
       $this->smtp->Reset();

-      return false;
+      return FALSE;

     }
 
     if(!$this->smtp->Data($header . $body)) {
       $this->SetError($this->Lang('data_not_accepted'));
       $this->smtp->Reset();
     }
 
     if(!$this->smtp->Data($header . $body)) {
       $this->SetError($this->Lang('data_not_accepted'));
       $this->smtp->Reset();

-      return false;
+      return FALSE;

     }
     }

-    if($this->SMTPKeepAlive == true) {
+    if($this->SMTPKeepAlive == TRUE) {

       $this->smtp->Reset();
     } else {
       $this->SmtpClose();
     }
 
       $this->smtp->Reset();
     } else {
       $this->SmtpClose();
     }
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -587,7 +587,7 @@ class PHPMailer {
     $connection = ($this->smtp->Connected());
 
     /* Retry while there is no connection */
     $connection = ($this->smtp->Connected());
 
     /* Retry while there is no connection */

-    while($index < count($hosts) && $connection == false) {
+    while($index < count($hosts) && $connection == FALSE) {

       $hostinfo = array();
       if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
         $host = $hostinfo[1];
       $hostinfo = array();
       if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
         $host = $hostinfo[1];


@@ -604,12 +604,12 @@ class PHPMailer {
           $this->smtp->Hello($this->ServerHostname());
         }
 
           $this->smtp->Hello($this->ServerHostname());
         }
 

-        $connection = true;
+        $connection = TRUE;

         if($this->SMTPAuth) {
           if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
             $this->SetError($this->Lang('authenticate'));
             $this->smtp->Reset();
         if($this->SMTPAuth) {
           if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
             $this->SetError($this->Lang('authenticate'));
             $this->smtp->Reset();

-            $connection = false;
+            $connection = FALSE;

           }
         }
       }
           }
         }
       }


@@ -667,7 +667,7 @@ class PHPMailer {
     }
     $this->language = $PHPMAILER_LANG;
 
     }
     $this->language = $PHPMAILER_LANG;
 

-    return true;
+    return TRUE;

   }
 
   /////////////////////////////////////////////////
   }
 
   /////////////////////////////////////////////////


@@ -714,7 +714,7 @@ class PHPMailer {
    * @access private
    * @return string
    */
    * @access private
    * @return string
    */

-  function WrapText($message, $length, $qp_mode = false) {
+  function WrapText($message, $length, $qp_mode = FALSE) {

     $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
     // If utf-8 encoding is used, we will need to make sure we don't
     // split multibyte characters when we wrap
     $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
     // If utf-8 encoding is used, we will need to make sure we don't
     // split multibyte characters when we wrap


@@ -797,12 +797,12 @@ class PHPMailer {
    * @return int
    */
   function UTF8CharBoundary($encodedText, $maxLength) {
    * @return int
    */
   function UTF8CharBoundary($encodedText, $maxLength) {

-    $foundSplitPos = false;
+    $foundSplitPos = FALSE;

     $lookBack = 3;
     while (!$foundSplitPos) {
       $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
       $encodedCharPos = strpos($lastChunk, "=");
     $lookBack = 3;
     while (!$foundSplitPos) {
       $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
       $encodedCharPos = strpos($lastChunk, "=");

-      if ($encodedCharPos !== false) {
+      if ($encodedCharPos !== FALSE) {

         // Found start of encoded character byte within $lookBack block.
         // Check the encoded byte value (the 2 chars after the '=')
         $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
         // Found start of encoded character byte within $lookBack block.
         // Check the encoded byte value (the 2 chars after the '=')
         $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);


@@ -812,17 +812,17 @@ class PHPMailer {
           // otherwise reduce maxLength to start of the encoded char
           $maxLength = ($encodedCharPos == 0) ? $maxLength :
           $maxLength - ($lookBack - $encodedCharPos);
           // otherwise reduce maxLength to start of the encoded char
           $maxLength = ($encodedCharPos == 0) ? $maxLength :
           $maxLength - ($lookBack - $encodedCharPos);

-          $foundSplitPos = true;
+          $foundSplitPos = TRUE;

         } elseif ($dec >= 192) { // First byte of a multi byte character
           // Reduce maxLength to split at start of character
           $maxLength = $maxLength - ($lookBack - $encodedCharPos);
         } elseif ($dec >= 192) { // First byte of a multi byte character
           // Reduce maxLength to split at start of character
           $maxLength = $maxLength - ($lookBack - $encodedCharPos);

-          $foundSplitPos = true;
+          $foundSplitPos = TRUE;

         } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
           $lookBack += 3;
         }
       } else {
         // No encoded character found
         } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
           $lookBack += 3;
         }
       } else {
         // No encoded character found

-        $foundSplitPos = true;
+        $foundSplitPos = TRUE;

       }
     }
     return $maxLength;
       }
     }
     return $maxLength;


@@ -1124,7 +1124,7 @@ class PHPMailer {
   function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     if(!@is_file($path)) {
       $this->SetError($this->Lang('file_access') . $path);
   function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     if(!@is_file($path)) {
       $this->SetError($this->Lang('file_access') . $path);

-      return false;
+      return FALSE;

     }
 
     $filename = basename($path);
     }
 
     $filename = basename($path);


@@ -1138,11 +1138,11 @@ class PHPMailer {
     $this->attachment[$cur][2] = $name;
     $this->attachment[$cur][3] = $encoding;
     $this->attachment[$cur][4] = $type;
     $this->attachment[$cur][2] = $name;
     $this->attachment[$cur][3] = $encoding;
     $this->attachment[$cur][4] = $type;

-    $this->attachment[$cur][5] = false; // isStringAttachment
+    $this->attachment[$cur][5] = FALSE; // isStringAttachment

     $this->attachment[$cur][6] = 'attachment';
     $this->attachment[$cur][7] = 0;
 
     $this->attachment[$cur][6] = 'attachment';
     $this->attachment[$cur][7] = 0;
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -1306,7 +1306,7 @@ class PHPMailer {
     } else {
       $encoding = 'Q';
       $encoded = $this->EncodeQ($str, $position);
     } else {
       $encoding = 'Q';
       $encoded = $this->EncodeQ($str, $position);

-      $encoded = $this->WrapText($encoded, $maxlen, true);
+      $encoded = $this->WrapText($encoded, $maxlen, TRUE);

       $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
     }
 
       $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
     }
 


@@ -1375,7 +1375,7 @@ class PHPMailer {
    * @access private
    * @return string
    */
    * @access private
    * @return string
    */

-  function EncodeQP( $input = '', $line_max = 76, $space_conv = false ) {
+  function EncodeQP( $input = '', $line_max = 76, $space_conv = FALSE ) {

     $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";


@@ -1463,7 +1463,7 @@ class PHPMailer {
     $this->attachment[$cur][2] = $filename;
     $this->attachment[$cur][3] = $encoding;
     $this->attachment[$cur][4] = $type;
     $this->attachment[$cur][2] = $filename;
     $this->attachment[$cur][3] = $encoding;
     $this->attachment[$cur][4] = $type;

-    $this->attachment[$cur][5] = true; // isString
+    $this->attachment[$cur][5] = TRUE; // isString

     $this->attachment[$cur][6] = 'attachment';
     $this->attachment[$cur][7] = 0;
   }
     $this->attachment[$cur][6] = 'attachment';
     $this->attachment[$cur][7] = 0;
   }


@@ -1485,7 +1485,7 @@ class PHPMailer {
 
     if(!@is_file($path)) {
       $this->SetError($this->Lang('file_access') . $path);
 
     if(!@is_file($path)) {
       $this->SetError($this->Lang('file_access') . $path);

-      return false;
+      return FALSE;

     }
 
     $filename = basename($path);
     }
 
     $filename = basename($path);


@@ -1500,11 +1500,11 @@ class PHPMailer {
     $this->attachment[$cur][2] = $name;
     $this->attachment[$cur][3] = $encoding;
     $this->attachment[$cur][4] = $type;
     $this->attachment[$cur][2] = $name;
     $this->attachment[$cur][3] = $encoding;
     $this->attachment[$cur][4] = $type;

-    $this->attachment[$cur][5] = false;
+    $this->attachment[$cur][5] = FALSE;

     $this->attachment[$cur][6] = 'inline';
     $this->attachment[$cur][7] = $cid;
 
     $this->attachment[$cur][6] = 'inline';
     $this->attachment[$cur][7] = $cid;
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -1513,10 +1513,10 @@ class PHPMailer {
    * @return bool
    */
   function InlineImageExists() {
    * @return bool
    */
   function InlineImageExists() {

-    $result = false;
+    $result = FALSE;

     for($i = 0; $i < count($this->attachment); $i++) {
       if($this->attachment[$i][6] == 'inline') {
     for($i = 0; $i < count($this->attachment); $i++) {
       if($this->attachment[$i][6] == 'inline') {

-        $result = true;
+        $result = TRUE;

         break;
       }
     }
         break;
       }
     }


@@ -1731,7 +1731,7 @@ class PHPMailer {
         }
       }
     }
         }
       }
     }

-    $this->IsHTML(true);
+    $this->IsHTML(TRUE);

     $this->Body = $message;
     $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
     if ( !empty($textMsg) && empty($this->AltBody) ) {
     $this->Body = $message;
     $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
     if ( !empty($textMsg) && empty($this->AltBody) ) {


@@ -1855,7 +1855,7 @@ class PHPMailer {
       $this->$name = $value;
     } else {
       $this->SetError('Cannot set or reset variable ' . $name);
       $this->$name = $value;
     } else {
       $this->SetError('Cannot set or reset variable ' . $name);

-      return false;
+      return FALSE;

     }
   }
 
     }
   }
 


@@ -1874,7 +1874,7 @@ class PHPMailer {
       fclose($fp);
       return $return;
     } else {
       fclose($fp);
       return $return;
     } else {

-      return false;
+      return FALSE;

     }
   }
 
     }
   }
 

diff --git a/inc/phpmailer/class.pop3.php b/inc/phpmailer/class.pop3.php
index 0a6d8d45aa2859033e874c595d64f17bbdf4b781..56bbc54e573731a42556ef15976edf374ed36bb2 100644 (file)
--- a/inc/phpmailer/class.pop3.php
+++ b/inc/phpmailer/class.pop3.php
@@ -115,7 +115,7 @@ class POP3
   function POP3 ()
     {
       $this->pop_conn = 0;
   function POP3 ()
     {
       $this->pop_conn = 0;

-      $this->connected = false;
+      $this->connected = FALSE;

       $this->error = null;
     }
 
       $this->error = null;
     }
 


@@ -128,12 +128,12 @@ class POP3
    * @param string $username
    * @param string $password
    */
    * @param string $username
    * @param string $password
    */

-  function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0)
+  function Authorise ($host, $port = FALSE, $tval = FALSE, $username, $password, $debug_level = 0)

   {
     $this->host = $host;
 
     //  If no port value is passed, retrieve it
   {
     $this->host = $host;
 
     //  If no port value is passed, retrieve it

-    if ($port == false)
+    if ($port == FALSE)

     {
       $this->port = $this->POP3_PORT;
     }
     {
       $this->port = $this->POP3_PORT;
     }


@@ -143,7 +143,7 @@ class POP3
     }
 
     //  If no port value is passed, retrieve it
     }
 
     //  If no port value is passed, retrieve it

-    if ($tval == false)
+    if ($tval == FALSE)

     {
       $this->tval = $this->POP3_TIMEOUT;
     }
     {
       $this->tval = $this->POP3_TIMEOUT;
     }


@@ -170,7 +170,7 @@ class POP3
       {
         $this->Disconnect();
 
       {
         $this->Disconnect();
 

-        return true;
+        return TRUE;

       }
 
     }
       }
 
     }


@@ -178,7 +178,7 @@ class POP3
     //  We need to disconnect regardless if the login succeeded
     $this->Disconnect();
 
     //  We need to disconnect regardless if the login succeeded
     $this->Disconnect();
 

-    return false;
+    return FALSE;

   }
 
   /**
   }
 
   /**


@@ -189,12 +189,12 @@ class POP3
    * @param integer $tval
    * @return boolean
    */
    * @param integer $tval
    * @return boolean
    */

-  function Connect ($host, $port = false, $tval = 30)
+  function Connect ($host, $port = FALSE, $tval = 30)

     {
     //  Are we already connected?
     if ($this->connected)
     {
     {
     //  Are we already connected?
     if ($this->connected)
     {

-      return true;
+      return TRUE;

     }
 
     /*
     }
 
     /*


@@ -221,7 +221,7 @@ class POP3
     }
 
     //  Did we connect?
     }
 
     //  Did we connect?

-      if ($this->pop_conn == false)
+      if ($this->pop_conn == FALSE)

       {
         //  It would appear not...
         $this->error = array(
       {
         //  It would appear not...
         $this->error = array(


@@ -235,7 +235,7 @@ class POP3
           $this->displayErrors();
         }
 
           $this->displayErrors();
         }
 

-        return false;
+        return FALSE;

       }
 
       //  Increase the stream time-out
       }
 
       //  Increase the stream time-out


@@ -261,8 +261,8 @@ class POP3
       if ($this->checkResponse($pop3_response))
       {
       //  The connection is established and the POP3 server is talking
       if ($this->checkResponse($pop3_response))
       {
       //  The connection is established and the POP3 server is talking

-      $this->connected = true;
-        return true;
+      $this->connected = TRUE;
+        return TRUE;

       }
 
     }
       }
 
     }


@@ -276,7 +276,7 @@ class POP3
      */
     function Login ($username = '', $password = '')
     {
      */
     function Login ($username = '', $password = '')
     {

-      if ($this->connected == false)
+      if ($this->connected == FALSE)

       {
         $this->error = 'Not connected to POP3 server';
 
       {
         $this->error = 'Not connected to POP3 server';
 


@@ -311,16 +311,16 @@ class POP3
 
         if ($this->checkResponse($pop3_response))
         {
 
         if ($this->checkResponse($pop3_response))
         {

-          return true;
+          return TRUE;

         }
         else
         {
         }
         else
         {

-          return false;
+          return FALSE;

         }
       }
       else
       {
         }
       }
       else
       {

-        return false;
+        return FALSE;

       }
     }
 
       }
     }
 


@@ -389,11 +389,11 @@ class POP3
           $this->displayErrors();
         }
 
           $this->displayErrors();
         }
 

-        return false;
+        return FALSE;

       }
       else
       {
       }
       else
       {

-        return true;
+        return TRUE;

       }
 
     }
       }
 
     }

diff --git a/inc/phpmailer/class.smtp.php b/inc/phpmailer/class.smtp.php
index be084a116e117b695b278ab460af49f3969763f6..e8bcef0cf873c4b2ba713d2d2c91d4ec1c99d957 100644 (file)
--- a/inc/phpmailer/class.smtp.php
+++ b/inc/phpmailer/class.smtp.php
@@ -57,7 +57,7 @@ class SMTP
    *  Sets VERP use on/off (default is off)
    *  @var bool
    */
    *  Sets VERP use on/off (default is off)
    *  @var bool
    */

-  var $do_verp = false;
+  var $do_verp = FALSE;

 
   /**#@+
    * @access private
 
   /**#@+
    * @access private


@@ -107,7 +107,7 @@ class SMTP
       # for now we will just give an error saying we
       # are already connected
       $this->error = array("error" => "Already connected to a server");
       # for now we will just give an error saying we
       # are already connected
       $this->error = array("error" => "Already connected to a server");

-      return false;
+      return FALSE;

     }
 
     if(empty($port)) {
     }
 
     if(empty($port)) {


@@ -129,7 +129,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": $errstr ($errno)" . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": $errstr ($errno)" . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     # sometimes the SMTP server takes a little longer to respond
     }
 
     # sometimes the SMTP server takes a little longer to respond


@@ -149,7 +149,7 @@ class SMTP
       echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
     }
 
       echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
     }
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -174,7 +174,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     // Send encoded username
     }
 
     // Send encoded username


@@ -192,7 +192,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     // Send encoded password
     }
 
     // Send encoded password


@@ -210,10 +210,10 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     }
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -232,11 +232,11 @@ class SMTP
                  "EOF caught while checking if connected";
         }
         $this->Close();
                  "EOF caught while checking if connected";
         }
         $this->Close();

-        return false;
+        return FALSE;

       }
       }

-      return true; # everything looks good
+      return TRUE; # everything looks good

     }
     }

-    return false;
+    return FALSE;

   }
 
   /**
   }
 
   /**


@@ -285,7 +285,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Data() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Data() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"DATA" . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"DATA" . $this->CRLF);


@@ -306,7 +306,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     # the server is ready to accept data!
     }
 
     # the server is ready to accept data!


@@ -332,9 +332,9 @@ class SMTP
     # and we can process all lines before a blank "" line as
     # headers.
     $field = substr($lines[0],0,strpos($lines[0],":"));
     # and we can process all lines before a blank "" line as
     # headers.
     $field = substr($lines[0],0,strpos($lines[0],":"));

-    $in_headers = false;
+    $in_headers = FALSE;

     if(!empty($field) && !strstr($field," ")) {
     if(!empty($field) && !strstr($field," ")) {

-      $in_headers = true;
+      $in_headers = TRUE;

     }
 
     $max_line_length = 998; # used below; set here for ease in change
     }
 
     $max_line_length = 998; # used below; set here for ease in change


@@ -342,7 +342,7 @@ class SMTP
     while(list(,$line) = @each($lines)) {
       $lines_out = null;
       if($line == "" && $in_headers) {
     while(list(,$line) = @each($lines)) {
       $lines_out = null;
       if($line == "" && $in_headers) {

-        $in_headers = false;
+        $in_headers = FALSE;

       }
       # ok we need to break this line up into several
       # smaller lines
       }
       # ok we need to break this line up into several
       # smaller lines


@@ -397,9 +397,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -424,7 +424,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
             "error" => "Called Expand() without being connected");
     if(!$this->connected()) {
       $this->error = array(
             "error" => "Called Expand() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);


@@ -445,7 +445,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     # parse the reply and place in our array to return to user
     }
 
     # parse the reply and place in our array to return to user


@@ -475,7 +475,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
             "error" => "Called Hello() without being connected");
     if(!$this->connected()) {
       $this->error = array(
             "error" => "Called Hello() without being connected");

-      return false;
+      return FALSE;

     }
 
     # if a hostname for the HELO was not specified determine
     }
 
     # if a hostname for the HELO was not specified determine


@@ -490,10 +490,10 @@ class SMTP
     if(!$this->SendHello("EHLO", $host))
     {
       if(!$this->SendHello("HELO", $host))
     if(!$this->SendHello("EHLO", $host))
     {
       if(!$this->SendHello("HELO", $host))

-          return false;
+          return FALSE;

     }
 
     }
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -520,12 +520,12 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     $this->helo_rply = $rply;
 
     }
 
     $this->helo_rply = $rply;
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -549,7 +549,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Help() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Help() without being connected");

-      return false;
+      return FALSE;

     }
 
     $extra = "";
     }
 
     $extra = "";


@@ -575,7 +575,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     return $rply;
     }
 
     return $rply;


@@ -601,7 +601,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Mail() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Mail() without being connected");

-      return false;
+      return FALSE;

     }
 
     $useVerp = ($this->do_verp ? "XVERP" : "");
     }
 
     $useVerp = ($this->do_verp ? "XVERP" : "");


@@ -623,9 +623,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -644,7 +644,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Noop() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Noop() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"NOOP" . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"NOOP" . $this->CRLF);


@@ -665,9 +665,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -687,7 +687,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Quit() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Quit() without being connected");

-      return false;
+      return FALSE;

     }
 
     # send the quit command to the server
     }
 
     # send the quit command to the server


@@ -700,7 +700,7 @@ class SMTP
       echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
     }
 
       echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
     }
 

-    $rval = true;
+    $rval = TRUE;

     $e = null;
 
     $code = substr($byemsg,0,3);
     $e = null;
 
     $code = substr($byemsg,0,3);


@@ -709,7 +709,7 @@ class SMTP
       $e = array("error" => "SMTP server rejected quit command",
                  "smtp_code" => $code,
                  "smtp_rply" => substr($byemsg,4));
       $e = array("error" => "SMTP server rejected quit command",
                  "smtp_code" => $code,
                  "smtp_rply" => substr($byemsg,4));

-      $rval = false;
+      $rval = FALSE;

       if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $e["error"] . ": " .
                  $byemsg . $this->CRLF;
       if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $e["error"] . ": " .
                  $byemsg . $this->CRLF;


@@ -741,7 +741,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Recipient() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Recipient() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);


@@ -762,9 +762,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -785,7 +785,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Reset() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Reset() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"RSET" . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"RSET" . $this->CRLF);


@@ -806,10 +806,10 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
 
     }
 

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -834,7 +834,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Send() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Send() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);


@@ -855,9 +855,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -882,7 +882,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
           "error" => "Called SendAndMail() without being connected");
     if(!$this->connected()) {
       $this->error = array(
           "error" => "Called SendAndMail() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);


@@ -903,9 +903,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -930,7 +930,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
           "error" => "Called SendOrMail() without being connected");
     if(!$this->connected()) {
       $this->error = array(
           "error" => "Called SendOrMail() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);


@@ -951,9 +951,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     }

-    return true;
+    return TRUE;

   }
 
   /**
   }
 
   /**


@@ -975,7 +975,7 @@ class SMTP
     if($this->do_debug >= 1) {
       echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
     }
     if($this->do_debug >= 1) {
       echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
     }

-    return false;
+    return FALSE;

   }
 
   /**
   }
 
   /**


@@ -997,7 +997,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Verify() without being connected");
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Verify() without being connected");

-      return false;
+      return FALSE;

     }
 
     fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
     }
 
     fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);


@@ -1018,7 +1018,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }

-      return false;
+      return FALSE;

     }
     return $rply;
   }
     }
     return $rply;
   }

diff --git a/inc/phpmailer/docs/pop3_article.txt b/inc/phpmailer/docs/pop3_article.txt
index cc54f7c00aee9ba4fafa6d82f9d63d7b96ba5845..8f75f331627b15324fba7c47fad64bda2bf88e78 100644 (file)
--- a/inc/phpmailer/docs/pop3_article.txt
+++ b/inc/phpmailer/docs/pop3_article.txt
@@ -8,7 +8,7 @@ I didn't want to modify the PHP Mailer classes at all, so you will have to inclu
 When you need it, create your POP3 object
 
 Right before I invoke PHP Mailer I activate the POP3 authorisation. POP3 before SMTP is a process whereby you login to your web hosts POP3 mail server BEFORE sending out any emails via SMTP. The POP3 logon 'verifies' your ability to send email by SMTP, which typically otherwise blocks you. On my web host (Pair Networks) a single POP3 logon is enough to 'verify' you for 90 minutes. Here is some sample PHP code that activates the POP3 logon and then sends an email via PHP Mailer:
 When you need it, create your POP3 object
 
 Right before I invoke PHP Mailer I activate the POP3 authorisation. POP3 before SMTP is a process whereby you login to your web hosts POP3 mail server BEFORE sending out any emails via SMTP. The POP3 logon 'verifies' your ability to send email by SMTP, which typically otherwise blocks you. On my web host (Pair Networks) a single POP3 logon is enough to 'verify' you for 90 minutes. Here is some sample PHP code that activates the POP3 logon and then sends an email via PHP Mailer:

-[geshi lang=php] Authorise('pop3.example.com', 110, 30, 'mailer', 'password', 1); $mail = new PHPMailer(); $mail->SMTPDebug = 2; $mail->IsSMTP(); $mail->IsHTML(false); $mail->Host = 'relay.example.com'; $mail->From = 'mailer@example.com'; $mail->FromName = 'Example Mailer'; $mail->Subject = 'My subject'; $mail->Body = 'Hello world'; $mail->AddAddress('rich@corephp.co.uk', 'Richard Davey'); if (!$mail->Send()) { echo $mail->ErrorInfo; } ?> [/geshi]
+[geshi lang=php] Authorise('pop3.example.com', 110, 30, 'mailer', 'password', 1); $mail = new PHPMailer(); $mail->SMTPDebug = 2; $mail->IsSMTP(); $mail->IsHTML(FALSE); $mail->Host = 'relay.example.com'; $mail->From = 'mailer@example.com'; $mail->FromName = 'Example Mailer'; $mail->Subject = 'My subject'; $mail->Body = 'Hello world'; $mail->AddAddress('rich@corephp.co.uk', 'Richard Davey'); if (!$mail->Send()) { echo $mail->ErrorInfo; } ?> [/geshi]

 
 The PHP Mailer parts of this code should be obvious to anyone who has used PHP Mailer before. One thing to note - you almost certainly will not need to use SMTP Authentication *and* POP3 before SMTP together. The Authorisation method is a proxy method to all of the others within that class. There are Connect, Logon and Disconnect methods available, but I wrapped them in the single Authorisation one to make things easier.
 The Parameters
 
 The PHP Mailer parts of this code should be obvious to anyone who has used PHP Mailer before. One thing to note - you almost certainly will not need to use SMTP Authentication *and* POP3 before SMTP together. The Authorisation method is a proxy method to all of the others within that class. There are Connect, Logon and Disconnect methods available, but I wrapped them in the single Authorisation one to make things easier.
 The Parameters

diff --git a/inc/phpmailer/docs/use_gmail.txt b/inc/phpmailer/docs/use_gmail.txt
index 7519d7d2f8510ae0972ffd5c3676c13afbda9044..faf98b9f9aa970fcf33f1d5c073ad456a0f2037c 100644 (file)
--- a/inc/phpmailer/docs/use_gmail.txt
+++ b/inc/phpmailer/docs/use_gmail.txt
@@ -11,7 +11,7 @@ $body             = $mail->getFile('contents.html');
 $body             = eregi_replace("[\]",'',$body);
 
 $mail->IsSMTP();
 $body             = eregi_replace("[\]",'',$body);
 
 $mail->IsSMTP();

-$mail->SMTPAuth   = true;                  // enable SMTP authentication
+$mail->SMTPAuth   = TRUE;                  // enable SMTP authentication

 $mail->SMTPSecure = "ssl";                 // sets the prefix to the servier
 $mail->Host       = "smtp.gmail.com";      // sets GMAIL as the SMTP server
 $mail->Port       = 465;                   // set the SMTP port
 $mail->SMTPSecure = "ssl";                 // sets the prefix to the servier
 $mail->Host       = "smtp.gmail.com";      // sets GMAIL as the SMTP server
 $mail->Port       = 465;                   // set the SMTP port


@@ -34,7 +34,7 @@ $mail->AddAttachment("/path/to/image.jpg", "new.jpg"); // attachment
 
 $mail->AddAddress("username@domain.com","First Last");
 
 
 $mail->AddAddress("username@domain.com","First Last");
 

-$mail->IsHTML(true); // send as HTML
+$mail->IsHTML(TRUE); // send as HTML

 
 if(!$mail->Send()) {
   echo "Mailer Error: " . $mail->ErrorInfo;
 
 if(!$mail->Send()) {
   echo "Mailer Error: " . $mail->ErrorInfo;

diff --git a/inc/phpmailer/examples/pop3_before_smtp_test.php b/inc/phpmailer/examples/pop3_before_smtp_test.php
index b10b5e151d717992e566ccb2ec1cf35cbb1280d4..7d1e30437e4a8bd4c4feafd344bf1d0035b84752 100644 (file)
--- a/inc/phpmailer/examples/pop3_before_smtp_test.php
+++ b/inc/phpmailer/examples/pop3_before_smtp_test.php
@@ -17,7 +17,7 @@
 
   $mail->IsSMTP();
   $mail->SMTPDebug = 2;
 
   $mail->IsSMTP();
   $mail->SMTPDebug = 2;

-  $mail->IsHTML(false);
+  $mail->IsHTML(FALSE);

 
   $mail->Host     = 'relay.example.com';
 
 
   $mail->Host     = 'relay.example.com';
 

diff --git a/inc/phpmailer/examples/test_gmail.php b/inc/phpmailer/examples/test_gmail.php
index 553976f76f3ed72c684ecebed226dd123e43203c..69f2f7c128069353239df231ef55f847133ed3e3 100644 (file)
--- a/inc/phpmailer/examples/test_gmail.php
+++ b/inc/phpmailer/examples/test_gmail.php
@@ -9,7 +9,7 @@ $body             = $mail->getFile('contents.html');
 $body             = eregi_replace("[\]",'',$body);
 
 $mail->IsSMTP();
 $body             = eregi_replace("[\]",'',$body);
 
 $mail->IsSMTP();

-$mail->SMTPAuth   = true;                  // enable SMTP authentication
+$mail->SMTPAuth   = TRUE;                  // enable SMTP authentication

 $mail->SMTPSecure = "ssl";                 // sets the prefix to the servier
 $mail->Host       = "smtp.gmail.com";      // sets GMAIL as the SMTP server
 $mail->Port       = 465;                   // set the SMTP port for the GMAIL server
 $mail->SMTPSecure = "ssl";                 // sets the prefix to the servier
 $mail->Host       = "smtp.gmail.com";      // sets GMAIL as the SMTP server
 $mail->Port       = 465;                   // set the SMTP port for the GMAIL server


@@ -34,7 +34,7 @@ $mail->AddAddress("whoto@otherdomain.com", "John Doe");
 
 $mail->AddAttachment("images/phpmailer.gif");             // attachment
 
 
 $mail->AddAttachment("images/phpmailer.gif");             // attachment
 

-$mail->IsHTML(true); // send as HTML
+$mail->IsHTML(TRUE); // send as HTML

 
 if(!$mail->Send()) {
   echo "Mailer Error: " . $mail->ErrorInfo;
 
 if(!$mail->Send()) {
   echo "Mailer Error: " . $mail->ErrorInfo;

diff --git a/inc/phpmailer/phpdoc/PHPMailer/PHPMailer.html b/inc/phpmailer/phpdoc/PHPMailer/PHPMailer.html
index 87be4024b70eef07e0c64e939f675f3ed3c2388d..ccd6cfd3798cae603a90f53c228b8cec14ff64f6 100644 (file)
--- a/inc/phpmailer/phpdoc/PHPMailer/PHPMailer.html
+++ b/inc/phpmailer/phpdoc/PHPMailer/PHPMailer.html
@@ -367,7 +367,7 @@
 
        <!-- ========== Info from phpDoc block ========= -->
 <p class="short-description">Sets the Body of the message.  This can be either an HTML or text body.</p>
 
        <!-- ========== Info from phpDoc block ========= -->
 <p class="short-description">Sets the Body of the message.  This can be either an HTML or text body.</p>

-<p class="description"><p>If HTML then run IsHTML(true).</p></p>
+<p class="description"><p>If HTML then run IsHTML(TRUE).</p></p>

        
        
                
        
        
                

diff --git a/inc/phpmailer/test/phpmailer_test.php b/inc/phpmailer/test/phpmailer_test.php
index ffbe4bd42982c853d728a979f09b70b9aa6bc322..736277aacd704ed1db02af31bfbc14f03a5f71ad 100644 (file)
--- a/inc/phpmailer/test/phpmailer_test.php
+++ b/inc/phpmailer/test/phpmailer_test.php
@@ -20,7 +20,7 @@ class phpmailerTest extends TestCase
      * @private
      * @type object
      */
      * @private
      * @type object
      */

-    var $Mail = false;
+    var $Mail = FALSE;

 
     /**
      * Holds the SMTP mail host.
 
     /**
      * Holds the SMTP mail host.


@@ -73,7 +73,7 @@ class phpmailerTest extends TestCase
         $this->Mail->Host = $global_vars["mail_host"];
         $this->Mail->Port = 25;
         $this->Mail->Helo = "localhost.localdomain";
         $this->Mail->Host = $global_vars["mail_host"];
         $this->Mail->Port = 25;
         $this->Mail->Helo = "localhost.localdomain";

-        $this->Mail->SMTPAuth = false;
+        $this->Mail->SMTPAuth = FALSE;

         $this->Mail->Username = "";
         $this->Mail->Password = "";
         $this->Mail->PluginDir = $INCLUDE_DIR;
         $this->Mail->Username = "";
         $this->Mail->Password = "";
         $this->Mail->PluginDir = $INCLUDE_DIR;


@@ -351,7 +351,7 @@ class phpmailerTest extends TestCase
      */
     function test_Html() {
     
      */
     function test_Html() {
     

-        $this->Mail->IsHTML(true);
+        $this->Mail->IsHTML(TRUE);

         $this->Mail->Subject .= ": HTML only";
         
         $this->Mail->Body = "This is a <b>test message</b> written in HTML. </br>" .
         $this->Mail->Subject .= ": HTML only";
         
         $this->Mail->Body = "This is a <b>test message</b> written in HTML. </br>" .


@@ -370,7 +370,7 @@ class phpmailerTest extends TestCase
 
         $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
         $this->Mail->Subject .= ": HTML + Attachment";
 
         $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
         $this->Mail->Subject .= ": HTML + Attachment";

-        $this->Mail->IsHTML(true);
+        $this->Mail->IsHTML(TRUE);

         
         if(!$this->Mail->AddAttachment("phpmailer_test.php", "test_attach.txt"))
         {
         
         if(!$this->Mail->AddAttachment("phpmailer_test.php", "test_attach.txt"))
         {


@@ -390,7 +390,7 @@ class phpmailerTest extends TestCase
         $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\" src=\"cid:my-attach\">" .
                      "Here is an image!</a>";
         $this->Mail->Subject .= ": Embedded Image";
         $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\" src=\"cid:my-attach\">" .
                      "Here is an image!</a>";
         $this->Mail->Subject .= ": Embedded Image";

-        $this->Mail->IsHTML(true);
+        $this->Mail->IsHTML(TRUE);

         
         if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
                                           "base64", "image/png"))
         
         if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
                                           "base64", "image/png"))


@@ -411,7 +411,7 @@ class phpmailerTest extends TestCase
         $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\" src=\"cid:my-attach\">" .
                      "Here is an image!</a>";
         $this->Mail->Subject .= ": Embedded Image + Attachment";
         $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\" src=\"cid:my-attach\">" .
                      "Here is an image!</a>";
         $this->Mail->Subject .= ": Embedded Image + Attachment";

-        $this->Mail->IsHTML(true);
+        $this->Mail->IsHTML(TRUE);

         
         if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
                                           "base64", "image/png"))
         
         if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
                                           "base64", "image/png"))


@@ -455,7 +455,7 @@ class phpmailerTest extends TestCase
         $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
         $this->Mail->AltBody = "This is the text part of the email.";
         $this->Mail->Subject .= ": AltBody + Attachment";
         $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
         $this->Mail->AltBody = "This is the text part of the email.";
         $this->Mail->Subject .= ": AltBody + Attachment";

-        $this->Mail->IsHTML(true);
+        $this->Mail->IsHTML(TRUE);

         
         if(!$this->Mail->AddAttachment("phpmailer_test.php", "test_attach.txt"))
         {
         
         if(!$this->Mail->AddAttachment("phpmailer_test.php", "test_attach.txt"))
         {


@@ -488,7 +488,7 @@ class phpmailerTest extends TestCase
         $this->BuildBody();
         $subject = $this->Mail->Subject;
 
         $this->BuildBody();
         $subject = $this->Mail->Subject;
 

-        $this->Mail->SMTPKeepAlive = true;
+        $this->Mail->SMTPKeepAlive = TRUE;

         $this->Mail->Subject = $subject . ": SMTP keep-alive 1";
         $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
         
         $this->Mail->Subject = $subject . ": SMTP keep-alive 1";
         $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
         


@@ -513,8 +513,8 @@ class phpmailerTest extends TestCase
         $this->Mail->Subject .= ": This should be sent"; 
         $this->BuildBody();
         $this->Mail->ClearAllRecipients(); // no addresses should cause an error
         $this->Mail->Subject .= ": This should be sent"; 
         $this->BuildBody();
         $this->Mail->ClearAllRecipients(); // no addresses should cause an error

-        $this->assert($this->Mail->IsError() == false, "Error found");
-        $this->assert($this->Mail->Send() == false, "Send succeeded");
+        $this->assert($this->Mail->IsError() == FALSE, "Error found");
+        $this->assert($this->Mail->Send() == FALSE, "Send succeeded");

         $this->assert($this->Mail->IsError(), "No error found");
         $this->assertEquals('You must provide at least one ' .
                             'recipient email address.', $this->Mail->ErrorInfo);
         $this->assert($this->Mail->IsError(), "No error found");
         $this->assertEquals('You must provide at least one ' .
                             'recipient email address.', $this->Mail->ErrorInfo);

diff --git a/inc/phpmailer/test/phpunit.php b/inc/phpmailer/test/phpunit.php
index 1ce4cb9ed541ff74b1f7969ab3b7ac3fff594bc8..b7395cdce326bacef07565e140bd80be1c9692b6 100644 (file)
--- a/inc/phpmailer/test/phpunit.php
+++ b/inc/phpmailer/test/phpunit.php
@@ -269,7 +269,7 @@ class TestResult {
   /* Collect the results of running a set of TestCases. */
   var $fFailures = array();
   var $fRunTests = 0;
   /* Collect the results of running a set of TestCases. */
   var $fFailures = array();
   var $fRunTests = 0;

-  var $fStop = false;
+  var $fStop = FALSE;

 
   function TestResult() { }
 
 
   function TestResult() { }
 


@@ -310,7 +310,7 @@ class TestResult {
 
   function stop() {
     /* set indication that the test sequence should halt */
 
   function stop() {
     /* set indication that the test sequence should halt */

-    $fStop = true;
+    $fStop = TRUE;

   }
 
   function countFailures() {
   }
 
   function countFailures() {

diff --git a/inc/pool/pool- b/inc/pool/pool-
index f89e234c402100309bc6d69ba9110b7838fe8c53..06e966306b3793529b11e61e981b8f899298be38 100644 (file)
--- a/inc/pool/pool-
+++ b/inc/pool/pool-
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 // Don't run on daily reset
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
        // Skip here
 // Don't run on daily reset
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
        // Skip here

-       return false;
+       return FALSE;

 } elseif (!isExtensionActive('foo')) {
        // Abort if extension foo is not active
 } elseif (!isExtensionActive('foo')) {
        // Abort if extension foo is not active

-       return false;
+       return FALSE;

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 001d12b8eae8905ada3d01e1ec80d9a409404ffc..58ea34151ca1904b52faf657acef63f454805ba8 100644 (file)
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 // Don't run on daily reset
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
        // Skip here
 // Don't run on daily reset
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
        // Skip here

-       return false;
+       return FALSE;

 } elseif (!isExtensionActive('bonus')) {
        // Abort if extension bonus is not active
 } elseif (!isExtensionActive('bonus')) {
        // Abort if extension bonus is not active

-       return false;
+       return FALSE;

 }
 
 // Only send bonus mail when bonus extension is active and maximum send-mails is not reached
 }
 
 // Only send bonus mail when bonus extension is active and maximum send-mails is not reached


@@ -117,7 +117,7 @@ ORDER BY
                                        //* DEBUG: */ debugOutput('OK!/L:'.__LINE__);
 
                                        // Remove receiver from list
                                        //* DEBUG: */ debugOutput('OK!/L:'.__LINE__);
 
                                        // Remove receiver from list

-                                       $status = removeReceiver($temporaryReceivers, $key, $userid, $mailData['id'], $mailData['id'], true);
+                                       $status = removeReceiver($temporaryReceivers, $key, $userid, $mailData['id'], $mailData['id'], TRUE);

 
                                        // Did it work?
                                        switch ($status) {
 
                                        // Did it work?
                                        switch ($status) {


@@ -209,7 +209,7 @@ LIMIT 1",
                                                implode(';', $temporaryReceivers),
                                                bigintval($mailData['id'])
                                        ), __FILE__, __LINE__);
                                                implode(';', $temporaryReceivers),
                                                bigintval($mailData['id'])
                                        ), __FILE__, __LINE__);

-                               //* DEBUG: */ debugOutput('*L:'.__LINE__.'<pre>'.print_r($temporaryReceivers, true).'</pre>!!!');
+                               //* DEBUG: */ debugOutput('*L:'.__LINE__.'<pre>'.print_r($temporaryReceivers, TRUE).'</pre>!!!');

 
                                // Run any SQLs
                                runFilterChain('run_sqls');
 
                                // Run any SQLs
                                runFilterChain('run_sqls');

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index eae45bc0e45da7487bc60af0d1e9dd7ba10db9bf..76aabe0042b205eb93650c5963f5ce5acfd56102 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 // Don't run on daily reset
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
        // Skip here
 // Don't run on daily reset
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
        // Skip here

-       return false;
+       return FALSE;

 } elseif (!isExtensionActive('user')) {
        // Abort here if extension user is not active
 } elseif (!isExtensionActive('user')) {
        // Abort here if extension user is not active

-       return false;
+       return FALSE;

 }
 
 // No HTML is default
 }
 
 // No HTML is default

diff --git a/inc/purge/purge- b/inc/purge/purge-
index 6d2b403cc345f0b701f7225fc416474a623ba34c..fadd911de360fc329cb1bf8e33ef83e3205c4080 100644 (file)
--- a/inc/purge/purge-
+++ b/inc/purge/purge-
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
        // Abort here
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
        // Abort here

-       return false;
+       return FALSE;

 } // END - if
 
 // [EOF]
 } // END - if
 
 // [EOF]

diff --git a/inc/purge/purge-general.php b/inc/purge/purge-general.php
index f3ab83bd2d7124f637d2be0121e2d5c8ee95397c..fa5cf3f0569ee48472f5690a4759e9089becabc9 100644 (file)
--- a/inc/purge/purge-general.php
+++ b/inc/purge/purge-general.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
        die();
 } elseif ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here

-       return false;
+       return FALSE;

 }
 
 if (getAutoPurge() > 0) {
 }
 
 if (getAutoPurge() > 0) {


@@ -88,11 +88,11 @@ ORDER BY
 
                                // Remove confirmation links from queue
                                addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
 
                                // Remove confirmation links from queue
                                addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",

-                                       array(bigintval($content['id'])), __FILE__, __LINE__, false));
+                                       array(bigintval($content['id'])), __FILE__, __LINE__, FALSE));

 
                                // Update status of order
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",
 
                                // Update status of order
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",

-                                       array(bigintval($content['pool_id'])), __FILE__, __LINE__, false));
+                                       array(bigintval($content['pool_id'])), __FILE__, __LINE__, FALSE));

                        } // END - if
                } // END - while
 
                        } // END - if
                } // END - while
 


@@ -104,7 +104,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Is the 'bonus' extension installed and activated?
        SQL_FREERESULT($result);
 
        // Is the 'bonus' extension installed and activated?

-       if (isExtensionActive('bonus', true)) {
+       if (isExtensionActive('bonus', TRUE)) {

                // Check for bonus campaigns
                $result = SQL_QUERY("SELECT `id`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='SEND' AND `timestamp` <= {?auto_purge?} ORDER BY `id` ASC", __FILE__, __LINE__);
                if (!SQL_HASZERONUMS($result)) {
                // Check for bonus campaigns
                $result = SQL_QUERY("SELECT `id`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='SEND' AND `timestamp` <= {?auto_purge?} ORDER BY `id` ASC", __FILE__, __LINE__);
                if (!SQL_HASZERONUMS($result)) {


@@ -123,11 +123,11 @@ ORDER BY
 
                                        // Remove confirmation links from queue
                                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
 
                                        // Remove confirmation links from queue
                                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",

-                                               array(bigintval($content['id'])), __FILE__, __LINE__, false));
+                                               array(bigintval($content['id'])), __FILE__, __LINE__, FALSE));

 
                                        // Update status of order
                                        addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",
 
                                        // Update status of order
                                        addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",

-                                               array(bigintval($content['id'])), __FILE__, __LINE__, false));
+                                               array(bigintval($content['id'])), __FILE__, __LINE__, FALSE));

                                } // END - if
                        } // END - while
 
                                } // END - if
                        } // END - while
 

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index d9278d309ca8a53b4fac8d39e337e12176bad718..5cf054fc1053aae204348ceddd63fe6f4ee3029d 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here

-       return false;
+       return FALSE;

 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?


@@ -107,7 +107,7 @@ ORDER BY
 
                        // Update this account
                        addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
 
                        // Update this account
                        addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",

-                               array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));

                } // END - while
 
                // Remove last comma
                } // END - while
 
                // Remove last comma

diff --git a/inc/purge/purge-mails.php b/inc/purge/purge-mails.php
index 7e830feb8a6c580faf024913158466a5b8f19175..4827c787df4b754e17017693d5688cbc35a4b807 100644 (file)
--- a/inc/purge/purge-mails.php
+++ b/inc/purge/purge-mails.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive()) || (getConfig('ap_del_mails') != 'Y')) {
        // Abort here
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive()) || (getConfig('ap_del_mails') != 'Y')) {
        // Abort here

-       return false;
+       return FALSE;

 } // END - if
 
 // Okay, let's check for deleted mails
 } // END - if
 
 // Okay, let's check for deleted mails

diff --git a/inc/purge/purge-tasks.php b/inc/purge/purge-tasks.php
index 4917a6f8dc7c0cd6808a49c65167067615ec91d5..0c70c91ab05b98448b70b692728b1cd7db849975 100644 (file)
--- a/inc/purge/purge-tasks.php
+++ b/inc/purge/purge-tasks.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here

-       return false;
+       return FALSE;

 } // END - if
 
 // Check version (must be >= 0.1.9)
 } // END - if
 
 // Check version (must be >= 0.1.9)

diff --git a/inc/purge/purge-unconfirmed.php b/inc/purge/purge-unconfirmed.php
index 0517925652473c1179536c52c4f5f069a673fe31..106302b6542fee71b56e7a0526e02bb9da5d6d47 100644 (file)
--- a/inc/purge/purge-unconfirmed.php
+++ b/inc/purge/purge-unconfirmed.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here

-       return false;
+       return FALSE;

 } // END - if
 
 // Shall I auto-purge unconfirmed accounts?
 } // END - if
 
 // Shall I auto-purge unconfirmed accounts?

diff --git a/inc/purge/purge-user.php b/inc/purge/purge-user.php
index 3e4850c6d4f83eacec097b6d207ef351f904bb37..6b8a7d32425c057830e0e71ba70b95a6f75047c3 100644 (file)
--- a/inc/purge/purge-user.php
+++ b/inc/purge/purge-user.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
        // Abort here
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
        // Abort here

-       return false;
+       return FALSE;

 } // END - if
 
 // [EOF]
 } // END - if
 
 // [EOF]

diff --git a/inc/referral-functions.php b/inc/referral-functions.php
index fc628b3daa59f2579be6486046aaefaad9960be4..26700a53061e710b70659489379f8742bb51b0d5 100644 (file)
--- a/inc/referral-functions.php
+++ b/inc/referral-functions.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function initReferralSystem () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referral system initialized!');
        $GLOBALS['ref_level']  = NULL;
 function initReferralSystem () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referral system initialized!');
        $GLOBALS['ref_level']  = NULL;

-       $GLOBALS['ref_system'] = true;
+       $GLOBALS['ref_system'] = TRUE;

 }
 
 // Getter fro ref level percents
 }
 
 // Getter fro ref level percents


@@ -56,7 +56,7 @@ function getReferralLevelPercents ($level) {
        if ((isset($GLOBALS['cache_array']['refdepths']['level'])) && (isExtensionActive('cache'))) {
                // First look for level
                $key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
        if ((isset($GLOBALS['cache_array']['refdepths']['level'])) && (isExtensionActive('cache'))) {
                // First look for level
                $key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);

-               if ($key !== false) {
+               if ($key !== FALSE) {

                        // Entry found
                        $data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
 
                        // Entry found
                        $data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
 


@@ -93,7 +93,7 @@ function getReferralLevelPercents ($level) {
 function addPointsThroughReferralSystem ($subject, $userid, $points, $refid = NULL) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',refid=' . convertNullToZero($refid) . ' - ENTERED!');
        // By default nothing has been added
 function addPointsThroughReferralSystem ($subject, $userid, $points, $refid = NULL) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',refid=' . convertNullToZero($refid) . ' - ENTERED!');
        // By default nothing has been added

-       $added = false;
+       $added = FALSE;

 
        // Determine payment method and notification
        $paymentMethod = strtoupper(getPaymentMethodFromSubject($subject));
 
        // Determine payment method and notification
        $paymentMethod = strtoupper(getPaymentMethodFromSubject($subject));


@@ -200,7 +200,7 @@ function addPointsThroughReferralSystem ($subject, $userid, $points, $refid = NU
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',refid=' . $refid . ',paymentMethod=' . $paymentMethod . ',sendNotify=' . intval($sendNotify) . ',isLocked=' . intval($isLocked));
 
                        // Send "referral confirmed" mails out?
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',refid=' . $refid . ',paymentMethod=' . $paymentMethod . ',sendNotify=' . intval($sendNotify) . ',isLocked=' . intval($isLocked));
 
                        // Send "referral confirmed" mails out?

-                       if ((isValidUserid($refid)) && ($refid != $userid) && ($sendNotify === true)) {
+                       if ((isValidUserid($refid)) && ($refid != $userid) && ($sendNotify === TRUE)) {

                                // Calculate the referral's points and percents
                                $percentsReferral = getReferralLevelPercents($GLOBALS['ref_level'] + 1);
 
                                // Calculate the referral's points and percents
                                $percentsReferral = getReferralLevelPercents($GLOBALS['ref_level'] + 1);
 


@@ -226,7 +226,7 @@ function addPointsThroughReferralSystem ($subject, $userid, $points, $refid = NU
                        } // END - if
 
                        // Points updated, maybe I shall send him an email?
                        } // END - if
 
                        // Points updated, maybe I shall send him an email?

-                       if (($sendNotify === true) && ($isLocked === false)) {
+                       if (($sendNotify === TRUE) && ($isLocked === FALSE)) {

                                // "Explode" subject
                                $subjectArray = explode(':', $subject);
                                $subjectUserid = (isset($subjectArray[1])) ? $subjectArray[1] : '0';
                                // "Explode" subject
                                $subjectArray = explode(':', $subject);
                                $subjectUserid = (isset($subjectArray[1])) ? $subjectArray[1] : '0';


@@ -518,7 +518,7 @@ function getPointsColumnNameFromSubjectLocked ($subject, $isLocked) {
        $columnName = $pointsData['column_name'];
 
        // Are the points locked?
        $columnName = $pointsData['column_name'];
 
        // Are the points locked?

-       if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) {
+       if (($isLocked === TRUE) && ($pointsData['locked_mode'] == 'LOCKED')) {

                // Locked points, so prefix it
                $columnName = 'locked_' . $pointsData['column_name'];
        } // END - if
                // Locked points, so prefix it
                $columnName = 'locked_' . $pointsData['column_name'];
        } // END - if


@@ -666,7 +666,7 @@ function addMissingReferralLevels ($userid) {
                        } // END - foreach
                } // END - foreach
        } // END - foreach
                        } // END - foreach
                } // END - foreach
        } // END - foreach

-       //die('<pre>'.print_r($GLOBALS['referral_refid'][$userid],true).'</pre>');
+       //die('<pre>'.print_r($GLOBALS['referral_refid'][$userid],TRUE).'</pre>');

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!');
 }
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!');
 }
 


@@ -689,7 +689,7 @@ function flushReferralTableToDatabase ($userid) {
 
        // Prepare SQL
        $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`, `level`, `refid`) VALUES ';
 
        // Prepare SQL
        $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`, `level`, `refid`) VALUES ';

-       $executeSql = false;
+       $executeSql = FALSE;

 
        // Now walk through the array, first levels
        foreach ($GLOBALS['referral_refid'][$userid] as $level => $levelArray) {
 
        // Now walk through the array, first levels
        foreach ($GLOBALS['referral_refid'][$userid] as $level => $levelArray) {


@@ -711,7 +711,7 @@ function flushReferralTableToDatabase ($userid) {
                                $SQL .= '(' . $userid . ',' . $level . ',' . $refid . '),';
 
                                // Some has been added, so execute the query
                                $SQL .= '(' . $userid . ',' . $level . ',' . $refid . '),';
 
                                // Some has been added, so execute the query

-                               $executeSql = true;
+                               $executeSql = TRUE;

                        } // END - if
                } // END - foreach
        } // END - foreach
                        } // END - if
                } // END - foreach
        } // END - foreach


@@ -721,7 +721,7 @@ function flushReferralTableToDatabase ($userid) {
 
        // And run it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',SQL=' . $SQL);
 
        // And run it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',SQL=' . $SQL);

-       if ($executeSql === true) {
+       if ($executeSql === TRUE) {

                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
        } // END - if
 
                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
        } // END - if
 


@@ -820,7 +820,7 @@ function determineReferralId () {
                return getReferralId();
        } elseif ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) {
                // Skip this in non-html-mode and outside ref.php
                return getReferralId();
        } elseif ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) {
                // Skip this in non-html-mode and outside ref.php

-               return false;
+               return FALSE;

        }
 
        // Check if refid is set
        }
 
        // Check if refid is set


@@ -864,7 +864,7 @@ function determineReferralId () {
        // Set cookie when default refid > 0
        if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferralId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
                // Default is not found
        // Set cookie when default refid > 0
        if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferralId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
                // Default is not found

-               $found = false;
+               $found = FALSE;

 
                // Is there nickname or userid set?
                if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferralId()))) {
 
                // Is there nickname or userid set?
                if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferralId()))) {


@@ -872,7 +872,7 @@ function determineReferralId () {
                        $found = fetchUserData(getReferralId(), 'nickname');
 
                        // If we found it, use the userid as referral id
                        $found = fetchUserData(getReferralId(), 'nickname');
 
                        // If we found it, use the userid as referral id

-                       if ($found === true) {
+                       if ($found === TRUE) {

                                // Set the userid as 'refid'
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from user account by nickname (' . getUserData('userid') . ')');
                                setReferralId(getUserData('userid'));
                                // Set the userid as 'refid'
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from user account by nickname (' . getUserData('userid') . ')');
                                setReferralId(getUserData('userid'));


@@ -884,7 +884,7 @@ function determineReferralId () {
                }
 
                // Is the record valid?
                }
 
                // Is the record valid?

-               if ((($found === false) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) {
+               if ((($found === FALSE) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) {

                        // No, then reset referral id
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
                        setReferralId(getDefRefid());
                        // No, then reset referral id
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
                        setReferralId(getDefRefid());

diff --git a/inc/request-functions.php b/inc/request-functions.php
index e0051a169edc6da09958b57ae5ac2276f48452b9..f8c84e627046ffb65eb13c46275445ac41e9f24e 100644 (file)
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -90,7 +90,7 @@ function getRequestArray () {
 // Counts entries in $_GET or returns false if not an array
 function countRequestGet () {
        // By default this is not an array
 // Counts entries in $_GET or returns false if not an array
 function countRequestGet () {
        // By default this is not an array

-       $count = false;
+       $count = FALSE;

 
        // Get the array
        $GET = getRequestArray();
 
        // Get the array
        $GET = getRequestArray();


@@ -160,7 +160,8 @@ function isPostRequestElementSet ($element, $subElement = NULL) {
         * a string as numerical indexes are not wanted in POST data (in this
         * project).
         */
         * a string as numerical indexes are not wanted in POST data (in this
         * project).
         */

-       assert(is_string($element) && ((is_null($subElement)) || (is_string($subElement)) || (is_int($subElement))));
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[]=' . gettype($element) . ',subElement[]=' . gettype($subElement));
+       assert(is_string($element) && ((is_null($subElement)) || (is_string($subElement)) || (is_int($subElement)) || (is_double($subElement))));

 
        // Is a sub element set?
        if (is_null($subElement)) {
 
        // Is a sub element set?
        if (is_null($subElement)) {


@@ -191,7 +192,7 @@ function setPostRequestArray ($postData) {
 // Counts entries in $_POST or returns false if not an array
 function countRequestPost () {
        // By default this is not an array
 // Counts entries in $_POST or returns false if not an array
 function countRequestPost () {
        // By default this is not an array

-       $count = false;
+       $count = FALSE;

 
        // Get the array
        $postData = postRequestArray();
 
        // Get the array
        $postData = postRequestArray();

diff --git a/inc/revision-functions.php b/inc/revision-functions.php
index 40ff69b3f650568580fb4985f77f4c27f385c64d..e61d9788751d69dfd852a1cf351cab7a2d47c615 100644 (file)
--- a/inc/revision-functions.php
+++ b/inc/revision-functions.php
@@ -73,7 +73,7 @@ function getRepositoryData ($type = 'Revision') {
        $ret = 'INVALID';
 
        // By default nothing is new... ;-)
        $ret = 'INVALID';
 
        // By default nothing is new... ;-)

-       $new = false;
+       $new = FALSE;

 
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['revision'][$type][0])) {
 
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['revision'][$type][0])) {


@@ -90,24 +90,24 @@ function getRepositoryData ($type = 'Revision') {
                // Check if 'check_revision_data' is setted (switch for manually rewrite the .revision-File)
                if ((isGetRequestElementSet('check_revision_data')) && (getRequestElement('check_revision_data') == 'yes')) {
                        // Forced rebuild of .revision file
                // Check if 'check_revision_data' is setted (switch for manually rewrite the .revision-File)
                if ((isGetRequestElementSet('check_revision_data')) && (getRequestElement('check_revision_data') == 'yes')) {
                        // Forced rebuild of .revision file

-                       $new = true;
+                       $new = TRUE;

                } else {
                        // Check for revision file
                        if (!isFileReadable($FQFN)) {
                                // Not found, so we need to create it
                } else {
                        // Check for revision file
                        if (!isFileReadable($FQFN)) {
                                // Not found, so we need to create it

-                               $new = true;
+                               $new = TRUE;

                        } else {
                                // Revision file found
                                $ins_vers = explode(chr(10), readFromFile($FQFN));
 
                                // Get array for mapping information
                                $mapper = array_flip($GLOBALS['repository_search_for']);
                        } else {
                                // Revision file found
                                $ins_vers = explode(chr(10), readFromFile($FQFN));
 
                                // Get array for mapping information
                                $mapper = array_flip($GLOBALS['repository_search_for']);

-                               //* DEBUG: */ debugOutput('<pre>mapper='.print_r($mapper, true).'</pre>ins_vers=<pre>'.print_r($ins_vers, true).'</pre>');
+                               //* DEBUG: */ debugOutput('<pre>mapper='.print_r($mapper, TRUE).'</pre>ins_vers=<pre>'.print_r($ins_vers, TRUE).'</pre>');

 
                                // Is the content valid?
                                if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == '') || ($ins_vers[0]) == 'new') {
                                        // File needs update!
 
                                // Is the content valid?
                                if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == '') || ($ins_vers[0]) == 'new') {
                                        // File needs update!

-                                       $new = true;
+                                       $new = TRUE;

                                } else {
                                        // Generate fake cache entry
                                        foreach ($mapper as $map => $idx) {
                                } else {
                                        // Generate fake cache entry
                                        foreach ($mapper as $map => $idx) {


@@ -122,7 +122,7 @@ function getRepositoryData ($type = 'Revision') {
                }
 
                // Has it been updated?
                }
 
                // Has it been updated?

-               if ($new === true)  {
+               if ($new === TRUE)  {

                        // Write it
                        writeToFile($FQFN, implode(chr(10), getArrayFromRepositoryData()));
 
                        // Write it
                        writeToFile($FQFN, implode(chr(10), getArrayFromRepositoryData()));
 

diff --git a/inc/session-functions.php b/inc/session-functions.php
index dc6c3ff8728f7d906250b2f601822c25a2e4020f..384e3f465ec1a2d7df2195b81b1f31b524c6f28d 100644 (file)
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function setSession ($var, $value) {
        // Abort in CSS mode here
        if (isCssOutputMode()) {
 function setSession ($var, $value) {
        // Abort in CSS mode here
        if (isCssOutputMode()) {

-               return true;
+               return TRUE;

        } // END - if
 
        // Trim value and session variable
        } // END - if
 
        // Trim value and session variable


@@ -58,7 +58,7 @@ function setSession ($var, $value) {
                unset($GLOBALS['_SESSION'][$var]);
                if (isPhpVersionEqualNewer('5.3.0')) {
                        // session_unregister() is deprecated as of 5.3.0
                unset($GLOBALS['_SESSION'][$var]);
                if (isPhpVersionEqualNewer('5.3.0')) {
                        // session_unregister() is deprecated as of 5.3.0

-                       return true;
+                       return TRUE;

                } else {
                        // PHP version < 5.3.0
                        return session_unregister($var);
                } else {
                        // PHP version < 5.3.0
                        return session_unregister($var);


@@ -69,7 +69,7 @@ function setSession ($var, $value) {
                $GLOBALS['_SESSION'][$var] =  $value;
                if (isPhpVersionEqualNewer('5.3.0')) {
                        // session_unregister() is deprecated as of 5.3.0
                $GLOBALS['_SESSION'][$var] =  $value;
                if (isPhpVersionEqualNewer('5.3.0')) {
                        // session_unregister() is deprecated as of 5.3.0

-                       return true;
+                       return TRUE;

                } else {
                        // PHP version < 5.3.0
                        return session_register($var);
                } else {
                        // PHP version < 5.3.0
                        return session_register($var);


@@ -78,12 +78,12 @@ function setSession ($var, $value) {
                // Update session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);
                $GLOBALS['_SESSION'][$var] = $value;
                // Update session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);
                $GLOBALS['_SESSION'][$var] = $value;

-               return true;
+               return TRUE;

        }
 
        // Ignored (but valid)
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'IGNORED:' . $var . '=' . $value);
        }
 
        // Ignored (but valid)
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'IGNORED:' . $var . '=' . $value);

-       return true;
+       return TRUE;

 }
 
 // Check whether a session variable is set
 }
 
 // Check whether a session variable is set


@@ -115,12 +115,12 @@ function getSessionArray () {
 }
 
 // Destroy user session
 }
 
 // Destroy user session

-function destroyMemberSession ($destroy = false) {
+function destroyMemberSession ($destroy = FALSE) {

        // Reset userid
        initMemberId();
 
        // Remove all user data from session
        // Reset userid
        initMemberId();
 
        // Remove all user data from session

-       if ($destroy === true) {
+       if ($destroy === TRUE) {

                // Destroy whole session
                return session_destroy();
        } else {
                // Destroy whole session
                return session_destroy();
        } else {


@@ -129,19 +129,19 @@ function destroyMemberSession ($destroy = false) {
 }
 
 // Destroys the admin session
 }
 
 // Destroys the admin session

-function destroyAdminSession ($destroy = true) {
+function destroyAdminSession ($destroy = TRUE) {

        // Kill maybe existing session variables including array elements
        setAdminId(0);
        setAdminMd5('');
        setAdminLast('');
 
        // Destroy session if requested and return status
        // Kill maybe existing session variables including array elements
        setAdminId(0);
        setAdminMd5('');
        setAdminLast('');
 
        // Destroy session if requested and return status

-       if ($destroy === true) {
+       if ($destroy === TRUE) {

                return session_destroy();
        } // END - if
 
        // All fine if we shall not really destroy the session
                return session_destroy();
        } // END - if
 
        // All fine if we shall not really destroy the session

-       return true;
+       return TRUE;

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/sql-functions.php b/inc/sql-functions.php
index d684cbd07edbe0564940e50d547e33cb918c765b..069f459d93a35b471a06883d80301c91d8799433 100644 (file)
--- a/inc/sql-functions.php
+++ b/inc/sql-functions.php
@@ -146,7 +146,7 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
                        } elseif ((substr($value, -2, 2) == '()') || (substr($value, 0, 1) == '`')) {
                                // SQL function needs no ticks (')
                                $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value) . ',';
                        } elseif ((substr($value, -2, 2) == '()') || (substr($value, 0, 1) == '`')) {
                                // SQL function needs no ticks (')
                                $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value) . ',';

-                       } elseif ('' . bigintval($value, true, false) . '' == '' . $value . '')  {
+                       } elseif ('' . bigintval($value, TRUE, FALSE) . '' == '' . $value . '')  {

                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value . ',';
                        } else {
                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value . ',';
                        } else {


@@ -161,7 +161,7 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
                        } elseif ((substr($value[$multiDimId], -2, 2) == '()') || (substr($value[$multiDimId], 0, 1) == '`')) {
                                // SQL function needs no ticks (')
                                $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value[$multiDimId]) . ',';
                        } elseif ((substr($value[$multiDimId], -2, 2) == '()') || (substr($value[$multiDimId], 0, 1) == '`')) {
                                // SQL function needs no ticks (')
                                $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value[$multiDimId]) . ',';

-                       } elseif (('' . bigintval($value[$multiDimId], true, false) . '' == '' . $value[$multiDimId] . ''))  {
+                       } elseif (('' . bigintval($value[$multiDimId], TRUE, FALSE) . '' == '' . $value[$multiDimId] . ''))  {

                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ',';
                        } else {
                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ',';
                        } else {


@@ -199,7 +199,7 @@ function getInsertSqlFromArray ($array, $tableName) {
                } elseif (substr($value, -2, 2) == '()') {
                        // SQL function needs no ticks (')
                        $SQL .= SQL_ESCAPE($value) . ',';
                } elseif (substr($value, -2, 2) == '()') {
                        // SQL function needs no ticks (')
                        $SQL .= SQL_ESCAPE($value) . ',';

-               } elseif ('' . bigintval($value, true, false) . '' == '' . $value . '') {
+               } elseif ('' . bigintval($value, TRUE, FALSE) . '' == '' . $value . '') {

                        // Number detected, no need for ticks (')
                        $SQL .= bigintval($value) . ',';
                } elseif ('' . (float) $value . '' == '' . $value . '') {
                        // Number detected, no need for ticks (')
                        $SQL .= bigintval($value) . ',';
                } elseif ('' . (float) $value . '' == '' . $value . '') {

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index 816be3410d7a723eb21656bb336bc1afe907cddc..c3f607114228cf869f5afaeb84391cfa5327a5b5 100644 (file)
--- a/inc/stats-functions.php
+++ b/inc/stats-functions.php
@@ -51,7 +51,7 @@ function initStatsSystem () {
                loadStatsTable();
 
                // Stats are loaded!
                loadStatsTable();
 
                // Stats are loaded!

-               $GLOBALS['stats_loaded'] = true;
+               $GLOBALS['stats_loaded'] = TRUE;

        } // END - if
 }
 
        } // END - if
 }
 


@@ -102,7 +102,7 @@ function setStatsEntry ($entry, $value) {
 // Loads stats table
 function loadStatsTable () {
        // Check if the link is up
 // Loads stats table
 function loadStatsTable () {
        // Check if the link is up

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // Is it there for today?
        if (!isStatsTableCreated()) {
 
        // Is it there for today?
        if (!isStatsTableCreated()) {


@@ -128,7 +128,7 @@ function loadStatsTable () {
 // Checks if the the statistics table is created
 function isStatsTableCreated () {
        // Check if the link is up
 // Checks if the the statistics table is created
 function isStatsTableCreated () {
        // Check if the link is up

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // Ask for it
        $result = SQL_QUERY_ESC("SHOW TABLES LIKE '{?_MYSQL_PREFIX?}_stats_%s'",
 
        // Ask for it
        $result = SQL_QUERY_ESC("SHOW TABLES LIKE '{?_MYSQL_PREFIX?}_stats_%s'",


@@ -141,7 +141,7 @@ function isStatsTableCreated () {
 // Create the dummy table
 function createStatsTable () {
        // Check if the link is up
 // Create the dummy table
 function createStatsTable () {
        // Check if the link is up

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // Create it here
        $result = SQL_QUERY_ESC("CREATE TEMPORARY TABLE IF NOT EXISTS `{?_MYSQL_PREFIX?}_stats_%s` (
 
        // Create it here
        $result = SQL_QUERY_ESC("CREATE TEMPORARY TABLE IF NOT EXISTS `{?_MYSQL_PREFIX?}_stats_%s` (


@@ -155,7 +155,7 @@ PRIMARY KEY (`stats_entry`)
 // Write all entries to the table
 function writeStatsTable () {
        // Check if the link is up
 // Write all entries to the table
 function writeStatsTable () {
        // Check if the link is up

-       if (!SQL_IS_LINK_UP()) return false;
+       if (!SQL_IS_LINK_UP()) return FALSE;

 
        // Empty the table first
        SQL_QUERY_ESC("TRUNCATE `{?_MYSQL_PREFIX?}_stats_%s`",
 
        // Empty the table first
        SQL_QUERY_ESC("TRUNCATE `{?_MYSQL_PREFIX?}_stats_%s`",

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 29b7304c5ccb471498bf068e8fd4da7f129d3954..bb2bb16c6c83db15f22e194f0ef20410e7a9049b 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -116,7 +116,7 @@ if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
        } // END - foreach
 
        // Load template
        } // END - foreach
 
        // Load template

-       $GLOBALS['__page_header'] .= loadTemplate('css_inline', true, $OUT);
+       $GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, $OUT);

 } else {
        // Now we load all CSS files from css.php!
        $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
 } else {
        // Now we load all CSS files from css.php!
        $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 9c7192ab1a5d40132d25ab1f45c122e2a11e93cf..6f1006a2a5da7142c50d77236523eb1890d7d853 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -41,12 +41,12 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Wrapper until we merged to the EL branch
 } // END - if
 
 // Wrapper until we merged to the EL branch

-function preCompileCode ($code, $template = '', $compiled = false, $full = true, $overwrite = false) {
-       return compileCode($code, false, true, $full);
+function preCompileCode ($code, $template = '', $compiled = FALSE, $full = TRUE, $overwrite = FALSE) {
+       return compileCode($code, FALSE, TRUE, $full);

 }
 
 // Setter for 'is_template_html'
 }
 
 // Setter for 'is_template_html'

-function enableTemplateHtml ($enable = true) {
+function enableTemplateHtml ($enable = TRUE) {

        $GLOBALS['is_template_html'] = (bool) $enable;
 }
 
        $GLOBALS['is_template_html'] = (bool) $enable;
 }
 


@@ -56,7 +56,7 @@ function isTemplateHtml () {
        // Is the output_mode other than 0 (HTML), then no comments are enabled
        if (!isHtmlOutputMode()) {
                // No HTML
        // Is the output_mode other than 0 (HTML), then no comments are enabled
        if (!isHtmlOutputMode()) {
                // No HTML

-               return false;
+               return FALSE;

        } else {
                // Maybe HTML?
                return $GLOBALS['is_template_html'];
        } else {
                // Maybe HTML?
                return $GLOBALS['is_template_html'];


@@ -86,14 +86,14 @@ function initTemplateColorSwitch ($template) {
 // "Getter" for color switch code
 function getColorSwitchCode ($template) {
        // Prepare the code
 // "Getter" for color switch code
 function getColorSwitchCode ($template) {
        // Prepare the code

-       $code = "{DQUOTE} . doTemplateColorSwitch('" . $template . "', false, false) . {DQUOTE}";
+       $code = "{DQUOTE} . doTemplateColorSwitch('" . $template . "', FALSE, FALSE) . {DQUOTE}";

 
        // And return it
        return $code;
 }
 
 // Output HTML code directly or 'render' it. You addionally switch the new-line character off
 
        // And return it
        return $code;
 }
 
 // Output HTML code directly or 'render' it. You addionally switch the new-line character off

-function outputHtml ($htmlCode, $newLine = true) {
+function outputHtml ($htmlCode, $newLine = TRUE) {

        // Init output
        if (!isset($GLOBALS['__output'])) {
                $GLOBALS['__output'] = '';
        // Init output
        if (!isset($GLOBALS['__output'])) {
                $GLOBALS['__output'] = '';


@@ -111,7 +111,7 @@ function outputHtml ($htmlCode, $newLine = true) {
                                        outputRawCode($htmlCode);
 
                                        // That's why you don't need any \n at the end of your HTML code... :-)
                                        outputRawCode($htmlCode);
 
                                        // That's why you don't need any \n at the end of your HTML code... :-)

-                                       if ($newLine === true) {
+                                       if ($newLine === TRUE) {

                                                outputRawCode(chr(10));
                                        } // END - if
                                } else {
                                                outputRawCode(chr(10));
                                        } // END - if
                                } else {


@@ -119,7 +119,7 @@ function outputHtml ($htmlCode, $newLine = true) {
                                        $GLOBALS['__output'] .= $htmlCode;
 
                                        // That's why you don't need any \n at the end of your HTML code... :-)
                                        $GLOBALS['__output'] .= $htmlCode;
 
                                        // That's why you don't need any \n at the end of your HTML code... :-)

-                                       if ($newLine === true) {
+                                       if ($newLine === TRUE) {

                                                $GLOBALS['__output'] .= chr(10);
                                        } // END - if
                                }
                                                $GLOBALS['__output'] .= chr(10);
                                        } // END - if
                                }


@@ -134,7 +134,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 
                                // The same as above... ^
                                outputRawCode($htmlCode);
 
                                // The same as above... ^
                                outputRawCode($htmlCode);

-                               if ($newLine === true) {
+                               if ($newLine === TRUE) {

                                        outputRawCode(chr(10));
                                } // END - if
                                break;
                                        outputRawCode(chr(10));
                                } // END - if
                                break;


@@ -218,7 +218,7 @@ function compileFinalOutput () {
 }
 
 // Main compilation loop
 }
 
 // Main compilation loop

-function doFinalCompilation ($code, $insertComments = true, $enableCodes = true) {
+function doFinalCompilation ($code, $insertComments = TRUE, $enableCodes = TRUE) {

        // Insert comments? (Only valid with HTML templates, of course)
        enableTemplateHtml($insertComments);
 
        // Insert comments? (Only valid with HTML templates, of course)
        enableTemplateHtml($insertComments);
 


@@ -226,14 +226,14 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
        $count = 0;
 
        // Compile all out
        $count = 0;
 
        // Compile all out

-       while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== false)) && ($count < 7)) {
+       while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== FALSE)) && ($count < 7)) {

                // Init common variables
                $content = array();
                $newContent = '';
 
                // Compile it
                //* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');
                // Init common variables
                $content = array();
                $newContent = '';
 
                // Compile it
                //* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');

-               $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), false, true, $enableCodes)) . '";';
+               $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), FALSE, TRUE, $enableCodes)) . '";';

                //* DEBUG: */ if (!$insertComments) print('EVAL=<pre>'.linenumberCode($eval).'</pre>');
                eval($eval);
                //* DEBUG: */ if (!$insertComments) print('NEW=<pre>'.linenumberCode($newContent).'</pre>');
                //* DEBUG: */ if (!$insertComments) print('EVAL=<pre>'.linenumberCode($eval).'</pre>');
                eval($eval);
                //* DEBUG: */ if (!$insertComments) print('NEW=<pre>'.linenumberCode($newContent).'</pre>');


@@ -242,14 +242,14 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
                // Was that eval okay?
                if (empty($newContent)) {
                        // Something went wrong!
                // Was that eval okay?
                if (empty($newContent)) {
                        // Something went wrong!

-                       reportBug(__FUNCTION__, __LINE__, 'Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', false);
+                       reportBug(__FUNCTION__, __LINE__, 'Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', FALSE);

                } // END - if
 
                // Use it again
                $code = $newContent;
 
                // Compile the final code if insertComments is true
                } // END - if
 
                // Use it again
                $code = $newContent;
 
                // Compile the final code if insertComments is true

-               if ($insertComments == true) {
+               if ($insertComments == TRUE) {

                        // ... because SQL queries shall keep OPEN_CONFIG and such in
                        $code = compileRawCode($code);
                } // END - if
                        // ... because SQL queries shall keep OPEN_CONFIG and such in
                        $code = compileRawCode($code);
                } // END - if


@@ -259,7 +259,7 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
        } // END - while
 
        // Add debugging data in HTML code, if mode is enabled
        } // END - while
 
        // Add debugging data in HTML code, if mode is enabled

-       if ((isDebugModeEnabled()) && ($insertComments === true) && ((isHtmlOutputMode()) || (isCssOutputMode()))) {
+       if ((isDebugModeEnabled()) && ($insertComments === TRUE) && ((isHtmlOutputMode()) || (isCssOutputMode()))) {

                // Add loop count
                $code .= '<!-- Total compilation loop=' . $count . ' //-->';
        } // END - if
                // Add loop count
                $code .= '<!-- Total compilation loop=' . $count . ' //-->';
        } // END - if


@@ -281,7 +281,7 @@ function outputRawCode ($htmlCode) {
 }
 
 // Load a template file and return it's content (only it's name; do not use ' or ")
 }
 
 // Load a template file and return it's content (only it's name; do not use ' or ")

-function loadTemplate ($template, $return = false, $content = array(), $compileCode = true) {
+function loadTemplate ($template, $return = FALSE, $content = array(), $compileCode = TRUE) {

        // @TODO Remove these sanity checks if all is fine
        if (!is_bool($return)) {
                // $return has to be boolean
        // @TODO Remove these sanity checks if all is fine
        if (!is_bool($return)) {
                // $return has to be boolean


@@ -335,21 +335,21 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
                                        $code = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['template_content']['html'][$template] . '<!-- Template ' . $template . ' - End //-->';
 
                                        // Prepare eval() command
                                        $code = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['template_content']['html'][$template] . '<!-- Template ' . $template . ' - End //-->';
 
                                        // Prepare eval() command

-                                       $GLOBALS['template_eval']['html'][$template] = '$ret = "' . getColorSwitchCode($template) . compileCode(escapeQuotes($code), false, true, true, $compileCode) . '";';
+                                       $GLOBALS['template_eval']['html'][$template] = '$ret = "' . getColorSwitchCode($template) . compileCode(escapeQuotes($code), FALSE, TRUE, TRUE, $compileCode) . '";';

                                } elseif (substr($template, 0, 3) == 'js_') {
                                        // JavaScripts don't like entities, dollar signs and timings
                                } elseif (substr($template, 0, 3) == 'js_') {
                                        // JavaScripts don't like entities, dollar signs and timings

-                                       $GLOBALS['template_eval']['html'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), false, true, true, $compileCode) . '");';
+                                       $GLOBALS['template_eval']['html'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), FALSE, TRUE, TRUE, $compileCode) . '");';

                                } else {
                                        // Prepare eval() command, other output doesn't like entities, maybe
                                } else {
                                        // Prepare eval() command, other output doesn't like entities, maybe

-                                       $GLOBALS['template_eval']['html'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['template_content']['html'][$template]), false, true, true, $compileCode) . '");';
+                                       $GLOBALS['template_eval']['html'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['template_content']['html'][$template]), FALSE, TRUE, TRUE, $compileCode) . '");';

                                }
                        } elseif (isHtmlOutputMode()) {
                                // Add surrounding HTML comments to help finding bugs faster
                                $ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['template_content']['html'][$template] . '<!-- Template ' . $template . ' - End //-->';
                                }
                        } elseif (isHtmlOutputMode()) {
                                // Add surrounding HTML comments to help finding bugs faster
                                $ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['template_content']['html'][$template] . '<!-- Template ' . $template . ' - End //-->';

-                               $GLOBALS['template_eval']['html'][$template] = '$ret = "' . getColorSwitchCode($template) . compileRawCode(escapeQuotes($ret), false, true, true, $compileCode) . '";';
+                               $GLOBALS['template_eval']['html'][$template] = '$ret = "' . getColorSwitchCode($template) . compileRawCode(escapeQuotes($ret), FALSE, TRUE, TRUE, $compileCode) . '";';

                        } else {
                                // JavaScript again
                        } else {
                                // JavaScript again

-                               $GLOBALS['template_eval']['html'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), false, true, true, $compileCode) . '");';
+                               $GLOBALS['template_eval']['html'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), FALSE, TRUE, TRUE, $compileCode) . '");';

                        } // END - if
                } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
                        // Only admins shall see this warning or when installation mode is active
                        } // END - if
                } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
                        // Only admins shall see this warning or when installation mode is active


@@ -361,7 +361,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
 </div>
 <div class="para">
        {--TEMPLATE_CONTENT--}:
 </div>
 <div class="para">
        {--TEMPLATE_CONTENT--}:

-       <pre>' . print_r($content, true) . '</pre>
+       <pre>' . print_r($content, TRUE) . '</pre>

 </div>';
                } else {
                        // No file!
 </div>';
                } else {
                        // No file!


@@ -381,7 +381,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
        // Is there some content to output or return?
        if (!empty($ret)) {
                // Not empty so let's put it out! ;)
        // Is there some content to output or return?
        if (!empty($ret)) {
                // Not empty so let's put it out! ;)

-               if ($return === true) {
+               if ($return === TRUE) {

                        // Return the HTML code
                        return $ret;
                } else {
                        // Return the HTML code
                        return $ret;
                } else {


@@ -390,7 +390,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
                }
        } elseif (isDebugModeEnabled()) {
                // Warning, empty output!
                }
        } elseif (isDebugModeEnabled()) {
                // Warning, empty output!

-               return 'E:' . $template . ',content=<pre>' . print_r($content, true) . '</pre>';
+               return 'E:' . $template . ',content=<pre>' . print_r($content, TRUE) . '</pre>';

        }
 }
 
        }
 }
 


@@ -449,7 +449,7 @@ function detectExtraTemplatePath ($prefix, $template) {
 }
 
 // Loads an email template and compiles it
 }
 
 // Loads an email template and compiles it

-function loadEmailTemplate ($template, $content = array(), $userid = NULL, $loadUserData = true) {
+function loadEmailTemplate ($template, $content = array(), $userid = NULL, $loadUserData = TRUE) {

        // Make sure all template names are lowercase!
        $template = strtolower($template);
 
        // Make sure all template names are lowercase!
        $template = strtolower($template);
 


@@ -506,7 +506,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
 </div>
 <div class="para">
        {--TEMPLATE_CONTENT--}:
 </div>
 <div class="para">
        {--TEMPLATE_CONTENT--}:

-       <pre>' . print_r($content, true) . '</pre>
+       <pre>' . print_r($content, TRUE) . '</pre>

 </div>';
 
                        // Don't cache this, as there is no template to cache
 </div>';
 
                        // Don't cache this, as there is no template to cache


@@ -541,7 +541,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
                // Add last error if the required function exists
                if (function_exists('error_get_last')) {
                        // Add last error and some lines for better overview
                // Add last error if the required function exists
                if (function_exists('error_get_last')) {
                        // Add last error and some lines for better overview

-                       $newContent .= "\n--------------------------------------\nDebug:\n" . print_r(error_get_last(), true) . "--------------------------------------\nPlease don't alter these informations!\nThanx.";
+                       $newContent .= "\n--------------------------------------\nDebug:\n" . print_r(error_get_last(), TRUE) . "--------------------------------------\nPlease don't alter these informations!\nThanx.";

                } // END - if
        } // END - if
 
                } // END - if
        } // END - if
 


@@ -587,21 +587,21 @@ function generateCaptchaCode ($code, $type, $urlId, $userid) {
 }
 
 // Compiles the given HTML/mail code
 }
 
 // Compiles the given HTML/mail code

-function compileCode ($code, $simple = false, $constants = true, $full = true, $compileCode = true) {
+function compileCode ($code, $simple = FALSE, $constants = TRUE, $full = TRUE, $compileCode = TRUE) {

        // Is the code a string or should we not compile?
        // Is the code a string or should we not compile?

-       if ((!is_string($code)) || ($compileCode === false)) {
+       if ((!is_string($code)) || ($compileCode === FALSE)) {

                // Silently return it
                return $code;
        } // END - if
 
        // Start couting
                // Silently return it
                return $code;
        } // END - if
 
        // Start couting

-       $startCompile = microtime(true);
+       $startCompile = microtime(TRUE);

 
        // Comile the code
        $code = compileRawCode($code, $simple, $constants, $full);
 
        // Get timing
 
        // Comile the code
        $code = compileRawCode($code, $simple, $constants, $full);
 
        // Get timing

-       $compilationTime = $startCompile - microtime(true);
+       $compilationTime = $startCompile - microtime(TRUE);

 
        // Add timing if enabled
        if (isTemplateHtml()) {
 
        // Add timing if enabled
        if (isTemplateHtml()) {


@@ -615,9 +615,9 @@ function compileCode ($code, $simple = false, $constants = true, $full = true, $
 
 // Compiles the code
 // @TODO $simple/$constants are deprecated
 
 // Compiles the code
 // @TODO $simple/$constants are deprecated

-function compileRawCode ($code, $simple = false, $constants = true, $full = true, $compileCode = true) {
+function compileRawCode ($code, $simple = FALSE, $constants = TRUE, $full = TRUE, $compileCode = TRUE) {

        // Is the code a string or shall we not compile?
        // Is the code a string or shall we not compile?

-       if ((!is_string($code)) || ($compileCode === false)) {
+       if ((!is_string($code)) || ($compileCode === FALSE)) {

                // Silently return it
                return $code;
        } // END - if
                // Silently return it
                return $code;
        } // END - if


@@ -626,7 +626,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
        $secChars = $GLOBALS['url_chars'];
 
        // Select full set of chars to replace when we e.g. want to compile URLs
        $secChars = $GLOBALS['url_chars'];
 
        // Select full set of chars to replace when we e.g. want to compile URLs

-       if ($full === true) {
+       if ($full === TRUE) {

                $secChars = $GLOBALS['security_chars'];
        } // END - if
 
                $secChars = $GLOBALS['security_chars'];
        } // END - if
 


@@ -650,7 +650,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
                $matchesFound = array();
                foreach ($matches[0] as $key => $match) {
                        // Fuzzy look has failed by default
                $matchesFound = array();
                foreach ($matches[0] as $key => $match) {
                        // Fuzzy look has failed by default

-                       $fuzzyFound = false;
+                       $fuzzyFound = FALSE;

 
                        // Fuzzy look on match if already found
                        foreach ($matchesFound as $found => $set) {
 
                        // Fuzzy look on match if already found
                        foreach ($matchesFound as $found => $set) {


@@ -662,13 +662,13 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
                                if ($test == $match) {
                                        // Match found
                                        //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'fuzzyFound!');
                                if ($test == $match) {
                                        // Match found
                                        //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'fuzzyFound!');

-                                       $fuzzyFound = true;
+                                       $fuzzyFound = TRUE;

                                        break;
                                } // END - if
                        } // END - foreach
 
                        // Skip this entry?
                                        break;
                                } // END - if
                        } // END - foreach
 
                        // Skip this entry?

-                       if ($fuzzyFound === true) {
+                       if ($fuzzyFound === TRUE) {

                                continue;
                        } // END - if
 
                                continue;
                        } // END - if
 


@@ -679,7 +679,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
                                $newMatch = str_replace(array('[', ']', '$'), array("['", "']", '{COMPILE_DOLLAR}'), $match);
                                $code = str_replace($match, '".' . $newMatch . '."', $code);
                                $matchesFound[$key . '_' . $matches[3][$key]] = 1;
                                $newMatch = str_replace(array('[', ']', '$'), array("['", "']", '{COMPILE_DOLLAR}'), $match);
                                $code = str_replace($match, '".' . $newMatch . '."', $code);
                                $matchesFound[$key . '_' . $matches[3][$key]] = 1;

-                               $matchesFound[$match] = true;
+                               $matchesFound[$match] = TRUE;

                        } elseif (!isset($matchesFound[$match])) {
                                // Not yet replaced!
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'match=' . $match);
                        } elseif (!isset($matchesFound[$match])) {
                                // Not yet replaced!
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'match=' . $match);


@@ -845,12 +845,12 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
 }
 
 // Insert the code in $img_code into jpeg or PNG image
 }
 
 // Insert the code in $img_code into jpeg or PNG image

-function generateImageOrCode ($img_code, $headerSent = true) {
+function generateImageOrCode ($img_code, $headerSent = TRUE) {

        // Is the code size oversized or shouldn't we display it?
        if ((strlen($img_code) > 6) || (empty($img_code)) || (getCodeLength() == '0')) {
                // Stop execution of function here because of over-sized code length
                reportBug(__FUNCTION__, __LINE__, 'img_code ' . $img_code .' has invalid length. img_code(length)=' . strlen($img_code) . ' code_length=' . getCodeLength());
        // Is the code size oversized or shouldn't we display it?
        if ((strlen($img_code) > 6) || (empty($img_code)) || (getCodeLength() == '0')) {
                // Stop execution of function here because of over-sized code length
                reportBug(__FUNCTION__, __LINE__, 'img_code ' . $img_code .' has invalid length. img_code(length)=' . strlen($img_code) . ' code_length=' . getCodeLength());

-       } elseif ($headerSent === false) {
+       } elseif ($headerSent === FALSE) {

                // Return an HTML code here
                return '<img src="{%url=img.php?code=' . $img_code . '%}" alt="Image" />';
        }
                // Return an HTML code here
                return '<img src="{%url=img.php?code=' . $img_code . '%}" alt="Image" />';
        }


@@ -900,7 +900,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 }
 
 // Create selection box or array of splitted timestamp
 }
 
 // Create selection box or array of splitted timestamp

-function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'center', $asArray = false) {
+function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'center', $asArray = FALSE) {

        // Do not continue if ONE_DAY is absend
        if (!isConfigEntrySet('ONE_DAY')) {
                // Abort here
        // Do not continue if ONE_DAY is absend
        if (!isConfigEntrySet('ONE_DAY')) {
                // Abort here


@@ -953,7 +953,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
        //
        // Now we convert them in seconds...
        //
        //
        // Now we convert them in seconds...
        //

-       if ($asArray === true) {
+       if ($asArray === TRUE) {

                // Just put all data in an array for later use
                $OUT = array(
                        'Y' => $Y,
                // Just put all data in an array for later use
                $OUT = array(
                        'Y' => $Y,


@@ -1198,7 +1198,7 @@ function app_exit ($F, $L, $message) {
        } // END - if
 
        // Make sure, that the script realy realy diese here and now
        } // END - if
 
        // Make sure, that the script realy realy diese here and now

-       $GLOBALS['app_died'] = true;
+       $GLOBALS['app_died'] = TRUE;

 
        // Set content type as text/html
        setContentType('text/html');
 
        // Set content type as text/html
        setContentType('text/html');


@@ -1215,7 +1215,7 @@ function app_exit ($F, $L, $message) {
        );
 
        // Load the message template
        );
 
        // Load the message template

-       loadTemplate('app_exit_message', false, $message);
+       loadTemplate('app_exit_message', FALSE, $message);

 
        // Load footer
        loadIncludeOnce('inc/footer.php');
 
        // Load footer
        loadIncludeOnce('inc/footer.php');


@@ -1226,11 +1226,11 @@ function displayParsingTime () {
        // Is the timer started?
        if (!isset($GLOBALS['__start_time'])) {
                // Abort here
        // Is the timer started?
        if (!isset($GLOBALS['__start_time'])) {
                // Abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Get end time
        } // END - if
 
        // Get end time

-       $endTime = microtime(true);
+       $endTime = microtime(TRUE);

 
        // "Explode" both times
        $start = explode(' ', $GLOBALS['__start_time']);
 
        // "Explode" both times
        $start = explode(' ', $GLOBALS['__start_time']);


@@ -1248,7 +1248,7 @@ function displayParsingTime () {
        );
 
        // Load the template
        );
 
        // Load the template

-       $GLOBALS['__page_footer'] .= loadTemplate('show_timings', true, $content);
+       $GLOBALS['__page_footer'] .= loadTemplate('show_timings', TRUE, $content);

 }
 
 /**
 }
 
 /**


@@ -1265,7 +1265,7 @@ function displayParsingTime () {
  * @param      $sendEmail      Wether to send an email to all configured administrators
  * @return     void
  */
  * @param      $sendEmail      Wether to send an email to all configured administrators
  * @return     void
  */

-function reportBug ($F, $L, $message = '', $sendEmail = true) {
+function reportBug ($F, $L, $message = '', $sendEmail = TRUE) {

        // Is this already called?
        if (isset($GLOBALS[__FUNCTION__])) {
                // Other backtrace
        // Is this already called?
        if (isset($GLOBALS[__FUNCTION__])) {
                // Other backtrace


@@ -1278,7 +1278,7 @@ function reportBug ($F, $L, $message = '', $sendEmail = true) {
        setHttpStatus('500 Internal Server Error');
 
        // Mark this function as called
        setHttpStatus('500 Internal Server Error');
 
        // Mark this function as called

-       $GLOBALS[__FUNCTION__] = true;
+       $GLOBALS[__FUNCTION__] = TRUE;

 
        // Init message
        $debug = '';
 
        // Init message
        $debug = '';


@@ -1302,7 +1302,7 @@ function reportBug ($F, $L, $message = '', $sendEmail = true) {
        $debug .= '<div class="para">Thank you for finding bugs.</div>';
 
        // Send an email? (e.g. not wanted for evaluation errors)
        $debug .= '<div class="para">Thank you for finding bugs.</div>';
 
        // Send an email? (e.g. not wanted for evaluation errors)

-       if (($sendEmail === true) && (!isInstallationPhase())) {
+       if (($sendEmail === TRUE) && (!isInstallationPhase())) {

                // Prepare content
                $content = array(
                        'message'   => trim($message),
                // Prepare content
                $content = array(
                        'message'   => trim($message),


@@ -1324,7 +1324,7 @@ function reportBug ($F, $L, $message = '', $sendEmail = true) {
 }
 
 // Compile characters which are allowed in URLs
 }
 
 // Compile characters which are allowed in URLs

-function compileUriCode ($code, $simple = true) {
+function compileUriCode ($code, $simple = TRUE) {

        // Trim code
        $test = trim($code);
 
        // Trim code
        $test = trim($code);
 


@@ -1361,7 +1361,7 @@ function compileUriCode ($code, $simple = true) {
        );
 
        // Compile constants
        );
 
        // Compile constants

-       if ($simple === false) {
+       if ($simple === FALSE) {

                // Add more 'from'
                array_push($charsCompile['from'], '{--', '--}');
 
                // Add more 'from'
                array_push($charsCompile['from'], '{--', '--}');
 


@@ -1392,7 +1392,7 @@ function handleCodeMessage () {
                $message = getMessageFromErrorCode(getRequestElement('code'));
 
                // Load message template
                $message = getMessageFromErrorCode(getRequestElement('code'));
 
                // Load message template

-               loadTemplate('message', false, $message);
+               loadTemplate('message', FALSE, $message);

        } // END - if
 }
 
        } // END - if
 }
 


@@ -1603,7 +1603,7 @@ function isTemplateCached ($prefix, $template) {
 // Flushes non-flushed template cache to disk
 function flushTemplateCache ($prefix, $template, $eval) {
        // Is this cache flushed?
 // Flushes non-flushed template cache to disk
 function flushTemplateCache ($prefix, $template, $eval) {
        // Is this cache flushed?

-       if ((isDebuggingTemplateCache() === false) && (isTemplateCached($prefix, $template) === false) && ($eval != '404')) {
+       if ((isDebuggingTemplateCache() === FALSE) && (isTemplateCached($prefix, $template) === FALSE) && ($eval != '404')) {

                // Generate FQFN
                $FQFN = generateCacheFqfn($prefix, $template);
 
                // Generate FQFN
                $FQFN = generateCacheFqfn($prefix, $template);
 


@@ -1614,7 +1614,7 @@ function flushTemplateCache ($prefix, $template, $eval) {
                } // END - if
 
                // And flush it
                } // END - if
 
                // And flush it

-               writeToFile($FQFN, $eval, true);
+               writeToFile($FQFN, $eval, TRUE);

        } // END - if
 }
 
        } // END - if
 }
 


@@ -1640,9 +1640,9 @@ function readTemplateCache ($prefix, $template) {
 }
 
 // Escapes quotes (default is only double-quotes)
 }
 
 // Escapes quotes (default is only double-quotes)

-function escapeQuotes ($str, $single = false) {
+function escapeQuotes ($str, $single = FALSE) {

        // Should we escape all?
        // Should we escape all?

-       if ($single === true) {
+       if ($single === TRUE) {

                // Escape all (including null)
                $str = addslashes($str);
        } else {
                // Escape all (including null)
                $str = addslashes($str);
        } else {


@@ -1772,12 +1772,12 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
 }
 
 // Generates a 'selection box' from given array

-function generateSelectionBoxFromArray ($options, $name, $optionKey, $optionContent = '', $extraName = '', $templateName = '', $default = NULL, $nameElement = '', $allowNone = false, $useDefaultAsArray = false) {
+function generateSelectionBoxFromArray ($options, $name, $optionKey, $optionContent = '', $extraName = '', $templateName = '', $default = NULL, $nameElement = '', $allowNone = FALSE, $useDefaultAsArray = FALSE) {

        // Default is empty
        $addKey = '';
 
        // Use default value as array key?
        // Default is empty
        $addKey = '';
 
        // Use default value as array key?

-       if ($useDefaultAsArray === true) {
+       if ($useDefaultAsArray === TRUE) {

                // Then set it
                $addKey = '[' . convertNullToZero($default) . ']';
        } // END - if
                // Then set it
                $addKey = '[' . convertNullToZero($default) . ']';
        } // END - if


@@ -1787,7 +1787,7 @@ function generateSelectionBoxFromArray ($options, $name, $optionKey, $optionCont
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
 
        // Allow none?
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
 
        // Allow none?

-       if ($allowNone === true) {
+       if ($allowNone === TRUE) {

                // Then add it
                $OUT .= '<option value="0">{--SELECT_NONE--}</option>';
        } // END - if
                // Then add it
                $OUT .= '<option value="0">{--SELECT_NONE--}</option>';
        } // END - if


@@ -1815,10 +1815,10 @@ function generateSelectionBoxFromArray ($options, $name, $optionKey, $optionCont
                        // Is a template name given?
                        if (empty($templateName)) {
                                // ... $name template
                        // Is a template name given?
                        if (empty($templateName)) {
                                // ... $name template

-                               $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
+                               $OUT .= loadTemplate('select_' . $name . $extraName . '_option', TRUE, $option);

                        } else {
                                // ... $templateName template
                        } else {
                                // ... $templateName template

-                               $OUT .= loadTemplate('select_' . $templateName . $extraName . '_option', true, $option);
+                               $OUT .= loadTemplate('select_' . $templateName . $extraName . '_option', TRUE, $option);

                        }
                } else {
                        // ... direct HTML code
                        }
                } else {
                        // ... direct HTML code


@@ -1837,10 +1837,10 @@ function generateSelectionBoxFromArray ($options, $name, $optionKey, $optionCont
        // Load template and return it
        if (empty($templateName)) {
                // Use name from $name + $extraName
        // Load template and return it
        if (empty($templateName)) {
                // Use name from $name + $extraName

-               return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
+               return loadTemplate('select_' . $name . $extraName . '_box', TRUE, $content);

        } else {
                // Use name from $templateName + $extraName
        } else {
                // Use name from $templateName + $extraName

-               return loadTemplate('select_' . $templateName . $extraName . '_box', true, $content);
+               return loadTemplate('select_' . $templateName . $extraName . '_box', TRUE, $content);

        }
 }
 
        }
 }
 


@@ -1952,7 +1952,7 @@ function translateTimeUnit ($unit) {
 }
 
 // Displays given message in admin_settings_saved template
 }
 
 // Displays given message in admin_settings_saved template

-function displayMessage ($message, $return = false) {
+function displayMessage ($message, $return = FALSE) {

        // Load the template
        return loadTemplate('admin_settings_saved', $return, $message);
 }
        // Load the template
        return loadTemplate('admin_settings_saved', $return, $message);
 }


@@ -2045,19 +2045,19 @@ function addJavaScriptMenuContent ($menuMode, $mainAction, $action, $what) {
 //-----------------------------------------------------------------------------
 
 // Color-switch helper function
 //-----------------------------------------------------------------------------
 
 // Color-switch helper function

-function doTemplateColorSwitch ($templateName, $clear = false, $return = true) {
+function doTemplateColorSwitch ($templateName, $clear = FALSE, $return = TRUE) {

        // Is it there?
        if (!isset($GLOBALS['color_switch'][$templateName])) {
                // Initialize it
                initTemplateColorSwitch($templateName);
        // Is it there?
        if (!isset($GLOBALS['color_switch'][$templateName])) {
                // Initialize it
                initTemplateColorSwitch($templateName);

-       } elseif ($clear === false) {
+       } elseif ($clear === FALSE) {

                // Switch color if called from loadTemplate()
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SWITCH:' . $templateName);
                $GLOBALS['color_switch'][$templateName] = 3 - $GLOBALS['color_switch'][$templateName];
        }
 
        // Return CSS class name
                // Switch color if called from loadTemplate()
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SWITCH:' . $templateName);
                $GLOBALS['color_switch'][$templateName] = 3 - $GLOBALS['color_switch'][$templateName];
        }
 
        // Return CSS class name

-       if ($return === true) {
+       if ($return === TRUE) {

                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'RETURN:' . $templateName . '=' . $GLOBALS['color_switch'][$templateName]);
                return 'switch_sw' . $GLOBALS['color_switch'][$templateName];
        } // END - if
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'RETURN:' . $templateName . '=' . $GLOBALS['color_switch'][$templateName]);
                return 'switch_sw' . $GLOBALS['color_switch'][$templateName];
        } // END - if


@@ -2201,7 +2201,7 @@ function doTemplateGetTermsConditionsLink ($templateName, $clear) {
 }
 
 // Template helper function to create selection box for "locked points mode"
 }
 
 // Template helper function to create selection box for "locked points mode"

-function doTemplatePointsLockedModeSelectionBox ($templateName, $clear = false, $default = NULL) {
+function doTemplatePointsLockedModeSelectionBox ($templateName, $clear = FALSE, $default = NULL) {

        // Init array
        $lockedModes = array(
                0 => array('mode' => 'LOCKED'),
        // Init array
        $lockedModes = array(
                0 => array('mode' => 'LOCKED'),


@@ -2216,7 +2216,7 @@ function doTemplatePointsLockedModeSelectionBox ($templateName, $clear = false,
 }
 
 // Template helper function to create selection box for payment method
 }
 
 // Template helper function to create selection box for payment method

-function doTemplatePointsPaymentMethodSelectionBox ($templateName, $clear = false, $default = NULL) {
+function doTemplatePointsPaymentMethodSelectionBox ($templateName, $clear = FALSE, $default = NULL) {

        // Init array
        $paymentMethods = array(
                0 => array('method' => 'DIRECT'),
        // Init array
        $paymentMethods = array(
                0 => array('method' => 'DIRECT'),

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index fdae0479db245003a983c67b64ba19d45e376302..31e30cbefe98f21f223b82595b9e59b4244f8fe7 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -62,25 +62,25 @@ function readFromFile ($FQFN) {
 }
 
 // Writes content to a file
 }
 
 // Writes content to a file

-function writeToFile ($FQFN, $content, $aquireLock = false) {
+function writeToFile ($FQFN, $content, $aquireLock = FALSE) {

        // Is the file writeable?
        if ((isFileReadable($FQFN)) && (!is_writeable($FQFN)) && (!changeMode($FQFN, 0644))) {
                // Not writeable!
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("File %s not writeable.", basename($FQFN)));
 
                // Failed! :(
        // Is the file writeable?
        if ((isFileReadable($FQFN)) && (!is_writeable($FQFN)) && (!changeMode($FQFN, 0644))) {
                // Not writeable!
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("File %s not writeable.", basename($FQFN)));
 
                // Failed! :(

-               return false;
+               return FALSE;

        } // END - if
 
        // By default all is failed...
        } // END - if
 
        // By default all is failed...

-       $GLOBALS['file_readable'][$FQFN] = false;
+       $GLOBALS['file_readable'][$FQFN] = FALSE;

        unset($GLOBALS['file_content'][$FQFN]);
        unset($GLOBALS['file_content'][$FQFN]);

-       $return = false;
+       $return = FALSE;

 
        // Is the function there?
        if (function_exists('file_put_contents')) {
                // With lock?
 
        // Is the function there?
        if (function_exists('file_put_contents')) {
                // With lock?

-               if ($aquireLock === true) {
+               if ($aquireLock === TRUE) {

                        // Write it directly with lock
                        $return = file_put_contents($FQFN, $content, LOCK_EX);
                } else {
                        // Write it directly with lock
                        $return = file_put_contents($FQFN, $content, LOCK_EX);
                } else {


@@ -92,7 +92,7 @@ function writeToFile ($FQFN, $content, $aquireLock = false) {
                $fp = fopen($FQFN, 'w') or reportBug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($FQFN) . '!');
 
                // Aquire a lock?
                $fp = fopen($FQFN, 'w') or reportBug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($FQFN) . '!');
 
                // Aquire a lock?

-               if ($aquireLock === true) {
+               if ($aquireLock === TRUE) {

                        // Aquire a lock.
                        flock($fp, LOCK_EX);
                } // END - if
                        // Aquire a lock.
                        flock($fp, LOCK_EX);
                } // END - if


@@ -105,16 +105,16 @@ function writeToFile ($FQFN, $content, $aquireLock = false) {
        }
 
        // Was something written?
        }
 
        // Was something written?

-       if ($return !== false) {
+       if ($return !== FALSE) {

                // Mark it as readable
                // Mark it as readable

-               $GLOBALS['file_readable'][$FQFN] = true;
+               $GLOBALS['file_readable'][$FQFN] = TRUE;

 
                // Remember content in cache
                $GLOBALS['file_content'][$FQFN] = $content;
        } // END - if
 
        // Return status
 
                // Remember content in cache
                $GLOBALS['file_content'][$FQFN] = $content;
        } // END - if
 
        // Return status

-       return (($return !== false) && (changeMode($FQFN, 0644)));
+       return (($return !== FALSE) && (changeMode($FQFN, 0644)));

 }
 
 // Clears the output buffer. This function does *NOT* backup sent content.
 }
 
 // Clears the output buffer. This function does *NOT* backup sent content.


@@ -132,7 +132,7 @@ function clearOutputBuffer () {
        } // END - if
 
        // Mark this function as called
        } // END - if
 
        // Mark this function as called

-       $GLOBALS[__FUNCTION__] = true;
+       $GLOBALS[__FUNCTION__] = TRUE;

 }
 
 // Encode strings
 }
 
 // Encode strings


@@ -219,7 +219,7 @@ function detectRealIpAddress () {
 // "Getter" for remote IP number
 function detectRemoteAddr () {
        // Get remote ip from environment
 // "Getter" for remote IP number
 function detectRemoteAddr () {
        // Get remote ip from environment

-       $remoteAddr = determineRealRemoteAddress(true);
+       $remoteAddr = determineRealRemoteAddress(TRUE);

 
        // Is removeip installed?
        if (isExtensionActive('removeip')) {
 
        // Is removeip installed?
        if (isExtensionActive('removeip')) {


@@ -247,12 +247,12 @@ function detectRemoteHostname () {
 }
 
 // "Getter" for user agent
 }
 
 // "Getter" for user agent

-function detectUserAgent ($alwaysReal = false) {
+function detectUserAgent ($alwaysReal = FALSE) {

        // Get remote ip from environment
        $userAgent = getenv('HTTP_USER_AGENT');
 
        // Is removeip installed?
        // Get remote ip from environment
        $userAgent = getenv('HTTP_USER_AGENT');
 
        // Is removeip installed?

-       if ((isExtensionActive('removeip')) && ($alwaysReal === false)) {
+       if ((isExtensionActive('removeip')) && ($alwaysReal === FALSE)) {

                // Then anonymize it
                $userAgent = getAnonymousUserAgent($userAgent);
        } // END - if
                // Then anonymize it
                $userAgent = getAnonymousUserAgent($userAgent);
        } // END - if


@@ -380,13 +380,13 @@ function isAdminRegistered () {
 // Checks whether the hourly reset mode is active
 function isHourlyResetEnabled () {
        // Now simply check it
 // Checks whether the hourly reset mode is active
 function isHourlyResetEnabled () {
        // Now simply check it

-       return ((isset($GLOBALS['hourly_enabled'])) && ($GLOBALS['hourly_enabled'] === true));
+       return ((isset($GLOBALS['hourly_enabled'])) && ($GLOBALS['hourly_enabled'] === TRUE));

 }
 
 // Checks whether the reset mode is active
 function isResetModeEnabled () {
        // Now simply check it
 }
 
 // Checks whether the reset mode is active
 function isResetModeEnabled () {
        // Now simply check it

-       return ((isset($GLOBALS['reset_enabled'])) && ($GLOBALS['reset_enabled'] === true));
+       return ((isset($GLOBALS['reset_enabled'])) && ($GLOBALS['reset_enabled'] === TRUE));

 }
 
 // Checks whether the debug mode is enabled
 }
 
 // Checks whether the debug mode is enabled


@@ -454,7 +454,7 @@ function isCacheInstanceValid () {
 // even if there is no xdebug extension installed.
 function copyFileVerified ($source, $dest, $chmod = '') {
        // Failed is the default
 // even if there is no xdebug extension installed.
 function copyFileVerified ($source, $dest, $chmod = '') {
        // Failed is the default

-       $status = false;
+       $status = FALSE;

 
        // Is the source file there?
        if (!isFileReadable($source)) {
 
        // Is the source file there?
        if (!isFileReadable($source)) {


@@ -474,11 +474,11 @@ function copyFileVerified ($source, $dest, $chmod = '') {
                reportBug(__FUNCTION__, __LINE__, 'copy() has failed to copy the file.');
        } else {
                // Reset cache
                reportBug(__FUNCTION__, __LINE__, 'copy() has failed to copy the file.');
        } else {
                // Reset cache

-               $GLOBALS['file_readable'][$dest] = true;
+               $GLOBALS['file_readable'][$dest] = TRUE;

        }
 
        // All fine by default
        }
 
        // All fine by default

-       $status = true;
+       $status = TRUE;

 
        // If there are chmod rights set, apply them
        if (!empty($chmod)) {
 
        // If there are chmod rights set, apply them
        if (!empty($chmod)) {


@@ -508,7 +508,7 @@ function removeFile ($FQFN) {
        // Is the file there?
        if (isFileReadable($FQFN)) {
                // Reset cache first
        // Is the file there?
        if (isFileReadable($FQFN)) {
                // Reset cache first

-               $GLOBALS['file_readable'][$FQFN] = false;
+               $GLOBALS['file_readable'][$FQFN] = FALSE;

 
                // Yes, so remove it
                return unlink($FQFN);
 
                // Yes, so remove it
                return unlink($FQFN);


@@ -516,7 +516,7 @@ function removeFile ($FQFN) {
 
        // All fine if no file was removed. If we change this to 'false' or rewrite
        // above if() block it would be to restrictive.
 
        // All fine if no file was removed. If we change this to 'false' or rewrite
        // above if() block it would be to restrictive.

-       return true;
+       return TRUE;

 }
 
 // Wrapper for $_POST['sel']
 }
 
 // Wrapper for $_POST['sel']


@@ -539,7 +539,7 @@ function countPostSelection ($element = 'sel') {
 
 // Checks whether the config-local.php is loaded
 function isConfigLocalLoaded () {
 
 // Checks whether the config-local.php is loaded
 function isConfigLocalLoaded () {

-       return ((isset($GLOBALS['config_local_loaded'])) && ($GLOBALS['config_local_loaded'] === true));
+       return ((isset($GLOBALS['config_local_loaded'])) && ($GLOBALS['config_local_loaded'] === TRUE));

 }
 
 // Checks whether a nickname or userid was entered and caches the result
 }
 
 // Checks whether a nickname or userid was entered and caches the result


@@ -547,7 +547,7 @@ function isNicknameUsed ($userid) {
        // Is the cache there
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it
        // Is the cache there
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it

-               $GLOBALS[__FUNCTION__][$userid] = ((!empty($userid)) && (('' . bigintval($userid, true, false) . '') != $userid) && ($userid != 'NULL'));
+               $GLOBALS[__FUNCTION__][$userid] = ((!empty($userid)) && (('' . bigintval($userid, TRUE, FALSE) . '') != $userid) && ($userid != 'NULL'));

        } // END - if
 
        // Return the result
        } // END - if
 
        // Return the result


@@ -555,7 +555,7 @@ function isNicknameUsed ($userid) {
 }
 
 // Getter for 'what' value
 }
 
 // Getter for 'what' value

-function getWhat ($strict = true) {
+function getWhat ($strict = TRUE) {

        // Default is null
        $what = NULL;
 
        // Default is null
        $what = NULL;
 


@@ -590,7 +590,7 @@ function isWhatSet ($strict =  false) {
        $isset = (isset($GLOBALS['__what']) && (!empty($GLOBALS['__what'])));
 
        // Should we abort here?
        $isset = (isset($GLOBALS['__what']) && (!empty($GLOBALS['__what'])));
 
        // Should we abort here?

-       if (($strict === true) && ($isset === false)) {
+       if (($strict === TRUE) && ($isset === FALSE)) {

                // Output backtrace
                debug_report_bug(__FUNCTION__, __LINE__, 'what is empty.');
        } // END - if
                // Output backtrace
                debug_report_bug(__FUNCTION__, __LINE__, 'what is empty.');
        } // END - if


@@ -600,7 +600,7 @@ function isWhatSet ($strict =  false) {
 }
 
 // Getter for 'action' value
 }
 
 // Getter for 'action' value

-function getAction ($strict = true) {
+function getAction ($strict = TRUE) {

        // Default is null
        $action = NULL;
 
        // Default is null
        $action = NULL;
 


@@ -625,7 +625,7 @@ function isActionSet ($strict =  false) {
        $isset = ((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action'])));
 
        // Should we abort here?
        $isset = ((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action'])));
 
        // Should we abort here?

-       if (($strict === true) && ($isset === false)) {
+       if (($strict === TRUE) && ($isset === FALSE)) {

                // Output backtrace
                reportBug(__FUNCTION__, __LINE__, 'action is empty.');
        } // END - if
                // Output backtrace
                reportBug(__FUNCTION__, __LINE__, 'action is empty.');
        } // END - if


@@ -635,7 +635,7 @@ function isActionSet ($strict =  false) {
 }
 
 // Getter for 'module' value
 }
 
 // Getter for 'module' value

-function getModule ($strict = true) {
+function getModule ($strict = TRUE) {

        // Default is null
        $module = NULL;
 
        // Default is null
        $module = NULL;
 


@@ -661,13 +661,13 @@ function isModuleSet ($strict =  false) {
        $isset = ((isset($GLOBALS['__module'])) && (!empty($GLOBALS['__module'])));
 
        // Should we abort here?
        $isset = ((isset($GLOBALS['__module'])) && (!empty($GLOBALS['__module'])));
 
        // Should we abort here?

-       if (($strict === true) && ($isset === false)) {
+       if (($strict === TRUE) && ($isset === FALSE)) {

                // Output backtrace
                reportBug(__FUNCTION__, __LINE__, 'Module is empty.');
        } // END - if
 
        // Return it
                // Output backtrace
                reportBug(__FUNCTION__, __LINE__, 'Module is empty.');
        } // END - if
 
        // Return it

-       return (($isset === true) && ($GLOBALS['__module'] != 'unknown')) ;
+       return (($isset === TRUE) && ($GLOBALS['__module'] != 'unknown')) ;

 }
 
 // Getter for 'output_mode' value
 }
 
 // Getter for 'output_mode' value


@@ -700,7 +700,7 @@ function isOutputModeSet ($strict =  false) {
        $isset = (isset($GLOBALS['__output_mode']));
 
        // Should we abort here?
        $isset = (isset($GLOBALS['__output_mode']));
 
        // Should we abort here?

-       if (($strict === true) && ($isset === false)) {
+       if (($strict === TRUE) && ($isset === FALSE)) {

                // Output backtrace
                reportBug(__FUNCTION__, __LINE__, 'Output mode is not set.');
        } // END - if
                // Output backtrace
                reportBug(__FUNCTION__, __LINE__, 'Output mode is not set.');
        } // END - if


@@ -710,7 +710,7 @@ function isOutputModeSet ($strict =  false) {
 }
 
 // Enables block-mode
 }
 
 // Enables block-mode

-function enableBlockMode ($enabled = true) {
+function enableBlockMode ($enabled = TRUE) {

        $GLOBALS['__block_mode'] = $enabled;
 }
 
        $GLOBALS['__block_mode'] = $enabled;
 }
 


@@ -982,7 +982,7 @@ function isUserDataValid () {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isCurrentUserIdSet()=false - ABORTING!');
 
                // Abort here
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isCurrentUserIdSet()=false - ABORTING!');
 
                // Abort here

-               return false;
+               return FALSE;

        } // END - if
 
        // Is it cached?
        } // END - if
 
        // Is it cached?


@@ -1097,8 +1097,8 @@ function getFetchedUserData ($keyColumn, $userid, $valueColumn) {
 
 // Wrapper for strpos() to ease porting from deprecated ereg() function
 function isInString ($needle, $haystack) {
 
 // Wrapper for strpos() to ease porting from deprecated ereg() function
 function isInString ($needle, $haystack) {

-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'needle=' . $needle . ', haystack=' . $haystack . ', returned=' . intval(strpos($haystack, $needle) !== false));
-       return (strpos($haystack, $needle) !== false);
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'needle=' . $needle . ', haystack=' . $haystack . ', returned=' . intval(strpos($haystack, $needle) !== FALSE));
+       return (strpos($haystack, $needle) !== FALSE);

 }
 
 // Wrapper for strpos() to ease porting from deprecated eregi() function
 }
 
 // Wrapper for strpos() to ease porting from deprecated eregi() function


@@ -1215,7 +1215,7 @@ function getTotalConfirmedUser () {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionActive('user')) {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionActive('user')) {

-                       $GLOBALS[__FUNCTION__] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, runFilterChain('user_exclusion_sql', ' '));
+                       $GLOBALS[__FUNCTION__] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', TRUE, runFilterChain('user_exclusion_sql', ' '));

                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }
                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }


@@ -1231,7 +1231,7 @@ function getTotalUnconfirmedUser () {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionActive('user')) {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionActive('user')) {

-                       $GLOBALS[__FUNCTION__] = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true, runFilterChain('user_exclusion_sql', ' '));
+                       $GLOBALS[__FUNCTION__] = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', TRUE, runFilterChain('user_exclusion_sql', ' '));

                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }
                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }


@@ -1247,7 +1247,7 @@ function getTotalLockedUser () {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionActive('user')) {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionActive('user')) {

-                       $GLOBALS[__FUNCTION__] = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true, runFilterChain('user_exclusion_sql', ' '));
+                       $GLOBALS[__FUNCTION__] = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', TRUE, runFilterChain('user_exclusion_sql', ' '));

                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }
                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }


@@ -1263,7 +1263,7 @@ function getTotalRandomRefidUser () {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionInstalledAndNewer('user', '0.3.4')) {
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
                if (isExtensionInstalledAndNewer('user', '0.3.4')) {

-                       $GLOBALS[__FUNCTION__] = countSumTotalData('{?user_min_confirmed?}', 'user_data', 'userid', 'rand_confirmed', true, runFilterChain('user_exclusion_sql', ' '), '>=');
+                       $GLOBALS[__FUNCTION__] = countSumTotalData('{?user_min_confirmed?}', 'user_data', 'userid', 'rand_confirmed', TRUE, runFilterChain('user_exclusion_sql', ' '), '>=');

                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }
                } else {
                        $GLOBALS[__FUNCTION__] = 0;
                }


@@ -1292,7 +1292,7 @@ function isValidUserId ($userid) {
 // Encodes entities
 function encodeEntities ($str) {
        // Secure it first
 // Encodes entities
 function encodeEntities ($str) {
        // Secure it first

-       $str = secureString($str, true, true);
+       $str = secureString($str, TRUE, TRUE);

 
        // Encode dollar sign as well
        $str = str_replace('$', '$', $str);
 
        // Encode dollar sign as well
        $str = str_replace('$', '$', $str);


@@ -2899,7 +2899,7 @@ function generateYesNoOptions ($defaultValue = '') {
 // "Getter" for total available receivers
 function getTotalReceivers ($mode = 'normal') {
        // Get num rows
 // "Getter" for total available receivers
 function getTotalReceivers ($mode = 'normal') {
        // Get num rows

-       $numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, runFilterChain('user_exclusion_sql', ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode)));
+       $numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', TRUE, runFilterChain('user_exclusion_sql', ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode)));

 
        // Return value
        return $numRows;
 
        // Return value
        return $numRows;


@@ -2910,7 +2910,7 @@ function getTotalUnconfirmedMails ($userid) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it

-               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_links', 'id', 'userid', true);
+               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_links', 'id', 'userid', TRUE);

        } // END - if
 
        // Return cache
        } // END - if
 
        // Return cache


@@ -3017,7 +3017,7 @@ function isFullPage () {
 // Checks whether frameset_mode is set to true
 function isFramesetModeEnabled () {
        // Check it
 // Checks whether frameset_mode is set to true
 function isFramesetModeEnabled () {
        // Check it

-       return ((isset($GLOBALS['frameset_mode'])) && ($GLOBALS['frameset_mode'] === true));
+       return ((isset($GLOBALS['frameset_mode'])) && ($GLOBALS['frameset_mode'] === TRUE));

 }
 
 // Function to determine correct 'what' value
 }
 
 // Function to determine correct 'what' value


@@ -3067,7 +3067,7 @@ function prependZeros ($mStretch, $length = 2) {
 function convertSelectionsToEpocheTimeInPostData ($id) {
        // Init variables
        $content = array();
 function convertSelectionsToEpocheTimeInPostData ($id) {
        // Init variables
        $content = array();

-       $skip = false;
+       $skip = FALSE;

 
        // Get all POST data
        $postData = postRequestArray();
 
        // Get all POST data
        $postData = postRequestArray();


@@ -3082,7 +3082,7 @@ function convertSelectionsToEpocheTimeInPostData ($id) {
 // Wraps checking if given points account type matches with given in POST data
 function ifPointsAccountTypeMatchesPost ($type) {
        // Check condition
 // Wraps checking if given points account type matches with given in POST data
 function ifPointsAccountTypeMatchesPost ($type) {
        // Check condition

-       exit(__FUNCTION__.':type='.$type.',post=<pre>'.print_r(postRequestArray(), true).'</pre>');
+       exit(__FUNCTION__.':type='.$type.',post=<pre>'.print_r(postRequestArray(), TRUE).'</pre>');

 }
 
 // Gets given user's total referral
 }
 
 // Gets given user's total referral


@@ -3092,10 +3092,10 @@ function getUsersTotalReferrals ($userid, $level = NULL) {
                // Is the level NULL?
                if (is_null($level)) {
                        // Get total amount (all levels)
                // Is the level NULL?
                if (is_null($level)) {
                        // Get total amount (all levels)

-                       $GLOBALS[__FUNCTION__][$userid][$level] = countSumTotalData($userid, 'user_refs', 'refid', 'userid', true);
+                       $GLOBALS[__FUNCTION__][$userid][$level] = countSumTotalData($userid, 'user_refs', 'refid', 'userid', TRUE);

                } else {
                        // Get it from user refs
                } else {
                        // Get it from user refs

-                       $GLOBALS[__FUNCTION__][$userid][$level] = countSumTotalData($userid, 'user_refs', 'refid', 'userid', true, ' AND `level`=' . bigintval($level));
+                       $GLOBALS[__FUNCTION__][$userid][$level] = countSumTotalData($userid, 'user_refs', 'refid', 'userid', TRUE, ' AND `level`=' . bigintval($level));

                }
        } // END - if
 
                }
        } // END - if
 

diff --git a/inc/xml-functions.php b/inc/xml-functions.php
index d0963f4b22f203ee895d4e64a026edd4ebf95b90..6c5e5812a4d7bdb88129ceac0a947fba4d69add8 100644 (file)
--- a/inc/xml-functions.php
+++ b/inc/xml-functions.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Calls back a function based on given XML template data
 } // END - if
 
 // Calls back a function based on given XML template data

-function showEntriesByXmlCallback ($template, $content = array(), $compileCode = true) {
+function showEntriesByXmlCallback ($template, $content = array(), $compileCode = TRUE) {

        // Generate FQFN for with special path
        $FQFN = sprintf("%stemplates/xml/%s%s.xml",
                getPath(),
        // Generate FQFN for with special path
        $FQFN = sprintf("%stemplates/xml/%s%s.xml",
                getPath(),


@@ -69,7 +69,7 @@ function showEntriesByXmlCallback ($template, $content = array(), $compileCode =
                        $templateContent = readFromFile($FQFN);
 
                        // Prepare it for finaly eval() command
                        $templateContent = readFromFile($FQFN);
 
                        // Prepare it for finaly eval() command

-                       $GLOBALS['template_eval']['xml'][$template] = '$templateContent = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($templateContent), false, true, true, $compileCode) . '");';
+                       $GLOBALS['template_eval']['xml'][$template] = '$templateContent = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($templateContent), FALSE, TRUE, TRUE, $compileCode) . '");';

 
                        // Eval the code, this does insert any array elements from $content
                        eval($GLOBALS['template_eval']['xml'][$template]);
 
                        // Eval the code, this does insert any array elements from $content
                        eval($GLOBALS['template_eval']['xml'][$template]);


@@ -127,7 +127,7 @@ function parseXmlData ($content) {
        $xmlParser = xml_parser_create();
 
        // Force case-folding to on
        $xmlParser = xml_parser_create();
 
        // Force case-folding to on

-       xml_parser_set_option($xmlParser, XML_OPTION_CASE_FOLDING, true);
+       xml_parser_set_option($xmlParser, XML_OPTION_CASE_FOLDING, TRUE);

 
        // Set UTF-8
        xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
 
        // Set UTF-8
        xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'UTF-8');


@@ -311,7 +311,7 @@ function getSqlPartFromXmlArray ($columns) {
 // Searches in given XML array for value and returns the parent index
 function searchXmlArray ($value, $columns, $childKey) {
        // Default is not found
 // Searches in given XML array for value and returns the parent index
 function searchXmlArray ($value, $columns, $childKey) {
        // Default is not found

-       $return = false;
+       $return = FALSE;

 
        // Walk through whole array
        foreach ($columns as $key => $columnArray) {
 
        // Walk through whole array
        foreach ($columns as $key => $columnArray) {

diff --git a/index.php b/index.php
index a07f405aa42d578f40957f51a322205afa290ffb..f0683ecff1c5a97b3276f847a8954d9130821d8c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -43,7 +43,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module/what and output mode
 $GLOBALS['__module']      = 'index';
 
 // Set module/what and output mode
 $GLOBALS['__module']      = 'index';


@@ -93,7 +93,7 @@ if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
                $content['module'] = 'index';
 
                // Load template
                $content['module'] = 'index';
 
                // Load template

-               loadTemplate('index_forward', false, $content);
+               loadTemplate('index_forward', FALSE, $content);

        } // END - if
 
        // Footer (which will call doShutdown() for us)
        } // END - if
 
        // Footer (which will call doShutdown() for us)

diff --git a/install.php b/install.php
index a347a260b912cc2bb13ae6b35df1f58ed6d21317..1e305c17df2dcb2350812d04e244b70954b8d26d 100644 (file)
--- a/install.php
+++ b/install.php
@@ -42,10 +42,10 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Tell every module / require file we are installing
 
 // Tell every module / require file we are installing

-$GLOBALS['__mailer_installing'] = true;
+$GLOBALS['__mailer_installing'] = TRUE;

 
 // Set module and output mode
 $GLOBALS['__module']      = 'install';
 
 // Set module and output mode
 $GLOBALS['__module']      = 'install';


@@ -96,7 +96,7 @@ if (isGetRequestElementSet('installer')) {
        );
 
        // Load main installation table
        );
 
        // Load main installation table

-       loadTemplate('install_main_ajax', false, $content);
+       loadTemplate('install_main_ajax', FALSE, $content);

 } elseif (isPlainInstaller()) {
        // Plain installer:
        // Load include file
 } elseif (isPlainInstaller()) {
        // Plain installer:
        // Load include file

diff --git a/js.php b/js.php
index c2b5a879dfad50590b0504e4c453a1e75985c14f..6191d896ba9642ed37bc7dd0caa943cafd7d3f45 100644 (file)
--- a/js.php
+++ b/js.php
@@ -42,7 +42,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // This is a fake-CSS file loader, more a JavaScript loader...
 // This is in one way good and in one not. The whole reset part will be
 
 // This is a fake-CSS file loader, more a JavaScript loader...
 // This is in one way good and in one not. The whole reset part will be

diff --git a/lead-confirm.php b/lead-confirm.php
index b49519a6afb852589c9c4e7c013410bba5b6aaee..d8a63309c1921b07ccc9aea8651319621908000d 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module and output mode
 $GLOBALS['__module']      = 'lead-confirm';
 
 // Set module and output mode
 $GLOBALS['__module']      = 'lead-confirm';


@@ -73,7 +73,7 @@ if ((isSessionVariableSet('lead_userid')) && (fetchUserData(getSession('lead_use
 } // END - if
 
 // Load the lead template
 } // END - if
 
 // Load the lead template

-loadTemplate('lead_code', false, $content);
+loadTemplate('lead_code', FALSE, $content);

 
 // Footer
 loadIncludeOnce('inc/footer.php');
 
 // Footer
 loadIncludeOnce('inc/footer.php');

diff --git a/login.php b/login.php
index b1020c7a999be684f2b91f82751463acc4c5828a..c3a174c6a70df245970e8557bac154f0b7065d40 100644 (file)
--- a/login.php
+++ b/login.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module / output mode
 $GLOBALS['__module']      = 'login';
 
 // Set module / output mode
 $GLOBALS['__module']      = 'login';

diff --git a/mailid.php b/mailid.php
index fcf1e3beac9f0375ece5a96a985ade1fe4df60e3..a90ea06eff7f577c4ebde4f469f455d6d32f63f1 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Tell everyone we are in this module
 $GLOBALS['__module']      = 'mailid';
 
 // Tell everyone we are in this module
 $GLOBALS['__module']      = 'mailid';


@@ -47,7 +47,7 @@ $GLOBALS['__output_mode'] = '0';
 $errorCode = '';
 
 // This is a frameset module
 $errorCode = '';
 
 // This is a frameset module

-$GLOBALS['frameset_mode'] = true;
+$GLOBALS['frameset_mode'] = TRUE;

 
 // Disable copyright footer which would break the frameset
 $GLOBALS['__copyright_enabled'] = 'N';
 
 // Disable copyright footer which would break the frameset
 $GLOBALS['__copyright_enabled'] = 'N';


@@ -75,7 +75,7 @@ if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('b
 // 01           1        12            2    2            21    1                      2210
 if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
        // Init result
 // 01           1        12            2    2            21    1                      2210
 if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
        // Init result

-       $result_link = false;
+       $result_link = FALSE;

 
        // Maybe he wants to confirm an email?
        if ($mailId > 0) {
 
        // Maybe he wants to confirm an email?
        if ($mailId > 0) {


@@ -151,7 +151,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                list($pay) = SQL_FETCHROW($result);
                                                                $time      = getPaymentData($pay, 'time');
                                                                $payment   = getPaymentData($pay, 'payment');
                                                                list($pay) = SQL_FETCHROW($result);
                                                                $time      = getPaymentData($pay, 'time');
                                                                $payment   = getPaymentData($pay, 'payment');

-                                                               $isValid   = true;
+                                                               $isValid   = TRUE;

                                                        } // END - if
 
                                                        // Free memory
                                                        } // END - if
 
                                                        // Free memory


@@ -164,7 +164,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        if (SQL_NUMROWS($result) == 1) {
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = '0.00000';
                                                        if (SQL_NUMROWS($result) == 1) {
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = '0.00000';

-                                                               $isValid = true;
+                                                               $isValid = TRUE;

                                                        } // END - if
 
                                                        // Free memory
                                                        } // END - if
 
                                                        // Free memory


@@ -180,7 +180,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                        loadIncludeOnce('inc/header.php');
 
                                        // Was that mail a valid one?
                                        loadIncludeOnce('inc/header.php');
 
                                        // Was that mail a valid one?

-                                       if ($isValid === true) {
+                                       if ($isValid === TRUE) {

                                                // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
                                                if (($time == '0') && ($payment > 0)) { 
                                                        $url = getUrl();
                                                // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
                                                if (($time == '0') && ($payment > 0)) { 
                                                        $url = getUrl();


@@ -200,7 +200,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        );
 
                                                        // Load template
                                                        );
 
                                                        // Load template

-                                                       loadTemplate('mailid_frames', false, $content);
+                                                       loadTemplate('mailid_frames', FALSE, $content);

                                                } else {
                                                        $errorCode = getCode('DATA_INVALID');
                                                }
                                                } else {
                                                        $errorCode = getCode('DATA_INVALID');
                                                }

diff --git a/mailid_top.php b/mailid_top.php
index 15228331df02b4f469b3900d37795f52a504c0f0..98fe721023078bf93a4ab3b21c00cf36b313b288 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -41,7 +41,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Tell everyone we are in this module
 $GLOBALS['__module']      = 'mailid';
 
 // Tell everyone we are in this module
 $GLOBALS['__module']      = 'mailid';


@@ -107,7 +107,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                $data = SQL_FETCHARRAY($result_main);
 
                // Init result here with invalid to avoid possible missing variable
                $data = SQL_FETCHARRAY($result_main);
 
                // Init result here with invalid to avoid possible missing variable

-               $result_mailid = false;
+               $result_mailid = FALSE;

 
                // @TODO Rewrite this to a filter/function
                switch ($data['link_type']) {
 
                // @TODO Rewrite this to a filter/function
                switch ($data['link_type']) {


@@ -142,7 +142,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                        } // END - if
 
                        // Is the user id valid?
                        } // END - if
 
                        // Is the user id valid?

-                       if (fetchUserData($userId) === true) {
+                       if (fetchUserData($userId) === TRUE) {

                                // Is the user status CONFIRMED?
                                if (getUserData('status') == 'CONFIRMED') {
                                        // User has confirmed his account so we can procede...
                                // Is the user status CONFIRMED?
                                if (getUserData('status') == 'CONFIRMED') {
                                        // User has confirmed his account so we can procede...


@@ -157,7 +157,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                list($pay) = SQL_FETCHROW($result);
                                                                $time      = getPaymentData($pay, 'time');
                                                                $payment   = getPaymentData($pay, 'payment');
                                                                list($pay) = SQL_FETCHROW($result);
                                                                $time      = getPaymentData($pay, 'time');
                                                                $payment   = getPaymentData($pay, 'payment');

-                                                               $isValid   = true;
+                                                               $isValid   = TRUE;

                                                        } // END - if
 
                                                        // Free memory...
                                                        } // END - if
 
                                                        // Free memory...


@@ -171,7 +171,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        // Entry found?
                                                        if (SQL_NUMROWS($result) == 1) {
                                                                list($time, $payment) = SQL_FETCHROW($result);
                                                        // Entry found?
                                                        if (SQL_NUMROWS($result) == 1) {
                                                                list($time, $payment) = SQL_FETCHROW($result);

-                                                               $isValid = true;
+                                                               $isValid = TRUE;

                                                        } // END - if
 
                                                        // Free memory...
                                                        } // END - if
 
                                                        // Free memory...


@@ -184,7 +184,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                        } // END - switch
 
                                        // Is this entry valid?
                                        } // END - switch
 
                                        // Is this entry valid?

-                                       if ($isValid === true) {
+                                       if ($isValid === TRUE) {

                                                if (($time == '0') && ($payment > 0)) $time = 1;
                                                if (($time > 0) && ($payment > 0)) {
                                                        $realCode = '0';
                                                if (($time == '0') && ($payment > 0)) $time = 1;
                                                if (($time > 0) && ($payment > 0)) {
                                                        $realCode = '0';


@@ -232,7 +232,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        } // END - switch
 
                                                                        // Export data into constants for the template
                                                                        } // END - switch
 
                                                                        // Export data into constants for the template

-                                                                       $content['banner'] = loadTemplate('mailid_banner', true);
+                                                                       $content['banner'] = loadTemplate('mailid_banner', TRUE);

 
                                                                        // Only when user extension = v0.1.2: Update mails-confirmed counter
                                                                        // @TODO Rewrite these blocks to filter
 
                                                                        // Only when user extension = v0.1.2: Update mails-confirmed counter
                                                                        // @TODO Rewrite these blocks to filter


@@ -306,7 +306,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                $content['points'] = $payment;
 
                                                                                // Load template
                                                                                $content['points'] = $payment;
 
                                                                                // Load template

-                                                                               loadTemplate($template, false, $content);
+                                                                               loadTemplate($template, FALSE, $content);

                                                                        } elseif (isValidUserId($data['sender'])) {
                                                                                // Wrong image code! So add points to sender's account
                                                                                initReferralSystem();
                                                                        } elseif (isValidUserId($data['sender'])) {
                                                                                // Wrong image code! So add points to sender's account
                                                                                initReferralSystem();


@@ -316,13 +316,13 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                $content['points'] = $payment;
 
                                                                                // Load template
                                                                                $content['points'] = $payment;
 
                                                                                // Load template

-                                                                               loadTemplate('mailid_points_failed', false, $content);
+                                                                               loadTemplate('mailid_points_failed', FALSE, $content);

                                                                        } else {
                                                                                // Add payment points (again)
                                                                                $content['points'] = $payment;
 
                                                                                // Load template
                                                                        } else {
                                                                                // Add payment points (again)
                                                                                $content['points'] = $payment;
 
                                                                                // Load template

-                                                                               loadTemplate('mailid_points_failed2', false, $content);
+                                                                               loadTemplate('mailid_points_failed2', FALSE, $content);

                                                                        }
 
                                                                        // Remove link from table
                                                                        }
 
                                                                        // Remove link from table


@@ -341,7 +341,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                $content['userid'] = $userId;
                                                                                $content['type']   = $type;
                                                                                $content['data']   = $urlId;
                                                                                $content['userid'] = $userId;
                                                                                $content['type']   = $type;
                                                                                $content['data']   = $urlId;

-                                                                               $content['banner'] = loadTemplate('mailid_banner', true);
+                                                                               $content['banner'] = loadTemplate('mailid_banner', TRUE);

                                                                                if (getCodeLength() > 0) {
                                                                                        // Generate Code
                                                                                        $content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);
                                                                                if (getCodeLength() > 0) {
                                                                                        // Generate Code
                                                                                        $content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);


@@ -353,7 +353,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                }
 
                                                                                // Load template
                                                                                }
 
                                                                                // Load template

-                                                                               loadTemplate($templ, false, $content);
+                                                                               loadTemplate($templ, FALSE, $content);

                                                                        } else {
                                                                                // Cannot confirm!
                                                                                reportBug(__FILE__, __LINE__, 'No code given.');
                                                                        } else {
                                                                                // Cannot confirm!
                                                                                reportBug(__FILE__, __LINE__, 'No code given.');


@@ -369,10 +369,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        $content['type']   = $type;
                                                                        $content['data']   = $urlId;
                                                                        $content['rand']   = getRandomTan();
                                                                        $content['type']   = $type;
                                                                        $content['data']   = $urlId;
                                                                        $content['rand']   = getRandomTan();

-                                                                       $content['banner'] = loadTemplate('mailid_banner', true);
+                                                                       $content['banner'] = loadTemplate('mailid_banner', TRUE);

 
                                                                        // Load template
 
                                                                        // Load template

-                                                                       loadTemplate('mailid_timer', false, $content);
+                                                                       loadTemplate('mailid_timer', FALSE, $content);

                                                                        break;
 
                                                                default: // Unknown mode
                                                                        break;
 
                                                                default: // Unknown mode


@@ -380,30 +380,30 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        break;
                                                        } // END - switch
                                                } else {
                                                                        break;
                                                        } // END - switch
                                                } else {

-                                                       loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (6)');
+                                                       loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (6)');

                                                        $do = 'failed';
                                                }
                                        } else {
                                                        $do = 'failed';
                                                }
                                        } else {

-                                               loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (5)');
+                                               loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (5)');

                                                $do = 'failed';
                                        }
                                } else {
                                                $do = 'failed';
                                        }
                                } else {

-                                       loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (4)');
+                                       loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (4)');

                                        $do = 'failed';
                                }
                        } else {
                                        $do = 'failed';
                                }
                        } else {

-                               loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (3)');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (3)');

                                $do = 'failed';
                        }
                } else {
                                $do = 'failed';
                        }
                } else {

-                       loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (2)');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (2)');

                        $do = 'failed';
                }
 
                // Free result
                SQL_FREERESULT($result_mailid);
        } else {
                        $do = 'failed';
                }
 
                // Free result
                SQL_FREERESULT($result_mailid);
        } else {

-               loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (1)');
+               loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (1)');

                $do = 'failed';
        }
 
                $do = 'failed';
        }
 

diff --git a/modules.php b/modules.php
index 280bd0f12481754250713633f677cbdde2ae94f8..4a717981da624a2fd62a8fed92e543202507fa86 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -42,7 +42,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Init output mode and module
 $GLOBALS['__module']      = 'unknown';
 
 // Init output mode and module
 $GLOBALS['__module']      = 'unknown';

diff --git a/network-vcheck.php b/network-vcheck.php
index 3bb6ff5734343251b2d2361cff391e97a7204aed..ad95e67711de7b093bd48d394d62bf61193a380c 100644 (file)
--- a/network-vcheck.php
+++ b/network-vcheck.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module and output mode (raw)
 $GLOBALS['__module']      = 'network-vcheck';
 
 // Set module and output mode (raw)
 $GLOBALS['__module']      = 'network-vcheck';

diff --git a/ref.php b/ref.php
index 7f0d0c7b2e83c9aa1c7e3445d9517d670673a84a..7e452673a5e555f1dba513a9d587ec184f53b77e 100644 (file)
--- a/ref.php
+++ b/ref.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module
 $GLOBALS['__module']      = 'ref';
 
 // Set module
 $GLOBALS['__module']      = 'ref';

diff --git a/show_bonus.php b/show_bonus.php
index ad3ba472f617365b79d6893505dad8089b2be213..d478f9a9aebfbd580c19af11a8c170eef1a30f8e 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set this because we have no module in URI
 $GLOBALS['__module']      = 'show_bonus';
 
 // Set this because we have no module in URI
 $GLOBALS['__module']      = 'show_bonus';


@@ -111,7 +111,7 @@ LIMIT 1",
                        $content = merge_array($content, $GLOBALS['ranking_content']);
 
                        // Load pre-template
                        $content = merge_array($content, $GLOBALS['ranking_content']);
 
                        // Load pre-template

-                       $content['message'] = loadTemplate('show_bonus_msg', true, $content);
+                       $content['message'] = loadTemplate('show_bonus_msg', TRUE, $content);

                } else {
                        // No data found
                        $content['message'] = '<span class="bad">{--BONUS_SHOW_NO_DATA--}</span>';
                } else {
                        // No data found
                        $content['message'] = '<span class="bad">{--BONUS_SHOW_NO_DATA--}</span>';


@@ -129,13 +129,13 @@ LIMIT 1",
 }
 
 // Load send_bonus header template (for your banners, e.g.?)
 }
 
 // Load send_bonus header template (for your banners, e.g.?)

-$content['header'] = loadTemplate('show_bonus_header', true);
+$content['header'] = loadTemplate('show_bonus_header', TRUE);

 
 // Load show_bonus footer template (for your banners, e.g.?)
 
 // Load show_bonus footer template (for your banners, e.g.?)

-$content['footer'] = loadTemplate('show_bonus_footer', true);
+$content['footer'] = loadTemplate('show_bonus_footer', TRUE);

 
 // Load final template
 
 // Load final template

-loadTemplate('show_bonus', false, $content);
+loadTemplate('show_bonus', FALSE, $content);

 
 // Include footer
 loadIncludeOnce('inc/footer.php');
 
 // Include footer
 loadIncludeOnce('inc/footer.php');

diff --git a/sponsor_confirm.php b/sponsor_confirm.php
index 2a0a6e6ee782b0d5c64c8b3efec49e03974f6276..c45f00f3f37e1d676cdef6efd0159b09b268bf32 100644 (file)
--- a/sponsor_confirm.php
+++ b/sponsor_confirm.php
@@ -38,7 +38,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module / output mode
 $GLOBALS['__module']      = 'sponsor_confirm';
 
 // Set module / output mode
 $GLOBALS['__module']      = 'sponsor_confirm';

diff --git a/sponsor_ref.php b/sponsor_ref.php
index 5acd78168d4cab40abef20a7ef5b8b1fd48f8c8e..20e5da48ef18f7bf60a367e5d03a9b5056286d46 100644 (file)
--- a/sponsor_ref.php
+++ b/sponsor_ref.php
@@ -38,7 +38,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module / output mode
 $GLOBALS['__module']      = 'sponsor_ref';
 
 // Set module / output mode
 $GLOBALS['__module']      = 'sponsor_ref';

diff --git a/surfbar.php b/surfbar.php
index 9fce26b80c2c3247ac7ddd3d13625f3f195cae91..cd6893f540b39400df74ce54f3ad7a11476eed68 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module output mode
 $GLOBALS['__module']      = 'surfbar';
 
 // Set module output mode
 $GLOBALS['__module']      = 'surfbar';


@@ -127,7 +127,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
                );
 
                // Load template for "stats" page
                );
 
                // Load template for "stats" page

-               loadTemplate('surfbar_frame_stats', false, $content);
+               loadTemplate('surfbar_frame_stats', FALSE, $content);

        } elseif ((!isFullPage()) && (getRequestElement('frame') == 'textlinks')) {
                // Prepare content
                $content = array(
        } elseif ((!isFullPage()) && (getRequestElement('frame') == 'textlinks')) {
                // Prepare content
                $content = array(


@@ -135,7 +135,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
                );
 
                // Load template for "stats" page
                );
 
                // Load template for "stats" page

-               loadTemplate('surfbar_frame_textlinks', false, $content);
+               loadTemplate('surfbar_frame_textlinks', FALSE, $content);

        } else {
                // Prepare content
                $content = array(
        } else {
                // Prepare content
                $content = array(


@@ -144,7 +144,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
                );
 
                // Load template for stopped surfbar
                );
 
                // Load template for stopped surfbar

-               loadTemplate('surfbar_stopped', false, $content);
+               loadTemplate('surfbar_stopped', FALSE, $content);

        }
 } elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
        // Dummy next id get
        }
 } elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
        // Dummy next id get


@@ -209,8 +209,8 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
        $templateName = determineSurfbarTemplateName();
 
        // Load that template
        $templateName = determineSurfbarTemplateName();
 
        // Load that template

-       //* DEBUG: */ exit('templateName=' . $templateName . '<br /><strong>content</strong>=<pre>' . print_r($content, true) . '</pre>');
-       loadTemplate($templateName, false, $content);
+       //* DEBUG: */ exit('templateName=' . $templateName . '<br /><strong>content</strong>=<pre>' . print_r($content, TRUE) . '</pre>');
+       loadTemplate($templateName, FALSE, $content);

 }
 
 // Load footer
 }
 
 // Load footer

diff --git a/templates/xml/admin/admin_delete_do_forced_ads.xml b/templates/xml/admin/admin_delete_do_forced_ads.xml
index 2895d49fd398244a2e0d0b4faa21af7cb10ed578..9ea59fc23c4dbd063d2f045631e46e53e18a7895 100644 (file)
--- a/templates/xml/admin/admin_delete_do_forced_ads.xml
+++ b/templates/xml/admin/admin_delete_do_forced_ads.xml
@@ -57,7 +57,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_delete_do_forced_costs.xml b/templates/xml/admin/admin_delete_do_forced_costs.xml
index a47f72010a171d8ace3039ea5005d34df8caad5b..6ac67900e33e071dc42cf1d0be397c6f58879630 100644 (file)
--- a/templates/xml/admin/admin_delete_do_forced_costs.xml
+++ b/templates/xml/admin/admin_delete_do_forced_costs.xml
@@ -57,7 +57,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_delete_do_nickname_history.xml b/templates/xml/admin/admin_delete_do_nickname_history.xml
index 3af9abc6056123f1120ddb98cf890a074b551da9..f039e829e642ec9a3214740c55b7deab031f0d95 100644 (file)
--- a/templates/xml/admin/admin_delete_do_nickname_history.xml
+++ b/templates/xml/admin/admin_delete_do_nickname_history.xml
@@ -57,7 +57,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_delete_do_surfbar_urls.xml b/templates/xml/admin/admin_delete_do_surfbar_urls.xml
index d9f7918a1fda4a18b341033f41bbea00c8cb4b3e..59d6b3223b7afea17a2d01b1301502dbdb307f68 100644 (file)
--- a/templates/xml/admin/admin_delete_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_delete_do_surfbar_urls.xml
@@ -58,7 +58,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_delete_do_user_subid.xml b/templates/xml/admin/admin_delete_do_user_subid.xml
index 39fd0bdc776bdd01d5348bcb42b65b0787f2f6b3..3dc3d60c4013e40808f1b912caa02cecc11782e1 100644 (file)
--- a/templates/xml/admin/admin_delete_do_user_subid.xml
+++ b/templates/xml/admin/admin_delete_do_user_subid.xml
@@ -57,7 +57,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_delete_do_user_subid_stats.xml b/templates/xml/admin/admin_delete_do_user_subid_stats.xml
index 342e06060516d36c160892c6d2d007115001fb77..5ba3291e62e8640c4182f480262771b22fb3d729 100644 (file)
--- a/templates/xml/admin/admin_delete_do_user_subid_stats.xml
+++ b/templates/xml/admin/admin_delete_do_user_subid_stats.xml
@@ -57,7 +57,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_delete_show_forced_ads.xml b/templates/xml/admin/admin_delete_show_forced_ads.xml
index b81695d2f5a746d9009007a1001a7cd7978138b3..b983e1d0fa3ef7c9e991d18720a0646c79126a09 100644 (file)
--- a/templates/xml/admin/admin_delete_show_forced_ads.xml
+++ b/templates/xml/admin/admin_delete_show_forced_ads.xml
@@ -93,7 +93,7 @@ MA  02110-1301  USA
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_delete_show_forced_costs.xml b/templates/xml/admin/admin_delete_show_forced_costs.xml
index 56dd0ac97154bff3a5154d5a0087eb5f24d2181c..320c4c8f3638c4ffbfe05cb645de7dde7744675d 100644 (file)
--- a/templates/xml/admin/admin_delete_show_forced_costs.xml
+++ b/templates/xml/admin/admin_delete_show_forced_costs.xml
@@ -72,7 +72,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_delete_show_surfbar_urls.xml b/templates/xml/admin/admin_delete_show_surfbar_urls.xml
index 6a035fb0a04168ef5e19ebc6c115bfdfa8691688..70c5d13ca21d945ad967eac3633591fce4e6b396 100644 (file)
--- a/templates/xml/admin/admin_delete_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_delete_show_surfbar_urls.xml
@@ -86,7 +86,7 @@ MA  02110-1301  USA
                <extra-parameter-list-entry name="" type="string" value="" />
        </extra-parameter-list>
        <!--
                <extra-parameter-list-entry name="" type="string" value="" />
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_delete_show_user_subid.xml b/templates/xml/admin/admin_delete_show_user_subid.xml
index 14539c2c0ccd4edc4e7b79c82d66ad7ad0db86e7..3a7503c12ec49503e0197e8e7a461bd20a3230e6 100644 (file)
--- a/templates/xml/admin/admin_delete_show_user_subid.xml
+++ b/templates/xml/admin/admin_delete_show_user_subid.xml
@@ -85,7 +85,7 @@ MA  02110-1301  USA
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_edit_do_forced_ads.xml b/templates/xml/admin/admin_edit_do_forced_ads.xml
index 3818cea1e0b302b2cb4bba6e85c228c72b462c81..6284d8b77165ecc3e8478a3387c250a9b6a647c6 100644 (file)
--- a/templates/xml/admin/admin_edit_do_forced_ads.xml
+++ b/templates/xml/admin/admin_edit_do_forced_ads.xml
@@ -62,7 +62,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_edit_do_forced_costs.xml b/templates/xml/admin/admin_edit_do_forced_costs.xml
index 950ff33436bdb8cd597b6a59d43b04a387a84245..e5dc1195ff0f4b06fbdf0e1e5fffc8dd079444bb 100644 (file)
--- a/templates/xml/admin/admin_edit_do_forced_costs.xml
+++ b/templates/xml/admin/admin_edit_do_forced_costs.xml
@@ -62,7 +62,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_edit_do_point_accounts.xml b/templates/xml/admin/admin_edit_do_point_accounts.xml
index f0280cfa99ed749bf681aa617d9c16dd574404da..1cc9a5e39ef2849dece944f0f169dbb08ecc2826 100644 (file)
--- a/templates/xml/admin/admin_edit_do_point_accounts.xml
+++ b/templates/xml/admin/admin_edit_do_point_accounts.xml
@@ -62,7 +62,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_edit_do_surfbar_urls.xml b/templates/xml/admin/admin_edit_do_surfbar_urls.xml
index 584d9e0a1ed0d87cab3066fc6e2807d16b3e9d88..82b614e6789d287e5fb30f8ef6da784d8be835fd 100644 (file)
--- a/templates/xml/admin/admin_edit_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_edit_do_surfbar_urls.xml
@@ -63,7 +63,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_edit_do_user_subid.xml b/templates/xml/admin/admin_edit_do_user_subid.xml
index 6ab3c767d0cc6ed79c6eb800c4bbcca93ab61872..6f2ef3db09f26ab209d3eb3e4fda1ff89528dd6e 100644 (file)
--- a/templates/xml/admin/admin_edit_do_user_subid.xml
+++ b/templates/xml/admin/admin_edit_do_user_subid.xml
@@ -62,7 +62,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_edit_show_forced_ads.xml b/templates/xml/admin/admin_edit_show_forced_ads.xml
index 060badac532ce51da6e8789bf61ee94ef61af457..a994ad4781f7fb8c8a6ccf7b7ef00af2240fbb16 100644 (file)
--- a/templates/xml/admin/admin_edit_show_forced_ads.xml
+++ b/templates/xml/admin/admin_edit_show_forced_ads.xml
@@ -121,7 +121,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_edit_show_forced_campaigns.xml b/templates/xml/admin/admin_edit_show_forced_campaigns.xml
index e8797e360e40b8b116e7344f0d069b823ab65a91..5618e8a678b1a22d12ef7b77757b5713efb05293 100644 (file)
--- a/templates/xml/admin/admin_edit_show_forced_campaigns.xml
+++ b/templates/xml/admin/admin_edit_show_forced_campaigns.xml
@@ -136,7 +136,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_edit_show_forced_costs.xml b/templates/xml/admin/admin_edit_show_forced_costs.xml
index 7f41209db367a30a7d44527912dd31bd9043edac..120dc546201aaf724f7eb0cb0ebf2a14a2cc5c02 100644 (file)
--- a/templates/xml/admin/admin_edit_show_forced_costs.xml
+++ b/templates/xml/admin/admin_edit_show_forced_costs.xml
@@ -77,7 +77,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_edit_show_point_accounts.xml b/templates/xml/admin/admin_edit_show_point_accounts.xml
index 79a4f65e72743f0d4481d7a5d8749e8553de7263..4103e674aa800d1ca7c4ae759827b66c7f965dc6 100644 (file)
--- a/templates/xml/admin/admin_edit_show_point_accounts.xml
+++ b/templates/xml/admin/admin_edit_show_point_accounts.xml
@@ -77,7 +77,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_edit_show_surfbar_actions.xml b/templates/xml/admin/admin_edit_show_surfbar_actions.xml
index a0fc8f93f50b97d5b6e421e6314c56130c39b926..61d2535127320350f3d07425f0d9c2fefe22a2f6 100644 (file)
--- a/templates/xml/admin/admin_edit_show_surfbar_actions.xml
+++ b/templates/xml/admin/admin_edit_show_surfbar_actions.xml
@@ -75,7 +75,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_edit_show_surfbar_urls.xml b/templates/xml/admin/admin_edit_show_surfbar_urls.xml
index e9465a020239677391810e4af21b933c8d1da0be..76d1424a5800aef0144cb04c6eedccdc085e96a7 100644 (file)
--- a/templates/xml/admin/admin_edit_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_edit_show_surfbar_urls.xml
@@ -112,7 +112,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_edit_show_user_subid.xml b/templates/xml/admin/admin_edit_show_user_subid.xml
index 74a562eda359341c1dcf895d1d407ac72558959c..8dd31d60e6774b219509d547133d3c28350a7548 100644 (file)
--- a/templates/xml/admin/admin_edit_show_user_subid.xml
+++ b/templates/xml/admin/admin_edit_show_user_subid.xml
@@ -111,7 +111,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_lock_do_surfbar_urls.xml b/templates/xml/admin/admin_lock_do_surfbar_urls.xml
index f970ff0ab853eb43fc5de1c13c5306c1c907badf..19040e42004a0f62a3fe7fd128c09fdb60f14761 100644 (file)
--- a/templates/xml/admin/admin_lock_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_lock_do_surfbar_urls.xml
@@ -70,7 +70,7 @@ MA  02110-1301  USA
                <status-change-list-entry name="url_status" type="string" old="LOCKED" value="ACTIVE" />
        </status-change-list>
        <!--
                <status-change-list-entry name="url_status" type="string" old="LOCKED" value="ACTIVE" />
        </status-change-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_lock_show_surfbar_urls.xml b/templates/xml/admin/admin_lock_show_surfbar_urls.xml
index ae28d18b0a53e777da3eddd1d5059b32afed760c..759832d46a600c703cf461e9864c4addbc821af4 100644 (file)
--- a/templates/xml/admin/admin_lock_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_lock_show_surfbar_urls.xml
@@ -93,7 +93,7 @@ MA  02110-1301  USA
        //-->
        <status-change-column name="" type="string" value="url_status" />
        <!--
        //-->
        <status-change-column name="" type="string" value="url_status" />
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin/admin_undelete_do_surfbar_urls.xml b/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
index 0420548067a596616f857cdd6c8a7ab416d996cf..ba27720fa65591d380f8479c47aaa9206c9c5658 100644 (file)
--- a/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
@@ -68,7 +68,7 @@ MA  02110-1301  USA
                <status-change-list-entry name="url_status" type="string" old="DELETED" value="ACTIVE" />
        </status-change-list>
        <!--
                <status-change-list-entry name="url_status" type="string" old="DELETED" value="ACTIVE" />
        </status-change-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/admin/admin_undelete_show_surfbar_urls.xml b/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
index bcc63c2084054320b0b0e22cd8e305b2afa1d412..b7215561811c1492a1d2073818d871c84024fe03 100644 (file)
--- a/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
@@ -89,7 +89,7 @@ MA  02110-1301  USA
                <extra-parameter-list-entry name="" type="string" value="" />
        </extra-parameter-list>
        <!--
                <extra-parameter-list-entry name="" type="string" value="" />
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/admin_data_template.xml b/templates/xml/admin_data_template.xml
index 7bdac96841fccb68dd77e66b8441f9df012844a4..c704558fe3336e6cac19d421a8858c1edc6297a4 100644 (file)
--- a/templates/xml/admin_data_template.xml
+++ b/templates/xml/admin_data_template.xml
@@ -106,7 +106,7 @@ MA 02110-1301 USA
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/member/member_delete_do_user_subid.xml b/templates/xml/member/member_delete_do_user_subid.xml
index 6911636638dc98c3dfce1155f99af2e89deb63c6..5eb138517eeb4ed16c4ecf0cd32adff8d2371b9b 100644 (file)
--- a/templates/xml/member/member_delete_do_user_subid.xml
+++ b/templates/xml/member/member_delete_do_user_subid.xml
@@ -57,7 +57,7 @@ MA  02110-1301  USA
        <extra-parameter-list>
        </extra-parameter-list>
        <!--
        <extra-parameter-list>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/member/member_delete_show_user_subid.xml b/templates/xml/member/member_delete_show_user_subid.xml
index 74d6f0c0029bbb03376cfe11922058b779803f24..6771531682d80f0dd4ebfd7e93f3b4995e0e9214 100644 (file)
--- a/templates/xml/member/member_delete_show_user_subid.xml
+++ b/templates/xml/member/member_delete_show_user_subid.xml
@@ -85,7 +85,7 @@ MA  02110-1301  USA
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--
                </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/templates/xml/member/member_edit_do_user_subid.xml b/templates/xml/member/member_edit_do_user_subid.xml
index 35d27982a691f1a813654c4ed4b1d64f2f1df447..d1139e012436ec67d19a836a97bb8eca7734c9de 100644 (file)
--- a/templates/xml/member/member_edit_do_user_subid.xml
+++ b/templates/xml/member/member_edit_do_user_subid.xml
@@ -42,12 +42,20 @@ MA  02110-1301  USA
        And all column names to read/write, leave this list tag empty for all (*).
        //-->
        <database-column-list>
        And all column names to read/write, leave this list tag empty for all (*).
        //-->
        <database-column-list>

+               <!--
+               Only handle this column in a special function.
+               //-->
+               <database-column-list-entry name="" type="string" table="" value="subid" alias="" function="" />

        </database-column-list>
        <!--
        "Filter" call-back functions to call back for piping the fetched data
        through (can be left empty, no call-back function will be called)
        //-->
        <callback-function-list>
        </database-column-list>
        <!--
        "Filter" call-back functions to call back for piping the fetched data
        through (can be left empty, no call-back function will be called)
        //-->
        <callback-function-list>

+               <!--
+               Use again prepareSubId() to validate it.
+               //-->
+               <callback-function-list-entry name="" type="string" value="validateSubId" />

        </callback-function-list>
        <!--
        Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
        </callback-function-list>
        <!--
        Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array


@@ -62,7 +70,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="true" />
        <!--

diff --git a/templates/xml/member/member_edit_show_user_subid.xml b/templates/xml/member/member_edit_show_user_subid.xml
index e383af5db9d76210aafe766551b9513c4ba2368e..207a7842d35ce448f6367da38806983caa3ecbc0 100644 (file)
--- a/templates/xml/member/member_edit_show_user_subid.xml
+++ b/templates/xml/member/member_edit_show_user_subid.xml
@@ -90,7 +90,7 @@ MA  02110-1301  USA
        <time-columns-list>
        </time-columns-list>
        <!--
        <time-columns-list>
        </time-columns-list>
        <!--

-       Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
+       Wether to 'edit/delete/change' (change) the entries (TRUE) or just read them for displaying (FALSE)

        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--
        //-->
        <enable-modify-entries name="" type="bool" value="false" />
        <!--

diff --git a/view.php b/view.php
index 6595733672049ac704d62bfba67bf214aec07feb..afbdbff05c90de6af1963240ddeb478cc71a73f8 100644 (file)
--- a/view.php
+++ b/view.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);

 
 // Set module
 $GLOBALS['__module']      = 'view';
 
 // Set module
 $GLOBALS['__module']      = 'view';


@@ -66,7 +66,7 @@ if ((isGetRequestElementSet('user')) && (isGetRequestElementSet('banner'))) {
                setContentType('image/' . substr($data['url'], -3, 3));
 
                // Redirect
                setContentType('image/' . substr($data['url'], -3, 3));
 
                // Redirect

-               redirectToUrl($data['url'], false);
+               redirectToUrl($data['url'], FALSE);

        } else {
                // @TODO No banner found, output some default banner
                logDebugMessage(__FILE__, __LINE__, 'Banner ' . bigintval(getRequestElement('banner')) . ' not dound.');
        } else {
                // @TODO No banner found, output some default banner
                logDebugMessage(__FILE__, __LINE__, 'Banner ' . bigintval(getRequestElement('banner')) . ' not dound.');