From c67fd7c7ee3b30b469f8ef8daaa13e2e01ce5a44 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Wed, 5 Dec 2001 16:19:12 +0000
Subject: [PATCH] Fix for passing phpgw_info in the querystring

---
 about.php                   |  1 +
 addressbook/addfield.php    |  1 +
 addressbook/csv_import.php  |  1 +
 addressbook/deletefield.php |  1 +
 addressbook/editfield.php   |  1 +
 addressbook/fields.php      |  1 +
 addressbook/index.php       |  2 ++
 admin/index.php             | 11 +++++------
 soap.php                    |  1 +
 xmlrpc.php                  |  3 ++-
 10 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/about.php b/about.php
index a317e8f134..1c83b54b58 100644
--- a/about.php
+++ b/about.php
@@ -11,6 +11,7 @@
 
   /* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'about';
 	$GLOBALS['phpgw_info']['flags']['disable_Template_class'] = True;
 	include('header.inc.php');
diff --git a/addressbook/addfield.php b/addressbook/addfield.php
index 52ed610e31..dc53338dde 100644
--- a/addressbook/addfield.php
+++ b/addressbook/addfield.php
@@ -12,6 +12,7 @@
 
   /* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
 	include('../header.inc.php');
 
diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index d6ca5ddc3c..ca82861b77 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -12,6 +12,7 @@
 
   /* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
 	$GLOBALS['phpgw_info']['flags']['enable_contacts_class'] = True;
 	include('../header.inc.php');
diff --git a/addressbook/deletefield.php b/addressbook/deletefield.php
index bf439b5edc..c7237b779f 100644
--- a/addressbook/deletefield.php
+++ b/addressbook/deletefield.php
@@ -11,6 +11,7 @@
   \**************************************************************************/
   /* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	if ($HTTP_POST_VARS['confirm'])
 	{
 		$GLOBALS['phpgw_info']['flags'] = array(
diff --git a/addressbook/editfield.php b/addressbook/editfield.php
index c3374129f1..0a26d3a444 100644
--- a/addressbook/editfield.php
+++ b/addressbook/editfield.php
@@ -11,6 +11,7 @@
   \**************************************************************************/
   /* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw']_info['flags']['currentapp'] = 'addressbook';
 	include('../header.inc.php');
 
diff --git a/addressbook/fields.php b/addressbook/fields.php
index 86e8ce76ca..57ab4a9c5c 100644
--- a/addressbook/fields.php
+++ b/addressbook/fields.php
@@ -11,6 +11,7 @@
   \**************************************************************************/
   /* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'currentapp' => 'addressbook',
 		'enable_nextmatchs_class' => True
diff --git a/addressbook/index.php b/addressbook/index.php
index 223d224932..0efb70a7b1 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -14,6 +14,8 @@
 
 	/* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
+
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'currentapp' => 'addressbook',
 		'noheader'   => True,
diff --git a/admin/index.php b/admin/index.php
index ed089fa65d..821bb84269 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -14,15 +14,14 @@
 
 	/* $Id$ */
 
-	$phpgw_info['flags']['currentapp'] = 'admin';
+	$GLOBALS['phpgw_info'] = array();
+	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'admin';
 	include('../header.inc.php');
 
 	$GLOBALS['admin_tpl'] = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
-	$GLOBALS['admin_tpl']->set_file(
-		Array(
-			'admin' => 'index.tpl'
-		)
-	);
+	$GLOBALS['admin_tpl']->set_file(array(
+		'admin' => 'index.tpl'
+	));
 
 	$GLOBALS['admin_tpl']->set_block('admin','list');
 	$GLOBALS['admin_tpl']->set_block('admin','app_row');
diff --git a/soap.php b/soap.php
index 59f26f0eaa..ecaac6df8c 100644
--- a/soap.php
+++ b/soap.php
@@ -12,6 +12,7 @@
 
 	/* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'disable_Template_class' => True,
 		'currentapp' => 'login',
diff --git a/xmlrpc.php b/xmlrpc.php
index 207ef0b583..1f3bec485d 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -12,6 +12,7 @@
 
   /* $Id$ */
 
+	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'currentapp' => 'login',
 		'noheader'   => True
@@ -22,7 +23,7 @@
 	$server = CreateObject('phpgwapi.xmlrpc_server');
 	$server->authed = False;
 	/* _debug_array($server);exit; */
-	//include(PHPGW_API_INC . '/xmlrpc.interop.php');
+	include(PHPGW_API_INC . '/xmlrpc.interop.php');
 
 	$headers = getallheaders();