New administration module
Monotone-Parent: 8542ad5d3580057a3e361ef25f6c24df41841c52 Monotone-Revision: f6040f9d8af2e51778344f97f1c76c9125f0af7b Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-08-13T10:40:25 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
5eb391b009
commit
8e55eeb4b9
|
@ -1,3 +1,8 @@
|
||||||
|
2009-08-14 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
|
* UI/AdministrationUI/UIxAdministration.m: new administration
|
||||||
|
module. Initial functionalities are limited to ACLs management.
|
||||||
|
|
||||||
2009-08-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2009-08-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* Tools/SOGoToolRestore.m: new "sogo-tool" utility that restores
|
* Tools/SOGoToolRestore.m: new "sogo-tool" utility that restores
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
/* AdministrationUIProduct.m - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2009 Inverse inc.
|
||||||
|
*
|
||||||
|
* Author: Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import <Foundation/NSObject.h>
|
||||||
|
|
||||||
|
@interface AdministrationUIProduct : NSObject
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation AdministrationUIProduct
|
||||||
|
|
||||||
|
@end
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,32 @@
|
||||||
|
# GNUstep makefile
|
||||||
|
|
||||||
|
include ../common.make
|
||||||
|
|
||||||
|
BUNDLE_NAME = AdministrationUI
|
||||||
|
|
||||||
|
AdministrationUI_PRINCIPAL_CLASS = AdministrationUIProduct
|
||||||
|
|
||||||
|
AdministrationUI_LANGUAGES = BrazilianPortuguese Czech Dutch English French German Hungarian Italian Spanish Welsh Russian
|
||||||
|
|
||||||
|
AdministrationUI_OBJC_FILES = \
|
||||||
|
AdministrationUIProduct.m \
|
||||||
|
\
|
||||||
|
UIxAdministration.m \
|
||||||
|
UIxAdministrationFilterPanel.m
|
||||||
|
|
||||||
|
AdministrationUI_RESOURCE_FILES += \
|
||||||
|
Version \
|
||||||
|
product.plist
|
||||||
|
|
||||||
|
#AdministrationUI_RESOURCE_FILES += \
|
||||||
|
# Toolbars/UIxAdministration.toolbar
|
||||||
|
|
||||||
|
AdministrationUI_LOCALIZED_RESOURCE_FILES += \
|
||||||
|
Localizable.strings \
|
||||||
|
|
||||||
|
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
|
||||||
|
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
|
||||||
|
|
||||||
|
-include GNUmakefile.preamble
|
||||||
|
include $(GNUSTEP_MAKEFILES)/bundle.make
|
||||||
|
-include GNUmakefile.postamble
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,37 @@
|
||||||
|
/* UIxPreferences.h - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2009 Inverse inc.
|
||||||
|
*
|
||||||
|
* Author: Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef UIXADMINISTRATION_H
|
||||||
|
#define UIXADMINISTRATION_H
|
||||||
|
|
||||||
|
#import <SOGoUI/UIxComponent.h>
|
||||||
|
|
||||||
|
@class SOGoUser;
|
||||||
|
|
||||||
|
@interface UIxAdministration : UIxComponent
|
||||||
|
{
|
||||||
|
SOGoUser *user;
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
#endif /* UIXADMINISTRATION_H */
|
|
@ -0,0 +1,55 @@
|
||||||
|
/* UIxAdministration.m - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2009 Inverse inc.
|
||||||
|
*
|
||||||
|
* Author: Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import <NGObjWeb/WOContext.h>
|
||||||
|
#import <NGObjWeb/WORequest.h>
|
||||||
|
|
||||||
|
#import <SoObjects/SOGo/SOGoUser.h>
|
||||||
|
//#import "../../Main/SOGo.h"
|
||||||
|
|
||||||
|
#import "UIxAdministration.h"
|
||||||
|
|
||||||
|
@implementation UIxAdministration
|
||||||
|
|
||||||
|
- (id) init
|
||||||
|
{
|
||||||
|
if ((self = [super init]))
|
||||||
|
{
|
||||||
|
ASSIGN (user, [context activeUser]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void) dealloc
|
||||||
|
{
|
||||||
|
[user release];
|
||||||
|
[super dealloc];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL) shouldTakeValuesFromRequest: (WORequest *) request
|
||||||
|
inContext: (WOContext*) context
|
||||||
|
{
|
||||||
|
return [[request method] isEqualToString: @"POST"];
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
|
@ -0,0 +1,119 @@
|
||||||
|
/* UIxAdministrationFilterPanel.m - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2009 Inverse inc.
|
||||||
|
*
|
||||||
|
* Author: Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import <SOGoUI/UIxComponent.h>
|
||||||
|
|
||||||
|
@interface UIxAdministrationFilterPanel : UIxComponent
|
||||||
|
{
|
||||||
|
NSString *searchText;
|
||||||
|
NSString *searchCriteria;
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation UIxAdministrationFilterPanel
|
||||||
|
|
||||||
|
static NSArray *filters = nil;
|
||||||
|
|
||||||
|
+ (void) initialize
|
||||||
|
{
|
||||||
|
NSMutableDictionary *md;
|
||||||
|
NSMutableArray *ma;
|
||||||
|
|
||||||
|
md = [[NSMutableDictionary alloc] initWithCapacity:8];
|
||||||
|
ma = [[NSMutableArray alloc] initWithCapacity:4];
|
||||||
|
|
||||||
|
filters = [ma copy];
|
||||||
|
[md release]; md = nil;
|
||||||
|
[ma release]; ma = nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (id) init
|
||||||
|
{
|
||||||
|
if ((self = [super init]))
|
||||||
|
{
|
||||||
|
searchText = nil;
|
||||||
|
searchCriteria = nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void) dealloc
|
||||||
|
{
|
||||||
|
[searchCriteria release];
|
||||||
|
[searchText release];
|
||||||
|
[super dealloc];
|
||||||
|
}
|
||||||
|
|
||||||
|
/* accessors */
|
||||||
|
|
||||||
|
- (void) setSearchText: (NSString *)_txt
|
||||||
|
{
|
||||||
|
ASSIGNCOPY(searchText, _txt);
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void) setSearchCriteria: (NSString *)_txt
|
||||||
|
{
|
||||||
|
ASSIGNCOPY(searchText, _txt);
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString *) searchText
|
||||||
|
{
|
||||||
|
if (!searchText)
|
||||||
|
searchText = [[self queryParameterForKey: @"search"] copy];
|
||||||
|
|
||||||
|
return searchText;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString *) searchCriteria
|
||||||
|
{
|
||||||
|
if (!searchCriteria)
|
||||||
|
searchCriteria = [[self queryParameterForKey: @"criteria"] copy];
|
||||||
|
|
||||||
|
return searchCriteria;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* filters */
|
||||||
|
|
||||||
|
- (NSArray *) filters
|
||||||
|
{
|
||||||
|
return filters;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* qualifiers */
|
||||||
|
|
||||||
|
- (NSString *) filterLabel
|
||||||
|
{
|
||||||
|
#if 1
|
||||||
|
return [[[self context] page] labelForKey: @"filter"];
|
||||||
|
#else
|
||||||
|
return [self valueForKey: @"filter"];
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString *) selectedFilter
|
||||||
|
{
|
||||||
|
return [self queryParameterForKey: @"filterpopup"];
|
||||||
|
}
|
||||||
|
|
||||||
|
@end /* UIxAdministrationFilterPanel */
|
|
@ -0,0 +1 @@
|
||||||
|
# nothing here
|
|
@ -0,0 +1,12 @@
|
||||||
|
/* this file is in UTF-8 format! */
|
||||||
|
|
||||||
|
"Modules" = "Modules";
|
||||||
|
|
||||||
|
/* Modules short names */
|
||||||
|
"ACLs" = "ACLs";
|
||||||
|
|
||||||
|
/* Modules titles */
|
||||||
|
"ACLs_title" = "Users folders ACLs management";
|
||||||
|
|
||||||
|
/* Modules descriptions */
|
||||||
|
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
|
@ -0,0 +1,22 @@
|
||||||
|
{ /* -*-javascript-*- */
|
||||||
|
requires = ( MAIN, MainUI, CommonUI );
|
||||||
|
|
||||||
|
publicResources = (
|
||||||
|
);
|
||||||
|
|
||||||
|
factories = {
|
||||||
|
};
|
||||||
|
|
||||||
|
categories = {
|
||||||
|
SOGoUserFolder = {
|
||||||
|
slots = {
|
||||||
|
};
|
||||||
|
methods = {
|
||||||
|
Administration = {
|
||||||
|
protectedBy = "View";
|
||||||
|
pageName = "UIxAdministration";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -10,6 +10,7 @@
|
||||||
"Address Book" = "Address Book";
|
"Address Book" = "Address Book";
|
||||||
"Mail" = "Mail";
|
"Mail" = "Mail";
|
||||||
"Preferences" = "Preferences";
|
"Preferences" = "Preferences";
|
||||||
|
"Administration" = "Administration";
|
||||||
"Disconnect" = "Disconnect";
|
"Disconnect" = "Disconnect";
|
||||||
"Right Administration" = "Right Administration";
|
"Right Administration" = "Right Administration";
|
||||||
"Log Console (dev.)" = "Log Console (dev.)";
|
"Log Console (dev.)" = "Log Console (dev.)";
|
||||||
|
|
|
@ -100,8 +100,8 @@ static NSString *siteFavicon = nil;
|
||||||
{
|
{
|
||||||
return (@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
return (@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
||||||
@"<!DOCTYPE html"
|
@"<!DOCTYPE html"
|
||||||
@" PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
|
@" PUBLIC \"-//W3C//DTD XHTML 1.1//EN\""
|
||||||
@" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");
|
@" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Help URL/target */
|
/* Help URL/target */
|
||||||
|
@ -153,6 +153,11 @@ static NSString *siteFavicon = nil;
|
||||||
return [self relativePathToUserFolderSubPath: @"preferences"];
|
return [self relativePathToUserFolderSubPath: @"preferences"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSString *) relativeAdministrationPath
|
||||||
|
{
|
||||||
|
return [self relativePathToUserFolderSubPath: @"Administration/"];
|
||||||
|
}
|
||||||
|
|
||||||
- (NSString *) logoffPath
|
- (NSString *) logoffPath
|
||||||
{
|
{
|
||||||
return [self relativePathToUserFolderSubPath: @"logoff"];
|
return [self relativePathToUserFolderSubPath: @"logoff"];
|
||||||
|
@ -359,6 +364,11 @@ static NSString *siteFavicon = nil;
|
||||||
return [self _moduleIs: @"MailerUI"];
|
return [self _moduleIs: @"MailerUI"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL) isAdministration
|
||||||
|
{
|
||||||
|
return [self _moduleIs: @"AdministrationUI"];
|
||||||
|
}
|
||||||
|
|
||||||
- (void) setToolbar: (NSString *) newToolbar
|
- (void) setToolbar: (NSString *) newToolbar
|
||||||
{
|
{
|
||||||
ASSIGN (toolbar, newToolbar);
|
ASSIGN (toolbar, newToolbar);
|
||||||
|
|
|
@ -4,16 +4,17 @@
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
|
|
||||||
SUBPROJECTS += \
|
SUBPROJECTS += \
|
||||||
SOGoUI \
|
SOGoUI \
|
||||||
SOGoElements \
|
SOGoElements \
|
||||||
Common \
|
Common \
|
||||||
Contacts \
|
Contacts \
|
||||||
MailerUI \
|
MailerUI \
|
||||||
MailPartViewers \
|
MailPartViewers \
|
||||||
MainUI \
|
MainUI \
|
||||||
PreferencesUI \
|
PreferencesUI \
|
||||||
Scheduler \
|
Scheduler \
|
||||||
Templates \
|
AdministrationUI \
|
||||||
|
Templates \
|
||||||
WebServerResources
|
WebServerResources
|
||||||
|
|
||||||
include $(GNUSTEP_MAKEFILES)/aggregate.make
|
include $(GNUSTEP_MAKEFILES)/aggregate.make
|
||||||
|
|
|
@ -384,18 +384,12 @@ static NSString *LDAPContactInfoAttribute = nil;
|
||||||
SOGoUserFolder *userFolder;
|
SOGoUserFolder *userFolder;
|
||||||
|
|
||||||
folderType = [self queryParameterForKey: @"type"];
|
folderType = [self queryParameterForKey: @"type"];
|
||||||
if ([folderType length])
|
userFolder = [self clientObject];
|
||||||
{
|
folders
|
||||||
userFolder = [self clientObject];
|
= [userFolder foldersOfType: folderType
|
||||||
folders
|
forUID: [userFolder ownerInContext: context]];
|
||||||
= [userFolder foldersOfType: folderType
|
result = [self _foldersResponseForResults: folders];
|
||||||
forUID: [userFolder ownerInContext: context]];
|
|
||||||
result = [self _foldersResponseForResults: folders];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
result = [NSException exceptionWithHTTPStatus: 400
|
|
||||||
reason: @"missing 'type' parameter"];
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,17 @@
|
||||||
<a id="preferencesBannerLink"
|
<a id="preferencesBannerLink"
|
||||||
var:href="relativePreferencesPath"
|
var:href="relativePreferencesPath"
|
||||||
><var:string label:value="Preferences" /></a>
|
><var:string label:value="Preferences" /></a>
|
||||||
|
<var:if condition="isSuperUser">
|
||||||
|
|
|
||||||
|
<var:if condition="isAdministration">
|
||||||
|
<span class="active"><var:string label:value="Admnistration"
|
||||||
|
/></span>
|
||||||
|
</var:if>
|
||||||
|
<var:if condition="isAdministration" const:negate="YES">
|
||||||
|
<a id="administrationBannerLink" var:href="relativeAdministrationPath"
|
||||||
|
><var:string label:value="Administration" /></a>
|
||||||
|
</var:if>
|
||||||
|
</var:if>
|
||||||
<var:if condition="context.isUIxDebugEnabled"
|
<var:if condition="context.isUIxDebugEnabled"
|
||||||
>| <a id="consoleBannerLink"
|
>| <a id="consoleBannerLink"
|
||||||
href="#"><var:string
|
href="#"><var:string
|
||||||
|
|
|
@ -131,6 +131,7 @@ var SOGoDragHandlesInterface = {
|
||||||
|
|
||||||
document.body.setAttribute('style', '');
|
document.body.setAttribute('style', '');
|
||||||
document.body.setStyle({ cursor: "default" });
|
document.body.setStyle({ cursor: "default" });
|
||||||
|
this.fire("handle:dragged");
|
||||||
|
|
||||||
Event.stop(event);
|
Event.stop(event);
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue