added $pdfKeys to get_pdfEntries

lam/lib/baseModule.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2014  Roland Gruber
+  Copyright (C) 2003 - 2015  Roland Gruber
 
   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
@@ -807,9 +807,10 @@ abstract class baseModule {
 	/**
 	* Returns the PDF entries for this module.
 	*
+	* @param array $pdfKeys list of PDF keys that are included in document
 	* @return array list of possible PDF entries
 	*/
-	public function get_pdfEntries() {
+	public function get_pdfEntries($pdfKeys) {
 		return array();
 	}
 	

lam/lib/modules.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2014  Roland Gruber
+  Copyright (C) 2003 - 2015  Roland Gruber
 
   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
@@ -1951,12 +1951,13 @@ class accountContainer {
 	/**
 	 * Returns a list of possible PDF entries for this account.
 	 *
-	 * @return list of PDF entries (array(<name> => <PDF lines>))
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
 	 */
-	function get_pdfEntries() {
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		while(($current = current($this->module)) != null) {
-			$return = array_merge($return,$current->get_pdfEntries());
+			$return = array_merge($return,$current->get_pdfEntries($pdfKeys));
 			next($this->module);
 		}
 		$dn = $this->dn_orig;

lam/lib/modules/account.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-                2005 - 2014  Roland Gruber
+                2005 - 2015  Roland Gruber
 
   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
@@ -222,9 +222,10 @@ class account extends baseModule {
 	/**
 	* Returns the PDF entries for this module.
 	*
+	* @param array $pdfKeys list of PDF keys that are included in document
 	* @return array list of possible PDF entries
 	*/
-	function get_pdfEntries() {
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'description', _('Description'));
 		$this->addSimplePDFField($return, 'uid', _('User name'));

lam/lib/modules/asteriskAccount.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
   Copyright (C) 2009 - 2012  Pavel Pozdnyak
-                2009 - 2014  Roland Gruber
+                2009 - 2015  Roland Gruber
 
   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
@@ -975,9 +975,12 @@ class asteriskAccount extends baseModule implements passwordService {
 	}
 
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'AstAccountCallerID', _('Caller ID'));
 		$this->addSimplePDFField($return, 'AstAccountContext', _('Account context'));

lam/lib/modules/asteriskExtension.inc

@@ -794,10 +794,13 @@ class asteriskExtension extends baseModule {
         return $suggeted_extension;
     }
 
-    /**
+	/**
-     * Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-     */
+	 *
-    function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+    function get_pdfEntries($pdfKeys) {
     	$a = $this->attributes;
     	$o = $this->orig;
         $return = array();

lam/lib/modules/asteriskVoicemail.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
   Copyright (C) 2010         Pavel Pozdnyak
-                2010 - 2014  Roland Gruber
+                2010 - 2015  Roland Gruber
 
   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
@@ -362,9 +362,12 @@ class asteriskVoicemail extends baseModule implements passwordService {
 	}
 
 	/**
-	 * Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
+	 *
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
 	 */
-	function get_pdfEntries() {
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'AstVoicemailMailbox', _('Mailbox'));
 		$this->addSimplePDFField($return, 'AstContext', _('Account context'));

lam/lib/modules/authorizedServiceObject.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is not yet part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2011         J de Jong
-  				2012 - 2014  Roland Gruber
+  				2012 - 2015  Roland Gruber
 
   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
@@ -233,11 +233,12 @@ class authorizedServiceObject extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		if (in_array('authorizedServiceObject', $this->attributes['objectClass'])) {
 			$this->addSimplePDFField($return, 'authorizedService', _('Authorized Services'));

lam/lib/modules/ddns.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008         Thomas Manninger
-                2008 - 2014  Roland Gruber
+                2008 - 2015  Roland Gruber
 
   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
@@ -403,11 +403,12 @@ class ddns extends baseModule {
 	}
 	
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	public function get_pdfEntries() {
+	 */
+	public function get_pdfEntries($pdfKeys) {
 		// attributes are taken from DHCP server object
 		$this->attributes = &$this->getAccountContainer()->getAccountModule('dhcp_settings')->attributes;
 		$this->orig = &$this->getAccountContainer()->getAccountModule('dhcp_settings')->orig;

lam/lib/modules/dhcp_settings.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008        Thomas Manninger
-                2008 - 2014  Roland Gruber
+                2008 - 2015  Roland Gruber
 
   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
@@ -655,11 +655,12 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
 	}
 	
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$nodeType = $this->getDHCPOption('netbios-node-type');
 		$nodeTypeValue = '';
 		if (isset($this->all_netbios_node_types[$nodeType])) {

lam/lib/modules/eduPerson.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009 - 2014  Roland Gruber
+  Copyright (C) 2009 - 2015  Roland Gruber
 
   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
@@ -572,11 +572,12 @@ class eduPerson extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'primaryAffiliation', _('Primary affiliation'), 'eduPersonPrimaryAffiliation');
 		$this->addSimplePDFField($return, 'scopedAffiliation', _('Scoped affiliations'), 'eduPersonScopedAffiliation');

lam/lib/modules/fixed_ip.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008         Thomas Manninger
-                2008 - 2014  Roland Gruber
+                2008 - 2015  Roland Gruber
 
   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
@@ -728,11 +728,12 @@ class fixed_ip extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		if (is_array($this->fixed_ip) && (sizeof($this->fixed_ip) > 0)) {
 			$return[get_class($this) . '_IPlist'] = array(

lam/lib/modules/freeRadius.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2011 - 2014  Roland Gruber
+  Copyright (C) 2011 - 2015  Roland Gruber
 
   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
@@ -685,11 +685,12 @@ class freeRadius extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'radiusFramedIPAddress', _('IP address'));
 		$this->addSimplePDFField($return, 'radiusFramedIPNetmask', _('Net mask'));

lam/lib/modules/hostObject.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2011 - 2012  Roland Gruber
+  Copyright (C) 2011 - 2015  Roland Gruber
 
   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
@@ -208,11 +208,12 @@ class hostObject extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'hosts', _('Host list'), 'host');
 		return $return;

lam/lib/modules/ieee802device.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2004 - 2014  Roland Gruber
+  Copyright (C) 2004 - 2015  Roland Gruber
 
   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
@@ -153,11 +153,12 @@ class ieee802device extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'macAddress', _('MAC addresses'));
 		return $return;

lam/lib/modules/inetLocalMailRecipient.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2004 - 2014  Roland Gruber
+  Copyright (C) 2004 - 2015  Roland Gruber
 
   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
@@ -283,11 +283,12 @@ class inetLocalMailRecipient extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'routingAdr', _('Routing address'), 'mailRoutingAddress');
 		$this->addSimplePDFField($return, 'localAdr', _('Local address list'), 'mailLocalAddress');

lam/lib/modules/inetOrgPerson.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-                2005 - 2014  Roland Gruber
+                2005 - 2015  Roland Gruber
 
   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
@@ -1916,11 +1916,12 @@ class inetOrgPerson extends baseModule implements passwordService {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'description', _('Description'));
 		$this->addSimplePDFField($return, 'title', _('Job title'));

lam/lib/modules/kolabGroup.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -416,9 +416,12 @@ class kolabGroup extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'mail', _('Email address'));
 		$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recipients'));

lam/lib/modules/kolabSharedFolder.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -550,9 +550,12 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'cn', _('Name'));
 		$this->addSimplePDFField($return, 'mail', _('Email address'));

lam/lib/modules/kolabUser.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2004 - 2014  Roland Gruber
+  Copyright (C) 2004 - 2015  Roland Gruber
 
   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
@@ -736,11 +736,12 @@ class kolabUser extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'mailHost', _('Mailbox home server'));
 		// invitation policies

lam/lib/modules/ldapPublicKey.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2005 - 2014  Roland Gruber
+  Copyright (C) 2005 - 2015  Roland Gruber
 
   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
@@ -189,9 +189,12 @@ class ldapPublicKey extends baseModule {
 	}
 
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		if (sizeof($this->attributes['sshPublicKey']) > 0) {
 			$return['ldapPublicKey_sshPublicKey'][0] = '<block><key>' . _('SSH public keys') . '</key><tr><td align=\"L\">' . $this->attributes['sshPublicKey'][0] . '</td></tr></block>';

lam/lib/modules/nisMailAlias.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2004 - 2014  Roland Gruber
+  Copyright (C) 2004 - 2015  Roland Gruber
 
   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
@@ -466,11 +466,12 @@ class nisMailAlias extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'alias', _('Alias name'), 'cn');
 		$this->addSimplePDFField($return, 'recipients', _('Recipient list'), 'rfc822MailMember');

lam/lib/modules/nisMailAliasUser.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2014  Roland Gruber
+  Copyright (C) 2014 - 2015  Roland Gruber
 
   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
@@ -512,11 +512,12 @@ class nisMailAliasUser extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$aliases = $this->getMailAliasList();
 		$foundAliases = array();

lam/lib/modules/nisnetgroup.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009 - 2014  Roland Gruber
+  Copyright (C) 2009 - 2015  Roland Gruber
 
   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
@@ -572,9 +572,12 @@ class nisnetgroup extends baseModule {
 	}
 
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'cn', _('Group name'));
 		$this->addSimplePDFField($return, 'description', _('Description'));

lam/lib/modules/posixAccount.inc

@@ -4,7 +4,7 @@
 
 	This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
 	Copyright (C) 2003 - 2006  Tilo Lutz
-    Copyright (C) 2005 - 2014  Roland Gruber
+    Copyright (C) 2005 - 2015  Roland Gruber
 
 	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
@@ -1834,11 +1834,12 @@ class posixAccount extends baseModule implements passwordService {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$uidLabel = _('User name');
 		if ($this->get_scope() == 'host') {
 			$uidLabel = _('Host name');

lam/lib/modules/posixGroup.inc

@@ -4,7 +4,7 @@ $Id$
 
 This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
 Copyright (C) 2003 - 2006  Tilo Lutz
-              2007 - 2014  Roland Gruber
+              2007 - 2015  Roland Gruber
 
 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
@@ -422,6 +422,7 @@ class posixGroup extends baseModule implements passwordService {
 		);
 		if (!$this->isBooleanConfigOptionSet('posixGroup_hidememberUid')) {
 			$return['PDF_fields']['memberUid'] = _('Group members');
+			$return['PDF_fields']['memberUidPrimary'] = _('Group members (incl. primary members)');
 		}
 		if ($this->manageCnAttribute) {
 			$return['PDF_fields']['cn'] = _('Group name');
@@ -560,11 +561,12 @@ class posixGroup extends baseModule implements passwordService {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'memberUid', _('Group members'));
 		$this->addSimplePDFField($return, 'cn', _('Group name'));

lam/lib/modules/puppetClient.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is not yet part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2012 - 2014  Roland Gruber
+  Copyright (C) 2012 - 2015  Roland Gruber
 
   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
@@ -418,11 +418,12 @@ class puppetClient extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		if (!in_array('puppetClient', $this->attributes['objectClass'])) {
 			return $return;

lam/lib/modules/pykotaBillingCode.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -253,9 +253,12 @@ class pykotaBillingCode extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->loadCodeCache();
 		$this->addSimplePDFField($return, 'pykotaBillingCode', _('Billing code'));

lam/lib/modules/pykotaGroup.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -459,9 +459,12 @@ class pykotaGroup extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'cn', _('Common name'));
 		$this->addSimplePDFField($return, 'pykotaGroupName', _('PyKota group name'));

lam/lib/modules/pykotaPrinter.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -576,9 +576,12 @@ class pykotaPrinter extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->loadPrinterNameCache();
 		$this->addSimplePDFField($return, 'cn', _('Printer name'));

lam/lib/modules/pykotaUser.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -881,9 +881,12 @@ class pykotaUser extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'cn', _('Common name'));
 		$this->addSimplePDFField($return, 'uid', _('User name'));

lam/lib/modules/quota.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-                2007 - 2014  Roland Gruber
+                2007 - 2015  Roland Gruber
 
   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
@@ -608,11 +608,12 @@ class quota extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$this->initQuotas();
 		if (!isset($this->quota) || !is_array($this->quota)) return array();
 		if (sizeof($this->quota) > 0) {

lam/lib/modules/range.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008         Thomas Manninger
-                2008 - 2014  Roland Gruber
+                2008 - 2015  Roland Gruber
 
   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
@@ -761,11 +761,12 @@ class range extends baseModule {
 	}
 	
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		if (is_array($this->ranges) && (sizeof($this->ranges) > 0)) {
 			$start = $this->ranges[0]['range_start'];

lam/lib/modules/sambaDomain.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2005 - 2014  Roland Gruber
+  Copyright (C) 2005 - 2015  Roland Gruber
 
   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
@@ -590,11 +590,12 @@ class sambaDomain extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'domainName', _('Domain name'), 'sambaDomainName');
 		$this->addSimplePDFField($return, 'domainSID', _('Domain SID'), 'sambaSID');

lam/lib/modules/sambaGroupMapping.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-                2007 - 2014  Roland Gruber
+                2007 - 2015  Roland Gruber
 
   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
@@ -529,11 +529,12 @@ class sambaGroupMapping extends baseModule {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'gidNumber', _('GID number'));
 		$this->addSimplePDFField($return, 'sambaSID', _('Windows group'));

lam/lib/modules/sambaSamAccount.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-                2005 - 2014  Roland Gruber
+                2005 - 2015  Roland Gruber
 
   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
@@ -1897,11 +1897,12 @@ class sambaSamAccount extends baseModule implements passwordService {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'displayName', _('Display name'));
 		$this->addSimplePDFField($return, 'sambaHomePath', _('Home path'));

lam/lib/modules/shadowAccount.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-  Copyright (C) 2007 - 2014  Roland Gruber
+  Copyright (C) 2007 - 2015  Roland Gruber
 
   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
@@ -482,11 +482,12 @@ class shadowAccount extends baseModule implements passwordService {
 	}
 
 	/**
-	* Returns the PDF entries for this module.
+	 * Returns a list of possible PDF entries for this account.
-	*
+	 *
-	* @return array list of possible PDF entries
+	 * @param array $pdfKeys list of PDF keys that are included in document
-	*/
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
-	function get_pdfEntries() {
+	 */
+	function get_pdfEntries($pdfKeys) {
 		$shadowLastChange = '';
 		if (isset($this->attributes['shadowLastChange'][0])) {
 			$shadowLastChange = date('d. m. Y',$this->attributes['shadowLastChange'][0]*24*3600);

lam/lib/modules/systemQuotas.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2011 - 2012  Roland Gruber
+  Copyright (C) 2011 - 2015  Roland Gruber
 
   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
@@ -373,9 +373,12 @@ class systemQuotas extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	public function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	public function get_pdfEntries($pdfKeys) {
 		$return = array();
 		if (isset($this->attributes['quota'][0])) {
 			$quotas[] = '<block><tr>' .

lam/lib/modules/windowsGroup.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -738,9 +738,12 @@ class windowsGroup extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	public function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	public function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'cn', _('Group name'));
 		$this->addSimplePDFField($return, 'description', _('Description'));

lam/lib/modules/windowsHost.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -281,9 +281,12 @@ class windowsHost extends baseModule {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	public function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	public function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'cn', _('Host name'));
 		$this->addSimplePDFField($return, 'description', _('Description'));

lam/lib/modules/windowsUser.inc

@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2014  Roland Gruber
+  Copyright (C) 2013 - 2015  Roland Gruber
 
   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
@@ -1586,9 +1586,12 @@ class windowsUser extends baseModule implements passwordService {
 	}
 	
 	/**
-	* Returns a list of PDF entries
+	 * Returns a list of possible PDF entries for this account.
-	*/
+	 *
-	public function get_pdfEntries() {
+	 * @param array $pdfKeys list of PDF keys that are included in document
+	 * @return list of PDF entries (array(<PDF key> => <PDF lines>))
+	 */
+	public function get_pdfEntries($pdfKeys) {
 		$return = array();
 		$this->addSimplePDFField($return, 'userPrincipalName', _('User name'));
 		$this->addSimplePDFField($return, 'cn', _('Common name'));

lam/lib/pdf.inc

@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2004  Michael Duergner
-                2003 - 2013  Roland Gruber
+                2003 - 2015  Roland Gruber
 
   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
@@ -69,6 +69,21 @@ function createModulePDF($accounts, $pdf_structure="default", $returnAsString =
 	// Get PDF structure from xml file
 	$load = loadPDFStructureDefinitions($account_type,$pdf_structure);
 	$structure = $load['structure'];
+	// get list of PDF keys
+	$pdfKeys = array();
+	foreach($structure as $entry) {
+		if ($entry['tag'] == "SECTION" && $entry['type'] == "open") {
+			$key = $entry['attributes']['NAME'];
+			// only values with a starting "_" are keys 
+			if (strpos($key, '_') === 0) {
+				$pdfKeys[] = substr($key, 1);
+			}
+		}
+		if  ($entry['tag'] == "ENTRY") {
+			$pdfKeys[] = $entry['attributes']['NAME'];
+		}
+	}
+	$pdfKeys = array_unique($pdfKeys);
 	
 	// The decimal separator must be a dot in order to write pdf-files
 	setlocale(LC_NUMERIC, "C");
@@ -85,7 +100,7 @@ function createModulePDF($accounts, $pdf_structure="default", $returnAsString =
 		$pdf->AddPage();
 		
 		// Get PDF entries for the current account
-		$entries = $account->get_pdfEntries();
+		$entries = $account->get_pdfEntries($pdfKeys);
 		
 		// Now create the PDF file acording to the structure with the submitted values 
 		foreach($structure as $entry) {