[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] preferences preferences.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] preferences preferences.php |
Date: |
Wed, 21 Feb 2007 18:45:17 +0000 |
CVSROOT: /sources/phpgroupware
Module name: preferences
Changes by: Sigurd Nes <sigurdne> 07/02/21 18:45:17
Modified files:
. : preferences.php
Log message:
notices, utf
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/preferences/preferences.php?cvsroot=phpgroupware&r1=1.43&r2=1.44
Patches:
Index: preferences.php
===================================================================
RCS file: /sources/phpgroupware/preferences/preferences.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- preferences.php 20 Dec 2006 08:34:42 -0000 1.43
+++ preferences.php 21 Feb 2007 18:45:17 -0000 1.44
@@ -5,7 +5,7 @@
* @copyright Copyright (C) 2000-2006 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package preferences
- * @version $Id: preferences.php,v 1.43 2006/12/20 08:34:42 sigurdne Exp
$
+ * @version $Id: preferences.php,v 1.44 2007/02/21 18:45:17 sigurdne Exp
$
*/
$GLOBALS['phpgw_info']['flags'] = array
@@ -151,7 +151,9 @@
if ($GLOBALS['type'] == 'user')
{
- $def_text =
(!isset($GLOBALS['phpgw']->preferences->user[$_appname][$name]) ||
!$GLOBALS['phpgw']->preferences->user[$_appname][$name]) ?
$GLOBALS['phpgw']->preferences->data[$_appname][$name] :
$GLOBALS['phpgw']->preferences->default[$_appname][$name];
+ $def_text =
(!isset($GLOBALS['phpgw']->preferences->user[$_appname][$name]) ||
!$GLOBALS['phpgw']->preferences->user[$_appname][$name]) ?
+
(isset($GLOBALS['phpgw']->preferences->data[$_appname][$name])?$GLOBALS['phpgw']->preferences->data[$_appname][$name]:'')
:
+
(isset($GLOBALS['phpgw']->preferences->default[$_appname][$name])?$GLOBALS['phpgw']->preferences->default[$_appname][$name]:'');
if (isset($notifys[$name])) // translate the
substitution names
{
@@ -371,7 +373,7 @@
if ($GLOBALS['type'] == 'user')
{
- $def_text =
!$GLOBALS['phpgw']->preferences->user[$_appname][$name] ?
$GLOBALS['phpgw']->preferences->data[$_appname][$name] :
$GLOBALS['phpgw']->preferences->default[$_appname][$name];
+ $def_text =
!isset($GLOBALS['phpgw']->preferences->user[$_appname][$name]) ||
!$GLOBALS['phpgw']->preferences->user[$_appname][$name] ?
$GLOBALS['phpgw']->preferences->data[$_appname][$name] :
(isset($GLOBALS['phpgw']->preferences->default[$_appname][$name])?$GLOBALS['phpgw']->preferences->default[$_appname][$name]:'');
if (isset($notifys[$name])) // translate the
substitution names
{
@@ -379,7 +381,7 @@
}
$def_text = $def_text != '' ? '<br><i><font
size="-1"><b>'.lang('default').'</b>:<br>'.nl2br($def_text).'</font></i>' : '';
}
- $t->set_var('row_value',"<textarea rows=\"$rows\"
cols=\"$cols\"
name=\"${GLOBALS['type']}[$name]\">".htmlentities($default)."</textarea>$def_text");
+ $t->set_var('row_value',"<textarea rows=\"$rows\"
cols=\"$cols\"
name=\"${GLOBALS['type']}[$name]\">".htmlentities($default,ENT_QUOTES,'UTF-8')."</textarea>$def_text");
$t->set_var('row_name',lang($label));
$GLOBALS['phpgw']->nextmatchs->template_alternate_row_class($t);
- [Phpgroupware-cvs] preferences preferences.php,
Sigurd Nes <=