Applied Cocoa compatibility fix of Philippe Laval

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1240 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/samples/BasicAuthSession/Application.m b/sope-appserver/samples/BasicAuthSession/Application.m
index 32fcaa832a311a5d8ca09547507404f56f03036e..672dac21e13696209167cfdc5be5ac55b65ed7fb 100644 (file)
--- a/sope-appserver/samples/BasicAuthSession/Application.m
+++ b/sope-appserver/samples/BasicAuthSession/Application.m
@@ -1,4 +1,23 @@
-// $Id: Application.m,v 1.1 2004/06/08 11:08:07 helge Exp $
+/*
+  Copyright (C) 2000-2005 SKYRIX Software AG
+
+  This file is part of SOPE.
+
+  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.
+
+  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 SOPE; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #include <NGObjWeb/WOApplication.h>
 

diff --git a/sope-appserver/samples/BasicAuthSession/GNUmakefile b/sope-appserver/samples/BasicAuthSession/GNUmakefile
index a59a18e4379677f240439a08062116d3ee89c8b6..41c44c249caedbd11da0ee9cd7b66964bb4d0324 100644 (file)
--- a/sope-appserver/samples/BasicAuthSession/GNUmakefile
+++ b/sope-appserver/samples/BasicAuthSession/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 2004/06/08 11:08:07 helge Exp $
+# GNUstep makefile
 
 include $(GNUSTEP_MAKEFILES)/common.make
 

diff --git a/sope-appserver/samples/BasicAuthSession/Main.m b/sope-appserver/samples/BasicAuthSession/Main.m
index 8a5c3afcf95e459ab2359505777f23bb8e391db6..cae6785cd918a43061433a82684ac707e9a8f144 100644 (file)
--- a/sope-appserver/samples/BasicAuthSession/Main.m
+++ b/sope-appserver/samples/BasicAuthSession/Main.m
@@ -1,4 +1,23 @@
-// $Id: Main.m,v 1.1 2004/06/08 11:08:07 helge Exp $
+/*
+  Copyright (C) 2000-2005 SKYRIX Software AG
+
+  This file is part of SOPE.
+
+  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.
+
+  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 SOPE; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #include <NGObjWeb/WOComponent.h>
 

diff --git a/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.h b/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.h
index 0dbdc9f2659b44157d2fa3a79a6e81a887969a49..bb57fbac2d4ee48df836dacbf44d7f05c5f51190 100644 (file)
--- a/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.h
+++ b/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.h
@@ -1,4 +1,23 @@
-// $Id: NSString+BasicAuth.h,v 1.1 2004/06/08 11:08:07 helge Exp $
+/*
+  Copyright (C) 2000-2005 SKYRIX Software AG
+
+  This file is part of SOPE.
+
+  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.
+
+  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 SOPE; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #ifndef __NSString_BasicAuth_H__
 #define __NSString_BasicAuth_H__

diff --git a/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.m b/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.m
index 4745129092455095a3271945fa040942df9b57ce..52ab356c1e82bc1f4ee575ae763bb6920c9f914d 100644 (file)
--- a/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.m
+++ b/sope-appserver/samples/BasicAuthSession/NSString+BasicAuth.m
@@ -1,4 +1,23 @@
-// $Id: NSString+BasicAuth.m,v 1.1 2004/06/08 11:08:07 helge Exp $
+/*
+  Copyright (C) 2000-2005 SKYRIX Software AG
+
+  This file is part of SOPE.
+
+  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.
+
+  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 SOPE; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #include "NSString+BasicAuth.h"
 #include <NGExtensions/NGBase64Coding.h>
@@ -26,23 +45,23 @@
 
 - (NSString *)loginOfHTTPBasicAuthorizationValue {
   NSString *s;
-  unsigned idx;
+  NSRange  r;
   
   if ((s = [self decodedHTTPBasicAuthorizationValue]) == nil)
     return nil;
-  if ((idx = [s indexOfString:@":"]) == NSNotFound)
+  if ((r = [s rangeOfString:@":"]).length == 0)
     return nil;
-  return [s substringToIndex:idx];
+  return [s substringToIndex:r.location];
 }
 - (NSString *)passwordOfHTTPBasicAuthorizationValue {
   NSString *s;
-  unsigned idx;
+  NSRange  r;
   
   if ((s = [self decodedHTTPBasicAuthorizationValue]) == nil)
     return nil;
-  if ((idx = [s indexOfString:@":"]) == NSNotFound)
+  if ((r = [s rangeOfString:@":"]).length == 0)
     return nil;
-  return [s substringFromIndex:(idx + 1)];
+  return [s substringFromIndex:(r.location + r.length)];
 }
 
 @end /* NSString(BasicAuth) */

diff --git a/sope-appserver/samples/BasicAuthSession/common.h b/sope-appserver/samples/BasicAuthSession/common.h
index a9bbfa3999481f8c80f5657cd8ed41f3ad1fda2a..91e59923130641d1b9e4604e32c3e907def65efd 100644 (file)
--- a/sope-appserver/samples/BasicAuthSession/common.h
+++ b/sope-appserver/samples/BasicAuthSession/common.h
@@ -1,3 +1,22 @@
-// $Id: common.h,v 1.1 2004/06/08 11:08:07 helge Exp $
+/*
+  Copyright (C) 2000-2005 SKYRIX Software AG
+
+  This file is part of SOPE.
+
+  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.
+
+  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 SOPE; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #import <Foundation/Foundation.h>

diff --git a/sope-appserver/samples/ChangeLog b/sope-appserver/samples/ChangeLog
index bf1ff0d55aae06e7fdb8a3a1dd9771d8cc39ffa2..076211fa3e64b2778785ccc2e7dd82231e108174 100644 (file)
--- a/sope-appserver/samples/ChangeLog
+++ b/sope-appserver/samples/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-02  Philippe Laval  <philippe.laval@free.fr>
+       
+       * BasicAuthSession/NSString+BasicAuth.m: replaced usage of non-Cocoa
+         -indexOfString: with -rangeOfString:
+
 2004-02-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * added the HelloWorld application example - the simplest application