final touches on dkim test harness

[citadel.git] / webcit / cookie_conversion.c

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 23a751f6ac7026046f9f5af175b29416703b149f..dcdc6da1c0af0e1adea0ca51a117864b686d945b 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -1,5 +1,13 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program 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 General Public License for more details.
  */
 
 #include "webcit.h"
@@ -11,6 +19,7 @@
  */
 static char *unset = "; expires=28-May-1971 18:10:00 GMT";
 typedef unsigned char byte;          /* Byte type used by cookie_to_stuff() */
+extern const char *get_selected_language(void);
 
 /*
  * Pack all session info into one easy-to-digest cookie. Healthy and delicious!
@@ -33,14 +42,14 @@ void stuff_to_cookie(int unset_cookies)
                StrBufHexescAppend(WCC->HBuf, NULL, "|");
                StrBufHexescAppend(WCC->HBuf, WCC->wc_password, NULL);
                StrBufHexescAppend(WCC->HBuf, NULL, "|");
-               StrBufHexescAppend(WCC->HBuf, WCC->wc_roomname, NULL);
+               StrBufHexescAppend(WCC->HBuf, WCC->CurRoom.name, NULL);
                StrBufHexescAppend(WCC->HBuf, NULL, "|");
                StrBufHexescAppend(WCC->HBuf, NULL, get_selected_language());
                StrBufHexescAppend(WCC->HBuf, NULL, "|");
 
                if (server_cookie != NULL) {
                        StrBufAppendPrintf(WCC->HBuf, 
-                                          "; path=/ %s\r\n", 
+                                          ";path=/ \r\n%s\r\n", 
                                           server_cookie);
                }
                else {
@@ -50,29 +59,6 @@ void stuff_to_cookie(int unset_cookies)
        }
 }
 
-/*
- * Convert unpacked hex string to an integer
- */
-int xtoi(const char *in, size_t len)
-{
-       int val = 0;
-       char c = 0;
-       while (!IsEmptyStr(in) && isxdigit((byte) *in) && (len-- > 0))
-       {
-               c = *in++;
-               val <<= 4;
-               if (!isdigit((unsigned char)c)) {
-                       c = tolower((unsigned char) c);
-                       if ((c < 'a') || (c > 'f'))
-                               return 0;
-                       val += c  - 'a' + 10 ;
-               }
-               else
-                       val += c - '0';
-       }
-       return val;
-}
-
 /*
  * Extract all that fun stuff out of the cookie.
  */