From 63ca721bd5903096ab0570d0358f35a4de9f3a4c Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Tue, 18 Sep 2001 01:26:21 +0000
Subject: [PATCH] Possible fixes for some small problems in the preferences.

---
 preferences/index.php       | 24 ++++++++++++------------
 preferences/preferences.php | 21 +++++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/preferences/index.php b/preferences/index.php
index cd051c6a60..b1e3805d4e 100755
--- a/preferences/index.php
+++ b/preferences/index.php
@@ -28,43 +28,44 @@
 	$pref_tpl->set_block('pref','link_row');
 	$pref_tpl->set_block('pref','spacer_row');
 
-	if ($phpgw->acl->check('run',1,'admin'))
+	if ($GLOBALS['phpgw']->acl->check('run',1,'admin'))
 	{
 		// This is where we will keep track of our postion.
 		// Developers won't have to pass around a variable then
-		$session_data = $phpgw->session->appsession('session_data','preferences');
+		$session_data = $GLOBALS['phpgw']->session->appsession('session_data','preferences');
 
 		if (! is_array($session_data))
 		{
 			$session_data = array(
 				'type' => 'user'
 			);
-			$phpgw->session->appsession('session_data','preferences',$session_data);
+			$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
 		}
 
-		if (! $GLOBALS['type'])
+		if (! $GLOBALS['HTTP_GET_VARS']['type'])
 		{
 			$type = $session_data['type'];
 		}
 		else
 		{
+			$type = $GLOBALS['HTTP_GET_VARS']['type'];
 			$session_data = array(
-				'type' => $GLOBALS['type']
+				'type' => $type
 			);
-			$phpgw->session->appsession('session_data','preferences',$session_data);
+			$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
 		}
 
 		$tabs[] = array(
 			'label' => 'Your preferences',
-			'link'  => $phpgw->link('/preferences/index.php','type=user')
+			'link'  => $GLOBALS['phpgw']->link('/preferences/index.php','type=user')
 		);
 		$tabs[] = array(
 			'label' => 'Default preferences',
-			'link'  => $phpgw->link('/preferences/index.php','type=default')
+			'link'  => $GLOBALS['phpgw']->link('/preferences/index.php','type=default')
 		);
 		$tabs[] = array(
 			'label' => 'Forced preferences',
-			'link'  => $phpgw->link('/preferences/index.php','type=forced')
+			'link'  => $GLOBALS['phpgw']->link('/preferences/index.php','type=forced')
 		);
 
 		switch($type)
@@ -73,7 +74,7 @@
 			case 'default':	$selected = 1; break;
 			case 'forced':		$selected = 2; break;
 		}
-		$pref_tpl->set_var('tabs',$phpgw->common->create_tabs($tabs,$selected));
+		$pref_tpl->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
 	}
 
 	// This func called by the includes to dump a row header
@@ -123,8 +124,7 @@
 
 	function display_section($appname,$title,$file)
 	{
-		global $phpgw;
-		section_start($title,$phpgw->common->image($appname,Array('navbar.gif',$appname.'.gif')),$appname);
+		section_start($title,$GLOBALS['phpgw']->common->image($appname,Array('navbar.gif',$appname.'.gif')),$appname);
 
 		while(list($text,$url) = each($file))
 		{
diff --git a/preferences/preferences.php b/preferences/preferences.php
index e140360258..3005f47ad6 100755
--- a/preferences/preferences.php
+++ b/preferences/preferences.php
@@ -208,29 +208,30 @@
 			$phpgw->session->appsession('session_data','preferences',$session_data);
 		}
 
-		if (! $GLOBALS['type'])
+		if (!isset($GLOBALS['HTTP_GET_VARS']['type']))
 		{
 			$type = $session_data['type'];
 		}
 		else
 		{
+			$type = $GLOBALS['HTTP_GET_VARS']['type'];
 			$session_data = array(
-				'type' => $GLOBALS['type']
+				'type' => $type
 			);
 			$phpgw->session->appsession('session_data','preferences',$session_data);
 		}
 
 		$tabs[] = array(
 			'label' => 'Your preferences',
-			'link'  => $phpgw->link('/preferences/preferences.php','appname=' . $appname . '&type=user')
+			'link'  => $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $appname . '&type=user')
 		);
 		$tabs[] = array(
 			'label' => 'Default preferences',
-			'link'  => $phpgw->link('/preferences/preferences.php','appname=' . $appname . '&type=default')
+			'link'  => $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $appname . '&type=default')
 		);
 		$tabs[] = array(
 			'label' => 'Forced preferences',
-			'link'  => $phpgw->link('/preferences/preferences.php','appname=' . $appname . '&type=forced')
+			'link'  => $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $appname . '&type=forced')
 		);
 
 		switch($type)
@@ -239,11 +240,11 @@
 			case 'default':	$selected = 1; break;
 			case 'forced':		$selected = 2; break;
 		}
-		$t->set_var('tabs',$phpgw->common->create_tabs($tabs,$selected));
+		$t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
 	}
 	else
 	{
-		$GLOBALS['type'] = 'user';
+		$type = 'user';
 	}
 
 	/* Only load if there working on the default preferences */
@@ -258,17 +259,17 @@
 		/* Don't use a switch here, we need to check some permissions durring the ifs */
 		if ($type == 'user')
 		{
-			process_array(&$p, $user);
+			process_array($p, $user);
 		}
 
 		if ($type == 'default' && is_admin())
 		{
-			process_array(&$dp, $default);		
+			process_array($dp, $default);		
 		}
 
 		if ($type == 'forced' && is_admin())
 		{
-			process_array(&$gp, $forced);
+			process_array($gp, $forced);
 		}
 
 		Header('Location: ' . $GLOBALS['phpgw']->link('/preferences/index.php'));