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

merge of '36df3bcfd6c56f483f2676ceb6b6757a6506dbb7'

Browse Source 
and 'f12c75a72aac13edc9728fe5a656c622487836dd'

Monotone-Parent: 36df3bcfd6c56f483f2676ceb6b6757a6506dbb7
Monotone-Parent: f12c75a72aac13edc9728fe5a656c622487836dd
Monotone-Revision: 0c622c14bea584c75539ec4bf9d8ca29899745ef

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-14T22:05:54
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-09-14 22:05:54 +00:00
parent 3b49a8a8a8 21718aeac2
commit d4c43b432e
80 changed files with 1299 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Common/English.lproj/Localizable.strings
+1
View File
@@ -32,3 +32,4 @@
"You cannot subscribe to a folder that you own!" = "You cannot subscribe to a folder that you own!";
"Unable to unsubscribe from that folder!" = "Unable to unsubscribe from that folder!";
"You cannot unsubscribe from a folder that you own!" = "You cannot unsubscribe from a folder that you own!";
"Unable to rename that folder!" = "Unable to rename that folder!";
UI/Common/French.lproj/Localizable.strings
+1
View File
@@ -33,3 +33,4 @@
"You cannot subscribe to a folder that you own!" = "Impossible de vous abonner à un dossier qui vous appartient.";
"Unable to unsubscribe from that folder!" = "Impossible de se désabonner de ce dossier.";
"You cannot unsubscribe from a folder that you own!" = "Impossible de vous désabonner d'un dossier qui vous appartient.";
"Unable to rename that folder!" = "Impossible de renommer ce dossier.";
UI/Common/GNUmakefile
+1
View File
@@ -17,6 +17,7 @@ CommonUI_OBJC_FILES += \
UIxAclEditor.m \
UIxObjectActions.m \
UIxFolderActions.m \
UIxParentFolderActions.m \
UIxElemBuilder.m \
UIxTabView.m \
UIxTabItem.m \
UI/Common/German.lproj/Localizable.strings
+1
View File
@@ -35,3 +35,4 @@
"You cannot subscribe to a folder that you own!" = "Unmöglich sich an einem Ordner zu abonnieren, der Ihnen selbst gehört.";
"Unable to unsubscribe from that folder!" = "Unmöglich sich von diesem Ordner zu des-abonnieren.";
"You cannot unsubscribe from a folder that you own!" = "Unmöglich sich von einem Ordner zu des-abonnieren, der Ihnen selbst gehört.";
"Unable to rename that folder!" = "Unable to rename that folder!";
UI/Common/UIxFolderActions.h
+1 -1
View File
@@ -41,7 +41,7 @@
NSString *owner;
NSString *login;
NSString *baseFolder;
NSMutableString *subscriptionPointer;
NSString *subscriptionPointer;
NSMutableDictionary *moduleSettings;
BOOL isMailInvitation;
}
UI/Common/UIxFolderActions.m
+61 -48
View File
@@ -33,8 +33,9 @@
#import <NGObjWeb/SoSecurityManager.h>
#import <SoObjects/SOGo/LDAPUserManager.h>
#import <SoObjects/SOGo/NSArray+Utilities.h>
#import <SoObjects/SOGo/SOGoUser.h>
#import <SoObjects/SOGo/SOGoObject.h>
#import <SoObjects/SOGo/SOGoFolder.h>
#import <SoObjects/SOGo/SOGoPermissions.h>
#import "WODirectAction+SOGo.h"
@@ -74,21 +75,19 @@
}
[ud setObject: moduleSettings forKey: baseFolder];
subscriptionPointer = [NSMutableString stringWithFormat: @"%@:%@",
owner, baseFolder];
if ([baseFolder isEqualToString: @"Contacts"])
[subscriptionPointer appendFormat: @"/%@",
[clientObject nameInContainer]];
subscriptionPointer = [NSString stringWithFormat: @"%@:%@/%@",
owner, baseFolder,
[clientObject nameInContainer]];
mailInvitationParam
= [[context request] formValueForKey: @"mail-invitation"];
isMailInvitation = [mailInvitationParam boolValue];
}
- (WOResponse *) _realActionWithFolderName: (NSDictionary *) folderDict
- (WOResponse *) _realSubscribe: (BOOL) reallyDo
{
WOResponse *response;
NSMutableDictionary *folderSubscription;
NSMutableArray *folderSubscription;
NSString *mailInvitationURL;
if ([owner isEqualToString: login])
@@ -101,17 +100,17 @@
{
folderSubscription
= [moduleSettings objectForKey: @"SubscribedFolders"];
if (!folderSubscription)
if (!(folderSubscription
&& [folderSubscription isKindOfClass: [NSMutableArray class]]))
{
folderSubscription = [NSMutableDictionary dictionary];
folderSubscription = [NSMutableArray array];
[moduleSettings setObject: folderSubscription
forKey: @"SubscribedFolders"];
}
if (folderDict)
[folderSubscription setObject: folderDict
forKey: subscriptionPointer];
if (reallyDo)
[folderSubscription addObjectUniquely: subscriptionPointer];
else
[folderSubscription removeObjectForKey: subscriptionPointer];
[folderSubscription removeObject: subscriptionPointer];
[ud synchronize];
@@ -133,32 +132,16 @@
- (WOResponse *) subscribeAction
{
NSString *email;
NSMutableDictionary *folderDict;
NSString *folderName;
[self _setupContext];
email = [NSString stringWithFormat: @"%@ <%@>",
[um getCNForUID: owner],
[um getEmailForUID: owner]];
if ([baseFolder isEqualToString: @"Contacts"])
folderName = [NSString stringWithFormat: @"%@ (%@)",
[clientObject nameInContainer], email];
else
folderName = email;
folderDict = [NSMutableDictionary dictionary];
[folderDict setObject: folderName forKey: @"displayName"];
[folderDict setObject: [NSNumber numberWithBool: NO] forKey: @"active"];
return [self _realActionWithFolderName: folderDict];
return [self _realSubscribe: YES];
}
- (WOResponse *) unsubscribeAction
{
[self _setupContext];
return [self _realActionWithFolderName: nil];
return [self _realSubscribe: NO];
}
- (WOResponse *) canAccessContentAction
@@ -168,26 +151,24 @@
- (WOResponse *) _realFolderActivation: (BOOL) makeActive
{
NSMutableDictionary *folderSubscription, *folderDict;
NSNumber *active;
NSMutableArray *folderSubscription;
NSString *folderName;
[self _setupContext];
active = [NSNumber numberWithBool: makeActive];
if ([owner isEqualToString: login])
[moduleSettings setObject: active forKey: @"activateUserFolder"];
else
folderSubscription
= [moduleSettings objectForKey: @"ActiveFolders"];
if (!folderSubscription)
{
folderSubscription
= [moduleSettings objectForKey: @"SubscribedFolders"];
if (folderSubscription)
{
folderDict = [folderSubscription objectForKey: subscriptionPointer];
if (folderDict)
[folderDict setObject: active
forKey: @"active"];
}
folderSubscription = [NSMutableArray array];
[moduleSettings setObject: folderSubscription forKey: @"ActiveFolders"];
}
folderName = [clientObject nameInContainer];
if (makeActive)
[folderSubscription addObjectUniquely: folderName];
else
[folderSubscription removeObject: folderName];
[ud synchronize];
return [self responseWith204];
@@ -203,4 +184,36 @@
return [self _realFolderActivation: NO];
}
- (WOResponse *) deleteFolderAction
{
WOResponse *response;
response = (WOResponse *) [[self clientObject] delete];
if (!response)
response = [self responseWith204];
return response;
}
- (WOResponse *) renameFolderAction
{
WOResponse *response;
NSString *folderName;
folderName = [[context request] formValueForKey: @"name"];
if ([folderName length] > 0)
{
clientObject = [self clientObject];
[clientObject renameTo: folderName];
response = [self responseWith204];
}
else
{
response = [self responseWithStatus: 500];
[response appendContentString: @"Missing 'name' parameter."];
}
return response;
}
@end
UI/Common/product.plist
+109 -90
View File
@@ -1,95 +1,114 @@
{ /* -*-javascript-*- */
requires = ( MAIN, Mailer );
{ /* -*-java-*- */
requires = ( MAIN, Mailer );
publicResources = (
calendar.css,
uix.css,
menu_logo_top.gif,
line_left.gif,
line_stretch.gif,
line_right.gif,
box_topleft.gif,
box_top.gif,
box_topright.gif,
box_left.gif,
box_right.gif,
box_botleft.gif,
box_bottom.gif,
box_botright.gif,
tab_selected.gif,
tab_.gif,
corner_right.gif,
closewindow.gif,
OGoLogo.gif,
upward_sorted.gif,
downward_sorted.gif,
non_sorted.gif
);
publicResources = (
calendar.css,
uix.css,
menu_logo_top.gif,
line_left.gif,
line_stretch.gif,
line_right.gif,
box_topleft.gif,
box_top.gif,
box_topright.gif,
box_left.gif,
box_right.gif,
box_botleft.gif,
box_bottom.gif,
box_botright.gif,
tab_selected.gif,
tab_.gif,
corner_right.gif,
closewindow.gif,
OGoLogo.gif,
upward_sorted.gif,
downward_sorted.gif,
non_sorted.gif
);
factories = {
};
factories = {
};
categories = {
SOGoObject = {
methods = {
addUserInAcls = {
protectedBy = "SaveAcls";
actionClass = "UIxObjectActions";
actionName = "addUserInAcls";
};
removeUserFromAcls = {
protectedBy = "SaveAcls";
actionClass = "UIxObjectActions";
actionName = "removeUserFromAcls";
};
acls = {
protectedBy = "ReadAcls";
pageName = "UIxAclEditor";
};
saveAcls = {
protectedBy = "SaveAcls";
pageName = "UIxAclEditor";
actionName = "saveAcls";
};
userRights = {
protectedBy = "ReadAcls";
pageName = "UIxUserRightsEditor";
};
saveUserRights = {
protectedBy = "ReadAcls";
pageName = "UIxUserRightsEditor";
actionName = "saveUserRights";
};
};
categories = {
SOGoObject = {
methods = {
addUserInAcls = {
protectedBy = "SaveAcls";
actionClass = "UIxObjectActions";
actionName = "addUserInAcls";
};
removeUserFromAcls = {
protectedBy = "SaveAcls";
actionClass = "UIxObjectActions";
actionName = "removeUserFromAcls";
};
acls = {
protectedBy = "ReadAcls";
pageName = "UIxAclEditor";
};
saveAcls = {
protectedBy = "SaveAcls";
pageName = "UIxAclEditor";
actionName = "saveAcls";
};
userRights = {
protectedBy = "ReadAcls";
pageName = "UIxUserRightsEditor";
};
saveUserRights = {
protectedBy = "ReadAcls";
pageName = "UIxUserRightsEditor";
actionName = "saveUserRights";
};
};
SOGoFolder = {
methods = {
subscribe = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "subscribe";
};
unsubscribe = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "unsubscribe";
};
canAccessContent = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "canAccessContent";
};
activateFolder = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "activateFolder";
};
deactivateFolder = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "deactivateFolder";
};
};
};
SOGoParentFolder = {
methods = {
createFolder = {
protectedBy = "View";
actionClass = "UIxParentFolderActions";
actionName = "createFolder";
};
};
};
};
SOGoFolder = {
methods = {
subscribe = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "subscribe";
};
unsubscribe = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "unsubscribe";
};
canAccessContent = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "canAccessContent";
};
activateFolder = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "activateFolder";
};
deactivateFolder = {
protectedBy = "<public>";
actionClass = "UIxFolderActions";
actionName = "deactivateFolder";
};
deleteFolder = {
protectedBy = "SaveAcls"; /* a hack to force "owner" */
actionClass = "UIxFolderActions";
actionName = "deleteFolder";
};
renameFolder = {
protectedBy = "SaveAcls";
actionClass = "UIxFolderActions";
actionName = "renameFolder";
};
};
};
};
}
UI/Contacts/English.lproj/Localizable.strings
+3 -1
View File
@@ -105,6 +105,8 @@
"Are you sure you want to delete the selected address book?"
= "Are you sure you want to delete the selected address book?";
"Address Book Name" = "Address Book Name";
"You cannot subscribe to a folder that you own!"
= "You cannot subscribe to a folder that you own!";
"Unable to subscribe to that folder!"
@@ -125,4 +127,4 @@
= "This person can erase cards from this addressbook.";
"The selected contact has no email address."
= "The selected contact has no email address.";
= "The selected contact has no email address.";
UI/Contacts/French.lproj/Localizable.strings
+3 -1
View File
@@ -118,6 +118,8 @@
"Are you sure you want to delete the selected address book?"
= "Voulez-vous vraiment supprimer le carnet d'adresses sélectionné ?";
"Address Book Name" = "Nom du carnet d'adresses";
"You cannot subscribe to a folder that you own!"
= "Vous ne pouvez pas vous inscrire à un dossier qui vous appartient!";
"Unable to subscribe to that folder!"
@@ -138,4 +140,4 @@
= "Cette personne peut effacer des fiches de ce carnet d'adresses.";
"The selected contact has no email address."
= "Cette personne n'a pas d'adresse courriel."
= "Cette personne n'a pas d'adresse courriel."
UI/Contacts/German.lproj/Localizable.strings
+2
View File
@@ -109,6 +109,8 @@
"Are you sure you want to delete the selected address book?"
= "Voulez-vous vraiment supprimer le carnet d'adresses sélectionné ?";
"Address Book Name" = "Address Book Name";
"You cannot subscribe to a folder that you own!"
= "Vous ne pouvez pas vous inscrire à un dossier qui vous appartient!";
"Unable to subscribe to that folder!"
UI/Contacts/UIxContactEditor.m
+2 -2
View File
@@ -584,8 +584,8 @@
id <SOGoContactFolder> co;
co = [self clientObject];
if ([[co class] respondsToSelector: @selector (globallyUniqueObjectId)])
objectId = [[[self clientObject] class] globallyUniqueObjectId];
if ([co respondsToSelector: @selector (globallyUniqueObjectId)])
objectId = [co globallyUniqueObjectId];
else
objectId = nil;
UI/Contacts/UIxContactFoldersView.m
+63 -83
View File
@@ -52,8 +52,7 @@
WORequest *request;
folders = [self clientObject];
action = [NSString stringWithFormat: @"../personal/%@",
actionName];
action = [NSString stringWithFormat: @"../personal/%@", actionName];
request = [[self context] request];
@@ -74,25 +73,6 @@
return [self _selectActionForApplication: @"new"];
}
- (id <WOActionResults>) newAbAction
{
id <WOActionResults> response;
NSString *name;
name = [self queryParameterForKey: @"name"];
if ([name length] > 0)
{
response = [[self clientObject] newFolderWithName: name];
if (!response)
response = [self responseWith204];
}
else
response = [NSException exceptionWithHTTPStatus: 400
reason: @"The name is missing"];
return response;
}
- (id) selectForMailerAction
{
return [self _selectActionForApplication: @"mailer-contacts"];
@@ -193,50 +173,55 @@
return result;
}
- (NSArray *) _gcsFoldersFromFolder: (SOGoContactFolders *) contactFolders
- (NSArray *) _subFoldersFromFolder: (SOGoParentFolder *) parentFolder
{
NSMutableArray *gcsFolders;
NSEnumerator *contactSubfolders;
SOGoContactGCSFolder *currentContactFolder;
NSString *folderName, *displayName;
NSMutableArray *folders;
NSEnumerator *subfolders;
SOGoFolder *currentFolder;
NSString *folderName;
NSMutableDictionary *currentDictionary;
SoSecurityManager *securityManager;
gcsFolders = [NSMutableArray new];
[gcsFolders autorelease];
securityManager = [SoSecurityManager sharedSecurityManager];
// return (([securityManager validatePermission: SoPerm_AccessContentsInformation
// onObject: contactFolder
// inContext: context] == nil)
contactSubfolders = [[contactFolders subFolders] objectEnumerator];
currentContactFolder = [contactSubfolders nextObject];
while (currentContactFolder)
folders = [NSMutableArray new];
[folders autorelease];
subfolders = [[parentFolder subFolders] objectEnumerator];
currentFolder = [subfolders nextObject];
while (currentFolder)
{
if ([currentContactFolder
isKindOfClass: [SOGoContactGCSFolder class]])
if (![securityManager validatePermission: SOGoPerm_AccessObject
onObject: currentFolder inContext: context])
{
displayName = [[currentContactFolder ocsFolder] folderName];
if (displayName)
{
folderName = [NSString stringWithFormat: @"/Contacts/%@",
[currentContactFolder nameInContainer]];
currentDictionary
= [NSMutableDictionary dictionaryWithCapacity: 3];
[currentDictionary setObject: displayName forKey: @"displayName"];
[currentDictionary setObject: folderName forKey: @"name"];
[currentDictionary setObject: @"contact" forKey: @"type"];
[gcsFolders addObject: currentDictionary];
}
folderName = [NSString stringWithFormat: @"/%@/%@",
[parentFolder nameInContainer],
[currentFolder nameInContainer]];
currentDictionary
= [NSMutableDictionary dictionaryWithCapacity: 3];
[currentDictionary setObject: [currentFolder displayName]
forKey: @"displayName"];
[currentDictionary setObject: folderName forKey: @"name"];
[currentDictionary setObject: [currentFolder folderType]
forKey: @"type"];
[folders addObject: currentDictionary];
}
currentContactFolder = [contactSubfolders nextObject];
currentFolder = [subfolders nextObject];
}
return gcsFolders;
return folders;
}
- (NSArray *) _foldersForUID: (NSString *) uid
ofType: (NSString *) folderType
{
NSObject *topFolder, *userFolder;
SOGoContactFolders *contactFolders;
SOGoParentFolder *parentFolder;
NSMutableArray *folders;
NSMutableDictionary *currentDictionary;
folders = [NSMutableArray new];
[folders autorelease];
@@ -245,23 +230,19 @@
userFolder = [topFolder lookupName: uid inContext: context acquire: NO];
/* FIXME: should be moved in the SOGo* classes. Maybe by having a SOGoFolderManager. */
#warning this might need adjustments whenever we permit multiple calendar folders per-user
if ([folderType length] == 0 || [folderType isEqualToString: @"calendar"])
{
currentDictionary = [NSMutableDictionary new];
[currentDictionary autorelease];
[currentDictionary setObject: [self labelForKey: @"Calendar"]
forKey: @"displayName"];
[currentDictionary setObject: @"/Calendar" forKey: @"name"];
[currentDictionary setObject: @"calendar" forKey: @"type"];
[folders addObject: currentDictionary];
parentFolder = [userFolder lookupName: @"Calendar"
inContext: context acquire: NO];
[folders
addObjectsFromArray: [self _subFoldersFromFolder: parentFolder]];
}
if ([folderType length] == 0 || [folderType isEqualToString: @"contact"])
{
contactFolders = [userFolder lookupName: @"Contacts"
inContext: context acquire: NO];
parentFolder = [userFolder lookupName: @"Contacts"
inContext: context acquire: NO];
[folders
addObjectsFromArray: [self _gcsFoldersFromFolder: contactFolders]];
addObjectsFromArray: [self _subFoldersFromFolder: parentFolder]];
}
return folders;
@@ -352,31 +333,30 @@
return result;
}
- (SOGoContactGCSFolder *) contactFolderForUID: (NSString *) uid
{
SOGoFolder *upperContainer;
SOGoUserFolder *userFolder;
SOGoContactFolders *contactFolders;
SOGoContactGCSFolder *contactFolder;
SoSecurityManager *securityManager;
// - (SOGoContactGCSFolder *) contactFolderForUID: (NSString *) uid
// {
// SOGoFolder *upperContainer;
// SOGoUserFolder *userFolder;
// SOGoContactFolders *contactFolders;
// SOGoContactGCSFolder *contactFolder;
// SoSecurityManager *securityManager;
upperContainer = [[[self clientObject] container] container];
userFolder = [SOGoUserFolder objectWithName: uid
inContainer: upperContainer];
contactFolders = [SOGoContactFolders objectWithName: @"Contacts"
inContainer: userFolder];
contactFolder = [SOGoContactGCSFolder objectWithName: @"personal"
inContainer: contactFolders];
[contactFolder
setOCSPath: [NSString stringWithFormat: @"/Users/%@/Contacts/personal", uid]];
[contactFolder setOwner: uid];
// upperContainer = [[[self clientObject] container] container];
// userFolder = [SOGoUserFolder objectWithName: uid
// inContainer: upperContainer];
// contactFolders = [SOGoUserFolder lookupName: @"Contacts"
// inContext: context
// acquire: NO];
// contactFolder = [contactFolders lookupName: @"personal"
// inContext: context
// acquire: NO];
securityManager = [SoSecurityManager sharedSecurityManager];
// securityManager = [SoSecurityManager sharedSecurityManager];
return (([securityManager validatePermission: SoPerm_AccessContentsInformation
onObject: contactFolder
inContext: context] == nil)
? contactFolder : nil);
}
// return (([securityManager validatePermission: SoPerm_AccessContentsInformation
// onObject: contactFolder
// inContext: context] == nil)
// ? contactFolder : nil);
// }
@end
UI/Contacts/UIxContactsListView.m
-19
View File
@@ -81,25 +81,6 @@
return selectorComponentClass;
}
- (id <WOActionResults>) deleteAction
{
id <WOActionResults> result;
NSException <WOActionResults> *ex;
WOResponse *response;
ex = [[self clientObject] delete];
if (ex)
result = ex;
else
{
response = [context response];
[response setStatus: 200];
result = response;
}
return result;
}
- (NSString *) defaultSortKey
{
return @"displayName";
UI/Contacts/UIxContactsListViewContainer.h
+1 -11
View File
@@ -31,28 +31,18 @@
@interface UIxContactsListViewContainer : UIxComponent
{
NSString *foldersPrefix;
NSString *selectorComponentClass;
NSString *currentAdditionalFolder;
NSDictionary *additionalFolders;
id currentFolder;
}
- (void) setCurrentFolder: (id) folder;
- (NSString *) foldersPrefix;
- (NSArray *) contactFolders;
- (NSString *) currentContactFolderId;
- (NSString *) currentContactFolderOwner;
- (NSString *) currentContactFolderName;
- (NSArray *) additionalFolders;
- (void) setCurrentAdditionalFolder: (NSString *) newCurrentAdditionalFolder;
- (NSString *) currentAdditionalFolder;
- (NSString *) currentAdditionalFolderName;
@end
#endif /* UIXCONTACTSLISTVIEWCONTAINERBASE_H */
UI/Contacts/UIxContactsListViewContainer.m
+3 -62
View File
@@ -41,20 +41,12 @@
{
if ((self = [super init]))
{
foldersPrefix = nil;
selectorComponentClass = nil;
additionalFolders = nil;
}
return self;
}
- (void) dealloc
{
[additionalFolders release];
[super dealloc];
}
- (void) setSelectorComponentClass: (NSString *) aComponentClass
{
selectorComponentClass = aComponentClass;
@@ -86,30 +78,6 @@
currentFolder = folder;
}
- (NSString *) foldersPrefix
{
NSMutableArray *folders;
SOGoObject *currentObject;
if (!foldersPrefix)
{
folders = [NSMutableArray new];
[folders autorelease];
currentObject = [[self clientObject] container];
while (![currentObject isKindOfClass: [SOGoContactFolders class]])
{
[folders insertObject: [currentObject nameInContainer] atIndex: 0];
currentObject = [currentObject container];
}
foldersPrefix = [folders componentsJoinedByString: @"/"];
[foldersPrefix retain];
}
return foldersPrefix;
}
- (NSArray *) contactFolders
{
SOGoContactFolders *folderContainer;
@@ -121,8 +89,7 @@
- (NSString *) currentContactFolderId
{
return [NSString stringWithFormat: @"%@/%@",
[self foldersPrefix],
return [NSString stringWithFormat: @"/%@",
[currentFolder nameInContainer]];
}
@@ -131,35 +98,9 @@
return [currentFolder displayName];
}
- (NSArray *) additionalFolders
- (NSString *) currentContactFolderOwner
{
NSUserDefaults *ud;
if (!additionalFolders)
{
ud = [[context activeUser] userSettings];
additionalFolders
= [[ud objectForKey: @"Contacts"] objectForKey: @"SubscribedFolders"];
[additionalFolders retain];
}
return [additionalFolders allKeys];
}
- (void) setCurrentAdditionalFolder: (NSString *) newCurrentAdditionalFolder
{
currentAdditionalFolder = newCurrentAdditionalFolder;
}
- (NSString *) currentAdditionalFolder
{
return currentAdditionalFolder;
}
- (NSString *) currentAdditionalFolderName
{
return [[additionalFolders objectForKey: currentAdditionalFolder]
objectForKey: @"displayName"];
return [currentFolder ownerInContext: context];
}
- (BOOL) hasContactSelectionButtons
UI/Contacts/product.plist
-10
View File
@@ -17,11 +17,6 @@
pageName = "UIxContactFoldersView";
actionName = "new";
};
newAb = {
protectedBy = "View";
pageName = "UIxContactFoldersView";
actionName = "newAb";
};
mailer-contacts = {
protectedBy = "View";
pageName = "UIxContactFoldersView";
@@ -87,11 +82,6 @@
pageName = "UIxContactsListView";
actionName = "mailerContacts";
};
delete = {
protectedBy = "SaveAcls"; /* a hack to force "owner" */
pageName = "UIxContactsListView";
actionName = "delete";
};
userRights = {
protectedBy = "ReadAcls";
pageName = "UIxContactsUserRightsEditor";
UI/MainUI/SOGoRootPage.m
+17 -81
View File
@@ -73,7 +73,7 @@
cookieString = [NSString stringWithFormat: @"%@:%@",
[self queryParameterForKey: @"userName"],
[self queryParameterForKey: @"password"]];
cookieValue = [NSString stringWithFormat: @"basic%@",
cookieValue = [NSString stringWithFormat: @"basic %@",
[cookieString stringByEncodingBase64]];
authCookie = [WOCookie cookieWithName: [auth cookieNameInContext: context]
value: cookieValue];
@@ -83,88 +83,24 @@
return response;
}
// - (id <WOActionResults>) defaultAction
// {
// WOResponse *r;
// NSString *login, *rhk;
// SOGoWebAuthenticator *auth;
// SOGoUser *user;
// SOGoUserFolder *home;
// WOApplication *base;
- (id <WOActionResults>) defaultAction
{
id <WOActionResults> response;
NSString *login, *oldLocation;
// /*
// Note: ctx.activeUser is NOT set here. Don't know why, so we retrieve
// the user from the authenticator.
// */
// auth = [[self clientObject] authenticatorInContext: context];
// user = [auth userInContext: context];
// login = [user login];
login = [[context activeUser] login];
if ([login isEqualToString: @"anonymous"])
response = self;
else
{
oldLocation = [[self clientObject] baseURLInContext: context];
response
= [self redirectToLocation: [NSString stringWithFormat: @"%@/%@",
oldLocation, login]];
}
// if ([login isEqualToString:@"anonymous"]) {
// /* use root page for unauthenticated users */
// return self;
// }
// /* check base */
// base = [self application];
// rhk = [[context request] requestHandlerKey];
// if (([rhk length] == 0) || ([base requestHandlerForKey:rhk] == nil)) {
// base = [base lookupName: @"so" inContext: context acquire: NO];
// if (![base isNotNull] || [base isKindOfClass:[NSException class]]) {
// /* use root page if home could not be found */
// [self errorWithFormat:@"Did not find 'so' request handler!"];
// return self;
// }
// }
// /* lookup home-page */
// home = [base lookupName: login inContext: context acquire: NO];
// if (![home isNotNull] || [home isKindOfClass:[NSException class]]) {
// /* use root page if home could not be found */
// return self;
// }
// /* redirect to home-page */
// r = [context response];
// [r setStatus: 302 /* moved */];
// [r setHeader: [home baseURLInContext: context]
// forKey: @"location"];
// return r;
// }
/* response generation */
// - (void) appendToResponse: (WOResponse *) response
// inContext: (WOContext *) ctx
// {
// NSString *rhk;
// // TODO: we might also want to look into the HTTP basic-auth to redirect to
// // the login URL!
// rhk = [[ctx request] requestHandlerKey];
// if ([rhk length] == 0
// || [[self application] requestHandlerForKey: rhk] == nil)
// {
// /* a small hack to redirect to a valid URL */
// NSString *url;
// url = [ctx urlWithRequestHandlerKey: @"so" path: @"/" queryString: nil];
// [response setStatus: 302 /* moved */];
// [response setHeader: url forKey: @"location"];
// [self logWithFormat: @"URL: %@", url];
// return;
// }
// [response setHeader: @"text/html" forKey: @"content-type"];
// [super appendToResponse: response inContext: ctx];
// }
return response;
}
- (BOOL) isPublicInContext: (WOContext *) localContext
{
UI/MainUI/product.plist
+8
View File
@@ -46,6 +46,14 @@
"Access Contents Information" = ( "Owner", "ObjectViewer" );
};
};
SOGoParentFolder = {
superclass = "SOGoObject";
protectedBy = "Access Contents Information";
defaultRoles = {
"Access Contents Information" = ( "Authenticated" );
"WebDAV Access" = ( "Authenticated" );
};
};
SOGoUserFolder = {
superclass = "SOGoFolder";
protectedBy = "Access Contents Information";
UI/PreferencesUI/UIxPreferences.m
+2 -1
View File
@@ -125,7 +125,8 @@ static BOOL shouldDisplayPasswordChange = NO;
- (NSArray *) timeZonesList
{
return [NSTimeZone knownTimeZoneNames];
return [[NSTimeZone knownTimeZoneNames]
sortedArrayUsingSelector: @selector (localizedCaseInsensitiveCompare:)];
}
- (NSString *) userTimeZone
UI/Scheduler/English.lproj/Localizable.strings
+5 -2
View File
@@ -110,8 +110,11 @@
/* Button Titles */
"Add..." = "Add...";
"Remove" = "Remove";
"New Calendar..." = "New Calendar...";
"Subscribe to a Calendar..." = "Subscribe to a Calendar...";
"Remove the selected Calendar" = "Remove the selected Calendar";
"Name of the Calendar" = "Name of the Calendar";
"new" = "New";
"printview" = "Print View";
UI/Scheduler/French.lproj/Localizable.strings
+5 -2
View File
@@ -111,8 +111,11 @@
/* Button Titles */
"Add..." = "Ajouter...";
"Remove" = "Enlever";
"New Calendar..." = "Nouvel agenda...";
"Subscribe to a Calendar..." = "S'inscrire à un agenda...";
"Remove the selected Calendar" = "Enlever l'agenda sélectionné";
"Name of the Calendar" = "Nom de l'agenda";
"new" = "Nouveau";
"printview" = "Version imprimable";
UI/Scheduler/GNUmakefile
+1 -1
View File
@@ -48,7 +48,7 @@ SchedulerUI_RESOURCE_FILES += \
product.plist
SchedulerUI_RESOURCE_FILES += \
Toolbars/SOGoAppointmentFolder.toolbar \
Toolbars/SOGoAppointmentFolders.toolbar \
Toolbars/SOGoAppointmentObject.toolbar \
Toolbars/SOGoAppointmentObjectAccept.toolbar \
Toolbars/SOGoAppointmentObjectDecline.toolbar \
UI/Scheduler/German.lproj/Localizable.strings
+5 -2
View File
@@ -100,8 +100,11 @@
/* Button Titles */
"Add..." = "Hinzufügen...";
"Remove" = "Löschen";
"New Calendar..." = "New Calendar...";
"Subscribe to a Calendar..." = "Subscribe to a Calendar...";
"Remove the selected Calendar" = "Remove the selected Calendar";
"Name of the Calendar" = "Name of the Calendar";
"new" = "Neu";
"printview" = "Version imprimable";
UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar → UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
View File
UI/Scheduler/UIxAppointmentEditor.m
+5 -5
View File
@@ -286,14 +286,14 @@
{
NSString *objectId, *method, *uri;
id <WOActionResults> result;
Class clientKlazz;
SOGoAppointmentFolder *co;
clientKlazz = [[self clientObject] class];
objectId = [clientKlazz globallyUniqueObjectId];
co = [self clientObject];
objectId = [co globallyUniqueObjectId];
if ([objectId length] > 0)
{
method = [NSString stringWithFormat:@"%@/Calendar/%@/editAsAppointment",
[self userFolderPath], objectId];
method = [NSString stringWithFormat:@"%@/%@/editAsAppointment",
[co soURL], objectId];
uri = [self completeHrefForMethod: method];
result = [self redirectToLocation: uri];
}
UI/Scheduler/UIxCalListingActions.m
+31 -51
View File
@@ -25,6 +25,7 @@
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSNull.h>
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOContext+SoObjects.h>
@@ -38,6 +39,7 @@
#import <SoObjects/SOGo/NSArray+Utilities.h>
#import <SoObjects/SOGo/NSObject+Utilities.h>
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
#import <SoObjects/Appointments/SOGoAppointmentFolders.h>
#import <UI/Common/WODirectAction+SOGo.h>
@@ -214,36 +216,6 @@
return aptFolder;
}
- (NSArray *) _activeCalendarFolders
{
NSMutableArray *activeFolders;
NSEnumerator *folders;
NSDictionary *currentFolderDict;
SOGoAppointmentFolder *currentFolder, *clientObject;
activeFolders = [NSMutableArray new];
[activeFolders autorelease];
clientObject = [self clientObject];
folders = [[clientObject calendarFolders] objectEnumerator];
currentFolderDict = [folders nextObject];
while (currentFolderDict)
{
if ([[currentFolderDict objectForKey: @"active"] boolValue])
{
currentFolder
= [self _aptFolder: [currentFolderDict objectForKey: @"folder"]
withClientObject: clientObject];
[activeFolders addObject: currentFolder];
}
currentFolderDict = [folders nextObject];
}
return activeFolders;
}
- (NSArray *) _fetchFields: (NSArray *) fields
forComponentOfType: (NSString *) component
{
@@ -252,34 +224,42 @@
NSMutableDictionary *infos, *currentInfo, *newInfo;
NSString *owner, *uid;
NSNull *marker;
SOGoAppointmentFolders *clientObject;
marker = [NSNull null];
infos = [NSMutableDictionary dictionary];
folders = [[self _activeCalendarFolders] objectEnumerator];
clientObject = [self clientObject];
folders = [[clientObject subFolders] objectEnumerator];
currentFolder = [folders nextObject];
while (currentFolder)
{
owner = [currentFolder ownerInContext: context];
currentInfos = [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
component: component] objectEnumerator];
newInfo = [currentInfos nextObject];
while (newInfo)
if ([currentFolder isActive])
{
uid = [newInfo objectForKey: @"c_uid"];
currentInfo = [infos objectForKey: uid];
if (!currentInfo
|| [owner isEqualToString: userLogin])
{
[self _updatePrivacyInComponent: newInfo
fromFolder: currentFolder];
[newInfo setObject: owner forKey: @"c_owner"];
[infos setObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]
forKey: uid];
}
owner = [currentFolder ownerInContext: context];
currentInfos = [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
component: component] objectEnumerator];
newInfo = [currentInfos nextObject];
while (newInfo)
{
uid = [newInfo objectForKey: @"c_uid"];
currentInfo = [infos objectForKey: uid];
if (!currentInfo
|| [owner isEqualToString: userLogin])
{
[self _updatePrivacyInComponent: newInfo
fromFolder: currentFolder];
[newInfo setObject: [currentFolder nameInContainer]
forKey: @"c_folder"];
// [newInfo setObject: owner forKey: @"c_owner"];
[infos setObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]
forKey: uid];
}
newInfo = [currentInfos nextObject];
}
}
currentFolder = [folders nextObject];
}
@@ -326,7 +306,7 @@
[self _setupContext];
newEvents = [NSMutableArray array];
fields = [NSArray arrayWithObjects: @"c_name", @"c_owner", @"c_status",
fields = [NSArray arrayWithObjects: @"c_name", @"c_folder", @"c_status",
@"c_title", @"c_startdate", @"c_enddate", @"c_location",
@"c_isallday", nil];
events = [[self _fetchFields: fields
@@ -397,7 +377,7 @@
[self _setupContext];
fields = [NSArray arrayWithObjects: @"c_name", @"c_owner", @"c_status",
fields = [NSArray arrayWithObjects: @"c_name", @"c_folder", @"c_status",
@"c_title", @"c_enddate", nil];
tasks = [[self _fetchFields: fields
UI/Scheduler/UIxCalMainView.m
+10
View File
@@ -23,6 +23,7 @@
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSString.h>
#import <Foundation/NSTimeZone.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
@@ -41,6 +42,15 @@ static NSMutableArray *yearMenuItems = nil;
@implementation UIxCalMainView
- (NSString *) userUTCOffset
{
NSTimeZone *userTZ;
userTZ = [[context activeUser] timeZone];
return [NSString stringWithFormat: @"%d", [userTZ secondsFromGMT]];
}
- (NSArray *) monthMenuItems
{
unsigned int count;
UI/Scheduler/UIxCalendarSelector.h
+7 -13
View File
@@ -23,29 +23,23 @@
#ifndef UIXCALENDARSELECTOR_H
#define UIXCALENDARSELECTOR_H
#import <UI/SOGoUI/UIxComponent.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSMutableDictionary;
@class NSString;
@class iCalPerson;
@interface UIxCalendarSelector : UIxComponent
{
NSMutableDictionary *colors;
NSDictionary *currentCalendarFolder;
NSString *currentCalendarLogin;
NSMutableArray *calendars;
NSDictionary *currentCalendar;
}
- (NSArray *) calendarFolders;
- (NSArray *) calendars;
- (void) setCurrentCalendarFolder: (NSDictionary *) newCurrentCalendarFolder;
- (NSDictionary *) currentCalendarFolder;
- (NSString *) currentCalendarSpanBG;
- (NSString *) currentCalendarLogin;
- (NSString *) currentCalendarStyle;
- (void) setCurrentCalendar: (NSDictionary *) newCalendar;
- (NSDictionary *) currentCalendar;
@end
UI/Scheduler/UIxCalendarSelector.m
+54 -79
View File
@@ -22,34 +22,30 @@
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
#import <NGExtensions/NGExtensions.h>
#import <NGCards/iCalPerson.h>
#import <SOGo/SOGoUser.h>
#import <SOGoUI/UIxComponent.h>
#import <SOGo/NSDictionary+Utilities.h>
#import <Appointments/SOGoAppointmentFolder.h>
#import <Appointments/SOGoAppointmentFolders.h>
#import "UIxCalendarSelector.h"
static inline char
darkenedColor (const char value)
{
char newValue;
// static inline char
// darkenedColor (const char value)
// {
// char newValue;
if (value >= '0' && value <= '9')
newValue = ((value - '0') / 2) + '0';
else if (value >= 'a' && value <= 'f')
newValue = ((value + 10 - 'a') / 2) + '0';
else if (value >= 'A' && value <= 'F')
newValue = ((value + 10 - 'A') / 2) + '0';
else
newValue = value;
// if (value >= '0' && value <= '9')
// newValue = ((value - '0') / 2) + '0';
// else if (value >= 'a' && value <= 'f')
// newValue = ((value + 10 - 'a') / 2) + '0';
// else if (value >= 'A' && value <= 'F')
// newValue = ((value + 10 - 'A') / 2) + '0';
// else
// newValue = value;
return newValue;
}
// return newValue;
// }
static inline NSString *
colorForNumber (unsigned int number)
@@ -90,8 +86,8 @@ colorForNumber (unsigned int number)
{
if ((self = [super init]))
{
colors = nil;
currentCalendarFolder = nil;
calendars = nil;
currentCalendar = nil;
}
return self;
@@ -99,82 +95,61 @@ colorForNumber (unsigned int number)
- (void) dealloc
{
[currentCalendarFolder release];
[colors release];
[calendars release];
[currentCalendar release];
[super dealloc];
}
- (NSArray *) calendarFolders
- (NSArray *) calendars
{
NSArray *calendarFolders;
NSEnumerator *newFolders;
NSDictionary *currentFolder;
unsigned int count;
NSArray *folders;
SOGoAppointmentFolder *folder;
NSMutableDictionary *calendar;
unsigned int count, max;
NSString *folderId, *folderName;
NSNumber *isActive;
calendarFolders = [[self clientObject] calendarFolders];
if (!colors)
if (!calendars)
{
colors = [NSMutableDictionary new];
count = 0;
newFolders = [calendarFolders objectEnumerator];
currentFolder = [newFolders nextObject];
while (currentFolder)
folders = [[self clientObject] subFolders];
max = [folders count];
calendars = [[NSMutableArray alloc] initWithCapacity: max];
for (count = 0; count < max; count++)
{
[colors setObject: colorForNumber (count)
forKey: [currentFolder objectForKey: @"folder"]];
count++;
currentFolder = [newFolders nextObject];
folder = [folders objectAtIndex: count];
calendar = [NSMutableDictionary dictionary];
folderName = [folder nameInContainer];
[calendar setObject:
[NSString stringWithFormat: @"/%@", folderName]
forKey: @"id"];
[calendar setObject: [folder displayName]
forKey: @"displayName"];
[calendar setObject: folderName forKey: @"folder"];
[calendar setObject: colorForNumber (count)
forKey: @"color"];
isActive = [NSNumber numberWithBool: [folder isActive]];
[calendar setObject: isActive forKey: @"active"];
[calendars addObject: calendar];
}
}
return calendarFolders;
return calendars;
}
- (void) setCurrentCalendarFolder: (NSDictionary *) newCurrentCalendarFolder
- (void) setCurrentCalendar: (NSDictionary *) newCalendar
{
ASSIGN (currentCalendarFolder, newCurrentCalendarFolder);
ASSIGN (currentCalendar, newCalendar);
}
- (NSDictionary *) currentCalendarFolder
- (NSDictionary *) currentCalendar
{
return currentCalendarFolder;
}
- (NSString *) currentCalendarSpanBG
{
NSString *colorKey;
colorKey = [currentCalendarFolder objectForKey: @"folder"];
return [colors objectForKey: colorKey];
}
- (NSString *) currentCalendarLogin
{
NSArray *parts;
NSMutableString *login;
login = [NSMutableString string];
parts = [[currentCalendarFolder objectForKey: @"folder"]
componentsSeparatedByString: @":"];
[login appendString: (([parts count] > 1)
? [parts objectAtIndex: 0]
: [[context activeUser] login])];
[login replaceString: @"." withString: @"_"];
[login replaceString: @"#" withString: @"_"];
[login replaceString: @"@" withString: @"_"];
return login;
return currentCalendar;
}
- (NSString *) currentCalendarStyle
{
NSString *color;
color = [self currentCalendarSpanBG];
return [NSString stringWithFormat: @"color: %@; background-color: %@;",
color, color];
return [currentCalendar
keysWithFormat: @"color: %{color}; background-color: %{color};"];
}
@end /* UIxCalendarSelector */
UI/Scheduler/UIxComponentEditor.m
+7 -5
View File
@@ -42,6 +42,7 @@
#import <NGExtensions/NSString+misc.h>
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
#import <SoObjects/Appointments/SOGoAppointmentFolders.h>
#import <SoObjects/Appointments/SOGoAppointmentObject.h>
#import <SoObjects/Appointments/SOGoTaskObject.h>
#import <SoObjects/SOGo/NSString+Utilities.h>
@@ -331,19 +332,20 @@
- (NSArray *) calendarList
{
SOGoAppointmentFolder *folder;
SOGoAppointmentFolder *calendar, *currentCalendar;
SOGoAppointmentFolders *calendarParent;
NSEnumerator *allCalendars;
NSDictionary *currentCalendar;
if (!calendarList)
{
calendarList = [NSMutableArray new];
folder = [[self clientObject] container];
allCalendars = [[folder calendarFolders] objectEnumerator];
calendar = [[self clientObject] container];
calendarParent = [calendar container];
allCalendars = [[calendarParent subFolders] objectEnumerator];
currentCalendar = [allCalendars nextObject];
while (currentCalendar)
{
if ([[currentCalendar objectForKey: @"active"] boolValue])
if ([currentCalendar isActive])
[calendarList addObject: currentCalendar];
currentCalendar = [allCalendars nextObject];
}
UI/Scheduler/UIxTaskEditor.m
+5 -5
View File
@@ -324,14 +324,14 @@
{
NSString *objectId, *method, *uri;
id <WOActionResults> result;
Class clientKlazz;
SOGoAppointmentFolder *co;
clientKlazz = [[self clientObject] class];
objectId = [clientKlazz globallyUniqueObjectId];
co = [self clientObject];
objectId = [co globallyUniqueObjectId];
if ([objectId length] > 0)
{
method = [NSString stringWithFormat:@"%@/Calendar/%@/editAsTask",
[self userFolderPath], objectId];
method = [NSString stringWithFormat:@"%@/%@/editAsTask",
[co soURL], objectId];
uri = [self completeHrefForMethod: method];
result = [self redirectToLocation: uri];
}
UI/Scheduler/product.plist
+39 -14
View File
@@ -28,11 +28,11 @@
};
categories = {
SOGoAppointmentFolder = {
SOGoAppointmentFolders = {
slots = {
toolbar = {
protectedBy = "View";
value = "SOGoAppointmentFolder.toolbar";
value = "SOGoAppointmentFolders.toolbar";
};
};
methods = {
@@ -70,16 +70,6 @@
protectedBy = "View";
pageName = "UIxCalMonthView";
};
newevent = {
protectedBy = "Add Documents, Images, and Files";
pageName = "UIxAppointmentEditor";
actionName = "new";
};
newtask = {
protectedBy = "Add Documents, Images, and Files";
pageName = "UIxTaskEditor";
actionName = "new";
};
show = {
protectedBy = "View";
pageName = "UIxCalView";
@@ -94,15 +84,45 @@
pageName = "UIxAppointmentProposal";
actionName = "proposalSearch";
};
userRights = {
protectedBy = "ReadAcls";
pageName = "UIxCalUserRightsEditor";
};
saveUserRights = {
protectedBy = "SaveAcls";
pageName = "UIxCalUserRightsEditor";
actionName = "saveUserRights";
};
};
};
SOGoAppointmentFolder = {
methods = {
newevent = {
protectedBy = "Add Documents, Images, and Files";
pageName = "UIxAppointmentEditor";
actionName = "new";
};
newtask = {
protectedBy = "Add Documents, Images, and Files";
pageName = "UIxTaskEditor";
actionName = "new";
};
batchDelete = {
protectedBy = "Delete Objects";
pageName = "UIxCalMainView";
actionName = "batchDelete";
};
updateCalendars = {
show = {
protectedBy = "View";
pageName = "UIxCalView";
actionName = "redirectForUIDs";
};
batchDelete = {
protectedBy = "Delete Objects";
pageName = "UIxCalMainView";
actionName = "updateCalendars";
actionName = "batchDelete";
};
editAttendees = {
protectedBy = "View";
@@ -119,6 +139,7 @@
};
};
};
SOGoCalendarComponent = {
};
@@ -158,6 +179,10 @@
pageName = "UIxAppointmentEditor";
actionName = "decline";
};
editAttendees = {
protectedBy = "View";
pageName = "UIxAttendeesEditor";
};
};
};
UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+3 -6
View File
@@ -62,13 +62,10 @@
<ul id="contactFolders">
<var:foreach list="contactFolders" item="currentFolder"
><li var:id="currentContactFolderId"
><var:string value="currentContactFolderName" /></li
var:owner="currentContactFolderOwner"
><var:string value="currentContactFolderName" /></li
></var:foreach
><var:foreach list="additionalFolders"
item="currentAdditionalFolder"
><li var:id="currentAdditionalFolder" class="denied"
><var:string value="currentAdditionalFolderName" /></li
></var:foreach>
>
</ul>
<var:if condition="hasContactSelectionButtons">
UI/Templates/SchedulerUI/UIxCalMainView.wox
+3
View File
@@ -9,6 +9,9 @@
className="UIxPageFrame"
title="title"
>
<script type="text/javascript">
var UTCOffset = <var:string value="userUTCOffset"/>;
</script>
<div class="preload" style="visibility: hidden;">
<img rsrc:src="event-gradient.png"/>
</div>
UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+13 -9
View File
@@ -7,30 +7,34 @@
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label">
<style type="text/css">
<var:foreach list="calendarFolders" item="currentCalendarFolder">
.ownerIs<var:string value="currentCalendarLogin" />
{ background-color: <var:string value="currentCalendarSpanBG" /> !important; }
<var:foreach list="calendars" item="currentCalendar">
.calendarFolder<var:string value="currentCalendar.folder" />
{ background-color: <var:string value="currentCalendar.color" /> !important; }
</var:foreach>
</style>
<div id="calendarSelector">
<span id="calendarSelectorButtons">
<a href="#" class="toolbarButton"
><span class="toolbarButton"><img rsrc:src="add-calendar.png"
label:title="Add..."
label:title="New Calendar..."
/></span></a>
<a href="#" class="toolbarButton"
><span class="toolbarButton"><img rsrc:src="add-user-calendar.png"
label:title="Subscribe to a Calendar..."
/></span></a>
<a href="#" class="toolbarButton"
><span class="toolbarButton"><img rsrc:src="remove-calendar.png"
label:title="Remove"
label:title="Remove the selected Calendar"
/></span></a>
</span>
<ul id="calendarList" multiselect="yes">
<var:foreach list="calendarFolders" item="currentCalendarFolder"
><li class="denied" var:id="currentCalendarFolder.folder">
<var:foreach list="calendars" item="currentCalendar"
><li class="denied" var:id="currentCalendar.id">
<input type="checkbox" class="checkBox"
const:disabled="disabled"
var:checked="currentCalendarFolder.active" />
var:checked="currentCalendar.active" />
<div class="colorBox" var:style="currentCalendarStyle">OO</div>
<var:string value="currentCalendarFolder.displayName"
<var:string value="currentCalendar.displayName"
/></li>
</var:foreach>
</ul>
UI/Templates/UIxPageFrame.wox
+1 -1
View File
@@ -5,7 +5,7 @@
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label"
xmlns:label="OGo:label"
><var:string var:value="doctype" const:escapeHTML="NO" />
<var:if condition="hideFrame" const:negate="YES"
><html>
UI/WebServerResources/ContactsUI.js
+83 -59
View File
@@ -19,8 +19,8 @@ function validateEditorInput(sender) {
errortext = errortext + labels.error_missingrecipients + "\n";
if (errortext.length > 0) {
alert(labels.error_validationfailed.decodeEntities() + ":\n"
+ errortext.decodeEntities());
alert(labels.error_validationfailed + ":\n"
+ errortext);
return false;
}
return true;
@@ -497,28 +497,24 @@ function refreshContacts(contactId) {
}
function onAddressBookNew(event) {
var name = window.prompt(labels["Name of the Address Book"].decodeEntities());
if (name) {
if (document.newAbAjaxRequest) {
document.newAbAjaxRequest.aborted = true;
document.newAbAjaxRequest.abort();
}
var url = ApplicationBaseURL + "/newAb?name=" + name;
document.newAbAjaxRequest
= triggerAjaxRequest(url, newAbCallback, name);
}
createFolder(window.prompt(labels["Name of the Address Book"]),
appendAddressBook);
preventDefault(event);
}
function appendAddressBook(name, folder) {
var li = document.createElement("li");
$("contactFolders").appendChild(li);
li.setAttribute("id", folder);
li.appendChild(document.createTextNode(name));
setEventsOnContactFolder(li);
if (folder)
folder = accessToSubscribedFolder(folder);
else
folder = "/" + name;
var li = document.createElement("li");
$("contactFolders").appendChild(li);
li.setAttribute("id", folder);
li.appendChild(document.createTextNode(name));
setEventsOnContactFolder(li);
}
function newAbCallback(http) {
function newFolderCallback(http) {
if (http.readyState == 4
&& http.status == 201) {
var name = http.callbackData;
@@ -552,60 +548,60 @@ function onAddressBookRemove(event) {
var selector = $("contactFolders");
var nodes = selector.getSelectedNodes();
if (nodes.length > 0) {
nodes[0].deselect();
var folderId = nodes[0].getAttribute("id");
var folderIdElements = folderId.split(":");
if (folderIdElements.length > 1)
unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
else {
var abId = folderIdElements[0].substr(1);
deletePersonalAddressBook(abId);
var personal = $("/personal");
personal.select();
onFolderSelectionChange();
}
nodes[0].deselect();
var folderId = nodes[0].getAttribute("id");
var folderIdElements = folderId.split("_");
if (folderIdElements.length > 1)
unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
else {
var abId = folderIdElements[0].substr(1);
deletePersonalAddressBook(abId);
var personal = $("/personal");
personal.select();
onFolderSelectionChange();
}
}
preventDefault(event);
}
function deletePersonalAddressBook(folderId) {
var label
= labels["Are you sure you want to delete the selected address book?"];
if (window.confirm(label.decodeEntities())) {
if (document.deletePersonalABAjaxRequest) {
document.deletePersonalABAjaxRequest.aborted = true;
document.deletePersonalABAjaxRequest.abort();
}
var url = ApplicationBaseURL + "/" + folderId + "/delete";
document.deletePersonalABAjaxRequest
= triggerAjaxRequest(url, deletePersonalAddressBookCallback,
folderId);
}
var label
= labels["Are you sure you want to delete the selected address book?"];
if (window.confirm(label)) {
if (document.deletePersonalABAjaxRequest) {
document.deletePersonalABAjaxRequest.aborted = true;
document.deletePersonalABAjaxRequest.abort();
}
var url = ApplicationBaseURL + "/" + folderId + "/deleteFolder";
document.deletePersonalABAjaxRequest
= triggerAjaxRequest(url, deletePersonalAddressBookCallback,
folderId);
}
}
function deletePersonalAddressBookCallback(http) {
if (http.readyState == 4) {
if (http.status == 200) {
var ul = $("contactFolders");
if (isHttpStatus204(http.status)) {
var ul = $("contactFolders");
var children = ul.childNodesWithTag("li");
var i = 0;
var done = false;
while (!done && i < children.length) {
var currentFolderId = children[i].getAttribute("id").substr(1);
if (currentFolderId == http.callbackData) {
ul.removeChild(children[i]);
done = true;
}
else
i++;
var children = ul.childNodesWithTag("li");
var i = 0;
var done = false;
while (!done && i < children.length) {
var currentFolderId = children[i].getAttribute("id").substr(1);
if (currentFolderId == http.callbackData) {
ul.removeChild(children[i]);
done = true;
}
}
document.deletePersonalABAjaxRequest = null;
else
i++;
}
}
document.deletePersonalABAjaxRequest = null;
}
else
log ("ajax problem 5: " + http.status);
log ("ajax problem 5: " + http.status);
}
function configureDragHandles() {
@@ -677,6 +673,34 @@ function setEventsOnContactFolder(node) {
onContactFoldersContextMenu.bindAsEventListener(node), false);
}
function onMenuModify(event) {
var folders = $("contactFolders");
var selected = folders.getSelectedNodes()[0];
if (UserLogin == selected.getAttribute("owner")) {
var currentName = selected.innerHTML;
var newName = window.prompt(labels["Address Book Name"],
currentName);
if (newName && newName.length > 0
&& newName != currentName) {
var url = (URLForFolderID(selected.getAttribute("id"))
+ "/renameFolder?name=" + escape(newName.utf8encode()));
triggerAjaxRequest(url, folderRenameCallback,
{node: selected, name: newName});
}
} else
window.alert(clabels["Unable to rename that folder!"]);
}
function folderRenameCallback(http) {
if (http.readyState == 4) {
if (isHttpStatus204(http.status)) {
var dict = http.callbackData;
dict["node"].innerHTML = dict["name"];
}
}
}
function onMenuSharing(event) {
var folders = $("contactFolders");
var selected = folders.getSelectedNodes()[0];
@@ -688,7 +712,7 @@ function onMenuSharing(event) {
function getMenus() {
var menus = {};
menus["contactFoldersMenu"] = new Array(null, "-", null,
menus["contactFoldersMenu"] = new Array(onMenuModify, "-", null,
null, "-", null, "-",
onMenuSharing);
menus["contactMenu"] = new Array(onMenuEditContact, "-",
UI/WebServerResources/MailerUI.js
+9 -9
View File
@@ -207,7 +207,7 @@ function ctxFolderAdd(sender) {
}
function ctxFolderDelete(sender) {
if (!confirm("Delete current folder?").decodeEntities())
if (!confirm("Delete current folder?"))
return false;
// TODO: should use a form-POST or AJAX
@@ -306,10 +306,10 @@ function onMenuDeleteMessage(event) {
function onPrintCurrentMessage(event) {
var rowIds = $("messageList").getSelectedRowsId();
if (rowIds.length == 0) {
window.alert(labels["Please select a message to print."].decodeEntities());
window.alert(labels["Please select a message to print."]);
}
else if (rowIds.length > 1) {
window.alert(labels["Please select only one message to print."].decodeEntities());
window.alert(labels["Please select only one message to print."]);
}
else
window.print();
@@ -492,7 +492,7 @@ function quotasCallback(http) {
var used = mbQuotas["usedSpace"];
var max = mbQuotas["maxQuota"];
var percents = (Math.round(used * 10000 / max) / 100);
var format = labels["quotasFormat"].decodeEntities();
var format = labels["quotasFormat"];
var text = format.formatted(used, max, percents);
window.status = text;
}
@@ -1265,7 +1265,7 @@ function buildMailboxes(accountName, encoded) {
}
function onMenuCreateFolder(event) {
var name = window.prompt(labels["Name :"].decodeEntities(), "");
var name = window.prompt(labels["Name :"], "");
if (name && name.length > 0) {
var folderID = document.menuTarget.getAttribute("dataname");
var urlstr = URLForFolderID(folderID) + "/createFolder?name=" + name;
@@ -1275,7 +1275,7 @@ function onMenuCreateFolder(event) {
function onMenuRenameFolder(event) {
var name = window.prompt(labels["Enter the new name of your folder :"]
.decodeEntities(),
,
"");
if (name && name.length > 0) {
var folderID = document.menuTarget.getAttribute("dataname");
@@ -1285,7 +1285,7 @@ function onMenuRenameFolder(event) {
}
function onMenuDeleteFolder(event) {
var answer = window.confirm(labels["Do you really want to move this folder into the trash ?"].decodeEntities());
var answer = window.confirm(labels["Do you really want to move this folder into the trash ?"]);
if (answer) {
var folderID = document.menuTarget.getAttribute("dataname");
var urlstr = URLForFolderID(folderID) + "/deleteFolder";
@@ -1320,7 +1320,7 @@ function folderOperationCallback(http) {
&& http.status == 204)
initMailboxTree();
else
window.alert(labels["Operation failed"].decodeEntities());
window.alert(labels["Operation failed"]);
}
function folderRefreshCallback(http) {
@@ -1331,7 +1331,7 @@ function folderRefreshCallback(http) {
refreshCurrentFolder();
}
else
window.alert(labels["Operation failed"].decodeEntities());
window.alert(labels["Operation failed"]);
}
function getMenus() {
UI/WebServerResources/SOGoRootPage.css
+5 -5
View File
@@ -12,10 +12,10 @@ DIV#loginScreen
background-color: #d4d0c8;
margin: 0px auto;
margin-top: 5em;
padding: 10px;
padding: 5px;
border: 2px solid transparent;
width: 197px;
height: 300px;
width: 200px;
height: 315px;
-moz-border-top-colors: #efebe7 #fff;
-moz-border-left-colors: #efebe7 #fff;
-moz-border-right-colors: #000 #9c9a94 transparent;
@@ -26,8 +26,8 @@ DIV#loginScreen IMG
{ border: 0px;
margin: 0px;
padding: 0px;
height: 192px;
width: 192px; }
height: 200px;
width: 200px; }
DIV#loginScreen INPUT.textField
{ width: 187px; }
UI/WebServerResources/SchedulerUI.js
+173 -113
View File
@@ -17,7 +17,7 @@ var cachedDateSelectors = new Array();
var contactSelectorAction = 'calendars-contacts';
var eventsToDelete = new Array();
var ownersOfEventsToDelete = new Array();
var calendarsOfEventsToDelete = new Array();
var usersRightsWindowHeight = 250;
var usersRightsWindowWidth = 502;
@@ -27,15 +27,11 @@ function newEvent(sender, type) {
if (!day)
day = currentDay;
var user = UserLogin;
if (sender.parentNode.getAttribute("id") != "toolbar"
&& currentView == "multicolumndayview" && type == "event")
user = sender.parentNode.parentNode.getAttribute("user");
var hour = sender.hour;
if (!hour)
hour = sender.getAttribute("hour");
var urlstr = UserFolderURL + "../" + user + "/Calendar/new" + type;
var folderID = getSelectedFolder();
var urlstr = ApplicationBaseURL + folderID + "/new" + type;
var params = new Array();
if (day)
params.push("day=" + day);
@@ -49,6 +45,18 @@ function newEvent(sender, type) {
return false; /* stop following the link */
}
function getSelectedFolder() {
var folder;
var nodes = $("calendarList").getSelectedRows();
if (nodes.length > 0)
folder = nodes[0].getAttribute("id");
else
folder = "/personal";
return folder;
}
function onMenuNewEventClick(event) {
newEvent(this, "event");
}
@@ -57,13 +65,8 @@ function onMenuNewTaskClick(event) {
newEvent(this, "task");
}
function _editEventId(id, owner) {
var urlBase;
if (owner)
urlBase = UserFolderURL + "../" + owner + "/";
urlBase += "Calendar/"
var urlstr = urlBase + id + "/edit";
function _editEventId(id, calendar) {
var urlstr = ApplicationBaseURL + "/" + calendar + "/" + id + "/edit";
var targetname = "SOGo_edit_" + id;
var win = window.open(urlstr, "_blank",
"width=490,height=470,resizable=0");
@@ -76,10 +79,10 @@ function editEvent() {
for (var i = 0; i < nodes.length; i++)
_editEventId(nodes[i].getAttribute("id"),
nodes[i].owner);
nodes[i].calendar);
} else if (selectedCalendarCell) {
_editEventId(selectedCalendarCell[0].cname,
selectedCalendarCell[0].owner);
selectedCalendarCell[0].calendar);
}
return false; /* stop following the link */
@@ -87,9 +90,9 @@ function editEvent() {
function _batchDeleteEvents() {
var events = eventsToDelete.shift();
var owner = ownersOfEventsToDelete.shift();
var urlstr = (UserFolderURL + "../" + owner + "/Calendar/batchDelete?ids="
+ events.join('/'));
var calendar = calendarsOfEventsToDelete.shift();
var urlstr = (ApplicationBaseURL + "/" + calendar
+ "/batchDelete?ids=" + events.join('/'));
document.deleteEventAjaxRequest = triggerAjaxRequest(urlstr,
deleteEventCallback,
events);
@@ -102,9 +105,9 @@ function deleteEvent() {
if (nodes.length > 0) {
var label = "";
if (listOfSelection == $("tasksList"))
label = labels["taskDeleteConfirmation"].decodeEntities();
label = labels["taskDeleteConfirmation"];
else
label = labels["eventDeleteConfirmation"].decodeEntities();
label = labels["eventDeleteConfirmation"];
if (confirm(label)) {
if (document.deleteEventAjaxRequest) {
@@ -112,33 +115,33 @@ function deleteEvent() {
document.deleteEventAjaxRequest.abort();
}
var sortedNodes = new Array();
var owners = new Array();
var calendars = new Array();
for (var i = 0; i < nodes.length; i++) {
var owner = nodes[i].owner;
if (!sortedNodes[owner]) {
sortedNodes[owner] = new Array();
owners.push(owner);
var calendar = nodes[i].calendar;
if (!sortedNodes[calendar]) {
sortedNodes[calendar] = new Array();
calendars.push(calendar);
}
sortedNodes[owner].push(nodes[i].cname);
sortedNodes[calendar].push(nodes[i].cname);
}
for (var i = 0; i < owners.length; i++) {
ownersOfEventsToDelete.push(owners[i]);
eventsToDelete.push(sortedNodes[owners[i]]);
for (var i = 0; i < calendars.length; i++) {
calendarsOfEventsToDelete.push(calendars[i]);
eventsToDelete.push(sortedNodes[calendars[i]]);
}
_batchDeleteEvents();
}
}
}
else if (selectedCalendarCell) {
var label = labels["eventDeleteConfirmation"].decodeEntities();
var label = labels["eventDeleteConfirmation"];
if (confirm(label)) {
if (document.deleteEventAjaxRequest) {
document.deleteEventAjaxRequest.aborted = true;
document.deleteEventAjaxRequest.abort();
}
eventsToDelete.push([selectedCalendarCell[0].cname]);
ownersOfEventsToDelete.push(selectedCalendarCell[0].owner);
calendarsOfEventsToDelete.push(selectedCalendarCell[0].calendar);
_batchDeleteEvents();
}
}
@@ -168,7 +171,7 @@ function closeInvitationWindow() {
closePseudoWin.style.top = "0px;";
closePseudoWin.style.left = "0px;";
closePseudoWin.style.right = "0px;";
closePseudoWin.appendChild(document.createTextNode(labels["closeThisWindowMessage"].decodeEntities()));
closePseudoWin.appendChild(document.createTextNode(labels["closeThisWindowMessage"]));
document.body.appendChild(closeDiv);
document.body.appendChild(closePseudoWin);
}
@@ -215,7 +218,7 @@ function deleteEventCallback(http) {
}
function editDoubleClickedEvent(event) {
_editEventId(this.cname, this.owner);
_editEventId(this.cname, this.calendar);
preventDefault(event);
event.cancelBubble = true;
@@ -316,7 +319,7 @@ function eventsListCallback(http) {
$(row).addClassName("eventRow");
row.setAttribute("id", escape(data[i][0]));
row.cname = escape(data[i][0]);
row.owner = data[i][1];
row.calendar = data[i][1];
var startDate = new Date();
startDate.setTime(data[i][4] * 1000);
@@ -372,9 +375,8 @@ function tasksListCallback(http) {
Event.observe(listItem, "dblclick", editDoubleClickedEvent.bindAsEventListener(listItem));
listItem.setAttribute("id", data[i][0]);
$(listItem).addClassName(data[i][5]);
var owner = data[i][1];
listItem.owner = owner;
$(listItem).addClassName("ownerIs" + owner.cssSafeString());
listItem.calendar = data[i][1];
$(listItem).addClassName("calendarFolder" + data[i][1]);
listItem.cname = escape(data[i][0]);
var input = document.createElement("input");
input.setAttribute("type", "checkbox");
@@ -429,7 +431,7 @@ function restoreCurrentDaySelection(div) {
}
function changeDateSelectorDisplay(day, keepCurrentDay) {
var url = ApplicationBaseURL + "dateselector";
var url = ApplicationBaseURL + "/dateselector";
if (day)
url += "?day=" + day;
@@ -457,7 +459,7 @@ function changeDateSelectorDisplay(day, keepCurrentDay) {
}
function changeCalendarDisplay(time, newView) {
var url = ApplicationBaseURL + ((newView) ? newView : currentView);
var url = ApplicationBaseURL + "/" + ((newView) ? newView : currentView);
selectedCalendarCell = null;
@@ -583,7 +585,7 @@ function refreshCalendarEvents() {
document.refreshCalendarEventsAjaxRequest.aborted = true;
document.refreshCalendarEventsAjaxRequest.abort();
}
var url = ApplicationBaseURL + "eventslist?sd=" + sd + "&ed=" + ed;
var url = ApplicationBaseURL + "/eventslist?sd=" + sd + "&ed=" + ed;
document.refreshCalendarEventsAjaxRequest
= triggerAjaxRequest(url, refreshCalendarEventsCallback,
{"startDate": sd, "endDate": ed});
@@ -608,9 +610,9 @@ function drawCalendarEvent(eventData, sd, ed) {
var viewEndDate = ed.asDate();
var startDate = new Date();
startDate.setTime(eventData[4] * 1000);
startDate.setTime(eventData[4] * 1000 + (1000 * UTCOffset));
var endDate = new Date();
endDate.setTime(eventData[5] * 1000);
endDate.setTime(eventData[5] * 1000 + (1000 * UTCOffset));
var days = startDate.daysUpTo(endDate);
@@ -636,8 +638,8 @@ function drawCalendarEvent(eventData, sd, ed) {
// log("day: " + days[i]);
if (i == 0) {
var quarters = (startDate.getHours() * 4
+ Math.floor(startDate.getMinutes() / 15));
var quarters = (startDate.getUTCHours() * 4
+ Math.floor(startDate.getUTCMinutes() / 15));
starts = quarters;
startHour = startDate.getDisplayHoursString();
endHour = endDate.getDisplayHoursString();
@@ -648,8 +650,8 @@ function drawCalendarEvent(eventData, sd, ed) {
var ends;
var lasts;
if (i == days.length - 1) {
var quarters = (endDate.getHours() * 4
+ Math.ceil(endDate.getMinutes() / 15));
var quarters = (endDate.getUTCHours() * 4
+ Math.ceil(endDate.getUTCMinutes() / 15));
ends = quarters;
}
else
@@ -706,11 +708,11 @@ function drawCalendarEvent(eventData, sd, ed) {
}
}
function newEventDIV(cname, owner, starts, lasts,
function newEventDIV(cname, calendar, starts, lasts,
startHour, endHour, title) {
var eventDiv = document.createElement("div");
eventDiv.cname = escape(cname);
eventDiv.owner = owner;
eventDiv.calendar = calendar;
$(eventDiv).addClassName("event");
$(eventDiv).addClassName("starts" + starts);
$(eventDiv).addClassName("lasts" + lasts);
@@ -723,7 +725,7 @@ function newEventDIV(cname, owner, starts, lasts,
var innerDiv = document.createElement("div");
eventDiv.appendChild(innerDiv);
$(innerDiv).addClassName("eventInside");
$(innerDiv).addClassName("ownerIs" + owner.cssSafeString());
$(innerDiv).addClassName("calendarFolder" + calendar);
var gradientDiv = document.createElement("div");
innerDiv.appendChild(gradientDiv);
@@ -881,7 +883,7 @@ function _loadEventHref(href) {
document.eventsListAjaxRequest.aborted = true;
document.eventsListAjaxRequest.abort();
}
var url = ApplicationBaseURL + href;
var url = ApplicationBaseURL + "/" + href;
document.eventsListAjaxRequest
= triggerAjaxRequest(url, eventsListCallback, href);
@@ -897,7 +899,7 @@ function _loadTasksHref(href) {
document.tasksListAjaxRequest.aborted = true;
document.tasksListAjaxRequest.abort();
}
url = ApplicationBaseURL + href;
url = ApplicationBaseURL + "/" + href;
var tasksList = $("tasksList");
var selectedIds;
@@ -1119,7 +1121,6 @@ function onShowCompletedTasks(event) {
function updateTaskStatus(event) {
var taskId = this.parentNode.getAttribute("id");
var taskOwner = this.parentNode.owner;
var newStatus = (this.checked ? 1 : 0);
var http = createHTTPClient();
@@ -1128,9 +1129,8 @@ function updateTaskStatus(event) {
//log("update task status: " + taskId + " to " + this.checked);
event.cancelBubble = true;
url = (UserFolderURL + "../" + taskOwner
+ "/Calendar/" + taskId
+ "/changeStatus?status=" + newStatus);
url = (ApplicationBaseURL + "/" + this.parentNode.calendar
+ "/" + taskId + "/changeStatus?status=" + newStatus);
if (http) {
// log ("url: " + url);
@@ -1162,10 +1162,11 @@ function updateCalendarStatus(event) {
}
}
if (!list.length) {
list.push(UserLogin);
nodes[0].childNodesWithTag("input")[0].checked = true;
}
// if (!list.length) {
// list.push(UserLogin);
// nodes[0].childNodesWithTag("input")[0].checked = true;
// }
// ApplicationBaseURL = (UserFolderURL + "Groups/_custom_"
// + list.join(",") + "/Calendar/");
@@ -1207,7 +1208,7 @@ function calendarStatusCallback(http) {
}
function calendarEntryCallback(http) {
if (http.readyState == 4) {
if (http.readyState == 4) {
var denied = !isHttpStatus204(http.status);
var entry = $(http.callbackData);
if (denied)
@@ -1339,79 +1340,94 @@ function initCalendarSelector() {
}
var links = $("calendarSelectorButtons").childNodesWithTag("a");
Event.observe(links[0], "click", onCalendarAdd);
Event.observe(links[1], "click", onCalendarRemove);
Event.observe(links[0], "click", onCalendarNew);
Event.observe(links[1], "click", onCalendarAdd);
Event.observe(links[2], "click", onCalendarRemove);
}
function onCalendarNew(event) {
createFolder(window.prompt(labels["Name of the Calendar"]),
appendCalendar);
preventDefault(event);
}
function onCalendarAdd(event) {
openUserFolderSelector(onFolderSubscribeCB, "calendar");
preventDefault(event);
openUserFolderSelector(onFolderSubscribeCB, "calendar");
preventDefault(event);
}
function appendCalendar(folderName, folder) {
var calendarList = $("calendarList");
var lis = calendarList.childNodesWithTag("li");
var color = indexColor(lis.length);
//log ("color: " + color);
if (folder)
folder = accessToSubscribedFolder(folder);
else
folder = "/" + folderName;
var li = document.createElement("li");
calendarList.appendChild(li);
// log ("append: " + folderName + "; folder: " + folder);
var checkBox = document.createElement("input");
checkBox.setAttribute("type", "checkbox");
li.appendChild(checkBox);
var calendarList = $("calendarList");
var lis = calendarList.childNodesWithTag("li");
var color = indexColor(lis.length + 100);
//log ("color: " + color);
var li = document.createElement("li");
calendarList.appendChild(li);
var checkBox = document.createElement("input");
checkBox.setAttribute("type", "checkbox");
li.appendChild(checkBox);
li.appendChild(document.createTextNode(" "));
li.appendChild(document.createTextNode(" "));
var colorBox = document.createElement("div");
li.appendChild(colorBox);
li.appendChild(document.createTextNode(" " + folderName));
colorBox.appendChild(document.createTextNode("OO"));
var colorBox = document.createElement("div");
li.appendChild(colorBox);
li.appendChild(document.createTextNode(" " + folderName));
colorBox.appendChild(document.createTextNode("OO"));
li.setAttribute("id", folder);
Event.observe(li, "mousedown", listRowMouseDownHandler);
Event.observe(li, "click", onRowClick);
$(checkBox).addClassName("checkBox");
li.setAttribute("id", folder);
Event.observe(li, "mousedown", listRowMouseDownHandler);
Event.observe(li, "click", onRowClick);
$(checkBox).addClassName("checkBox");
Event.observe(checkBox, "click", updateCalendarStatus.bindAsEventListener(checkBox));
Event.observe(checkBox, "click",
updateCalendarStatus.bindAsEventListener(checkBox));
$(colorBox).addClassName("colorBox");
if (color) {
$(colorBox).setStyle({ color: color,
backgroundColor: color });
}
$(colorBox).addClassName("colorBox");
if (color)
$(colorBox).setStyle({color: color,
backgroundColor: color});
var contactId = folder.split(":")[0];
var url = URLForFolderID(folder) + "/canAccessContent";
triggerAjaxRequest(url, calendarEntryCallback, folder);
var url = URLForFolderID(folder) + "/canAccessContent";
triggerAjaxRequest(url, calendarEntryCallback, folder);
if (!document.styleSheets) return;
var theRules = new Array();
var lastSheet = document.styleSheets[document.styleSheets.length - 1];
if (lastSheet.insertRule) { // Mozilla
lastSheet.insertRule('.ownerIs' + contactId.cssSafeString() + ' {'
+ ' background-color: '
+ color
+ ' !important; }', 0);
}
else { // IE
lastSheet.addRule('.ownerIs' + contactId.cssSafeString(),
' background-color: '
+ color
+ ' !important; }');
}
if (!document.styleSheets) return;
var theRules = new Array();
var lastSheet = document.styleSheets[document.styleSheets.length - 1];
if (lastSheet.insertRule) { // Mozilla
lastSheet.insertRule('.calendarFolder' + folder.substr(1) + ' {'
+ ' background-color: '
+ color
+ ' !important; }', 0);
}
else { // IE
lastSheet.addRule('.calendarFolder' + folder.substr(1),
' background-color: '
+ color
+ ' !important; }');
}
}
function onFolderSubscribeCB(folderData) {
var folder = $(folderData["folder"]);
if (!folder)
appendCalendar(folderData["folderName"], folderData["folder"]);
appendCalendar(folderData["folderName"], folderData["folder"]);
}
function onFolderUnsubscribeCB(folderId) {
var node = $(folderId);
node.parentNode.removeChild(node);
var node = $(folderId);
node.parentNode.removeChild(node);
refreshEvents();
refreshTasks();
changeCalendarDisplay();
}
function onCalendarRemove(event) {
@@ -1419,15 +1435,59 @@ function onCalendarRemove(event) {
if (nodes.length > 0) {
nodes[0].deselect();
var folderId = nodes[0].getAttribute("id");
var folderIdElements = folderId.split(":");
var folderIdElements = folderId.split("_");
if (folderIdElements.length > 1) {
unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
}
else {
var calId = folderIdElements[0].substr(1);
deletePersonalCalendar(calId);
}
}
preventDefault(event);
}
function deletePersonalCalendar(folderId) {
var label
= labels["Are you sure you want to delete the selected calendar?"];
if (window.confirm(label)) {
if (document.deletePersonalCalendarAjaxRequest) {
document.deletePersonalCalendarAjaxRequest.aborted = true;
document.deletePersonalCalendarAjaxRequest.abort();
}
var url = ApplicationBaseURL + "/" + folderId + "/deleteFolder";
document.deletePersonalCalendarAjaxRequest
= triggerAjaxRequest(url, deletePersonalCalendarCallback, folderId);
}
}
function deletePersonalCalendarCallback(http) {
if (http.readyState == 4) {
if (isHttpStatus204(http.status)) {
var ul = $("calendarList");
var children = ul.childNodesWithTag("li");
var i = 0;
var done = false;
while (!done && i < children.length) {
var currentFolderId = children[i].getAttribute("id").substr(1);
if (currentFolderId == http.callbackData) {
ul.removeChild(children[i]);
done = true;
}
else
i++;
}
refreshEvents();
refreshTasks();
changeCalendarDisplay();
}
document.deletePersonalCalendarAjaxRequest = null;
}
else
log ("ajax problem 5: " + http.status);
}
function configureLists() {
var list = $("tasksList");
list.multiselect = true;
UI/WebServerResources/UIxAclEditor.js
+1 -2
View File
@@ -88,8 +88,7 @@ function subscribeToFolder(refreshCallback, refreshCallbackData) {
refreshCallbackData["folder"]);
}
else
refreshCallbackData["window"].alert(clabels["You cannot subscribe to a folder that you own!"]
.decodeEntities());
refreshCallbackData["window"].alert(clabels["You cannot subscribe to a folder that you own!"]);
}
function openRightsForUserID(userID) {
UI/WebServerResources/UIxAppointmentEditor.js
+8 -8
View File
@@ -43,36 +43,36 @@ function validateAptEditor() {
e = $('summary');
if (e.value.length == 0) {
if (!confirm(labels.validate_notitle.decodeEntities()))
if (!confirm(labels.validate_notitle))
return false;
}
e = $('startTime_date');
if (e.value.length != 10) {
alert(labels.validate_invalid_startdate.decodeEntities());
alert(labels.validate_invalid_startdate);
return false;
}
startdate = e.calendar.prs_date(e.value);
if (startdate == null) {
alert(labels.validate_invalid_startdate.decodeEntities());
alert(labels.validate_invalid_startdate);
return false;
}
e = $('endTime_date');
if (e.value.length != 10) {
alert(labels.validate_invalid_enddate.decodeEntities());
alert(labels.validate_invalid_enddate);
return false;
}
enddate = e.calendar.prs_date(e.value);
if (enddate == null) {
alert(labels.validate_invalid_enddate.decodeEntities());
alert(labels.validate_invalid_enddate);
return false;
}
// cuicui = '';
tmpdate = uixEarlierDate(startdate, enddate);
if (tmpdate == enddate) {
// window.alert(cuicui);
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (tmpdate == null /* means: same date */) {
@@ -83,14 +83,14 @@ function validateAptEditor() {
end = parseInt(document.forms[0]['endTime_time_hour'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (start == end) {
start = parseInt(document.forms[0]['startTime_time_minute'].value);
end = parseInt(document.forms[0]['endTime_time_minute'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
}
UI/WebServerResources/UIxComponentEditor.js
+1 -1
View File
@@ -24,7 +24,7 @@ function onPopupUrlWindow(event) {
preventDefault(event);
var urlInput = document.getElementById("url");
var newUrl = window.prompt(labels["Target:"].decodeEntities(), urlInput.value);
var newUrl = window.prompt(labels["Target:"], urlInput.value);
if (newUrl != null) {
var documentHref = $("documentHref");
var documentLabel = $("documentLabel");
UI/WebServerResources/UIxContactEditor.js
+2 -2
View File
@@ -84,13 +84,13 @@ function validateContactEditor() {
if (e.value.length == 0)
return true;
if (uixEmailRegex.test(e.value) != true)
return confirm(labels.invalidemailwarn.decodeEntities());
return confirm(labels.invalidemailwarn);
e = $('homeMail');
if (e.value.length == 0)
return true;
if (uixEmailRegex.test(e.value) != true)
return confirm(labels.invalidemailwarn.decodeEntities());
return confirm(labels.invalidemailwarn);
return true;
}
UI/WebServerResources/UIxContactsUserFolders.js
+1 -1
View File
@@ -30,7 +30,7 @@ function addLineToTree(tree, parent, line) {
for (var i = 1; i < nodes.length; i++) {
var folderInfos = nodes[i].split(":");
var icon = ResourcesURL + '/';
if (folderInfos[2] == 'contact')
if (folderInfos[2] == 'Contacts')
icon += 'tb-mail-addressbook-flat-16x16.png';
else
icon += 'calendar-folder-16x16.png';
UI/WebServerResources/UIxMailEditor.js
+1 -2
View File
@@ -133,8 +133,7 @@ function validateEditorInput(sender) {
errortext = errortext + labels.error_missingrecipients + "\n";
if (errortext.length > 0) {
alert(labels.error_validationfailed.decodeEntities() + ":\n"
+ errortext.decodeEntities());
alert(labels.error_validationfailed + ":\n" + errortext);
return false;
}
return true;
UI/WebServerResources/UIxTaskEditor.js
+5 -5
View File
@@ -24,7 +24,7 @@ function validateDate(date, label) {
dateValue = date.calendar.prs_date(date.value);
if (date.value.length != 10 || !dateValue) {
alert(label.decodeEntities());
alert(label);
result = false;
} else
result = dateValue;
@@ -37,7 +37,7 @@ function validateTaskEditor() {
e = document.getElementById('summary');
if (e.value.length == 0
&& !confirm(labels.validate_notitle.decodeEntities()))
&& !confirm(labels.validate_notitle))
return false;
e = document.getElementById('startTime_date');
@@ -58,7 +58,7 @@ function validateTaskEditor() {
tmpdate = uixEarlierDate(startdate, enddate);
if (tmpdate == enddate) {
// window.alert(cuicui);
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (tmpdate == null /* means: same date */) {
@@ -69,14 +69,14 @@ function validateTaskEditor() {
end = parseInt(document.forms[0]['dueTime_time_hour'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (start == end) {
start = parseInt(document.forms[0]['startTime_time_minute'].value);
end = parseInt(document.forms[0]['dueTime_time_minute'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
}
UI/WebServerResources/add-user-calendar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

UI/WebServerResources/generic.js
+81 -22
View File
@@ -983,6 +983,7 @@ function subscribeToFolder(refreshCallback, refreshCallbackData) {
document.subscriptionAjaxRequest.aborted = true;
document.subscriptionAjaxRequest.abort();
}
var rfCbData = { method: refreshCallback, data: refreshCallbackData };
document.subscriptionAjaxRequest = triggerAjaxRequest(url,
folderSubscriptionCallback,
@@ -1006,29 +1007,42 @@ function folderUnsubscriptionCallback(http) {
}
function unsubscribeFromFolder(folder, refreshCallback, refreshCallbackData) {
if (document.body.hasClassName("popup")) {
window.opener.unsubscribeFromFolder(folder, refreshCallback,
refreshCallbackData);
}
else {
var folderData = folder.split(":");
var username = folderData[0];
var folderPath = folderData[1];
if (username != UserLogin) {
var url = (UserFolderURL + "../" + username
+ "/" + folderPath + "/unsubscribe");
if (document.unsubscriptionAjaxRequest) {
document.unsubscriptionAjaxRequest.aborted = true;
document.unsubscriptionAjaxRequest.abort();
}
var rfCbData = { method: refreshCallback, data: refreshCallbackData };
document.unsubscriptionAjaxRequest
= triggerAjaxRequest(url, folderUnsubscriptionCallback,
rfCbData);
if (document.body.hasClassName("popup")) {
window.opener.unsubscribeFromFolder(folder, refreshCallback,
refreshCallbackData);
}
else {
var folderData = folder.split("+");
var username = folderData[0];
var folderPath = folderData[1];
if (username != UserLogin) {
var url = (ApplicationBaseURL + folder + "/unsubscribe");
if (document.unsubscriptionAjaxRequest) {
document.unsubscriptionAjaxRequest.aborted = true;
document.unsubscriptionAjaxRequest.abort();
}
else
window.alert(clabels["You cannot unsubscribe from a folder that you own!"].decodeEntities());
}
var rfCbData = { method: refreshCallback, data: refreshCallbackData };
document.unsubscriptionAjaxRequest
= triggerAjaxRequest(url, folderUnsubscriptionCallback,
rfCbData);
}
else
window.alert(clabels["You cannot unsubscribe from a folder that you own!"].decodeEntities());
}
}
function accessToSubscribedFolder(serverFolder) {
var folder;
var parts = serverFolder.split(":");
if (parts.length > 1) {
var paths = parts[1].split("/");
folder = "/" + parts[0] + "_" + paths[2];
}
else
folder = serverFolder;
return folder;
}
function listRowMouseDownHandler(event) {
@@ -1289,12 +1303,25 @@ function onLoadHandler(event) {
configureDragHandles();
configureSortableTableHeaders();
configureLinkBanner();
translateLabels();
var progressImage = $("progressIndicator");
if (progressImage)
progressImage.parentNode.removeChild(progressImage);
Event.observe(document.body, "contextmenu", onBodyClickContextMenu);
}
function translateLabels() {
if (typeof labels != "undefined") {
for (var key in labels)
labels[key] = labels[key].decodeEntities();
}
if (typeof clabels != "undefined") {
for (var key in clabels)
clabels[key] = clabels[key].decodeEntities();
}
}
function onBodyClickContextMenu(event) {
preventDefault(event);
}
@@ -1340,6 +1367,38 @@ function configureLinkBanner() {
}
}
/* folder creation */
function createFolder(name, okCB, notOkCB) {
if (name) {
if (document.newFolderAjaxRequest) {
document.newFolderAjaxRequest.aborted = true;
document.newFolderAjaxRequest.abort();
}
var url = ApplicationBaseURL + "/createFolder?name=" + name;
document.newFolderAjaxRequest
= triggerAjaxRequest(url, createFolderCallback,
{name: name,
okCB: okCB,
notOkCB: notOkCB});
}
}
function createFolderCallback(http) {
if (http.readyState == 4) {
var data = http.callbackData;
if (http.status == 201) {
if (data.okCB)
data.okCB(data.name, "/" + http.responseText);
}
else {
if (data.notOkCB)
data.notOkCB(name);
else
log("ajax problem:" + http.status);
}
}
}
addEvent(window, 'load', onLoadHandler);
function parent$(element) {
UI/WebServerResources/lori-login.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB