From 5ece0c83911c632b3056ea12d240436c47ab4f0c Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 13 Apr 2014 16:59:56 +0000
Subject: [PATCH] reduced upload code

---
 lam/lib/modules/kolabSharedFolder.inc | 24 +++++-------------------
 lam/lib/modules/kolabUser.inc         | 14 +++-----------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/lam/lib/modules/kolabSharedFolder.inc b/lam/lib/modules/kolabSharedFolder.inc
index 89251f15..8a377648 100644
--- a/lam/lib/modules/kolabSharedFolder.inc
+++ b/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  Roland Gruber
+  Copyright (C) 2013 - 2014  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
@@ -467,25 +467,11 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 			// cn
 			$partialAccounts[$i]['cn'] = $rawAccounts[$i][$ids['kolabSharedFolder_cn']];
 			// mail
-			if (!get_preg($rawAccounts[$i][$ids['kolabSharedFolder_mail']], 'email')) {
-				$errMsg = $this->messages['mail'][1];
-				array_push($errMsg, array($i));
-				$messages[] = $errMsg;
-			}
-			else {
-				$partialAccounts[$i]['mail'] = $rawAccounts[$i][$ids['kolabSharedFolder_mail']];
-			}
+			$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'kolabSharedFolder_mail', 'mail',
+				'email', $this->messages['mail'][1], $messages);
 			// mailbox server
-			if (!empty($rawAccounts[$i][$ids['kolabSharedFolder_mailHost']])) {
-				if (get_preg($rawAccounts[$i][$ids['kolabSharedFolder_mailHost']], 'DNSname')) {
-					$partialAccounts[$i]['mailHost'] = $rawAccounts[$i][$ids['kolabSharedFolder_mailHost']];
-				}
-				else {
-					$errMsg = $this->messages['mailHost'][1];
-					array_push($errMsg, array($i));
-					$messages[] = $errMsg;
-				}
-			}
+			$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'kolabSharedFolder_mailHost', 'mailHost',
+				'DNSname', $this->messages['mailHost'][1], $messages);
 			// target folder
 			$partialAccounts[$i]['kolabTargetFolder'] = $rawAccounts[$i][$ids['kolabSharedFolder_kolabTargetFolder']];
 			// folder type
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index 841289e5..31937374 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 - 2013  Roland Gruber
+  Copyright (C) 2004 - 2014  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
@@ -610,16 +610,8 @@ class kolabUser extends baseModule {
 				$partialAccounts[$i]['objectClass'][] = "mailrecipient";
 			}
 			// mailbox server
-			if ($rawAccounts[$i][$ids['kolabUser_mailHost']] != "") {
-				if (get_preg($rawAccounts[$i][$ids['kolabUser_mailHost']], 'DNSname')) {
-					$partialAccounts[$i]['mailHost'] = $rawAccounts[$i][$ids['kolabUser_mailHost']];
-				}
-				else {
-					$errMsg = $this->messages['mailHost'][1];
-					array_push($errMsg, array($i));
-					$messages[] = $errMsg;
-				}
-			}
+			$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'kolabUser_mailHost', 'mailHost',
+				'DNSname', $this->messages['mailHost'][1], $messages);
 			// mailbox quota
 			if (!empty($rawAccounts[$i][$ids['kolabUser_mailQuota']])) {
 				if (get_preg($rawAccounts[$i][$ids['kolabUser_mailQuota']], 'digit')) {