[eGroupWare-cvs] preferences/inc class.uisettings.inc.php,1.8,1.9

[<ral...@us...>]

Update of /cvsroot/egroupware/preferences/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8435/inc

Modified Files:
	class.uisettings.inc.php 
Log Message:
support for the old format of the hook_settings file, as asked by Regis Leroy

Index: class.uisettings.inc.php
===================================================================
RCS file: /cvsroot/egroupware/preferences/inc/class.uisettings.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.uisettings.inc.php	29 Jul 2005 12:54:28 -0000	1.8
--- class.uisettings.inc.php	30 Jul 2005 08:12:13 -0000	1.9
***************
*** 38,42 ****
  				$GLOBALS['egw']->redirect_link('/preferences/index.php');
  			}
! 
  			$user    = get_var('user',Array('POST'));
  			$forced  = get_var('forced',Array('POST'));
--- 38,56 ----
  				$GLOBALS['egw']->redirect_link('/preferences/index.php');
  			}
! 			if (substr($_SERVER['PHP_SELF'],-15) == 'preferences.php')
! 			{
! 				$pref_link = '/preferences/preferences.php';
! 				$link_params = array(
! 					'appname'    => $_GET['appname'],
! 				);
! 			}
! 			else
! 			{
! 				$pref_link = '/index.php';
! 				$link_params = array(
! 					'menuaction' => 'preferences.uisettings.index',
! 					'appname'    => $_GET['appname'],
! 				);
! 			}
  			$user    = get_var('user',Array('POST'));
  			$forced  = get_var('forced',Array('POST'));
***************
*** 119,127 ****
  			if(!$error && ($_POST['save'] || $_POST['apply']) && $GLOBALS['type'] == 'user' && $_GET['appname'] == 'preferences')
  			{
! 				$GLOBALS['egw']->redirect_link('/index.php','menuaction=preferences.uisettings.index&appname=' . $_GET['appname']);
  			}
  
  			$this->t->set_var('messages',$error);
! 			$this->t->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname=' . $_GET['appname']));
  			$this->t->set_var('th_bg',  $GLOBALS['egw_info']['theme']['th_bg']);
  			$this->t->set_var('th_text',$GLOBALS['egw_info']['theme']['th_text']);
--- 133,141 ----
  			if(!$error && ($_POST['save'] || $_POST['apply']) && $GLOBALS['type'] == 'user' && $_GET['appname'] == 'preferences')
  			{
! 				$GLOBALS['egw']->redirect_link($pref_link,$link_params);
  			}
  
  			$this->t->set_var('messages',$error);
! 			$this->t->set_var('action_url',$GLOBALS['egw']->link($pref_link,$link_params));
  			$this->t->set_var('th_bg',  $GLOBALS['egw_info']['theme']['th_bg']);
  			$this->t->set_var('th_text',$GLOBALS['egw_info']['theme']['th_text']);
***************
*** 239,251 ****
  				$tabs[] = array(
  					'label' => lang('Your preferences'),
! 					'link'  => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname=' . $_GET['appname'] . "&type=user")
  				);
  				$tabs[] = array(
  					'label' => lang('Default preferences'),
! 					'link'  => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname=' . $_GET['appname'] . "&type=default")
  				);
  				$tabs[] = array(
  					'label' => lang('Forced preferences'),
! 					'link'  => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname=' . $_GET['appname'] . "&type=forced")
  				);
  
--- 253,265 ----
  				$tabs[] = array(
  					'label' => lang('Your preferences'),
! 					'link'  => $GLOBALS['egw']->link($pref_link,$link_params+array('type'=>'user')),
  				);
  				$tabs[] = array(
  					'label' => lang('Default preferences'),
! 					'link'  => $GLOBALS['egw']->link($pref_link,$link_params+array('type'=>'default')),
  				);
  				$tabs[] = array(
  					'label' => lang('Forced preferences'),
! 					'link'  => $GLOBALS['egw']->link($pref_link,$link_params+array('type'=>'forced')),
  				);