diff --git a/UI/AdministrationUI/GNUmakefile b/UI/AdministrationUI/GNUmakefile index 436d64c76a..b57e5cbff7 100644 --- a/UI/AdministrationUI/GNUmakefile +++ b/UI/AdministrationUI/GNUmakefile @@ -18,9 +18,6 @@ AdministrationUI_OBJC_FILES = \ AdministrationUI_RESOURCE_FILES += \ product.plist -AdministrationUI_RESOURCE_FILES += \ - Toolbars/UIxAdministration.toolbar - AdministrationUI_LOCALIZED_RESOURCE_FILES += \ Localizable.strings \ diff --git a/UI/AdministrationUI/Toolbars/UIxAdministration.toolbar b/UI/AdministrationUI/Toolbars/UIxAdministration.toolbar deleted file mode 100644 index 73499716d0..0000000000 --- a/UI/AdministrationUI/Toolbars/UIxAdministration.toolbar +++ /dev/null @@ -1,7 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ - ( { link = "#"; - label = "Help"; - onclick = "help(this);"; - image = "properties.png"; } - ) -) diff --git a/UI/AdministrationUI/product.plist b/UI/AdministrationUI/product.plist index 28dd5ed15d..8d797179a9 100644 --- a/UI/AdministrationUI/product.plist +++ b/UI/AdministrationUI/product.plist @@ -3,8 +3,7 @@ publicResources = (); - factories = { - }; + factories = {}; categories = { SOGoUserFolder = { diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile index 1f0315e3ea..7f445c2129 100644 --- a/UI/Contacts/GNUmakefile +++ b/UI/Contacts/GNUmakefile @@ -10,11 +10,9 @@ ContactsUI_LANGUAGES = $(SOGO_LANGUAGES) ContactsUI_OBJC_FILES = \ UIxContactsUserFolders.m \ - UIxContactsMailerSelection.m \ UIxContactsUserRightsEditor.m \ \ ContactsUIProduct.m \ - UIxContactsFilterPanel.m \ UIxContactActions.m \ UIxContactView.m \ UIxContactEditor.m \ @@ -29,9 +27,6 @@ ContactsUI_OBJC_FILES = \ ContactsUI_RESOURCE_FILES += \ product.plist \ -ContactsUI_RESOURCE_FILES += \ - Toolbars/SOGoContactFolder.toolbar - ContactsUI_LOCALIZED_RESOURCE_FILES += \ Localizable.strings \ diff --git a/UI/Contacts/Toolbars/SOGoContactFolder.toolbar b/UI/Contacts/Toolbars/SOGoContactFolder.toolbar deleted file mode 100644 index 4f85f8f518..0000000000 --- a/UI/Contacts/Toolbars/SOGoContactFolder.toolbar +++ /dev/null @@ -1,39 +0,0 @@ -( /* the toolbar groups -*-java-*- */ - ( - { link = "#"; - jsLink="js_card"; - label="New Card"; - image="new-card.png"; - onclick = "newContact(this); return false;"; - tooltip = "Create a new address book card"; }, - { link = "#"; - label="New List"; - image="new-list.png"; - onclick = "newList(this); return false;"; - tooltip = "Create a new list"; } - ), - ( - { link = "#"; - label = "Edit"; - onclick = "return onToolbarEditSelectedContacts(this);"; - image = "properties.png"; - tooltip = "Edit the selected card"; }, - { link = "#"; - label="Write"; - onclick = "return onToolbarWriteToSelectedContacts(this);"; - image="write.png"; - tooltip = "Send a mail message"; } - ), - ( - { link = "#"; - label="Delete"; - onclick = "return onToolbarDeleteSelectedContacts(this);"; - image="tb-mail-delete-flat-24x24.png"; - tooltip = "Delete selected card or address book"; } - ), - ( { link = "#"; - label = "Reload"; - onclick = "return onContactsReload();"; - image = "calendar-reload.png"; - tooltip = "Reload all contacts"; } ) -) diff --git a/UI/Contacts/UIxContactEditor.h b/UI/Contacts/UIxContactEditor.h index 742767ef6e..6343682965 100644 --- a/UI/Contacts/UIxContactEditor.h +++ b/UI/Contacts/UIxContactEditor.h @@ -23,14 +23,14 @@ #ifndef __UIxContactEditor_H__ #define __UIxContactEditor_H__ -#include +#include @class NSString; @class NSMutableDictionary; @protocol SOGoContactFolder; -@interface UIxContactEditor : UIxComponent +@interface UIxContactEditor : SOGoDirectAction { id addressBookItem; NGVCard *card; diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m index 4c30403a66..4be69db310 100644 --- a/UI/Contacts/UIxContactEditor.m +++ b/UI/Contacts/UIxContactEditor.m @@ -26,11 +26,11 @@ #import #import #import +#import #import #import #import - #import #import #import @@ -141,30 +141,6 @@ - (NSString *) item /* helper */ -- (NSString *) _completeURIForMethod: (NSString *) _method -{ - // TODO: this is a DUP of UIxAppointmentEditor - NSString *uri; - NSRange r; - - uri = [[[self context] request] uri]; - - /* first: identify query parameters */ - r = [uri rangeOfString: @"?" options:NSBackwardsSearch]; - if (r.length > 0) - uri = [uri substringToIndex:r.location]; - - /* next: append trailing slash */ - if (![uri hasSuffix: @"/"]) - uri = [uri stringByAppendingString: @"/"]; - - /* next: append method */ - uri = [uri stringByAppendingString:_method]; - - /* next: append query parameters */ - return [self completeHrefForMethod:uri]; -} - - (BOOL) isNew { return ([[self clientObject] isNew]); @@ -213,85 +189,6 @@ - (NSString *) addressBookDisplayName return [addressBookItem displayName]; } -- (BOOL) supportCategories -{ - return [[self clientObject] isKindOfClass: SOGoContactGCSEntryK]; -} - -- (void) setJsonContactCategories: (NSString *) jsonCategories -{ - NSArray *newCategories; - - newCategories = [jsonCategories objectFromJSONString]; - if ([newCategories isKindOfClass: [NSArray class]]) - [[self ldifRecord] setObject: newCategories - forKey: @"vcardcategories"]; - else - [[self ldifRecord] removeObjectForKey: @"vcardcategories"]; -} - -- (NSString *) jsonContactCategories -{ - NSArray *categories; - - categories = [[self ldifRecord] objectForKey: @"vcardcategories"]; - - return [categories jsonRepresentation]; -} - -- (NSArray *) _languageContactsCategories -{ - NSArray *categoryLabels; - - categoryLabels = [[self labelForKey: @"contacts_category_labels"] - componentsSeparatedByString: @","]; - if (!categoryLabels) - categoryLabels = [NSArray array]; - - return [categoryLabels trimmedComponents]; -} - -- (NSArray *) _fetchAndCombineCategoriesList -{ - NSString *ownerLogin; - SOGoUserDefaults *ud; - NSArray *cats, *newCats, *contactCategories; - - ownerLogin = [[self clientObject] ownerInContext: context]; - ud = [[SOGoUser userWithLogin: ownerLogin] userDefaults]; - cats = [ud contactsCategories]; - if (!cats) - cats = [self _languageContactsCategories]; - - contactCategories = [[self ldifRecord] objectForKey: @"vcardcategories"]; - if (contactCategories) - { - newCats = [cats mergedArrayWithArray: contactCategories]; - if ([newCats count] != [cats count]) - { - cats = [newCats sortedArrayUsingSelector: - @selector (localizedCaseInsensitiveCompare:)]; - [ud setContactsCategories: cats]; - [ud synchronize]; - } - } - - return cats; -} - -- (NSString *) contactCategoriesList -{ - NSArray *cats; - NSString *list; - - cats = [self _fetchAndCombineCategoriesList]; - list = [cats jsonRepresentation]; - if (!list) - list = @"[]"; - - return list; -} - /* actions */ // - (BOOL) shouldTakeValuesFromRequest: (WORequest *) request @@ -590,33 +487,5 @@ - (void) setAttributes: (NSDictionary *) attributes return [self responseWithStatus: 200 andJSONRepresentation: data]; } -- (id) writeAction -{ - NSString *email, *cn, *url; - NSMutableString *address; - - [self ldifRecord]; - email = [ldifRecord objectForKey: @"mail"]; - if ([email length] == 0) - email = [ldifRecord objectForKey: @"mozillasecondemail"]; - - if (email) - { - address = [NSMutableString string]; - cn = [ldifRecord objectForKey: @"cn"]; - if ([cn length] > 0) - [address appendFormat: @"%@ <%@>", cn, email]; - else - [address appendString: email]; - - url = [NSString stringWithFormat: @"%@/Mail/compose?mailto=%@", - [self userFolderPath], address]; - } - else - url = [NSString stringWithFormat: @"%@/Mail/compose", [self userFolderPath]]; - - return [self redirectToLocation: url]; -} - @end /* UIxContactEditor */ diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m index a525f27b5c..e2c7d37428 100644 --- a/UI/Contacts/UIxContactFoldersView.m +++ b/UI/Contacts/UIxContactFoldersView.m @@ -124,13 +124,6 @@ - (NSArray *) personalContactInfos return contactInfos; } -- (id ) mailerContactsAction -{ - selectorComponentClass = @"UIxContactsMailerSelection"; - - return self; -} - - (NSString *) selectorComponentClass { return selectorComponentClass; @@ -290,7 +283,7 @@ - (NSArray *) contactFolders NSString *userLogin, *owner; NSArray *folders, *allACLs; NSDictionary *folderAttrs; - id currentFolder; + id currentFolder; BOOL objectCreator, objectEditor, objectEraser, synchronize; int max, i; diff --git a/UI/Contacts/UIxContactsFilterPanel.m b/UI/Contacts/UIxContactsFilterPanel.m deleted file mode 100644 index 75af540ee6..0000000000 --- a/UI/Contacts/UIxContactsFilterPanel.m +++ /dev/null @@ -1,97 +0,0 @@ -/* - Copyright (C) 2000-2005 SKYRIX Software AG - Copyright (C) 2000-2012 Inverse inc. - - This file is part of SOGo. - - SOGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - SOGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. - */ - -#import - -@interface UIxContactsFilterPanel : UIxComponent -{ - NSString *searchText; - NSString *searchCriteria; -} - -@end - -@implementation UIxContactsFilterPanel - -- (id) init -{ - if ((self = [super init])) - { - searchText = nil; - searchCriteria = nil; - } - - return self; -} - -- (void) dealloc -{ - [searchCriteria release]; - [searchText release]; - [super dealloc]; -} - -/* accessors */ - -- (void) setSearchText: (NSString *)_txt -{ - ASSIGNCOPY (searchText, _txt); -} - -- (void) setSearchCriteria: (NSString *)_txt -{ - ASSIGNCOPY (searchText, _txt); -} - -- (NSString *) searchText -{ - if (!searchText) - searchText = [[self queryParameterForKey: @"search"] copy]; - - return searchText; -} - -- (NSString *) searchCriteria -{ - if (!searchCriteria) - searchCriteria = [[self queryParameterForKey: @"criteria"] copy]; - - return searchCriteria; -} - -/* qualifiers */ - -- (NSString *) filterLabel -{ -#if 1 - return [[[self context] page] labelForKey: @"filter"]; -#else - return [self valueForKey: @"filter"]; -#endif -} - -- (NSString *) selectedFilter -{ - return [self queryParameterForKey: @"filterpopup"]; -} - -@end /* UIxContactsFilterPanel */ diff --git a/UI/Contacts/UIxContactsListActions.m b/UI/Contacts/UIxContactsListActions.m index c3e0372b27..c686077991 100644 --- a/UI/Contacts/UIxContactsListActions.m +++ b/UI/Contacts/UIxContactsListActions.m @@ -159,7 +159,7 @@ - (NSArray *) contactInfos searchFields = [data objectForKey: @"search"]; valueText = [data objectForKey: @"value"]; - if (![searchFields isKindOfClass: [NSArray class]] || ![searchFields count] > 0) + if (![searchFields isKindOfClass: [NSArray class]] || !([searchFields count] > 0)) { searchFields = nil; } @@ -461,72 +461,6 @@ - (NSArray *) getHeadersForIDs: (NSArray *) ids return response; } -- (id ) contactSearchAction -{ - id result; - id folder; - BOOL excludeLists; - NSString *searchText, *mail, *domain; - NSDictionary *contact, *data; - NSArray *contacts, *descriptors, *sortedContacts; - NSMutableDictionary *uniqueContacts; - unsigned int i; - NSSortDescriptor *commonNameDescriptor; - - excludeLists = [[[self requestData] objectForKey: @"excludeLists"] boolValue]; - searchText = [[self requestData] objectForKey: @"search"]; - if ([searchText length] > 0) - { - NS_DURING - folder = [self clientObject]; - NS_HANDLER - if ([[localException name] isEqualToString: @"SOGoDBException"]) - folder = nil; - else - [localException raise]; - NS_ENDHANDLER - - domain = [[context activeUser] domain]; - uniqueContacts = [NSMutableDictionary dictionary]; - contacts = [folder lookupContactsWithFilter: searchText - onCriteria: nil - sortBy: @"c_cn" - ordering: NSOrderedAscending - inDomain: domain]; - for (i = 0; i < [contacts count]; i++) - { - contact = [contacts objectAtIndex: i]; - if (!excludeLists || ![[contact objectForKey: @"c_component"] isEqualToString: @"vlist"]) - { - mail = [contact objectForKey: @"c_mail"]; - if ([mail isNotNull] && [uniqueContacts objectForKey: mail] == nil) - [uniqueContacts setObject: contact forKey: mail]; - } - } - - if ([uniqueContacts count] > 0) - { - // Sort the contacts by display name - commonNameDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"c_cn" - ascending:YES] autorelease]; - descriptors = [NSArray arrayWithObjects: commonNameDescriptor, nil]; - sortedContacts = [[uniqueContacts allValues] sortedArrayUsingDescriptors: descriptors]; - } - else - sortedContacts = [NSArray array]; - - data = [NSDictionary dictionaryWithObjectsAndKeys: searchText, @"searchText", - sortedContacts, @"cards", nil]; - result = [self responseWithStatus: 200 - andString: [data jsonRepresentation]]; - } - else - result = [NSException exceptionWithHTTPStatus: 400 - reason: @"missing 'search' parameter"]; - - return result; -} - - (NSString *) cardDavURL { NSString *davURL, *baseCardDAVURL; diff --git a/UI/Contacts/UIxContactsMailerSelection.m b/UI/Contacts/UIxContactsMailerSelection.m deleted file mode 100644 index 830dd573e5..0000000000 --- a/UI/Contacts/UIxContactsMailerSelection.m +++ /dev/null @@ -1,30 +0,0 @@ -/* - Copyright (C) 2004-2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import - -@interface UIxContactsMailerSelection : UIxComponent - -@end - -@implementation UIxContactsMailerSelection - -@end /* UIxContactsMailerSelection */ diff --git a/UI/Contacts/UIxListEditor.h b/UI/Contacts/UIxListEditor.h index 5e90faa426..203b9abe43 100644 --- a/UI/Contacts/UIxListEditor.h +++ b/UI/Contacts/UIxListEditor.h @@ -1,8 +1,6 @@ /* UIxListEditor.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse inc. - * - * Author: Wolfgang Sourdeau + * Copyright (C) 2008-2020 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,10 +21,10 @@ #ifndef UIXLISTEDITOR_H #define UIXLISTEDITOR_H -#import +#import #import -@interface UIxListEditor : UIxComponent +@interface UIxListEditor : SOGoDirectAction { NGVList *list; SOGoContactGCSList *co; diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m index b51344d97d..666f69037a 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-2015 Inverse inc. + * Copyright (C) 2008-2020 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,8 +19,9 @@ */ -#import #import +#import +#import #import #import @@ -42,15 +43,6 @@ - (void) dealloc [super dealloc]; } -- (id ) defaultAction -{ - co = [self clientObject]; - list = [co vList]; - [list retain]; - - return self; -} - - (NSArray *) references { NSArray *references; @@ -292,12 +284,6 @@ - (void) setAttributes: (NSDictionary *) attributes [list setDescription: [attributes objectForKey: @"description"]]; } -- (BOOL) canCreateOrModify -{ - return ([co isKindOfClass: [SOGoContentObject class]] - && [super canCreateOrModify]); -} - - (id ) saveAction { WORequest *request; diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist index 84a15a3fe3..b716dc8322 100644 --- a/UI/Contacts/product.plist +++ b/UI/Contacts/product.plist @@ -18,21 +18,11 @@ protectedBy = "View"; pageName = "UIxContactFoldersView"; }; - mailer-contacts = { - protectedBy = "View"; - pageName = "UIxContactFoldersView"; - actionName = "mailerContacts"; - }; allContactSearch = { protectedBy = ""; pageName = "UIxContactFoldersView"; actionName = "allContactSearch"; }; - updateAdditionalAddressBooks = { - protectedBy = "View"; - pageName = "UIxContactFoldersView"; - actionName = "updateAdditionalAddressBooks"; - }; acls = { protectedBy = "ReadAcls"; pageName = "UIxAclEditor"; @@ -42,11 +32,6 @@ pageName = "UIxAclEditor"; actionName = "saveAcls"; }; - checkRights = { - protectedBy = "View"; - pageName = "UIxContactFoldersView"; - actionName = "checkRights"; - }; UIxContactEditorTemplate = { protectedBy = "View"; pageName = "UIxContactEditorTemplate"; @@ -60,7 +45,7 @@ pageName = "UIxContactFoldersView"; actionName = "addressbooksList"; }; - saveDragHandleState = { + saveDragHandleState = { protectedBy = "View"; pageName = "UIxContactFoldersView"; actionName = "saveDragHandleState"; @@ -88,41 +73,11 @@ actionClass = "UIxContactsListActions"; actionName = "getHeaders"; }; - // contacts = { - // protectedBy = "View"; - // actionClass = "UIxContactsListActions"; - // actionName = "contactsList"; - // }; - contactSearch = { - protectedBy = ""; - actionClass = "UIxContactsListActions"; - actionName = "contactSearch"; - }; - newcontact = { - protectedBy = ""; - pageName = "UIxContactEditor"; - actionName = "new"; - }; - newlist = { - protectedBy = "Add Documents, Images, and Files"; - pageName = "UIxListEditor"; - actionName = "new"; - }; - mailer-contacts = { - protectedBy = "View"; - pageName = "UIxContactFoldersView"; - actionName = "mailerContacts"; - }; export = { protectedBy = "View"; actionClass = "UIxContactFolderActions"; actionName = "export"; }; - exportFolder = { - protectedBy = "View"; - actionClass = "UIxContactFolderActions"; - actionName = "export"; - }; import = { protectedBy = "Add Documents, Images, and Files"; actionClass = "UIxContactFolderActions"; @@ -171,21 +126,6 @@ actionClass = "UIxContactsListActions"; actionName = "contactsList"; }; - newcontact = { - protectedBy = ""; - pageName = "UIxContactEditor"; - actionName = "new"; - }; - mailer-contacts = { - protectedBy = ""; - pageName = "UIxContactFoldersView"; - actionName = "mailerContacts"; - }; - canAccessContent = { - protectedBy = ""; - actionClass = "UIxFolderActions"; - actionName = "canAccessContent"; - }; copy = { protectedBy = "Access Contents Information"; actionClass = "UIxFolderActions"; @@ -201,29 +141,16 @@ pageName = "UIxContactView"; actionName = "data"; }; - edit = { - protectedBy = "Access Contents Information"; - pageName = "UIxContactEditor"; - }; - editAsContact = { - protectedBy = "Access Contents Information"; - pageName = "UIxContactEditor"; - }; save = { protectedBy = "Change Images And Files"; - pageName = "UIxContactEditor"; + actionClass = "UIxContactEditor"; actionName = "save"; }; saveAsContact = { protectedBy = "Change Images And Files"; - pageName = "UIxContactEditor"; + actionClass = "UIxContactEditor"; actionName = "save"; }; - write = { - protectedBy = "View"; - pageName = "UIxContactEditor"; - actionName = "write"; - }; setCategory = { protectedBy = "Change Images And Files"; actionClass = "UIxContactActions"; @@ -264,22 +191,14 @@ pageName = "UIxListView"; actionName = "properties"; }; - edit = { - protectedBy = "Access Contents Information"; - pageName = "UIxListEditor"; - }; - editAsList = { - protectedBy = "Access Contents Information"; - pageName = "UIxListEditor"; - }; save = { protectedBy = "Change Images And Files"; - pageName = "UIxListEditor"; + actionClass = "UIxListEditor"; actionName = "save"; }; saveAsList = { protectedBy = "Change Images And Files"; - pageName = "UIxListEditor"; + actionClass = "UIxListEditor"; actionName = "save"; }; raw = { @@ -297,14 +216,6 @@ pageName = "UIxContactView"; actionName = "data"; }; - edit = { - protectedBy = "Access Contents Information"; - pageName = "UIxContactEditor"; - }; - editAsContact = { - protectedBy = "Access Contents Information"; - pageName = "UIxContactEditor"; - }; members = { protectedBy = "Access Contents Information"; pageName = "UIxContactView"; @@ -312,19 +223,14 @@ }; save = { protectedBy = "Change Images And Files"; - pageName = "UIxContactEditor"; + actionClass = "UIxContactEditor"; actionName = "save"; }; saveAsContact = { protectedBy = "Change Images And Files"; - pageName = "UIxContactEditor"; + actionClass = "UIxContactEditor"; actionName = "save"; }; - write = { - protectedBy = ""; - pageName = "UIxContactEditor"; - actionName = "write"; - }; }; }; }; diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index 9148cecb83..9549c132e8 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -22,23 +22,19 @@ MailerUI_OBJC_FILES += \ UIxMailSourceView.m \ UIxMailPopupView.m \ UIxMailMoveToPopUp.m \ - UIxMailFilterPanel.m \ - UIxMailSearch.m \ \ UIxMailAccountActions.m \ UIxMailFolderActions.m \ UIxMailFolderSubscriptions.m \ UIxMailActions.m \ UIxMailEditor.m \ - UIxMailToSelection.m \ UIxMailWindowCloser.m \ \ UIxMailUserRightsEditor.m \ UIxMailUserDelegationEditor.m MailerUI_RESOURCE_FILES += \ - product.plist \ - Toolbars/*.toolbar + product.plist MailerUI_LOCALIZED_RESOURCE_FILES += \ Localizable.strings diff --git a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar b/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar deleted file mode 100644 index 84fe4cea59..0000000000 --- a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar +++ /dev/null @@ -1,39 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ - ( /* first group */ - { link = "#"; - isSafe = NO; - onclick = "return clickedEditorSend(this);"; - image = "tb-compose-send-flat-24x24.png"; - cssClass = "tbicon_send"; - label = "Send"; - tooltip = "Send this message now"; } - ), - ( - { link = "#"; - onclick = "return onContactAdd(this);"; - image = "tb-compose-contacts-flat-24x24.png"; - cssClass = "tbicon_addressbook"; - label = "Contacts"; - tooltip = "Select a recipient from an Address Book"; }, - { link = "#"; - isSafe = NO; - onclick = "return clickedEditorSave(this);"; - image = "tb-mail-file-flat-24x24.png"; - cssClass = "tbicon_save"; - label = "Save"; - tooltip = "Save this message"; }, - { link = "#"; - hasMenu = YES; - onclick = "return onSelectOptions(event);"; - image = "options.png"; - cssClass = "tbicon_options"; - label = "Options"; } - ), - ( - { link = "#"; - isSafe = NO; - onclick = "return onCloseButtonClick(event);"; - label = "Close"; - image = "tb-mail-stop-flat-24x24.png"; } - ) -) diff --git a/UI/MailerUI/Toolbars/SOGoMailFolder.toolbar b/UI/MailerUI/Toolbars/SOGoMailFolder.toolbar deleted file mode 100644 index 119b2ac9b2..0000000000 --- a/UI/MailerUI/Toolbars/SOGoMailFolder.toolbar +++ /dev/null @@ -1,74 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ - - ( // first group - { link = "#"; - image = "tb-mail-getmail-flat-24x24.png"; - cssClass = "tbicon_getmail"; - label = "Get Mail"; - onclick = "return refreshMailbox(this);"; - tooltip = "Get new messages"; }, - { link = "#"; - isSafe = NO; - image = "tb-mail-write-flat-24x24.png"; - onclick = "return onComposeMessage();"; - cssClass = "tbicon_compose"; - label = "Write"; - tooltip = "Create a new message"; }, - ), - - ( // second group - { link = "#"; - onclick = "return openMessageWindowsForSelection('reply');"; - isSafe = NO; - image = "tb-mail-reply-flat-24x24.png"; - cssClass = "tbicon_reply"; - label = "Reply"; - tooltip = "Reply to the message"; }, - { link = "#"; - onclick = "return openMessageWindowsForSelection('replyall');"; - isSafe = NO; - image = "tb-mail-replyall-flat-24x24.png"; - cssClass = "tbicon_replyall"; - label = "Reply All"; - tooltip = "Reply to sender and all recipients"; }, - { link = "#"; - onclick = "return openMessageWindowsForSelection('forward');"; - isSafe = NO; - image = "tb-mail-forward-flat-24x24.png"; - cssClass = "tbicon_forward"; - label = "Forward"; - tooltip = "Forward selected message"; }, - ), - - ( // third group - { link = "#"; - isSafe = NO; - onclick = "onMenuDeleteMessage(event);"; -// enabled = showMarkDeletedButton; - image = "tb-mail-delete-flat-24x24.png"; - cssClass = "tbicon_delete"; - label = "Delete"; - tooltip = "Delete selected message or folder"; }, -// { link = "#"; -// isSafe = NO; -// image = "tb-mail-junk-flat-24x24.png"; -// cssClass = "tbicon_junk"; -// label = "Junk"; -// tooltip = "Mark the selected messages as junk"; }, - ), - ( - { link = "#"; - onclick = "return onPrintCurrentMessage(event);"; - cssClass = "tbicon_print single-window-not-conditional"; - image = "tb-mail-print-flat-24x24.png"; - label = "Print"; - tooltip = "Print this message"; }, - - { link = "#"; - onclick = "return onSearchMail(event);"; - cssClass = ""; - image = "search-messages.png"; - label = "Search"; - tooltip = "Search multiple mailboxes"; } - ) -) diff --git a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar b/UI/MailerUI/Toolbars/SOGoMailObject.toolbar deleted file mode 100644 index 062af06438..0000000000 --- a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar +++ /dev/null @@ -1,58 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ - - ( // first group - { link = "#"; - onclick = "return openMessageWindowsForSelection('reply');"; - isSafe = NO; - image = "tb-mail-reply-flat-24x24.png"; - cssClass = "tbicon_reply"; - label = "Reply"; - tooltip = "Reply to the message"; }, - { link = "#"; - onclick = "return openMessageWindowsForSelection('replyall');"; - isSafe = NO; - image = "tb-mail-replyall-flat-24x24.png"; - cssClass = "tbicon_replyall"; - label = "Reply All"; - tooltip = "Reply to sender and all recipients"; }, - { link = "#"; - onclick = "return openMessageWindowsForSelection('forward');"; - isSafe = NO; - image = "tb-mail-forward-flat-24x24.png"; - cssClass = "tbicon_forward"; - label = "Forward"; - tooltip = "Forward selected message"; }, - ), - - ( // second group - { link = "#"; - isSafe = NO; - onclick = "onMenuDeleteMessage(event);"; -// enabled = showMarkDeletedButton; - image = "tb-mail-delete-flat-24x24.png"; - cssClass = "tbicon_delete"; - label = "Delete"; - tooltip = "Delete selected message or folder"; }, -// { link = "#"; -// isSafe = NO; -// image = "tb-mail-junk-flat-24x24.png"; -// cssClass = "tbicon_junk"; -// label = "Junk"; -// tooltip = "Mark the selected messages as junk"; }, - ), - ( - { link = "#"; - onclick = "return onPrintCurrentMessage(event);"; - cssClass = "tbicon_print single-window-not-conditional"; - image = "tb-mail-print-flat-24x24.png"; - label = "Print"; - tooltip = "Print this message"; }, - ), - ( - { link = "#"; - isSafe = NO; - onclick = "return onCloseButtonClick(event);"; - label = "Close"; - image = "tb-mail-stop-flat-24x24.png"; } - ) -) diff --git a/UI/MailerUI/UIxFilterList.m b/UI/MailerUI/UIxFilterList.m deleted file mode 100644 index 5691d2b48f..0000000000 --- a/UI/MailerUI/UIxFilterList.m +++ /dev/null @@ -1,111 +0,0 @@ -/* - Copyright (C) 2004-2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - - -/* - UIxFilterList - - This component shows a list of filter scripts and is (usually) attached to - a SOGoSieveScriptsFolder object. -*/ - -@interface UIxFilterList : UIxComponent -{ - NSArray *filters; - id filter; -} - -@end - -@implementation UIxFilterList - -- (void)dealloc { - [self->filter release]; - [self->filters release]; - [super dealloc]; -} - -/* notifications */ - -- (void)sleep { - [self->filter release]; self->filter = nil; - [self->filters release]; self->filters = nil; - [super sleep]; -} - -/* accessors */ - -- (void)setFilter:(id)_msg { - ASSIGN(self->filter, _msg); -} -- (id)filter { - return self->filter; -} - -- (NSArray *)filters { - return self->filters; -} - -- (NSString *)panelTitle { - return [self labelForKey:@"Mail Filters"]; -} - -/* JavaScript code */ - -- (NSString *)clickedFilterJS { - /* return 'false' aborts processing */ - return [NSString stringWithFormat: - @"clickedFilter(this, '%@'); return false", - [self filter]]; -} - -/* creating scripts */ - -- (NSString *)newScriptName { - NSCalendarDate *now; - - now = [NSCalendarDate date]; - return [NSString stringWithFormat:@"MyFilter-%04d%02d%02d-%02d%02d%02d", - [now yearOfCommonEra], [now monthOfYear], - [now dayOfMonth], - [now hourOfDay], [now minuteOfHour], [now secondOfMinute]]; -} - -/* actions */ - -- (id)defaultAction { - [self debugWithFormat:@"fetch scripts in: %@", [self clientObject]]; - self->filters = [[[self clientObject] toOneRelationshipKeys] copy]; - return self; -} - -- (id)createAction { - NSString *newURL; - - newURL = [[self clientObject] baseURLInContext:[self context]]; - if (![newURL hasSuffix:@"/"]) newURL = [newURL stringByAppendingString:@"/"]; - newURL = [newURL stringByAppendingString:[self newScriptName]]; - newURL = [newURL stringByAppendingString:@"/edit"]; - - return [self redirectToLocation:newURL]; -} - -@end /* UIxFilterList */ diff --git a/UI/MailerUI/UIxMailFilterPanel.m b/UI/MailerUI/UIxMailFilterPanel.m deleted file mode 100644 index 1e8a804dbe..0000000000 --- a/UI/MailerUI/UIxMailFilterPanel.m +++ /dev/null @@ -1,192 +0,0 @@ -/* - Copyright (C) 2000-2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. - */ - -#import - -#import -#import -#import -#import - -@interface UIxMailFilterPanel : WOComponent -{ - NSString *searchText; - NSString *searchCriteria; -} - -@end - -@implementation UIxMailFilterPanel - -static NSArray *filters = nil; -// static NSDictionary *filterToQualifier = nil; - -+ (void)initialize { - // TODO: also available: answered, draft [custom: NotJunk and Junk] - // Note: we currently cannot use: "flags != 'deleted'" - static NSString *quals[] = { - @"all", nil, - @"read", @"flags = 'seen' AND NOT (flags = 'deleted')", - @"unread", @"flags = 'unseen' AND NOT (flags = 'deleted')", - @"deleted", @"flags = 'deleted'", - @"flagged", @"flags = 'flagged'", - nil, nil - }; - NSMutableDictionary *md; - NSMutableArray *ma; - unsigned i; - -#warning why not populate "filters" directly, as an NSMutableArray? - md = [[NSMutableDictionary alloc] initWithCapacity:8]; - ma = [[NSMutableArray alloc] initWithCapacity:4]; - - for (i = 0; quals[i] != nil; i += 2) { - [ma addObject:quals[i]]; - if (quals[i + 1] != nil) { - [md setObject:[EOQualifier qualifierWithQualifierFormat:quals[i + 1]] - forKey:quals[i]]; - } - } - -// filterToQualifier = [md copy]; - filters = [ma copy]; - [md release]; md = nil; - [ma release]; ma = nil; -} - -- (id) init -{ - if ((self = [super init])) - { - searchText = nil; - searchCriteria = nil; - } - - return self; -} - -- (void) dealloc -{ - [searchCriteria release]; - [searchText release]; - [super dealloc]; -} - -/* accessors */ - -- (void) setSearchText: (NSString *) _txt -{ - ASSIGN (searchText, _txt); -} - -- (void) setSearchCriteria: (NSString *) _txt -{ - ASSIGN (searchText, _txt); -} - -- (NSString *) searchText -{ - if (!searchText) - { - searchText = [[context request] formValueForKey: @"value"]; - [searchText retain]; - } - - return searchText; -} - -- (NSString *) searchCriteria -{ - if (!searchCriteria) - { - searchCriteria = [[context request] formValueForKey: @"criteria"]; - [searchCriteria retain]; - } - - return searchCriteria; -} - -/* filters */ - -- (NSArray *) filters -{ - return filters; -} - -/* qualifiers */ - -// - (EOQualifier *) searchTextQualifier -// { -// EOQualifier *q; -// NSString *s; - -// s = [self searchText]; -// if ([s length] == 0) -// return nil; - -// q = [EOQualifier qualifierWithQualifierFormat: -// @"(subject doesContain: %@) OR " -// @"(from doesContain: %@)", -// s, s]; -// return q; -// } - -// - (NSString *) filterLabel -// { -// #if 1 -// return [[context page] labelForKey:[self valueForKey:@"filter"]]; -// #else -// return [self valueForKey:@"filter"]; -// #endif -// } - -// - (NSString *) selectedFilter -// { -// return [[context request] formValueForKey: @"filterpopup"]; -// } - -// - (EOQualifier *) filterQualifier -// { -// NSString *selectedFilter; - -// selectedFilter = [self selectedFilter]; - -// return [selectedFilter length] > 0 -// ? [filterToQualifier objectForKey:selectedFilter] : nil; -// } - -// - (EOQualifier *) qualifier -// { -// EOQualifier *sq, *fq; -// NSArray *qa; - -// sq = [self searchTextQualifier]; -// fq = [self filterQualifier]; - -// if (fq == nil) return sq; -// if (sq == nil) return fq; - -// qa = [NSArray arrayWithObjects:fq, sq, nil]; - -// return [[[EOAndQualifier alloc] initWithQualifierArray:qa] autorelease]; -// } - -@end /* UIxMailFilterPanel */ diff --git a/UI/MailerUI/UIxMailSearch.h b/UI/MailerUI/UIxMailSearch.h deleted file mode 100644 index 8eb7b03bac..0000000000 --- a/UI/MailerUI/UIxMailSearch.h +++ /dev/null @@ -1,29 +0,0 @@ -/* UIxMailSearch.h - this file is part of SOGo - * - * Copyright (C) 2006-2014 Inverse inc. - * - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -@interface UIxMailSearch : UIxComponent -{ - id item; - -} -@end \ No newline at end of file diff --git a/UI/MailerUI/UIxMailSearch.m b/UI/MailerUI/UIxMailSearch.m deleted file mode 100644 index 0459848ef5..0000000000 --- a/UI/MailerUI/UIxMailSearch.m +++ /dev/null @@ -1,103 +0,0 @@ -/* UIxMailSearch.m - this file is part of SOGo - * - * Copyright (C) 2006-2014 Inverse inc. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import -#import - -#import - -@implementation UIxMailSearch - -- (id) init -{ - item = nil; - - return self; -} - -- (void) dealloc -{ - [item release]; - [super dealloc]; -} - -- (void) setItem: (id) newItem -{ - ASSIGN(item, newItem); -} - -- (id) item -{ - return item; -} - -- (NSString *) currentFolderDisplayName -{ - return [[item allValues] lastObject]; -} - -- (NSString *) currentFolderPath -{ - return [[item allKeys] lastObject]; -} - -- (NSArray *) mailAccountsList -{ - NSDictionary *accountName, *mailbox; - NSString *userName, *aString; - SOGoMailAccounts *mAccounts; - SOGoMailAccount *mAccount; - NSArray *accountFolders; - NSMutableArray *mailboxes; - - int nbMailboxes, nbMailAccounts, i, j; - - // Number of accounts linked with the current user - mAccounts = [self clientObject]; - nbMailAccounts = [[mAccounts mailAccounts] count]; - - mailboxes = [NSMutableArray array]; - for (i = 0; i < nbMailAccounts; i++) - { - accountName = [[[mAccounts mailAccounts] objectAtIndex:i] objectForKey:@"name"]; // Keys on this account = (name, port, encryption, mailboxes, serverName, identities, userName) - userName = [[[mAccounts mailAccounts] objectAtIndex:i] objectForKey:@"userName"]; - - aString = [NSString stringWithFormat:@"%i", i]; - mAccount = [mAccounts lookupName:aString inContext: context acquire: NO]; - accountFolders = [mAccount allFoldersMetadata]; - - // Number of mailboxes inside the current account - nbMailboxes = [accountFolders count]; - [mailboxes addObject: [NSDictionary dictionaryWithObject: accountName forKey: accountName]]; - - for (j = 0; j < nbMailboxes; j++) - { - mailbox = [NSDictionary dictionaryWithObject: [NSString stringWithFormat:@"%@%@", userName, [[accountFolders objectAtIndex:j] objectForKey: @"displayName"]] - forKey: [[accountFolders objectAtIndex:j] objectForKey: @"path"]]; - [mailboxes addObject: mailbox]; - } - } - - return mailboxes; -} - -@end diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m deleted file mode 100644 index 89db70a2ce..0000000000 --- a/UI/MailerUI/UIxMailToSelection.m +++ /dev/null @@ -1,333 +0,0 @@ -/* - Copyright (C) 2004-2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import - -#import -#import - -#import - -/* - UIxMailToSelection - - Select a set of address headers for composing an email. - - Bindings: - to - array of strings suitable for placement in a To: header - cc - array of strings suitable for placement in a Cc: header - bcc - array of strings suitable for placement in a Bcc: header - - Sample: - -*/ - -@class NSArray; - -@interface UIxMailToSelection : UIxComponent -{ - NSArray *to; - NSArray *cc; - NSArray *bcc; - id item; - id address; - NSArray *addressList; - int currentIndex; -} - -- (void) setTo: (NSArray *) _to; -- (NSArray *) to; -- (void) setCc: (NSArray *) _cc; -- (NSArray *) cc; -- (void) setBcc: (NSArray *) _bcc; -- (NSArray *) bcc; - -- (void) getAddressesFromFormValues: (NSDictionary *) _dict; -- (NSString *) getIndexFromIdentifier: (NSString *) _identifier; - -@end - -@implementation UIxMailToSelection - -static NSArray *headers = nil; - -+ (void) initialize -{ - static BOOL didInit = NO; - if (!didInit) - { - didInit = YES; - headers = [[NSArray alloc] initWithObjects: @"to", @"cc", @"bcc", nil]; - } -} - -- (id) init -{ - if ((self = [super init])) - currentIndex = -1; - - return self; -} - -- (void) dealloc -{ - [to release]; - [cc release]; - [bcc release]; - [item release]; - [address release]; - [addressList release]; - [super dealloc]; -} - -/* accessors */ - -- (void) setTo: (NSArray *) _to -{ - ASSIGN (to, _to); -} - -- (NSArray *) to -{ - NSString *mailto; - - mailto = [self queryParameterForKey: @"mailto"]; - if ([mailto length] > 0 && ![to count]) - { - to = [NSArray arrayWithObject: mailto]; - [to retain]; - } - - return to; -} - -- (void) setCc: (NSArray *) _cc -{ - ASSIGN (cc, _cc); -} - -- (NSArray *) cc -{ - return cc; -} - -- (void) setBcc: (NSArray *) _bcc -{ - ASSIGN (bcc, _bcc); -} - -- (NSArray *) bcc -{ - return bcc; -} - -- (void) setAddressList: (NSArray *) _addressList -{ - ASSIGN (addressList, _addressList); -} - -- (NSArray *) addressList -{ - return addressList; -} - -- (void) setAddress: (id) _address -{ - ASSIGN (address, _address); -} - -- (id) address -{ - return address; -} - -- (void) setItem: (id) _item -{ - ASSIGN (item, _item); -} - -- (id) item -{ - return item; -} - -- (NSArray *) addressLists -{ - NSMutableArray *ma; - NSArray *tmp; - - ma = [NSMutableArray arrayWithCapacity:3]; - if ([to isNotNull] && [to count] > 0) - [ma addObject: to]; - if ([cc isNotNull]) - [ma addObject: cc]; - if ([bcc isNotNull]) - [ma addObject: bcc]; - - /* ensure that at least one object is available */ - if ([ma count] == 0) - { - tmp = [NSArray arrayWithObject: @""]; - ASSIGN (to, tmp); - [ma addObject: to]; - } - - return ma; -} - -- (NSArray *) headers -{ - return headers; -} - -- (NSString *) currentHeader -{ - if (addressList == to) - return @"to"; - else if (addressList == cc) - return @"cc"; - - return @"bcc"; -} - -/* identifiers */ - -- (NSString *) nextId -{ - currentIndex++; - - return @""; -} - -- (NSString *) currentRowId -{ - [self nextId]; - - return [NSString stringWithFormat: @"row_%d", currentIndex]; -} - -- (NSString *) currentPopUpId -{ - - return [NSString stringWithFormat: @"popup_%d", currentIndex]; -} - -- (NSString *) currentAddressId -{ - return [NSString stringWithFormat: @"addr_%d", currentIndex]; -} - -/* handling requests */ - -- (void) _fillAddresses: (NSMutableArray *) addresses - withObject: (id) object -{ - NSEnumerator *list; - NSString *currentAddress; - - if ([object isKindOfClass: [NSString class]]) - [addresses addObject: object]; - else if ([object isKindOfClass: [NSArray class]]) - { - list = [object objectEnumerator]; - while ((currentAddress - = [[list nextObject] stringByTrimmingSpaces])) - if ([currentAddress length]) - [addresses addObject: currentAddress]; - } -} - -- (void) getAddressesFromFormValues: (NSDictionary *) _dict -{ - NSMutableArray *rawTo, *rawCc, *rawBcc; - NSString *idx, *popupKey, *popupValue; - NSArray *keys; - unsigned i, count; - id addr; - - rawTo = [NSMutableArray arrayWithCapacity:4]; - rawCc = [NSMutableArray arrayWithCapacity:4]; - rawBcc = [NSMutableArray arrayWithCapacity:2]; - - keys = [_dict allKeys]; - count = [keys count]; - for (i = 0; i < count; i++) - { - NSString *key; - - key = [keys objectAtIndex:i]; - if ([key hasPrefix:@"addr_"]) - { - addr = [_dict objectForKey:key]; - idx = [self getIndexFromIdentifier:key]; - popupKey = [NSString stringWithFormat:@"popup_%@", idx]; - popupValue = [[_dict objectForKey:popupKey] lastObject]; - if([popupValue isEqualToString:@"0"]) - [self _fillAddresses: rawTo withObject: addr]; - else if([popupValue isEqualToString:@"1"]) - [self _fillAddresses: rawCc withObject: addr]; - else - [self _fillAddresses: rawBcc withObject: addr]; - } - } - - [self setTo: rawTo]; - [self setCc: rawCc]; - [self setBcc: rawBcc]; -} - -- (NSString *) getIndexFromIdentifier: (NSString *) _identifier -{ - NSRange r; - - r = [_identifier rangeOfString: @"_"]; - - return [_identifier substringFromIndex: NSMaxRange(r)]; -} - -- (void) takeValuesFromRequest: (WORequest *) _rq - inContext: (WOContext *) _ctx -{ - /* OK, we have a special form value processor */ - NSDictionary *d; - - if ((d = [_rq formValues]) == nil) - return; - -#if 0 - [self debugWithFormat:@"Note: will take values ..."]; - NSLog(@"%s formValues: %@", - __PRETTY_FUNCTION__, - d); -#endif - [self getAddressesFromFormValues: d]; -} - -- (int) addressCount -{ - return [to count] + [cc count] + [bcc count]; -} - -@end /* UIxMailToSelection */ diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist index 13584b75bb..9f5c158fe4 100644 --- a/UI/MailerUI/product.plist +++ b/UI/MailerUI/product.plist @@ -1,72 +1,9 @@ { /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ requires = ( MAIN, MainUI, CommonUI, Mailer, MailPartViewers ); - publicResources = ("generic.js", - "UIxAppointmentEditor.js", - "UIxContactEditor.js", - "UIxMailToSelection.js", + publicResources = (); - "lori_32x32.png", - - "tbtv_account_17x17.gif", - "tbtv_drafts_17x17.gif", - "tbtv_inbox_17x17.png", - "tbtv_junction2_17x17.gif", - "tbtv_junction_17x17.gif", - "tbtv_leaf_corner_17x17.png", - "tbtv_line_17x17.gif", - "tbtv_minus_17x17.gif", - "tbtv_plus_17x17.gif", - "tbtv_corner_17x17.gif", - "tbtv_corner_minus_17x17.gif", - "tbtv_corner_plus_17x17.gif", - "tbtv_sent_17x17.gif", - "tbtv_trash_17x17.gif", - - "tbtb_addressbook.png", - "tbtb_compose.png", - "tbtb_delete.png", - "tbtb_deletedoc.png", - "tbtb_filetofolder.png", - "tbtb_forward.png", - "tbtb_getmail.png", - "tbtb_next.png", - "tbtb_previous.png", - "tbtb_print.png", - "tbtb_reply.png", - "tbtb_replyall.png", - "tbtb_search.png", - "tbtb_trash.png", - - "tbtb_compose_addressbook_30x30.png", - "tbtb_compose_attach_30x30.png", - "tbtb_compose_clip_30x30.png", - "tbtb_compose_cut_30x30.png", - "tbtb_compose_dup_30x30.png", - "tbtb_compose_file_30x30.png", - "tbtb_compose_lock_30x30.png", - "tbtb_compose_quote_30x30.png", - "tbtb_compose_send_30x30.png", - "tbtb_compose_spell_30x30.png", - - "message-mail.png", - "message-mail-read.png", - - "dot.png", - "flag.png", - "icon_unread.gif", - - "title_attachment_14x14.png", - "title_config.png", - "title_junk.png", - "title_read_14x14.png", - "title_thread.png", - "title_sortdown_12x12.png", - "title_sortup_12x12.png", - ); - - factories = { - }; + factories = {}; categories = { SOGoMailFolder = { diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist index c06aa1a7b7..0d2f6fdcf5 100644 --- a/UI/MainUI/product.plist +++ b/UI/MainUI/product.plist @@ -218,22 +218,6 @@ }; }; }; - // SOGoGroupsFolder = { - // methods = { - // index = { - // protectedBy = "View"; - // pageName = "SOGoGroupsPage"; - // }; - // }; - // }; - // SOGoGroupFolder = { - // methods = { - // index = { - // protectedBy = "View"; - // pageName = "SOGoGroupPage"; - // }; - // }; - // }; SOGoFreeBusyObject = { methods = { ajaxRead = { diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index fec88da0f8..300d2cd93a 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -17,14 +17,11 @@ SchedulerUI_OBJC_FILES = \ UIxCalendarProperties.m \ UIxCalendarFolderLinksTemplate.m\ \ - UIxCalFilterPanel.m \ UIxCalDayTable.m \ - UIxCalDateSelector.m \ UIxCalUserRightsEditor.m \ UIxCalFolderActions.m \ \ UIxCalView.m \ - UIxCalViewPrint.m \ UIxCalDayView.m \ UIxCalMulticolumnDayView.m \ UIxCalWeekView.m \ @@ -39,24 +36,12 @@ SchedulerUI_OBJC_FILES = \ UIxAppointmentActions.m \ UIxAppointmentEditor.m \ UIxTaskEditor.m \ - UIxDatePicker.m \ - UIxTimeDateControl.m \ - UIxCalMonthOverview.m \ - UIxCalMonthViewOld.m \ UIxRecurrenceEditor.m \ - UIxReminderEditor.m \ - UIxOccurenceDialog.m + UIxReminderEditor.m SchedulerUI_RESOURCE_FILES += \ product.plist -SchedulerUI_RESOURCE_FILES += \ - Toolbars/SOGoAppointmentFolders.toolbar \ - Toolbars/SOGoAppointmentObject.toolbar \ - Toolbars/SOGoTaskObject.toolbar \ - Toolbars/SOGoComponentClose.toolbar \ - Toolbars/SOGoEmpty.toolbar - SchedulerUI_LOCALIZED_RESOURCE_FILES += \ Localizable.strings diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar deleted file mode 100644 index 58bae28ab4..0000000000 --- a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar +++ /dev/null @@ -1,55 +0,0 @@ -( /* the toolbar groups -*-java-*- */ - ( { link = "#"; - isSafe = NO; - label = "New Event"; - onclick = "return newEvent('event');"; - image = "new-event.png"; - tooltip = "Create a new event"; }, - { link = "#"; - label="New Task"; - image = "new-task.png"; - onclick = "return newEvent('task');"; - image = "new-task.png"; - tooltip = "Create a new task"; } ), - ( { link = "#"; - label="Go to Today"; - onclick = "return gotoToday();"; - image = "goto-today.png"; - tooltip = "Go to today"; } ), - ( { link = "#"; - label="Day View"; - onclick = "return onDayOverview();"; - image = "day-view.png"; - tooltip = "Switch to day view"; }, - { link = "#"; - label="Multicolumn Day View"; - onclick = "return onMulticolumnDayOverview();"; - image = "day-view-multicolumn.png"; - tooltip = "Switch to multi-columns day view"; }, - { link = "#"; - label="Week View"; - onclick = "return onWeekOverview();"; - image = "week-view.png"; - tooltip = "Switch to week view"; }, - { link = "#"; - label="Month View"; - onclick = "return onMonthOverview();"; - image = "month-view.png"; - tooltip = "Switch to month view"; } ), - ( { link = "#"; - onclick = "return printView();"; - cssClass = "tbicon_print single-window-not-conditional"; - image = "tb-mail-print-flat-24x24.png"; - label = "Print view"; - tooltip = "Print the current calendar view"; } ), - ( { link = "#"; - label="Delete"; - onclick = "return deleteEvent(this);"; - image = "tb-mail-delete-flat-24x24.png"; - tooltip = "Delete this event or task"; } ), - ( { link = "#"; - label = "Reload"; - onclick = "return onCalendarReload();"; - image = "calendar-reload.png"; - tooltip = "Reload all calendars"; } ) -) diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar deleted file mode 100644 index b7946fbb37..0000000000 --- a/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar +++ /dev/null @@ -1,19 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ - ( { link = "#"; - label = "Save and Close"; - onclick = "return saveEvent();"; - image = "tb-compose-save-flat-24x24.png"; }, - { link = "#"; - label = "Invite Attendees"; - onclick = "return onPopupAttendeesWindow();"; - image = "tb-compose-contacts-flat-24x24.png"; }, - { link = "#"; - hasMenu = YES; - label = "Privacy"; - onclick = "return onSelectClassification(event);"; - image = "tb-compose-security-flat-24x24.png"; }, - { link = "#"; - label = "Attach"; - onclick = "return onPopupAttachWindow();"; - image = "tb-compose-attach-flat-24x24.png"; } ) -) diff --git a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar b/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar deleted file mode 100644 index 571e1f6a09..0000000000 --- a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar +++ /dev/null @@ -1,7 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ - ( { link = "#"; - isSafe = NO; - label = "Close"; - onclick = "window.close(); return false;"; - image = "tb-mail-stop-flat-24x24.png"; } ) -) diff --git a/UI/Scheduler/Toolbars/SOGoEmpty.toolbar b/UI/Scheduler/Toolbars/SOGoEmpty.toolbar deleted file mode 100644 index c97df27ee4..0000000000 --- a/UI/Scheduler/Toolbars/SOGoEmpty.toolbar +++ /dev/null @@ -1,2 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ -) diff --git a/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar b/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar deleted file mode 100644 index 28ea487562..0000000000 --- a/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar +++ /dev/null @@ -1,15 +0,0 @@ -( /* the toolbar groups -*-cperl-*- */ - ( { link = "#"; - label = "Save and Close"; - onclick = "return saveEvent();"; - image = "tb-compose-save-flat-24x24.png"; }, - { link = "#"; - hasMenu = YES; - label = "Privacy"; - onclick = "return onSelectClassification(event);"; - image = "tb-compose-security-flat-24x24.png"; }, - { link = "#"; - label = "Attach"; - onclick = "return onPopupAttachWindow();"; - image = "tb-compose-attach-flat-24x24.png"; } ) -) diff --git a/UI/Scheduler/UIxCalDateSelector.h b/UI/Scheduler/UIxCalDateSelector.h deleted file mode 100644 index 1c304a9dd9..0000000000 --- a/UI/Scheduler/UIxCalDateSelector.h +++ /dev/null @@ -1,47 +0,0 @@ -/* UIxCalDateSelector.h - this file is part of SOGo - * - * Copyright (C) 2006 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef UIXCALDATESELECTOR_H -#define UIXCALDATESELECTOR_H - -#include "UIxCalMonthOverview.h" - -@interface UIxCalDateSelector : UIxCalMonthOverview -{ - NSCalendarDate *selectedDate; - NSString *style; - NSString *headerStyle; - NSString *weekStyle; - NSString *todayWeekStyle; - NSString *dayHeaderStyle; - NSString *dayBodyStyle; - NSString *todayBodyStyle; - NSString *inactiveDayBodyStyle; - NSString *selectedDayExtraStyle; - NSString *daySelectionHref; - NSString *weekSelectionHref; - NSString *monthSelectionHref; -} - -@end - -#endif /* UIXCALDATESELECTOR_H */ diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m deleted file mode 100644 index a9bb518f3e..0000000000 --- a/UI/Scheduler/UIxCalDateSelector.m +++ /dev/null @@ -1,193 +0,0 @@ -/* UIxCalDateSelector.m - this file is part of SOGo - * - * Copyright (C) 2006 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import -#import -#import - -#import "UIxCalDateSelector.h" - -@implementation UIxCalDateSelector - -/* binding accessors */ - -- (void) setSelectedDate: (NSCalendarDate *) _date -{ - ASSIGN (selectedDate, _date); - [selectedDate setTimeZone: timeZone]; -} - -- (NSCalendarDate *) selectedDate -{ - if (!selectedDate) - selectedDate = [super selectedDate]; - - return selectedDate; -} - -- (NSString *) style -{ - return style; -} - -- (NSString *) headerStyle -{ - return headerStyle; -} - -- (NSString *) weekStyle -{ - return weekStyle; -} - -- (void) setTodayWeekStyle: (NSString *) _style -{ - ASSIGN (todayWeekStyle, _style); -} - -- (NSString *) todayWeekStyle -{ - return ((todayWeekStyle) - ? todayWeekStyle - : [self weekStyle]); -} - -- (NSString *) dayHeaderStyle -{ - return dayHeaderStyle; -} - -- (void) setSelectedDayExtraStyle: (NSString *) _style -{ - ASSIGN(selectedDayExtraStyle, _style); -} - -- (NSString *) selectedDayExtraStyle -{ - return selectedDayExtraStyle; -} - -- (NSTimeZone *) viewTimeZone -{ - return timeZone; -} - -/* date ranges */ - -- (NSCalendarDate *) startDate -{ - return [[self selectedDate] firstDayOfMonth]; -} - -- (unsigned int) firstDayOfWeek -{ - SOGoUserDefaults *ud; - - ud = [[context activeUser] userDefaults]; - - return [ud firstDayOfWeek]; -} - -/* labels */ - -- (NSString *) headerMonthValue -{ - NSCalendarDate *date; - - date = [self startDate]; - - return [NSString stringWithFormat: @"%.2d", (int)[date monthOfYear]]; -} - -- (NSString *) headerMonthString -{ - NSCalendarDate *date; - - date = [self startDate]; - - return [NSString stringWithFormat:@"%@", - [self localizedNameForMonthOfYear: [date monthOfYear]]]; -} - -- (NSString *) headerYearString -{ - NSCalendarDate *date; - - date = [self startDate]; - - return [NSString stringWithFormat: @"%d", (int)[date yearOfCommonEra]]; -} - -- (NSString *) localizedDayOfWeekName -{ - return [self localizedAbbreviatedNameForDayOfWeek: [self dayOfWeek]]; -} - -/* stylesheets */ - -- (NSString *) currentWeekStyle -{ - return (([currentWeekStart isDateInSameWeek:[NSCalendarDate date]] && - [currentWeekStart isDateInSameMonth:[self selectedDate]]) - ? [self todayWeekStyle] - : [self weekStyle]); -} - -- (NSString *) contentStyle -{ - return (([currentDay isToday] - && [currentDay isDateInSameMonth:[self selectedDate]]) - ? @"dayOfToday" - : (([currentDay monthOfYear] != [[self startDate] monthOfYear]) - ? @"inactiveDay" - : @"activeDay")); -} - -- (NSString *) extraStyle -{ - NSString *extraStyle; - - if ([[self selectedDate] isDateOnSameDay: currentDay]) - extraStyle = [self selectedDayExtraStyle]; - else - extraStyle = nil; - - return extraStyle; -} - -/* URLs */ - -- (NSDictionary *) currentMonthQueryParameters -{ - return [self queryParametersBySettingSelectedDate: [self startDate]]; -} - -/* overriding */ - -- (NSArray *) fetchCoreInfos -{ - return nil; -} - -@end diff --git a/UI/Scheduler/UIxCalFilterPanel.h b/UI/Scheduler/UIxCalFilterPanel.h deleted file mode 100644 index 537d2e735d..0000000000 --- a/UI/Scheduler/UIxCalFilterPanel.h +++ /dev/null @@ -1,36 +0,0 @@ -/* UIxContactsFilterPanel.h - this file is part of SOGo - * - * Copyright (C) 2006-2018 Inverse inc. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef UIXCONTACTSFILTERPANEL_H -#define UIXCONTACTSFILTERPANEL_H - -#import - -@class NSString; - -@interface UIxCalFilterPanel : UIxComponent -{ - NSString *searchText; - NSString *searchCriteria; -} - -@end - -#endif /* UIXCONTACTSFILTERPANEL_H */ diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m deleted file mode 100644 index 01cef4ecaa..0000000000 --- a/UI/Scheduler/UIxCalFilterPanel.m +++ /dev/null @@ -1,125 +0,0 @@ -/* UIxContactsFilterPanel.m - this file is part of SOGo - * - * Copyright (C) 2006-2018 Inverse inc. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - - -#import -#import - -#import "UIxCalFilterPanel.h" - -static NSArray *filters = nil; - -@implementation UIxCalFilterPanel - -+ (void) initialize -{ - static NSString *quals[] - = {@"view_all", - @"view_today", @"view_next7", @"view_next14", - @"view_next31", @"view_thismonth", @"view_thisyear", @"view_future", - @"view_selectedday" }; - - if (!filters) - { - filters = [NSArray arrayWithObjects: quals count: 8]; - [filters retain]; - } -} - -- (id) init -{ - if ((self = [super init])) - { - searchText = nil; - searchCriteria = nil; - } - - return self; -} - -- (void) dealloc -{ - [searchCriteria release]; - [searchText release]; - [super dealloc]; -} - -/* accessors */ - -- (void) setSearchText: (NSString *)_txt -{ - ASSIGN (searchText, _txt); -} - -- (void) setSearchCriteria: (NSString *)_txt -{ - ASSIGN (searchText, _txt); -} - -- (NSString *) searchText -{ - if (!searchText) - searchText = [[self queryParameterForKey: @"search"] copy]; - - return searchText; -} - -- (NSString *) searchCriteria -{ - if (!searchCriteria) - searchCriteria = [[self queryParameterForKey: @"criteria"] copy]; - - return searchCriteria; -} - -/* filters */ - -- (NSArray *) filters -{ - return filters; -} - -/* qualifiers */ - -- (NSString *) filterLabel -{ - return [self labelForKey: [self valueForKey:@"filter"]]; -} - -- (NSString *) selectedFilter -{ - NSString *selectedFilter; - SOGoUserSettings *us; - - selectedFilter = [self queryParameterForKey: @"filterpopup"]; - if (![selectedFilter length]) - { - us = [[context activeUser] userSettings]; - selectedFilter = [us objectForKey: @"CalendarDefaultFilter"]; - } - if (![selectedFilter length]) - selectedFilter = @"view_today"; - - return selectedFilter; -} - -@end /* UIxCalFilterPanel */ diff --git a/UI/Scheduler/UIxCalMonthOverview.h b/UI/Scheduler/UIxCalMonthOverview.h deleted file mode 100644 index 511d0819fc..0000000000 --- a/UI/Scheduler/UIxCalMonthOverview.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - Copyright (C) 2004 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ -// $Id: UIxCalMonthOverview.h 181 2004-08-11 15:13:25Z helge $ - - -#import "UIxCalMonthViewOld.h" - -@class NSCalendarDate, NSString, NSDictionary, NSArray; - -@interface UIxCalMonthOverview : UIxCalMonthViewOld -{ - int dayIndex; - int dayOfWeek; - int weekOfYear; - NSCalendarDate *currentWeekStart; -} - -- (void)setDayIndex:(int)_idx; -- (int)dayIndex; -- (void)setDayOfWeek:(int)_day; -- (int)dayOfWeek; - -- (void)setCurrentWeekStartDate:(NSCalendarDate *)_date; -- (NSCalendarDate *)currentWeekStartDate; -- (void)setWeekOfYear:(int)_week; -- (int)weekOfYear; -- (int)year; -- (int)month; -- (NSString *)localizedDayOfWeekName; -- (NSDictionary *)currentWeekQueryParameters; - -/* style sheet */ - -- (NSString *)weekStyle; -- (NSString *)contentStyle; - -/* appointments */ - -// - (NSArray *)appointments; - -@end - diff --git a/UI/Scheduler/UIxCalMonthOverview.m b/UI/Scheduler/UIxCalMonthOverview.m deleted file mode 100644 index 3c7adf4ac3..0000000000 --- a/UI/Scheduler/UIxCalMonthOverview.m +++ /dev/null @@ -1,104 +0,0 @@ - -#import - -#import - -#import "UIxCalMonthOverview.h" - -@implementation UIxCalMonthOverview - -- (void)dealloc { - [currentWeekStart release]; - [super dealloc]; -} - -- (void)configureFormatters { - [super configureFormatters]; - - [aptFormatter setShortTitleOnly]; - [privateAptFormatter setPrivateTitleOnly]; -} - -- (void)setDayIndex:(int)_idx { - dayIndex = _idx; -} - -- (int)dayIndex { - return dayIndex; -} - -- (void)setDayOfWeek:(int)_day { - dayOfWeek = _day; -} - -- (int)dayOfWeek { - return dayOfWeek; -} - -- (void)setCurrentWeekStartDate:(NSCalendarDate *)_date { - ASSIGN(currentWeekStart, _date); -} - -- (NSCalendarDate *)currentWeekStartDate { - return currentWeekStart; -} - -- (void)setWeekOfYear:(int)_week { - NSCalendarDate *date; - - weekOfYear = _week; - if(_week == 52 || _week == 53) - date = [[self startOfMonth] mondayOfWeek]; - else - date = [self startOfMonth]; - date = [date mondayOfWeek:_week]; - [self setCurrentWeekStartDate:date]; -} - -- (int)weekOfYear { - return weekOfYear; -} - -- (int)year { - return [[self startOfMonth] yearOfCommonEra]; -} - -- (int)month { - return [[self startOfMonth] monthOfYear]; -} - -- (NSString *)localizedDayOfWeekName { - return [self localizedNameForDayOfWeek:dayOfWeek]; -} - -- (NSDictionary *)currentWeekQueryParameters { - return [self queryParametersBySettingSelectedDate:currentWeekStart]; -} - - -/* style sheet */ - - -- (NSString *)weekStyle { - if([currentWeekStart isDateInSameWeek:[NSCalendarDate date]]) - return @"monthoverview_week_hilite"; - return @"monthoverview_week"; -} - -- (NSString *)contentStyle { - if([currentDay isToday]) - return @"monthoverview_content_hilite"; - else if([currentDay monthOfYear] != [[self startOfMonth] monthOfYear]) - return @"monthoverview_content_dimmed"; - return @"monthoverview_content"; -} - - -/* appointments */ - - -// - (NSArray *)appointments { -// return [self fetchCoreAppointmentsInfos]; -// } - -@end /* UIxCalMonthOverview */ diff --git a/UI/Scheduler/UIxCalMonthViewOld.h b/UI/Scheduler/UIxCalMonthViewOld.h deleted file mode 100644 index 85db06daca..0000000000 --- a/UI/Scheduler/UIxCalMonthViewOld.h +++ /dev/null @@ -1,23 +0,0 @@ -// $Id: UIxCalMonthView.h 163 2004-08-02 12:59:28Z znek $ - -#ifndef __SOGo_UIxCalMonthViewOld_H__ -#define __SOGo_UIxCalMonthViewOld_H__ - -#include "UIxCalView.h" - -/* - UIxCalMonthView - - Abstract superclass for views which display months. -*/ - -@interface UIxCalMonthViewOld : UIxCalView - -- (NSCalendarDate *) startOfMonth; - -- (NSDictionary *) prevMonthQueryParameters; -- (NSDictionary *) nextMonthQueryParameters; - -@end - -#endif /* __SOGo_UIxCalMonthViewOld_H__ */ diff --git a/UI/Scheduler/UIxCalMonthViewOld.m b/UI/Scheduler/UIxCalMonthViewOld.m deleted file mode 100644 index 058a61f556..0000000000 --- a/UI/Scheduler/UIxCalMonthViewOld.m +++ /dev/null @@ -1,39 +0,0 @@ -#import - -#import - -#import "UIxCalMonthViewOld.h" - -@implementation UIxCalMonthViewOld - -- (NSCalendarDate *) startOfMonth -{ - return [[[super startDate] firstDayOfMonth] beginOfDay]; -} - -- (NSCalendarDate *) startDate -{ - return [[self startOfMonth] mondayOfWeek]; -} - -/* URLs */ - -- (NSDictionary *) prevMonthQueryParameters -{ - NSCalendarDate *date; - - date = [[self startOfMonth] dateByAddingYears:0 months:-1 days:0 - hours:0 minutes:0 seconds:0]; - return [self queryParametersBySettingSelectedDate:date]; -} - -- (NSDictionary *)nextMonthQueryParameters -{ - NSCalendarDate *date; - - date = [[self startOfMonth] dateByAddingYears:0 months:1 days:0 - hours:0 minutes:0 seconds:0]; - return [self queryParametersBySettingSelectedDate:date]; -} - -@end /* UIxCalMonthView */ diff --git a/UI/Scheduler/UIxCalViewPrint.h b/UI/Scheduler/UIxCalViewPrint.h deleted file mode 100644 index dd3326bec7..0000000000 --- a/UI/Scheduler/UIxCalViewPrint.h +++ /dev/null @@ -1,31 +0,0 @@ -/* UIxCalViewPrint.h - this file is part of SOGo - * - * Copyright (C) 2006-2014 Inverse inc. - * - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -@interface UIxCalViewPrint : UIxCalendarSelector -{ - id item; - SOGoUserSettings *us; -} - -@end - diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m deleted file mode 100644 index be59cce33c..0000000000 --- a/UI/Scheduler/UIxCalViewPrint.m +++ /dev/null @@ -1,99 +0,0 @@ -/* UIxCalViewPrint.m - this file is part of SOGo - * - * Copyright (C) 2006-2014 Inverse inc. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#import -#import - -#import - -static NSArray *layoutItems = nil; - -@implementation UIxCalViewPrint - -+ (void) initialize -{ - if (!layoutItems) - { - layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Multi-Columns", @"Weekly", nil]; - [layoutItems retain]; - } -} - -- (id) init -{ - item = nil; - - return self; -} - -- (void) dealloc -{ - [item release]; - [super dealloc]; -} - -- (void) setItem: (NSString *) newItem -{ - ASSIGN(item, newItem); -} - -- (NSString *) item -{ - return item; -} - -- (NSArray *) printLayoutList -{ - return layoutItems; -} - -- (NSString *) itemPrintLayoutText -{ - return [self labelForKey: [NSString stringWithFormat: @"%@", item]]; -} - -// -// The objective here is to return the parent view layout and select the print -// layout corresponding. Default print view: list view -// -- (NSString *) parentPrintLayout -{ - SOGoUser *activeUser; - NSString *parentView; - - activeUser = [[self context] activeUser]; - us = [activeUser userSettings]; - parentView = [[us objectForKey:@"Calendar"] objectForKey:@"View" ]; - - if ([parentView isEqualToString:@"dayview"]) - return @"Daily"; - - else if ([parentView isEqualToString:@"weekview"]) - return @"Weekly"; - - else if ([parentView isEqualToString:@"multicolumndayview"]) - return @"Multi-Columns"; - - else - return @"LIST"; -} - -@end diff --git a/UI/Scheduler/UIxDatePicker.h b/UI/Scheduler/UIxDatePicker.h deleted file mode 100644 index e6573ea585..0000000000 --- a/UI/Scheduler/UIxDatePicker.h +++ /dev/null @@ -1,43 +0,0 @@ -/* UIxDatePicker.h - this file is part of SOGo - * - * Copyright (C) 2009-2014 Inverse inc. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef UIXDATEPICKER_H -#define UIXDATEPICKER_H - - -@class NSString; - -@interface UIxDatePicker : WOComponent -{ - NSString *dateID; - id day; - id month; - id year; - NSString *label; - BOOL isDisabled; -} - -- (NSString *) dateID; -- (NSString *) dateFormat; -- (NSString *) jsDateFormat; -- (BOOL) useISOFormats; -@end - -#endif /* UIXDATEPICKER_H */ diff --git a/UI/Scheduler/UIxDatePicker.m b/UI/Scheduler/UIxDatePicker.m deleted file mode 100644 index 9217368141..0000000000 --- a/UI/Scheduler/UIxDatePicker.m +++ /dev/null @@ -1,224 +0,0 @@ -/* UIxDatePicker.h - this file is part of SOGo - * - * Copyright (C) 2009-2014 Inverse inc. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import -#import -#import - -#import -#import -#import - -#import -#import - -#import "UIxDatePicker.h" - -@implementation UIxDatePicker - -- (id) init -{ - if ((self = [super init])) - { - dateID = nil; - day = nil; - year = nil; - label = nil; - isDisabled = NO; - } - - return self; -} - -- (void) dealloc -{ - [self->dateID release]; - [self->day release]; - [self->month release]; - [self->year release]; - [self->label release]; - [super dealloc]; -} - -/* Accessors */ - -- (void) setDateID: (NSString *) _dateID -{ - ASSIGNCOPY(self->dateID, _dateID); -} -- (NSString *) dateID -{ - return self->dateID; -} - -- (void) setDay: (id) _day -{ - ASSIGN(self->day, _day); -} -- (id) day -{ - return self->day; -} - -- (void) setMonth: (id) _month -{ - ASSIGN(self->month, _month); -} -- (id) month -{ - return self->month; -} - -- (void) setYear: (id) _year -{ - ASSIGN(self->year, _year); -} -- (id) year -{ - return self->year; -} - -- (void) setLabel: (NSString *) _label -{ - ASSIGNCOPY(self->label, _label); -} -- (NSString *) label -{ - return self->label; -} - - -/* formats */ - -- (BOOL) useISOFormats -{ - NSNumber *useISOFormats; - WOContext *ctx; - - ctx = [self context]; - useISOFormats = [ctx valueForKey:@"useISOFormats"]; - if (!useISOFormats) - { - NSArray *languages; - - languages = [ctx resourceLookupLanguages]; - if (languages && [languages count] > 0) - { - if ([[languages objectAtIndex:0] isEqualToString:@"French"]) - { - useISOFormats = [NSNumber numberWithBool:NO]; - } - } - if (!useISOFormats) - useISOFormats = [NSNumber numberWithBool: YES]; - - [ctx takeValue: useISOFormats forKey:@"useISOFormats"]; - } - - return [useISOFormats boolValue]; -} - -- (NSString *) formattedDateString -{ - char buf[22]; - - if ([self useISOFormats]) - { - sprintf(buf, "%04d-%02d-%02d", - [[self year] intValue], - [[self month] intValue], - [[self day] intValue]); - } - else - { - sprintf(buf, "%02d/%02d/%04d", - [[self day] intValue], - [[self month] intValue], - [[self year] intValue]); - } - return [NSString stringWithCString:buf]; -} - -- (NSString *) dateFormat -{ - return [self useISOFormats] ? @"%Y-%m-%d" : @"%d/%m/%Y"; -} - -- (NSString *) jsDateFormat -{ - return [self useISOFormats] ? @"yyyy-mm-dd" : @"dd/mm/yyyy"; -} - -- (void) takeValuesFromRequest: (WORequest *) _rq - inContext: (WOContext *) _ctx -{ - NSInteger dateTZOffset, userTZOffset; - NSTimeZone *systemTZ, *userTZ; - SOGoUserDefaults *ud; - NSString *dateString; - NSCalendarDate *d; - - dateString = [_rq formValueForKey:[self dateID]]; - - if (dateString == nil) - { - [self debugWithFormat:@"got no date string!"]; - return; - } - - d = [NSCalendarDate dateWithString: dateString - calendarFormat: [self dateFormat]]; - if (!d) - { - [self warnWithFormat: @"Could not parse dateString: '%@'", - dateString]; - } - - /* we must adjust the date timezone because "dateWithString:..." uses the - system timezone, which can be different from the user's. */ - ud = [[_ctx activeUser] userDefaults]; - systemTZ = [d timeZone]; - dateTZOffset = [systemTZ secondsFromGMTForDate: d]; - userTZ = [ud timeZone]; - userTZOffset = [userTZ secondsFromGMTForDate: d]; - if (dateTZOffset != userTZOffset) - d = [d dateByAddingYears: 0 months: 0 days: 0 - hours: 0 minutes: 0 - seconds: (dateTZOffset - userTZOffset)]; - [d setTimeZone: userTZ]; - - [self setDay: [NSNumber numberWithInt:[d dayOfMonth]]]; - [self setMonth: [NSNumber numberWithInt:[d monthOfYear]]]; - [self setYear: [NSNumber numberWithInt:[d yearOfCommonEra]]]; - - [super takeValuesFromRequest: _rq inContext: _ctx]; -} - -- (void) setDisabled: (BOOL) disabled -{ - isDisabled = disabled; -} - -- (BOOL) disabled -{ - return isDisabled; -} - -@end /* UIxDatePicker */ diff --git a/UI/Scheduler/UIxOccurenceDialog.h b/UI/Scheduler/UIxOccurenceDialog.h deleted file mode 100644 index dec43087b5..0000000000 --- a/UI/Scheduler/UIxOccurenceDialog.h +++ /dev/null @@ -1,45 +0,0 @@ -/* UIxOccurenceDialog.h - this file is part of SOGo - * - * Copyright (C) 2008 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef UIXRECURRENCEEDITOR_H -#define UIXRECURRENCEEDITOR_H - - -@class NSString; - -@interface UIxOccurenceDialog : UIxComponent -{ - NSString *action; -} - -- (NSString *) action; - -- (NSString *) calendarFolder; -- (NSString *) componentName; -- (NSString *) recurrenceName; - -- (id ) defaultAction; -- (id ) confirmDeletionAction; - -@end - -#endif /* UIXRECURRENCEEDITOR_H */ diff --git a/UI/Scheduler/UIxOccurenceDialog.m b/UI/Scheduler/UIxOccurenceDialog.m deleted file mode 100644 index 1935c9180d..0000000000 --- a/UI/Scheduler/UIxOccurenceDialog.m +++ /dev/null @@ -1,106 +0,0 @@ -/* UIxOccurenceDialog.m - this file is part of SOGo - * - * Copyright (C) 2008-2014 Inverse inc. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#import - -#import - -#import "UIxOccurenceDialog.h" - -@implementation UIxOccurenceDialog - -- (id) init -{ - if ((self = [super init])) - action = nil; - - return self; -} - -- (void) dealloc -{ - [action release]; - [super dealloc]; -} - -- (NSString *) action -{ - return action; -} - -- (NSString *) calendarFolder -{ - SOGoCalendarComponent *component; - - component = [[self clientObject] container]; - - return [[component container] nameInContainer]; -} - -- (NSString *) componentName -{ - SOGoCalendarComponent *component; - - component = [[self clientObject] container]; - - return [component nameInContainer]; -} - -- (NSString *) recurrenceName -{ - return [[self clientObject] nameInContainer]; -} - -- (id ) defaultAction -{ - ASSIGN (action, @"edit"); - - return self; -} - -- (id ) confirmDeletionAction -{ - ASSIGN (action, @"delete"); - - return self; -} - -- (id ) confirmAdjustmentAction -{ - ASSIGN (action, @"adjust"); - - return self; -} - -- (WOResponse *) deleteAction -{ - SOGoCalendarComponent *component; - WOResponse *response; - - component = [self clientObject]; - response = (WOResponse *) [component prepareDelete]; - if (!response) - response = [self responseWithStatus: 204]; - - return response; -} - -@end diff --git a/UI/Scheduler/UIxTimeDateControl.h b/UI/Scheduler/UIxTimeDateControl.h deleted file mode 100644 index 8314fd2465..0000000000 --- a/UI/Scheduler/UIxTimeDateControl.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - Copyright (C) 2004 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#ifndef UIXTIMEDATECONTROL_H -#define UIXTIMEDATECONTROL_H - -#import - -@class NSString; -@class NSCalendarDate; -@class NSNumber; - -@interface UIxTimeDateControl : UIxComponent -{ - NSString *controlID; - NSString *label; - NSCalendarDate *date; - NSString *time; - id day; - id month; - id year; - BOOL displayTimeControl; - BOOL isDisabled; -} - -- (void)setControlID:(NSString *)_controlID; -- (NSString *)controlID; -- (void)setLabel:(NSString *)_label; -- (NSString *)label; -- (void)setDate:(NSCalendarDate *)_date; -- (NSCalendarDate *)date; -- (void)setTime:(NSString *)_time; -- (NSString *)time; - -- (void)setDay:(id)_day; -- (id)day; -- (void)setMonth:(id)_month; -- (id)month; -- (void)setYear:(id)_year; -- (id)year; - -- (NSString *)timeID; -- (NSString *)dateID; - -- (void)_setDate:(NSCalendarDate *)_date; - -@end - -#endif /* UIXTIMEDATECONTROL_H */ diff --git a/UI/Scheduler/UIxTimeDateControl.m b/UI/Scheduler/UIxTimeDateControl.m deleted file mode 100644 index d7024ee497..0000000000 --- a/UI/Scheduler/UIxTimeDateControl.m +++ /dev/null @@ -1,205 +0,0 @@ -/* - Copyright (C) 2004 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import - -#import -#import -#import -#import - -#import "UIxTimeDateControl.h" - -@implementation UIxTimeDateControl - -- (id)init { - self = [super init]; - if (self) { - displayTimeControl = YES; - isDisabled = NO; - } - return self; -} - -- (void)dealloc { - [controlID release]; - [label release]; - [date release]; - [time release]; - [day release]; - [month release]; - [year release]; - [super dealloc]; -} - -/* accessors */ - -- (void)setControlID:(NSString *)_controlID -{ - ASSIGNCOPY(controlID, _controlID); -} - -- (NSString *)controlID -{ - return controlID; -} - -- (void)setLabel:(NSString *)_label -{ - ASSIGNCOPY(label, _label); -} -- (NSString *)label -{ - return label; -} - -- (void) setDate: (NSCalendarDate *) _date -{ - SOGoUserDefaults *ud; - - if (!_date) - _date = [NSCalendarDate date]; - - ud = [[context activeUser] userDefaults]; - [_date setTimeZone: [ud timeZone]]; - - [self _setDate: _date]; - [self setTime: [_date descriptionWithCalendarFormat: @"%H:%M"]]; - - [self setYear: [NSNumber numberWithInt: [_date yearOfCommonEra]]]; - [self setMonth: [NSNumber numberWithInt: [_date monthOfYear]]]; - [self setDay: [NSNumber numberWithInt: [_date dayOfMonth]]]; -} - -- (void)_setDate:(NSCalendarDate *)_date -{ - ASSIGN(date, _date); -} - -- (NSCalendarDate *)date -{ - return date; -} - -- (void) setTime: (NSString *)_time -{ - ASSIGN(time, _time); -} - -- (NSString *) time -{ - return time; -} - -- (void)setDay:(id)_day -{ - ASSIGN(day, _day); -} - -- (id)day -{ - return day; -} - -- (void)setMonth:(id)_month -{ - ASSIGN(month, _month); -} - -- (id)month -{ - return month; -} - -- (void)setYear:(id)_year -{ - ASSIGN(year, _year); -} - -- (id)year -{ - return year; -} - -- (NSString *) timeID -{ - return [[self controlID] stringByAppendingString:@"_time"]; -} - -- (NSString *) dateID -{ - return [[self controlID] stringByAppendingString:@"_date"]; -} - -- (void) setDisplayTimeControl: (BOOL) _displayTimeControl -{ - displayTimeControl = _displayTimeControl; -} - -- (BOOL) displayTimeControl -{ - return displayTimeControl; -} - -/* processing request */ - -- (void) takeValuesFromRequest: (WORequest *) _rq - inContext: (WOContext *) _ctx -{ - NSCalendarDate *d; - unsigned _year, _month, _day, _hour, _minute;//, _second; - SOGoUserDefaults *ud; - NSArray *_time; - - /* call super, so that the form values are applied on the popups */ - [super takeValuesFromRequest:_rq inContext:_ctx]; - - _year = [[self year] intValue]; - if (_year > 0) - { - [self setTime: [_rq formValueForKey: [self timeID]]]; - - _month = [[self month] intValue]; - _day = [[self day] intValue]; - _time = [[self time] componentsSeparatedByString: @":"]; - _hour = [[_time objectAtIndex: 0] intValue]; - _minute = [[_time objectAtIndex: 1] intValue]; -// _second = [[self second] intValue]; - - ud = [[context activeUser] userDefaults]; - d = [NSCalendarDate dateWithYear: _year month: _month day: _day - hour: _hour minute: _minute second: 0 - timeZone: [ud timeZone]]; - [self _setDate: d]; - } -} - -- (void) setDisabled: (BOOL) disabled -{ - isDisabled = disabled; -} - -- (BOOL) disabled -{ - return isDisabled; -} - -@end /* UIxTimeDateControl */ diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist index 9212e850fd..5c6103724a 100644 --- a/UI/Scheduler/product.plist +++ b/UI/Scheduler/product.plist @@ -1,31 +1,9 @@ { /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ requires = ( MAIN, MainUI, CommonUI, Appointments, Contacts, ContactsUI ); - publicResources = ( - previous_week.gif, - next_week.gif, - icon_view_overview.gif, - icon_view_overview_inactive.gif, - icon_view_chart.gif, - icon_view_chart_inactive.gif, - icon_view_list.gif, - icon_view_list_inactive.gif, - icon_view_columns.gif, - icon_view_columns_inactive.gif, - icon_popupcalendar.gif, - first.gif, - previous.gif, - next.gif, - last.gif, - skycalendar.html, - skycalendar.js, - green_corner.gif, - invisible_space_2.gif, - cycles.plist, - ); + publicResources = (); - factories = { - }; + factories = {}; categories = { SOGoAppointmentFolders = { @@ -70,10 +48,6 @@ pageName = "UIxCalMainView"; actionName = "saveFoldersOrder"; }; - dateselector = { - protectedBy = "View"; - pageName = "UIxCalDateSelector"; - }; calendarslist = { protectedBy = "View"; pageName = "UIxCalendarSelector"; @@ -318,25 +292,6 @@ }; }; - SOGoComponentOccurence = { - methods = { - confirmEditing = { - protectedBy = "ViewAllComponent"; - pageName = "UIxOccurenceDialog"; - }; - confirmAdjustment = { - protectedBy = "ViewAllComponent"; - pageName = "UIxOccurenceDialog"; - actionName = "confirmAdjustment"; - }; - confirmDeletion = { - protectedBy = "Delete Object"; - pageName = "UIxOccurenceDialog"; - actionName = "confirmDeletion"; - }; - }; - }; - SOGoAppointmentOccurence = { slots = { toolbar = { diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox deleted file mode 100644 index b3b134750d..0000000000 --- a/UI/Templates/ContactsUI/UIxContactEditor.wox +++ /dev/null @@ -1,11 +0,0 @@ - - - - -
foo
- - diff --git a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox deleted file mode 100644 index c58f554c88..0000000000 --- a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox +++ /dev/null @@ -1,24 +0,0 @@ - - -
- - - - - -
- diff --git a/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox b/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox deleted file mode 100644 index ab7b868839..0000000000 --- a/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox +++ /dev/null @@ -1,18 +0,0 @@ - - - -
-

- -
- -
-

- diff --git a/UI/Templates/ContactsUI/UIxListEditor.wox b/UI/Templates/ContactsUI/UIxListEditor.wox deleted file mode 100644 index 7f30d24cdd..0000000000 --- a/UI/Templates/ContactsUI/UIxListEditor.wox +++ /dev/null @@ -1,83 +0,0 @@ - - - -
-
    -
    -
    -
    - - - - - - - -
    - - - -
    -
    - - - - - - - - - - - - -
    - -
    - - -
    -
    -
    -
    - - - - - - -
    -
    -
    - - -
    -     diff --git a/UI/Templates/MailerUI/UIxMailFilterPanel.wox b/UI/Templates/MailerUI/UIxMailFilterPanel.wox deleted file mode 100644 index 3eaac32e11..0000000000 --- a/UI/Templates/MailerUI/UIxMailFilterPanel.wox +++ /dev/null @@ -1,30 +0,0 @@ - - -
    - - - - - - -
    -     diff --git a/UI/Templates/MailerUI/UIxMailSearch.wox b/UI/Templates/MailerUI/UIxMailSearch.wox deleted file mode 100644 index c111d2f7ef..0000000000 --- a/UI/Templates/MailerUI/UIxMailSearch.wox +++ /dev/null @@ -1,94 +0,0 @@ - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - -
    -
    - -
    -
    -
    - - - - -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - -
    -
    -
    - - - - -
    -
    -
    -
    diff --git a/UI/Templates/MailerUI/UIxMailToSelection.wox b/UI/Templates/MailerUI/UIxMailToSelection.wox deleted file mode 100644 index c3b3b3b4d3..0000000000 --- a/UI/Templates/MailerUI/UIxMailToSelection.wox +++ /dev/null @@ -1,61 +0,0 @@ - - - - -
    - - - - - - - - - - - - - -
    - - - -
    - - - -
    -
    - -     - diff --git a/UI/Templates/MainUI/SOGoGroupPage.wox b/UI/Templates/MainUI/SOGoGroupPage.wox deleted file mode 100644 index 3a8d736580..0000000000 --- a/UI/Templates/MainUI/SOGoGroupPage.wox +++ /dev/null @@ -1,27 +0,0 @@ - - -

    - OpenGroupware.org: - -

    - -

    Actions

    - - -

    Group Members

    -
      - -
      • -       -
    - -     diff --git a/UI/Templates/MainUI/SOGoGroupsPage.wox b/UI/Templates/MainUI/SOGoGroupsPage.wox deleted file mode 100644 index 5b10210030..0000000000 --- a/UI/Templates/MainUI/SOGoGroupsPage.wox +++ /dev/null @@ -1,18 +0,0 @@ - - -

    - OpenGroupware.org: - -

    - -

    - This is an (intentionally) empty page, go back. -

    -     diff --git a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox deleted file mode 100644 index 9a4ff7ea3c..0000000000 --- a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox +++ /dev/null @@ -1,44 +0,0 @@ - -
    -
    - - - -
    - - - - -
    diff --git a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox deleted file mode 100644 index f00be3221e..0000000000 --- a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox +++ /dev/null @@ -1,32 +0,0 @@ - - - -
    - - - - - - - - -
    -     diff --git a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox deleted file mode 100644 index a289bf06df..0000000000 --- a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox +++ /dev/null @@ -1,132 +0,0 @@ - - - - -
    - - - - - - - - - - - -
    - -
    - -
    - - - - - - - -
    - - - -
    - - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - - -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - -
    -
    -     diff --git a/UI/Templates/SchedulerUI/UIxColorPicker.wox b/UI/Templates/SchedulerUI/UIxColorPicker.wox deleted file mode 100644 index 6687b7cbe2..0000000000 --- a/UI/Templates/SchedulerUI/UIxColorPicker.wox +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/UI/Templates/SchedulerUI/UIxDatePicker.wox b/UI/Templates/SchedulerUI/UIxDatePicker.wox deleted file mode 100644 index 6bc7e1a6f6..0000000000 --- a/UI/Templates/SchedulerUI/UIxDatePicker.wox +++ /dev/null @@ -1,25 +0,0 @@ - - - diff --git a/UI/Templates/SchedulerUI/UIxFilterList.wox b/UI/Templates/SchedulerUI/UIxFilterList.wox deleted file mode 100644 index 3bbdc1494b..0000000000 --- a/UI/Templates/SchedulerUI/UIxFilterList.wox +++ /dev/null @@ -1,50 +0,0 @@ - - - -
    - Server Side Filter Scripts -
    - -
    -
    - - - - - - - - - - - - - - - -
    - - - Filters -
    - - -
    - - - -
    - -
    -
    - -     diff --git a/UI/Templates/SchedulerUI/UIxFreeBusyUserSelector.wox b/UI/Templates/SchedulerUI/UIxFreeBusyUserSelector.wox deleted file mode 100644 index cff7611f6a..0000000000 --- a/UI/Templates/SchedulerUI/UIxFreeBusyUserSelector.wox +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/UI/Templates/SchedulerUI/UIxOccurenceDialog.wox b/UI/Templates/SchedulerUI/UIxOccurenceDialog.wox deleted file mode 100644 index b86f4bd9ea..0000000000 --- a/UI/Templates/SchedulerUI/UIxOccurenceDialog.wox +++ /dev/null @@ -1,35 +0,0 @@ - - - - -
    - -
    -
    -
    - - -
    -
    - - - - -
    -
    -     diff --git a/UI/Templates/SchedulerUI/UIxSortButton.wox b/UI/Templates/SchedulerUI/UIxSortButton.wox deleted file mode 100644 index c4c1339a2e..0000000000 --- a/UI/Templates/SchedulerUI/UIxSortButton.wox +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/UI/Templates/SchedulerUI/UIxTimeDateControl.wox b/UI/Templates/SchedulerUI/UIxTimeDateControl.wox deleted file mode 100644 index 8eaa44c1ae..0000000000 --- a/UI/Templates/SchedulerUI/UIxTimeDateControl.wox +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - -