From 40790f985eeffbfaaa18abc2c0a8332da66b3bf6 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 28 Mar 2005 20:39:21 +0000 Subject: [PATCH] do not load bundles without extensions git-svn-id: http://svn.opengroupware.org/SOGo/trunk@647 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/Main/ChangeLog | 5 +++++ SOGo/Main/SOGoGroupPage.m | 6 +----- SOGo/Main/SOGoProductLoader.m | 4 ++++ SOGo/Main/SOGoUserHomePage.m | 31 ++++++++++++++++++++----------- SOGo/Main/Version | 2 +- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog index a256d710..7e2f7d5c 100644 --- a/SOGo/Main/ChangeLog +++ b/SOGo/Main/ChangeLog @@ -1,3 +1,8 @@ +2005-03-28 Helge Hess + + * SOGoProductLoader.m: do not try to load directories without + extensions (v0.9.28) + 2005-03-23 Marcus Mueller * renamed "default.strings" to "Localizable.strings" (v0.9.27) diff --git a/SOGo/Main/SOGoGroupPage.m b/SOGo/Main/SOGoGroupPage.m index cb70b59d..f157417e 100644 --- a/SOGo/Main/SOGoGroupPage.m +++ b/SOGo/Main/SOGoGroupPage.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 SKYRIX Software AG + Copyright (C) 2004-2005 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,14 +18,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: SOGoGroupPage.m 106 2004-06-30 09:44:35Z helge $ #include @interface SOGoGroupPage : SoComponent -{ -} - @end #include "common.h" diff --git a/SOGo/Main/SOGoProductLoader.m b/SOGo/Main/SOGoProductLoader.m index 875b93d9..2d994ea2 100644 --- a/SOGo/Main/SOGoProductLoader.m +++ b/SOGo/Main/SOGoProductLoader.m @@ -155,6 +155,10 @@ while ((productName = [productNames nextObject]) != nil) { NSString *bpath; + + if ([[productName pathExtension] length] == 0) + /* filter out directories without extensions */ + continue; bpath = [lpath stringByAppendingPathComponent:productName]; [self logWithFormat:@" register SOGo product: %@", diff --git a/SOGo/Main/SOGoUserHomePage.m b/SOGo/Main/SOGoUserHomePage.m index 6b6a5d64..e3cdd016 100644 --- a/SOGo/Main/SOGoUserHomePage.m +++ b/SOGo/Main/SOGoUserHomePage.m @@ -1,4 +1,23 @@ -// $Id$ +/* + Copyright (C) 2004-2005 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ #include @@ -20,16 +39,6 @@ @implementation SOGoUserHomePage -- (id)initWithContext:(id)_ctx { - if ((self = [super initWithContext:_ctx])) { - } - return self; -} - -- (void)dealloc { - [super dealloc]; -} - /* lookup */ - (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_flag { diff --git a/SOGo/Main/Version b/SOGo/Main/Version index ef3a2490..9a461be1 100644 --- a/SOGo/Main/Version +++ b/SOGo/Main/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=27 +SUBMINOR_VERSION:=28 # v0.9.24 requires libWEExtensions v4.5.67 # v0.9.16 requires libNGExtensions v4.5.136 -- 2.39.2