Skip to content

Enhancements required by EGroupware to support utf-8 and win2008r2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ralfbecker wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Enhancements required by EGroupware to support utf-8 and win2008r2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11d83d3
enhancements required by EGroupware:
ralfbecker Aug 24, 2013
cd6dbd1
remove accidently commited diff
ralfbecker Aug 24, 2013
9ded26a
make most utility methods static and add new method to convert unix t…
ralfbecker Aug 24, 2013
978ad74
Merge remote-tracking branch 'upstream/master'
ralfbecker Jan 28, 2014
21c4680
Real AD password change, if ldap_modify_batch is available PHP 5.4 >=…
ralfbecker Mar 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/adLDAP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@ class adLDAP {
*/
protected $recursiveGroups = true;

/**
* Charset used for internal encoding
*
* @var string
*/
public $charset = 'iso-8859-1';

// You should not need to edit anything below this line
//******************************************************************************************

Expand Down Expand Up @@ -584,6 +591,9 @@ function __construct($options = array()) {
$this->setUseSSO(false);
}
}
if (array_key_exists("charset", $options)) {
$this->charset = strtolower($options["charset"]);
}
}

if ($this->ldapSupported() === false) {
Expand Down Expand Up @@ -919,15 +929,18 @@ public function adldap_schema($attributes) {
*/
protected function encode8Bit(&$item, $key) {
$encode = false;
if (is_string($item)) {
if (is_string($item) && $key != 'password' && $this->charset != 'utf-8') {
for ($i=0; $i<strlen($item); $i++) {
if (ord($item[$i]) >> 7) {
$encode = true;
break;
}
}
}
if ($encode === true && $key != 'password') {
$item = utf8_encode($item);
if ($encode === true) {
$item = function_exists('mb_convert_encoding') ?
mb_convert_encoding($item, 'utf-8', $this->charset) :
utf8_encode($item);
}
}

Expand Down
Loading