Constant OUTPUT_MODE rewritten

diff --git a/inc/functions.php b/inc/functions.php
index 73084e5fa580ce7d4f38c601cad63f9b86a0ae8f..32abd70af766c67176f6e56762b871a2a751f634 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -67,7 +67,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
        // Do we have HTML-Code here?
        if (!empty($HTML)) {
                // Yes, so we handle it as you have configured
        // Do we have HTML-Code here?
        if (!empty($HTML)) {
                // Yes, so we handle it as you have configured

-               switch (OUTPUT_MODE)
+               switch (constant('OUTPUT_MODE'))

                {
                case "render":
                        // That's why you don't need any \n at the end of your HTML code... :-)
                {
                case "render":
                        // That's why you don't need any \n at the end of your HTML code... :-)


@@ -97,7 +97,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
 
                default:
                        // Huh, something goes wrong or maybe you have edited config.php ???
 
                default:
                        // Huh, something goes wrong or maybe you have edited config.php ???

-                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE));
+                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));

                        mxchange_die("<strong>{!FATAL_ERROR!}:</strong> {!LANG_NO_RENDER_DIRECT!}");
                        break;
                }
                        mxchange_die("<strong>{!FATAL_ERROR!}:</strong> {!LANG_NO_RENDER_DIRECT!}");
                        break;
                }


@@ -152,7 +152,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
 
                // Output code here, DO NOT REMOVE! ;-)
                OUTPUT_RAW($OUTPUT);
 
                // Output code here, DO NOT REMOVE! ;-)
                OUTPUT_RAW($OUTPUT);

-       } elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) {
+       } elseif ((constant('OUTPUT_MODE') == "render") && (!empty($OUTPUT))) {

                // Rewrite links when rewrite extension is active
                if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {
                        $OUTPUT = REWRITE_LINKS($OUTPUT);
                // Rewrite links when rewrite extension is active
                if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {
                        $OUTPUT = REWRITE_LINKS($OUTPUT);

diff --git a/inc/install-inc.php b/inc/install-inc.php
index c33ac6ed94b2433ad67d26278504529587ef77f3..fb50b7134b41b8b9a79b67b9c448860d94f81ef8 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -258,10 +258,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
   <td>
     <select name=\"omode\" size=\"1\" class=\"install_select\">
       <option value=\"render\"");
   <td>
     <select name=\"omode\" size=\"1\" class=\"install_select\">
       <option value=\"render\"");

-               if (OUTPUT_MODE == "render") OUTPUT_HTML(" selected=\"selected\"");
+               if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(" selected=\"selected\"");

                OUTPUT_HTML(">{!MODE_RENDER!}</option>
       <option value=\"direct\"");
                OUTPUT_HTML(">{!MODE_RENDER!}</option>
       <option value=\"direct\"");

-               if (OUTPUT_MODE == "direct") OUTPUT_HTML(" selected=\"selected\"");
+               if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(" selected=\"selected\"");

                OUTPUT_HTML(">{!MODE_DIRECT!}</option>
     </select>
   </td>
                OUTPUT_HTML(">{!MODE_DIRECT!}</option>
     </select>
   </td>


@@ -403,7 +403,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 
                        if (getTotalFatalErrors() > 0) {
                                $OUT = "";
 
                        if (getTotalFatalErrors() > 0) {
                                $OUT = "";

-                               foreach ($FATAL as $value) {
+                               foreach ($FATAL as $value) {

                                        $OUT .= "    <li>".$value."</li>\n";
                                } // END foreach
                                define('__FATAL_ERROR_LI', $OUT);
                                        $OUT .= "    <li>".$value."</li>\n";
                                } // END foreach
                                define('__FATAL_ERROR_LI', $OUT);