holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for not set system_charset

Browse Source
This commit is contained in:
Ralf Becker 2003-10-10 12:06:40 +00:00
parent 23704841e0
commit 71c2acae50
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -113,19 +113,19 @@
// data for posixaccount // data for posixaccount
$newData['cn'] = $GLOBALS['phpgw']->translation->convert(sprintf("%s %s", $newData['cn'] = $GLOBALS['phpgw']->translation->convert(sprintf("%s %s",
$this->data['firstname'], $this->data['firstname'],
$this->data['lastname']),$GLOBALS['phpgw_info']['server']['system_charset'],'utf-8'); $this->data['lastname']),$GLOBALS['phpgw']->translation->charset(),'utf-8');
$newData['uid'] = $GLOBALS['phpgw']->translation->convert( $newData['uid'] = $GLOBALS['phpgw']->translation->convert(
$this->data['account_lid'], $this->data['account_lid'],
$GLOBALS['phpgw_info']['server']['system_charset'],'utf-8'); $GLOBALS['phpgw']->translation->charset(),'utf-8');
if($this->data['lastname']) if($this->data['lastname'])
$newData['sn'] = $GLOBALS['phpgw']->translation->convert( $newData['sn'] = $GLOBALS['phpgw']->translation->convert(
$this->data['lastname'], $this->data['lastname'],
$GLOBALS['phpgw_info']['server']['system_charset'],'utf-8'); $GLOBALS['phpgw']->translation->charset(),'utf-8');
if($this->data['firstname']) if($this->data['firstname'])
$newData['givenname'] = $GLOBALS['phpgw']->translation->convert( $newData['givenname'] = $GLOBALS['phpgw']->translation->convert(
$this->data['firstname'], $this->data['firstname'],
$GLOBALS['phpgw_info']['server']['system_charset'],'utf-8'); $GLOBALS['phpgw']->translation->charset(),'utf-8');
if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']) if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'])
{ {
$newData['homedirectory'] = $this->data['homedirectory']; $newData['homedirectory'] = $this->data['homedirectory'];
@ -160,7 +160,7 @@
// data for posixgroup // data for posixgroup
$newData['cn'] = $GLOBALS['phpgw']->translation->convert( $newData['cn'] = $GLOBALS['phpgw']->translation->convert(
$this->data['account_lid'], $this->data['account_lid'],
$GLOBALS['phpgw_info']['server']['system_charset'], 'utf-8'); $GLOBALS['phpgw']->translation->charset(), 'utf-8');
$newData['gidnumber'] = $this->data['account_id']; $newData['gidnumber'] = $this->data['account_id'];
$newGroupID = $newData['cn']; $newGroupID = $newData['cn'];
$oldGroupID = $newData['cn']; $oldGroupID = $newData['cn'];
@ -832,7 +832,7 @@
$entry['objectclass'][0] = 'top'; $entry['objectclass'][0] = 'top';
$entry['objectclass'][1] = 'posixGroup'; $entry['objectclass'][1] = 'posixGroup';
$entry['objectclass'][2] = 'phpgwAccount'; $entry['objectclass'][2] = 'phpgwAccount';
$entry['cn'] = $GLOBALS['phpgw']->translation->convert($account_info['account_lid'],$GLOBALS['phpgw_info']['server']['system_charset'],'utf-8'); $entry['cn'] = $GLOBALS['phpgw']->translation->convert($account_info['account_lid'],$GLOBALS['phpgw']->translation->charset(),'utf-8');
$entry['gidnumber'] = $account_id; $entry['gidnumber'] = $account_id;
#$entry['userpassword'] = $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd']); #$entry['userpassword'] = $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd']);
$entry['description'] = 'phpgw-created group'; $entry['description'] = 'phpgw-created group';
@ -844,16 +844,16 @@
$entry['cn'] = $GLOBALS['phpgw']->translation->convert(sprintf("%s %s", $entry['cn'] = $GLOBALS['phpgw']->translation->convert(sprintf("%s %s",
$account_info['account_firstname'], $account_info['account_firstname'],
$account_info['account_lastname'] $account_info['account_lastname']
), $GLOBALS['phpgw_info']['server']['system_charset'], 'utf-8'); ), $GLOBALS['phpgw']->translation->charset(), 'utf-8');
$entry['sn'] = $GLOBALS['phpgw']->translation->convert( $entry['sn'] = $GLOBALS['phpgw']->translation->convert(
$account_info['account_lastname'], $account_info['account_lastname'],
$GLOBALS['phpgw_info']['server']['system_charset'], 'utf-8'); $GLOBALS['phpgw']->translation->charset(), 'utf-8');
if($account_info['account_firstname']) if($account_info['account_firstname'])
$entry['givenname'] = $GLOBALS['phpgw']->translation->convert( $entry['givenname'] = $GLOBALS['phpgw']->translation->convert(
$account_info['account_firstname'], $account_info['account_firstname'],
$GLOBALS['phpgw_info']['server']['system_charset'], 'utf-8'); $GLOBALS['phpgw']->translation->charset(), 'utf-8');
$entry['uid'] = $account_info['account_lid']; $entry['uid'] = $account_info['account_lid'];
$entry['uidnumber'] = $account_id; $entry['uidnumber'] = $account_id;