deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

Closes pull request #22 and fixes #18 - preg_replace_callback changes

Browse Source
This commit is contained in:
Deon George 2019-04-19 20:08:53 +10:00
parent 73b7795bc0
commit c494078550
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ds_ldap.php
View File

@ -1117,12 +1117,12 @@ class ldap extends DS {
if (is_array($dn)) { if (is_array($dn)) {
$a = array(); $a = array();
foreach ($dn as $key => $rdn) { foreach ($dn as $key => $rdn) {
$a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', function($m) { return "''.chr(hexdec('${m[1]}')).''"; }, $rdn); $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', function($m) { return chr(hexdec('${m[1]}')); }, $rdn);
} }
return $a; return $a;
} else { } else {
return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', function($m) { return "''.chr(hexdec('${m[1]}')).''"; }, $dn); return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', function($m) { return chr(hexdec('${m[1]}')); }, $dn);
} }
} }

32
lib/functions.php
View File

@ -69,7 +69,7 @@ spl_autoload_register(function ($className) {
/** /**
* Strips all slashes from the specified array in place (pass by ref). * Strips all slashes from the specified array in place (pass by ref).
* @param Array The array to strip slashes from, typically one of * @param Array The array to strip slashes from, typically one of
* $_GET, $_POST, or $_COOKIE. * $_GET, $_POST, or $_COOKIE.
*/ */
function array_stripslashes(&$array) { function array_stripslashes(&$array) {
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
@ -2504,21 +2504,23 @@ function draw_chooser_link($form,$element,$include_choose_text=true,$rdn='none')
* ldap_explode_dn turns unprintable chars (in the ASCII sense, UTF8 * ldap_explode_dn turns unprintable chars (in the ASCII sense, UTF8
* encoded) into \<hexcode>. * encoded) into \<hexcode>.
*/ */
function ldap_explode_dn_patch( $dn, $with_attrib ) { function ldap_explode_dn_patch($dn,$with_attrib) {
$result = ldap_explode_dn( $dn, $with_attrib ); $result = ldap_explode_dn($dn,$with_attrib);
if (! $result ) return null; if (! $result)
# translate hex code into ascii again return null;
foreach ( $result as $key => $value ) {
$result[ $key ] = preg_replace_callback(
"/\\\([0-9A-Fa-f]{2})/",
function ( $matches) {
return chr( hexdec( $matches[1] ) );
},
$value
);
}
return ( $result );
# translate hex code into ascii again
foreach ($result as $key => $value) {
$result[$key] = preg_replace_callback(
"/\\\([0-9A-Fa-f]{2})/",
function ($matches) {
return chr(hexdec($matches[1]));
},
$value
);
}
return $result;
} }
/** /**