RELEASE 1.1.0.7

VERSION

@@ -1 +1 @@
-$Name: RELEASE-1_1_0_6 $
+$Name: RELEASE-1_1_0_7 $

config/config.php.example

@@ -169,7 +169,7 @@ $ldapservers->SetValue($i,'server','name','My LDAP Server');
 // $ldapservers->SetValue($i,'server','host','127.0.0.1');
 
 /* The port your LDAP server listens on (no quotes). 389 is standard. */
-// $ldapservers->SetValue($i,'server','port','389');
+// $ldapservers->SetValue($i,'server','port',389);
 
 /* Array of base DNs of your LDAP server. Leave this blank to have phpLDAPadmin
    auto-detect it for you. */
@@ -318,7 +318,7 @@ $ldapservers->SetValue($i,'server','name','My LDAP Server');
 
 /* The minimum number to use when searching for the next available UID number
    (only when 'search' is used for auto_uid_number_mechanism' */
-// $ldapservers->SetValue($i,'auto_number','min','1000');
+// $ldapservers->SetValue($i,'auto_number','min',1000);
 
 /* The DN of the uidPool entry when 'uidpool' mechanism is used above. */
 // $ldapservers->SetValue($i,'auto_number','uidpool_dn','cn=uidPool,dc=example,dc=com');
@@ -400,7 +400,7 @@ $ldapservers->SetValue($i,'server','name','My LDAP Server');
 $i++;
 $ldapservers->SetValue($i,'server','name','LDAP Server');
 $ldapservers->SetValue($i,'server','host','127.0.0.1');
-$ldapservers->SetValue($i,'server','port','389');
+$ldapservers->SetValue($i,'server','port',389);
 $ldapservers->SetValue($i,'server','base',array(''));
 $ldapservers->SetValue($i,'server','auth_type','cookie');
 $ldapservers->SetValue($i,'login','dn','');
@@ -416,7 +416,7 @@ $ldapservers->SetValue($i,'appearance','show_create',true);
 $ldapservers->SetValue($i,'auto_number','enable',true);
 $ldapservers->SetValue($i,'auto_number','mechanism','search');
 $ldapservers->SetValue($i,'auto_number','search_base',null);
-$ldapservers->SetValue($i,'auto_number','min','1000');
+$ldapservers->SetValue($i,'auto_number','min',1000);
 $ldapservers->SetValue($i,'auto_number','dn',null);
 $ldapservers->SetValue($i,'auto_number','pass',null);
 $ldapservers->SetValue($i,'login','anon_bind',true);

doc/README-translation.txt

@@ -1,2 +1,2 @@
-Please see http://wiki.phpldapadmin.info/Translating now for information on
+Please see http://phpldapadmin.sourceforge.net/Translate now for information on
 translating PLA.

htdocs/css/style.css

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/css/style.css,v 1.48.2.8 2008/12/19 00:38:31 wurley Exp $ */
+/* $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/css/style.css,v 1.48.2.9 2009/03/20 07:33:04 wurley Exp $ */
 
 /* Global Page */
 table.page {
@@ -7,7 +7,7 @@ table.page {
 
 	font-family: bitstream vera sans,luxi sans,verdana,geneva,arial,helvetica,sans-serif;
 	background-color: #FFFFFF;
-	font-size: 11pt;
+	font-size: 13px;
 	empty-cells: hide;
 }
 
@@ -187,7 +187,7 @@ table.page table.body td.foot {
 table.page tr.foot td {
 	border-top: 1px solid #AAAACC;
 	font-weight: bold;
-	font-size: 10pt;
+	font-size: 12px;
 	text-align: right;
 }
 
@@ -415,7 +415,7 @@ table.menu td.icon {
 
 /* Edit DN */
 div.add_value {
-	font-size: 10pt;
+	font-size: 12px;
 	margin: 0px;
 	padding: 0px;
 }
@@ -825,7 +825,7 @@ table.error th {
 	background-color: #AA0000;
 	border: 0px;
 	color: #FFFFFF;
-	font-size: 12pt;
+	font-size: 14px;
 	font-weight: bold;
 	text-align: center;
 	vertical-align: middle;

htdocs/update.php

@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/update.php,v 1.29.2.3 2008/12/12 12:20:22 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/update.php,v 1.29.2.4 2009/01/05 14:25:48 wurley Exp $
 
 /**
  * Updates or deletes a value from a specified attribute for a specified dn.
@@ -91,7 +91,7 @@ foreach ($entry['update'] as $attr_name => $val) {
 		$href['search'] = sprintf('cmd.php?cmd=search&search=true&form=advanced&server_id=%s&filter=%s=%s',
 			$ldapserver->server_id,$attr_name,$badattr);
 
-		error(sprintf(_('Your attempt to add <b>%s</b> (<i>%s</i>) to <br><b>%s</b><br> is NOT allowed. That attribute/value belongs to another entry.<p>You might like to <a href="%s">search</a> for that entry.'),
+		error(sprintf(_('Your attempt to add <b>%s</b> (<i>%s</i>) to <br><b>%s</b><br> is NOT allowed. That attribute/value belongs to another entry.<p>You might like to <a href=\'%s\'>search</a> for that entry.'),
 			$attr_name,$badattr,$entry['dn']['string'],$href['search']),'error','index.php');
 	}
 

lib/Entry.php

@@ -1,5 +1,7 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/Entry.php,v 1.2.2.4 2008/11/28 23:26:51 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/Entry.php,v 1.2.2.5 2009/03/20 07:33:34 wurley Exp $
+
+define('TMPDEBUG',0);
 
 /**
  * @package phpLDAPadmin

lib/EntryWriter1.php

@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3.2.30 2008/12/19 00:35:09 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3.2.31 2009/01/30 04:40:03 wurley Exp $
 
 define('IdEntryRefreshMenuItem', '0');
 define('IdEntryExportBaseMenuItem', '1');
@@ -2501,7 +2501,7 @@ class EntryWriter1 extends EntryWriter {
 			$this->draw('Attribute::Values',$attribute,$entry);
 		} else {
 			$this->draw('StartValueLine', $attribute);
-			$this->draw('Value', $attribute, 0);
+			$this->draw('Value', $attribute, 0,$entry);
 			$this->draw('Menu', $attribute);
 			$this->draw('EndValueLine', $attribute);
 		}

lib/Visitor.php

@@ -12,12 +12,15 @@
  */
 class Visitor {
 	public function __call($method,$args) {
+		$methods = array();
 		$class = '';
 		$fnct = '';
 		$a0 = isset($args[0]) ? $args[0] : '';
+
 		for ($i = 0; $i < strlen($a0); $i++) {
 			if ($class) {
 				if ($a0[$i] != ':') $fnct .= $a0[$i];
+
 			} else {
 				if ($a0[$i] != ':') {
 					$fnct .= $a0[$i];
@@ -42,11 +45,20 @@ class Visitor {
 			$c = $class;
 
 		$call = "$method$class$fnct";
-		while ($class && !method_exists($this,$call)) {
+		array_push($methods,$call);
+
+		while ($class && ! method_exists($this,$call)) {
 			$class = get_parent_class($class);
 			$call = "$method$class$fnct";
+			array_push($methods,$call);
 		}
 
+		if (defined('TMPDEBUG') && TMPDEBUG)
+			printf('<font size=-2><i>Calling Methods: %s</i></font><br >',join('|',$methods));
+
+		if (defined('TMPDEBUG') && TMPDEBUG && method_exists($this,$call))
+			printf('<font size=-2><b>Invoking Method: %s::%s</b></font><br >',get_class($this),$call);
+
 		if ($class) {
 			$call .= '($obj';
 			for ($i = 2; $i < count($args); $i++) {

lib/createlm.php

@@ -1,6 +1,6 @@
 <?php
 /*
-$Id: createlm.php,v 1.4.2.1 2007/12/21 12:11:55 wurley Exp $
+$Id: createlm.php,v 1.4.2.2 2009/01/05 14:35:23 wurley Exp $
 
   This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
   Copyright (C) 2004 - 2006 Roland Gruber
@@ -327,7 +327,7 @@ var $sbox = array(array(array(14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5
 	* @return string hash value
 	*/
 	function nthash($password = "") {
-		return strtoupper(bin2hex(hash('md4', iconv("UTF-8","UTF-16LE",$password),true)));
+		return strtoupper(bin2hex(mhash(MHASH_MD4,iconv('UTF-8','UTF-16LE',$password))));
 	}
 
 	/**

lib/server_functions.php

@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.51.2.15 2008/12/13 08:57:41 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.51.2.20 2009/03/20 07:48:45 wurley Exp $
 
 /**
  * Classes and functions for LDAP server configuration and capability
@@ -111,7 +111,7 @@ class LDAPserver {
 			$return = true;
 
 		} else {
-			error(sprintf(_('Error: You have an error in your config file. The only three allowed values for auth_type in the $servers section are \'session\', \'cookie\', and \'config\'. You entered \'%s\', which is not allowed.'),htmlspecialchars($this->auth_type)),'error',null,true);
+			error(sprintf(_('Error: You have an error in your config file. The only four allowed values for auth_type in the $servers section are \'http\', \'session\', \'cookie\', and \'config\'. You entered \'%s\', which is not allowed.'),htmlspecialchars($this->auth_type)),'error',null,true);
 		}
 
 		if (DEBUG_ENABLED)
@@ -375,7 +375,7 @@ class LDAPserver {
 						error(sprintf(_('Could not connect to "%s" on port "%s"'),$host,$port),'error');
 						break;
 					default:
-						error(_('Could not bind to the LDAP server (%s).',ldap_err2str($resource),$resource),'error');
+						error(sprintf(_('Could not bind to the LDAP server (%s).'),ldap_err2str($resource)),'error');
  				}
 
  			} else {
@@ -394,7 +394,10 @@ class LDAPserver {
 			debug_log('Leaving with Connect [%s], Resource [%s]',16,__FILE__,__LINE__,__METHOD__,
 				$connect_id,$this->connection[$connect_id]['resource']);
 
+		if (isset($this->connection[$connect_id]['resource']))
 	 		return $this->connection[$connect_id]['resource'];
+		else
+			return false;
  	}
 
 	/**
@@ -1822,6 +1825,12 @@ class LDAPserver {
 
 					# Iterate over the attributes
 					while ($attr) {
+						/* It seems that OpenDS complains when you do a ldap_get_values on these attributes - we'll skip them as a workaround */
+						if (in_array($attr,array('isMemberOf'))) {
+							$attr = ldap_next_attribute($resource,$entry_id,$attrs);
+							continue;
+						}
+
 						if ($this->isAttrBinary($attr))
 							$values = ldap_get_values_len($resource,$entry_id,$attr);
 						else
@@ -2785,7 +2794,7 @@ class LDAPserver {
 		$return = $dn;
 
 		foreach ($this->getBaseDN() as $base_dn) {
-			if (preg_match("/${base_dn}$/",$dn)) {
+			if (preg_match("/${base_dn}$/i",$dn)) {
 				$return = $base_dn;
 				break;
 			}
@@ -3084,7 +3093,7 @@ class LDAPservers {
 		$this->default->server['port'] = array(
 			'desc'=>'Port Number',
 			'var'=>'port',
-			'default'=>'389');
+			'default'=>389);
 
 		/* Normally PLA will direct all read/write operations to host/port above. However,
 		 * if you specify hostwr/portwr, then write operations will be directed to that host/port.
@@ -3097,7 +3106,7 @@ class LDAPservers {
 		$this->default->server['portwr'] = array(
 			'desc'=>'Port Number for write replica',
 			'var'=>'portwr',
-			'default'=>'389');
+			'default'=>389);
 
 		$this->default->server['base'] = array(
 			'desc'=>'Base DN',

lib/template_functions.php

@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.43.2.8 2008/12/12 12:20:23 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.43.2.9 2009/01/09 06:08:21 wurley Exp $
 
 /**
  * Classes and functions for the template engine.ation and capability
@@ -265,7 +265,10 @@ class Templates {
 					break;
 
 				default :
+					if (isset($xml_value['#text']))
 						$template[$xml_key] = $xml_value['#text'];
+					else
+						$template[$xml_key] = $xml_value;
 			}
 		}
 

locale/es_ES/LC_MESSAGES/messages.po

@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2008-11-29 01:48+0000\n"
+"PO-Revision-Date: 2009-02-05 23:25+0000\n"
-"Last-Translator: maraboli <Unknown>\n"
+"Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
 "Language-Team: phpLDAPadmin <phpldapadmin-devel@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-29 23:48+0000\n"
+"X-Launchpad-Export-Date: 2009-03-20 08:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../../htdocs/mass_delete.php:86
@@ -64,7 +64,7 @@ msgstr ""
 
 #: ../../lib/functions.php:1292
 msgid "A query on the uidpool_dn did return a valid uidNumber."
-msgstr ""
+msgstr "Una consulta en el uidpool_dn devolvió un uidNumber válido."
 
 #: ../../lib/EntryWriter1.php:2463 ../../lib/template_functions.php:962
 msgid "A random password was generated for you"
@@ -744,7 +744,7 @@ msgstr "Filtro aplicado"
 
 #: ../../htdocs/schema.php:112
 msgid "Force as MAY by config"
-msgstr ""
+msgstr "Forzar a MAY por configuración"
 
 #: ../../htdocs/search.php:276
 msgid "Format"
@@ -1618,7 +1618,7 @@ msgstr "plantilla"
 
 #: ../../lib/EntryWriter1.php:2570
 msgid "Template Value Error"
-msgstr ""
+msgstr "Error de valor de plantilla"
 
 #: ../../lib/EntryWriter1.php:1036 ../../lib/EntryWriter1.php:1255
 msgid "Templates"
@@ -1777,7 +1777,7 @@ msgstr ""
 #: ../../htdocs/schema.php:496
 msgid ""
 "This attribute has been forced as a MAY attribute by the configuration"
-msgstr ""
+msgstr "El atributo ha sido forzado a MAY por la configuración."
 
 #: ../../lib/EntryWriter1.php:1418
 msgid "This attribute is required"
@@ -1915,7 +1915,7 @@ msgstr "Tipo de autentificación \"auth_type\" desconocido: %s"
 
 #: ../../lib/functions.php:1285
 msgid "Unknown uidpool type."
-msgstr ""
+msgstr "Tipo desconocido de uidpool."
 
 #: ../../htdocs/search.php:214
 msgid "Unrecognized criteria option: "

locale/pt_BR/LC_MESSAGES/messages.po

@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2008-09-01 10:37+0000\n"
+"PO-Revision-Date: 2009-01-12 13:30+0000\n"
 "Last-Translator: Rafael Porto Rodrigues <rafporto@gmail.com>\n"
 "Language-Team: phpLDAPadmin <phpldapadmin-devel@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-29 23:48+0000\n"
+"X-Launchpad-Export-Date: 2009-03-20 08:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../../htdocs/mass_delete.php:86
@@ -60,8 +60,7 @@ msgstr ":"
 #: ../../lib/search_form_advanced.php:103
 msgid "A list of attributes to display in the results (comma-separated)"
 msgstr ""
-"A lista de atributos que devem ser mostrados nos resultados (separados por "
+"Uma lista de atributos para exibir nos resultados (separados por vírgula)"
-"vírgula)"
 
 #: ../../lib/functions.php:1292
 msgid "A query on the uidpool_dn did return a valid uidNumber."
@@ -69,45 +68,45 @@ msgstr ""
 
 #: ../../lib/EntryWriter1.php:2463 ../../lib/template_functions.php:962
 msgid "A random password was generated for you"
-msgstr "Uma senha aleatória foi gerada automaticamente para você"
+msgstr "Uma senha aleatória foi gerada para você"
 
 #: ../../lib/ldif_functions.php:532
 msgid "A valid deleteoldrdn attribute should be specified"
-msgstr ""
+msgstr "Um atributo válido deleteoldrdn deve ser especificado"
 
 #: ../../lib/ldif_functions.php:243
 msgid "A valid dn line is required."
-msgstr "Uma linha dn válida é obrigatória."
+msgstr "Uma linha dn válida é solicitada."
 
 #: ../../lib/ldif_functions.php:538
 msgid "A valid newrdn attribute  should be specified"
-msgstr ""
+msgstr "Um atributo válido newrd deve ser especificado"
 
 #: ../../lib/EntryWriter1.php:789 ../../htdocs/add_attr_form.php:104
 #: ../../htdocs/add_attr_form.php:148
 msgid "Add"
-msgstr "Inserir"
+msgstr "Adicionar"
 
 #: ../../htdocs/add_value_form.php:182
 msgid "Add New Value"
-msgstr "Inserir novo valor"
+msgstr "Adicionar novo valor"
 
 #: ../../htdocs/compare.php:466 ../../htdocs/add_oclass_form.php:104
 msgid "Add ObjectClass and Attributes"
-msgstr "Inserir Classe de Objetos e Atributos"
+msgstr "Adicionar Classe de Objetos e Atributos"
 
 #: ../../htdocs/modify_member_form.php:145
 msgid "Add all"
-msgstr "Inserir todos"
+msgstr "Adicionar todos"
 
 #: ../../lib/EntryWriter1.php:1847 ../../htdocs/compare.php:479
 #, php-format
 msgid "Add an additional value to attribute '%s'"
-msgstr "Insere um novo valor para o atributo '%s'"
+msgstr "Insere um valor adicional para o atributo '%s'"
 
 #: ../../htdocs/add_value_form.php:93
 msgid "Add new"
-msgstr "Inserir novo"
+msgstr "Adicionar novo"
 
 #: ../../htdocs/add_value_form.php:153 ../../htdocs/compare.php:470
 msgid "Add new ObjectClass"
@@ -116,19 +115,19 @@ msgstr "Inserir nova ObjectClass"
 #: ../../lib/EntryWriter1.php:789 ../../htdocs/add_attr_form.php:23
 #: ../../htdocs/add_attr_form.php:72
 msgid "Add new attribute"
-msgstr "Inserir Novo Atributo"
+msgstr "Adicionar Novo Atributo"
 
 #: ../../htdocs/add_attr_form.php:114
 msgid "Add new binary attribute"
-msgstr "Inserir novo atributo binário"
+msgstr "Adicionar novo atributo binário"
 
 #: ../../htdocs/modify_member_form.php:145
 msgid "Add selected"
-msgstr "Inserir selecionado"
+msgstr "Adicionar selecionado"
 
 #: ../../htdocs/ldif_import.php:62
 msgid "Adding..."
-msgstr "Inserindo..."
+msgstr "Adicionando..."
 
 #: ../../lib/search_form_predefined.php:34
 #: ../../lib/search_form_advanced.php:25 ../../lib/search_form_simple.php:35
@@ -228,7 +227,7 @@ msgstr "Construindo a imagem da árvore a ser copiada... "
 
 #: ../../lib/export_functions.php:38
 msgid "CSV (Spreadsheet)"
-msgstr ""
+msgstr "CSV (Planilha Eletrônica)"
 
 #: ../../lib/functions.php:63
 msgid "Called to load a class that cant be found"
@@ -1023,7 +1022,7 @@ msgstr "Baixo Limite de Memória"
 #: ../../lib/template_functions.php:419
 #, php-format
 msgid "Missing %s in the XML file."
-msgstr ""
+msgstr "Perdido %s no arquivo XML."
 
 #: ../../lib/ldif_functions.php:169
 msgid "Missing attibutes or changetype attribute for entry"
@@ -1086,11 +1085,11 @@ msgstr "DN não especificado"
 
 #: ../../htdocs/ldif_import.php:38
 msgid "No LDIF file specified. Please try again."
-msgstr ""
+msgstr "Nenhum arquivo LDIF especificado. Favor tentar novamente."
 
 #: ../../lib/Entry.php:282
 msgid "No Template"
-msgstr ""
+msgstr "Nenhum Modelo"
 
 #: ../../htdocs/compare.php:186 ../../htdocs/compare.php:199
 msgid "No Value"
@@ -1266,7 +1265,7 @@ msgstr "Exluir permanentemente todos os objetos filho também?"
 
 #: ../../lib/functions.php:140
 msgid "Please check and see if this bug has been reported"
-msgstr ""
+msgstr "Favor verificar e olhar se o erro já foi relatado"
 
 #: ../../lib/functions.php:1855
 msgid ""
@@ -1494,7 +1493,7 @@ msgstr "Exibir Atributos"
 
 #: ../../lib/functions.php:357
 msgid "Show Cache"
-msgstr ""
+msgstr "Mostrar cache"
 
 #: ../../lib/EntryWriter1.php:755
 msgid "Show internal attributes"
@@ -1575,7 +1574,7 @@ msgstr "Logado com sucesso no servidor."
 
 #: ../../htdocs/compare.php:64
 msgid "Switch Entry"
-msgstr ""
+msgstr "Escolher Entradas"
 
 #: ../../htdocs/add_value_form.php:175 ../../htdocs/schema.php:104
 msgid "Syntax"
@@ -1623,7 +1622,7 @@ msgstr "O atributo (%s) está em modo somente leitura"
 
 #: ../../lib/ldif_functions.php:410
 msgid "The attribute name should be add, delete or replace"
-msgstr ""
+msgstr "O atributo nome deve ser adicionado, apagado ou substituído"
 
 #: ../../lib/ldif_functions.php:514
 msgid "The attribute name should be newsuperior"
@@ -1889,7 +1888,7 @@ msgstr "auth_type desconhecido: %s"
 
 #: ../../lib/functions.php:1285
 msgid "Unknown uidpool type."
-msgstr ""
+msgstr "Tipo uidpool desconhecido"
 
 #: ../../htdocs/search.php:214
 msgid "Unrecognized criteria option: "
@@ -2186,7 +2185,7 @@ msgstr ""
 
 #: ../../lib/session_functions.php:139
 msgid "Your configuration has been automatically refreshed."
-msgstr ""
+msgstr "Sua configuração foi automaticamente atualizada"
 
 #: ../../lib/functions.php:1172
 #, php-format

tools/po/Makefile

@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Makefile Utility to manipulate PO and POT files
+# Copyright (c) 2009 Alessandro De Zorzi - <lota@nonlontano.it>
+#
+# This code is part of phpLDAPadmin
+# http://phpldapadmin.wiki.sourceforge.net
+# Released under the same licence of phpldapadmin
+#
+# Current target list:
+#
+# all		display target
+# all-mo	compile .mo files from .po translation available
+# pot		create a update main POT file
+# all-merge	merge last POT with each current translations
+# xml-pot	create a update POT template file (XML files)
+
+
+LOCALEDIR = ../../locale
+TEMPLATEFILES=`find ../../templates -iname *xml -exec echo -m {} \;`
+EXPORTFILE = $(shell echo $${EXPORTFILE:-/tmp/launchpad-export.tgz})
+
+all:
+	@echo Please, specify a target [pot, xml-pot, all-mo, all-merge, launchpad-export]
+
+all-mo:
+	@for i in `ls -1 $(LOCALEDIR)` ; \
+	do \
+	    if [ -f $(LOCALEDIR)/$$i/LC_MESSAGES/messages.po ]; then \
+	    echo Processing: $$i ; \
+	    msgfmt -v -c --statistics $(LOCALEDIR)/$$i/LC_MESSAGES/messages.po -o $(LOCALEDIR)/$$i/LC_MESSAGES/messages.mo; \
+	    fi \
+	done
+
+
+pot:
+	@cp messages.header messages.pot
+	@find ../../ -name *.php -exec xgettext --keyword=_ -L PHP -j --omit-header -o messages.pot -s {} \;
+	@find ../../ -name *.inc -exec xgettext --keyword=_ -L PHP -j --omit-header -o messages.pot -s {} \;
+	@echo messages.pot created
+
+all-merge: pot
+	@for i in `ls -1 $(LOCALEDIR)` ; \
+	do \
+	    if [ -f $(LOCALEDIR)/$$i/LC_MESSAGES/messages.po ]; then \
+	    echo Processing: $$i ; \
+	    msgmerge -v $(LOCALEDIR)/$$i/LC_MESSAGES/messages.po messages.pot -o $$i.po; \
+	    fi \
+	done
+
+xml-pot:
+	@po4a-gettextize -o tags="<display>" -o tagsonly=1 -f xml $(TEMPLATEFILES) -p template.pot
+	@echo template.pot created
+
+launchpad-extract:
+	@[ ! -r $(EXPORTFILE) ] && echo "No export file [$(EXPORTFILE)] found?" && exit 1 || true
+	@cd $(LOCALEDIR); tar xzf $(EXPORTFILE)
+	@rm -f $(LOCALEDIR)/phpldapadmin-uk.po
+	@rm -f $(LOCALEDIR)/phpldapadmin/phpldapadmin.pot
+	@rmdir $(LOCALEDIR)/phpldapadmin
+	@find $(LOCALEDIR) -name phpldapadmin-\*.po | while read i; do newi=$$(echo $$i| sed -e 's/phpldapadmin-.*/messages.po/'); mv $$i $$newi; done
+
+launchpad-export: launchpad-extract all-mo

tools/po/make_all

@@ -1,25 +0,0 @@
-#!/bin/bash
-echo "Generating Catalan translation template"
-./make_po_ca
-tar -czf messages.po_ca.tar.gz messages.po  
-echo " "
-echo "Generating Spanish translation template"
-./make_po_es
-tar -czf messages.po_es.tar.gz messages.po  
-echo " "
-echo "Generating French translation template"
-./make_po_fr
-tar -czf messages.po_fr.tar.gz messages.po  
-echo " "
-echo "Generating Hungarian translation template"
-./make_po_hu
-tar -czf messages.po_hu.tar.gz messages.po  
-echo " "
-echo "Generating Italian translation template"
-./make_po_it
-tar -czf messages.po_it.tar.gz messages.po  
-echo " "
-echo "Generating Japanese translation template"
-./make_po_jp
-tar -czf messages.po_jp.tar.gz messages.po  
-

tools/po/make_mo

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script generates a messages.mo file from the translated messages.po file.
-
-rm -f messages.mo
-msgfmt -v -c --statistics messages.po -o messages.mo

tools/po/make_mo_all

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-HOME=$PWD/$(dirname $0)
-cd ../../locale
-
-for i in $(ls -1); do
-	if [ "$i" == "CVS" ];  then
-		continue;
-	else
-		echo Processing: $i
-		cd $i/LC_MESSAGES
-		$HOME/make_mo
-		cd ../..
-	fi
-done

tools/po/make_po

@@ -1,10 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script generates a messages.po file for translation from all .inc and .php files.
-
-cp messages.header messages.po
-find ../../ -name *.php -exec xgettext --keyword=_ -L PHP -j --omit-header -s {} \;
-find ../../ -name *.inc -exec xgettext --keyword=_ -L PHP -j --omit-header -s {} \;

tools/po/make_po_ca

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script is run after make_po to merge the existing German translations to messages.po
-
-./make_po
-msgmerge -v ../../locale/ca_ES/LC_MESSAGES/messages.po messages.po -o messages.po

tools/po/make_po_de

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script is run after make_po to merge the existing German translations to messages.po
-
-./make_po
-msgmerge -v ../../locale/de_DE/LC_MESSAGES/messages.po messages.po -o messages.po

tools/po/make_po_es

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script is run to update the existing Spanish translations in messages.po
-
-./make_po
-msgmerge -v ../../locale/es_ES/LC_MESSAGES/messages.po messages.po -o messages.po

tools/po/make_po_fr

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script is run after make_po to merge the existing German translations to messages.po
-
-./make_po
-msgmerge -v ../../locale/fr_FR/LC_MESSAGES/messages.po messages.po -o messages.po

tools/po/make_po_hu

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script is run after make_po to merge the existing Hungarian translations to messages.po
-
-./make_po
-msgmerge -v ../../locale/hu_HU/LC_MESSAGES/messages.po messages.po -o messages.po

tools/po/make_po_it

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script is run after make_po to merge the existing German translations to messages.po
-
-./make_po
-msgmerge -v ../../locale/it_IT/LC_MESSAGES/messages.po messages.po -o messages.po

tools/po/make_po_ja

@@ -1,9 +0,0 @@
-#!/bin/bash
-# $Header $
-#
-# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-
-# This script is run after make_po to merge the existing Japanese translations to messages.po
-
-./make_po
-msgmerge -v ../../locale/ja_JP/LC_MESSAGES/messages.po messages.po -o messages.po