Fixes and further rewrites to make use of EL

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 5f62c273416bde14d01b56aa74fa8dd90ab813cf..90dbe1d5e69a801bdd4c84ff4d95f7f4b2ba407a 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -515,6 +515,9 @@ function makeTime ($hours, $minutes, $seconds, $stamp) {
 
 // Redirects to an URL and if neccessarry extends it with own base URL
 function redirectToUrl ($URL, $allowSpider = true) {
+       // Remove {%url=
+       if (substr($URL, 0, 6) == '{%url=') $URL = substr($URL, 6, -2);
+
        // Compile out codes
        eval('$URL = "' . compileRawCode(encodeUrl($URL)) . '";');
 
@@ -1768,7 +1771,7 @@ function handleLoginFailures ($accessLevel) {
                        // 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('mailer_' . $accessLevel . '_failures'),
+                               'login_failures' => 'mailer_' . $accessLevel . '_failures',
                                'last_failure'   => generateDateTime(getSession('mailer_' . $accessLevel . '_last_failure'), 2)
                        );