Maybe now better, but a simple wget still gives HTTP/1.0 :(

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 0a6f17f48fd9935c595e280ffd2f34aee62cb9b6..69477a7dc847bc199728c6894e5948d69559cee1 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -134,7 +134,7 @@ function sendHttpHeaders () {
        $now = gmdate('D, d M Y H:i:s') . ' GMT';
 
        // Send HTTP header
-       sendHeader('HTTP/1.1 200');
+       sendHeader('HTTP/1.1 200 OK');
 
        // General headers for no caching
        sendHeader('Expires: ' . $now); // RFC2616 - Section 14.21
@@ -2721,11 +2721,12 @@ function isUrlValidSimple ($url) {
        $pattern['d1g12']  = $http . $domain1 . $getstring1;
        $pattern['d2g12']  = $http . $domain2 . $getstring1;
        $pattern['ipg12']  = $http . $ip . $getstring1;
+
        // Test all patterns
        $reg = false;
        foreach ($pattern as $key => $pat) {
                // Debug regex?
-               if (isDebugRegExpressionEnabled()) {
+               if (isDebugRegularExpressionEnabled()) {
                        // @TODO Are these convertions still required?
                        $pat = str_replace('.', "\.", $pat);
                        $pat = str_replace('@', "\@", $pat);
@@ -2733,7 +2734,7 @@ function isUrlValidSimple ($url) {
                } // END - if
 
                // Check if expression matches
-               $reg = ($reg || preg_match(('^' . $pat.'^'), $url));
+               $reg = ($reg || preg_match(('^' . $pat . '^'), $url));
 
                // Does it match?
                if ($reg === true) break;
@@ -2940,14 +2941,14 @@ function handleLoginFailures ($accessLevel) {
        $OUT = '';
 
        // Is the session data set?
-       if ((isSessionVariableSet('mxchange_' . $accessLevel . '_failures')) && (isSessionVariableSet('mxchange_' . $accessLevel . '_last_failure'))) {
+       if ((isSessionVariableSet('mailer_' . $accessLevel . '_failures')) && (isSessionVariableSet('mailer_' . $accessLevel . '_last_failure'))) {
                // Ignore zero values
-               if (getSession('mxchange_' . $accessLevel . '_failures') > 0) {
+               if (getSession('mailer_' . $accessLevel . '_failures') > 0) {
                        // Non-guest has login failures found, get both data and prepare it for template
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "accessLevel={$accessLevel}<br />");
                        $content = array(
-                               'login_failures' => getSession('mxchange_' . $accessLevel . '_failures'),
-                               'last_failure'   => generateDateTime(getSession('mxchange_' . $accessLevel . '_last_failure'), 2)
+                               'login_failures' => getSession('mailer_' . $accessLevel . '_failures'),
+                               'last_failure'   => generateDateTime(getSession('mailer_' . $accessLevel . '_last_failure'), 2)
                        );
 
                        // Load template
@@ -2955,8 +2956,8 @@ function handleLoginFailures ($accessLevel) {
                } // END - if
 
                // Reset session data
-               setSession('mxchange_' . $accessLevel . '_failures', '');
-               setSession('mxchange_' . $accessLevel . '_last_failure', '');
+               setSession('mailer_' . $accessLevel . '_failures', '');
+               setSession('mailer_' . $accessLevel . '_last_failure', '');
        } // END - if
 
        // Return rendered content