From b9f1527ba0ae37ab5391a9f32771fa80d6fc3a9b Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Tue, 16 Sep 2008 17:11:44 +0000
Subject: [PATCH] fixed checkASCII and gecos in upload (2103936)

---
 lam/lib/modules/posixAccount.inc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index 2b3e15aa..424d498a 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -878,15 +878,15 @@ class posixAccount extends baseModule {
 		$convert = array ( 'ä' => 'ae', 'Ä' => 'Ae', 'ö' => 'oe', 'Ö' => 'Oe', 'ü' => 'ue', 'Ü' => 'Ue',
 			'ß' => 'ss', 'é' => 'e', 'è' => 'e', 'ô' => 'o', 'ç' => 'c'
 			);
-		$index = array_keys($convert);
 		// replace special characters
-		for ($k = 0; $k < count($index); $k++) {
-			$attribute = str_replace($index[$k], $convert[$index[$k]], $attribute);
+		foreach ($convert as $key => $value) {
+			$attribute = str_replace($key, $value, $attribute);
 		}
 		// remove remaining UTF-8 characters
 		for ($c = 0; $c < strlen($attribute); $c++) {
 			if (ord($attribute[$c]) > 127) {
-				$attribute = substr($attribute, 0, $c) . substr($attribute, $c + 2);
+				$attribute = str_replace($attribute[$c], "", $attribute);
+				$c--;
 			}
 		}
 		return $attribute;
@@ -1392,7 +1392,7 @@ class posixAccount extends baseModule {
 			// GECOS
 			if ($rawAccounts[$i][$ids['posixAccount_gecos']] != "") {
 				if (get_preg($rawAccounts[$i][$ids['posixAccount_gecos']], 'gecos')) {
-					$partialAccounts[$i]['gecos'] = $rawAccounts[$i][$ids['posixAccount_gecos']];
+					$partialAccounts[$i]['gecos'] = $this->checkASCII($rawAccounts[$i][$ids['posixAccount_gecos']]);
 				}
 				else {
 					$errMsg = $this->messages['gecos'][0];
@@ -1411,7 +1411,9 @@ class posixAccount extends baseModule {
 						}
 					}
 				}
-				if ($gecos != "") $partialAccounts[$i]['gecos'] = $gecos;
+				if ($gecos != "") {
+					$partialAccounts[$i]['gecos'] = $this->checkASCII($gecos);
+				}
 			}
 			// user specific attributes
 			if ($this->get_scope() == 'user') {