[dev] [cvs] commit: turba/lib Turba.php api.php turba/lib/Driver share.php
Gunnar Wrobel
wrobel at pardus.de
Tue Oct 2 14:39:42 UTC 2007
Michael Rubinsky <mike at theupstairsroom.com> writes:
> Quoting Gunnar Wrobel <wrobel at pardus.de>:
>
>> "Michael Rubinsky" <mike at theupstairsroom.com> writes:
>>
>>> mrubinsk 2007-08-16 14:40:14 EDT
>>>
>>> Modified files:
>>> lib Turba.php api.php
>>> lib/Driver share.php
>>> Log:
>>> When calling removeUserData() for a share enabled source -
>>>
>>> - Remove the entries from the backend storage
>>> - Remove the share from the share system
>>>
>>> I've tested this and it seems to be ok, but would appreciate
>>> someone else trying this out also, since we are nuking data!
>>>
>>> Revision Changes Path
>>> 1.7 +6 -3 turba/lib/Driver/share.php
>>> 1.151 +18 -15 turba/lib/Turba.php
>>> 1.217 +25 -7 turba/lib/api.php
>>>
>>> Chora Links:
>>> http://cvs.horde.org/diff.php/turba/lib/Driver/share.php?r1=1.6&r2=1.7&ty=u
>>
>> The change
>>
>> - $sourceName = $this->getName();
>> + $sourceName = $this->getContactOwner();
>>
>> seems strange to me. This gave me a problem with the Kolab driver
>> since I had warning in there that triggered once the function gets
>> called with a $sourceName argument other than the current share.
>>
>> I assumed that deleteAll should only get called after the driver got
>> instantiated with an existing addressbook. This is at least what
>> happens when I delete a share at the moment. The code will create a
>> driver object with and will call deleteAll() on it without arguments
>> in wich case all the elements in the share the driver is currently
>> working with are being deleted.
>>
>> Now the deleteAll call gets the owner of the share delivered as a
>> default which seems incorrect. The Kolab driver currently just
>> disregards the value.
>
> No. Turba_Driver_share::getContactOwner() *does* return the owner of
> the share, but that value is only the username for default shares.
> Otherwise, it's the share name (the datatree_name field - it's been a
> while, can't remember the correct nomenclature). So for example, for
> user-created shares, getContactOwner will return
> bf2475f95f727cce3a64a65695d73dfc' - and the underlaying storage
> driver uses *this* value as the address book name to delete.
>
> Hope this answers your question, I've been out of the "turba mode" for
> a little now, so I'm a bit rusty on the particulars....I'm thinking of
> getting a T-Shirt made that says "I survived the Turba share rewrite"
> :)
:) Yes, this answers my question. I guess that the share rewrite in
Turba.php gave me the idea that the mechanism of identifying default
shares by the user name went away before Horde 4.
Cheers,
Gunnar
>
>
> Thanks,
> mike
>
> --
> The Horde Project (www.horde.org)
> mrubinsk at horde.org
>
> "Time just hates me. That's why it made me an adult." - Josh Joplin
> -----BEGIN PGP PUBLIC KEY BLOCK-----
> Version: GnuPG v1.4.4 (MingW32)
>
> mQGiBD3iprYRBADSs3c3I4wBlb6+HQspAgKQe1RP7bJbiBUDZH7P2buD9tN+T5CY
> MZzyPXPL/txGlQ3R8zHBqjKBP7PzbY/mDiEIZZenK1iQRuRKySRILjzIIplxau5c
> PczJYnu6X0zOEd5kTX55hKhyCMD/bhWQPgtRj0oO9JhSqoQZU68OHnqGpQCg/0AW
> qQn0ffh1RfvNQqpRgZJFEF0D/RmmsilfOMRjY6GQ2lOf7tno7HCczR4B7xdBGBQ8
> TFBzQotZuS7pmUteHdH/KpSbwBAU7DxAjzGcx2CJdyEN7xH61oF8+Rmujsldp9QS
> NeU1NQJPvDC6LwcEOrw8Lwea8ULX/BqxQkRoXRJA/vDSIGPIEcrKEOQ6bSQMtH42
> F6TCBACNe5XQvt5DAxwktavrB9cMhop8iuxB76iBW55/Ca193G0Kn3FxnAoMQU30
> EDy/uGrfxt4hedbLH7Yr9ZNjEmkx0LW5q1sP4WPIn8jnxSlc2Rer8wSC4VtY6G2h
> D8Fz6VSml0Y9/HmBDrrxQzdIbx1dz5dXzmnrOBnQ+bntPMHatbQrTWljaGFlbCBS
> dWJpbnNreSA8bWlrZUB0aGV1cHN0YWlyc3Jvb20uY29tPohOBBARAgAOBQI94qa2
> BAsDAgECGQEACgkQTW0K6bINYV6oxwCfWmg1y7HBPA6gBv1zWROmEpceFzcAoKha
> jjwba0WFN9ClsIlddrMN4326uQMNBD3iprcQDADMHXdXJDhK4sTw6I4TZ5dOkhNh
> 9tvrJQ4X/faY98h8ebByHTh1+/bBc8SDESYrQ2DD4+jWCv2hKCYLrqmus2UPogBT
> AaB81qujEh76DyrOH3SET8rzF/OkQOnX0ne2Qi0CNsEmy2henXyYCQqNfi3t5F15
> 9dSST5sYjvwqp0t8MvZCV7cIfwgXcqK61qlC8wXo+VMROU+28W65Szgg2gGnVqMU
> 6Y9AVfPQB8bLQ6mUrfdMZIZJ+AyDvWXpF9Sh01D49Vlf3HZSTz09jdvOmeFXklnN
> /biudE/F/Ha8g8VHMGHOfMlm/xX5u/2RXscBqtNbno2gpXI61Brwv0YAWCvl9Ij9
> WE5J280gtJ3kkQc2azNsOA1FHQ98iLMcfFstjvbzySPAQ/ClWxiNjrtVjLhdONM0
> /XwXV0OjHRhs3jMhLLUq/zzhsSlAGBGNfISnCnLWhsQDGcgHKXrKlQzZlp+r0ApQ
> mwJG0wg9ZqRdQZ+cfL2JSyIZJrqrol7DVelMMm8AAgIL/jAsKXPT6gs4C0E7aRRV
> 3f3yDNaqn5vXb2aarZMgYKQuz76csmoxOH/9tM2b5Ra0RB4m7WJjfgpxMovkkOYu
> i4xSx+bhp7khM+6myA6akykwsD55UJRrnHKu2Nf3m09rRKIylsfn06KnWU6WGyii
> 0vQQWVxRjUmBo+uqAoOOP3rPK/zfWag9ST9pyC5Lqd3eFlFY3MRC69Aocs7EbBze
> e6LfsB/TzUJUo7a6m90qyB90lDu7lHrTvtV/tqQ/ESkkB/bogQIygymm+XeFWV1d
> vqz7lQ7QuF5nkN8Nv1h/FIn6l9keRgckUHVloM8x0+otqvfkSEd3h8XzR/rwGSH2
> WiPXtEJMDPYSFojkemP6MJYb8TEqCLD6KjA194LTwRcVwxRuHqQmp+rtS3W4czcx
> a+pDaDmF/8b99wgHUMtZQF2iHtovzaaAoAVkL+DjKgfP8HXKeaUjJzF6XzQEQWps
> T5bRViFtba+r3h8e4cvHUw+UPD6ar7GrXHkMxjS8FlLoEohGBBgRAgAGBQI94qa3
> AAoJEE1tCumyDWFep7oAoPfwLvoFEvSbjzx6F/CDaLklaDvQAJ9G+UWbra0i4DhK
> yKstCHAPb7Y75w==
> =e3BX
> -----END PGP PUBLIC KEY BLOCK-----
>
> --
> Horde developers mailing list - Join the hunt: http://horde.org/bounties/
> Frequently Asked Questions: http://horde.org/faq/
> To unsubscribe, mail: dev-unsubscribe at lists.horde.org
--
____ http://www.pardus.de _________________ http://gunnarwrobel.de _
E-mail : p at rdus.de Dr. Gunnar Wrobel
Tel. : +49 40 432 72335 Bundesstrasse 29
Fax : +49 40 432 70855 D-20146 Hamburg
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> Mail at ease - Rent a kolab groupware server at p at rdus <<
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
More information about the dev
mailing list