Fixes + asserts

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

diff --git a/inc/ajax-functions.php b/inc/ajax-functions.php
index 512b3ae5751883b66b834bf917a08c314cd1c1c8..d3736e0f03043caddaca465a74056c03c9cc6915 100644 (file)
--- a/inc/ajax-functions.php
+++ b/inc/ajax-functions.php
@@ -61,7 +61,7 @@ function initAjax () {
        setUsername('{--USERNAME_AJAX--}');
 
        // In installation phase load ajax_installer.php
-       if (isInstallationPhase()) {
+       if (isInstaller()) {
                // Load it
                loadIncludeOnce('inc/ajax/ajax_installer.php');
        } // END - if
@@ -80,7 +80,7 @@ function setAjaxReplyContent ($content) {
  * Checks whether the AJAX access level was valid. This function doesn't need
  * caching in $GLOBALS[__FUNCTION__] because it will be called only once.
  */
-function isAjaxRequestLevelValid () {
+function isValidAjaxRequestLevel () {
        // By default nothing is valid
        $isValid = FALSE;
 
@@ -88,7 +88,7 @@ function isAjaxRequestLevelValid () {
        switch (postRequestElement('level')) {
                case 'install': // Installation phase level
                        // Simply check for it
-                       $isValid = isInstallationPhase();
+                       $isValid = isInstaller();
                        break;
 
                case 'admin': // Admin area
@@ -131,9 +131,9 @@ function processAjaxRequest () {
 }
 
 // Send AJAX content
-function sendAjaxContent () {
+function sendAjaxContent ($forceOutput = FALSE) {
        // Is the status fine or template not found (404)?
-       if (isAjaxHttpStatusAccepted()) {
+       if ((isAjaxHttpStatusAccepted()) || ($forceOutput === TRUE)) {
                // Then output the JSON
                outputHtml(encodeJson($GLOBALS['ajax_reply']));
        } // END - if