propagate from branch 'ca.inverse.sogo.1_3_1' (head f6a0b62965278336b461dac36045bfae5fc07f0a)

to branch 'ca.inverse.sogo' (head aa0663eb86f38080e2ab2d20b64f30547adbfa81)

Monotone-Parent: aa0663eb86f38080e2ab2d20b64f30547adbfa81
Monotone-Parent: f6a0b62965278336b461dac36045bfae5fc07f0a
Monotone-Revision: 0176ffcc344892f0535563789b246aea9810ee5e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-08-12T18:23:23
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/GNUmakefile.preamble

@@ -19,7 +19,7 @@ SOGo_LIBRARIES_DEPEND_UPON += \
 	-lNGCards		\
 	-lNGMime		\
 	-lNGStreams -lNGExtensions -lEOControl \
-	-lXmlRpc -lDOM -lSaxObjC \
+	-lXmlRpc -lDOM -lSaxObjC -lcrypt \
 	-lNGLdap
 
 ADDITIONAL_TOOL_LIBS += \

SoObjects/SOGo/NSString+Utilities.m

@@ -263,12 +263,12 @@ static int cssEscapingCount;
   int count;
 
   strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_",
-                     @"_C_", @"_CO_", @"_SP_", @"_SQ_", nil];
+                     @"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", nil];
   [strings retain];
   cssEscapingStrings = [strings asPointersOfObjects];
 
   characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":",
-                        @",", @" ", @"'", nil];
+                        @",", @" ", @"'", @"&", nil];
   cssEscapingCount = [strings count];
   cssEscapingCharacters = NSZoneMalloc (NULL,
                                         (cssEscapingCount + 1)

SoObjects/SOGo/SOGoContentObject.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2006-2010 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo 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
+  SOGo 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.

SoObjects/SOGo/SOGoDefaults.plist

@@ -15,7 +15,6 @@
 
     SOGoCacheCleanupInterval = 300.0;
     SOGoMemcachedHost = "localhost";
-    SOGoMemcachedPort = 11211;
 
     SOGoUIxDebugEnabled = NO;
 
@@ -33,7 +32,7 @@
     SOGoLanguage = "English";
     SOGoSupportedLanguages = ( "Czech", "Welsh", "English", "Spanish",
                                "French", "German", "Italian", "Hungarian",
-                               "Dutch", "BrazilianPortuguese", "Russian",
+                               "Dutch", "BrazilianPortuguese", "Polish", "Russian",
                                "Ukrainian", "Swedish");
 
     SOGoTimeZone = "UTC";

SoObjects/SOGo/SOGoObject.h

@@ -115,6 +115,7 @@
 /* operations */
 
 - (NSException *)delete;
+- (id) DELETEAction: (id) _ctx;
 - (id)GETAction:(id)_ctx;
 
 /* etag support */

SoObjects/SOGo/SQLSource.m

@@ -35,6 +35,8 @@
 #import <GDLAccess/EOAdaptorContext.h>
 #import <GDLAccess/EOAttribute.h>
 
+#include <unistd.h>
+
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 
@@ -139,6 +141,16 @@
     {
       return [plainPassword isEqualToString: encryptedPassword];
     }
+  else if ([_userPasswordAlgorithm caseInsensitiveCompare: @"crypt"] == NSOrderedSame)
+    {
+      NSString *s;
+      char *buf;
+      
+      buf = (char *)crypt([plainPassword UTF8String], [encryptedPassword UTF8String]);
+      s = [NSString stringWithUTF8String: buf];
+      
+      return [s isEqualToString: encryptedPassword];
+    }
   else if ([_userPasswordAlgorithm caseInsensitiveCompare: @"md5"] == NSOrderedSame)
     {
       NSString *s;