Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 2e67489387c9eb29c91594652dc164a7153f278a..2da1f613620bcc3f94dab889d6e94d41d1f20dc4 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2548,6 +2548,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('MORE_RECEIVERS2')    : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
                case getCode('MORE_RECEIVERS3')    : $message = getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'); break;
                case getCode('INVALID_URL')        : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
+               case getCode('NO_MAIL_TYPE')       : $message = getMessage('MEMBER_NO_MAIL_TYPE_SELECTED'); break;
                case getCode('UNKNOWN_ERROR')      : $message = getMessage('LOGIN_UNKNOWN_ERROR'); break;
                case getCode('UNKNOWN_STATUS')     : $message = getMessage('LOGIN_UNKNOWN_STATUS'); break;
 
@@ -3787,37 +3788,23 @@ function isSpider () {
        if (empty($userAgent)) return true;
 
        // Is it a spider?
-       return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false));
+       return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false) || (strpos($userAgent, 'archiver') !== false));
 }
 
 // Prepares the header for HTML output
 function loadHtmlHeader () {
-       // Determine the page title
-       $content['header_title'] = determinePageTitle();
+       // Run two filters:
+       // 1.) pre_page_header (mainly loads the page_header template and includes
+       //     meta description)
+       runFilterChain('pre_page_header');
 
-       // Output page header code
-       $GLOBALS['page_header'] = loadTemplate('page_header', true, $content);
-
-       // Include meta data in 'guest' module
-       if (getModule() == 'index') {
-               // Load meta data template
-               $GLOBALS['page_header'] .= loadTemplate('metadata', true);
-
-               // Add meta description to header
-               if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
-                       // Add meta description not in admin and login module and when the script is installed
-                       generateMetaDescriptionCode();
-               } // END - if
-       } // END - if
+       // Here can be something be added, but normally one of the two filters
+       // around this line should do the job for you.
 
+       // 2.) post_page_header (mainly to load stylesheet, extra JavaScripts and
+       //     to close the head-tag)
        // Include more header data here
-       $GLOBALS['page_header'] .= loadTemplate('header', true);
-
-       // Include stylesheet
-       loadIncludeOnce('inc/stylesheet.php');
-
-       // Closing HEAD tag
-       $GLOBALS['page_header'] .= '</head>';
+       runFilterChain('post_page_header');
 }
 
 // Adds page header and footer to output array element