Even more fixes

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 47c6b65abd6efa1a0778f416c8ecc505fdcefac0..b2d81171024f82b37b0d251b0fcc49594c01cccd 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -106,20 +106,20 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        loadTemplate('css_inline', false, $OUT);
 } else {
        // Now we load all CSS files from css.php!
        loadTemplate('css_inline', false, $OUT);
 } else {
        // Now we load all CSS files from css.php!

-       outputHtml('<link rel="stylesheet" type="text/css" href="{%url=css.php', false);
+       $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';

        if ((isInstallationPhase())) {
                // Default theme first
                $newTheme = 'default';
                if (isGetRequestElementSet('theme'))  $newTheme = getRequestElement('theme');
                if (isPostRequestElementSet('theme')) $newTheme = secureString(postRequestElement('theme'));
        if ((isInstallationPhase())) {
                // Default theme first
                $newTheme = 'default';
                if (isGetRequestElementSet('theme'))  $newTheme = getRequestElement('theme');
                if (isPostRequestElementSet('theme')) $newTheme = secureString(postRequestElement('theme'));

-               outputHtml('?theme=' . $newTheme . '&amp;installing=1', false);
+               $OUT .= '?theme=' . $newTheme . '&amp;installing=1';

        } else {
                // Add SVN revision to bypass caching problems
        } else {
                // Add SVN revision to bypass caching problems

-               outputHtml('?rev=' . getConfig('CURR_SVN_REVISION'));
+               $OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');

        }
 
        // Close tag
        }
 
        // Close tag

-       outputHtml('%}" />');
+       outputHtml($OUT . '%}" />');

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

diff --git a/mailid.php b/mailid.php
index 0649da1e8386a79129c614d0d4ae046bf63e74be..06f313f3b89743e6a5964732ab4a843c96535025 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -111,7 +111,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        default: // Invalid mail type
                                debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
                                break;
                        default: // Invalid mail type
                                debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
                                break;

-               }
+               } // END - switch

 
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
 
                if (SQL_NUMROWS($result) == 1) {
                        // Load data


@@ -154,7 +154,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = '0.00000';
                                                                $isValid = true;
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = '0.00000';
                                                                $isValid = true;

-                                                       }
+                                                       } // END - if

 
                                                        // Free memory
                                                        SQL_FREERESULT($result);
 
                                                        // Free memory
                                                        SQL_FREERESULT($result);


@@ -176,9 +176,9 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                        // Export data into constants for the template
                                                        $content = array(
                                                                'userid'  => $url_userid,
                                                        // Export data into constants for the template
                                                        $content = array(
                                                                'userid'  => $url_userid,

-                                                               'type' => $type,
-                                                               'data' => $urlId,
-                                                               'url'  => generateDerefererUrl($URL)
+                                                               'type'    => $type,
+                                                               'data'    => $urlId,
+                                                               'url'     => generateDerefererUrl($URL)

                                                        );
 
                                                        // Load template
                                                        );
 
                                                        // Load template

diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index 4cbe33e35f81c3c2b3ae7a139365012f2950ea5f..164799939dc7b60d3175927b731e37ef71f568a3 100644 (file)
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -26,7 +26,7 @@ function StartCounter() {
                <table border="0" cellspacing="0" cellpadding="0" width="200" class="member_confirm dashed">
                        <tr>
                                <td align="center">
                <table border="0" cellspacing="0" cellpadding="0" width="200" class="member_confirm dashed">
                        <tr>
                                <td align="center">

-                               <form accept-charset="utf-8" name="confirm" style="margin-top: 0px?margin-bottom: 0px">
+                               <form accept-charset="utf-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">

                                {--MEMBER_TIME_COUNTER_1--} <input type="text" name="counter"
                                        size="$content[tim2]" readonly class="member_normal"
                                        value="$content[time]">&nbsp;{--_SECONDS--}
                                {--MEMBER_TIME_COUNTER_1--} <input type="text" name="counter"
                                        size="$content[tim2]" readonly class="member_normal"
                                        value="$content[time]">&nbsp;{--_SECONDS--}