SQL_FETCHROW()->SQL_FETCHARRAY() and other improvements

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 03376db72e20103835833c2b16695e5e1b336895..6e3cda3de9dad272524e41e5964431122e6f1cbe 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -97,11 +97,6 @@ function outputHtml ($htmlCode, $newLine = true) {
                        clearOutputBuffer();
                } // END - if
 
-               // Extension 'rewrite' installed?
-               if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
-                       $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
-               } // END - if
-
                // Send all HTTP headers
                sendHttpHeaders();
 
@@ -111,11 +106,6 @@ function outputHtml ($htmlCode, $newLine = true) {
                // Output code here, DO NOT REMOVE! ;-)
                outputRawCode($GLOBALS['output']);
        } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
-               // Rewrite links when rewrite extension is active
-               if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
-                       $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
-               } // END - if
-
                // Send all HTTP headers
                sendHttpHeaders();
 
@@ -157,16 +147,17 @@ function compileFinalOutput () {
        addPageHeaderFooter();
 
        // Compile all out
-       while (((strpos($GLOBALS['output'], '{--') !== false) || (strpos($GLOBALS['output'], '{!') !== false) || (strpos($GLOBALS['output'], '{?') !== false) || (strpos($GLOBALS['output'], '{%') !== false)) && ($cnt < 3)) {
+       while (((strpos($GLOBALS['output'], '{--') !== false) || (strpos($GLOBALS['output'], '{DQUOTE}') !== false) || (strpos($GLOBALS['output'], '{!') !== false) || (strpos($GLOBALS['output'], '{?') !== false) || (strpos($GLOBALS['output'], '{%') !== false)) && ($cnt < 3)) {
                // Init common variables
                $content = array();
                $newContent = '';
 
                // Compile it
                //* DEBUG: */ print '<pre>'.htmlentities($GLOBALS['output']).'</pre>';
-               $eval = '$newContent = "' . compileCode(escapeQuotes($GLOBALS['output'])) . '";';
+               $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($GLOBALS['output']))) . '";';
                //* DEBUG: */ die('<pre>'.htmlentities($eval).'</pre>');
                eval($eval);
+               //* DEBUG: */ die('<pre>'.htmlentities($newContent).'</pre>');
 
                // Was that eval okay?
                if (empty($newContent)) {
@@ -181,6 +172,11 @@ function compileFinalOutput () {
                $cnt++;
        } // END - while
 
+       // Extension 'rewrite' installed?
+       if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
+               $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
+       } // END - if
+
        // Compress it?
        if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
                // Compress it for HTTP gzip
@@ -1708,7 +1704,10 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
                }
 
                // Add seperator if we have not yet reached total pages
-               if ($page < $PAGES) $NAV .= '&nbsp;|&nbsp;';
+               if ($page < $PAGES) {
+                       // Add it
+                       $NAV .= '|';
+               } // END - if
        } // END - for
 
        // Define constants only once
@@ -2081,7 +2080,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
        $targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
 
        // Begin of navigation links
-       $OUT = '[&nbsp;';
+       $OUT = '[';
 
        foreach ($targetArray as $tar) {
                $OUT .= '<span class="admin_user_link"><a href="{%url=modules.php?module=admin&amp;what=' . $tar . '&amp;userid=' . $userid . '%}" title="{--ADMIN_LINK_';
@@ -2101,7 +2100,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
                        // All other status is fine
                        $OUT .= strtoupper($tar);
                }
-               $OUT .= '--}</a></span>&nbsp;|&nbsp;';
+               $OUT .= '--}</a></span>|';
        }
 
        // Finish navigation link
@@ -2397,9 +2396,10 @@ function displayParsingTime() {
        if ($runTime < 0) $runTime = '0';
 
        // Prepare output
+       // @TODO This can be easily moved out after the merge from EL branch to this is complete
        $content = array(
-               'runtime'  => translateComma($runTime),
-               'timeSQLs' => translateComma(getConfig('sql_time') * 1000),
+               'run_time' => translateComma($runTime),
+               'sql_time' => translateComma(getConfig('sql_time') * 1000),
        );
 
        // Load the template
@@ -3260,12 +3260,12 @@ function generateExtensionNotInstalledMessage ($ext_name) {
        } // END - if
 
        // Default message
-       $message = getMaskedMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
+       $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
 
        // Is an admin logged in?
        if (isAdmin()) {
                // Then output admin message
-               $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
+               $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
        } // END - if
 
        // Return prepared message
@@ -3748,7 +3748,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent='') {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
        // Start the output
        $OUT = '<select name="' . $name . '" size="1" class="admin_select">
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
@@ -3758,7 +3758,7 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
                // Add the <option> entry
                if (empty($optionContent)) {
                        // ... from template
-                       $OUT .= loadTemplate('select_' . $name . '_option', true, $option);
+                       $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
                } else {
                        // Direct HTML code
                        $OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
@@ -3776,7 +3776,7 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
        );
 
        // Load template and return it
-       return loadTemplate('select_' . $name . '_box', true, $content);
+       return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
 }
 
 // Get a module from filename and access level