From b22748263f0c8348b9f1f5018f9dc9ae3f2367b3 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 26 Sep 2008 14:55:44 +0000 Subject: [PATCH 1/6] Monotone-Parent: c465e35fc5f42324c08780dae83f7d225dca6e6a Monotone-Revision: 27a0bd22985debe601bbcb1061a0c32acd6854ea Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-26T14:55:44 Monotone-Branch: ca.inverse.sogo --- configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure b/configure index 92a300f92..83be6b757 100755 --- a/configure +++ b/configure @@ -83,6 +83,11 @@ printParas() { else echo " strip: no"; fi + if test $ARG_WITH_LDAP_CONFIG = 1; then + echo " ldap-based configuration: yes"; + else + echo " ldap-based configuration: no"; + fi echo " prefix: $ARG_PREFIX" echo " gstep: $ARG_GSMAKE" From c3b3dc744d81d7029c497e8175936c755f5de3a4 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Sat, 27 Sep 2008 01:09:23 +0000 Subject: [PATCH 2/6] Monotone-Parent: 27a0bd22985debe601bbcb1061a0c32acd6854ea Monotone-Revision: c33cdda9e79ffbb64ec7e5ffcb898838a13ac5a7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-27T01:09:23 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 + SoObjects/SOGo/SOGoLDAPUserDefaults.m | 307 ++++++++++++++++++++++++++ 2 files changed, 313 insertions(+) diff --git a/ChangeLog b/ChangeLog index cc49dcf5f..bad1e6e9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-26 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoLDAPUserDefaults.m ([SOGoLDAPUserDefaults + -objectForKey:key]): implemented overriden method by using c types + and methods to avoid recursive calls from objective-c methods. + 2008-09-25 Wolfgang Sourdeau * SoObjects/SOGo/SOGoLDAPUserDefaults.[hm]: new class module diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.m b/SoObjects/SOGo/SOGoLDAPUserDefaults.m index f7071c937..35ecefec3 100644 --- a/SoObjects/SOGo/SOGoLDAPUserDefaults.m +++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.m @@ -20,8 +20,315 @@ * Boston, MA 02111-1307, USA. */ +#define LDAP_DEPRECATED 1 + +#import + +#import +#import +#import + +#import + #import "SOGoLDAPUserDefaults.h" +#define SOGoLDAPDescriptor @"/etc/sogo.conf" +#define SOGoLDAPContainerSize 64 + +typedef enum _SOGoLDAPValueType { + SOGoLDAPAtom, + SOGoLDAPArray, + SOGoLDAPDictionary, + SOGoLDAPLastType +} _SOGoLDAPValueType; + +typedef struct _SOGoLDAPValue { + _SOGoLDAPValueType type; + void *value; + unsigned int maxCount; + char *key; +} _SOGoLDAPValue; + @implementation SOGoLDAPUserDefaults +static _SOGoLDAPValue* +_createAtom (_SOGoLDAPValueType type, void *value) +{ + _SOGoLDAPValue *newAtom; + + newAtom = calloc (sizeof (_SOGoLDAPValue), 1); + newAtom->type = type; + newAtom->value = value; + + return newAtom; +} + +static _SOGoLDAPValue* +_createContainer (_SOGoLDAPValueType type) +{ + _SOGoLDAPValue *newContainer; + _SOGoLDAPValue **array; + + array = malloc (sizeof (_SOGoLDAPValue *) * SOGoLDAPContainerSize); + *array = NULL; + newContainer = _createAtom (type, array); + newContainer->maxCount = SOGoLDAPContainerSize - 1; /* all values + NULL */ + + return newContainer; +} + +static void +_appendAtomToContainer (_SOGoLDAPValue *atom, _SOGoLDAPValue *container) +{ + unsigned int count; + _SOGoLDAPValue **atoms, **currentAtom; + + atoms = (_SOGoLDAPValue **) container->value; + currentAtom = atoms; + while (*currentAtom) + currentAtom++; + + count = (currentAtom - atoms); + if (count > container->maxCount) + { + container->maxCount += SOGoLDAPContainerSize; + container->value = realloc (container->value, container->maxCount + 1); + } + *currentAtom = atom; + *(currentAtom + 1) = NULL; +} + +static _SOGoLDAPValue ** +_findAtomInDictionary (const char *key, const _SOGoLDAPValue *dictionary) +{ + _SOGoLDAPValue **atom, **value; + + atom = NULL; + + value = dictionary->value; + if (value) + { + while (!atom && *value) + if (strcmp ((*value)->key, key) == 0) + atom = value; + else + value++; + } + + return atom; +} + +static void +_appendAtomToDictionary (_SOGoLDAPValue *atom, _SOGoLDAPValue *dictionary) +{ + _SOGoLDAPValue **oldAtomPtr, *oldAtom, *container; + + oldAtomPtr = _findAtomInDictionary (atom->key, dictionary); + if (oldAtomPtr) + { + oldAtom = *oldAtomPtr; + if (oldAtom->type == SOGoLDAPAtom) + { + container = _createContainer (SOGoLDAPArray); + container->key = oldAtom->key; + oldAtom->key = NULL; + _appendAtomToContainer (oldAtom, container); + *oldAtomPtr = container; + } + else if (oldAtom->type == SOGoLDAPArray) + container = oldAtom; + else + { +// some error handling here... + } + } + else + container = dictionary; + + if (container->type == SOGoLDAPArray) + { + free (atom->key); + atom->key = NULL; + } + _appendAtomToContainer (atom, container); +} + +static _SOGoLDAPValue * +_readLDAPDictionaryWithHandle(const char *dn, LDAP *ldapHandle) +{ + struct timeval timeout; + int rc; + _SOGoLDAPValue *atom, *dictionary; + LDAPMessage *messages, *message; + BerElement *element; + BerValue **values, **value; + const char *attribute; + + dictionary = _createContainer (SOGoLDAPDictionary); + + timeout.tv_sec = 100; + timeout.tv_usec = 0; + + rc = ldap_search_ext_s (ldapHandle, dn, LDAP_SCOPE_BASE, "(objectClass=*)", + NULL, 0, NULL, NULL, &timeout, 0, &messages); + fprintf (stderr, "code: %d, %s\n", rc, ldap_err2string (rc)); + if (rc == LDAP_SUCCESS) + { + message = ldap_first_entry (ldapHandle, messages); + if (message) + { + attribute = ldap_first_attribute (ldapHandle, message, &element); + while (attribute) + { + values = ldap_get_values_len (ldapHandle, message, attribute); + value = values; + while (*value) + { + if (strncmp ((*value)->bv_val, "dict-dn:", 8) == 0) + atom + = _readLDAPDictionaryWithHandle (((*value)->bv_val + 8), + ldapHandle); + else + atom = _createAtom (SOGoLDAPAtom, + strdup ((*value)->bv_val)); + atom->key = strdup (attribute); + _appendAtomToDictionary (atom, dictionary); + value++; + } + ldap_value_free_len (values); + attribute = ldap_next_attribute (ldapHandle, message, element); + } + } + ldap_msgfree (message); + } + + return dictionary; +} + +static NSString *_convertLDAPAtomToNSString (_SOGoLDAPValue *atom); +static NSArray *_convertLDAPAtomToNSArray (_SOGoLDAPValue *atom); +static NSDictionary *_convertLDAPAtomToNSDictionary (_SOGoLDAPValue *atom); + +static id +_convertLDAPAtomToNSObject (_SOGoLDAPValue *atom) +{ + id ldapObject; + + if (atom->type == SOGoLDAPAtom) + ldapObject = _convertLDAPAtomToNSString (atom); + else if (atom->type == SOGoLDAPArray) + ldapObject = _convertLDAPAtomToNSArray (atom); + else + ldapObject = _convertLDAPAtomToNSDictionary (atom); + + return ldapObject; +} + +static NSString * +_convertLDAPAtomToNSString (_SOGoLDAPValue *atom) +{ + NSString *ldapObject; + + ldapObject = [[NSString alloc] + initWithBytes: atom->value + length: strlen (atom->value) + encoding: NSUTF8StringEncoding]; + [ldapObject autorelease]; + + return ldapObject; +} + +static NSArray * +_convertLDAPAtomToNSArray (_SOGoLDAPValue *atom) +{ + _SOGoLDAPValue **currentSubAtom; + NSMutableArray *ldapObject; + + ldapObject = [NSMutableArray array]; + + currentSubAtom = atom->value; + while (*currentSubAtom) + { + [ldapObject addObject: _convertLDAPAtomToNSObject (*currentSubAtom)]; + currentSubAtom++; + } + + return ldapObject; +} + +static NSDictionary * +_convertLDAPAtomToNSDictionary (_SOGoLDAPValue *atom) +{ + _SOGoLDAPValue **currentSubAtom; + NSMutableDictionary *ldapObject; + NSString *atomKey; + + ldapObject = [NSMutableDictionary dictionary]; + + currentSubAtom = atom->value; + while (*currentSubAtom) + { + atomKey = [[NSString alloc] + initWithBytes: (*currentSubAtom)->key + length: strlen ((*currentSubAtom)->key) + encoding: NSUTF8StringEncoding]; + [atomKey autorelease]; + [ldapObject setObject: _convertLDAPAtomToNSObject (*currentSubAtom) + forKey: atomKey]; + currentSubAtom++; + } + + return ldapObject; +} + +// dn = "cn=admin,dc=inverse,dc=ca"; +// password = "qwerty"; +// uri = "ldap://127.0.0.1"; +// configDN = @"cn=sogo-config,dc=inverse,dc=ca"; + +static _SOGoLDAPValue * +_initLDAPDefaults () +{ + const char *dn, *password, *uri, *configDN; + LDAP *ldapHandle; + int rc, opt; + _SOGoLDAPValue *dictionary; + + ldap_initialize (&ldapHandle, uri); + + opt = LDAP_VERSION3; + rc = ldap_set_option (ldapHandle, LDAP_OPT_PROTOCOL_VERSION, &opt); + rc = ldap_set_option (ldapHandle, LDAP_OPT_REFERRALS, LDAP_OPT_OFF); + // rc = ldap_sasl_bind_s (ldapHandle, dn, LDAP_SASL_NULL, password, NULL, NULL, &none); + rc = ldap_simple_bind_s (ldapHandle, dn, password); + if (rc == LDAP_SUCCESS) + dictionary + = _readLDAPDictionaryWithHandle (configDN, ldapHandle); + else + dictionary = _createContainer (SOGoLDAPDictionary); + + return dictionary; +} + +- (id) objectForKey: (NSString *) key +{ + static _SOGoLDAPValue *SOGoLDAPDefaults = NULL; + _SOGoLDAPValue **atom; + id ldapObject; + + if (!SOGoLDAPDefaults) + SOGoLDAPDefaults = _initLDAPDefaults (); + + atom = _findAtomInDictionary ([key UTF8String], SOGoLDAPDefaults); + if (atom) + ldapObject = _convertLDAPAtomToNSObject (*atom); + else + ldapObject = nil; + + if (!ldapObject) + ldapObject = [super objectForKey: key]; + + return ldapObject; +} + @end From 15e496adbe9691bddd60ad5a1c11e52e59fff348 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Sat, 27 Sep 2008 01:13:41 +0000 Subject: [PATCH 3/6] Monotone-Parent: c33cdda9e79ffbb64ec7e5ffcb898838a13ac5a7 Monotone-Revision: c6900964008d79668f220a86e8a60e9a660b9c0d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-27T01:13:41 Monotone-Branch: ca.inverse.sogo --- Main/build.h | 2 +- Main/build.m | 2 +- SOPE/NGCards/CardElement.h | 2 +- SOPE/NGCards/CardElement.m | 2 +- SOPE/NGCards/CardGroup.h | 2 +- SOPE/NGCards/CardGroup.m | 2 +- SOPE/NGCards/CardVersitRenderer.h | 2 +- SOPE/NGCards/CardVersitRenderer.m | 2 +- SOPE/NGCards/NGVCardReference.h | 2 +- SOPE/NGCards/NGVCardReference.m | 2 +- SOPE/NGCards/NGVList.h | 2 +- SOPE/NGCards/NGVList.m | 2 +- SOPE/NGCards/NSArray+NGCards.h | 2 +- SOPE/NGCards/NSArray+NGCards.m | 2 +- SOPE/NGCards/NSCalendarDate+NGCards.h | 2 +- SOPE/NGCards/NSCalendarDate+NGCards.m | 2 +- SOPE/NGCards/NSDictionary+NGCards.h | 2 +- SOPE/NGCards/NSDictionary+NGCards.m | 2 +- SOPE/NGCards/NSString+NGCards.h | 2 +- SOPE/NGCards/NSString+NGCards.m | 2 +- SOPE/NGCards/iCalDateTime.h | 2 +- SOPE/NGCards/iCalDateTime.m | 2 +- SOPE/NGCards/iCalTimeZone.h | 2 +- SOPE/NGCards/iCalTimeZone.m | 2 +- SOPE/NGCards/iCalTimeZonePeriod.h | 2 +- SOPE/NGCards/iCalTimeZonePeriod.m | 2 +- SOPE/NGCards/samples/unittest.h | 2 +- SOPE/NGCards/samples/unittest.m | 2 +- SOPE/NGCards/samples/vcardtest.m | 2 +- SOPE/NGCards/samples/versittest.m | 2 +- Scripts/sogo-init.d-debian | 2 +- Scripts/sogo-init.d-redhat | 2 +- Scripts/sogod-wrapper | 2 +- Scripts/updates.php | 2 +- SoObjects/Appointments/NSArray+Appointments.h | 2 +- SoObjects/Appointments/NSArray+Appointments.m | 2 +- SoObjects/Appointments/SOGoAppointmentFolders.h | 2 +- SoObjects/Appointments/SOGoAppointmentFolders.m | 2 +- SoObjects/Appointments/SOGoAppointmentOccurence.h | 2 +- SoObjects/Appointments/SOGoAppointmentOccurence.m | 2 +- SoObjects/Appointments/SOGoAptMailICalReply.h | 2 +- SoObjects/Appointments/SOGoAptMailICalReply.m | 2 +- SoObjects/Appointments/SOGoCalendarComponent.h | 2 +- SoObjects/Appointments/SOGoCalendarComponent.m | 4 ++-- SoObjects/Appointments/SOGoComponentOccurence.h | 2 +- SoObjects/Appointments/SOGoComponentOccurence.m | 2 +- SoObjects/Appointments/SOGoFreeBusyObject.m | 2 +- SoObjects/Appointments/SOGoTaskOccurence.h | 2 +- SoObjects/Appointments/SOGoTaskOccurence.m | 2 +- SoObjects/Appointments/SOGoUserFolder+Appointments.h | 2 +- SoObjects/Appointments/SOGoUserFolder+Appointments.m | 2 +- SoObjects/Appointments/iCalEntityObject+SOGo.h | 2 +- SoObjects/Appointments/iCalEntityObject+SOGo.m | 2 +- SoObjects/Appointments/iCalEvent+SOGo.h | 2 +- SoObjects/Appointments/iCalEvent+SOGo.m | 2 +- SoObjects/Appointments/iCalEventChanges+SOGo.h | 2 +- SoObjects/Appointments/iCalEventChanges+SOGo.m | 2 +- SoObjects/Appointments/iCalPerson+SOGo.h | 2 +- SoObjects/Appointments/iCalPerson+SOGo.m | 2 +- SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.h | 2 +- SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m | 2 +- SoObjects/Appointments/iCalToDo+SOGo.h | 2 +- SoObjects/Appointments/iCalToDo+SOGo.m | 2 +- SoObjects/Contacts/SOGoContactFolders.h | 2 +- SoObjects/Contacts/SOGoContactFolders.m | 2 +- SoObjects/Contacts/SOGoContactGCSEntry.h | 2 +- SoObjects/Contacts/SOGoContactGCSList.h | 2 +- SoObjects/Contacts/SOGoContactGCSList.m | 2 +- SoObjects/Contacts/SOGoContactLDAPFolder.h | 2 +- SoObjects/Contacts/SOGoContactLDAPFolder.m | 2 +- SoObjects/Contacts/SOGoContactLDIFEntry.h | 2 +- SoObjects/Contacts/SOGoContactLDIFEntry.m | 2 +- SoObjects/Contacts/SOGoFolder+CardDAV.h | 2 +- SoObjects/Contacts/SOGoFolder+CardDAV.m | 2 +- SoObjects/Mailer/NSData+Mail.h | 2 +- SoObjects/Mailer/NSString+Mail.h | 2 +- SoObjects/Mailer/SOGoDraftsFolder.h | 2 +- SoObjects/Mailer/SOGoDraftsFolder.m | 2 +- SoObjects/Mailer/SOGoHTMLMailBodyPart.m | 2 +- SoObjects/Mailer/SOGoMailForward.h | 2 +- SoObjects/Mailer/SOGoMailForward.m | 2 +- SoObjects/Mailer/SOGoMailObject+Draft.h | 2 +- SoObjects/Mailer/SOGoMailObject+Draft.m | 2 +- SoObjects/Mailer/SOGoMailReply.h | 2 +- SoObjects/Mailer/SOGoMailReply.m | 2 +- SoObjects/SOGo/LDAPSource.h | 2 +- SoObjects/SOGo/LDAPUserManager.h | 2 +- SoObjects/SOGo/NSArray+DAV.h | 2 +- SoObjects/SOGo/NSArray+DAV.m | 2 +- SoObjects/SOGo/NSArray+Utilities.h | 2 +- SoObjects/SOGo/NSArray+Utilities.m | 2 +- SoObjects/SOGo/NSDictionary+DAV.h | 2 +- SoObjects/SOGo/NSDictionary+DAV.m | 2 +- SoObjects/SOGo/NSDictionary+URL.h | 2 +- SoObjects/SOGo/NSDictionary+URL.m | 2 +- SoObjects/SOGo/NSDictionary+Utilities.h | 2 +- SoObjects/SOGo/NSDictionary+Utilities.m | 2 +- SoObjects/SOGo/NSNull+Utilities.h | 2 +- SoObjects/SOGo/NSNull+Utilities.m | 2 +- SoObjects/SOGo/NSNumber+Utilities.h | 2 +- SoObjects/SOGo/NSNumber+Utilities.m | 2 +- SoObjects/SOGo/NSObject+DAV.h | 2 +- SoObjects/SOGo/NSObject+DAV.m | 2 +- SoObjects/SOGo/NSObject+Utilities.h | 2 +- SoObjects/SOGo/NSObject+Utilities.m | 2 +- SoObjects/SOGo/NSString+DAV.h | 2 +- SoObjects/SOGo/NSString+DAV.m | 2 +- SoObjects/SOGo/NSString+Utilities.h | 2 +- SoObjects/SOGo/NSURL+DAV.h | 2 +- SoObjects/SOGo/NSURL+DAV.m | 2 +- SoObjects/SOGo/SOGoAuthenticator.h | 2 +- SoObjects/SOGo/SOGoCache.h | 2 +- SoObjects/SOGo/SOGoCache.m | 2 +- SoObjects/SOGo/SOGoFolder.h | 2 +- SoObjects/SOGo/SOGoFolder.m | 2 +- SoObjects/SOGo/SOGoGCSFolder.m | 2 +- SoObjects/SOGo/SOGoLDAPUserDefaults.h | 2 +- SoObjects/SOGo/SOGoLDAPUserDefaults.m | 2 +- SoObjects/SOGo/SOGoMailer.h | 2 +- SoObjects/SOGo/SOGoMailer.m | 2 +- SoObjects/SOGo/SOGoObject.m | 2 +- SoObjects/SOGo/SOGoParentFolder.h | 2 +- SoObjects/SOGo/SOGoParentFolder.m | 2 +- SoObjects/SOGo/SOGoPermissions.h | 2 +- SoObjects/SOGo/SOGoPermissions.m | 2 +- SoObjects/SOGo/SOGoWebAuthenticator.h | 2 +- SoObjects/SOGo/SOGoWebAuthenticator.m | 2 +- SoObjects/SOGo/SOGoWebDAVAclManager.h | 2 +- SoObjects/SOGo/SOGoWebDAVAclManager.m | 2 +- SoObjects/SOGo/SOGoWebDAVValue.h | 2 +- SoObjects/SOGo/SOGoWebDAVValue.m | 2 +- SoObjects/SOGo/WORequest+SOGo.h | 2 +- SoObjects/SOGo/WORequest+SOGo.m | 2 +- SoObjects/SOGo/iCalEntityObject+Utilities.h | 2 +- SoObjects/SOGo/iCalEntityObject+Utilities.m | 2 +- UI/Common/UIxAclEditor.h | 2 +- UI/Common/UIxAclEditor.m | 2 +- UI/Common/UIxFolderActions.h | 2 +- UI/Common/UIxFolderActions.m | 2 +- UI/Common/UIxJSClose.h | 2 +- UI/Common/UIxJSClose.m | 2 +- UI/Common/UIxObjectActions.h | 2 +- UI/Common/UIxObjectActions.m | 2 +- UI/Common/UIxParentFolderActions.h | 2 +- UI/Common/UIxParentFolderActions.m | 2 +- UI/Common/UIxUserRightsEditor.h | 2 +- UI/Common/UIxUserRightsEditor.m | 2 +- UI/Common/WODirectAction+SOGo.h | 2 +- UI/Common/WODirectAction+SOGo.m | 2 +- UI/Contacts/UIxContactFoldersView.h | 2 +- UI/Contacts/UIxContactFoldersView.m | 2 +- UI/Contacts/UIxContactsListViewContainer.h | 2 +- UI/Contacts/UIxContactsListViewContainer.m | 2 +- UI/Contacts/UIxContactsUserFolders.h | 2 +- UI/Contacts/UIxContactsUserFolders.m | 2 +- UI/Contacts/UIxContactsUserRightsEditor.h | 2 +- UI/Contacts/UIxContactsUserRightsEditor.m | 2 +- UI/Contacts/UIxListEditor.h | 2 +- UI/Contacts/UIxListEditor.m | 2 +- UI/Contacts/UIxListView.h | 2 +- UI/Contacts/UIxListView.m | 2 +- UI/MailPartViewers/UIxMailPartHTMLViewer.h | 2 +- UI/MailPartViewers/UIxMailPartHTMLViewer.m | 2 +- UI/MailPartViewers/UIxMailPartICalActions.h | 2 +- UI/MailPartViewers/UIxMailPartICalActions.m | 2 +- UI/MailPartViewers/UIxMailPartTextViewer.h | 2 +- UI/MailerUI/UIxMailAccountActions.h | 2 +- UI/MailerUI/UIxMailAccountActions.m | 2 +- UI/MailerUI/UIxMailActions.h | 2 +- UI/MailerUI/UIxMailActions.m | 2 +- UI/MailerUI/UIxMailFolderActions.h | 2 +- UI/MailerUI/UIxMailMainFrame.h | 2 +- UI/MailerUI/UIxMailPopupView.m | 2 +- UI/MailerUI/UIxMailSourceView.h | 2 +- UI/MailerUI/UIxMailSourceView.m | 2 +- UI/MailerUI/UIxMailUserRightsEditor.h | 2 +- UI/MailerUI/UIxMailUserRightsEditor.m | 2 +- UI/MainUI/OCSFolderInfo-oracle.sql | 2 +- UI/MainUI/OCSFolderInfo.sql | 2 +- UI/MainUI/SOGoProfile-oracle.sql | 2 +- UI/MainUI/SOGoProfile.sql | 2 +- UI/MainUI/SOGoRootPage.h | 2 +- UI/MainUI/SOGoUserHomePage.m | 2 +- UI/PreferencesUI/PreferencesUIProduct.m | 2 +- UI/PreferencesUI/UIxAdditionalPreferences.h | 2 +- UI/PreferencesUI/UIxAdditionalPreferences.m | 2 +- UI/PreferencesUI/UIxJSONPreferences.h | 2 +- UI/PreferencesUI/UIxJSONPreferences.m | 2 +- UI/PreferencesUI/UIxPreferences.h | 2 +- UI/PreferencesUI/UIxPreferences.m | 2 +- UI/SOGoElements/SOGoElementsBuilder.h | 2 +- UI/SOGoElements/SOGoElementsBuilder.m | 2 +- UI/SOGoElements/SOGoElementsBundle.m | 2 +- UI/SOGoElements/SOGoIEConditional.h | 2 +- UI/SOGoElements/SOGoIEConditional.m | 2 +- UI/SOGoUI/SOGoACLAdvisory.h | 2 +- UI/SOGoUI/SOGoACLAdvisory.m | 2 +- UI/SOGoUI/SOGoFolderAdvisory.h | 2 +- UI/SOGoUI/SOGoFolderAdvisory.m | 2 +- UI/SOGoUI/UIxJSClose.h | 2 +- UI/SOGoUI/UIxJSClose.m | 2 +- UI/Scheduler/NSArray+Scheduler.h | 2 +- UI/Scheduler/NSArray+Scheduler.m | 2 +- UI/Scheduler/NSDictionary+Scheduler.h | 2 +- UI/Scheduler/NSDictionary+Scheduler.m | 2 +- UI/Scheduler/UIxAppointmentEditor.h | 2 +- UI/Scheduler/UIxAppointmentEditor.m | 2 +- UI/Scheduler/UIxAttendeesEditor.h | 2 +- UI/Scheduler/UIxAttendeesEditor.m | 2 +- UI/Scheduler/UIxCalDateSelector.h | 2 +- UI/Scheduler/UIxCalDateSelector.m | 2 +- UI/Scheduler/UIxCalDayTable.h | 2 +- UI/Scheduler/UIxCalDayTable.m | 2 +- UI/Scheduler/UIxCalFilterPanel.h | 2 +- UI/Scheduler/UIxCalFilterPanel.m | 2 +- UI/Scheduler/UIxCalListingActions.h | 2 +- UI/Scheduler/UIxCalListingActions.m | 2 +- UI/Scheduler/UIxCalMainView.h | 2 +- UI/Scheduler/UIxCalMainView.m | 2 +- UI/Scheduler/UIxCalMonthView.h | 2 +- UI/Scheduler/UIxCalMonthView.m | 2 +- UI/Scheduler/UIxCalMulticolumnDayView.h | 2 +- UI/Scheduler/UIxCalMulticolumnDayView.m | 2 +- UI/Scheduler/UIxCalUserRightsEditor.h | 2 +- UI/Scheduler/UIxCalUserRightsEditor.m | 2 +- UI/Scheduler/UIxCalView.m | 2 +- UI/Scheduler/UIxCalWeekView.h | 2 +- UI/Scheduler/UIxCalWeekView.m | 2 +- UI/Scheduler/UIxCalendarProperties.h | 2 +- UI/Scheduler/UIxCalendarProperties.m | 2 +- UI/Scheduler/UIxCalendarSelector.h | 2 +- UI/Scheduler/UIxCalendarSelector.m | 2 +- UI/Scheduler/UIxColorPicker.h | 2 +- UI/Scheduler/UIxColorPicker.m | 2 +- UI/Scheduler/UIxComponentEditor.h | 2 +- UI/Scheduler/UIxComponentEditor.m | 2 +- UI/Scheduler/UIxRecurrenceEditor.h | 2 +- UI/Scheduler/UIxRecurrenceEditor.m | 2 +- UI/Scheduler/UIxTaskEditor.h | 2 +- UI/Scheduler/UIxTaskEditor.m | 2 +- UI/Templates/UIxPageFrame.wox | 2 +- 241 files changed, 242 insertions(+), 242 deletions(-) diff --git a/Main/build.h b/Main/build.h index f74f8eef5..f068ebed4 100644 --- a/Main/build.h +++ b/Main/build.h @@ -1,6 +1,6 @@ /* build.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/Main/build.m b/Main/build.m index 9c106e801..cc5fa29b8 100644 --- a/Main/build.m +++ b/Main/build.m @@ -1,6 +1,6 @@ /* build.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/CardElement.h b/SOPE/NGCards/CardElement.h index 1b5ada19f..6b820bc64 100644 --- a/SOPE/NGCards/CardElement.h +++ b/SOPE/NGCards/CardElement.h @@ -1,6 +1,6 @@ /* CardElement.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m index a1a6b2c9b..544159ddd 100644 --- a/SOPE/NGCards/CardElement.m +++ b/SOPE/NGCards/CardElement.m @@ -1,6 +1,6 @@ /* CardElement.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/CardGroup.h b/SOPE/NGCards/CardGroup.h index 50d7a130c..c299830e1 100644 --- a/SOPE/NGCards/CardGroup.h +++ b/SOPE/NGCards/CardGroup.h @@ -1,6 +1,6 @@ /* CardGroup.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/CardGroup.m b/SOPE/NGCards/CardGroup.m index e1391682e..fabc12306 100644 --- a/SOPE/NGCards/CardGroup.m +++ b/SOPE/NGCards/CardGroup.m @@ -1,6 +1,6 @@ /* CardGroup.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/CardVersitRenderer.h b/SOPE/NGCards/CardVersitRenderer.h index 70ee8671d..7dac6526c 100644 --- a/SOPE/NGCards/CardVersitRenderer.h +++ b/SOPE/NGCards/CardVersitRenderer.h @@ -1,6 +1,6 @@ /* CardVersitRenderer.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/CardVersitRenderer.m b/SOPE/NGCards/CardVersitRenderer.m index d70b2db8e..049ae78b5 100644 --- a/SOPE/NGCards/CardVersitRenderer.m +++ b/SOPE/NGCards/CardVersitRenderer.m @@ -1,6 +1,6 @@ /* CardVersitRenderer.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NGVCardReference.h b/SOPE/NGCards/NGVCardReference.h index c5b715fae..80bb8fb61 100644 --- a/SOPE/NGCards/NGVCardReference.h +++ b/SOPE/NGCards/NGVCardReference.h @@ -1,6 +1,6 @@ /* NGVCardReference.h - this file is part of NGCards * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NGVCardReference.m b/SOPE/NGCards/NGVCardReference.m index 397631fe3..31da7fa51 100644 --- a/SOPE/NGCards/NGVCardReference.m +++ b/SOPE/NGCards/NGVCardReference.m @@ -1,6 +1,6 @@ /* NGVCardReference.m - this file is part of NGCards * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NGVList.h b/SOPE/NGCards/NGVList.h index 85d9caf3c..9c11b7d57 100644 --- a/SOPE/NGCards/NGVList.h +++ b/SOPE/NGCards/NGVList.h @@ -1,6 +1,6 @@ /* NGVList.h - this file is part of NGCards * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NGVList.m b/SOPE/NGCards/NGVList.m index 7d359df6d..1961cc584 100644 --- a/SOPE/NGCards/NGVList.m +++ b/SOPE/NGCards/NGVList.m @@ -1,6 +1,6 @@ /* NGVList.m - this file is part of NGCards * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSArray+NGCards.h b/SOPE/NGCards/NSArray+NGCards.h index 0d2ba14f3..9b6c23ad0 100644 --- a/SOPE/NGCards/NSArray+NGCards.h +++ b/SOPE/NGCards/NSArray+NGCards.h @@ -1,6 +1,6 @@ /* NSArray+NGCards.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSArray+NGCards.m b/SOPE/NGCards/NSArray+NGCards.m index 12ea0d9d4..5ea2aa460 100644 --- a/SOPE/NGCards/NSArray+NGCards.m +++ b/SOPE/NGCards/NSArray+NGCards.m @@ -1,6 +1,6 @@ /* NSArray+NGCards.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSCalendarDate+NGCards.h b/SOPE/NGCards/NSCalendarDate+NGCards.h index bbdc9adc7..514339206 100644 --- a/SOPE/NGCards/NSCalendarDate+NGCards.h +++ b/SOPE/NGCards/NSCalendarDate+NGCards.h @@ -1,6 +1,6 @@ /* NSDate+NGCards.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSCalendarDate+NGCards.m b/SOPE/NGCards/NSCalendarDate+NGCards.m index d4620e45a..b34471695 100644 --- a/SOPE/NGCards/NSCalendarDate+NGCards.m +++ b/SOPE/NGCards/NSCalendarDate+NGCards.m @@ -1,6 +1,6 @@ /* NSDate+NGCards.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSDictionary+NGCards.h b/SOPE/NGCards/NSDictionary+NGCards.h index 97d464d43..00249762c 100644 --- a/SOPE/NGCards/NSDictionary+NGCards.h +++ b/SOPE/NGCards/NSDictionary+NGCards.h @@ -1,6 +1,6 @@ /* NSDictionary+NGCards.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSDictionary+NGCards.m b/SOPE/NGCards/NSDictionary+NGCards.m index 2e7754657..fe890085d 100644 --- a/SOPE/NGCards/NSDictionary+NGCards.m +++ b/SOPE/NGCards/NSDictionary+NGCards.m @@ -1,6 +1,6 @@ /* NSDictionary+NGCards.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSString+NGCards.h b/SOPE/NGCards/NSString+NGCards.h index b0ccf2d86..c11ea9b43 100644 --- a/SOPE/NGCards/NSString+NGCards.h +++ b/SOPE/NGCards/NSString+NGCards.h @@ -1,6 +1,6 @@ /* NSString+NGCards.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index e07679a75..f17b9889d 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -1,6 +1,6 @@ /* NSString+NGCards.m - this file is part of SOPE * - * Copyright (C) 2006-2008 Inverse groupe conseil + * Copyright (C) 2006-2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/iCalDateTime.h b/SOPE/NGCards/iCalDateTime.h index dea30fd64..84d4e9b45 100644 --- a/SOPE/NGCards/iCalDateTime.h +++ b/SOPE/NGCards/iCalDateTime.h @@ -1,6 +1,6 @@ /* iCalDateTime.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/iCalDateTime.m b/SOPE/NGCards/iCalDateTime.m index 722f8669c..e833ae728 100644 --- a/SOPE/NGCards/iCalDateTime.m +++ b/SOPE/NGCards/iCalDateTime.m @@ -1,6 +1,6 @@ /* iCalDateTime.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/iCalTimeZone.h b/SOPE/NGCards/iCalTimeZone.h index 10ce4db6d..3427517fb 100644 --- a/SOPE/NGCards/iCalTimeZone.h +++ b/SOPE/NGCards/iCalTimeZone.h @@ -1,6 +1,6 @@ /* iCalTimeZone.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/iCalTimeZone.m b/SOPE/NGCards/iCalTimeZone.m index cd7afbe97..e4b6c41d9 100644 --- a/SOPE/NGCards/iCalTimeZone.m +++ b/SOPE/NGCards/iCalTimeZone.m @@ -1,6 +1,6 @@ /* iCalTimeZone.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/iCalTimeZonePeriod.h b/SOPE/NGCards/iCalTimeZonePeriod.h index d7d54f88a..a710630df 100644 --- a/SOPE/NGCards/iCalTimeZonePeriod.h +++ b/SOPE/NGCards/iCalTimeZonePeriod.h @@ -1,6 +1,6 @@ /* iCalTimeZonePeriod.h - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/iCalTimeZonePeriod.m b/SOPE/NGCards/iCalTimeZonePeriod.m index b5380f11e..2b7fdfc5c 100644 --- a/SOPE/NGCards/iCalTimeZonePeriod.m +++ b/SOPE/NGCards/iCalTimeZonePeriod.m @@ -1,6 +1,6 @@ /* iCalTimeZonePeriod.m - this file is part of SOPE * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/samples/unittest.h b/SOPE/NGCards/samples/unittest.h index 305e8317d..a34db76e1 100644 --- a/SOPE/NGCards/samples/unittest.h +++ b/SOPE/NGCards/samples/unittest.h @@ -1,6 +1,6 @@ /* unittest.h - this file is part of $PROJECT_NAME_HERE$ * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/samples/unittest.m b/SOPE/NGCards/samples/unittest.m index 34e164423..f9725a055 100644 --- a/SOPE/NGCards/samples/unittest.m +++ b/SOPE/NGCards/samples/unittest.m @@ -1,6 +1,6 @@ /* unittest.m - this file is part of $PROJECT_NAME_HERE$ * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/samples/vcardtest.m b/SOPE/NGCards/samples/vcardtest.m index dfeb557c7..5306658ba 100644 --- a/SOPE/NGCards/samples/vcardtest.m +++ b/SOPE/NGCards/samples/vcardtest.m @@ -1,6 +1,6 @@ /* vcardtest.m - this file is part of $PROJECT_NAME_HERE$ * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/samples/versittest.m b/SOPE/NGCards/samples/versittest.m index ec314f5a6..3d9f81b6b 100644 --- a/SOPE/NGCards/samples/versittest.m +++ b/SOPE/NGCards/samples/versittest.m @@ -1,6 +1,6 @@ /* versittest.m - this file is part of $PROJECT_NAME_HERE$ * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian index b7dfb81a5..7b0e175e2 100755 --- a/Scripts/sogo-init.d-debian +++ b/Scripts/sogo-init.d-debian @@ -2,7 +2,7 @@ # SOGo init script for Debian GNU/Linux # -# Copyright (C) 2007 Inverse groupe conseil +# Copyright (C) 2007 Inverse inc. # # Author: Wolfgang Sourdeau # Ludovic Marcotte diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat index 98466a4fb..906ca23a9 100755 --- a/Scripts/sogo-init.d-redhat +++ b/Scripts/sogo-init.d-redhat @@ -8,7 +8,7 @@ # SOGo init script for RedHat # -# Copyright (C) 2007 Inverse groupe conseil +# Copyright (C) 2007 Inverse inc. # # Author: Wolfgang Sourdeau # diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper index 203584285..3419c0b3c 100755 --- a/Scripts/sogod-wrapper +++ b/Scripts/sogod-wrapper @@ -2,7 +2,7 @@ # SOGo daemon wrapper # -# Copyright (C) 2007 Inverse groupe conseil +# Copyright (C) 2007 Inverse inc. # # Author: Wolfgang Sourdeau # diff --git a/Scripts/updates.php b/Scripts/updates.php index 4cfcded74..079883e82 100755 --- a/Scripts/updates.php +++ b/Scripts/updates.php @@ -1,7 +1,7 @@ * diff --git a/SoObjects/Appointments/NSArray+Appointments.h b/SoObjects/Appointments/NSArray+Appointments.h index 03fd2c31c..aa1c2856d 100644 --- a/SoObjects/Appointments/NSArray+Appointments.h +++ b/SoObjects/Appointments/NSArray+Appointments.h @@ -1,6 +1,6 @@ /* NSArray+Appointments.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/NSArray+Appointments.m b/SoObjects/Appointments/NSArray+Appointments.m index f3915a014..e4d243e4f 100644 --- a/SoObjects/Appointments/NSArray+Appointments.m +++ b/SoObjects/Appointments/NSArray+Appointments.m @@ -1,6 +1,6 @@ /* NSArray+Appointments.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.h b/SoObjects/Appointments/SOGoAppointmentFolders.h index 287a09048..0953f072f 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolders.h +++ b/SoObjects/Appointments/SOGoAppointmentFolders.h @@ -1,6 +1,6 @@ /* SOGoAppointmentFolders.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m index afc8a83da..66c81d4f2 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolders.m +++ b/SoObjects/Appointments/SOGoAppointmentFolders.m @@ -1,6 +1,6 @@ /* SOGoAppointmentFolders.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoAppointmentOccurence.h b/SoObjects/Appointments/SOGoAppointmentOccurence.h index c037b1774..b9e2b09c1 100644 --- a/SoObjects/Appointments/SOGoAppointmentOccurence.h +++ b/SoObjects/Appointments/SOGoAppointmentOccurence.h @@ -1,6 +1,6 @@ /* SOGoAppointmentOccurence.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoAppointmentOccurence.m b/SoObjects/Appointments/SOGoAppointmentOccurence.m index f543226a5..65eed5a5e 100644 --- a/SoObjects/Appointments/SOGoAppointmentOccurence.m +++ b/SoObjects/Appointments/SOGoAppointmentOccurence.m @@ -1,6 +1,6 @@ /* SOGoAppointmentOccurence.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.h b/SoObjects/Appointments/SOGoAptMailICalReply.h index 3b5308951..3882cc5ab 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.h +++ b/SoObjects/Appointments/SOGoAptMailICalReply.h @@ -1,6 +1,6 @@ /* SOGoAptMailICalReply.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m index 41eb1c4e9..7608054f3 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.m +++ b/SoObjects/Appointments/SOGoAptMailICalReply.m @@ -1,6 +1,6 @@ /* SOGoAptMailICalReply - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoCalendarComponent.h b/SoObjects/Appointments/SOGoCalendarComponent.h index 1e8970717..50e9fb961 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.h +++ b/SoObjects/Appointments/SOGoCalendarComponent.h @@ -1,6 +1,6 @@ /* SOGoCalendarComponent.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 368f1ebb8..1874bef6f 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -1,6 +1,6 @@ /* SOGoCalendarComponent.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * @@ -355,7 +355,7 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) { ASSIGN (*calendar, [iCalCalendar groupWithTag: @"vcalendar"]); [*calendar setVersion: @"2.0"]; - [*calendar setProdID: @"-//Inverse groupe conseil//SOGo 0.9//EN"]; + [*calendar setProdID: @"-//Inverse inc.//SOGo 0.9//EN"]; componentTag = [[self componentTag] uppercaseString]; newComponent = [[*calendar classForTag: componentTag] groupWithTag: componentTag]; diff --git a/SoObjects/Appointments/SOGoComponentOccurence.h b/SoObjects/Appointments/SOGoComponentOccurence.h index 24854a578..19df1c25b 100644 --- a/SoObjects/Appointments/SOGoComponentOccurence.h +++ b/SoObjects/Appointments/SOGoComponentOccurence.h @@ -1,6 +1,6 @@ /* SOGoComponentOccurence.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoComponentOccurence.m b/SoObjects/Appointments/SOGoComponentOccurence.m index 539eb0285..4a21f8624 100644 --- a/SoObjects/Appointments/SOGoComponentOccurence.m +++ b/SoObjects/Appointments/SOGoComponentOccurence.m @@ -1,6 +1,6 @@ /* SOGoComponentOccurence.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m index c6681983a..85a8993d8 100644 --- a/SoObjects/Appointments/SOGoFreeBusyObject.m +++ b/SoObjects/Appointments/SOGoFreeBusyObject.m @@ -120,7 +120,7 @@ static unsigned int freebusyRangeEnd = 0; uid = [container ownerInContext: context]; calendar = [iCalCalendar groupWithTag: @"vcalendar"]; - [calendar setProdID: @"//Inverse groupe conseil/SOGo 0.9"]; + [calendar setProdID: @"//Inverse inc./SOGo 0.9"]; [calendar setVersion: @"2.0"]; if (method) [calendar setMethod: method]; diff --git a/SoObjects/Appointments/SOGoTaskOccurence.h b/SoObjects/Appointments/SOGoTaskOccurence.h index 1ad101d48..80a6172bc 100644 --- a/SoObjects/Appointments/SOGoTaskOccurence.h +++ b/SoObjects/Appointments/SOGoTaskOccurence.h @@ -1,6 +1,6 @@ /* SOGoTaskOccurence.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoTaskOccurence.m b/SoObjects/Appointments/SOGoTaskOccurence.m index af5d406a3..129591c35 100644 --- a/SoObjects/Appointments/SOGoTaskOccurence.m +++ b/SoObjects/Appointments/SOGoTaskOccurence.m @@ -1,6 +1,6 @@ /* SOGoTaskOccurence.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.h b/SoObjects/Appointments/SOGoUserFolder+Appointments.h index 454499c72..885391457 100644 --- a/SoObjects/Appointments/SOGoUserFolder+Appointments.h +++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.h @@ -1,6 +1,6 @@ /* SOGoUserFolder+Appointments.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m index d6817daed..211c72460 100644 --- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m +++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m @@ -1,6 +1,6 @@ /* SOGoUserFolder+Appointments.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.h b/SoObjects/Appointments/iCalEntityObject+SOGo.h index d88e2b5c4..5bf7e58c4 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.h +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.h @@ -1,6 +1,6 @@ /* iCalEntityObject+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m index 7b690d1b6..de04fd87e 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.m +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m @@ -1,6 +1,6 @@ /* iCalEntityObject+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalEvent+SOGo.h b/SoObjects/Appointments/iCalEvent+SOGo.h index e2d71a8af..134014ca9 100644 --- a/SoObjects/Appointments/iCalEvent+SOGo.h +++ b/SoObjects/Appointments/iCalEvent+SOGo.h @@ -1,6 +1,6 @@ /* iCalEvent+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m index 691ae23cb..bd542a20e 100644 --- a/SoObjects/Appointments/iCalEvent+SOGo.m +++ b/SoObjects/Appointments/iCalEvent+SOGo.m @@ -1,6 +1,6 @@ /* iCalEvent+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalEventChanges+SOGo.h b/SoObjects/Appointments/iCalEventChanges+SOGo.h index 1c4ed55fb..53f41478b 100644 --- a/SoObjects/Appointments/iCalEventChanges+SOGo.h +++ b/SoObjects/Appointments/iCalEventChanges+SOGo.h @@ -1,6 +1,6 @@ /* iCalEventChanges+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalEventChanges+SOGo.m b/SoObjects/Appointments/iCalEventChanges+SOGo.m index 7096c6ae0..099acca1b 100644 --- a/SoObjects/Appointments/iCalEventChanges+SOGo.m +++ b/SoObjects/Appointments/iCalEventChanges+SOGo.m @@ -1,6 +1,6 @@ /* iCalEventChanges+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalPerson+SOGo.h b/SoObjects/Appointments/iCalPerson+SOGo.h index 06312acd2..a22955046 100644 --- a/SoObjects/Appointments/iCalPerson+SOGo.h +++ b/SoObjects/Appointments/iCalPerson+SOGo.h @@ -1,6 +1,6 @@ /* iCalPerson+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalPerson+SOGo.m b/SoObjects/Appointments/iCalPerson+SOGo.m index 53d828c41..0ab626ccf 100644 --- a/SoObjects/Appointments/iCalPerson+SOGo.m +++ b/SoObjects/Appointments/iCalPerson+SOGo.m @@ -1,6 +1,6 @@ /* iCalPerson+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.h b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.h index 3ab8ba2e0..1a50ef218 100644 --- a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.h +++ b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.h @@ -1,6 +1,6 @@ /* iCalRepeatableEntityObject+SOGo.h - this file is part of SOGo Copyright (C) 2004-2005 SKYRIX Software AG - Copyright (C) 2008 Inverse groupe conseil + Copyright (C) 2008 Inverse inc. This file is part of OpenGroupware.org. diff --git a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m index 4e9504e3c..7548471d7 100644 --- a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m +++ b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m @@ -1,6 +1,6 @@ /* iCalRepeatableEntityObject+SOGo.m - this file is part of SOGo Copyright (C) 2004-2005 SKYRIX Software AG - Copyright (C) 2008 Inverse groupe conseil + Copyright (C) 2008 Inverse inc. This file is part of OpenGroupware.org. diff --git a/SoObjects/Appointments/iCalToDo+SOGo.h b/SoObjects/Appointments/iCalToDo+SOGo.h index b02834908..81c16f80d 100644 --- a/SoObjects/Appointments/iCalToDo+SOGo.h +++ b/SoObjects/Appointments/iCalToDo+SOGo.h @@ -1,6 +1,6 @@ /* iCalToDo+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Appointments/iCalToDo+SOGo.m b/SoObjects/Appointments/iCalToDo+SOGo.m index 81ac2ed6e..18df52e53 100644 --- a/SoObjects/Appointments/iCalToDo+SOGo.m +++ b/SoObjects/Appointments/iCalToDo+SOGo.m @@ -1,6 +1,6 @@ /* iCalEvent+SOGo.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * Copyright (C) 2004-2005 SKYRIX Software AG * * Author: Wolfgang Sourdeau diff --git a/SoObjects/Contacts/SOGoContactFolders.h b/SoObjects/Contacts/SOGoContactFolders.h index 4e271e5cf..7aabf179f 100644 --- a/SoObjects/Contacts/SOGoContactFolders.h +++ b/SoObjects/Contacts/SOGoContactFolders.h @@ -1,6 +1,6 @@ /* SOGoContactFolders.h - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m index ac645dc5c..b83e7bd7d 100644 --- a/SoObjects/Contacts/SOGoContactFolders.m +++ b/SoObjects/Contacts/SOGoContactFolders.m @@ -1,6 +1,6 @@ /* SOGoContactFolders.m - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactGCSEntry.h b/SoObjects/Contacts/SOGoContactGCSEntry.h index fe9b62e06..e9e26dc44 100644 --- a/SoObjects/Contacts/SOGoContactGCSEntry.h +++ b/SoObjects/Contacts/SOGoContactGCSEntry.h @@ -1,6 +1,6 @@ /* SOGoContactGCSEntry.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactGCSList.h b/SoObjects/Contacts/SOGoContactGCSList.h index 5e3cc164d..56a309cec 100644 --- a/SoObjects/Contacts/SOGoContactGCSList.h +++ b/SoObjects/Contacts/SOGoContactGCSList.h @@ -1,6 +1,6 @@ /* SOGoContactGCSList.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactGCSList.m b/SoObjects/Contacts/SOGoContactGCSList.m index cbcb4aed9..576121b8a 100644 --- a/SoObjects/Contacts/SOGoContactGCSList.m +++ b/SoObjects/Contacts/SOGoContactGCSList.m @@ -1,6 +1,6 @@ /* SOGoContactGCSList.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.h b/SoObjects/Contacts/SOGoContactLDAPFolder.h index c8465e5bd..2389e7f8c 100644 --- a/SoObjects/Contacts/SOGoContactLDAPFolder.h +++ b/SoObjects/Contacts/SOGoContactLDAPFolder.h @@ -1,6 +1,6 @@ /* SOGoContactLDAPFolder.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m index 3e28d9230..db6bf55d7 100644 --- a/SoObjects/Contacts/SOGoContactLDAPFolder.m +++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m @@ -1,6 +1,6 @@ /* SOGoContactLDAPFolder.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.h b/SoObjects/Contacts/SOGoContactLDIFEntry.h index 0fe338288..475786723 100644 --- a/SoObjects/Contacts/SOGoContactLDIFEntry.h +++ b/SoObjects/Contacts/SOGoContactLDIFEntry.h @@ -1,5 +1,5 @@ /* SOGoContactLDIFEntry.h - this file is part of SOGo - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.m b/SoObjects/Contacts/SOGoContactLDIFEntry.m index d444306ee..0d0dba027 100644 --- a/SoObjects/Contacts/SOGoContactLDIFEntry.m +++ b/SoObjects/Contacts/SOGoContactLDIFEntry.m @@ -1,6 +1,6 @@ /* SOGoContactLDIFEntry.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.h b/SoObjects/Contacts/SOGoFolder+CardDAV.h index 056f5c418..2e0e88b0f 100644 --- a/SoObjects/Contacts/SOGoFolder+CardDAV.h +++ b/SoObjects/Contacts/SOGoFolder+CardDAV.h @@ -1,6 +1,6 @@ /* NSObject+CardDAV.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Ludovic Marcotte * diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m index 1b943916e..635e7f014 100644 --- a/SoObjects/Contacts/SOGoFolder+CardDAV.m +++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m @@ -1,6 +1,6 @@ /* NSObject+CardDAV.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Ludovic Marcotte * diff --git a/SoObjects/Mailer/NSData+Mail.h b/SoObjects/Mailer/NSData+Mail.h index d22317820..5ef48bc62 100644 --- a/SoObjects/Mailer/NSData+Mail.h +++ b/SoObjects/Mailer/NSData+Mail.h @@ -1,6 +1,6 @@ /* NSData+Mail.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/NSString+Mail.h b/SoObjects/Mailer/NSString+Mail.h index 7dbe514d9..a4bcb1b7d 100644 --- a/SoObjects/Mailer/NSString+Mail.h +++ b/SoObjects/Mailer/NSString+Mail.h @@ -1,6 +1,6 @@ /* NSString+Mail.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoDraftsFolder.h b/SoObjects/Mailer/SOGoDraftsFolder.h index 4c260d12f..0e195fd1d 100644 --- a/SoObjects/Mailer/SOGoDraftsFolder.h +++ b/SoObjects/Mailer/SOGoDraftsFolder.h @@ -1,6 +1,6 @@ /* SOGoDraftsFolder.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoDraftsFolder.m b/SoObjects/Mailer/SOGoDraftsFolder.m index 8cd7b2afb..f305c2169 100644 --- a/SoObjects/Mailer/SOGoDraftsFolder.m +++ b/SoObjects/Mailer/SOGoDraftsFolder.m @@ -1,6 +1,6 @@ /* SOGoDraftsFolder.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoHTMLMailBodyPart.m b/SoObjects/Mailer/SOGoHTMLMailBodyPart.m index 026fd1e9a..a3beafc66 100644 --- a/SoObjects/Mailer/SOGoHTMLMailBodyPart.m +++ b/SoObjects/Mailer/SOGoHTMLMailBodyPart.m @@ -1,6 +1,6 @@ /* SOGoHTMLMailBodyPart.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoMailForward.h b/SoObjects/Mailer/SOGoMailForward.h index e0273f980..c36620bfb 100644 --- a/SoObjects/Mailer/SOGoMailForward.h +++ b/SoObjects/Mailer/SOGoMailForward.h @@ -1,6 +1,6 @@ /* SOGoMailForward.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m index 5be3283d0..3957c6292 100644 --- a/SoObjects/Mailer/SOGoMailForward.m +++ b/SoObjects/Mailer/SOGoMailForward.m @@ -1,6 +1,6 @@ /* SOGoMailForward.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.h b/SoObjects/Mailer/SOGoMailObject+Draft.h index 706e1ca80..c4054fa1d 100644 --- a/SoObjects/Mailer/SOGoMailObject+Draft.h +++ b/SoObjects/Mailer/SOGoMailObject+Draft.h @@ -1,6 +1,6 @@ /* SOGoMailObject+Draft.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m index a962df870..864b590f5 100644 --- a/SoObjects/Mailer/SOGoMailObject+Draft.m +++ b/SoObjects/Mailer/SOGoMailObject+Draft.m @@ -1,6 +1,6 @@ /* SOGoMailObject+Draft.m - this file is part of SOGo * - * Copyright (C) 2007-2008 Inverse groupe conseil + * Copyright (C) 2007-2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoMailReply.h b/SoObjects/Mailer/SOGoMailReply.h index 118179edc..5ed4c3fa4 100644 --- a/SoObjects/Mailer/SOGoMailReply.h +++ b/SoObjects/Mailer/SOGoMailReply.h @@ -1,6 +1,6 @@ /* SOGoMailReply.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/Mailer/SOGoMailReply.m b/SoObjects/Mailer/SOGoMailReply.m index 5006094ad..5adab0549 100644 --- a/SoObjects/Mailer/SOGoMailReply.m +++ b/SoObjects/Mailer/SOGoMailReply.m @@ -1,6 +1,6 @@ /* SOGoMailReply.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/LDAPSource.h b/SoObjects/SOGo/LDAPSource.h index 2124b609f..e1db2396f 100644 --- a/SoObjects/SOGo/LDAPSource.h +++ b/SoObjects/SOGo/LDAPSource.h @@ -1,6 +1,6 @@ /* LDAPSource.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/LDAPUserManager.h b/SoObjects/SOGo/LDAPUserManager.h index a400af521..4a611786d 100644 --- a/SoObjects/SOGo/LDAPUserManager.h +++ b/SoObjects/SOGo/LDAPUserManager.h @@ -1,6 +1,6 @@ /* LDAPUserManager.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSArray+DAV.h b/SoObjects/SOGo/NSArray+DAV.h index 6804a210f..2ff6863bc 100644 --- a/SoObjects/SOGo/NSArray+DAV.h +++ b/SoObjects/SOGo/NSArray+DAV.h @@ -1,6 +1,6 @@ /* NSArray+DAV.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSArray+DAV.m b/SoObjects/SOGo/NSArray+DAV.m index 885f1294b..84e49b33b 100644 --- a/SoObjects/SOGo/NSArray+DAV.m +++ b/SoObjects/SOGo/NSArray+DAV.m @@ -1,6 +1,6 @@ /* NSArray+DAV.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSArray+Utilities.h b/SoObjects/SOGo/NSArray+Utilities.h index 96825c3d5..8f3cc836c 100644 --- a/SoObjects/SOGo/NSArray+Utilities.h +++ b/SoObjects/SOGo/NSArray+Utilities.h @@ -1,6 +1,6 @@ /* NSArray+Utilities.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSArray+Utilities.m b/SoObjects/SOGo/NSArray+Utilities.m index 7cb57f193..146ed07e0 100644 --- a/SoObjects/SOGo/NSArray+Utilities.m +++ b/SoObjects/SOGo/NSArray+Utilities.m @@ -1,6 +1,6 @@ /* NSArray+Utilities.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSDictionary+DAV.h b/SoObjects/SOGo/NSDictionary+DAV.h index a885b116a..843b0132d 100644 --- a/SoObjects/SOGo/NSDictionary+DAV.h +++ b/SoObjects/SOGo/NSDictionary+DAV.h @@ -1,6 +1,6 @@ /* NSDictionary+DAV.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSDictionary+DAV.m b/SoObjects/SOGo/NSDictionary+DAV.m index 49c120585..8fbbc6027 100644 --- a/SoObjects/SOGo/NSDictionary+DAV.m +++ b/SoObjects/SOGo/NSDictionary+DAV.m @@ -1,6 +1,6 @@ /* NSDictionary+DAV.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSDictionary+URL.h b/SoObjects/SOGo/NSDictionary+URL.h index 1568b042c..09d549a2a 100644 --- a/SoObjects/SOGo/NSDictionary+URL.h +++ b/SoObjects/SOGo/NSDictionary+URL.h @@ -1,6 +1,6 @@ /* NSDictionary+URL.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSDictionary+URL.m b/SoObjects/SOGo/NSDictionary+URL.m index dee5255bc..e4daaf479 100644 --- a/SoObjects/SOGo/NSDictionary+URL.m +++ b/SoObjects/SOGo/NSDictionary+URL.m @@ -1,6 +1,6 @@ /* NSDictionary+URL.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSDictionary+Utilities.h b/SoObjects/SOGo/NSDictionary+Utilities.h index 9427346d7..882b6b788 100644 --- a/SoObjects/SOGo/NSDictionary+Utilities.h +++ b/SoObjects/SOGo/NSDictionary+Utilities.h @@ -1,6 +1,6 @@ /* NSDictionary+Utilities.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSDictionary+Utilities.m b/SoObjects/SOGo/NSDictionary+Utilities.m index b777b66d2..8b8b35cf3 100644 --- a/SoObjects/SOGo/NSDictionary+Utilities.m +++ b/SoObjects/SOGo/NSDictionary+Utilities.m @@ -1,6 +1,6 @@ /* NSDictionary+Utilities.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSNull+Utilities.h b/SoObjects/SOGo/NSNull+Utilities.h index 736c0cf3c..cc6134be4 100644 --- a/SoObjects/SOGo/NSNull+Utilities.h +++ b/SoObjects/SOGo/NSNull+Utilities.h @@ -1,6 +1,6 @@ /* NSNull+Utilities.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSNull+Utilities.m b/SoObjects/SOGo/NSNull+Utilities.m index 68401dbb1..82855be77 100644 --- a/SoObjects/SOGo/NSNull+Utilities.m +++ b/SoObjects/SOGo/NSNull+Utilities.m @@ -1,6 +1,6 @@ /* NSNull+Utilities.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse group conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSNumber+Utilities.h b/SoObjects/SOGo/NSNumber+Utilities.h index d63f1e4a0..266ae4233 100644 --- a/SoObjects/SOGo/NSNumber+Utilities.h +++ b/SoObjects/SOGo/NSNumber+Utilities.h @@ -1,6 +1,6 @@ /* NSNumber+Utilities.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSNumber+Utilities.m b/SoObjects/SOGo/NSNumber+Utilities.m index d78d36502..c71929e0f 100644 --- a/SoObjects/SOGo/NSNumber+Utilities.m +++ b/SoObjects/SOGo/NSNumber+Utilities.m @@ -1,6 +1,6 @@ /* NSNumber+Utilities.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse group conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSObject+DAV.h b/SoObjects/SOGo/NSObject+DAV.h index 844ac0005..774d89e8e 100644 --- a/SoObjects/SOGo/NSObject+DAV.h +++ b/SoObjects/SOGo/NSObject+DAV.h @@ -1,6 +1,6 @@ /* NSObject+DAV.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSObject+DAV.m b/SoObjects/SOGo/NSObject+DAV.m index 5a95acf21..e36a8d5fd 100644 --- a/SoObjects/SOGo/NSObject+DAV.m +++ b/SoObjects/SOGo/NSObject+DAV.m @@ -1,6 +1,6 @@ /* NSObject+DAV.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSObject+Utilities.h b/SoObjects/SOGo/NSObject+Utilities.h index 11610aaba..b890d6511 100644 --- a/SoObjects/SOGo/NSObject+Utilities.h +++ b/SoObjects/SOGo/NSObject+Utilities.h @@ -1,6 +1,6 @@ /* NSObject+Utilities.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSObject+Utilities.m b/SoObjects/SOGo/NSObject+Utilities.m index d013f09cd..412b2ff4e 100644 --- a/SoObjects/SOGo/NSObject+Utilities.m +++ b/SoObjects/SOGo/NSObject+Utilities.m @@ -1,6 +1,6 @@ /* NSObject+Utilities.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSString+DAV.h b/SoObjects/SOGo/NSString+DAV.h index 0292ff940..75cbde590 100644 --- a/SoObjects/SOGo/NSString+DAV.h +++ b/SoObjects/SOGo/NSString+DAV.h @@ -1,6 +1,6 @@ /* NSString+DAV.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSString+DAV.m b/SoObjects/SOGo/NSString+DAV.m index 2c0b06073..1f44cb3dd 100644 --- a/SoObjects/SOGo/NSString+DAV.m +++ b/SoObjects/SOGo/NSString+DAV.m @@ -1,6 +1,6 @@ /* NSString+DAV.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSString+Utilities.h b/SoObjects/SOGo/NSString+Utilities.h index 543a4953e..b322b78a3 100644 --- a/SoObjects/SOGo/NSString+Utilities.h +++ b/SoObjects/SOGo/NSString+Utilities.h @@ -1,6 +1,6 @@ /* NSString+Utilities.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSURL+DAV.h b/SoObjects/SOGo/NSURL+DAV.h index be39c2f1f..7b4e93432 100644 --- a/SoObjects/SOGo/NSURL+DAV.h +++ b/SoObjects/SOGo/NSURL+DAV.h @@ -1,6 +1,6 @@ /* NSURL+DAV.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/NSURL+DAV.m b/SoObjects/SOGo/NSURL+DAV.m index 8068246d8..c5ea6dc95 100644 --- a/SoObjects/SOGo/NSURL+DAV.m +++ b/SoObjects/SOGo/NSURL+DAV.m @@ -1,6 +1,6 @@ /* NSURL+DAV.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoAuthenticator.h b/SoObjects/SOGo/SOGoAuthenticator.h index 2a2f11d99..064edf5c4 100644 --- a/SoObjects/SOGo/SOGoAuthenticator.h +++ b/SoObjects/SOGo/SOGoAuthenticator.h @@ -1,6 +1,6 @@ /* SOGoAuthenticator.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoCache.h b/SoObjects/SOGo/SOGoCache.h index 68243c6b7..b170687d8 100644 --- a/SoObjects/SOGo/SOGoCache.h +++ b/SoObjects/SOGo/SOGoCache.h @@ -1,6 +1,6 @@ /* SOGoCache.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m index b017ff7ab..eedc497fd 100644 --- a/SoObjects/SOGo/SOGoCache.m +++ b/SoObjects/SOGo/SOGoCache.m @@ -1,6 +1,6 @@ /* SOGoCache.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoFolder.h b/SoObjects/SOGo/SOGoFolder.h index a4b377207..e2a6e927e 100644 --- a/SoObjects/SOGo/SOGoFolder.h +++ b/SoObjects/SOGo/SOGoFolder.h @@ -1,6 +1,6 @@ /* SOGoFolder.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m index 91b10248e..4c51fc004 100644 --- a/SoObjects/SOGo/SOGoFolder.m +++ b/SoObjects/SOGo/SOGoFolder.m @@ -1,6 +1,6 @@ /* SOGoFolder.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index f1b90e3e2..43259a10f 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -1,7 +1,7 @@ /* SOGoGCSFolder.m - this file is part of SOGo * * Copyright (C) 2004-2005 SKYRIX Software AG - * Copyright (C) 2006-2008 Inverse groupe conseil + * Copyright (C) 2006-2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.h b/SoObjects/SOGo/SOGoLDAPUserDefaults.h index bc20dcdd8..329793a0e 100644 --- a/SoObjects/SOGo/SOGoLDAPUserDefaults.h +++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.h @@ -1,6 +1,6 @@ /* SOGoLDAPUserDefaults.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.m b/SoObjects/SOGo/SOGoLDAPUserDefaults.m index 35ecefec3..28a9863c2 100644 --- a/SoObjects/SOGo/SOGoLDAPUserDefaults.m +++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.m @@ -1,6 +1,6 @@ /* SOGoLDAPUserDefaults.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoMailer.h b/SoObjects/SOGo/SOGoMailer.h index 3108e6872..b8c6dc899 100644 --- a/SoObjects/SOGo/SOGoMailer.h +++ b/SoObjects/SOGo/SOGoMailer.h @@ -1,6 +1,6 @@ /* SOGoMailer.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoMailer.m b/SoObjects/SOGo/SOGoMailer.m index 0a8ad610e..a017118f2 100644 --- a/SoObjects/SOGo/SOGoMailer.m +++ b/SoObjects/SOGo/SOGoMailer.m @@ -1,6 +1,6 @@ /* SOGoMailer.m - this file is part of SOGo * - * Copyright (C) 2007-2008 Inverse groupe conseil + * Copyright (C) 2007-2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index e7ebed6de..473e8cf5f 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -1,7 +1,7 @@ /* SOGoGCSFolder.m - this file is part of SOGo * * Copyright (C) 2004-2005 SKYRIX Software AG - * Copyright (C) 2006-2008 Inverse groupe conseil + * Copyright (C) 2006-2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoParentFolder.h b/SoObjects/SOGo/SOGoParentFolder.h index 4271862e3..b98b9366e 100644 --- a/SoObjects/SOGo/SOGoParentFolder.h +++ b/SoObjects/SOGo/SOGoParentFolder.h @@ -1,6 +1,6 @@ /* SOGoParentFolder.h - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m index 1b3451bf4..b3cb6bc69 100644 --- a/SoObjects/SOGo/SOGoParentFolder.m +++ b/SoObjects/SOGo/SOGoParentFolder.m @@ -1,6 +1,6 @@ /* SOGoParentFolder.m - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoPermissions.h b/SoObjects/SOGo/SOGoPermissions.h index b8d8422dc..7c67c85d7 100644 --- a/SoObjects/SOGo/SOGoPermissions.h +++ b/SoObjects/SOGo/SOGoPermissions.h @@ -1,6 +1,6 @@ /* SOGoPermissions.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoPermissions.m b/SoObjects/SOGo/SOGoPermissions.m index 3eed89f07..4e89a7f45 100644 --- a/SoObjects/SOGo/SOGoPermissions.m +++ b/SoObjects/SOGo/SOGoPermissions.m @@ -1,6 +1,6 @@ /* SOGoPermissions.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoWebAuthenticator.h b/SoObjects/SOGo/SOGoWebAuthenticator.h index 464f38dc0..1e1fa4bf9 100644 --- a/SoObjects/SOGo/SOGoWebAuthenticator.h +++ b/SoObjects/SOGo/SOGoWebAuthenticator.h @@ -1,6 +1,6 @@ /* SOGoWebAuthenticator.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoWebAuthenticator.m b/SoObjects/SOGo/SOGoWebAuthenticator.m index d2ca60627..42699608f 100644 --- a/SoObjects/SOGo/SOGoWebAuthenticator.m +++ b/SoObjects/SOGo/SOGoWebAuthenticator.m @@ -1,6 +1,6 @@ /* SOGoWebAuthenticator.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoWebDAVAclManager.h b/SoObjects/SOGo/SOGoWebDAVAclManager.h index 18c4c49de..9cfc76737 100644 --- a/SoObjects/SOGo/SOGoWebDAVAclManager.h +++ b/SoObjects/SOGo/SOGoWebDAVAclManager.h @@ -1,6 +1,6 @@ /* SOGoWebDAVAclManager.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoWebDAVAclManager.m b/SoObjects/SOGo/SOGoWebDAVAclManager.m index 54c742a37..297e2c87c 100644 --- a/SoObjects/SOGo/SOGoWebDAVAclManager.m +++ b/SoObjects/SOGo/SOGoWebDAVAclManager.m @@ -1,6 +1,6 @@ /* SOGoWebDAVAclManager.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoWebDAVValue.h b/SoObjects/SOGo/SOGoWebDAVValue.h index 239abc96f..19971670b 100644 --- a/SoObjects/SOGo/SOGoWebDAVValue.h +++ b/SoObjects/SOGo/SOGoWebDAVValue.h @@ -1,6 +1,6 @@ /* SOGoWebDAVValue.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/SOGoWebDAVValue.m b/SoObjects/SOGo/SOGoWebDAVValue.m index 913bd09db..f1a5a5fa7 100644 --- a/SoObjects/SOGo/SOGoWebDAVValue.m +++ b/SoObjects/SOGo/SOGoWebDAVValue.m @@ -1,6 +1,6 @@ /* SOGoWebDAVValue.m - this file is part of $PROJECT_NAME_HERE$ * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/WORequest+SOGo.h b/SoObjects/SOGo/WORequest+SOGo.h index ac6cc1065..67c872637 100644 --- a/SoObjects/SOGo/WORequest+SOGo.h +++ b/SoObjects/SOGo/WORequest+SOGo.h @@ -1,6 +1,6 @@ /* WORequest+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m index eea2fae5e..ab4e9b10b 100644 --- a/SoObjects/SOGo/WORequest+SOGo.m +++ b/SoObjects/SOGo/WORequest+SOGo.m @@ -1,6 +1,6 @@ /* WORequest+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/iCalEntityObject+Utilities.h b/SoObjects/SOGo/iCalEntityObject+Utilities.h index c9d44c7d7..c60441b59 100644 --- a/SoObjects/SOGo/iCalEntityObject+Utilities.h +++ b/SoObjects/SOGo/iCalEntityObject+Utilities.h @@ -1,6 +1,6 @@ /* iCalEntityObject+Utilities.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SoObjects/SOGo/iCalEntityObject+Utilities.m b/SoObjects/SOGo/iCalEntityObject+Utilities.m index 86748093d..e6213c31a 100644 --- a/SoObjects/SOGo/iCalEntityObject+Utilities.m +++ b/SoObjects/SOGo/iCalEntityObject+Utilities.m @@ -1,6 +1,6 @@ /* iCalEntityObject+Utilities.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxAclEditor.h b/UI/Common/UIxAclEditor.h index 41f418e7c..9862f7341 100644 --- a/UI/Common/UIxAclEditor.h +++ b/UI/Common/UIxAclEditor.h @@ -1,6 +1,6 @@ /* UIxAclEditor.h - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m index eeb2a909e..1bd6462d0 100644 --- a/UI/Common/UIxAclEditor.m +++ b/UI/Common/UIxAclEditor.m @@ -1,6 +1,6 @@ /* UIxAclEditor.m - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxFolderActions.h b/UI/Common/UIxFolderActions.h index 4d4a751ee..57c174646 100644 --- a/UI/Common/UIxFolderActions.h +++ b/UI/Common/UIxFolderActions.h @@ -1,6 +1,6 @@ /* UIxFolderActions.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxFolderActions.m b/UI/Common/UIxFolderActions.m index b0fc2175c..edce5a18b 100644 --- a/UI/Common/UIxFolderActions.m +++ b/UI/Common/UIxFolderActions.m @@ -1,6 +1,6 @@ /* UIxFolderActions.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxJSClose.h b/UI/Common/UIxJSClose.h index dd51b869a..5a0820f78 100644 --- a/UI/Common/UIxJSClose.h +++ b/UI/Common/UIxJSClose.h @@ -1,6 +1,6 @@ /* UIxJSClose.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxJSClose.m b/UI/Common/UIxJSClose.m index 96dc6704f..6a4c5b780 100644 --- a/UI/Common/UIxJSClose.m +++ b/UI/Common/UIxJSClose.m @@ -1,6 +1,6 @@ /* UIxJSClose.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxObjectActions.h b/UI/Common/UIxObjectActions.h index 30ed17422..02f2e532b 100644 --- a/UI/Common/UIxObjectActions.h +++ b/UI/Common/UIxObjectActions.h @@ -1,6 +1,6 @@ /* UIxObjectActions.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxObjectActions.m b/UI/Common/UIxObjectActions.m index c51dbbc36..2168c8dd9 100644 --- a/UI/Common/UIxObjectActions.m +++ b/UI/Common/UIxObjectActions.m @@ -1,6 +1,6 @@ /* UIxObjectActions.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxParentFolderActions.h b/UI/Common/UIxParentFolderActions.h index c380f0642..eeacf9f61 100644 --- a/UI/Common/UIxParentFolderActions.h +++ b/UI/Common/UIxParentFolderActions.h @@ -1,6 +1,6 @@ /* UIxParentFolderActions.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxParentFolderActions.m b/UI/Common/UIxParentFolderActions.m index 4be3b8090..b02f18a25 100644 --- a/UI/Common/UIxParentFolderActions.m +++ b/UI/Common/UIxParentFolderActions.m @@ -1,6 +1,6 @@ /* UIxParentFolderActions.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxUserRightsEditor.h b/UI/Common/UIxUserRightsEditor.h index 0bef18e57..d2118d320 100644 --- a/UI/Common/UIxUserRightsEditor.h +++ b/UI/Common/UIxUserRightsEditor.h @@ -1,6 +1,6 @@ /* UIxUserRightsEditor.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m index d447ae844..1c9c53ddb 100644 --- a/UI/Common/UIxUserRightsEditor.m +++ b/UI/Common/UIxUserRightsEditor.m @@ -1,6 +1,6 @@ /* UIxUserRightsEditor.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/WODirectAction+SOGo.h b/UI/Common/WODirectAction+SOGo.h index 70b098c77..e11f91f99 100644 --- a/UI/Common/WODirectAction+SOGo.h +++ b/UI/Common/WODirectAction+SOGo.h @@ -1,6 +1,6 @@ /* WODirectAction+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Common/WODirectAction+SOGo.m b/UI/Common/WODirectAction+SOGo.m index e1f31afca..fd812e53c 100644 --- a/UI/Common/WODirectAction+SOGo.m +++ b/UI/Common/WODirectAction+SOGo.m @@ -1,6 +1,6 @@ /* WODirectAction+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactFoldersView.h b/UI/Contacts/UIxContactFoldersView.h index 76f92740a..b66ceaf08 100644 --- a/UI/Contacts/UIxContactFoldersView.h +++ b/UI/Contacts/UIxContactFoldersView.h @@ -1,6 +1,6 @@ /* UIxContactFoldersView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m index 73255c762..7bf95ed38 100644 --- a/UI/Contacts/UIxContactFoldersView.m +++ b/UI/Contacts/UIxContactFoldersView.m @@ -1,6 +1,6 @@ /* UIxContactFoldersView.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactsListViewContainer.h b/UI/Contacts/UIxContactsListViewContainer.h index 27ec7ee65..9c7d9b493 100644 --- a/UI/Contacts/UIxContactsListViewContainer.h +++ b/UI/Contacts/UIxContactsListViewContainer.h @@ -1,6 +1,6 @@ /* UIxContactsListViewContainer.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainer.m index ebfdbc700..f60e081cc 100644 --- a/UI/Contacts/UIxContactsListViewContainer.m +++ b/UI/Contacts/UIxContactsListViewContainer.m @@ -1,6 +1,6 @@ /* UIxContactsListViewContainer.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactsUserFolders.h b/UI/Contacts/UIxContactsUserFolders.h index 4b9117cc8..2a2a40a78 100644 --- a/UI/Contacts/UIxContactsUserFolders.h +++ b/UI/Contacts/UIxContactsUserFolders.h @@ -1,6 +1,6 @@ /* UIxContactsUserFolders.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactsUserFolders.m b/UI/Contacts/UIxContactsUserFolders.m index f94187450..a7485b210 100644 --- a/UI/Contacts/UIxContactsUserFolders.m +++ b/UI/Contacts/UIxContactsUserFolders.m @@ -1,6 +1,6 @@ /* UIxContactsUserFolders.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactsUserRightsEditor.h b/UI/Contacts/UIxContactsUserRightsEditor.h index 733bb5e46..9d32f84b8 100644 --- a/UI/Contacts/UIxContactsUserRightsEditor.h +++ b/UI/Contacts/UIxContactsUserRightsEditor.h @@ -1,6 +1,6 @@ /* UIxContactsUserRightsEditor.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxContactsUserRightsEditor.m b/UI/Contacts/UIxContactsUserRightsEditor.m index a6d43ee01..74e1e1a05 100644 --- a/UI/Contacts/UIxContactsUserRightsEditor.m +++ b/UI/Contacts/UIxContactsUserRightsEditor.m @@ -1,6 +1,6 @@ /* UIxContactsUserRightsEditor.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxListEditor.h b/UI/Contacts/UIxListEditor.h index f895eae8b..c48b42d68 100644 --- a/UI/Contacts/UIxListEditor.h +++ b/UI/Contacts/UIxListEditor.h @@ -1,6 +1,6 @@ /* UIxListEditor.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m index ba9e57a4d..f5ee19859 100644 --- a/UI/Contacts/UIxListEditor.m +++ b/UI/Contacts/UIxListEditor.m @@ -1,6 +1,6 @@ /* UIxListEditor.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxListView.h b/UI/Contacts/UIxListView.h index 40783eb9e..efac5bced 100644 --- a/UI/Contacts/UIxListView.h +++ b/UI/Contacts/UIxListView.h @@ -1,6 +1,6 @@ /* UIxListView.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Contacts/UIxListView.m b/UI/Contacts/UIxListView.m index de69286c6..5998705e8 100644 --- a/UI/Contacts/UIxListView.m +++ b/UI/Contacts/UIxListView.m @@ -1,6 +1,6 @@ /* UIxListView.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.h b/UI/MailPartViewers/UIxMailPartHTMLViewer.h index ce90665fe..a0df21764 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.h +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.h @@ -1,6 +1,6 @@ /* UIxMailPartHTMLViewer.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m index 78e9cddb1..ba7f88cda 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -1,6 +1,6 @@ /* UIxMailPartHTMLViewer.m - this file is part of SOGo * - * Copyright (C) 2007, 2008 Inverse groupe conseil + * Copyright (C) 2007, 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailPartViewers/UIxMailPartICalActions.h b/UI/MailPartViewers/UIxMailPartICalActions.h index f6a26e79a..2e92c666a 100644 --- a/UI/MailPartViewers/UIxMailPartICalActions.h +++ b/UI/MailPartViewers/UIxMailPartICalActions.h @@ -1,6 +1,6 @@ /* UIxMailPartICalActions.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailPartViewers/UIxMailPartICalActions.m b/UI/MailPartViewers/UIxMailPartICalActions.m index 06cf8395c..5ad40a4e3 100644 --- a/UI/MailPartViewers/UIxMailPartICalActions.m +++ b/UI/MailPartViewers/UIxMailPartICalActions.m @@ -1,6 +1,6 @@ /* UIxMailPartICalActions.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailPartViewers/UIxMailPartTextViewer.h b/UI/MailPartViewers/UIxMailPartTextViewer.h index f41e49424..dda31d780 100644 --- a/UI/MailPartViewers/UIxMailPartTextViewer.h +++ b/UI/MailPartViewers/UIxMailPartTextViewer.h @@ -1,6 +1,6 @@ /* UIxMailPartTextViewer.h - this file is part of $PROJECT_NAME_HERE$ * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailAccountActions.h b/UI/MailerUI/UIxMailAccountActions.h index f06d7fd12..9e98ae5fb 100644 --- a/UI/MailerUI/UIxMailAccountActions.h +++ b/UI/MailerUI/UIxMailAccountActions.h @@ -1,6 +1,6 @@ /* UIxMailAccountActions.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m index a4277fede..ffbd1a6b8 100644 --- a/UI/MailerUI/UIxMailAccountActions.m +++ b/UI/MailerUI/UIxMailAccountActions.m @@ -1,6 +1,6 @@ /* UIxMailAccountActions.m - this file is part of SOGo * - * Copyright (C) 2007, 2008 Inverse groupe conseil + * Copyright (C) 2007, 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailActions.h b/UI/MailerUI/UIxMailActions.h index 950639e98..cdbea6305 100644 --- a/UI/MailerUI/UIxMailActions.h +++ b/UI/MailerUI/UIxMailActions.h @@ -1,6 +1,6 @@ /* UIxMailActions.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailActions.m b/UI/MailerUI/UIxMailActions.m index 2a9c3da6f..7657e125d 100644 --- a/UI/MailerUI/UIxMailActions.m +++ b/UI/MailerUI/UIxMailActions.m @@ -1,6 +1,6 @@ /* UIxMailActions.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailFolderActions.h b/UI/MailerUI/UIxMailFolderActions.h index 3b8cfbdae..51e3dc669 100644 --- a/UI/MailerUI/UIxMailFolderActions.h +++ b/UI/MailerUI/UIxMailFolderActions.h @@ -1,6 +1,6 @@ /* UIxMailFolderActions.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailMainFrame.h b/UI/MailerUI/UIxMailMainFrame.h index 922350fb1..48907f926 100644 --- a/UI/MailerUI/UIxMailMainFrame.h +++ b/UI/MailerUI/UIxMailMainFrame.h @@ -1,6 +1,6 @@ /* UIxMailMainFrame.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailPopupView.m b/UI/MailerUI/UIxMailPopupView.m index 2021861c7..e8d6e737b 100644 --- a/UI/MailerUI/UIxMailPopupView.m +++ b/UI/MailerUI/UIxMailPopupView.m @@ -1,6 +1,6 @@ /* UIxMailPopupView.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailSourceView.h b/UI/MailerUI/UIxMailSourceView.h index 51ed79879..cda460d9b 100644 --- a/UI/MailerUI/UIxMailSourceView.h +++ b/UI/MailerUI/UIxMailSourceView.h @@ -1,6 +1,6 @@ /* UIxMailSourceView.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailSourceView.m b/UI/MailerUI/UIxMailSourceView.m index 60976e53d..a3b54267e 100644 --- a/UI/MailerUI/UIxMailSourceView.m +++ b/UI/MailerUI/UIxMailSourceView.m @@ -1,6 +1,6 @@ /* UIxMailSourceView.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailUserRightsEditor.h b/UI/MailerUI/UIxMailUserRightsEditor.h index 289c95c93..ef4633fca 100644 --- a/UI/MailerUI/UIxMailUserRightsEditor.h +++ b/UI/MailerUI/UIxMailUserRightsEditor.h @@ -1,6 +1,6 @@ /* UIxMailUserRightsEditor.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MailerUI/UIxMailUserRightsEditor.m b/UI/MailerUI/UIxMailUserRightsEditor.m index ca2dc5fdb..135462908 100644 --- a/UI/MailerUI/UIxMailUserRightsEditor.m +++ b/UI/MailerUI/UIxMailUserRightsEditor.m @@ -1,6 +1,6 @@ /* UIxMailUserRightsEditor.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MainUI/OCSFolderInfo-oracle.sql b/UI/MainUI/OCSFolderInfo-oracle.sql index bab345c38..16750692d 100644 --- a/UI/MainUI/OCSFolderInfo-oracle.sql +++ b/UI/MainUI/OCSFolderInfo-oracle.sql @@ -1,5 +1,5 @@ -- --- (C) 2007 Inverse groupe conseil +-- (C) 2007 Inverse inc. -- CREATE TABLE @{tableName} ( diff --git a/UI/MainUI/OCSFolderInfo.sql b/UI/MainUI/OCSFolderInfo.sql index e0bdf5b1a..80c2c2649 100644 --- a/UI/MainUI/OCSFolderInfo.sql +++ b/UI/MainUI/OCSFolderInfo.sql @@ -1,6 +1,6 @@ -- -- (C) 2004-2005 SKYRIX Software AG --- (C) 2006-2007 Inverse groupe conseil +-- (C) 2006-2007 Inverse inc. -- CREATE TABLE @{tableName} ( diff --git a/UI/MainUI/SOGoProfile-oracle.sql b/UI/MainUI/SOGoProfile-oracle.sql index c3371e55b..f8e2225ae 100644 --- a/UI/MainUI/SOGoProfile-oracle.sql +++ b/UI/MainUI/SOGoProfile-oracle.sql @@ -1,5 +1,5 @@ -- --- (C) 2007 Inverse groupe conseil +-- (C) 2007 Inverse inc. -- CREATE TABLE @{tableName} ( diff --git a/UI/MainUI/SOGoProfile.sql b/UI/MainUI/SOGoProfile.sql index f8f0adc8b..a979ad6c7 100644 --- a/UI/MainUI/SOGoProfile.sql +++ b/UI/MainUI/SOGoProfile.sql @@ -1,6 +1,6 @@ -- -- (C) 2004-2005 SKYRIX Software AG --- (C) 2006-2007 Inverse groupe conseil +-- (C) 2006-2007 Inverse inc. -- CREATE TABLE @{tableName} ( diff --git a/UI/MainUI/SOGoRootPage.h b/UI/MainUI/SOGoRootPage.h index 045d5d888..265d9f905 100644 --- a/UI/MainUI/SOGoRootPage.h +++ b/UI/MainUI/SOGoRootPage.h @@ -1,6 +1,6 @@ /* SOGoRootPage.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index 4b2ff348c..96252ceb7 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -1,6 +1,6 @@ /* SOGoUserHomePage.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/PreferencesUI/PreferencesUIProduct.m b/UI/PreferencesUI/PreferencesUIProduct.m index 9f569d1a4..8ff022aa3 100644 --- a/UI/PreferencesUI/PreferencesUIProduct.m +++ b/UI/PreferencesUI/PreferencesUIProduct.m @@ -1,6 +1,6 @@ /* PreferencesUIProduct.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/PreferencesUI/UIxAdditionalPreferences.h b/UI/PreferencesUI/UIxAdditionalPreferences.h index f3a11de17..a7a713cd8 100644 --- a/UI/PreferencesUI/UIxAdditionalPreferences.h +++ b/UI/PreferencesUI/UIxAdditionalPreferences.h @@ -1,6 +1,6 @@ /* UIxAdditionalPreferences.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/PreferencesUI/UIxAdditionalPreferences.m b/UI/PreferencesUI/UIxAdditionalPreferences.m index 275a498a7..0fb4ce54a 100644 --- a/UI/PreferencesUI/UIxAdditionalPreferences.m +++ b/UI/PreferencesUI/UIxAdditionalPreferences.m @@ -1,6 +1,6 @@ /* UIxAdditionalPreferences.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/PreferencesUI/UIxJSONPreferences.h b/UI/PreferencesUI/UIxJSONPreferences.h index df3982057..3cb14ddb2 100644 --- a/UI/PreferencesUI/UIxJSONPreferences.h +++ b/UI/PreferencesUI/UIxJSONPreferences.h @@ -1,6 +1,6 @@ /* UIxJSONPreferences.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m index de9055939..1deb0ab0c 100644 --- a/UI/PreferencesUI/UIxJSONPreferences.m +++ b/UI/PreferencesUI/UIxJSONPreferences.m @@ -1,6 +1,6 @@ /* UIxJSONPreferences.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h index 60b52ff28..1ccc15ae7 100644 --- a/UI/PreferencesUI/UIxPreferences.h +++ b/UI/PreferencesUI/UIxPreferences.h @@ -1,6 +1,6 @@ /* UIxPreferences.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 8859c5e3e..a15c95056 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -1,6 +1,6 @@ /* UIxPreferences.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoElements/SOGoElementsBuilder.h b/UI/SOGoElements/SOGoElementsBuilder.h index 8326e6f2f..9640fe9fa 100644 --- a/UI/SOGoElements/SOGoElementsBuilder.h +++ b/UI/SOGoElements/SOGoElementsBuilder.h @@ -1,6 +1,6 @@ /* SOGoElementsBuilder.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoElements/SOGoElementsBuilder.m b/UI/SOGoElements/SOGoElementsBuilder.m index d3f1f1f78..d122a131c 100644 --- a/UI/SOGoElements/SOGoElementsBuilder.m +++ b/UI/SOGoElements/SOGoElementsBuilder.m @@ -1,6 +1,6 @@ /* SOGoElementsBuilder.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoElements/SOGoElementsBundle.m b/UI/SOGoElements/SOGoElementsBundle.m index 4c88fefed..cfea130a6 100644 --- a/UI/SOGoElements/SOGoElementsBundle.m +++ b/UI/SOGoElements/SOGoElementsBundle.m @@ -1,6 +1,6 @@ /* SOGoElementsBundle.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoElements/SOGoIEConditional.h b/UI/SOGoElements/SOGoIEConditional.h index 6b9385eda..e59ed63ac 100644 --- a/UI/SOGoElements/SOGoIEConditional.h +++ b/UI/SOGoElements/SOGoIEConditional.h @@ -1,6 +1,6 @@ /* SOGoIEConditional.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoElements/SOGoIEConditional.m b/UI/SOGoElements/SOGoIEConditional.m index 5d9cf1680..ec18b500b 100644 --- a/UI/SOGoElements/SOGoIEConditional.m +++ b/UI/SOGoElements/SOGoIEConditional.m @@ -1,6 +1,6 @@ /* SOGoIEConditional.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoUI/SOGoACLAdvisory.h b/UI/SOGoUI/SOGoACLAdvisory.h index bfd0a3130..844f0a934 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.h +++ b/UI/SOGoUI/SOGoACLAdvisory.h @@ -1,6 +1,6 @@ /* SOGoACLAdvisory.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m index 4e77deca3..5d41104cb 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.m +++ b/UI/SOGoUI/SOGoACLAdvisory.m @@ -1,6 +1,6 @@ /* SOGoACLAdvisory.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoUI/SOGoFolderAdvisory.h b/UI/SOGoUI/SOGoFolderAdvisory.h index e98721c3f..c0b21273b 100644 --- a/UI/SOGoUI/SOGoFolderAdvisory.h +++ b/UI/SOGoUI/SOGoFolderAdvisory.h @@ -1,6 +1,6 @@ /* SOGoFolderAdvisory.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Ludovic Marcotte * diff --git a/UI/SOGoUI/SOGoFolderAdvisory.m b/UI/SOGoUI/SOGoFolderAdvisory.m index 9bfa0245a..9a5f49647 100644 --- a/UI/SOGoUI/SOGoFolderAdvisory.m +++ b/UI/SOGoUI/SOGoFolderAdvisory.m @@ -1,6 +1,6 @@ /* SOGoFolderAdvisory.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Ludovic Marcotte * diff --git a/UI/SOGoUI/UIxJSClose.h b/UI/SOGoUI/UIxJSClose.h index dd51b869a..5a0820f78 100644 --- a/UI/SOGoUI/UIxJSClose.h +++ b/UI/SOGoUI/UIxJSClose.h @@ -1,6 +1,6 @@ /* UIxJSClose.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/SOGoUI/UIxJSClose.m b/UI/SOGoUI/UIxJSClose.m index ed855818d..172e2b93a 100644 --- a/UI/SOGoUI/UIxJSClose.m +++ b/UI/SOGoUI/UIxJSClose.m @@ -1,6 +1,6 @@ /* UIxJSClose.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/NSArray+Scheduler.h b/UI/Scheduler/NSArray+Scheduler.h index 316a9675a..1d2f2b657 100644 --- a/UI/Scheduler/NSArray+Scheduler.h +++ b/UI/Scheduler/NSArray+Scheduler.h @@ -1,6 +1,6 @@ /* NSArray+Scheduler.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/NSArray+Scheduler.m b/UI/Scheduler/NSArray+Scheduler.m index 7508cda8a..030dd1f02 100644 --- a/UI/Scheduler/NSArray+Scheduler.m +++ b/UI/Scheduler/NSArray+Scheduler.m @@ -1,6 +1,6 @@ /* NSArray+Scheduler.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/NSDictionary+Scheduler.h b/UI/Scheduler/NSDictionary+Scheduler.h index c48aaa5b9..3901aa87e 100644 --- a/UI/Scheduler/NSDictionary+Scheduler.h +++ b/UI/Scheduler/NSDictionary+Scheduler.h @@ -1,6 +1,6 @@ /* NSDictionary+Scheduler.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/NSDictionary+Scheduler.m b/UI/Scheduler/NSDictionary+Scheduler.m index 97479748d..9875d6e98 100644 --- a/UI/Scheduler/NSDictionary+Scheduler.m +++ b/UI/Scheduler/NSDictionary+Scheduler.m @@ -1,6 +1,6 @@ /* NSDictionary+Scheduler.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxAppointmentEditor.h b/UI/Scheduler/UIxAppointmentEditor.h index 75c5315ee..579602958 100644 --- a/UI/Scheduler/UIxAppointmentEditor.h +++ b/UI/Scheduler/UIxAppointmentEditor.h @@ -1,6 +1,6 @@ /* UIxAppointmentEditor.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 513025b05..4e3311336 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -1,6 +1,6 @@ /* UIxAppointmentEditor.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxAttendeesEditor.h b/UI/Scheduler/UIxAttendeesEditor.h index ad556e5ce..7aa291a4e 100644 --- a/UI/Scheduler/UIxAttendeesEditor.h +++ b/UI/Scheduler/UIxAttendeesEditor.h @@ -1,6 +1,6 @@ /* UIxAttendeesEditor.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxAttendeesEditor.m b/UI/Scheduler/UIxAttendeesEditor.m index 05178c26b..8965286fb 100644 --- a/UI/Scheduler/UIxAttendeesEditor.m +++ b/UI/Scheduler/UIxAttendeesEditor.m @@ -1,6 +1,6 @@ /* UIxAttendeesEditor.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalDateSelector.h b/UI/Scheduler/UIxCalDateSelector.h index 113d26701..1c304a9dd 100644 --- a/UI/Scheduler/UIxCalDateSelector.h +++ b/UI/Scheduler/UIxCalDateSelector.h @@ -1,6 +1,6 @@ /* UIxCalDateSelector.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m index 2f69a291e..c85e9aedd 100644 --- a/UI/Scheduler/UIxCalDateSelector.m +++ b/UI/Scheduler/UIxCalDateSelector.m @@ -1,6 +1,6 @@ /* UIxCalDateSelector.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalDayTable.h b/UI/Scheduler/UIxCalDayTable.h index 0af884c11..47627fcd4 100644 --- a/UI/Scheduler/UIxCalDayTable.h +++ b/UI/Scheduler/UIxCalDayTable.h @@ -1,6 +1,6 @@ /* UIxCalDayTable.h - this file is part of $PROJECT_NAME_HERE$ * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m index acecad990..37df0f3d4 100644 --- a/UI/Scheduler/UIxCalDayTable.m +++ b/UI/Scheduler/UIxCalDayTable.m @@ -1,6 +1,6 @@ /* UIxCalDayTable.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalFilterPanel.h b/UI/Scheduler/UIxCalFilterPanel.h index 41106f97a..47197975b 100644 --- a/UI/Scheduler/UIxCalFilterPanel.h +++ b/UI/Scheduler/UIxCalFilterPanel.h @@ -1,6 +1,6 @@ /* UIxContactsFilterPanel.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m index f29c65941..b1000175a 100644 --- a/UI/Scheduler/UIxCalFilterPanel.m +++ b/UI/Scheduler/UIxCalFilterPanel.m @@ -1,6 +1,6 @@ /* UIxContactsFilterPanel.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalListingActions.h b/UI/Scheduler/UIxCalListingActions.h index b6fd1f20a..7a1d72a1d 100644 --- a/UI/Scheduler/UIxCalListingActions.h +++ b/UI/Scheduler/UIxCalListingActions.h @@ -1,6 +1,6 @@ /* UIxCalListingActions.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index ef0792332..1f58a54e1 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -1,6 +1,6 @@ /* UIxCalListingActions.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMainView.h b/UI/Scheduler/UIxCalMainView.h index 9cfe28b22..d139ce0fc 100644 --- a/UI/Scheduler/UIxCalMainView.h +++ b/UI/Scheduler/UIxCalMainView.h @@ -1,6 +1,6 @@ /* UIxCalMainView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m index f470afaff..86cd931ce 100644 --- a/UI/Scheduler/UIxCalMainView.m +++ b/UI/Scheduler/UIxCalMainView.m @@ -1,6 +1,6 @@ /* UIxCalMainView.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMonthView.h b/UI/Scheduler/UIxCalMonthView.h index 0d89356fc..3ffeea6e8 100644 --- a/UI/Scheduler/UIxCalMonthView.h +++ b/UI/Scheduler/UIxCalMonthView.h @@ -1,6 +1,6 @@ /* UIxCalMonthView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMonthView.m b/UI/Scheduler/UIxCalMonthView.m index 1108ff276..df50a6b6d 100644 --- a/UI/Scheduler/UIxCalMonthView.m +++ b/UI/Scheduler/UIxCalMonthView.m @@ -1,6 +1,6 @@ /* UIxCalMonthView.m - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMulticolumnDayView.h b/UI/Scheduler/UIxCalMulticolumnDayView.h index 656ff4234..268f0b006 100644 --- a/UI/Scheduler/UIxCalMulticolumnDayView.h +++ b/UI/Scheduler/UIxCalMulticolumnDayView.h @@ -1,6 +1,6 @@ /* UIxCalMulticolumnDayView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMulticolumnDayView.m b/UI/Scheduler/UIxCalMulticolumnDayView.m index 4d4bd4a7d..64915a9a2 100644 --- a/UI/Scheduler/UIxCalMulticolumnDayView.m +++ b/UI/Scheduler/UIxCalMulticolumnDayView.m @@ -1,6 +1,6 @@ /* UIxCalMulticolumnDayView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalUserRightsEditor.h b/UI/Scheduler/UIxCalUserRightsEditor.h index d20c5aed5..9a38f757c 100644 --- a/UI/Scheduler/UIxCalUserRightsEditor.h +++ b/UI/Scheduler/UIxCalUserRightsEditor.h @@ -1,6 +1,6 @@ /* UIxCalUserRightsEditor.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalUserRightsEditor.m b/UI/Scheduler/UIxCalUserRightsEditor.m index 4f6b5f14a..0413583ef 100644 --- a/UI/Scheduler/UIxCalUserRightsEditor.m +++ b/UI/Scheduler/UIxCalUserRightsEditor.m @@ -1,6 +1,6 @@ /* UIxCalUserRightsEditor.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index de9ba1c56..30ed361d5 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -1,6 +1,6 @@ /* UIxCalMainView.m - this file is part of SOGo * - * Copyright (C) 2006, 2007 Inverse groupe conseil + * Copyright (C) 2006, 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalWeekView.h b/UI/Scheduler/UIxCalWeekView.h index 83ab8d5a9..cb4727bbf 100644 --- a/UI/Scheduler/UIxCalWeekView.h +++ b/UI/Scheduler/UIxCalWeekView.h @@ -1,6 +1,6 @@ /* UIxCalWeekView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalWeekView.m b/UI/Scheduler/UIxCalWeekView.m index b87aeab2b..d50e2c3eb 100644 --- a/UI/Scheduler/UIxCalWeekView.m +++ b/UI/Scheduler/UIxCalWeekView.m @@ -1,6 +1,6 @@ /* UIxCalWeekView.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalendarProperties.h b/UI/Scheduler/UIxCalendarProperties.h index e8ebc8c09..e3bcbe047 100644 --- a/UI/Scheduler/UIxCalendarProperties.h +++ b/UI/Scheduler/UIxCalendarProperties.h @@ -1,6 +1,6 @@ /* UIxCalendarProperties.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m index 249a7ebcc..83d9684d8 100644 --- a/UI/Scheduler/UIxCalendarProperties.m +++ b/UI/Scheduler/UIxCalendarProperties.m @@ -1,6 +1,6 @@ /* UIxCalendarProperties.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalendarSelector.h b/UI/Scheduler/UIxCalendarSelector.h index 05ffa06f6..a271108a5 100644 --- a/UI/Scheduler/UIxCalendarSelector.h +++ b/UI/Scheduler/UIxCalendarSelector.h @@ -1,6 +1,6 @@ /* UIxCalendarSelector.h - this file is part of SOGo * - * Copyright (C) 2007, 2008 Inverse groupe conseil + * Copyright (C) 2007, 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m index 25e3c8d61..0bd0418c3 100644 --- a/UI/Scheduler/UIxCalendarSelector.m +++ b/UI/Scheduler/UIxCalendarSelector.m @@ -1,6 +1,6 @@ /* UIxCalendarSelector.m - this file is part of SOGo * - * Copyright (C) 2007, 2008 Inverse groupe conseil + * Copyright (C) 2007, 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxColorPicker.h b/UI/Scheduler/UIxColorPicker.h index 9a12eff6f..179c8b309 100644 --- a/UI/Scheduler/UIxColorPicker.h +++ b/UI/Scheduler/UIxColorPicker.h @@ -1,6 +1,6 @@ /* UIxColorPicker.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxColorPicker.m b/UI/Scheduler/UIxColorPicker.m index d4680611f..bda17c45b 100644 --- a/UI/Scheduler/UIxColorPicker.m +++ b/UI/Scheduler/UIxColorPicker.m @@ -1,6 +1,6 @@ /* UIxColorPicker.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxComponentEditor.h b/UI/Scheduler/UIxComponentEditor.h index c6b822c97..65f112513 100644 --- a/UI/Scheduler/UIxComponentEditor.h +++ b/UI/Scheduler/UIxComponentEditor.h @@ -1,6 +1,6 @@ /* UIxComponentEditor.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index c2bbf5791..1694af013 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -1,6 +1,6 @@ /* UIxComponentEditor.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse groupe conseil + * Copyright (C) 2006 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxRecurrenceEditor.h b/UI/Scheduler/UIxRecurrenceEditor.h index 8cc3d24d1..448121d43 100644 --- a/UI/Scheduler/UIxRecurrenceEditor.h +++ b/UI/Scheduler/UIxRecurrenceEditor.h @@ -1,6 +1,6 @@ /* UIxRecurrenceEditor.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Ludovic Marcotte * diff --git a/UI/Scheduler/UIxRecurrenceEditor.m b/UI/Scheduler/UIxRecurrenceEditor.m index 3a733aa23..6fc576fe5 100644 --- a/UI/Scheduler/UIxRecurrenceEditor.m +++ b/UI/Scheduler/UIxRecurrenceEditor.m @@ -1,6 +1,6 @@ /* UIxRecurrenceEditor.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse groupe conseil + * Copyright (C) 2008 Inverse inc. * * Author: Ludovic Marcotte * diff --git a/UI/Scheduler/UIxTaskEditor.h b/UI/Scheduler/UIxTaskEditor.h index 1b503d34f..68537a7fb 100644 --- a/UI/Scheduler/UIxTaskEditor.h +++ b/UI/Scheduler/UIxTaskEditor.h @@ -1,6 +1,6 @@ /* UIxTaskEditor.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m index 09b4b5d8e..090fde75f 100644 --- a/UI/Scheduler/UIxTaskEditor.m +++ b/UI/Scheduler/UIxTaskEditor.m @@ -1,6 +1,6 @@ /* UIxTaskEditor.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse groupe conseil + * Copyright (C) 2007 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox index 6346b0c0a..7773eaef3 100644 --- a/UI/Templates/UIxPageFrame.wox +++ b/UI/Templates/UIxPageFrame.wox @@ -17,7 +17,7 @@ - + From 7693e9df821805b9d168817181aad8450f995270 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Sat, 27 Sep 2008 01:32:47 +0000 Subject: [PATCH 4/6] Monotone-Parent: c6900964008d79668f220a86e8a60e9a660b9c0d Monotone-Revision: e0268121f41f4a9ac6226ffcf9e54efb36a9d2d3 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-27T01:32:47 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/SOGoLDAPUserDefaults.m | 1 + 1 file changed, 1 insertion(+) diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.m b/SoObjects/SOGo/SOGoLDAPUserDefaults.m index 28a9863c2..44d8f25ab 100644 --- a/SoObjects/SOGo/SOGoLDAPUserDefaults.m +++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.m @@ -289,6 +289,7 @@ _convertLDAPAtomToNSDictionary (_SOGoLDAPValue *atom) static _SOGoLDAPValue * _initLDAPDefaults () { +#error dn, password, uri, configDN should be defined const char *dn, *password, *uri, *configDN; LDAP *ldapHandle; int rc, opt; From 26e2ab38de3573c4fe52f7c26de4a5395e0bfead Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Sun, 28 Sep 2008 14:02:40 +0000 Subject: [PATCH 5/6] See ChangeLog Monotone-Parent: e0268121f41f4a9ac6226ffcf9e54efb36a9d2d3 Monotone-Revision: 5ca46341daec14901e918e991004a22b7ada9f49 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-09-28T14:02:40 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 20 + SOPE/sope-patchset-r1626.diff | 761 ++++++++++-------- SoObjects/Mailer/SOGoDraftObject.m | 31 +- UI/MailerUI/Dutch.lproj/Localizable.strings | 6 + UI/MailerUI/English.lproj/Localizable.strings | 7 +- UI/MailerUI/French.lproj/Localizable.strings | 6 + UI/MailerUI/German.lproj/Localizable.strings | 6 + UI/MailerUI/Italian.lproj/Localizable.strings | 6 + UI/MailerUI/Spanish.lproj/Localizable.strings | 6 + UI/MailerUI/Toolbars/SOGoDraftObject.toolbar | 5 + UI/MailerUI/UIxMailEditor.m | 58 +- UI/MailerUI/UIxMailListView.m | 55 +- UI/Templates/MailerUI/UIxMailEditor.wox | 12 + UI/Templates/MailerUI/UIxMailListView.wox | 10 +- UI/WebServerResources/UIxMailEditor.js | 51 ++ 15 files changed, 700 insertions(+), 340 deletions(-) diff --git a/ChangeLog b/ChangeLog index bad1e6e9f..1fff3ae3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-09-28 Ludovic Marcotte + + * Modified the following files: + SoObjects/Mailer/SOGoDraftObject.m + UI/MailerUI/Dutch.lproj/Localizable.strings + UI/MailerUI/English.lproj/Localizable.strings + UI/MailerUI/French.lproj/Localizable.strings + UI/MailerUI/German.lproj/Localizable.strings + UI/MailerUI/Italian.lproj/Localizable.strings + UI/MailerUI/Spanish.lproj/Localizable.strings + UI/MailerUI/Toolbars/SOGoDraftObject.toolbar + UI/MailerUI/UIxMailEditor.m + UI/MailerUI/UIxMailListView.m + UI/Templates/MailerUI/UIxMailEditor.wox + UI/Templates/MailerUI/UIxMailListView.wox + UI/WebServerResources/UIxMailEditor.js + in order to add support for X-Priority in emails. + * Regenerated the sope-patchset in order to add + capabilities to parse BODY[HEADER.FIELDS ...] responses. + 2008-09-26 Wolfgang Sourdeau * SoObjects/SOGo/SOGoLDAPUserDefaults.m ([SOGoLDAPUserDefaults diff --git a/SOPE/sope-patchset-r1626.diff b/SOPE/sope-patchset-r1626.diff index 7ec2213b6..69b3d9065 100644 --- a/SOPE/sope-patchset-r1626.diff +++ b/SOPE/sope-patchset-r1626.diff @@ -1,194 +1,7 @@ -Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m -=================================================================== ---- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1626) -+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail) -@@ -713,6 +713,39 @@ - return ms; - } - -+/* GCSEOAdaptorChannel protocol */ -+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n" -+ @" c_content VARCHAR (100000) NOT NULL,\n" -+ @" c_creationdate INT4 NOT NULL,\n" -+ @" c_lastmodified INT4 NOT NULL,\n" -+ @" c_version INT4 NOT NULL,\n" -+ @" c_deleted INT4 NULL\n" -+ @")"); -+static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_uid VARCHAR (256) NOT NULL,\n" -+ @" c_object VARCHAR (256) NOT NULL,\n" -+ @" c_role VARCHAR (80) NOT NULL\n" -+ @")"); -+ -+- (NSException *) createGCSFolderTableWithName: (NSString *) tableName -+{ -+ NSString *sql; -+ -+ sql = [NSString stringWithFormat: sqlFolderFormat, tableName]; -+ -+ return [self evaluateExpressionX: sql]; -+} -+ -+- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName -+{ -+ NSString *sql; -+ -+ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName]; -+ -+ return [self evaluateExpressionX: sql]; -+} -+ - @end /* PostgreSQL72Channel */ - - @implementation PostgreSQL72Channel(PrimaryKeyGeneration) -Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m -=================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1626) -+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail) -@@ -30,6 +30,7 @@ - - #import - -+static BOOL debugOn = NO; - // - // - // -@@ -41,10 +42,19 @@ - - @implementation OracleAdaptorChannel (Private) - --- (void) _cleanup -++ (void) initialize - { -+ NSUserDefaults *ud; -+ -+ ud = [NSUserDefaults standardUserDefaults]; -+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; -+} -+ -+- (void) _cleanup -+{ - column_info *info; - int c; -+ sword result; - - [_resultSetProperties removeAllObjects]; - -@@ -58,11 +68,29 @@ - // so we just free the value instead. - if (info->value) - { -- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS) -+ if (info->type == SQLT_CLOB -+ || info->type == SQLT_BLOB -+ || info->type == SQLT_BFILEE -+ || info->type == SQLT_CFILEE) -+ { -+ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB); -+ if (result != OCI_SUCCESS) -+ { -+ NSLog (@"value was not a LOB descriptor"); -+ abort(); -+ } -+ } -+ else - free(info->value); - info->value = NULL; - } -- free(info); -+ else -+ { -+ NSLog (@"trying to free an already freed value!"); -+ abort(); -+ } -+ free(info); -+ - [_row_buffer removeObjectAtIndex: c]; - } - -@@ -231,6 +259,9 @@ - - [self _cleanup]; - -+ if (debugOn) -+ [self logWithFormat: @"expression: %@", theExpression]; -+ - if (!theExpression || ![theExpression length]) - { - [NSException raise: @"OracleInvalidExpressionException" -@@ -302,7 +333,9 @@ - // We read the maximum width of a column - info->max_width = 0; - status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err); -- -+ -+ if (debugOn) -+ NSLog(@"name: %s, type: %d", cname, info->type); - attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width]; - [_resultSetProperties addObject: attribute]; - -@@ -609,7 +642,7 @@ - - /* GCSEOAdaptorChannel protocol */ - static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ -- @" c_name VARCHAR2 (256) NOT NULL,\n" -+ @" c_name VARCHAR2 (256) NOT NULL PRIMARY KEY,\n" - @" c_content CLOB NOT NULL,\n" - @" c_creationdate INTEGER NOT NULL,\n" - @" c_lastmodified INTEGER NOT NULL,\n" -Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m -=================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1626) -+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail) -@@ -31,6 +31,8 @@ - #import - #import - -+static BOOL debugOn = NO; -+ - // - // - // -@@ -48,6 +50,14 @@ - // - @implementation OracleAdaptorChannelController - -++ (void) initialize -+{ -+ NSUserDefaults *ud; -+ -+ ud = [NSUserDefaults standardUserDefaults]; -+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; -+} -+ - - (EODelegateResponse) adaptorChannel: (id) theChannel - willInsertRow: (NSMutableDictionary *) theRow - forEntity: (EOEntity *) theEntity -@@ -56,7 +66,8 @@ - NSArray *keys; - int i, c; - -- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); -+ if (debugOn) -+ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); - - s = AUTORELEASE([[NSMutableString alloc] init]); - -@@ -101,7 +112,8 @@ - NSArray *keys; - int i, c; - -- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]); -+ if (debugOn) -+ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]); - - s = AUTORELEASE([[NSMutableString alloc] init]); - Index: sope-mime/NGImap4/NGImap4Client.h =================================================================== ---- sope-mime/NGImap4/NGImap4Client.h (révision 1626) -+++ sope-mime/NGImap4/NGImap4Client.h (copie de travail) +--- sope-mime/NGImap4/NGImap4Client.h (revision 1626) ++++ sope-mime/NGImap4/NGImap4Client.h (working copy) @@ -62,6 +62,8 @@ NGImap4ResponseNormalizer *normer; NSMutableArray *responseReceiver; @@ -217,8 +30,8 @@ Index: sope-mime/NGImap4/NGImap4Client.h - (NSDictionary *)copyUid:(unsigned)_uid toFolder:(NSString *)_folder; Index: sope-mime/NGImap4/NGImap4Client.m =================================================================== ---- sope-mime/NGImap4/NGImap4Client.m (révision 1626) -+++ sope-mime/NGImap4/NGImap4Client.m (copie de travail) +--- sope-mime/NGImap4/NGImap4Client.m (revision 1626) ++++ sope-mime/NGImap4/NGImap4Client.m (working copy) @@ -24,6 +24,8 @@ #include "NGImap4Client.h" #include "NGImap4Context.h" @@ -520,8 +333,8 @@ Index: sope-mime/NGImap4/NGImap4Client.m __PRETTY_FUNCTION__, [_exception name], [_exception reason]]; Index: sope-mime/NGImap4/NGSieveClient.m =================================================================== ---- sope-mime/NGImap4/NGSieveClient.m (révision 1626) -+++ sope-mime/NGImap4/NGSieveClient.m (copie de travail) +--- sope-mime/NGImap4/NGSieveClient.m (revision 1626) ++++ sope-mime/NGImap4/NGSieveClient.m (working copy) @@ -294,8 +294,8 @@ return con; } @@ -556,8 +369,8 @@ Index: sope-mime/NGImap4/NGSieveClient.m /* write */ Index: sope-mime/NGImap4/NGImap4Connection.h =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.h (révision 1626) -+++ sope-mime/NGImap4/NGImap4Connection.h (copie de travail) +--- sope-mime/NGImap4/NGImap4Connection.h (revision 1626) ++++ sope-mime/NGImap4/NGImap4Connection.h (working copy) @@ -89,6 +89,7 @@ - (NSArray *)subfoldersForURL:(NSURL *)_url; @@ -568,8 +381,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.h Index: sope-mime/NGImap4/NGImap4Connection.m =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.m (révision 1626) -+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail) +--- sope-mime/NGImap4/NGImap4Connection.m (revision 1626) ++++ sope-mime/NGImap4/NGImap4Connection.m (working copy) @@ -381,7 +381,7 @@ if (debugCache) [self logWithFormat:@" no folders cached yet .."]; @@ -619,9 +432,32 @@ Index: sope-mime/NGImap4/NGImap4Connection.m } Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1626) -+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail) -@@ -648,14 +648,13 @@ +--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1626) ++++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy) +@@ -292,7 +292,7 @@ + /* + filter for fetch response + fetch : NSArray (fetch responses) +- 'header' - RFC822.HEADER ++ 'header' - RFC822.HEADER and BODY[HEADER.FIELDS (...)] + 'text' - RFC822.TEXT + 'size' - SIZE + 'flags' - FLAGS +@@ -336,7 +336,12 @@ + switch (c) { + case 'b': + /* Note: we check for _prefix_! eg body[1] is valid too */ +- if (klen > 3 && [key hasPrefix:@"body"]) { ++ if (klen > 17 && [key hasPrefix:@"body[header.fields"]) { ++ keys[count] = @"header"; ++ values[count] = objForKey(obj, @selector(objectForKey:), key); ++ count++; ++ } ++ else if (klen > 3 && [key hasPrefix:@"body"]) { + keys[count] = @"body"; + values[count] = objForKey(obj, @selector(objectForKey:), key); + count++; +@@ -648,14 +653,13 @@ enumerator = [_flags objectEnumerator]; cnt = 0; while ((obj = [enumerator nextObject])) { @@ -645,9 +481,17 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m if (objs) free(objs); Index: sope-mime/NGImap4/NGImap4ResponseParser.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1626) -+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail) -@@ -84,6 +84,8 @@ +--- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1626) ++++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy) +@@ -31,6 +31,7 @@ + @interface NGImap4ResponseParser(ParsingPrivates) + - (BOOL)_parseNumberUntaggedResponse:(NGMutableHashMap *)result_; + - (NSDictionary *)_parseBodyContent; ++- (NSData *) _parseBodyHeaderFields; + + - (NSData *)_parseData; + +@@ -84,6 +85,8 @@ static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self, BOOL isBodyStructure); @@ -656,7 +500,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m static NSString *_parseBodyString(NGImap4ResponseParser *self, BOOL _convertString); static NSString *_parseBodyDecodeString(NGImap4ResponseParser *self, -@@ -111,6 +113,7 @@ +@@ -111,6 +114,7 @@ static NSNumber *_parseUnsigned(NGImap4ResponseParser *self); static NSString *_parseUntil(NGImap4ResponseParser *self, char _c); static NSString *_parseUntil2(NGImap4ResponseParser *self, char _c1, char _c2); @@ -664,7 +508,58 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m static __inline__ NSException *_consumeIfMatch (NGImap4ResponseParser *self, unsigned char _m); -@@ -648,13 +651,148 @@ +@@ -488,6 +492,50 @@ + return [self _parseDataIntoRAM:size]; + } + ++/* ++ Similair to _parseData but used to parse something like this : ++ ++ BODY[HEADER.FIELDS (X-PRIORITY)] {17} ++ X-Priority: 1 ++ ++ ) ++ ++ Headers are returned as data, as is. ++*/ ++- (NSData *) _parseBodyHeaderFields ++{ ++ NSData *result; ++ unsigned size; ++ NSNumber *sizeNum; ++ ++ /* we skip until we're ready to parse {length} */ ++ _parseUntil(self, '{'); ++ ++ result = nil; ++ ++ if ((sizeNum = _parseUnsigned(self)) == nil) { ++ NSException *e; ++ ++ e = [[NGImap4ParserException alloc] ++ initWithFormat:@"expect a number between {}"]; ++ [self setLastException:[e autorelease]]; ++ return nil; ++ } ++ _consumeIfMatch(self, '}'); ++ _consumeIfMatch(self, '\n'); ++ ++ if ((size = [sizeNum intValue]) == 0) { ++ [self logWithFormat:@"ERROR(%s): got content size '0'!", ++ __PRETTY_FUNCTION__]; ++ return nil; ++ } ++ ++ if (UseMemoryMappedData && (size > Imap4MMDataBoundary)) ++ return [self _parseDataToFile:size]; ++ ++ return [self _parseDataIntoRAM:size]; ++} ++ + static int _parseTaggedResponse(NGImap4ResponseParser *self, + NGMutableHashMap *result_) + { +@@ -648,13 +696,148 @@ [result_ addObject:_parseUntil(self, '\n') forKey:@"description"]; } @@ -815,7 +710,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m } - (void)_consumeOptionalSpace { if (_la(self, 0) == ' ') _consume(self, 1); -@@ -1090,6 +1228,8 @@ +@@ -1090,6 +1273,8 @@ return @""; s = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; @@ -824,7 +719,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m if (s == nil) { [self logWithFormat: @"ERROR(%s): could not convert data (%d bytes) into string.", -@@ -1185,7 +1325,7 @@ +@@ -1185,7 +1370,7 @@ route = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace]; mailbox = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace]; host = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace]; @@ -833,7 +728,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m if (_la(self, 0) != ')') { [self logWithFormat:@"WARNING: IMAP4 envelope " @"address not properly closed (c0=%c,c1=%c): %@", -@@ -1197,6 +1337,7 @@ +@@ -1197,6 +1382,7 @@ address = [[NGImap4EnvelopeAddress alloc] initWithPersonalName:pname sourceRoute:route mailbox:mailbox host:host]; @@ -841,7 +736,24 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m return address; } -@@ -1594,8 +1735,11 @@ +@@ -1382,7 +1568,15 @@ + #if 0 + [self logWithFormat:@"PARSE KEY: %@", key]; + #endif +- if ([key hasPrefix:@"body["]) { ++ if ([key hasPrefix:@"body[header.fields"]) { ++ NSData *content; ++ ++ if ((content = [self _parseBodyHeaderFields]) != nil) ++ [fetch setObject:content forKey:key]; ++ else ++ [self logWithFormat:@"ERROR: got no body content for key: '%@'",key]; ++ } ++ else if ([key hasPrefix:@"body["]) { + NSDictionary *content; + + if ((content = [self _parseBodyContent]) != nil) +@@ -1594,8 +1788,11 @@ if (_decode) data = [data decodeQuotedPrintableValueOfMIMEHeaderField:nil]; @@ -855,7 +767,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m } else { str = _parseUntil2(self, ' ', ')'); -@@ -1620,13 +1764,35 @@ +@@ -1620,13 +1817,35 @@ return str; } @@ -892,7 +804,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m static NSDictionary *_parseBodyParameterList(NGImap4ResponseParser *self) { NSMutableDictionary *list; -@@ -1646,7 +1812,7 @@ +@@ -1646,7 +1865,7 @@ _consumeIfMatch(self, ' '); value = _parseBodyDecodeString(self, YES, YES); @@ -901,7 +813,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m } _consumeIfMatch(self, ')'); } -@@ -1731,13 +1897,14 @@ +@@ -1731,13 +1950,14 @@ static NSDictionary *_parseSingleBody(NGImap4ResponseParser *self, BOOL isBodyStructure) { NSString *type, *subtype, *bodyId, *description, @@ -918,7 +830,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m _consumeIfMatch(self, ' '); parameterList = _parseBodyParameterList(self); _consumeIfMatch(self, ' '); -@@ -1762,13 +1929,18 @@ +@@ -1762,13 +1982,18 @@ _consumeIfMatch(self, ' '); [dict setObject:_parseBodyString(self, YES) forKey:@"lines"]; } @@ -940,7 +852,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m _consumeIfMatch(self, ' '); [dict setObject:_parseParenthesizedAddressList(self) forKey:@"from"]; _consumeIfMatch(self, ' '); -@@ -1783,14 +1955,20 @@ +@@ -1783,14 +2008,20 @@ _consumeIfMatch(self, ' '); [dict setObject:_parseParenthesizedAddressList(self) forKey:@"bcc"]; _consumeIfMatch(self, ' '); @@ -964,7 +876,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m } } -@@ -1805,14 +1983,9 @@ +@@ -1805,14 +2036,9 @@ forKey: @"disposition"]; if (_la(self, 0) != ')') { _consume(self,1); @@ -982,7 +894,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m if (_la(self, 0) != ')') { _consume(self,1); [dict setObject: _parseBodyString(self, YES) -@@ -1829,6 +2002,7 @@ +@@ -1829,6 +2055,7 @@ static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self, BOOL isBodyStructure) { NSMutableArray *parts; @@ -990,7 +902,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m NSString *kind; NSMutableDictionary *dict; -@@ -1854,14 +2028,9 @@ +@@ -1854,14 +2081,9 @@ forKey: @"disposition"]; if (_la(self, 0) != ')') { _consume(self,1); @@ -1008,7 +920,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m if (_la(self, 0) != ')') { _consume(self,1); [dict setObject: _parseBodyString(self, YES) -@@ -2170,6 +2339,21 @@ +@@ -2170,6 +2392,21 @@ } } @@ -1030,7 +942,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m - (NSException *)exceptionForFailedMatch:(unsigned char)_match got:(unsigned char)_avail { -@@ -2225,9 +2409,9 @@ +@@ -2225,9 +2462,9 @@ [s release]; if (c == '\n') { @@ -1044,8 +956,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m self->serverResponseDebug = Index: sope-mime/NGImap4/ChangeLog =================================================================== ---- sope-mime/NGImap4/ChangeLog (révision 1626) -+++ sope-mime/NGImap4/ChangeLog (copie de travail) +--- sope-mime/NGImap4/ChangeLog (revision 1626) ++++ sope-mime/NGImap4/ChangeLog (working copy) @@ -1,3 +1,23 @@ +2008-09-22 Wolfgang Sourdeau + @@ -1072,8 +984,8 @@ Index: sope-mime/NGImap4/ChangeLog * NGImap4Connection.m: some fix for folders ending with a slash (OGo Index: sope-mime/NGImap4/NGImap4ConnectionManager.m =================================================================== ---- sope-mime/NGImap4/NGImap4ConnectionManager.m (révision 1626) -+++ sope-mime/NGImap4/NGImap4ConnectionManager.m (copie de travail) +--- sope-mime/NGImap4/NGImap4ConnectionManager.m (revision 1626) ++++ sope-mime/NGImap4/NGImap4ConnectionManager.m (working copy) @@ -38,6 +38,9 @@ debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"]; poolingOff = [ud boolForKey:@"NGImap4DisableIMAP4Pooling"]; @@ -1199,8 +1111,8 @@ Index: sope-mime/NGImap4/NGImap4ConnectionManager.m /* client object */ Index: sope-mime/NGImap4/NSString+Imap4.m =================================================================== ---- sope-mime/NGImap4/NSString+Imap4.m (révision 1626) -+++ sope-mime/NGImap4/NSString+Imap4.m (copie de travail) +--- sope-mime/NGImap4/NSString+Imap4.m (revision 1626) ++++ sope-mime/NGImap4/NSString+Imap4.m (working copy) @@ -20,11 +20,56 @@ 02111-1307, USA. */ @@ -1721,8 +1633,8 @@ Index: sope-mime/NGImap4/NSString+Imap4.m +@end /* NSString(Imap4) */ Index: sope-mime/NGMail/NGSmtpClient.m =================================================================== ---- sope-mime/NGMail/NGSmtpClient.m (révision 1626) -+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail) +--- sope-mime/NGMail/NGSmtpClient.m (revision 1626) ++++ sope-mime/NGMail/NGSmtpClient.m (working copy) @@ -24,6 +24,82 @@ #include "NGSmtpReplyCodes.h" #include "common.h" @@ -1877,8 +1789,8 @@ Index: sope-mime/NGMail/NGSmtpClient.m reply = [self receiveReply]; Index: sope-mime/NGMail/NGMailAddressParser.h =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.h (révision 1626) -+++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail) +--- sope-mime/NGMail/NGMailAddressParser.h (revision 1626) ++++ sope-mime/NGMail/NGMailAddressParser.h (working copy) @@ -24,7 +24,9 @@ #import @@ -1915,8 +1827,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.h Index: sope-mime/NGMail/NGMimeMessageGenerator.m =================================================================== ---- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1626) -+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail) +--- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1626) ++++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy) @@ -86,37 +86,40 @@ char *des = NULL; unsigned int cnt; @@ -1981,8 +1893,8 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m unsigned isoEndLen = 2; Index: sope-mime/NGMail/NGMailAddressParser.m =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.m (révision 1626) -+++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail) +--- sope-mime/NGMail/NGMailAddressParser.m (revision 1626) ++++ sope-mime/NGMail/NGMailAddressParser.m (working copy) @@ -52,9 +52,9 @@ StrClass = [NSString class]; } @@ -2126,8 +2038,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.m self->dataPos = 0; Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m =================================================================== ---- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1626) -+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1626) ++++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy) @@ -19,88 +19,45 @@ 02111-1307, USA. */ @@ -2531,8 +2443,8 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m #if 0 Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeMultipartBodyParser.m (révision 1626) -+++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeMultipartBodyParser.m (revision 1626) ++++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (working copy) @@ -428,6 +428,7 @@ NSString *boundary = nil; NSArray *rawBodyParts = nil; @@ -2556,8 +2468,8 @@ Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m if (rawBodyParts) { Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m =================================================================== ---- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1626) -+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail) +--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1626) ++++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy) @@ -77,6 +77,7 @@ [rfc822Set setGenerator:gen forField:@"bcc"]; [rfc822Set setGenerator:gen forField:Fields->from]; @@ -2568,8 +2480,8 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m Index: sope-mime/NGMime/NGMimeType.m =================================================================== ---- sope-mime/NGMime/NGMimeType.m (révision 1626) -+++ sope-mime/NGMime/NGMimeType.m (copie de travail) +--- sope-mime/NGMime/NGMimeType.m (revision 1626) ++++ sope-mime/NGMime/NGMimeType.m (working copy) @@ -120,28 +120,23 @@ /* some unsupported, but known encoding */ @@ -2666,8 +2578,8 @@ Index: sope-mime/NGMime/NGMimeType.m - (NSString *)stringValue { Index: sope-mime/NGMime/NGMimeBodyPart.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyPart.m (révision 1626) -+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail) +--- sope-mime/NGMime/NGMimeBodyPart.m (revision 1626) ++++ sope-mime/NGMime/NGMimeBodyPart.m (working copy) @@ -31,18 +31,6 @@ return 2; } @@ -2704,8 +2616,8 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m - (NSString *)contentId { Index: sope-mime/NGMime/ChangeLog =================================================================== ---- sope-mime/NGMime/ChangeLog (révision 1626) -+++ sope-mime/NGMime/ChangeLog (copie de travail) +--- sope-mime/NGMime/ChangeLog (revision 1626) ++++ sope-mime/NGMime/ChangeLog (working copy) @@ -1,3 +1,25 @@ +2008-09-08 Wolfgang Sourdeau + @@ -2734,8 +2646,8 @@ Index: sope-mime/NGMime/ChangeLog * fixes for OGo bug #789 (reply-to QP encoding) Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (révision 1626) -+++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (revision 1626) ++++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (working copy) @@ -36,8 +36,7 @@ NGMimeType *type = nil; // only one content-type field NSString *tmp = nil; @@ -2874,8 +2786,8 @@ Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m } Index: sope-mime/NGMime/NGMimePartGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimePartGenerator.m (révision 1626) -+++ sope-mime/NGMime/NGMimePartGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimePartGenerator.m (revision 1626) ++++ sope-mime/NGMime/NGMimePartGenerator.m (working copy) @@ -155,8 +155,9 @@ BOOL isMultiValue, isFirst; @@ -2899,8 +2811,8 @@ Index: sope-mime/NGMime/NGMimePartGenerator.m Index: sope-mime/NGMime/NGMimeBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyParser.m (révision 1626) -+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeBodyParser.m (revision 1626) ++++ sope-mime/NGMime/NGMimeBodyParser.m (working copy) @@ -67,7 +67,10 @@ if (_data == nil) return nil; @@ -2915,8 +2827,8 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m Index: sope-mime/NGMime/NGMimePartParser.h =================================================================== ---- sope-mime/NGMime/NGMimePartParser.h (révision 1626) -+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail) +--- sope-mime/NGMime/NGMimePartParser.h (revision 1626) ++++ sope-mime/NGMime/NGMimePartParser.h (working copy) @@ -117,6 +117,7 @@ BOOL parserParseRawBodyDataOfPart:1; BOOL parserBodyParserForPart:1; @@ -2937,8 +2849,8 @@ Index: sope-mime/NGMime/NGMimePartParser.h @interface NSObject(NGMimePartParser) Index: sope-mime/NGMime/NGMimePartParser.m =================================================================== ---- sope-mime/NGMime/NGMimePartParser.m (révision 1626) -+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail) +--- sope-mime/NGMime/NGMimePartParser.m (revision 1626) ++++ sope-mime/NGMime/NGMimePartParser.m (working copy) @@ -227,7 +227,7 @@ } @@ -2962,8 +2874,8 @@ Index: sope-mime/NGMime/NGMimePartParser.m : [NGMimeType mimeType:[ctype stringValue]]; Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1626) -+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1626) ++++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy) @@ -105,10 +105,10 @@ } @@ -3048,8 +2960,8 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m return data; Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1626) -+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1626) ++++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy) @@ -49,80 +49,70 @@ // TODO: move the stuff below to some NSString or NSData category? @@ -3182,10 +3094,197 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m } return data; } +Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m +=================================================================== +--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1626) ++++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy) +@@ -713,6 +713,39 @@ + return ms; + } + ++/* GCSEOAdaptorChannel protocol */ ++static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ ++ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n" ++ @" c_content VARCHAR (100000) NOT NULL,\n" ++ @" c_creationdate INT4 NOT NULL,\n" ++ @" c_lastmodified INT4 NOT NULL,\n" ++ @" c_version INT4 NOT NULL,\n" ++ @" c_deleted INT4 NULL\n" ++ @")"); ++static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ ++ @" c_uid VARCHAR (256) NOT NULL,\n" ++ @" c_object VARCHAR (256) NOT NULL,\n" ++ @" c_role VARCHAR (80) NOT NULL\n" ++ @")"); ++ ++- (NSException *) createGCSFolderTableWithName: (NSString *) tableName ++{ ++ NSString *sql; ++ ++ sql = [NSString stringWithFormat: sqlFolderFormat, tableName]; ++ ++ return [self evaluateExpressionX: sql]; ++} ++ ++- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName ++{ ++ NSString *sql; ++ ++ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName]; ++ ++ return [self evaluateExpressionX: sql]; ++} ++ + @end /* PostgreSQL72Channel */ + + @implementation PostgreSQL72Channel(PrimaryKeyGeneration) +Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m +=================================================================== +--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (revision 1626) ++++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy) +@@ -30,6 +30,7 @@ + + #import + ++static BOOL debugOn = NO; + // + // + // +@@ -41,10 +42,19 @@ + + @implementation OracleAdaptorChannel (Private) + +-- (void) _cleanup +++ (void) initialize + { ++ NSUserDefaults *ud; ++ ++ ud = [NSUserDefaults standardUserDefaults]; ++ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; ++} ++ ++- (void) _cleanup ++{ + column_info *info; + int c; ++ sword result; + + [_resultSetProperties removeAllObjects]; + +@@ -58,11 +68,29 @@ + // so we just free the value instead. + if (info->value) + { +- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS) ++ if (info->type == SQLT_CLOB ++ || info->type == SQLT_BLOB ++ || info->type == SQLT_BFILEE ++ || info->type == SQLT_CFILEE) ++ { ++ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB); ++ if (result != OCI_SUCCESS) ++ { ++ NSLog (@"value was not a LOB descriptor"); ++ abort(); ++ } ++ } ++ else + free(info->value); + info->value = NULL; + } +- free(info); ++ else ++ { ++ NSLog (@"trying to free an already freed value!"); ++ abort(); ++ } ++ free(info); ++ + [_row_buffer removeObjectAtIndex: c]; + } + +@@ -231,6 +259,9 @@ + + [self _cleanup]; + ++ if (debugOn) ++ [self logWithFormat: @"expression: %@", theExpression]; ++ + if (!theExpression || ![theExpression length]) + { + [NSException raise: @"OracleInvalidExpressionException" +@@ -302,7 +333,9 @@ + // We read the maximum width of a column + info->max_width = 0; + status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err); +- ++ ++ if (debugOn) ++ NSLog(@"name: %s, type: %d", cname, info->type); + attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width]; + [_resultSetProperties addObject: attribute]; + +@@ -609,7 +642,7 @@ + + /* GCSEOAdaptorChannel protocol */ + static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ +- @" c_name VARCHAR2 (256) NOT NULL,\n" ++ @" c_name VARCHAR2 (256) NOT NULL PRIMARY KEY,\n" + @" c_content CLOB NOT NULL,\n" + @" c_creationdate INTEGER NOT NULL,\n" + @" c_lastmodified INTEGER NOT NULL,\n" +Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m +=================================================================== +--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1626) ++++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy) +@@ -31,6 +31,8 @@ + #import + #import + ++static BOOL debugOn = NO; ++ + // + // + // +@@ -48,6 +50,14 @@ + // + @implementation OracleAdaptorChannelController + +++ (void) initialize ++{ ++ NSUserDefaults *ud; ++ ++ ud = [NSUserDefaults standardUserDefaults]; ++ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; ++} ++ + - (EODelegateResponse) adaptorChannel: (id) theChannel + willInsertRow: (NSMutableDictionary *) theRow + forEntity: (EOEntity *) theEntity +@@ -56,7 +66,8 @@ + NSArray *keys; + int i, c; + +- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); ++ if (debugOn) ++ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); + + s = AUTORELEASE([[NSMutableString alloc] init]); + +@@ -101,7 +112,8 @@ + NSArray *keys; + int i, c; + +- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]); ++ if (debugOn) ++ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]); + + s = AUTORELEASE([[NSMutableString alloc] init]); + Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h =================================================================== ---- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1626) -+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail) +--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1626) ++++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy) @@ -30,6 +30,7 @@ @interface NSString(GSAdditions) @@ -3222,8 +3321,8 @@ Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h /* specific to libFoundation */ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m =================================================================== ---- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (révision 1626) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (revision 1626) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy) @@ -39,18 +39,6 @@ : (NSString *)[[self copy] autorelease]; } @@ -3311,8 +3410,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m - (BOOL)isAbsoluteURL Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m =================================================================== ---- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1626) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1626) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy) @@ -140,8 +140,12 @@ @@ -3354,8 +3453,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m static char *iconv_wrapper(id self, char *_src, unsigned _srcLen, Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m =================================================================== ---- sope-core/NGExtensions/NGQuotedPrintableCoding.m (révision 1626) -+++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (copie de travail) +--- sope-core/NGExtensions/NGQuotedPrintableCoding.m (revision 1626) ++++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (working copy) @@ -278,7 +278,12 @@ for (cnt = 0; (cnt < _srcLen) && (destCnt < _destLen); cnt++) { @@ -3372,8 +3471,8 @@ Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m ((c > 31) && (c < 61)) || Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m =================================================================== ---- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1626) -+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail) +--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1626) ++++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy) @@ -19,6 +19,7 @@ 02111-1307, USA. */ @@ -3384,8 +3483,8 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m Index: sope-core/NGStreams/GNUmakefile.preamble =================================================================== ---- sope-core/NGStreams/GNUmakefile.preamble (révision 1626) -+++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail) +--- sope-core/NGStreams/GNUmakefile.preamble (revision 1626) ++++ sope-core/NGStreams/GNUmakefile.preamble (working copy) @@ -1,7 +1,10 @@ # compilation settings @@ -3399,8 +3498,8 @@ Index: sope-core/NGStreams/GNUmakefile.preamble -I.. Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1626) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1626) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy) @@ -19,6 +19,8 @@ 02111-1307, USA. */ @@ -3421,8 +3520,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h id entityResolver; Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1626) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1626) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy) @@ -30,6 +30,12 @@ #include #include @@ -3481,8 +3580,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m - (void)tearDownParser { Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (révision 1626) -+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (revision 1626) ++++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (working copy) @@ -614,7 +614,7 @@ xmlParseDocument(ctxt); @@ -3503,8 +3602,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m xmlFreeParserCtxt(self->ctxt); Index: sope-appserver/mod_ngobjweb/config.c =================================================================== ---- sope-appserver/mod_ngobjweb/config.c (révision 1626) -+++ sope-appserver/mod_ngobjweb/config.c (copie de travail) +--- sope-appserver/mod_ngobjweb/config.c (revision 1626) ++++ sope-appserver/mod_ngobjweb/config.c (working copy) @@ -21,7 +21,7 @@ #include "common.h" @@ -3514,10 +3613,22 @@ Index: sope-appserver/mod_ngobjweb/config.c static char *_makeString(char *buf, char *str, int max) { if (buf == NULL) +Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c +=================================================================== +--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1626) ++++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy) +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include "common.h" + #include "NGBufferedDescriptor.h" + + // returns the number of bytes which where read from the buffer Index: sope-appserver/mod_ngobjweb/GNUmakefile =================================================================== ---- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1626) -+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail) +--- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1626) ++++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy) @@ -82,7 +82,7 @@ CFLAGS = -Wall -I. -fPIC \ @@ -3537,22 +3648,10 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile install-usr-libexec :: all $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ -Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c -=================================================================== ---- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1626) -+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail) -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include "common.h" - #include "NGBufferedDescriptor.h" - - // returns the number of bytes which where read from the buffer Index: sope-appserver/NGObjWeb/GNUmakefile.postamble =================================================================== ---- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1626) -+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail) +--- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1626) ++++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy) @@ -23,14 +23,20 @@ # install makefiles @@ -3583,8 +3682,8 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble + $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make Index: sope-appserver/NGObjWeb/WOContext.m =================================================================== ---- sope-appserver/NGObjWeb/WOContext.m (révision 1626) -+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail) +--- sope-appserver/NGObjWeb/WOContext.m (revision 1626) ++++ sope-appserver/NGObjWeb/WOContext.m (working copy) @@ -64,11 +64,13 @@ static BOOL testNSURLs = NO; static BOOL newCURLStyle = NO; @@ -3623,8 +3722,8 @@ Index: sope-appserver/NGObjWeb/WOContext.m serverURL = [@"http://" stringByAppendingString:host]; Index: sope-appserver/NGObjWeb/ChangeLog =================================================================== ---- sope-appserver/NGObjWeb/ChangeLog (révision 1626) -+++ sope-appserver/NGObjWeb/ChangeLog (copie de travail) +--- sope-appserver/NGObjWeb/ChangeLog (revision 1626) ++++ sope-appserver/NGObjWeb/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2008-09-01 Ludovic Marcotte + @@ -3636,8 +3735,8 @@ Index: sope-appserver/NGObjWeb/ChangeLog * WOHTTPURLHandle.m: add 'query' component of URL to request path Index: sope-appserver/NGObjWeb/DAVPropMap.plist =================================================================== ---- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1626) -+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail) +--- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1626) ++++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy) @@ -24,13 +24,19 @@ "{DAV:}status" = "davStatus"; "{http://apache.org/dav/props/}executable" = "davIsExecutable"; @@ -3714,8 +3813,8 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist "{http://groupdav.org/}component-set" = gdavComponentSet; Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy) @@ -655,6 +655,7 @@ if (self->responses == nil) self->responses = [[NSMutableArray alloc] initWithCapacity:64]; @@ -3726,8 +3825,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m case 'n': Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (révision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (revision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (working copy) @@ -1523,16 +1523,16 @@ - (id)doREPORT:(WOContext *)_ctx { id domDocument; @@ -3814,8 +3913,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m /* DAV access control lists */ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (révision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy) @@ -277,7 +277,8 @@ ok = [self renderLockToken:_object inContext:_ctx]; break; @@ -3828,8 +3927,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m ok = [self renderStatusResult:_object Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (révision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (revision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (working copy) @@ -62,6 +62,7 @@ properties:(NSDictionary *)_props inContext:(id)_ctx; @@ -3840,8 +3939,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h inContext:(id)_ctx; Index: sope-appserver/NGObjWeb/WODirectAction.m =================================================================== ---- sope-appserver/NGObjWeb/WODirectAction.m (révision 1626) -+++ sope-appserver/NGObjWeb/WODirectAction.m (copie de travail) +--- sope-appserver/NGObjWeb/WODirectAction.m (revision 1626) ++++ sope-appserver/NGObjWeb/WODirectAction.m (working copy) @@ -46,7 +46,7 @@ } - (id)initWithContext:(WOContext *)_ctx { @@ -3875,8 +3974,8 @@ Index: sope-appserver/NGObjWeb/WODirectAction.m Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1626) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1626) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy) @@ -216,6 +216,12 @@ assocCount++; } @@ -3892,8 +3991,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1626) -+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1626) ++++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy) @@ -41,6 +41,7 @@ WOAssociation *string; WOAssociation *target; @@ -3925,8 +4024,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m return NO; Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1626) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1626) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy) @@ -41,7 +41,8 @@ WOAssociation *pageName; WOAssociation *actionClass; @@ -3939,8 +4038,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h /* 'ivar' associations */ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1626) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail) +--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1626) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy) @@ -39,22 +39,34 @@ static int debugLookup = -1; static int debugBaseURL = -1; @@ -4090,8 +4189,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (révision 1626) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (copie de travail) +--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (revision 1626) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (working copy) @@ -195,7 +195,8 @@ isCreateIfMissingMethod = YES; else if ([m isEqualToString:@"PROPPATCH"]) @@ -4104,8 +4203,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m // TODO: the following are only create-if-missing on the target! Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1626) -+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1626) ++++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy) @@ -32,6 +32,7 @@ #include #include @@ -4129,8 +4228,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m @implementation WOCoreApplication(SimpleParserSelection) Index: sope-appserver/NGObjWeb/Defaults.plist =================================================================== ---- sope-appserver/NGObjWeb/Defaults.plist (révision 1626) -+++ sope-appserver/NGObjWeb/Defaults.plist (copie de travail) +--- sope-appserver/NGObjWeb/Defaults.plist (revision 1626) ++++ sope-appserver/NGObjWeb/Defaults.plist (working copy) @@ -216,7 +216,7 @@ SoWebDAVDisableCrossHostMoveCheck = NO; @@ -4150,8 +4249,8 @@ Index: sope-appserver/NGObjWeb/Defaults.plist DELETE, Index: sope-appserver/NGObjWeb/WORequest.m =================================================================== ---- sope-appserver/NGObjWeb/WORequest.m (révision 1626) -+++ sope-appserver/NGObjWeb/WORequest.m (copie de travail) +--- sope-appserver/NGObjWeb/WORequest.m (revision 1626) ++++ sope-appserver/NGObjWeb/WORequest.m (working copy) @@ -597,6 +597,8 @@ if (r.length > 0) language = [language substringToIndex:r.location]; @@ -4163,8 +4262,8 @@ Index: sope-appserver/NGObjWeb/WORequest.m if ((tmp = [self languageForBrowserLanguageCode:language])) Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (révision 1626) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (copie de travail) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (revision 1626) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (working copy) @@ -62,6 +62,10 @@ /* RFC 3253 (DeltaV) */ NGHttpMethod_REPORT, @@ -4178,8 +4277,8 @@ Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (révision 1626) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (copie de travail) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (revision 1626) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (working copy) @@ -59,6 +59,10 @@ /* RFC 3253 (DeltaV) */ @"REPORT", diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 7eb463975..e36d98348 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -181,7 +181,7 @@ static BOOL showTextAttachmentsInline = NO; { id headerValue; unsigned int count; - NSString *messageID; + NSString *messageID, *priority; for (count = 0; count < 8; count++) { @@ -199,6 +199,29 @@ static BOOL showTextAttachmentsInline = NO; messageID = [self _generateMessageID]; [headers setObject: messageID forKey: @"message-id"]; } + + priority = [newHeaders objectForKey: @"priority"]; + + if (!priority || [priority isEqualToString: @"NORMAL"]) + { + [headers removeObjectForKey: @"X-Priority"]; + } + else if ([priority isEqualToString: @"HIGHEST"]) + { + [headers setObject: @"1 (Highest)" forKey: @"X-Priority"]; + } + else if ([priority isEqualToString: @"HIGH"]) + { + [headers setObject: @"2 (High)" forKey: @"X-Priority"]; + } + else if ([priority isEqualToString: @"LOW"]) + { + [headers setObject: @"4 (Low)" forKey: @"X-Priority"]; + } + else + { + [headers setObject: @"5 (Lowest)" forKey: @"X-Priority"]; + } } - (NSDictionary *) headers @@ -1235,8 +1258,10 @@ static BOOL showTextAttachmentsInline = NO; [map addObject: userAgent forKey: @"User-Agent"]; /* add custom headers */ - -// [self _addHeaders: [lInfo objectForKey: @"headers"] toHeaderMap:map]; + if ([(s = [headers objectForKey: @"X-Priority"]) length] > 0) + [map setObject: s + forKey: @"X-Priority"]; + [self _addHeaders: _headers toHeaderMap: map]; return map; diff --git a/UI/MailerUI/Dutch.lproj/Localizable.strings b/UI/MailerUI/Dutch.lproj/Localizable.strings index 16d9913bb..99523d1f2 100644 --- a/UI/MailerUI/Dutch.lproj/Localizable.strings +++ b/UI/MailerUI/Dutch.lproj/Localizable.strings @@ -79,6 +79,12 @@ "Edit Draft..." = "Concept aanpassen..."; +"highest" = "Highest"; +"high" = "High"; +"normal" = "Normal"; +"low" = "Low"; +"lowest" = "Lowest"; + "This mail is being sent from an unsecure network!" = "Deze e-mail wordt verzonden vanaf een onveilig netwerk!"; /* Popup "show" */ diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings index 7320cca1d..3c9524724 100644 --- a/UI/MailerUI/English.lproj/Localizable.strings +++ b/UI/MailerUI/English.lproj/Localizable.strings @@ -92,10 +92,15 @@ "bcc" = "Bcc"; "Addressbook" = "Address Book"; -"Anais" = "Anais"; "Edit Draft..." = "Edit Draft..."; +"highest" = "Highest"; +"high" = "High"; +"normal" = "Normal"; +"low" = "Low"; +"lowest" = "Lowest"; + "This mail is being sent from an unsecure network!" = "This mail is being sent from an unsecure network!"; /* Popup "show" */ diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings index 698120403..6c703ebae 100644 --- a/UI/MailerUI/French.lproj/Localizable.strings +++ b/UI/MailerUI/French.lproj/Localizable.strings @@ -96,6 +96,12 @@ "Edit Draft..." = "Modifier le brouillon..."; +"highest" = "Maximale"; +"high" = "Haute"; +"normal" = "Normale"; +"low" = "Basse"; +"lowest" = "Minimale"; + "This mail is being sent from an unsecure network!" = "Ce mail est envoyé depuis un réseau non sécurisé !"; /* Popup "show" */ diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings index 9b9ee6586..0a8e7c831 100644 --- a/UI/MailerUI/German.lproj/Localizable.strings +++ b/UI/MailerUI/German.lproj/Localizable.strings @@ -80,6 +80,12 @@ "Edit Draft..." = "Entwurf bearbeiten..."; +"highest" = "Highest"; +"high" = "High"; +"normal" = "Normal"; +"low" = "Low"; +"lowest" = "Lowest"; + "This mail is being sent from an unsecure network!" = "Diese e-Mail wurde von einem unsicheren Netzwerk gesendet!"; /* Popup "show" */ diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings index 7057fb6e1..ed874dd86 100644 --- a/UI/MailerUI/Italian.lproj/Localizable.strings +++ b/UI/MailerUI/Italian.lproj/Localizable.strings @@ -102,6 +102,12 @@ "Edit Draft..." = "Modifica bozza..."; +"highest" = "Highest"; +"high" = "High"; +"normal" = "Normal"; +"low" = "Low"; +"lowest" = "Lowest"; + "This mail is being sent from an unsecure network!" = "Questa email è stata spedita da un network contrassegnato come non sicuro!"; /* Popup "show" */ diff --git a/UI/MailerUI/Spanish.lproj/Localizable.strings b/UI/MailerUI/Spanish.lproj/Localizable.strings index 8822a297a..b772b231a 100644 --- a/UI/MailerUI/Spanish.lproj/Localizable.strings +++ b/UI/MailerUI/Spanish.lproj/Localizable.strings @@ -99,6 +99,12 @@ "Edit Draft..." = "Modificar borrador..."; +"highest" = "Highest"; +"high" = "High"; +"normal" = "Normal"; +"low" = "Low"; +"lowest" = "Lowest"; + "This mail is being sent from an unsecure network!" = "Este mendaje es enviado desde una red no segura."; /* Popup "show" */ diff --git a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar b/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar index c78528b91..e9bdfd5bf 100644 --- a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar +++ b/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar @@ -27,5 +27,10 @@ cssClass = "tbicon_save"; label = "Save"; tooltip = "Save this message"; }, + { link = "#"; + hasMenu = YES; + label = "Priority"; + onclick = "return onSelectPriority(event);"; + image = "priority.png"; }, ) ) diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m index dc9f2dedd..a1effdb92 100644 --- a/UI/MailerUI/UIxMailEditor.m +++ b/UI/MailerUI/UIxMailEditor.m @@ -1,6 +1,8 @@ /* Copyright (C) 2004-2005 SKYRIX Software AG + Copyright (C) 2008 Inverse inc. + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under @@ -64,6 +66,9 @@ NSString *from; SOGoMailFolder *sentFolder; + NSString *priority; + id item; + /* these are for the inline attachment list */ NSString *attachmentName; NSArray *attachmentNames; @@ -85,7 +90,7 @@ static NSArray *infoKeys = nil; infoKeys = [[NSArray alloc] initWithObjects: @"subject", @"to", @"cc", @"bcc", @"from", @"replyTo", @"inReplyTo", - nil]; + @"priority", nil]; /* Internet mail settings */ @@ -100,8 +105,20 @@ static NSArray *infoKeys = nil; [internetMailHeaders count]); } +- (id) init +{ + if ((self = [super init])) + { + [self setPriority: @"NORMAL"]; + } + + return self; +} + - (void) dealloc { + [item release]; + [priority release]; [sentFolder release]; [fromEMails release]; [from release]; @@ -117,6 +134,45 @@ static NSArray *infoKeys = nil; } /* accessors */ +- (void) setItem: (id) _item +{ + ASSIGN (item, _item); +} + +- (id) item +{ + return item; +} + +- (NSArray *) priorityClasses +{ + static NSArray *priorities = nil; + + if (!priorities) + { + priorities = [NSArray arrayWithObjects: @"HIGHEST", @"HIGH", + @"NORMAL", @"LOW", @"LOWEST", nil]; + [priorities retain]; + } + + return priorities; +} + +- (void) setPriority: (NSString *) _priority +{ + ASSIGN(priority, _priority); +} + +- (NSString *) priority +{ + return priority; +} + +- (NSString *) itemPriorityText +{ + return [self labelForKey: [NSString stringWithFormat: @"%@", [item lowercaseString]]]; +} + - (NSString *) isMailReply { return ([to count] > 0 ? @"true" : @"false"); diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m index fb3f331d5..059149996 100644 --- a/UI/MailerUI/UIxMailListView.m +++ b/UI/MailerUI/UIxMailListView.m @@ -27,6 +27,7 @@ */ #import +#import #import #import #import @@ -104,6 +105,55 @@ return [dateFormatter formattedDateAndTime: messageDate]; } +// +// Priorities are defined like this: +// +// X-Priority: 1 (Highest) +// X-Priority: 2 (High) +// X-Priority: 3 (Normal) +// X-Priority: 4 (Low) +// X-Priority: 5 (Lowest) +// +// Sometimes, the MUAs don't send over the string in () so we ignore it. +// +- (NSString *) messagePriority +{ + NSString *result; + NSData *data; + + data = [message objectForKey: @"header"]; + result = @""; + + if (data) + { + NSString *s; + + s = [[NSString alloc] initWithData: data + encoding: NSASCIIStringEncoding]; + + if (s) + { + NSRange r; + + [s autorelease]; + r = [s rangeOfString: @":"]; + + if (r.length) + { + s = [[s substringFromIndex: r.location+1] + stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]]; + + if ([s hasPrefix: @"1"]) result = [self labelForKey: @"highest"]; + else if ([s hasPrefix: @"2"]) result = [self labelForKey: @"high"]; + else if ([s hasPrefix: @"4"]) result = [self labelForKey: @"low"]; + else if ([s hasPrefix: @"5"]) result = [self labelForKey: @"lowest"]; + } + } + } + + return result; +} + - (NSString *) messageSubject { id baseSubject; @@ -239,9 +289,8 @@ if (!keys) keys = [[NSArray alloc] initWithObjects: @"UID", - @"FLAGS", @"ENVELOPE", @"RFC822.SIZE", - @"BODYSTRUCTURE", nil]; - + @"FLAGS", @"ENVELOPE", @"RFC822.SIZE", + @"BODYSTRUCTURE", @"BODY[HEADER.FIELDS (X-PRIORITY)]", nil]; return keys; } diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox index e8a9bda57..52c97058b 100644 --- a/UI/Templates/MailerUI/UIxMailEditor.wox +++ b/UI/Templates/MailerUI/UIxMailEditor.wox @@ -28,7 +28,19 @@ + +
+ +
    diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox index 26f458bd4..c4434e397 100644 --- a/UI/Templates/MailerUI/UIxMailListView.wox +++ b/UI/Templates/MailerUI/UIxMailListView.wox @@ -26,9 +26,11 @@ > | @@ -107,6 +109,12 @@ > diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js index 64b970e37..b976ee0a4 100644 --- a/UI/WebServerResources/UIxMailEditor.js +++ b/UI/WebServerResources/UIxMailEditor.js @@ -553,6 +553,33 @@ function initMailEditor() { var focusField = (mailIsReply ? textarea : $("addr_0")); focusField.focus(); + + initializePriorityMenu(); +} + +function initializePriorityMenu() { + var priority = $("priority").value.toUpperCase(); + var priorityMenu = $("priority-menu").childNodesWithTag("ul")[0]; + var menuEntries = $(priorityMenu).childNodesWithTag("li"); + var chosenNode; + if (priority == "HIGHEST") + chosenNode = menuEntries[0]; + else if (priority == "HIGH") + chosenNode = menuEntries[1]; + else if (priority == "LOW") + chosenNode = menuEntries[3]; + else if (priority == "LOWEST") + chosenNode = menuEntries[4]; + else + chosenNode = menuEntries[2]; + priorityMenu.chosenNode = chosenNode; + $(chosenNode).addClassName("_chosen"); + + var menuItems = $("itemPriorityList").childNodesWithTag("li"); + for (var i = 0; i < menuItems.length; i++) + menuItems[i].observe("mousedown", + onMenuSetPriority.bindAsEventListener(menuItems[i]), + false); } function getMenus() { @@ -599,6 +626,19 @@ function attachmentDeleteCallback(http) { } } +function onMenuSetPriority(event) { + event.cancelBubble = true; + + var priority = this.getAttribute("priority"); + if (this.parentNode.chosenNode) + this.parentNode.chosenNode.removeClassName("_chosen"); + this.addClassName("_chosen"); + this.parentNode.chosenNode = this; + + var priorityInput = $("priority"); + priorityInput.value = priority; +} + function onSelectAllAttachments() { var list = $("attachments"); var nodes = list.childNodesWithTag("li"); @@ -606,6 +646,17 @@ function onSelectAllAttachments() { nodes[i].selectElement(); } +function onSelectPriority(event) { + if (event.button == 0 || (isSafari() && event.button == 1)) { + var node = getTarget(event); + if (node.tagName != 'BUTTON') + node = $(node).up("button"); + popupToolbarMenu(node, "priority-menu"); + Event.stop(event); + // preventDefault(event); + } +} + function onWindowResize(event) { var textarea = document.pageform.text; var rowheight = (Element.getHeight(textarea) / textarea.rows); From 6d10c6158274e1844f6410c8cdbd982ea6f79fbe Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Sun, 28 Sep 2008 16:50:47 +0000 Subject: [PATCH 6/6] added missing file Monotone-Parent: 5ca46341daec14901e918e991004a22b7ada9f49 Monotone-Revision: 74d6ae3bf39677a7d5083301f1c29c74b97b84dd Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-09-28T16:50:47 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/priority.png | Bin 0 -> 806 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 UI/WebServerResources/priority.png diff --git a/UI/WebServerResources/priority.png b/UI/WebServerResources/priority.png new file mode 100644 index 0000000000000000000000000000000000000000..71fda86d913d35eb408d5d1254b840f7cff8cc9a GIT binary patch literal 806 zcmV+>1KIqEP)R00009c5p#w0007T0001B0PK>=MgRZ;j7da6R9M69S36JRKoFjF z&Jq$KD1=Z%fd(a_Nfgl_N-6|Ygo2We3JHFSYl?IfAVCL+jshuk$Vw9>6oeW-6WheE zy<)VN$H_v%dzYMaUo%?o+TVOTGrMC#DW#OcKZ_r{KX`pzC=?2ZhdA2Z9i4r7IXGyy z+igkW#YcEW03CmQ#nI~O{Cp~vN&$$XD2gJ$$A_XQ3S0g8iFR!b1$8>#<&7Nybo}g$ zIljJLsZ=TeD=YbYK0jDz7^Z2O08dZ#dc8g~<9VLvdFSUiyS@Egej%;^#L3CxVkVQx z0Oa$zTrLL?hG7_n13NdDOeT{6%ge*UwzlFja}qE+yReW>r_%sIfDT95rKM~(oBc%} zo1c?_w>QhOZQBM2!ypKPXlodTVHoVaUT;bSTwdC?<2Vk0@1vtpmI+0?zfW8MA&EpH zad)R_nx<(0LE!toA8otcZnxWIZ`W!Q7f`J>o6Tmcg(Kfr6jfE#=m=<*HY7k(q_xt^RzYmZ|2!bF0xGs(nS694vxkUhTnw>9{_Ij3OS%VaEUC;A8 zCRCPr@pA7*5rmi~ri|kZpZnuNIWYbI9~i^^eYspNOOhZ6f*>3nvFBk(DW#8(J3F#0 z%lrGh__#&j_O?_il_UxK|I<@K2qEP6b*}5WuKWDFx7TPi8k?JOc{xUaQc91HS<@D| zV*~(TV}lnfHvz0&{wkWhYmVD7iaY=C@KrmF_r%~%jtlOm(9KP;SS;4-SObGpK_0`X kR$HxBE1jNN0e>4m0VpmV@4!?up8x;=07*qoM6N<$f_p+-j{pDw literal 0 HcmV?d00001