diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index 98cf75c0..62ce70af 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/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 - 2012 Roland Gruber
+ Copyright (C) 2004 - 2013 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
@@ -621,10 +621,7 @@ class kolabUser extends baseModule {
*/
function get_pdfEntries() {
$return = array();
- // mail server
- if (isset($this->attributes['mailHost'][0])) {
- $return['kolabUser_mailHost'][0] = '' . _('Mailbox home server') . '' . $this->attributes['mailHost'][0] . '';
- }
+ $this->addSimplePDFField($return, 'mailHost', _('Mailbox home server'));
// invitation policies
if (isset($this->attributes['kolabInvitationPolicy'][0])) {
// find default policy
@@ -643,14 +640,8 @@ class kolabUser extends baseModule {
}
}
}
- // email aliases
- if (isset($this->attributes['alias'][0])) {
- $return['kolabUser_aliases'][0] = '' . _('Email aliases') . '' . implode(", ", $this->attributes['alias']) . '';
- }
- // delegates
- if (isset($this->attributes['kolabDelegate'][0])) {
- $return['kolabUser_delegate'][0] = '' . _('Delegates') . '' . implode(", ", $this->attributes['kolabDelegate']) . '';
- }
+ $this->addSimplePDFField($return, 'aliases', _('Email aliases'), 'alias');
+ $this->addSimplePDFField($return, 'delegate', _('Delegates'), 'kolabDelegate');
return $return;
}
diff --git a/lam/lib/modules/nisMailAlias.inc b/lam/lib/modules/nisMailAlias.inc
index e4509e85..cb503f92 100644
--- a/lam/lib/modules/nisMailAlias.inc
+++ b/lam/lib/modules/nisMailAlias.inc
@@ -374,12 +374,8 @@ class nisMailAlias extends baseModule {
*/
function get_pdfEntries() {
$return = array();
- if (isset($this->attributes['cn'][0])) {
- $return['nisMailAlias_alias'][0] = '' . _('Alias name') . '' . $this->attributes['cn'][0] . '';
- }
- if (sizeof($this->attributes['rfc822MailMember']) > 0) {
- $return['nisMailAlias_recipients'][0] = '' . _('Recipient list') . '' . implode(', ', $this->attributes['rfc822MailMember']) . '';
- }
+ $this->addSimplePDFField($return, 'alias', _('Alias name'), 'cn');
+ $this->addSimplePDFField($return, 'recipients', _('Recipient list'), 'rfc822MailMember');
return $return;
}
diff --git a/lam/lib/modules/nisnetgroup.inc b/lam/lib/modules/nisnetgroup.inc
index db1b3d71..7684db99 100644
--- a/lam/lib/modules/nisnetgroup.inc
+++ b/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 - 2012 Roland Gruber
+ Copyright (C) 2009 - 2013 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
@@ -571,16 +571,11 @@ class nisnetgroup extends baseModule {
*/
function get_pdfEntries() {
$return = array();
- // aliased entry
- $return[get_class($this) . '_cn'] = array('' . _('Group name') . '' . $this->attributes['cn'][0] . '');
- if (isset($this->attributes['description'][0])) {
- $return[get_class($this) . '_description'] = array('' . _('Description') . '' . $this->attributes['description'][0] . '');
- }
- if (is_array($this->attributes['memberNisNetgroup'])) {
- $return[get_class($this) . '_subgroups'] = array('' . _('Subgroups') . '' . implode(', ', $this->attributes['memberNisNetgroup']) . '');
- }
+ $this->addSimplePDFField($return, 'cn', _('Group name'));
+ $this->addSimplePDFField($return, 'description', _('Description'));
+ $this->addSimplePDFField($return, 'subgroups', _('Subgroups'), 'memberNisNetgroup');
if (sizeof($this->attributes['nisNetgroupTriple']) > 0) {
- $return[get_class($this) . '_members'] = array('' . _('Members') . ' ');
+ $return[get_class($this) . '_members'] = array('' . _('Members') . ' |
');
$return[get_class($this) . '_members'][] = '' .
'' . _('Host') . ' | ' .
'' . _('User') . ' | ' .