Changed order of AND to avoid call of function(s)

[mailer.git] / inc / ajax / ajax_installer.php

diff --git a/inc/ajax/ajax_installer.php b/inc/ajax/ajax_installer.php
index 055d00270adb4890f715c3dcc112cb4113991b5b..ada36bf66c819e00a8ce70f974303bf4f95baf9a 100644 (file)
--- a/inc/ajax/ajax_installer.php
+++ b/inc/ajax/ajax_installer.php
@@ -37,7 +37,8 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAjaxOutputMode()) || (!isInstallationPhase())) {
-       die();
+       header('HTTP/1.1 403 Forbidden');
+       die(json_encode(array('reply_content' => 'Access forbidden'), JSON_FORCE_OBJECT));
 } // END - if
 
 //-----------------------------------------------------------------------------
@@ -102,6 +103,7 @@ function doAjaxProcessInstall () {
 
        // Again we do a call-back, so generate a function name depending on 'do'
        $callbackName = 'doAjaxInstaller' . capitalizeUnderscoreString(postRequestElement('do'));
+       $GLOBALS['ajax_callback_function'] = $callbackName;
 
        // Is the call-back function there?
        if (!function_exists($callbackName)) {
@@ -248,7 +250,7 @@ function doAjaxInstallerChangeWarning () {
                // Is it an extension?
                if (substr($element, 0, 4) == 'ext_') {
                        // Add row for extension
-                       $OUT .= '<li>{%message=INSTALLER_CHANGED_ELEMENT_EXTENSION=' . str_replace('_', '-', $element) . '%}</li>';
+                       $OUT .= '<li>{%message,INSTALLER_CHANGED_ELEMENT_EXTENSION=' . str_replace('_', '-', $element) . '%}</li>';
                } else {
                        // Add generic row
                        $OUT .= '<li>{--INSTALLER_CHANGED_ELEMENT_' . strtoupper($element) . '--}</li>';