From 9dbb77047e5d7c3cf7b8376c177d732496849e8a Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 14 Jun 2021 11:38:43 -0400 Subject: [PATCH] chore: remove SOGoUI/UIxJSClose --- UI/Common/UIxAclEditor.m | 18 ---------- UI/SOGoUI/GNUmakefile | 2 -- UI/SOGoUI/UIxComponent.h | 2 -- UI/SOGoUI/UIxComponent.m | 13 +------- UI/SOGoUI/UIxJSClose.h | 41 ----------------------- UI/SOGoUI/UIxJSClose.m | 65 ------------------------------------- UI/Templates/UIxJSClose.wox | 26 --------------- 7 files changed, 1 insertion(+), 166 deletions(-) delete mode 100644 UI/SOGoUI/UIxJSClose.h delete mode 100644 UI/SOGoUI/UIxJSClose.m delete mode 100644 UI/Templates/UIxJSClose.wox diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m index 3ed075d9c..920474ea6 100644 --- a/UI/Common/UIxAclEditor.m +++ b/UI/Common/UIxAclEditor.m @@ -251,24 +251,6 @@ return ([[request method] isEqualToString: @"POST"]); } -- (id ) saveAclsAction -{ - NSEnumerator *aclsEnum; - SOGoObject *clientObject; - NSString *currentUID, *ownerLogin; - - clientObject = [self clientObject]; - ownerLogin = [clientObject ownerInContext: context]; - aclsEnum = [[self aclsForObject] objectEnumerator]; - while ((currentUID = [[aclsEnum nextObject] objectForKey: @"c_uid"])) - if ([currentUID isEqualToString: ownerLogin] - || [savedUIDs containsObject: currentUID]) - [users removeObjectForKey: currentUID]; - [clientObject removeAclsForUsers: [users allKeys]]; - - return [self jsCloseWithRefreshMethod: nil]; -} - - (BOOL) isPublicAccessEnabled { return [[SOGoSystemDefaults sharedSystemDefaults] enablePublicAccess]; diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile index 5e8948055..94f7a3d7d 100644 --- a/UI/SOGoUI/GNUmakefile +++ b/UI/SOGoUI/GNUmakefile @@ -15,14 +15,12 @@ ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo libSOGoUI_HEADER_FILES += \ \ - UIxJSClose.h \ UIxComponent.h \ SOGoAptFormatter.h \ SOGoDirectAction.h libSOGoUI_OBJC_FILES += \ \ - UIxJSClose.m \ UIxComponent.m \ UIxModuleAccessDenied.m \ SOGoAptFormatter.m \ diff --git a/UI/SOGoUI/UIxComponent.h b/UI/SOGoUI/UIxComponent.h index ffa33cf16..dd909f576 100644 --- a/UI/SOGoUI/UIxComponent.h +++ b/UI/SOGoUI/UIxComponent.h @@ -80,8 +80,6 @@ - (BOOL) hideFrame; -- (UIxComponent *) jsCloseWithRefreshMethod: (NSString *) methodName; - /* SoUser */ - (NSString *) shortUserNameForDisplay; diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index 12939f9a6..eac316e5b 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -44,7 +44,7 @@ #import #import -#import "UIxJSClose.h" +#import "UIxComponent.h" @interface UIxComponent (PrivateAPI) @@ -448,17 +448,6 @@ static SoProduct *commonProduct = nil; return ([[self queryParameterForKey: @"noframe"] boolValue]); } -- (UIxComponent *) jsCloseWithRefreshMethod: (NSString *) methodName -{ - UIxJSClose *jsClose; - - jsClose = [UIxJSClose new]; - [jsClose autorelease]; - [jsClose setRefreshMethod: [methodName doubleQuotedString]]; - - return jsClose; -} - /* common conditions */ - (BOOL) canCreateOrModify { diff --git a/UI/SOGoUI/UIxJSClose.h b/UI/SOGoUI/UIxJSClose.h deleted file mode 100644 index 41da7053a..000000000 --- a/UI/SOGoUI/UIxJSClose.h +++ /dev/null @@ -1,41 +0,0 @@ -/* UIxJSClose.h - this file is part of SOGo - * - * Copyright (C) 2006-2011 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef UIXJSCLOSE_H -#define UIXJSCLOSE_H - -#import - -@class NSString; - -@interface UIxJSClose : UIxComponent -{ - NSString *refreshMethod; -} - -- (void) setRefreshMethod: (NSString *) method; -- (NSString *) refreshMethod; -- (BOOL) hasRefreshMethod; - -@end - -#endif /* UIXJSCLOSE_H */ diff --git a/UI/SOGoUI/UIxJSClose.m b/UI/SOGoUI/UIxJSClose.m deleted file mode 100644 index 87d4fa45d..000000000 --- a/UI/SOGoUI/UIxJSClose.m +++ /dev/null @@ -1,65 +0,0 @@ -/* UIxJSClose.m - this file is part of SOGo - * - * Copyright (C) 2006-2011 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#import "UIxJSClose.h" - -@implementation UIxJSClose - -- (id) init -{ - if ((self = [super init])) - refreshMethod = nil; - - return self; -} - -- (void) dealloc -{ - [refreshMethod release]; - [super dealloc]; -} - -- (NSString *) doctype -{ - return (@"\n" - @""); -} - -- (void) setRefreshMethod: (NSString *) method -{ - ASSIGN (refreshMethod, method); -} - -- (NSString *) refreshMethod -{ - return refreshMethod; -} - -- (BOOL) hasRefreshMethod -{ - return (refreshMethod != nil); -} - -@end diff --git a/UI/Templates/UIxJSClose.wox b/UI/Templates/UIxJSClose.wox deleted file mode 100644 index f1bdef0ef..000000000 --- a/UI/Templates/UIxJSClose.wox +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -
- - -