steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include auth.class.php, 1.10, 1.10.2.1 form.class.php, 1.18.2.2, 1.18.2.3 ldap.class.php, 1.24.2.1, 1.24.2.2

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv29446/kolab-webadmin/php/admin/include

Modified Files:
      Tag: kolab_2_0_branch
	auth.class.php form.class.php ldap.class.php 
Log Message:
Fix for issue886 (i18n problem)

Index: auth.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- auth.class.php	9 Apr 2005 08:55:02 -0000	1.10
+++ auth.class.php	13 Oct 2005 01:50:24 -0000	1.10.2.1
@@ -67,7 +67,7 @@
 					$auth_group = $ldap->groupForUid( $auth_user );
 					$tmp_group = ($auth_user=='manager')?'manager':$auth_group;
 					if( !in_array( $tmp_group, $this->params['allow_user_classes'] ) ) {
-						$this->error_string = _("User class '$tmp_group' is denied access");
+					    $this->error_string = sprintf(_("User class '%s' is denied access"), $tmp_group);
 						$this->gotoLoginPage();					  
 					}
 					$bind_result = $ldap->bind( $dn, $_POST['password'] );

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- form.class.php	29 Aug 2005 21:28:50 -0000	1.18.2.2
+++ form.class.php	13 Oct 2005 01:50:24 -0000	1.18.2.3
@@ -253,7 +253,7 @@
 			if( $value['type'] == 'aclselect' ) {
 			  // ignore
 			} else if( strlen( trim($_REQUEST[$key]) ) == 0 ) {
-			  $this->errors[] = _('Required field ').$value['name']._(' is empty');
+			  $this->errors[] = sprintf( _('Required field %s is empty'), $value['name']);
 			}
 		  } else {
 			if( $value['type'] == 'aclselect' ) {

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -d -r1.24.2.1 -r1.24.2.2
--- ldap.class.php	28 Jul 2005 01:45:41 -0000	1.24.2.1
+++ ldap.class.php	13 Oct 2005 01:50:24 -0000	1.24.2.2
@@ -185,10 +185,10 @@
 	  if( $entries['count'] == 1 ) {
 		return $entries[0]['uid'][0];
 	  } else {
-		$errors[] = _("No such object $dn");
+		$errors[] = sprintf(_("No such object %s"), $dn);
 	  }
 	} else {
-	  $errors[] = _("LDAP Error searching for DN $dn: ").ldap_error($this->connection);
+	  $errors[] = sprintf(_("LDAP Error searching for DN %s: %s"), $dn, ldap_error($this->connection) );
 	}
     return false;	
   }
@@ -201,7 +201,7 @@
 	return ldap_get_dn( $this->connection, $entry );
       }
     } else {
-      echo _("Error searching for DN for UID=$uid");
+      echo sprintf( _("Error searching for DN for UID=%s"), $uid);
     }
     return false;
   }
@@ -215,10 +215,10 @@
       if( $entries['count'] == 1 ) {
         return $entries[0]['mail'][0]; 
       } else {
-        $errors[] = _("No such object $dn"); 
+        $errors[] = sprintf(_("No such object %s"), $dn); 
       } 
     } else {
-      $errors[] = _("LDAP Error searching for DN $dn: ").ldap_error($this->connection);
+      $errors[] = sprintf( _("LDAP Error searching for DN %s: %s"), $dn, ldap_error($this->connection) );
     }
     return false;
   }
@@ -231,7 +231,7 @@
         return ldap_get_dn( $this->connection, $entry );
       }
     } else {
-      echo _("Error searching for DN for Mail=$mail");
+      echo sprintf( _("Error searching for DN for Mail=%s"), $mail);
     }
     return false;
   }
@@ -248,7 +248,7 @@
         $errors[] = _("No such object $dn");
       }
     } else {
-      $errors[] = _("LDAP Error searching for DN $dn: ").ldap_error($this->connection);
+      $errors[] = sprintf( _("LDAP Error searching for DN %s: %s"), $dn, ldap_error($this->connection) );
     }
     return false;
   }
@@ -261,7 +261,7 @@
         return ldap_get_dn( $this->connection, $entry );
       }
     } else {
-      $errors[] = _("Error searching for DN for alias=$mail: ").ldap_error($this->connection);
+      $errors[] = sprintf( _("Error searching for DN for alias=%s: %s"), $mail, ldap_error($this->connection));
     }
     return false;
   }
@@ -274,7 +274,7 @@
         return ldap_get_dn( $this->connection, $entry );
       }
     } else {
-      $errors[] = _("Error searching for DN for mail_or_alias=$mail: ").ldap_error($this->connection);
+      $errors[] = sprintf(_("Error searching for DN for mail_or_alias=%s: %s"), $mail, ldap_error($this->connection));
     }
     return false;
   }
@@ -306,7 +306,7 @@
     $res = ldap_search( $this->connection, $mybase, $filter, array('member') );
     if( !$res ) {
       array_push($errors, _("LDAP Error: Can't read maintainers group: ")
-				 .ldap_error($conn) );	
+				 .ldap_error($conn) );
       return array();
     }
     $entries = ldap_get_entries( $this->connection, $res );