bugfix, bumped dyld versions

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index de2a8e7d0bec332e3df78afdb4820d513e287fda..df658e8b59e0ac809128b6bfd48cfe4a9d98f6c4 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-29  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * DynamicElements/_WOComplexHyperlink.m: changed
+         -shouldRewriteURLString:inContext: to only rewrite url strings which
+         either do not bear a scheme or have an `http' scheme (v4.5.203)
+
 2005-09-27  Helge Hess  <helge.hess@skyrix.com>
 
        * DynamicElements/WOPopUpButton.m: fixed a bug in the 'selection' which

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
index 5da69b34efae05272837e5a86a9145a866e4d714..4fc7dda5e671a2254f9a396309fc7e1c5095bdf1 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
@@ -370,11 +370,11 @@ static BOOL debugStaticLinks = NO;
 
 - (BOOL)shouldRewriteURLString:(NSString *)_s inContext:(WOContext *)_ctx {
   // TODO: we need a binding to disable rewriting!
-  if ([_s hasPrefix:@"mailto:"])
-    return NO;
-  if ([_s hasPrefix:@"javascript:"])
-    return NO;
-  return YES;
+  NSRange r;
+  
+  r = [_s rangeOfString:@":"];
+  if (!r.length) return YES;
+  return [[_s substringToIndex:r.location] isEqualToString:@"http"];
 }
 
 - (BOOL)_appendHrefToResponse:(WOResponse *)_r inContext:(WOContext *)_ctx {

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
index bf43ab305ca2657efb70bbd05ec74364bc2cb404..87cb7ea871577cd1e6b2148f2a66af39b87afea1 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
@@ -410,7 +410,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -596,7 +596,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -637,7 +637,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -680,7 +680,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
index 6334e456d34ac97dd1c6867e44062c449559f076..da02f5c11443227d7def4d37c0567d954ec90ee5 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
@@ -1970,7 +1970,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1984,7 +1984,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=201",
+                                       "-DSOPE_SUBMINOR_VERSION=203",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2107,16 +2107,16 @@
                                        ProjectRef = ADFE63E206E2656F006628C4 /* NGHttp.xcodeproj */;
                                },
                                {
-                                       ProductGroup = ADFE6C9806E27071006628C4 /* Products */;
-                                       ProjectRef = ADFE6C9706E27071006628C4 /* WebDAV.xcodeproj */;
+                                       ProductGroup = ADFE63E806E265AE006628C4 /* Products */;
+                                       ProjectRef = ADFE63E606E265AB006628C4 /* sope-core.xcodeproj */;
                                },
                                {
                                        ProductGroup = ADFE736806E287E6006628C4 /* Products */;
                                        ProjectRef = ADFE736706E287E6006628C4 /* SoObjects.xcodeproj */;
                                },
                                {
-                                       ProductGroup = ADFE63E806E265AE006628C4 /* Products */;
-                                       ProjectRef = ADFE63E606E265AB006628C4 /* sope-core.xcodeproj */;
+                                       ProductGroup = ADFE6C9806E27071006628C4 /* Products */;
+                                       ProjectRef = ADFE6C9706E27071006628C4 /* WebDAV.xcodeproj */;
                                },
                        );
                        targets = (
@@ -2490,7 +2490,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2514,7 +2514,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=201",
+                                       "-DSOPE_SUBMINOR_VERSION=203",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2536,7 +2536,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -2561,7 +2561,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=201",
+                                       "-DSOPE_SUBMINOR_VERSION=203",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2584,7 +2584,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2598,7 +2598,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=201",
+                                       "-DSOPE_SUBMINOR_VERSION=203",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
index 0a17c951244f8b95a783f43db50d76a48c6568f9..0b19d78be19e8d8b23331179b1e60dc90be40eca 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
@@ -305,7 +305,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -404,7 +404,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -444,7 +444,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -486,7 +486,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index e7507cedda707806981abb120a9807dfc355a3eb..8f2506ecdec8c35ff8502d89980ff33b556eca3d 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=202
+SUBMINOR_VERSION:=203
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134

diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
index 4bb4bf2351515faafe8ea16fba70b0ee185bdb1c..0eae1b60fc019cae43f4d1c7f326fca484c7e8ba 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
@@ -234,7 +234,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -332,7 +332,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -372,7 +372,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -414,7 +414,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.201;
+                               DYLIB_CURRENT_VERSION = 4.5.203;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;