From 6a675521bf2bf11b0cd521a9c602085f7bec5283 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 19 Nov 2012 01:09:30 +0000
Subject: [PATCH] Continued: - Renamed setOutputMode() to setScriptOutputMode()
 to be more conform with   getScriptOutput() - Added template for AJAX scripts
 - Added check for isAjaxOutput() and isInstallationPhase() to proper scripts

---
 .gitattributes              |  1 +
 inc/ajax/ajax_              | 44 +++++++++++++++++++++++++++++++++++++
 inc/ajax/ajax_admin.php     |  3 ++-
 inc/ajax/ajax_installer.php |  2 +-
 inc/wrapper-functions.php   |  4 ++--
 5 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 inc/ajax/ajax_

diff --git a/.gitattributes b/.gitattributes
index f90a825e2d..72ff75a341 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -83,6 +83,7 @@ img/uberwach/uberwach-kamera-gruen.gif -text svneol=unset#image/gif
 inc/.htaccess svneol=native#text/plain
 inc/ajax-functions.php svneol=native#text/plain
 inc/ajax/.htaccess svneol=native#text/plain
+inc/ajax/ajax_ svneol=native#text/plain
 inc/ajax/ajax_admin.php svneol=native#text/plain
 inc/ajax/ajax_installer.php svneol=native#text/plain
 inc/autopurge.php -text
diff --git a/inc/ajax/ajax_ b/inc/ajax/ajax_
new file mode 100644
index 0000000000..84b5c7f2b7
--- /dev/null
+++ b/inc/ajax/ajax_
@@ -0,0 +1,44 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 06/24/2012 *
+ * ===================                          Last change: 06/24/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : ajax_admin.php                                   *
+ * -------------------------------------------------------------------- *
+ * Short description : AJAX library for admin menu                      *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : AJAX-Bibliothek fuer Adminmenu                   *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAjaxOutputMode())) {
+	die();
+} // END - if
+
+// [EOF]
+?>
diff --git a/inc/ajax/ajax_admin.php b/inc/ajax/ajax_admin.php
index 05d9d690f1..827af52ec4 100644
--- a/inc/ajax/ajax_admin.php
+++ b/inc/ajax/ajax_admin.php
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isAdmin())) {
+if ((!defined('__SECURITY')) || (!isAjaxOutputMode()) || (!isAdmin())) {
 	die();
 } // END - if
 
@@ -108,5 +108,6 @@ function doAjaxAdminRequestContent () {
 		}
 	} // END - if
 }
+
 // [EOF]
 ?>
diff --git a/inc/ajax/ajax_installer.php b/inc/ajax/ajax_installer.php
index 425c81b029..5267a3aee5 100644
--- a/inc/ajax/ajax_installer.php
+++ b/inc/ajax/ajax_installer.php
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (!defined('__SECURITY')) {
+if ((!defined('__SECURITY')) || (!isAjaxOutputMode()) || (!isInstallationPhase())) {
 	die();
 } // END - if
 
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index e312c565a0..2e401e4bc5 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -707,7 +707,7 @@ function getScriptOutputMode () {
 }
 
 // Setter for 'output_mode' value
-function setOutputMode ($newOutputMode) {
+function setScriptOutputMode ($newOutputMode) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'output_mode=' . $newOutputMode);
 	$GLOBALS['__output_mode'] = (int) $newOutputMode;
 }
@@ -1176,7 +1176,7 @@ function sendRawRedirect ($url) {
 	$GLOBALS['__output'] = '';
 
 	// To make redirects working (no content type), output mode must be raw
-	setOutputMode(-1);
+	setScriptOutputMode(-1);
 
 	// Send helping header
 	setHttpStatus('302 Found');
-- 
2.39.5