steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.27, 1.28

[cvs at intevation.de]

Author: steffen

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

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

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ldap.class.php	14 Jul 2005 23:07:30 -0000	1.27
+++ ldap.class.php	13 Oct 2005 01:50:00 -0000	1.28
@@ -181,10 +181,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;	
   }
@@ -197,7 +197,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;
   }
@@ -211,10 +211,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;
   }
@@ -227,7 +227,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;
   }
@@ -241,10 +241,10 @@
       if( $entries['count'] == 1 ) {
         return $entries[0]['alias'][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;
   }
@@ -257,7 +257,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;
   }
@@ -270,7 +270,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;
   }