amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-18 19:48:53 +00:00
Code Issues Projects Releases Wiki Activity

merge of '875a3fc15e011173c22d5a90e998d65087950ddc'

Browse Source 
and 'd6d341b84cbf1c54684b2a4f7b962733b4c3fe07'

Monotone-Parent: 875a3fc15e011173c22d5a90e998d65087950ddc
Monotone-Parent: d6d341b84cbf1c54684b2a4f7b962733b4c3fe07
Monotone-Revision: 4d2a9c69a460efd87841ca2c5b2669f38b77bec2

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-07-13T15:22:08
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-07-13 15:22:08 +00:00
parent 63091606c3 5a46d4fb9f
commit 6984e4afaf
21 changed files with 95 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -13,6 +13,7 @@
whenever they were set once;
- imap folders with non-ascii characters are now correctly accessed;
- display the quotas of the selected mailbox on servers that support quotas;
- a bug in the folder acl description was preventing from accessing resources in dav;
Local variables:
mode: text

23
SoObjects/SOGo/SOGoFolder.m
View File

@@ -261,9 +261,11 @@ static NSString *defaultUserID = @"<default>";
if ([self respondsToSelector: @selector (groupDavResourceType)])
{
groupDavCollection = [NSArray arrayWithObjects: [self groupDavResourceType],
XMLNS_GROUPDAV, nil];
rType = [NSArray arrayWithObjects: @"collection", groupDavCollection, nil];
groupDavCollection
= [NSArray arrayWithObjects: [self groupDavResourceType],
XMLNS_GROUPDAV, nil];
rType = [NSArray arrayWithObjects: @"collection", groupDavCollection,
nil];
}
else
rType = [NSArray arrayWithObject: @"collection"];
@@ -296,8 +298,8 @@ static NSString *defaultUserID = @"<default>";
name = [names objectAtIndex: i];
r = [name rangeOfString: @"."];
if (r.length == 0)
name = [[name stringByAppendingString:@"."] stringByAppendingString: ext];
[ma addObject:name];
name = [NSMutableString stringWithFormat: @"%@.%@", name, ext];
[ma addObject: name];
}
names = ma;
@@ -530,19 +532,24 @@ static NSString *defaultUserID = @"<default>";
/* folder type */
- (NSString *)outlookFolderClass {
- (NSString *) outlookFolderClass
{
[self subclassResponsibility: _cmd];
return nil;
}
/* description */
- (void)appendAttributesToDescription:(NSMutableString *)_ms {
- (void) appendAttributesToDescription: (NSMutableString *) _ms
{
[super appendAttributesToDescription:_ms];
[_ms appendFormat:@" ocs=%@", [self ocsPath]];
}
- (NSString *)loggingPrefix {
- (NSString *) loggingPrefix
{
return [NSString stringWithFormat:@"<0x%08X[%@]:%@>",
self, NSStringFromClass([self class]),
[self nameInContainer]];

8
UI/MailerUI/UIxMailListView.h
View File

@@ -29,10 +29,10 @@
@interface UIxMailListView : UIxComponent
{
NSArray *sortedUIDs; /* we always need to retrieve all anyway! */
NSArray *messages;
unsigned firstMessageNumber;
id message;
NSArray *sortedUIDs; /* we always need to retrieve all anyway! */
NSArray *messages;
unsigned firstMessageNumber;
id message;
EOQualifier *qualifier;
SOGoDateFormatter *dateFormatter;
NSTimeZone *userTimeZone;

2
UI/MailerUI/UIxMailListView.m
View File

@@ -92,7 +92,7 @@ static int attachmentFlagSize = 8096;
{
NSCalendarDate *messageDate;
messageDate = [[message objectForKey: @"envelope"] date];
messageDate = [[message valueForKey: @"envelope"] date];
[messageDate setTimeZone: userTimeZone];
return [dateFormatter formattedDateAndTime: messageDate];

2
UI/MailerUI/common.h
View File

@@ -32,5 +32,3 @@
#include <NGExtensions/NGExtensions.h>
#include <NGObjWeb/NGObjWeb.h>
#include <NGObjWeb/SoObjects.h>
#warning importing common.h is baaad

4
UI/MailerUI/product.plist
View File

@@ -348,8 +348,8 @@ categories = {
};
methods = {
view = { /* somewhat hackish */
protectedBy = "View";
pageName = "UIxMailEditor";
protectedBy = "View";
pageName = "UIxMailView";
};
edit = {
protectedBy = "View";

2
UI/MainUI/product.plist
View File

@@ -41,7 +41,7 @@
protectedBy = "Access Object";
defaultRoles = {
"Change Images And Files" = ( "Owner", "ObjectEditor" );
"WebDAV Access" = ( "Owner", "ObjectViewer" );
"WebDAV Access" = ( "Owner", "AuthorizedSubscriber" );
"Access Object" = ( "Owner", "ObjectViewer" );
"Access Contents Information" = ( "Owner", "ObjectViewer" );
};

6
UI/Scheduler/GNUmakefile
View File

@@ -25,7 +25,6 @@ SchedulerUI_OBJC_FILES = \
UIxCalMulticolumnDayView.m \
UIxCalWeekView.m \
UIxCalMonthView.m \
UIxCalMonthViewOld.m \
UIxAptTableView.m \
\
UIxCalListingActions.m \
@@ -40,8 +39,9 @@ SchedulerUI_OBJC_FILES = \
UIxCalDateLabel.m \
UIxDatePicker.m \
UIxTimeDateControl.m \
UIxCalParticipationStatusView.m \
UIxCalMonthOverview.m
UIxCalParticipationStatusView.m \
UIxCalMonthOverview.m \
UIxCalMonthViewOld.m
SchedulerUI_RESOURCE_FILES += \
Version \

6
UI/Scheduler/SchedulerUIProduct.m
View File

@@ -18,17 +18,11 @@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: SchedulerUIProduct.m 904 2005-07-22 15:00:36Z helge $
#import <Foundation/NSObject.h>
@interface SchedulerUIProduct : NSObject
{
}
@end
#include "common.h"
@implementation SchedulerUIProduct
@end /* SchedulerUIProduct */

19
UI/Scheduler/UIxAppointmentProposal.m
View File

@@ -18,9 +18,18 @@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
#include <SOGoUI/UIxComponent.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSNull.h>
#import <Foundation/NSValue.h>
#import <NGExtensions/NGCalendarDateRange.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <NGCards/iCalPerson.h>
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
#import <SoObjects/Appointments/SOGoFreeBusyObject.h>
#import <SOGoUI/UIxComponent.h>
@interface UIxAppointmentProposal : UIxComponent
{
@@ -54,12 +63,6 @@
- (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp;
@end
#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
#include <SoObjects/Appointments/SOGoFreeBusyObject.h>
#include <NGExtensions/NGCalendarDateRange.h>
#include <NGCards/NGCards.h>
#include "common.h"
@implementation UIxAppointmentProposal
- (void)dealloc {

5
UI/Scheduler/UIxAptTableView.m
View File

@@ -18,9 +18,8 @@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: UIxAptTableView.m 59 2004-06-22 13:40:19Z znek $
#include <NGObjWeb/SoComponent.h>
#import <NGObjWeb/SoComponent.h>
@class NSArray, NSCalendarDate;
@@ -37,8 +36,6 @@
@end
#include "common.h"
@implementation UIxAptTableView
- (void)dealloc {

11
UI/Scheduler/UIxCalDateLabel.m
View File

@@ -18,9 +18,13 @@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: UIxCalDateLabel.m 619 2005-03-02 15:16:32Z znek $
#include <SOGoUI/UIxComponent.h>
#import <Foundation/NSCalendarDate.h>
#import <NGCards/NSCalendarDate+ICal.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <SOGoUI/UIxComponent.h>
@interface UIxCalDateLabel : UIxComponent
{
@@ -36,9 +40,6 @@
@end
#include "common.h"
#include <NGCards/NGCards.h>
@implementation UIxCalDateLabel
- (void)dealloc {

2
UI/Scheduler/UIxCalMonthOverview.h
View File

@@ -54,7 +54,7 @@
/* appointments */
- (NSArray *)appointments;
// - (NSArray *)appointments;
@end

16
UI/Scheduler/UIxCalMonthOverview.m
View File

@@ -1,8 +1,10 @@
// $Id: UIxCalMonthOverview.m 885 2005-07-21 16:41:34Z znek $
#include "UIxCalMonthOverview.h"
#include "common.h"
#include <SOGoUI/SOGoAptFormatter.h>
#import <Foundation/NSCalendarDate.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <SOGoUI/SOGoAptFormatter.h>
#import "UIxCalMonthOverview.h"
@implementation UIxCalMonthOverview
@@ -96,8 +98,8 @@
/* appointments */
- (NSArray *)appointments {
return [self fetchCoreAppointmentsInfos];
}
// - (NSArray *)appointments {
// return [self fetchCoreAppointmentsInfos];
// }
@end /* UIxCalMonthOverview */

9
UI/Scheduler/UIxCalMonthViewOld.m
View File

@@ -1,8 +1,9 @@
// $Id: UIxCalMonthView.m 191 2004-08-12 16:28:32Z helge $
#import <Foundation/NSCalendarDate.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#include <SOGo/NSCalendarDate+SOGo.h>
#include "UIxCalMonthViewOld.h"
#include "common.h"
#import <SOGo/NSCalendarDate+SOGo.h>
#import "UIxCalMonthViewOld.h"
@implementation UIxCalMonthViewOld

7
UI/Scheduler/UIxCalParticipationStatusView.m
View File

@@ -18,9 +18,9 @@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: UIxCalParticipationStatusView.m 759 2005-07-14 16:26:32Z znek $
#include <NGObjWeb/NGObjWeb.h>
#import <NGCards/iCalPerson.h>
#import <NGObjWeb/WOComponent.h>
@interface UIxCalParticipationStatusView : WOComponent
{
@@ -31,9 +31,6 @@
@end
#include <NGCards/NGCards.h> /* for iCalPersonPartStat */
#include "common.h"
@implementation UIxCalParticipationStatusView
- (void)setPartStat:(id)_partStat {

19
UI/Scheduler/UIxCalView.m
View File

@@ -1,20 +1,23 @@
// $Id: UIxCalView.m 1080 2007-06-12 22:15:47Z wolfgang $
#import "common.h"
//#import <OGoContentStore/OCSFolder.h>
#import <NGObjWeb/SoSecurityManager.h>
#import <NGObjWeb/SoUser.h>
#import <NGExtensions/NGCalendarDateRange.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <NGExtensions/NSNull+misc.h>
#import <NGExtensions/NSObject+Logs.h>
#import <NGExtensions/NSString+misc.h>
#import <NGCards/NGCards.h>
#import <SOGoUI/SOGoAptFormatter.h>
#import "UIxComponent+Scheduler.h"
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
#import <SoObjects/SOGo/NSArray+Utilities.h>
#import <SoObjects/SOGo/SOGoUser.h>
#import <SoObjects/SOGo/SOGoObject.h>
#import "SoObjects/Appointments/SOGoAppointmentFolder.h"
#import <SOGo/NSArray+Utilities.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoObject.h>
#import <SOGoUI/SOGoAptFormatter.h>
#import "UIxComponent+Scheduler.h"
#import "UIxCalView.h"

18
UI/Scheduler/UIxDatePicker.m
View File

@@ -19,7 +19,13 @@
02111-1307, USA.
*/
#include <NGObjWeb/WOComponent.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSCalendarDate.h>
#import <NGObjWeb/WOComponent.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WORequest.h>
#import <NGExtensions/NSObject+Logs.h>
@class NSString;
@@ -33,14 +39,12 @@
BOOL isDisabled;
}
- (NSString *)dateID;
- (NSString *)dateFormat;
- (NSString *)jsDateFormat;
- (BOOL)useISOFormats;
- (NSString *) dateID;
- (NSString *) dateFormat;
- (NSString *) jsDateFormat;
- (BOOL) useISOFormats;
@end
#include "common.h"
@implementation UIxDatePicker
- (id) init

18
UI/Scheduler/UIxTaskProposal.m
View File

@@ -20,7 +20,17 @@
*/
// $Id: UIxTaskEditor.m 181 2004-08-11 15:13:25Z helge $
#include <SOGoUI/UIxComponent.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSNull.h>
#import <Foundation/NSValue.h>
#import <NGExtensions/NGCalendarDateRange.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <NGCards/iCalPerson.h>
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
#import <SoObjects/Appointments/SOGoFreeBusyObject.h>
#import <SOGoUI/UIxComponent.h>
@interface UIxTaskProposal : UIxComponent
{
@@ -54,12 +64,6 @@
- (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp;
@end
#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
#include <SoObjects/Appointments/SOGoFreeBusyObject.h>
#include <NGExtensions/NGCalendarDateRange.h>
#include <NGCards/NGCards.h>
#include "common.h"
@implementation UIxTaskProposal
- (void)dealloc {

36
UI/Scheduler/common.h
View File

@@ -1,36 +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: common.h 1101 2007-07-10 19:27:48Z wolfgang $
#import <Foundation/Foundation.h>
#if LIB_FOUNDATION_LIBRARY
# import <Foundation/exceptions/GeneralExceptions.h>
#elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
# import <NGExtensions/NGObjectMacros.h>
# import <NGExtensions/NSString+Ext.h>
#endif
#import <NGExtensions/NGExtensions.h>
#import <NGObjWeb/NGObjWeb.h>
#import <NGObjWeb/SoObjects.h>
#warning importing common.h is baaad

1
UI/WebServerResources/UIxContactsUserFolders.js
View File

@@ -23,7 +23,6 @@ function addLineToTree(tree, parent, line) {
var parentNode = nodes[0];
var userInfos = parentNode.split(":");
var email = userInfos[1] + " &lt;" + userInfos[2] + ">";
log ("email: " + email);
tree.add(parent, 0, email, 0, '#', userInfos[0], 'person',
'', '',
ResourcesURL + '/abcard.gif',