[mjr] Allow creation of default, personal address book when other read-only sources...

diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
index 3828f02..642fce3 100644 (file)
--- a/turba/docs/CHANGES
+++ b/turba/docs/CHANGES
@@ -10,6 +10,10 @@ v3.0-git
 v2.3.4-cvs
 ----------
 
+[mjr] Allow creation of default, personal address book when other read-only
+      sources are present.
+[mjr] Log deletion in History  when deleting all of a user's contacts
+      (Bug #8755).
 [jan] Only export non-empty fields if exporting manually.
 [jan] Add export to vCard 3.0.
 [jan] Only synchronize those fields that are supported by the client
@@ -481,7 +485,7 @@ v2.0.4
 v2.0.3
 ------
 
-[jan] Add Turkish translation (Servet Güney <sguney@metu.edu.tr>, Ahmet Öztürk
+[jan] Add Turkish translation (Servet Güney <sguney@metu.edu.tr>, Ahmet Öztürk
       <oahmet@metu.edu.tr>).
 
 
@@ -618,7 +622,7 @@ v2.0-BETA
 [cjh] Turba's API has been consolidated somewhat, with a unified import method
       replacing add, addContact, and import_vcard.
 [jan] Add access keys.
-[cjh] Add Kolab drivers (Stuart Bingë <s.binge@codefusion.co.za>).
+[cjh] Add Kolab drivers (Stuart Bing� <s.binge@codefusion.co.za>).
 [cjh] The alphabetic pager now has an "All" option.
 
 
@@ -722,7 +726,7 @@ v1.2
 
 [cjh] Use the 'objectclass' entry from LDAP sources instead of defaulting to
       'objectclass=*'.
-[jan] Add Catalan translation (Angels Guimerà <angels.Guimera@uab.es>).
+[jan] Add Catalan translation (Angels Guimer� <angels.Guimera@uab.es>).
 [jan] Add a preference for viewing names as Lastname, Firstname (Marc Jauvin
       <marc@register4less.com>).
 [jan] Add Latvian translation (Kaspars Kapenieks <kaspars@rcc.lv>).
@@ -829,7 +833,7 @@ v1.0-RC4
 [jan] Add Brazilian Portuguese translation (Carlos Daniel Kibrit
       <kibrit@terra.com.br>).
 [jan] Add Greek translation (Stefanos I. Dimitriou <sdimitri@teiath.gr>).
-[jan] Add Swedish translation (Andreas Dahlén <andreas@dahlen.ws>).
+[jan] Add Swedish translation (Andreas Dahl�n <andreas@dahlen.ws>).
 [jan] Add Korean translation (J.I Kim <aporie@netian.com>).
 [cjh] Remove duplicate entries from multiple sources from
       turbaExpandAddresses() results.

diff --git a/turba/lib/Turba.php b/turba/lib/Turba.php
index 4f1fa94..6b769e2 100644 (file)
--- a/turba/lib/Turba.php
+++ b/turba/lib/Turba.php
@@ -374,6 +374,7 @@ class Turba {
         }
 
         $sortedShares = $defaults = $vbooks = array();
+        $defaults = array();
         foreach (array_keys($shares) as $name) {
             if (isset($sources[$name])) {
                 continue;
@@ -395,7 +396,7 @@ class Turba {
                 // Default share?
                 if (empty($defaults[$params['source']])) {
                     $driver = Turba_Driver::singleton($params['source']);
-                    if (!is_a($driver, 'PEAR_Error')) {
+                    if (!is_a($driver, 'PEAR_Error') && $driver->hasPermission(PERMS_EDIT)) {
                         $defaults[$params['source']] =
                             $driver->checkDefaultShare(
                                 $shares[$name],