diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index b2766de0..eb98791b 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -850,7 +850,7 @@ abstract class baseModule {
* @param mixed $value value as String or array
* @param String $delimiter delimiter if value is array (default: ", ")
*/
- public function addPDFKeyValue(&$result, $name, $label, $value, $delimiter = ', ') {
+ protected function addPDFKeyValue(&$result, $name, $label, $value, $delimiter = ', ') {
if (is_array($value)) {
natcasesort($value);
$value = implode($delimiter, $value);
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index f1ad22ff..12aadd2d 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -770,7 +770,7 @@ class kolabUser extends baseModule {
if (!empty($this->attributes['mailQuota'][0])) {
$mailQuota = ($this->attributes['mailQuota'][0] / 1024) . 'MB';
}
- $return[get_class($this) . '_mailQuota'] = array('' . _('Mailbox quota') . '' . $mailQuota . '');
+ $this->addPDFKeyValue($return, 'mailQuota', _('Mailbox quota'), $mailQuota);
return $return;
}
diff --git a/lam/lib/modules/nisMailAliasUser.inc b/lam/lib/modules/nisMailAliasUser.inc
index 7bd54878..12931565 100644
--- a/lam/lib/modules/nisMailAliasUser.inc
+++ b/lam/lib/modules/nisMailAliasUser.inc
@@ -539,7 +539,7 @@ class nisMailAliasUser extends baseModule {
}
}
$foundAliases = array_unique($foundAliases);
- $return[get_class($this) . '_alias'] = array('' . _('Alias names') . '' . implode(', ', $foundAliases) . '');
+ $this->addPDFKeyValue($return, 'alias', _('Alias names'), implode(', ', $foundAliases));
return $return;
}
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index dbab1737..2b9c50bf 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -1866,10 +1866,9 @@ class posixAccount extends baseModule implements passwordService {
$additionalGroups = $this->groups;
natcasesort($additionalGroups);
}
- $return = array(
- 'posixAccount_primaryGroup' => array('' . _('Primary group') . '' . $this->getGroupName($this->attributes['gidNumber'][0]) . ''),
- 'posixAccount_additionalGroups' => array('' . _('Additional groups') . '' . implode(", ", $additionalGroups) . ''),
- );
+ $return = array();
+ $this->addPDFKeyValue($return, 'primaryGroup', _('Primary group'), $this->getGroupName($this->attributes['gidNumber'][0]));
+ $this->addPDFKeyValue($return, 'additionalGroups', _('Additional groups'), implode(", ", $additionalGroups));
$this->addSimplePDFField($return, 'uid', $uidLabel);
$this->addSimplePDFField($return, 'cn', _('Common name'));
$this->addSimplePDFField($return, 'uidNumber', _('UID number'));
@@ -1886,13 +1885,13 @@ class posixAccount extends baseModule implements passwordService {
}
}
natcasesort($gons);
- $return['posixAccount_gon'] = array('' . _('Groups of names') . '' . implode(", ", $gons) . '');
+ $this->addPDFKeyValue($return, 'gon', _('Groups of names'), implode(", ", $gons));
}
if (isset($this->clearTextPassword)) {
- $return['posixAccount_userPassword'] = array('' . _('Password') . '' . $this->clearTextPassword . '');
+ $this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->clearTextPassword);
}
else if (isset($this->attributes['INFO.userPasswordClearText'])) {
- $return['posixAccount_userPassword'] = array('' . _('Password') . '' . $this->attributes['INFO.userPasswordClearText'] . '');
+ $this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->attributes['INFO.userPasswordClearText']);
}
return $return;
}