steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user deliver.php, 1.1.2.1, 1.1.2.2 forward.php, 1.11, 1.11.2.1 user.php, 1.62, 1.62.2.1 vacation.php, 1.17, 1.17.2.1

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv9358/kolab-webadmin/www/admin/user

Modified Files:
      Tag: kolab_2_0_branch
	deliver.php forward.php user.php vacation.php 
Log Message:
Backport of fix for Issue915 (encoding problem)

Index: deliver.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- deliver.php	27 Jul 2005 21:03:22 -0000	1.1.2.1
+++ deliver.php	29 Aug 2005 21:28:50 -0000	1.1.2.2
@@ -64,7 +64,7 @@
 	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 		$errors[] = $res->getMessage();
 		$errors[] = _('Script was:');
-		$errors[] = '<pre>'.htmlentities($script).'</pre>';
+		$errors[] = '<pre>'.MySmarty::htmlentities($script).'</pre>';
 	  }
 	  if( !$active && $sieve->getActive() === $scriptname ) {
 		$sieve->setActive( '' );

Index: forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- forward.php	11 Mar 2005 09:11:15 -0000	1.11
+++ forward.php	29 Aug 2005 21:28:50 -0000	1.11.2.1
@@ -68,7 +68,7 @@
 	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 		$errors[] = $res->getMessage();
 		$errors[] = _('Script was:');
-		$errors[] = '<pre>'.htmlentities($script).'</pre>';
+		$errors[] = '<pre>'.MySmarty::htmlentities($script).'</pre>';
 	  }
 	  if( !$active && $sieve->getActive() === $scriptname ) {
 		$sieve->setActive( '' );

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -u -d -r1.62 -r1.62.2.1
--- user.php	30 May 2005 11:53:35 -0000	1.62
+++ user.php	29 Aug 2005 21:28:50 -0000	1.62.2.1
@@ -83,7 +83,7 @@
   foreach( $lst as $alias ) {
 	debug( "looking at $alias, exluding $dn" );
 	if( $ldap->countMail( $_SESSION['base_dn'], $alias, $excludedn ) > 0 ) {
-	  $str .= _('Email address ').htmlentities($alias)._(' collision <br />');
+	  $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision <br />');
 	}
   }
   return $str;
@@ -99,7 +99,7 @@
   $str = '';
   foreach( $lst as $uid ) {
     if( $ldap->countMail( $_SESSION['base_dn'], $uid, $excludedn ) > 0 ) {
-      $str .= _('UID ').htmlentities($uid)._(' collision <br />');
+      $str .= _('UID ').MySmarty::htmlentities($uid)._(' collision <br />');
     }
   }
   return $str;

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- vacation.php	19 May 2005 23:51:17 -0000	1.17
+++ vacation.php	29 Aug 2005 21:28:50 -0000	1.17.2.1
@@ -50,7 +50,7 @@
 	if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 	  $errors[] = $res->getMessage();
 	  $errors[] = 'Script was:';
-	  $errors[] = '<pre>'.htmlentities($script).'</pre>';
+	  $errors[] = '<pre>'.MySmarty::htmlentities($script).'</pre>';
 	}
 	if( !$active && $sieve->getActive() === $scriptname ) {
 	  $sieve->setActive( '' );