WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed checkASCII and gecos in upload (2103936)

This commit is contained in:
Roland Gruber 2008-09-16 17:11:44 +00:00
parent 8d76e3218b
commit b9f1527ba0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lam/lib/modules/posixAccount.inc
View File

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