From 187b51978e8504e3477da8999deeb6905d882ff7 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Wed, 11 Mar 2015 20:50:37 +0000
Subject: [PATCH] added addPDFKeyValue()

---
 lam/lib/baseModule.inc               |  2 +-
 lam/lib/modules/kolabUser.inc        |  2 +-
 lam/lib/modules/nisMailAliasUser.inc |  2 +-
 lam/lib/modules/posixAccount.inc     | 13 ++++++-------
 4 files changed, 9 insertions(+), 10 deletions(-)

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('<block><key>' . _('Mailbox quota') . '</key><value>' . $mailQuota . '</value></block>');
+		$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('<block><key>' . _('Alias names') . '</key><value>' . implode(', ', $foundAliases) . '</value></block>');
+		$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('<block><key>' . _('Primary group') . '</key><value>' . $this->getGroupName($this->attributes['gidNumber'][0]) . '</value></block>'),
-			'posixAccount_additionalGroups' => array('<block><key>' . _('Additional groups') . '</key><value>' . implode(", ", $additionalGroups) . '</value></block>'),
-		);
+		$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('<block><key>' . _('Groups of names') . '</key><value>' . implode(", ", $gons) . '</value></block>');
+			$this->addPDFKeyValue($return, 'gon', _('Groups of names'), implode(", ", $gons));
 		}
 		if (isset($this->clearTextPassword)) {
-			$return['posixAccount_userPassword'] = array('<block><key>' . _('Password') . '</key><value>' . $this->clearTextPassword . '</value></block>');
+			$this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->clearTextPassword);
 		}
 		else if (isset($this->attributes['INFO.userPasswordClearText'])) {
-			$return['posixAccount_userPassword'] = array('<block><key>' . _('Password') . '</key><value>' . $this->attributes['INFO.userPasswordClearText'] . '</value></block>');
+			$this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->attributes['INFO.userPasswordClearText']);
 		}
 		return $return;
 	}