Upgrade to 2.0.3.

1 files changed, 87 insertions, 67 deletions

diff --git a/mail/turba/files/patch-config::sources.php.dist b/mail/turba/files/patch-config::sources.php.dist
index b3d2dca..5f11eab 100644
--- a/mail/turba/files/patch-config::sources.php.dist
+++ b/mail/turba/files/patch-config::sources.php.dist
@@ -1,7 +1,7 @@
---- config/sources.php.dist.orig	Tue Feb  8 21:43:47 2005
-+++ config/sources.php.dist	Sun Feb 13 15:54:12 2005
-@@ -454,72 +454,72 @@
-  * automatically populated with the current username.
+--- config/sources.php.dist.orig	Wed Jun 22 20:21:52 2005
++++ config/sources.php.dist	Tue Jul 19 14:25:35 2005
+@@ -468,82 +468,82 @@
+  * populated with the current username.
   */
  // First, get the user name
 -$uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
@@ -57,59 +57,59 @@
 -    'readonly' => false,
 -    'export' => true
 -    );
-+//UNCOMMENTIFIMSP $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
-+//UNCOMMENTIFIMSP $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
-+//UNCOMMENTIFIMSP if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP     $uid = Auth::getAuth();
-+//UNCOMMENTIFIMSP     if (preg_match('/(^.*)@/', $uid, $matches)) {
-+//UNCOMMENTIFIMSP         $uid = $matches[1];
-+//UNCOMMENTIFIMSP     }
-+//UNCOMMENTIFIMSP     $pass = Auth::getCredential('password');
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP 
-+//UNCOMMENTIFIMSP $cfgSources['imsp'] = array(
-+//UNCOMMENTIFIMSP     'title' => _("IMSP"),
-+//UNCOMMENTIFIMSP     'type' => 'imsp',
-+//UNCOMMENTIFIMSP     'params' => array(
-+//UNCOMMENTIFIMSP         'server'   => 'localhost',
-+//UNCOMMENTIFIMSP         'port'     => '406',
-+//UNCOMMENTIFIMSP         'username' => $uid,
-+//UNCOMMENTIFIMSP         'password' => $pass,
-+//UNCOMMENTIFIMSP         'name' => $uid,
-+//UNCOMMENTIFIMSP         'auth_method' => 'cram_md5',
-+//UNCOMMENTIFIMSP         'group_id_field' => 'group',
-+//UNCOMMENTIFIMSP         'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP         'contact_ownership' => false
-+//UNCOMMENTIFIMSP         ),
-+//UNCOMMENTIFIMSP     'map' => array(
-+//UNCOMMENTIFIMSP         '__key' => 'name',
-+//UNCOMMENTIFIMSP         '__type' => '__type',
-+//UNCOMMENTIFIMSP         '__members' => '__members',
-+//UNCOMMENTIFIMSP         '__owner' => '__owner',
-+//UNCOMMENTIFIMSP         '__uid' => '__uid',
-+//UNCOMMENTIFIMSP         'name' => 'fullname',
-+//UNCOMMENTIFIMSP         'email' => 'email',
-+//UNCOMMENTIFIMSP         'alias' => 'alias',
-+//UNCOMMENTIFIMSP         'company' => 'company',
-+//UNCOMMENTIFIMSP         'notes' => 'notes',
-+//UNCOMMENTIFIMSP         'workPhone' => 'phone-work',
-+//UNCOMMENTIFIMSP         'fax' => 'fax',
-+//UNCOMMENTIFIMSP         'homePhone' => 'phone-home',
-+//UNCOMMENTIFIMSP         'cellPhone' => 'cellphone',
-+//UNCOMMENTIFIMSP         'freebusyUrl' => 'freebusyUrl'
-+//UNCOMMENTIFIMSP         ),
-+//UNCOMMENTIFIMSP     'search' => array(
-+//UNCOMMENTIFIMSP         'name',
-+//UNCOMMENTIFIMSP         'email',
-+//UNCOMMENTIFIMSP         'alias',
-+//UNCOMMENTIFIMSP         'company',
-+//UNCOMMENTIFIMSP         'homePhone'
-+//UNCOMMENTIFIMSP         ),
-+//UNCOMMENTIFIMSP     'strict' => array(),
-+//UNCOMMENTIFIMSP     'public' => false,
-+//UNCOMMENTIFIMSP     'readonly' => false,
-+//UNCOMMENTIFIMSP     'export' => true
-+//UNCOMMENTIFIMSP     );
++//UNCOMMENTIFIMSP$uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
++//UNCOMMENTIFIMSP$pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
++//UNCOMMENTIFIMSPif (!strlen($uid)) {
++//UNCOMMENTIFIMSP    $uid = Auth::getAuth();
++//UNCOMMENTIFIMSP    if (preg_match('/(^.*)@/', $uid, $matches)) {
++//UNCOMMENTIFIMSP        $uid = $matches[1];
++//UNCOMMENTIFIMSP    }
++//UNCOMMENTIFIMSP    $pass = Auth::getCredential('password');
++//UNCOMMENTIFIMSP}
++//UNCOMMENTIFIMSP
++//UNCOMMENTIFIMSP$cfgSources['imsp'] = array(
++//UNCOMMENTIFIMSP    'title' => _("IMSP"),
++//UNCOMMENTIFIMSP    'type' => 'imsp',
++//UNCOMMENTIFIMSP    'params' => array(
++//UNCOMMENTIFIMSP        'server'   => 'localhost',
++//UNCOMMENTIFIMSP        'port'     => '406',
++//UNCOMMENTIFIMSP        'username' => $uid,
++//UNCOMMENTIFIMSP        'password' => $pass,
++//UNCOMMENTIFIMSP        'name' => $uid,
++//UNCOMMENTIFIMSP        'auth_method' => 'cram_md5',
++//UNCOMMENTIFIMSP        'group_id_field' => 'group',
++//UNCOMMENTIFIMSP        'group_id_value' => 'group',
++//UNCOMMENTIFIMSP        'contact_ownership' => false
++//UNCOMMENTIFIMSP        ),
++//UNCOMMENTIFIMSP    'map' => array(
++//UNCOMMENTIFIMSP        '__key' => 'name',
++//UNCOMMENTIFIMSP        '__type' => '__type',
++//UNCOMMENTIFIMSP        '__members' => '__members',
++//UNCOMMENTIFIMSP        '__owner' => '__owner',
++//UNCOMMENTIFIMSP        '__uid' => '__uid',
++//UNCOMMENTIFIMSP        'name' => 'fullname',
++//UNCOMMENTIFIMSP        'email' => 'email',
++//UNCOMMENTIFIMSP        'alias' => 'alias',
++//UNCOMMENTIFIMSP        'company' => 'company',
++//UNCOMMENTIFIMSP        'notes' => 'notes',
++//UNCOMMENTIFIMSP        'workPhone' => 'phone-work',
++//UNCOMMENTIFIMSP        'fax' => 'fax',
++//UNCOMMENTIFIMSP        'homePhone' => 'phone-home',
++//UNCOMMENTIFIMSP        'cellPhone' => 'cellphone',
++//UNCOMMENTIFIMSP        'freebusyUrl' => 'freebusyUrl'
++//UNCOMMENTIFIMSP        ),
++//UNCOMMENTIFIMSP    'search' => array(
++//UNCOMMENTIFIMSP        'name',
++//UNCOMMENTIFIMSP        'email',
++//UNCOMMENTIFIMSP        'alias',
++//UNCOMMENTIFIMSP        'company',
++//UNCOMMENTIFIMSP        'homePhone'
++//UNCOMMENTIFIMSP        ),
++//UNCOMMENTIFIMSP    'strict' => array(),
++//UNCOMMENTIFIMSP    'public' => false,
++//UNCOMMENTIFIMSP    'readonly' => false,
++//UNCOMMENTIFIMSP    'export' => true
++//UNCOMMENTIFIMSP    );
  
  /**
   * Get any other addressbooks this user might be privy to.
@@ -118,20 +118,40 @@
 -$result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
 -if (!is_a($result, 'PEAR_Error')) {
 -    for ($i = 0; $i < count($result); $i++) {
--        $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+-        // Make sure we didn't define this source explicitly.
+-        $dup = false;
+-        foreach ($cfgSources as $thisSource) {
+-            if (($thisSource['type'] == 'imsp') &&
+-                ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
+-                $dup = true;
+-            }
+-        }
+-        if (!$dup) {
+-            $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+-        }
 -    }
 -} else {
 -    $notification->push($result);
 -}
-+//UNCOMMENTIFIMSP require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
-+//UNCOMMENTIFIMSP if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP     for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP         $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
-+//UNCOMMENTIFIMSP     }
-+//UNCOMMENTIFIMSP } else {
-+//UNCOMMENTIFIMSP     $notification->push($result);
-+//UNCOMMENTIFIMSP }
++//UNCOMMENTIFIMSPrequire_once 'Net/IMSP/Utils.php';
++//UNCOMMENTIFIMSP$result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
++//UNCOMMENTIFIMSPif (!is_a($result, 'PEAR_Error')) {
++//UNCOMMENTIFIMSP    for ($i = 0; $i < count($result); $i++) {
++//UNCOMMENTIFIMSP        // Make sure we didn't define this source explicitly.
++//UNCOMMENTIFIMSP        $dup = false;
++//UNCOMMENTIFIMSP        foreach ($cfgSources as $thisSource) {
++//UNCOMMENTIFIMSP            if (($thisSource['type'] == 'imsp') &&
++//UNCOMMENTIFIMSP                ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
++//UNCOMMENTIFIMSP                $dup = true;
++//UNCOMMENTIFIMSP            }
++//UNCOMMENTIFIMSP        }
++//UNCOMMENTIFIMSP        if (!$dup) {
++//UNCOMMENTIFIMSP            $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
++//UNCOMMENTIFIMSP        }
++//UNCOMMENTIFIMSP    }
++//UNCOMMENTIFIMSP} else {
++//UNCOMMENTIFIMSP    $notification->push($result);
++//UNCOMMENTIFIMSP}
  
  /* Begin Kolab sources. */
  if (!empty($GLOBALS['conf']['kolab']['enabled'])) {