mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code style

This commit is contained in:
Arthur Schiwon 2012-07-25 13:18:31 +02:00
parent edfd789a87
commit ab1d9507a9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/user_ldap/lib/access.php
View File

@ -59,7 +59,7 @@ abstract class Access {
$result = \OCP\Util::mb_array_change_key_case(ldap_get_attributes($cr, $er), MB_CASE_LOWER, 'UTF-8'); $result = \OCP\Util::mb_array_change_key_case(ldap_get_attributes($cr, $er), MB_CASE_LOWER, 'UTF-8');
$attr = mb_strtolower($attr, 'UTF-8'); $attr = mb_strtolower($attr, 'UTF-8');
if(isset($result[$attr]) && $result[$attr]['count'] > 0){ if(isset($result[$attr]) && $result[$attr]['count'] > 0) {
$values = array(); $values = array();
for($i=0;$i<$result[$attr]['count'];$i++) { for($i=0;$i<$result[$attr]['count'];$i++) {
$values[] = $this->resemblesDN($attr) ? $this->sanitizeDN($result[$attr][$i]) : $result[$attr][$i]; $values[] = $this->resemblesDN($attr) ? $this->sanitizeDN($result[$attr][$i]) : $result[$attr][$i];
@ -90,7 +90,7 @@ abstract class Access {
*/ */
private function sanitizeDN($dn) { private function sanitizeDN($dn) {
//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this! //OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
$dn = preg_replace('/([^\\\]),(\s+)/u','\1,',$dn); $dn = preg_replace('/([^\\\]),(\s+)/u', '\1,', $dn);
//make comparisons and everything work //make comparisons and everything work
$dn = mb_strtolower($dn, 'UTF-8'); $dn = mb_strtolower($dn, 'UTF-8');
@ -500,7 +500,7 @@ abstract class Access {
foreach($attr as $key) { foreach($attr as $key) {
$key = mb_strtolower($key, 'UTF-8'); $key = mb_strtolower($key, 'UTF-8');
if(isset($item[$key])) { if(isset($item[$key])) {
if($key != 'dn'){ if($key != 'dn') {
$selection[$i][$key] = $this->resemblesDN($key) ? $this->sanitizeDN($item[$key][0]) : $item[$key][0]; $selection[$i][$key] = $this->resemblesDN($key) ? $this->sanitizeDN($item[$key][0]) : $item[$key][0];
} else { } else {
$selection[$i][$key] = $this->sanitizeDN($item[$key]); $selection[$i][$key] = $this->sanitizeDN($item[$key]);
@ -549,7 +549,7 @@ abstract class Access {
* Combines Filter arguments with AND * Combines Filter arguments with AND
*/ */
public function combineFilterWithAnd($filters) { public function combineFilterWithAnd($filters) {
return $this->combineFilter($filters,'&'); return $this->combineFilter($filters, '&');
} }
/** /**
@ -560,7 +560,7 @@ abstract class Access {
* Combines Filter arguments with AND * Combines Filter arguments with AND
*/ */
public function combineFilterWithOr($filters) { public function combineFilterWithOr($filters) {
return $this->combineFilter($filters,'|'); return $this->combineFilter($filters, '|');
} }
/** /**