Forgot it to comment out ... :(

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 418888d0336638fc1a1a58023eb8e9cee443c884..fe01016b23aa1d8f44fa7a7262812e5b678b7af5 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -93,7 +93,7 @@ function getColorSwitchCode ($template) {
 }
 
 // Output HTML code directly or 'render' it. You addionally switch the new-line character off
-function outputHtml ($htmlCode, $newLine = TRUE) {
+function outputHtml ($htmlCode = NULL, $newLine = TRUE) {
        // Init output
        if (!isset($GLOBALS['__output'])) {
                $GLOBALS['__output'] = '';
@@ -101,7 +101,7 @@ function outputHtml ($htmlCode, $newLine = TRUE) {
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getOutputMode()=' . getOutputMode() . ',htmlCode(length)=' . strlen($htmlCode) . ',output(length)=' . strlen($GLOBALS['__output']));
        // Is there HTML-Code here?
-       if (!empty($htmlCode)) {
+       if ((!is_null($htmlCode)) && (!empty($htmlCode))) {
                // Yes, so we handle it as you have configured
                switch (getOutputMode()) {
                        case 'render':
@@ -467,10 +467,10 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
        // Is content an array?
        if (is_array($content)) {
                // Add expiration to array
-               if ((isConfigEntrySet('auto_purge')) && (getAutoPurge() == '0')) {
+               if ((isExtensionInstalled('autopurge')) && (getAutoPurge() == '0')) {
                        // Will never expire!
                        $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}';
-               } elseif (isConfigEntrySet('auto_purge')) {
+               } elseif ((isExtensionInstalled('autopurge')) && (isConfigEntrySet('auto_purge'))) {
                        // Create nice date string
                        $content['expiration'] = '{%config,createFancyTime=auto_purge%}';
                } else {
@@ -1549,17 +1549,8 @@ function determinePageTitle () {
                        $pageTitle .= ' {%config,trim=title_middle%} {DQUOTE} . getModuleTitle(getModule()) . {DQUOTE}';
                } // END - if
 
-               // Add title from what file
-               $menuMode = '';
-               if (getModule() == 'login') {
-                       $menuMode = 'member';
-               } elseif (getModule() == 'index') {
-                       $menuMode = 'guest';
-               } elseif (getModule() == 'admin') {
-                       $menuMode = 'admin';
-               } elseif (getModule() == 'sponsor') {
-                       $menuMode = 'sponsor';
-               }
+               // Get menu mode from module
+               $menuMode = getMenuModeFromModule();
 
                // Add middle part (always in admin area!)
                if ((!empty($menuMode)) && ((isWhatTitleEnabled()) || ($menuMode == 'admin'))) {
@@ -2141,6 +2132,25 @@ function doTemplateNoYesSelectionBox ($templateName, $clear, $formField) {
        return $OUT;
 }
 
+// Helper function to add extra content for guest area (module=index and others)
+function doTemplateGuestFooterExtras ($templateName, $clear) {
+       // Init filter data
+       $filterData = array(
+               // Name of used template
+               'template' => $templateName,
+               // Target array for gathered data
+               '__data'   => array(),
+               // Where the HTML output will go
+               '__output' => '',
+       );
+
+       // Run the filter chain
+       $filterData = runFilterChain('guest_footer_extras', $filterData);
+
+       // Return output
+       return $filterData['__output'];
+}
+
 // Helper function to add extra content for member area (module=login)
 function doTemplateMemberFooterExtras ($templateName, $clear) {
        // Is a member logged in?