extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed handling for prefixes, prefix was not uses for saveing the prefs

Browse Source
This commit is contained in:
Ralf Becker 2003-04-06 10:35:51 +00:00
parent 8581021032
commit cbff06a182
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
preferences/preferences.php
View File

@ -225,10 +225,20 @@
$t->fp('rows',process_help($help) ? 'help_row' : 'row',True); $t->fp('rows',process_help($help) ? 'help_row' : 'row',True);
} }
function process_array(&$_p, $array) function process_array(&$_p,$array,$prefix='')
{ {
$_appname = check_app(); $_appname = check_app();
$prefs = &$_p->data[$_appname];
if ($prefix != '')
{
$prefix_arr = explode('/',$prefix);
foreach ($prefix_arr as $pre)
{
$prefs = &$prefs[$pre];
}
}
while (is_array($array) && list($var,$value) = each($array)) while (is_array($array) && list($var,$value) = each($array))
{ {
if (isset($value) && $value != '' && $value != '**NULL**') if (isset($value) && $value != '' && $value != '**NULL**')
@ -241,13 +251,15 @@
continue; // dont write empty password-fields continue; // dont write empty password-fields
} }
} }
$_p->add($_appname,$var,$value); $prefs[$var] = $value;
} }
else else
{ {
unset($_p->data[$_appname][$var]); unset($prefs[$var]);
} }
} }
//echo "prefix='$prefix', prefs=<pre>"; print_r($_p->data[$_appname]);
$_p->save_repository(True); $_p->save_repository(True);
} }
@ -267,7 +279,9 @@
/* and is able to create less powerfull admins. This will handle the ACL checks for that (jengo) */ /* and is able to create less powerfull admins. This will handle the ACL checks for that (jengo) */
function is_admin() function is_admin()
{ {
if (HAS_ADMIN_RIGHTS == 1 && !isset($_GET['prefix'])) // tabs only without prefix global $prefix;
if (HAS_ADMIN_RIGHTS == 1 && empty($prefix)) // tabs only without prefix
{ {
return True; return True;
} }
@ -290,6 +304,8 @@
$session_data = $GLOBALS['phpgw']->session->appsession('session_data','preferences'); $session_data = $GLOBALS['phpgw']->session->appsession('session_data','preferences');
$prefix = get_var('prefix',array('GET'),$session_data['appname'] == $_GET['appname'] ? $session_data['prefix'] : '');
if (is_admin()) if (is_admin())
{ {
/* This is where we will keep track of our postion. */ /* This is where we will keep track of our postion. */
@ -306,10 +322,8 @@
{ {
$GLOBALS['type'] = 'user'; $GLOBALS['type'] = 'user';
} }
$prefix = get_var('prefix',array('GET'),$session_data['prefix']); $show_help = "$session_data[show_help]" != '' && $session_data['appname'] == $_GET['appname'] ?
$session_data['show_help'] : intval($GLOBALS['phpgw_info']['user']['preferences']['common']['show_help']);
$show_help = "$session_data[show_help]" != '' ? $session_data['show_help'] :
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['show_help']);
if ($toggle_help = get_var('toggle_help','POST')) if ($toggle_help = get_var('toggle_help','POST'))
{ {
@ -329,7 +343,7 @@
/* Don't use a switch here, we need to check some permissions durring the ifs */ /* Don't use a switch here, we need to check some permissions durring the ifs */
if ($GLOBALS['type'] == 'user' || !($GLOBALS['type'])) if ($GLOBALS['type'] == 'user' || !($GLOBALS['type']))
{ {
process_array($GLOBALS['phpgw']->preferences, $user); process_array($GLOBALS['phpgw']->preferences,$user,$prefix);
} }
if ($GLOBALS['type'] == 'default' && is_admin()) if ($GLOBALS['type'] == 'default' && is_admin())
@ -347,23 +361,21 @@
$GLOBALS['phpgw']->redirect_link('/preferences/index.php'); $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
} }
if ($GLOBALS['type'] == 'user' && $_GET['appname'] == 'preferences') // changes for the admin itself if ($GLOBALS['type'] == 'user' && $_GET['appname'] == 'preferences' && $user['show_help'] != '')
{
if ($user['show_help'] != '')
{ {
$show_help = $user['show_help']; // use it, if admin changes his help-prefs $show_help = $user['show_help']; // use it, if admin changes his help-prefs
} }
if ($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] != $user['lang'])
{
$GLOBALS['phpgw']->redirect_link('/preferences/preferences.php','appname='.$_GET['appname']);
}
}
} }
$GLOBALS['phpgw']->session->appsession('session_data','preferences',array( $GLOBALS['phpgw']->session->appsession('session_data','preferences',array(
'type' => $GLOBALS['type'], // save our state in the app-session 'type' => $GLOBALS['type'], // save our state in the app-session
'show_help' => $show_help, 'show_help' => $show_help,
'prefix' => $prefix 'prefix' => $prefix,
'appname' => $_GET['appname'] // we use this to reset prefix on appname-change
)); ));
// changes for the admin itself, should have immediate feedback ==> redirect
if ($_POST['submit'] && $GLOBALS['type'] == 'user' && $_GET['appname'] == 'preferences') {
$GLOBALS['phpgw']->redirect_link('/preferences/preferences.php','appname='.$_GET['appname']);
}
if ($_GET['appname'] == 'preferences') if ($_GET['appname'] == 'preferences')
{ {
@ -387,10 +399,10 @@
default: default:
$prefs = &$GLOBALS['phpgw']->preferences->data[check_app()]; $prefs = &$GLOBALS['phpgw']->preferences->data[check_app()];
// use prefix if given in the url, used for email extra-accounts // use prefix if given in the url, used for email extra-accounts
if ($_GET['prefix'] != '') if ($prefix != '')
{ {
$prefix = explode('/',$_GET['prefix']); $prefix_arr = explode('/',$prefix);
foreach ($prefix as $pre) foreach ($prefix_arr as $pre)
{ {
$prefs = &$prefs[$pre]; $prefs = &$prefs[$pre];
} }