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

phpgroupware -> egroupware

Browse Source 
Fix for BUG [ 844428 ] X-Mailer text should be changed
This commit is contained in:
Lars Kneschke 2003-11-18 21:42:16 +00:00
parent 51e2eb61da
commit 2eebcbee3a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,7 +298,7 @@
// remove the uid from memberuid // remove the uid from memberuid
$newData['memberuid'] = array_flip($newData['memberuid']); $newData['memberuid'] = array_flip($newData['memberuid']);
unset($newData['memberuid'][$oldAccountID]); unset($newData['memberuid'][$oldAccountID]);
$newData['memberuid'] = array_values(array_unique(array_flip($newData['memberuid']))); $newData['memberuid'] = array_values(sort(array_flip($newData['memberuid'])));
ldap_mod_replace($this->ds, $dn, $newData); ldap_mod_replace($this->ds, $dn, $newData);
#print ldap_error($this->ds); #print ldap_error($this->ds);
@ -314,7 +314,7 @@
// remove the uid from memberuid // remove the uid from memberuid
$newData['memberuid'] = array_flip($newData['memberuid']); $newData['memberuid'] = array_flip($newData['memberuid']);
unset($newData['memberuid'][$oldAccountID]); unset($newData['memberuid'][$oldAccountID]);
$newData['memberuid'] = array_values(array_unique(array_flip($newData['memberuid']))); $newData['memberuid'] = array_values(sort(array_flip($newData['memberuid'])));
ldap_mod_replace($this->ds, $dn, $newData); ldap_mod_replace($this->ds, $dn, $newData);
#print ldap_error($this->ds); #print ldap_error($this->ds);
} }

2
phpgwapi/inc/class.send.inc.php
View File

@ -74,7 +74,7 @@
{ {
$header .= 'X-phpGW-Type: '.$msgtype."\n"; $header .= 'X-phpGW-Type: '.$msgtype."\n";
} }
$header .= 'X-Mailer: phpGroupWare (http://www.phpgroupware.org)'."\n"; $header .= 'X-Mailer: eGroupWare (http://www.egroupware.org)'."\n";
/* // moved to email/send_message.php /* // moved to email/send_message.php
if ($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'] && $attach_sig) if ($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'] && $attach_sig)