Fixes for last activity in mailid.php

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 6848f87e4f82bebf81ecbb52f3f89f2376592436..aa83e13b74f36e95470fa7f484916cfe7cad024e 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -43,6 +43,9 @@ if (!defined('__SECURITY')) {
 
 // Output HTML code directly or 'render' it. You addionally switch the new-line character off
 function outputHtml ($htmlCode, $newLine = true) {
+       // Init output
+       if (!isset($GLOBALS['output'])) $GLOBALS['output'] = '';
+
        // Transfer username
        $username = getMessage('USERNAME_UNKNOWN');
        if (isset($GLOBALS['username'])) $username = getUsername();
@@ -343,20 +346,20 @@ function loadTemplate ($template, $return=false, $content=array()) {
 
                        // Eval the code
                        eval($GLOBALS['template_eval'][$template]);
-               } else {
-                       // No file!
-                       $GLOBALS['template_eval'][$template] = '404';
-               }
-       } elseif (((isAdmin()) || ((isInstalling()) && (!isInstalled()))) && ($GLOBALS['template_eval'][$template] == '404')) {
-               // Only admins shall see this warning or when installation mode is active
-               $ret = '<br /><span class=\\"guest_failed\\">{--TEMPLATE_404--}</span><br />
+               } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
+                       // Only admins shall see this warning or when installation mode is active
+                       $ret = '<br /><span class=\\"guest_failed\\">{--TEMPLATE_404--}</span><br />
 (' . $template . ')<br />
 <br />
 {--TEMPLATE_CONTENT--}
 <pre>' . print_r($content, true) . '</pre>
 {--TEMPLATE_DATA--}
 <pre>' . print_r($DATA, true) . '</pre>
-<br /><br />\";';
+<br /><br />';
+               } else {
+                       // No file!
+                       $GLOBALS['template_eval'][$template] = '404';
+               }
        } else {
                // Eval the code
                eval($GLOBALS['template_eval'][$template]);
@@ -369,7 +372,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
                        // Return the HTML code
                        return $ret;
                } else {
-                       // Output direct
+                       // Output directly
                        outputHtml($ret);
                }
        } elseif (isDebugModeEnabled()) {
@@ -1148,19 +1151,19 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 }
 
 //
-function addSelectionBox ($type, $default, $prefix = '', $id = 0) {
+function addSelectionBox ($type, $default, $prefix = '', $id = 0, $class = 'register_select') {
        $OUT = '';
 
        if ($type == 'yn') {
                // This is a yes/no selection only!
                if ($id > 0) $prefix .= "[" . $id."]";
-               $OUT .= "    <select name=\"" . $prefix."\" class=\"register_select\" size=\"1\">\n";
+               $OUT .= "    <select name=\"" . $prefix."\" class=\"" . $class . "\" size=\"1\">\n";
        } else {
                // Begin with regular selection box here
                if (!empty($prefix)) $prefix .= "_";
                $type2 = $type;
                if ($id > 0) $type2 .= "[" . $id."]";
-               $OUT .= "    <select name=\"".strtolower($prefix . $type2)."\" class=\"register_select\" size=\"1\">\n";
+               $OUT .= "    <select name=\"".strtolower($prefix . $type2)."\" class=\"" . $class . "\" size=\"1\">\n";
        }
 
        switch ($type) {
@@ -2737,36 +2740,6 @@ function getMessageFromErrorCode ($code) {
        return $message;
 }
 
-// Generate a "link" for the given admin id (admin_id)
-function generateAdminLink ($adminId) {
-       // No assigned admin is default
-       $admin = "<span class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>";
-
-       // Zero? = Not assigned
-       if (bigintval($adminId) > 0) {
-               // Load admin's login
-               $login = getAdminLogin($adminId);
-
-               // Is the login valid?
-               if ($login != '***') {
-                       // Is the extension there?
-                       if (isExtensionActive('admins')) {
-                               // Admin found
-                               $admin = "<a href=\"".generateEmailLink(getAdminEmail($adminId), 'admins')."\">" . $login."</a>";
-                       } else {
-                               // Extension not found
-                               $admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
-                       }
-               } else {
-                       // Maybe deleted?
-                       $admin = "<div class=\"admin_note\">".sprintf(getMessage('ADMIN_ID_404'), $adminId)."</div>";
-               }
-       } // END - if
-
-       // Return result
-       return $admin;
-}
-
 // Compile characters which are allowed in URLs
 function compileUriCode ($code, $simple = true) {
        // Compile constants