diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index b11055ff..2b2c2d24 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -803,11 +803,12 @@ abstract class baseModule {
*
* 'myAttribute' => 'AttrName123 |
456 |
789 |
'
*
+ * @param string $typeId type id (user, group, host)
* @return array PDF entries
*
* @see baseModule::get_metaData()
*/
- public function get_pdfFields() {
+ public function get_pdfFields($typeId) {
return ((isset($this->meta['PDF_fields'])) ? $this->meta['PDF_fields'] : array());
}
@@ -815,9 +816,10 @@ abstract class baseModule {
* Returns the PDF entries for this module.
*
* @param array $pdfKeys list of PDF keys that are included in document
+ * @param string $typeId type id (user, group, host)
* @return PDFEntry[] list of key => PDFEntry
*/
- public function get_pdfEntries($pdfKeys) {
+ public function get_pdfEntries($pdfKeys, $typeId) {
return array();
}
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 3bf2d436..0def3e64 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -413,7 +413,7 @@ function getAvailablePDFFields($typeId) {
$return = array();
for ($i = 0; $i < sizeof($mods); $i++) {
$module = moduleCache::getModule($mods[$i], \LAM\TYPES\getScopeFromTypeId($typeId));
- $fields = $module->get_pdfFields();
+ $fields = $module->get_pdfFields($typeId);
$return[$mods[$i]] = array();
if (is_array($fields)) {
foreach ($fields as $fieldID => $fieldLabel) {
@@ -2010,12 +2010,13 @@ class accountContainer {
* Returns a list of possible PDF entries for this account.
*
* @param array $pdfKeys list of PDF keys that are included in document
+ * @param string $typeId type id (user, group, host)
* @return PDFEntry[] list of key => PDFEntry
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
while(($current = current($this->module)) != null) {
- $return = array_merge($return,$current->get_pdfEntries($pdfKeys));
+ $return = array_merge($return,$current->get_pdfEntries($pdfKeys, $typeId));
next($this->module);
}
$dn = $this->dn_orig;
diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc
index a85e50fe..ae301ab4 100644
--- a/lam/lib/modules/account.inc
+++ b/lam/lib/modules/account.inc
@@ -223,7 +223,7 @@ class account extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'description', _('Description'));
$this->addSimplePDFField($return, 'uid', _('User name'));
diff --git a/lam/lib/modules/asteriskAccount.inc b/lam/lib/modules/asteriskAccount.inc
index 88ff00ee..0023f1c4 100644
--- a/lam/lib/modules/asteriskAccount.inc
+++ b/lam/lib/modules/asteriskAccount.inc
@@ -978,7 +978,7 @@ class asteriskAccount extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'AstAccountCallerID', _('Caller ID'));
$this->addSimplePDFField($return, 'AstAccountContext', _('Account context'));
diff --git a/lam/lib/modules/asteriskExtension.inc b/lam/lib/modules/asteriskExtension.inc
index 0bcb2acf..c10935e1 100644
--- a/lam/lib/modules/asteriskExtension.inc
+++ b/lam/lib/modules/asteriskExtension.inc
@@ -800,7 +800,7 @@ class asteriskExtension extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$a = $this->attributes;
$o = $this->orig;
$return = array();
diff --git a/lam/lib/modules/asteriskVoicemail.inc b/lam/lib/modules/asteriskVoicemail.inc
index 73d7f85a..6b6928ce 100644
--- a/lam/lib/modules/asteriskVoicemail.inc
+++ b/lam/lib/modules/asteriskVoicemail.inc
@@ -365,7 +365,7 @@ class asteriskVoicemail extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'AstVoicemailMailbox', _('Mailbox'));
$this->addSimplePDFField($return, 'AstContext', _('Account context'));
diff --git a/lam/lib/modules/authorizedServiceObject.inc b/lam/lib/modules/authorizedServiceObject.inc
index 50e4173e..4f0e12f9 100644
--- a/lam/lib/modules/authorizedServiceObject.inc
+++ b/lam/lib/modules/authorizedServiceObject.inc
@@ -224,7 +224,7 @@ class authorizedServiceObject extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
if (in_array('authorizedServiceObject', $this->attributes['objectClass'])) {
$this->addSimplePDFField($return, 'authorizedService', _('Authorized Services'));
diff --git a/lam/lib/modules/ddns.inc b/lam/lib/modules/ddns.inc
index d4e2b491..9e0a8483 100644
--- a/lam/lib/modules/ddns.inc
+++ b/lam/lib/modules/ddns.inc
@@ -398,7 +398,7 @@ class ddns extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- public function get_pdfEntries($pdfKeys) {
+ public function get_pdfEntries($pdfKeys, $typeId) {
// attributes are taken from DHCP server object
$this->attributes = &$this->getAccountContainer()->getAccountModule('dhcp_settings')->attributes;
$this->orig = &$this->getAccountContainer()->getAccountModule('dhcp_settings')->orig;
diff --git a/lam/lib/modules/dhcp_settings.inc b/lam/lib/modules/dhcp_settings.inc
index 48fea0d8..68467100 100644
--- a/lam/lib/modules/dhcp_settings.inc
+++ b/lam/lib/modules/dhcp_settings.inc
@@ -660,7 +660,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$nodeType = $this->getDHCPOption('netbios-node-type');
$nodeTypeValue = '';
if (isset($this->all_netbios_node_types[$nodeType])) {
diff --git a/lam/lib/modules/eduPerson.inc b/lam/lib/modules/eduPerson.inc
index c7b810b1..b401b955 100644
--- a/lam/lib/modules/eduPerson.inc
+++ b/lam/lib/modules/eduPerson.inc
@@ -551,7 +551,7 @@ class eduPerson extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'primaryAffiliation', _('Primary affiliation'), 'eduPersonPrimaryAffiliation');
$this->addSimplePDFField($return, 'scopedAffiliation', _('Scoped affiliations'), 'eduPersonScopedAffiliation');
diff --git a/lam/lib/modules/fixed_ip.inc b/lam/lib/modules/fixed_ip.inc
index 37c5526c..fbdfc414 100644
--- a/lam/lib/modules/fixed_ip.inc
+++ b/lam/lib/modules/fixed_ip.inc
@@ -734,7 +734,7 @@ class fixed_ip extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
if (is_array($this->fixed_ip) && (sizeof($this->fixed_ip) > 0)) {
$pdfTable = new PDFTable();
diff --git a/lam/lib/modules/freeRadius.inc b/lam/lib/modules/freeRadius.inc
index e5c26206..a256bdc2 100644
--- a/lam/lib/modules/freeRadius.inc
+++ b/lam/lib/modules/freeRadius.inc
@@ -688,7 +688,7 @@ class freeRadius extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'radiusFramedIPAddress', _('IP address'));
$this->addSimplePDFField($return, 'radiusFramedIPNetmask', _('Net mask'));
diff --git a/lam/lib/modules/hostObject.inc b/lam/lib/modules/hostObject.inc
index d2d35e4e..7830f21a 100644
--- a/lam/lib/modules/hostObject.inc
+++ b/lam/lib/modules/hostObject.inc
@@ -198,7 +198,7 @@ class hostObject extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'hosts', _('Host list'), 'host');
return $return;
diff --git a/lam/lib/modules/ieee802device.inc b/lam/lib/modules/ieee802device.inc
index baacf59b..be2cc46e 100644
--- a/lam/lib/modules/ieee802device.inc
+++ b/lam/lib/modules/ieee802device.inc
@@ -158,7 +158,7 @@ class ieee802device extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'macAddress', _('MAC addresses'));
return $return;
diff --git a/lam/lib/modules/inetLocalMailRecipient.inc b/lam/lib/modules/inetLocalMailRecipient.inc
index d8163265..88f7195c 100644
--- a/lam/lib/modules/inetLocalMailRecipient.inc
+++ b/lam/lib/modules/inetLocalMailRecipient.inc
@@ -347,7 +347,7 @@ class inetLocalMailRecipient extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'routingAdr', _('Routing address'), 'mailRoutingAddress');
$this->addSimplePDFField($return, 'localAdr', _('Local address list'), 'mailLocalAddress');
diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index d43732cb..7513aa5e 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -1975,7 +1975,7 @@ class inetOrgPerson extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'description', _('Description'));
$this->addSimplePDFField($return, 'title', _('Job title'));
diff --git a/lam/lib/modules/kolabGroup.inc b/lam/lib/modules/kolabGroup.inc
index d30e7cbf..633a0213 100644
--- a/lam/lib/modules/kolabGroup.inc
+++ b/lam/lib/modules/kolabGroup.inc
@@ -393,7 +393,7 @@ class kolabGroup extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'mail', _('Email address'));
$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recipients'));
diff --git a/lam/lib/modules/kolabSharedFolder.inc b/lam/lib/modules/kolabSharedFolder.inc
index 4d31ab8b..b9a98219 100644
--- a/lam/lib/modules/kolabSharedFolder.inc
+++ b/lam/lib/modules/kolabSharedFolder.inc
@@ -513,7 +513,7 @@ class kolabSharedFolder extends baseModule { // TODO folder type
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'cn', _('Name'));
$this->addSimplePDFField($return, 'mail', _('Email address'));
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index 77f5f75e..b8d6ef05 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -702,7 +702,7 @@ class kolabUser extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'mailHost', _('Mailbox home server'));
// invitation policies
diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc
index 097b3313..d35827aa 100644
--- a/lam/lib/modules/ldapPublicKey.inc
+++ b/lam/lib/modules/ldapPublicKey.inc
@@ -285,7 +285,7 @@ class ldapPublicKey extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
if (sizeof($this->attributes['sshPublicKey']) > 0) {
$pdfTable = new PDFTable(_('SSH public keys'));
diff --git a/lam/lib/modules/nisMailAlias.inc b/lam/lib/modules/nisMailAlias.inc
index 7064385c..3f815572 100644
--- a/lam/lib/modules/nisMailAlias.inc
+++ b/lam/lib/modules/nisMailAlias.inc
@@ -468,7 +468,7 @@ class nisMailAlias extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'alias', _('Alias name'), 'cn');
$this->addSimplePDFField($return, 'recipients', _('Recipient list'), 'rfc822MailMember');
diff --git a/lam/lib/modules/nisMailAliasUser.inc b/lam/lib/modules/nisMailAliasUser.inc
index 9c8d2ac8..f3772520 100644
--- a/lam/lib/modules/nisMailAliasUser.inc
+++ b/lam/lib/modules/nisMailAliasUser.inc
@@ -525,7 +525,7 @@ class nisMailAliasUser extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$aliases = $this->getMailAliasList();
$foundAliases = array();
diff --git a/lam/lib/modules/nisNetGroupHost.inc b/lam/lib/modules/nisNetGroupHost.inc
index 3fc44078..484a514b 100644
--- a/lam/lib/modules/nisNetGroupHost.inc
+++ b/lam/lib/modules/nisNetGroupHost.inc
@@ -253,7 +253,7 @@ class nisNetGroupHost extends nisNetGroupUser {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$pdfTable = new PDFTable();
$pdfRow = new PDFTableRow();
diff --git a/lam/lib/modules/nisNetGroupUser.inc b/lam/lib/modules/nisNetGroupUser.inc
index 62131fdb..bbe40baf 100644
--- a/lam/lib/modules/nisNetGroupUser.inc
+++ b/lam/lib/modules/nisNetGroupUser.inc
@@ -471,7 +471,7 @@ class nisNetGroupUser extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$pdfTable = new PDFTable();
$pdfRow = new PDFTableRow();
diff --git a/lam/lib/modules/nisnetgroup.inc b/lam/lib/modules/nisnetgroup.inc
index 106087da..55733637 100644
--- a/lam/lib/modules/nisnetgroup.inc
+++ b/lam/lib/modules/nisnetgroup.inc
@@ -575,7 +575,7 @@ class nisnetgroup extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'cn', _('Group name'));
$this->addSimplePDFField($return, 'description', _('Description'));
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index 6fec28cf..19d78675 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -1818,7 +1818,7 @@ class posixAccount extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$uidLabel = _('User name');
if ($this->get_scope() == 'host') {
$uidLabel = _('Host name');
diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc
index a42f4766..258dba0f 100644
--- a/lam/lib/modules/posixGroup.inc
+++ b/lam/lib/modules/posixGroup.inc
@@ -616,7 +616,7 @@ class posixGroup extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'memberUid', _('Group members'));
$this->addSimplePDFField($return, 'cn', _('Group name'));
diff --git a/lam/lib/modules/puppetClient.inc b/lam/lib/modules/puppetClient.inc
index cfcfadbd..9dceecfd 100644
--- a/lam/lib/modules/puppetClient.inc
+++ b/lam/lib/modules/puppetClient.inc
@@ -401,7 +401,7 @@ class puppetClient extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
if (!in_array('puppetClient', $this->attributes['objectClass'])) {
return $return;
diff --git a/lam/lib/modules/pykotaBillingCode.inc b/lam/lib/modules/pykotaBillingCode.inc
index 0416ae6b..b961bf37 100644
--- a/lam/lib/modules/pykotaBillingCode.inc
+++ b/lam/lib/modules/pykotaBillingCode.inc
@@ -256,7 +256,7 @@ class pykotaBillingCode extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->loadCodeCache();
$this->addSimplePDFField($return, 'pykotaBillingCode', _('Billing code'));
diff --git a/lam/lib/modules/pykotaGroup.inc b/lam/lib/modules/pykotaGroup.inc
index c3d74dd2..7567d86c 100644
--- a/lam/lib/modules/pykotaGroup.inc
+++ b/lam/lib/modules/pykotaGroup.inc
@@ -462,7 +462,7 @@ class pykotaGroup extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'cn', _('Common name'));
$this->addSimplePDFField($return, 'pykotaGroupName', _('PyKota group name'));
diff --git a/lam/lib/modules/pykotaPrinter.inc b/lam/lib/modules/pykotaPrinter.inc
index de0b5fd7..1ca73114 100644
--- a/lam/lib/modules/pykotaPrinter.inc
+++ b/lam/lib/modules/pykotaPrinter.inc
@@ -579,7 +579,7 @@ class pykotaPrinter extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->loadPrinterNameCache();
$this->addSimplePDFField($return, 'cn', _('Printer name'));
diff --git a/lam/lib/modules/pykotaUser.inc b/lam/lib/modules/pykotaUser.inc
index 5741feb8..cbbb6a7a 100644
--- a/lam/lib/modules/pykotaUser.inc
+++ b/lam/lib/modules/pykotaUser.inc
@@ -887,7 +887,7 @@ class pykotaUser extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'cn', _('Common name'));
$this->addSimplePDFField($return, 'uid', _('User name'));
diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc
index 3ccf6e7f..731359fb 100644
--- a/lam/lib/modules/quota.inc
+++ b/lam/lib/modules/quota.inc
@@ -609,7 +609,7 @@ class quota extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$this->initQuotas();
if (!isset($this->quota) || !is_array($this->quota)) return array();
if (sizeof($this->quota) > 0) {
diff --git a/lam/lib/modules/range.inc b/lam/lib/modules/range.inc
index 525f5717..f632bd40 100644
--- a/lam/lib/modules/range.inc
+++ b/lam/lib/modules/range.inc
@@ -767,7 +767,7 @@ class range extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
if (is_array($this->ranges) && (sizeof($this->ranges) > 0)) {
$pdfTable = new PDFTable(_('Ranges'));
diff --git a/lam/lib/modules/sambaDomain.inc b/lam/lib/modules/sambaDomain.inc
index e471802e..cee9a8a0 100644
--- a/lam/lib/modules/sambaDomain.inc
+++ b/lam/lib/modules/sambaDomain.inc
@@ -593,7 +593,7 @@ class sambaDomain extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'domainName', _('Domain name'), 'sambaDomainName');
$this->addSimplePDFField($return, 'domainSID', _('Domain SID'), 'sambaSID');
diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc
index 65501de2..8844784c 100644
--- a/lam/lib/modules/sambaGroupMapping.inc
+++ b/lam/lib/modules/sambaGroupMapping.inc
@@ -535,7 +535,7 @@ class sambaGroupMapping extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'gidNumber', _('GID number'));
$this->addSimplePDFField($return, 'sambaSID', _('Windows group'));
diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc
index 1cd5064c..42deb960 100644
--- a/lam/lib/modules/sambaSamAccount.inc
+++ b/lam/lib/modules/sambaSamAccount.inc
@@ -1905,7 +1905,7 @@ class sambaSamAccount extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'displayName', _('Display name'));
$this->addSimplePDFField($return, 'sambaHomePath', _('Home path'));
diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc
index 6d3fe0c3..64e459d2 100644
--- a/lam/lib/modules/shadowAccount.inc
+++ b/lam/lib/modules/shadowAccount.inc
@@ -550,7 +550,7 @@ class shadowAccount extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- function get_pdfEntries($pdfKeys) {
+ function get_pdfEntries($pdfKeys, $typeId) {
$timeZone = getTimeZone();
$shadowLastChange = '';
if (!empty($this->attributes['shadowLastChange'][0])) {
diff --git a/lam/lib/modules/systemQuotas.inc b/lam/lib/modules/systemQuotas.inc
index cf8992fc..04765892 100644
--- a/lam/lib/modules/systemQuotas.inc
+++ b/lam/lib/modules/systemQuotas.inc
@@ -376,7 +376,7 @@ class systemQuotas extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- public function get_pdfEntries($pdfKeys) {
+ public function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
if (isset($this->attributes['quota'][0])) {
$pdfTable = new PDFTable();
diff --git a/lam/lib/modules/windowsGroup.inc b/lam/lib/modules/windowsGroup.inc
index d37d7b30..8b9b26e4 100644
--- a/lam/lib/modules/windowsGroup.inc
+++ b/lam/lib/modules/windowsGroup.inc
@@ -910,7 +910,7 @@ class windowsGroup extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- public function get_pdfEntries($pdfKeys) {
+ public function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'cn', _('Group name'));
$this->addSimplePDFField($return, 'description', _('Description'));
diff --git a/lam/lib/modules/windowsHost.inc b/lam/lib/modules/windowsHost.inc
index 4aa7eb0d..81500680 100644
--- a/lam/lib/modules/windowsHost.inc
+++ b/lam/lib/modules/windowsHost.inc
@@ -284,7 +284,7 @@ class windowsHost extends baseModule {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- public function get_pdfEntries($pdfKeys) {
+ public function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'cn', _('Host name'));
$this->addSimplePDFField($return, 'description', _('Description'));
diff --git a/lam/lib/modules/windowsUser.inc b/lam/lib/modules/windowsUser.inc
index 6e137744..ac3b7ea5 100644
--- a/lam/lib/modules/windowsUser.inc
+++ b/lam/lib/modules/windowsUser.inc
@@ -2415,7 +2415,7 @@ class windowsUser extends baseModule implements passwordService {
* {@inheritDoc}
* @see baseModule::get_pdfEntries()
*/
- public function get_pdfEntries($pdfKeys) {
+ public function get_pdfEntries($pdfKeys, $typeId) {
$return = array();
$this->addSimplePDFField($return, 'userPrincipalName', _('User name'));
$this->addSimplePDFField($return, 'cn', _('Common name'));
diff --git a/lam/lib/pdf.inc b/lam/lib/pdf.inc
index 83c888fe..966a1a92 100644
--- a/lam/lib/pdf.inc
+++ b/lam/lib/pdf.inc
@@ -104,7 +104,7 @@ function createModulePDF($accounts, $pdf_structure="default", $returnAsString =
$pdf->AddPage();
// Get PDF entries for the current account
- $entries = $account->get_pdfEntries($pdfKeys);
+ $entries = $account->get_pdfEntries($pdfKeys, $account_type->getId());
// Now create the PDF file acording to the structure with the submitted values
foreach($structure as $entry) {