See this is the magic of git, avoids  a lot of this pain....

(or mercurial, bzr, etc)



On 12/08/2010 11:47, Marcus Don wrote:
Re: [RCD] improved extended address book patch with group management Hi Phil

I just did a dry run of your patch against version 0.4-stable and got the following results:

patch -b --dry-run -p0 < rc_addressbook.r3814.patch
patching file skins/default/common.css
Hunk #1 succeeded at 765 (offset 10 lines).
patching file skins/default/functions.js
patching file skins/default/addressbook.css
Hunk #1 succeeded at 197 (offset -1 lines).
Hunk #2 succeeded at 209 with fuzz 2 (offset -4 lines).
patching file skins/default/settings.css
patching file skins/default/iehacks.css
patching file skins/default/templates/showcontact.html
patching file skins/default/templates/addressbook.html
patching file skins/default/templates/editcontact.html
patching file skins/default/templates/blankcontact.html
patching file skins/default/templates/addcontact.html
patching file index.php
patching file config/main.inc.php.dist
patching file program/include/rcube_contacts.php
patching file program/include/rcube_ldap.php
patching file program/include/rcube_vcard.php
Hunk #3 succeeded at 176 (offset 7 lines).
Hunk #5 succeeded at 312 (offset 7 lines).
patching file program/include/rcube_addressbook.php
patching file program/localization/en_GB/labels.inc
Hunk #1 succeeded at 197 (offset 1 line).
patching file program/localization/en_US/labels.inc
patching file program/js/app.js
Hunk #1 FAILED at 299.
Hunk #2 FAILED at 593.
Hunk #3 FAILED at 605.
Hunk #4 FAILED at 996.
Hunk #5 FAILED at 3612.
Hunk #6 FAILED at 3743.
Hunk #7 FAILED at 3812.
7 out of 7 hunks FAILED -- saving rejects to file program/js/app.js.rej
patching file program/steps/addressbook/func.inc
patching file program/steps/addressbook/save.inc
patching file program/steps/addressbook/show.inc
patching file program/steps/addressbook/edit.inc
patching file program/steps/mail/autocomplete.inc

Do you have an updated version by any chance?

Thanks

Marcus


> Hi Marcus,
>
> The patch was created against SVN Trunk r3814. I haven't made any changes to
> the import/export but none should be required since they already use the
> vCard data.
>
> Regards,
>
> Phil
>
> -----Original Message-----
> From: Marcus Don [mailto:mdon@names.co.uk]
> Sent: 19 July 2010 11:15
> To: Phil Weir; dev@lists.roundcube.net
> Subject: Re: [RCD] improved extended address book patch with group
> management
>
> Hi Phil
>
> Great to see progress being made with the address book - in my opinion, this
> is by far the most important missing element of Roundcube.
>
> Please can you confirm exactly which version of RC this patch is intended
> for, and whether it also extends the import/export functionality?
>
> Thanks
>
> Marcus
> --
> Marcus Don
> Applications Development Manager
> Namesco Limited
>
>
>> Hi,
>>
>> I have improved my extended address book patch to include a "Groups" tab,
>> this lists all the groups a contact is in (limited by address book) and
>> allows users to add or remove the contact from a group by ticking a box
>> (like the folder subscriptions). I'm not 100% sure about the group
>> management stuff so if any one has any better ideas on how to do it please
>> let me know.
>>
>> I have also extended the support for alternative email addresses to allow
>> any number of email address to be added. This is only for the default SQL
>> address book.
>>
>> Like before there is no need for any SQL changes.
>>
>> Complete list of changes:
>> *) Add "date_only" config option to specify the format when displaying a
>> contacts birthday
>> *) Add more fields based on vCard; alt email, address, telephone etc
>> *) Move auto_complete function into address book class to allow different
>> for searching of custom fields (like those in the vCard)
>> *) Add new blankcontact.html template file
>> *) Add support for multiple email address
>> *) Add "Groups" management tab
>>
>> The extended address book patch also incorporates the patch from this
> ticket
>> http://trac.roundcube.net/ticket/1486851.
>>
>> It's been tested with the default SQL address book, I'm not sure how well
> it
>> will get on with LDAP as I don't have access to an LDAP address book at
> the
>> moment, if any one would like to help me test it that would be
> appreciated.
>>
>> Screenshot and patch attached.
>>
>> Phil
>> http://www.tehinterweb.co.uk/roundcube
>>
>>
>>
>>  --- 8< --- detachments --- 8< ---
>>  The following attachments have been detached and are available for
> viewing.
>>   http://detached.gigo.com/rc/fm/Xq5dOtaO/addressbook.jpg
>>   http://detached.gigo.com/rc/fm/Xq5dOtaO/rc_addressbook.r3814.patch
>>  Only click these links if you trust the sender, as well as this message.
>>  --- 8< --- detachments --- 8< ---
>>
>> _______________________________________________
>> List info: http://lists.roundcube.net/dev/
>
>
>
_______________________________________________ List info: http://lists.roundcube.net/dev/ BT/443a308e