steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user forward.php, 1.2, 1.3 user.php, 1.15, 1.16 vacation.php, 1.2, 1.3

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	forward.php user.php vacation.php 
Log Message:
gettext preparation complete + no hardcoded paths

Index: forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- forward.php	18 Jul 2004 01:36:13 -0000	1.2
+++ forward.php	19 Jul 2004 01:36:59 -0000	1.3
@@ -1,6 +1,6 @@
 <?php
 /*
- (c) 2004 Klarlvdalens 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.
@@ -22,7 +22,7 @@
 $errors = array();
 if( (@include_once 'admin/include/Sieve.php' ) === false ) {
   $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available');
-  $errors[] = _('Suggest your system administrator to run "/kolab/bin/pear install http://pear.php.net/get/Net_Sieve" on the server');
+  $errors[] = _("Suggest your system administrator to run \"$kolab_prefix/bin/pear install http://pear.php.net/get/Net_Sieve\" on the server");
 }
 
 /**** Authentication etc. ***/

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- user.php	18 Jul 2004 01:36:13 -0000	1.15
+++ user.php	19 Jul 2004 01:36:59 -0000	1.16
@@ -331,10 +331,10 @@
 																	sha1( $_POST['password_0'])));
 		 if( $_POST['accttype'] > 0 ) {
 		   // We have a group or resource, create encrypted pw
-		   $pubkeydata=file_get_contents("/kolab/etc/kolab/res_pub.pem" );		   
+		   $pubkeydata=file_get_contents("$kolab_prefix/etc/kolab/res_pub.pem" );		   
 		   $pkey = openssl_pkey_get_public( $pubkeydata );
 		   if( $pkey === false ) {
-			 $sslerr = _("Could not read resource encryption public key file://kolab/etc/kolab/res_pub.pem: ");
+			 $sslerr = _("Could not read resource encryption public key file://$kolab_prefix/etc/kolab/res_pub.pem: ");
 			 while( $msg = openssl_error_string() )
 			   $sslerr .= $msg.' ';
 			 $errors[] = $sslerr;

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vacation.php	18 Jul 2004 01:36:13 -0000	1.2
+++ vacation.php	19 Jul 2004 01:36:59 -0000	1.3
@@ -1,6 +1,6 @@
 <?php
 /*
- (c) 2004 Klarlvdalens 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.
@@ -22,7 +22,7 @@
 $errors = array();
 if( (@include_once 'admin/include/Sieve.php' ) === false ) {
   $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available');
-  $errors[] = _('Suggest your system administrator to run "/kolab/bin/pear install http://pear.php.net/get/Net_Sieve" on the server');
+  $errors[] = _("Suggest your system administrator to run \"$kolab_prefix/bin/pear install http://pear.php.net/get/Net_Sieve\" on the server");
 }
 
 /**** Authentication etc. ***/