steffen: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php, 1.9, 1.10 index.php, 1.5, 1.6

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	admin.php index.php 
Log Message:
Fix for Issue545 (bad wording of errormessage about existing admin/maintainer)

Index: admin.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- admin.php	26 Oct 2004 02:51:09 -0000	1.9
+++ admin.php	30 Nov 2004 10:30:54 -0000	1.10
@@ -1,4 +1,23 @@
 <?php
+/*
+ *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ *  This  program is free  software; you can redistribute  it and/or
+ *  modify it  under the terms of the GNU  General Public License as
+ *  published by the  Free Software Foundation; either version 2, or
+ *  (at your option) any later version.
+ *
+ *  This program is  distributed in the hope that it will be useful,
+ *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  General Public License for more details.
+ *
+ *  You can view the  GNU General Public License, online, at the GNU
+ *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
 require_once('admin/include/mysmarty.php');
 require_once('admin/include/headers.php');
 require_once('admin/include/authenticate.php');
@@ -28,7 +47,7 @@
   if( is_unique( 'uid', $value ) ) {
 	return '';
   } else {
-	return _('Administrator with this UID already exists');
+	return _('Account with this UID already exists');
   }
 }
 

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.php	19 Nov 2004 01:32:26 -0000	1.5
+++ index.php	30 Nov 2004 10:30:54 -0000	1.6
@@ -1,4 +1,23 @@
 <?php
+/*
+ *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ *  This  program is free  software; you can redistribute  it and/or
+ *  modify it  under the terms of the GNU  General Public License as
+ *  published by the  Free Software Foundation; either version 2, or
+ *  (at your option) any later version.
+ *
+ *  This program is  distributed in the hope that it will be useful,
+ *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  General Public License for more details.
+ *
+ *  You can view the  GNU General Public License, online, at the GNU
+ *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
 require_once('admin/include/mysmarty.php');
 require_once('admin/include/headers.php');
 require_once('admin/include/authenticate.php');