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

fixed not working notifies (textfields with variable replacements)

Browse Source
This commit is contained in:
Ralf Becker 2005-07-26 13:54:59 +00:00
parent 7208e6b85c
commit 1ea908b40f
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
preferences/inc/class.bosettings.inc.php
View File

@ -166,9 +166,9 @@
} }
$prefs[$var] = get_magic_quotes_gpc() ? stripslashes($value) : $value; $prefs[$var] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
if($this->session_data['notifies'][$var]) // need to translate the key-words back if($notifies[$var]) // need to translate the key-words back
{ {
$prefs[$var] = $GLOBALS['egw']->preferences->lang_notify($prefs[$var],$this->session_data['notifies'][$var],True); $prefs[$var] = $GLOBALS['egw']->preferences->lang_notify($prefs[$var],$notifies[$var],True);
} }
} }
else else

19
preferences/inc/class.uisettings.inc.php
View File

@ -131,7 +131,7 @@
$this->bo->_read($this->check_app(),$this->prefix,$GLOBALS['type']); $this->bo->_read($this->check_app(),$this->prefix,$GLOBALS['type']);
//echo "prefs=<pre>"; print_r($this->bo->prefs); echo "</pre>\n"; //echo "prefs=<pre>"; print_r($this->bo->prefs); echo "</pre>\n";
$notifies = array(); $this->notifies = array();
if(!$this->bo->call_hook($_GET['appname'])) if(!$this->bo->call_hook($_GET['appname']))
{ {
$this->t->set_block('preferences','form','formhandle'); // skip the form $this->t->set_block('preferences','form','formhandle'); // skip the form
@ -217,7 +217,6 @@
$valarray['values'], $valarray['values'],
$valarray['subst_help'] $valarray['subst_help']
); );
@$notifies[$valarray['name']] = $valarray;
break; break;
} }
} }
@ -228,10 +227,10 @@
echo parse_navbar(); echo parse_navbar();
// TODO - what is the purpose of this? // TODO - what is the purpose of this?
if(count($notifies)) // there have been notifies in the hook, we need to save in the session if(count($this->notifies)) // there have been notifies in the hook, we need to save in the session
{ {
$this->bo->save_session($_GET['appname'],$GLOBALS['type'],$this->show_help,$this->prefix,$notifies); $this->bo->save_session($_GET['appname'],$GLOBALS['type'],$this->show_help,$this->prefix,$this->notifies);
//_debug_array($notifies); //echo "notifies="; _debug_array($this->notifies);
} }
if($this->is_admin()) if($this->is_admin())
{ {
@ -342,9 +341,9 @@
{ {
$def_text = !$GLOBALS['egw']->preferences->user[$_appname][$name] ? $GLOBALS['egw']->preferences->data[$_appname][$name] : $GLOBALS['egw']->preferences->default[$_appname][$name]; $def_text = !$GLOBALS['egw']->preferences->user[$_appname][$name] ? $GLOBALS['egw']->preferences->data[$_appname][$name] : $GLOBALS['egw']->preferences->default[$_appname][$name];
if(isset($notifies[$name])) // translate the substitution names if(isset($this->notifies[$name])) // translate the substitution names
{ {
$def_text = $GLOBALS['egw']->preferences->lang_notify($def_text,$notifies[$name]); $def_text = $GLOBALS['egw']->preferences->lang_notify($def_text,$this->notifies[$name]);
} }
$def_text = $def_text != '' ? ' <i><font size="-1">'.lang('default').':&nbsp;'.$def_text.'</font></i>' : ''; $def_text = $def_text != '' ? ' <i><font size="-1">'.lang('default').':&nbsp;'.$def_text.'</font></i>' : '';
} }
@ -482,7 +481,7 @@
} }
$this->bo->prefs[$name] = $GLOBALS['egw']->preferences->lang_notify($this->bo->prefs[$name],$vars); $this->bo->prefs[$name] = $GLOBALS['egw']->preferences->lang_notify($this->bo->prefs[$name],$vars);
$notifies[$name] = $vars; // this gets saved in the app_session for re-translation $this->notifies[$name] = $vars; // this gets saved in the app_session for re-translation
$help = $help && ($run_lang || is_null($run_lang)) ? lang($help) : $help; $help = $help && ($run_lang || is_null($run_lang)) ? lang($help) : $help;
if($subst_help || is_null($subst_help)) if($subst_help || is_null($subst_help))
@ -524,9 +523,9 @@
{ {
$def_text = !$GLOBALS['egw']->preferences->user[$_appname][$name] ? $GLOBALS['egw']->preferences->data[$_appname][$name] : $GLOBALS['egw']->preferences->default[$_appname][$name]; $def_text = !$GLOBALS['egw']->preferences->user[$_appname][$name] ? $GLOBALS['egw']->preferences->data[$_appname][$name] : $GLOBALS['egw']->preferences->default[$_appname][$name];
if(isset($notifies[$name])) // translate the substitution names if(isset($this->notifies[$name])) // translate the substitution names
{ {
$def_text = $GLOBALS['egw']->preferences->lang_notify($def_text,$notifies[$name]); $def_text = $GLOBALS['egw']->preferences->lang_notify($def_text,$this->notifies[$name]);
} }
$def_text = $def_text != '' ? '<br><i><font size="-1"><b>'.lang('default').'</b>:<br>'.nl2br($def_text).'</font></i>' : ''; $def_text = $def_text != '' ? '<br><i><font size="-1"><b>'.lang('default').'</b>:<br>'.nl2br($def_text).'</font></i>' : '';
} }