Add support for converting e-mail addresses to links. (is_email_address):

2001-03-30  Jon Trowbridge  <trow@ximian.com>

        * e-html-utils.c (e_text_to_html_full): Add support for converting
        e-mail addresses to links.
        (is_email_address): Added.  Identifies e-mail addresses.
        (email_address_extract): Added.  Extracts a copy of the e-mail
        address from the text.

        * e-html-utils.h (E_TEXT_TO_HTML_CONVERT_ADDRESSES): Added.

        * e-url.c (e_url_shroud): Added.  Copy a url, replacing
        any plaintext passwords with a single *.
        (e_url_equal): Compare two urls, taking into account that
        they may or may not be shrouded.

2001-03-30  Jon Trowbridge  <trow@ximian.com>

        * camel-mime-message.c (camel_mime_message_set_source): Shrould
        our source URL before putting it into X-Evolution-Source.

2001-03-30  Jon Trowbridge  <trow@ximian.com>

        * mail-display.c (mail_text_write): Add (commented-out)
        E_TEXT_TO_HTML_CONVERT_ADDRESSES.

        * mail-config.c (mail_config_get_account_by_source_url):
        Call e_url_equal to compare URLs.

svn path=/trunk/; revision=9050

11 files changed, 254 insertions, 16 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 1b0ea88d07..b97bf87e1f 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-30  Jon Trowbridge  <trow@ximian.com>
+
+	* camel-mime-message.c (camel_mime_message_set_source): Shrould
+	our source URL before putting it into X-Evolution-Source.
+
 2001-03-29  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* providers/imap/camel-imap-store.c (get_folder_info): Don't
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 1437744260..1977c3419b 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -32,6 +32,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "e-util/e-url.h"
+
 #include "camel-mime-message.h"
 #include "camel-multipart.h"
 #include "camel-stream-mem.h"
@@ -404,8 +406,12 @@ camel_mime_message_set_recipients(CamelMimeMessage *mime_message, const char *ty
 void
 camel_mime_message_set_source(CamelMimeMessage *mime_message, const char *src)
 {
+	char *shrouded_src;
 	g_assert (mime_message);
-	camel_medium_add_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source", src);
+
+	shrouded_src = e_url_shroud (src);
+	camel_medium_add_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source", shrouded_src);
+	g_free (shrouded_src);
 }
 
 const char *
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 8005acb99a..4fa4bd408a 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,18 @@
+2001-03-30  Jon Trowbridge  <trow@ximian.com>
+
+	* e-html-utils.c (e_text_to_html_full): Add support for converting
+	e-mail addresses to links.
+	(is_email_address): Added.  Identifies e-mail addresses.
+	(email_address_extract): Added.  Extracts a copy of the e-mail
+	address from the text.
+
+	* e-html-utils.h (E_TEXT_TO_HTML_CONVERT_ADDRESSES): Added.
+
+	* e-url.c (e_url_shroud): Added.  Copy a url, replacing
+	any plaintext passwords with a single *.
+	(e_url_equal): Compare two urls, taking into account that
+	they may or may not be shrouded.
+
 2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* e-corba-utils.h: Remove #include <glib.h>
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 2efec61ca3..2fd7b68e18 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -41,6 +41,8 @@ libeutil_la_SOURCES =			\
 	e-sexp.h			\
 	e-time-utils.c			\
 	e-time-utils.h			\
+	e-url.c				\
+	e-url.h				\
 	e-dbhash.c			\
 	e-dbhash.h			\
 	md5-utils.c			\
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 5afb0a6319..0a1938f0fa 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -65,6 +65,54 @@ url_extract (const unsigned char **text, gboolean check)
 	return out;
 }
 
+/* FIXME */
+static gboolean
+is_email_address (const unsigned char *c)
+{
+	gboolean seen_at = FALSE, seen_postat = FALSE;
+
+	if (*c == '<')
+		++c;
+
+	while (*c && (isalnum ((gint) *c)
+		      || *c == '-'
+		      || *c == '_'
+		      || *c == (seen_at ? '.' : '@'))) {
+		
+		if (seen_at && !seen_postat) {
+			if (*c == '.')
+				return FALSE;
+			seen_postat = TRUE;
+		}
+
+		if (*c == '@')
+			seen_at = TRUE;
+
+		++c;
+	}
+
+	return seen_at && seen_postat && (isspace ((gint) *c) || *c == '>' || !*c);
+}
+
+static gchar *
+email_address_extract (const unsigned char **text)
+{
+	const unsigned char *end = *text;
+	char *out;
+
+	while (*end && !isspace (*end) && (*end != '>') && (*end < 0x80))
+		++end;
+
+	out = g_strndup (*text, end - *text);
+	if (!is_email_address (out)) {
+		g_free (out);
+		return NULL;
+	}
+
+	*text = end;
+	return out;
+}
+
 static gboolean
 is_citation (const unsigned char *c)
 {
@@ -115,6 +163,9 @@ is_citation (const unsigned char *c)
  *   - E_TEXT_TO_HTML_CONVERT_URLS: wrap <a href="..."> </a> around
  *     strings that look like URLs.
  *
+ *   - E_TEXT_TO_HTML_CONVERT_ADDRESSES: wrap <a href="mailto:..."> </a> around
+ *     strings that look like mail addresses.
+ *
  *   - E_TEXT_TO_HTML_MARK_CITATION: wrap <font color="blue"> </font> around
  *     citations (lines beginning with "> ").
  **/
@@ -202,6 +253,36 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color)
 				break;
 			unicode_get_utf8 (cur, &u);
 		}
+
+		if (unicode_isalpha (u)
+		    && (flags & E_TEXT_TO_HTML_CONVERT_ADDRESSES)
+		    && is_email_address (cur)) {
+			gchar *addr = NULL, *dispaddr = NULL;
+
+			addr = email_address_extract (&cur);
+			dispaddr = e_text_to_html (addr, 0);
+			
+			if (addr) {
+				gchar *outaddr = g_strdup_printf ("<a href=\"mailto:%s\">"
+								  "<!--+GtkHTML:<DATA class=\"Text\" key=\"email\" value=\"%s\">-->"
+								  "%s"
+								  "<!--+GtkHTML:<DATA class=\"Text\" clear=\"email\">--> "
+								  "</a>",
+								  addr, addr, dispaddr);
+				out = check_size (&buffer, &buffer_size, out, strlen(outaddr));
+				out += sprintf (out, "%s", outaddr);
+				col += strlen (addr);
+				g_free (addr);
+				g_free (dispaddr);
+				g_free (outaddr);
+			}
+
+			if (!*cur)
+				break;
+			unicode_get_utf8 (cur, &u);
+			
+		}
+
 		if (u == (unicode_char_t)-1) {
 			/* Sigh. Someone sent undeclared 8-bit data.
 			 * Assume it's iso-8859-1.
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
index 346446956c..e95ca6e24a 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.h
@@ -25,11 +25,12 @@
 
 #include <glib.h>
 
-#define E_TEXT_TO_HTML_PRE            (1 << 0)
-#define E_TEXT_TO_HTML_CONVERT_NL     (1 << 1)
-#define E_TEXT_TO_HTML_CONVERT_SPACES (1 << 2)
-#define E_TEXT_TO_HTML_CONVERT_URLS   (1 << 3)
-#define E_TEXT_TO_HTML_MARK_CITATION  (1 << 4)
+#define E_TEXT_TO_HTML_PRE               (1 << 0)
+#define E_TEXT_TO_HTML_CONVERT_NL        (1 << 1)
+#define E_TEXT_TO_HTML_CONVERT_SPACES    (1 << 2)
+#define E_TEXT_TO_HTML_CONVERT_URLS      (1 << 3)
+#define E_TEXT_TO_HTML_MARK_CITATION     (1 << 4)
+#define E_TEXT_TO_HTML_CONVERT_ADDRESSES (1 << 5)
 
 char *e_text_to_html_full (const char *input, unsigned int flags, guint32 color);
 char *e_text_to_html      (const char *input, unsigned int flags);
diff --git a/e-util/e-url.c b/e-util/e-url.c
new file mode 100644
index 0000000000..ffebba7827
--- /dev/null
+++ b/e-util/e-url.c
@@ -0,0 +1,90 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * e-url.c
+ *
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * Developed by Jon Trowbridge <trow@ximian.com>
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * 
+ * 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.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ */
+
+#include <config.h>
+#include <string.h>
+#include "e-url.h"
+
+char *
+e_url_shroud (const char *url)
+{
+	const char *first_colon = NULL;
+	const char *last_at = NULL;
+	const char *p;
+	char *shrouded;
+	
+	if (url == NULL)
+		return NULL;
+
+	/* Skip past the moniker */
+	for (p = url; *p && *p != ':'; ++p);
+	if (*p)
+		++p;
+
+	while (*p) {
+		if (first_colon == NULL && *p == ':')
+			first_colon = p;
+		if (*p == '@')
+			last_at = p;
+		++p;
+	}
+
+	if (first_colon && last_at) {
+		shrouded = g_strdup_printf ("%.*s*%s", first_colon - url + 1, url, last_at);
+	} else {
+		shrouded = g_strdup (url);
+	}
+
+	g_message ("shrouded [%s] to [%s]", url, shrouded);
+	
+	return shrouded;
+}
+
+gboolean
+e_url_equal (const char *url1, const char *url2)
+{
+	char *shroud1 = e_url_shroud (url1);
+	char *shroud2 = e_url_shroud (url2);
+	gint len1, len2;
+	gboolean rv;
+
+	if (shroud1 == NULL || shroud2 == NULL) {
+		rv = (shroud1 == shroud2);
+	} else {
+		len1 = strlen (shroud1);
+		len2 = strlen (shroud2);
+
+		rv = !strncmp (shroud1, shroud2, MIN (len1, len2));
+	}
+
+	g_free (shroud1);
+	g_free (shroud2);
+
+	g_message ("[%s] and [%s] are%s equal", url1, url2, rv ? "" : " NOT");
+
+	return rv;
+}
diff --git a/e-util/e-url.h b/e-util/e-url.h
new file mode 100644
index 0000000000..5250963dba
--- /dev/null
+++ b/e-util/e-url.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * e-url.h
+ *
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * Developed by Jon Trowbridge <trow@ximian.com>
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * 
+ * 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.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ */
+
+#ifndef __E_URL_H__
+#define __E_URL_H__
+
+#include <gtk/gtk.h>
+
+char *e_url_shroud (const char *url);
+gboolean e_url_equal (const char *url1, const char *url2);
+
+#endif /* __E_URL_H__ */
+
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3a755a64ac..c25e088ed8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-30  Jon Trowbridge  <trow@ximian.com>
+
+	* mail-display.c (mail_text_write): Add (commented-out)
+	E_TEXT_TO_HTML_CONVERT_ADDRESSES.
+
+	* mail-config.c (mail_config_get_account_by_source_url): 
+	Call e_url_equal to compare URLs.
+
 2001-03-30  Dan Winship  <danw@ximian.com>
 
 	* component-factory.c (debug_cb): If the EvolutionShellComponent
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 38d84fc0e7..a58ecaaf02 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -35,6 +35,7 @@
 
 #include <gal/util/e-util.h>
 #include <e-util/e-html-utils.h>
+#include <e-util/e-url.h>
 #include "mail.h"
 #include "mail-config.h"
 #include "mail-ops.h"
@@ -772,30 +773,21 @@ mail_config_get_account_by_name (const char *account_name)
 	return NULL;
 }
 
-/*
-  We do a strncmp on the MIN of the url lengths rather than a straight strcmp because
-  I've observed extra stuff getting stuck on the end of urls in camel.  Hopefully
-  this work-around won't lead to any weirdness.
-*/
-
 const MailConfigAccount *
 mail_config_get_account_by_source_url (const char *source_url)
 {
 	const MailConfigAccount *account;
 	GSList *l;
-	gint src_len;
 
 	g_return_val_if_fail (source_url != NULL, NULL);
 
-	src_len = strlen (source_url);
-
 	l = config->accounts;
 	while (l) {
 		account = l->data;
 		if (account
 		    && account->source 
 		    && account->source->url
-		    && !strncmp (account->source->url, source_url, MIN (src_len, strlen (account->source->url))))
+		    && e_url_equal (account->source->url, source_url))
 			return account;
 		
 		l = l->next;
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 307408fb88..822a870bf4 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -920,6 +920,7 @@ mail_text_write (GtkHTML *html, GtkHTMLStream *stream,
 
 	htmltext = e_text_to_html_full (buf,
 					E_TEXT_TO_HTML_CONVERT_URLS |
+					/* E_TEXT_TO_HTML_CONVERT_ADDRESSES | */
 					E_TEXT_TO_HTML_CONVERT_NL |
 					E_TEXT_TO_HTML_CONVERT_SPACES |
 					(mail_config_get_citation_highlight () ? E_TEXT_TO_HTML_MARK_CITATION : 0),