From 2eebcbee3a288a5e3479494ce233614584935827 Mon Sep 17 00:00:00 2001 From: Lars Kneschke Date: Tue, 18 Nov 2003 21:42:16 +0000 Subject: [PATCH] phpgroupware -> egroupware Fix for BUG [ 844428 ] X-Mailer text should be changed --- phpgwapi/inc/class.accounts_ldap.inc.php | 4 ++-- phpgwapi/inc/class.send.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php index 764200c3ff..74c011d1d5 100644 --- a/phpgwapi/inc/class.accounts_ldap.inc.php +++ b/phpgwapi/inc/class.accounts_ldap.inc.php @@ -298,7 +298,7 @@ // remove the uid from memberuid $newData['memberuid'] = array_flip($newData['memberuid']); 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); #print ldap_error($this->ds); @@ -314,7 +314,7 @@ // remove the uid from memberuid $newData['memberuid'] = array_flip($newData['memberuid']); 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); #print ldap_error($this->ds); } diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php index 771e8e269f..551e6144ec 100644 --- a/phpgwapi/inc/class.send.inc.php +++ b/phpgwapi/inc/class.send.inc.php @@ -74,7 +74,7 @@ { $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 if ($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'] && $attach_sig)