fixed copyrights for 2005

[sope] / sope-appserver / WEExtensions / common.h

diff --git a/sope-appserver/WEExtensions/common.h b/sope-appserver/WEExtensions/common.h
index 1e05e891ef30372cd08607a6e5259a47df44b55b..c14520794bd2eae4d1acd5a7f8d434cc402e6f4b 100644 (file)
--- a/sope-appserver/WEExtensions/common.h
+++ b/sope-appserver/WEExtensions/common.h
@@ -1,31 +1,32 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE 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
+  SOPE 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
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __WEExtensions_common_H__
 #define __WEExtensions_common_H__
 
 #import <Foundation/Foundation.h>
-#include <NGObjWeb/NGObjWeb.h>
+
 #include <NGExtensions/NGExtensions.h>
+#include <NGObjWeb/NGObjWeb.h>
+
 
 #if NeXT_Foundation_LIBRARY || APPLE_Foundation_LIBRARY
 #  include <NGExtensions/NGObjectMacros.h>
@@ -52,12 +53,13 @@ static inline NSString *WEUriOfResource(NSString *_name, WOContext *_ctx) {
 
   if (_name == nil)
     return nil;
-
+  
   languages = [_ctx hasSession]
     ? [[_ctx session] languages]
     : [[_ctx request] browserLanguages];
   
-  resourceManager = [[_ctx application] resourceManager];
+  if ((resourceManager = [[_ctx component] resourceManager]) == nil)
+    resourceManager = [[_ctx application] resourceManager];
   
   uri = [resourceManager urlForResourceNamed:_name
                          inFramework:nil