steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.18, 1.19 vacation.php, 1.3, 1.4

cvs at intevation.de cvs at intevation.de
Wed Aug 4 00:58:02 CEST 2004


Author: steffen

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

Modified Files:
	user.php vacation.php 
Log Message:
suggest mail+aliases for vacation msg.

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- user.php	3 Aug 2004 22:38:49 -0000	1.18
+++ user.php	3 Aug 2004 22:58:00 -0000	1.19
@@ -129,7 +129,6 @@
   $form->entries['mail_0']['value'] = $mail_0;
   $form->entries['mail_0']['attrs'] = 'readonly';
   $form->entries['uid']['value'] = $uid;
-  $form->entries['uid']['attrs'] = 'readonly';
   // accttype
   $dncomp = split( ',', $dn );
   if( in_array('cn=groups',$dncomp) ) {

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vacation.php	19 Jul 2004 01:36:59 -0000	1.3
+++ vacation.php	3 Aug 2004 22:58:00 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /*
- (c) 2004 Klarälvdalens Datakonsult AB
+ (c) 2004 Klarälvdalens Datakonsult AB
 
  This program is Free Software under the GNU General Public License (>=v2).
  Read the file COPYING that comes with this packages for details.
@@ -86,7 +86,10 @@
 	  $text = undotstuff($text);
 	}
   }
-  if( !$addresses ) $addresses = array( $auth->uid() );
+  if( !$addresses ) {
+	$object = $ldap->read( $auth->dn() );
+	$addresses = array_merge( $object['mail'], $object['alias'] );
+  }
   if( !$days ) $days = 7;
   if( !$text ) {
 	$date = strftime(_('%x'));





More information about the commits mailing list