* will hang modest
*/
#define HYPERLINKIFY_MAX_LENGTH (1024*50)
-#define SIGNATURE_MARKER "--"
-
/*
* we need these regexps to find URLs in plain text e-mails
/* note: match MARK_AMP_URI_STR as well, because after txt->html, a '&' will look like $(MARK_AMP_URI_STR)"amp;" */
#define MAIL_VIEWER_URL_MATCH_PATTERNS { \
- { "(file|rtsp|http|ftp|https|mms|mmsh|rtsp|rdp|lastfm)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR \
- "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]", \
+ { "(feed:|)(file|rtsp|http|ftp|https|mms|mmsh|webcal|feed|rtsp|rdp|lastfm|sip)://[-a-z0-9_$.+!*(),;:@%=\?/~#&" MARK_AMP_URI_STR \
+ "]+[-a-z0-9_$%&" MARK_AMP_URI_STR "=?/~#]", \
NULL, NULL },\
{ "www\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\
NULL, "http://" }, \
{ "ftp\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\
NULL, "ftp://" },\
- { "(jabberto|voipto|sipto|sip|chatto|xmpp):[-_a-z@0-9.+]+", \
+ { "(jabberto|voipto|sipto|sip|chatto|skype|xmpp):[-_a-z@0-9.+]+", \
NULL, NULL}, \
{ "mailto:[-_a-z0-9.\\+]+@[-_a-z0-9.]+", \
NULL, NULL},\
g_return_val_if_fail (text, NULL);
g_return_val_if_fail (content_type, NULL);
- if (!signature)
- retval = g_strdup ("");
- else if (strcmp(content_type, "text/html") == 0) {
- tmp_sig = g_strconcat ("\n", SIGNATURE_MARKER,"\n", signature, NULL);
- retval = modest_text_utils_convert_to_html_body(tmp_sig, -1, TRUE);
+ if (!signature) {
+ tmp_sig = g_strdup (text);
+ } else {
+ tmp_sig = g_strconcat (text, "\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n", signature, NULL);
+ }
+
+ if (strcmp (content_type, "text/html") == 0) {
+ retval = modest_text_utils_convert_to_html_body (tmp_sig, -1, TRUE);
g_free (tmp_sig);
} else {
- retval = g_strconcat (text, "\n", SIGNATURE_MARKER, "\n", signature, NULL);
+ retval = tmp_sig;
}
return retval;
garbage in the s variable */
if (s)
s[0] = '\0';
+ else
+ return 0;
/* does not work on old maemo glib:
* g_date_set_time_t (&date, timet);
tmp += prefix_len;
tmp = g_strchug (tmp);
} else {
- break;
+ gchar *prefix_down, *tmp_down;
+
+ /* We need this to properly check the cases of
+ some clients adding FW: instead of Fw: for
+ example */
+ prefix_down = g_utf8_strdown (prefix, -1);
+ tmp_down = g_utf8_strdown (tmp, -1);
+ if (g_str_has_prefix (tmp_down, prefix_down)) {
+ tmp += prefix_len;
+ tmp = g_strchug (tmp);
+ g_free (prefix_down);
+ g_free (tmp_down);
+ } else {
+ g_free (prefix_down);
+ g_free (tmp_down);
+ break;
+ }
}
} while (tmp);
g_slist_foreach (addresses, (GFunc)g_free, NULL);
g_slist_free (addresses);
+ if (new_list == NULL)
+ new_list = g_strdup ("");
+
return new_list;
}
guchar kar = data[i];
if (space_seen && kar != ' ') {
- g_string_append_c (html, ' ');
+ g_string_append (html, " ");
space_seen = FALSE;
}
break_dist = 0;
if (space_seen) { /* second space in a row */
g_string_append (html, " ");
- space_seen = FALSE;
} else
space_seen = TRUE;
break;
/* if we hit the signature marker "-- ", we return -(indent + 1). This
* stops reformatting.
*/
- if (strcmp (l, "-- ") == 0) {
+ if (strcmp (l, MODEST_TEXT_UTILS_SIGNATURE_MARKER) == 0) {
return -1 - indent;
} else {
return indent;
q = g_string_new ("");
if (signature != NULL) {
- q = g_string_append (q, "\n--\n");
+ g_string_append_printf (q, "\n%s\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER);
q = g_string_append (q, signature);
}
GString *quoted_text;
g_string_append (result_string, "<pre>\n");
if (signature) {
- quote_html_add_to_gstring (result_string, SIGNATURE_MARKER);
+ quote_html_add_to_gstring (result_string, MODEST_TEXT_UTILS_SIGNATURE_MARKER);
quote_html_add_to_gstring (result_string, signature);
}
quote_html_add_to_gstring (result_string, cite);
quoted_text = g_string_new ("");
- quoted_text = modest_text_utils_quote_body (quoted_text, text, ">", limit);
+ quoted_text = modest_text_utils_quote_body (quoted_text, (text) ? text : "", ">", limit);
quote_html_add_to_gstring (result_string, quoted_text->str);
g_string_free (quoted_text, TRUE);
if (attachments) {
static gint url_matches_block = 0;
static url_match_pattern_t patterns[] = MAIL_VIEWER_URL_MATCH_PATTERNS;
+static GMutex *url_patterns_mutex = NULL;
static gboolean
void
modest_text_utils_hyperlinkify_begin (void)
{
+
+ if (url_patterns_mutex == NULL) {
+ url_patterns_mutex = g_mutex_new ();
+ }
+ g_mutex_lock (url_patterns_mutex);
if (url_matches_block == 0)
compile_patterns ();
url_matches_block ++;
+ g_mutex_unlock (url_patterns_mutex);
}
void
modest_text_utils_hyperlinkify_end (void)
{
+ g_mutex_lock (url_patterns_mutex);
url_matches_block--;
if (url_matches_block <= 0)
free_patterns ();
+ g_mutex_unlock (url_patterns_mutex);
}
for (i = 0; address[i]; ++i) {
if (address[i] == '<') {
- if (G_UNLIKELY(i == 0))
- return; /* there's nothing else, leave it */
- else {
+ if (G_UNLIKELY(i == 0)) {
+ break; /* there's nothing else, leave it */
+ }else {
address[i] = '\0'; /* terminate the string here */
- return;
+ break;
}
}
}
+
+ g_strchomp (address);
}
+gchar *
+modest_text_utils_get_display_addresses (const gchar *recipients)
+{
+ gchar *addresses;
+ GSList *recipient_list;
+
+ addresses = NULL;
+ recipient_list = modest_text_utils_split_addresses_list (recipients);
+ if (recipient_list) {
+ GString *add_string = g_string_sized_new (strlen (recipients));
+ GSList *iter = recipient_list;
+ gboolean first = TRUE;
+
+ while (iter) {
+ /* Strings are changed in place */
+ modest_text_utils_get_display_address ((gchar *) iter->data);
+ if (G_UNLIKELY (first)) {
+ g_string_append_printf (add_string, "%s", (gchar *) iter->data);
+ first = FALSE;
+ } else {
+ g_string_append_printf (add_string, ", %s", (gchar *) iter->data);
+ }
+ iter = g_slist_next (iter);
+ }
+ g_slist_foreach (recipient_list, (GFunc) g_free, NULL);
+ g_slist_free (recipient_list);
+ addresses = g_string_free (add_string, FALSE);
+ }
+ return addresses;
+}
gchar *
/* if it's today, show the time, if it's not today, show the date instead */
/* TODO: take into account the system config for 24/12h */
+#ifdef MODEST_TOOLKIT_HILDON2
if (day == date_day) /* is the date today? */
modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_24h_time"), date);
else
modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_date"), date);
+#else
+ if (day == date_day) /* is the date today? */
+ modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%X", date);
+ else
+ modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%x", date);
+#endif
return date_buf; /* this is a static buffer, don't free! */
}
const guint GB=1024 * MB;
if (size == 0)
- return g_strdup_printf (_FM("sfil_li_size_kb"));
+ return g_strdup_printf (_FM("sfil_li_size_kb"), (int) 0);
if (0 <= size && size < KB)
- return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), 1);
+ return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) 1);
else if (KB <= size && size < 100 * KB)
- return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);
+ return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) size / KB);
else if (100*KB <= size && size < MB)
- return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (float) size / MB);
+ return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (int) size / KB);
else if (MB <= size && size < 10*MB)
return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), (float) size / MB);
else if (10*MB <= size && size < GB)
- return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), size / MB);
+ return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (float) size / MB);
else
- return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
+ return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
}
static gchar *
return g_strndup (left_limit + 1, (right_limit - left_limit) - 1);
}
-gchar *
+gchar *
modest_text_utils_get_color_string (GdkColor *color)
{
g_return_val_if_fail (color, NULL);
-
+
return g_strdup_printf ("#%x%x%x%x%x%x%x%x%x%x%x%x",
(color->red >> 12) & 0xf, (color->red >> 8) & 0xf,
(color->red >> 4) & 0xf, (color->red) & 0xf,
return result;
}
+static void
+remove_quotes (gchar **quotes)
+{
+ if (g_str_has_prefix (*quotes, "\"") && g_str_has_suffix (*quotes, "\"")) {
+ gchar *result;
+ result = g_strndup ((*quotes)+1, strlen (*quotes) - 2);
+ g_free (*quotes);
+ *quotes = result;
+ }
+}
+
gchar *
modest_text_utils_escape_mnemonics (const gchar *text)
{
return g_string_free (result, FALSE);
}
+
+gchar *
+modest_text_utils_simplify_recipients (const gchar *recipients)
+{
+ GSList *addresses, *node;
+ GString *result;
+ gboolean is_first = TRUE;
+
+ if (recipients == NULL)
+ return g_strdup ("");
+
+ addresses = modest_text_utils_split_addresses_list (recipients);
+ result = g_string_new ("");
+
+ for (node = addresses; node != NULL; node = g_slist_next (node)) {
+ const gchar *address = (const gchar *) node->data;
+ gchar *left_limit, *right_limit;
+
+ left_limit = strstr (address, "<");
+ right_limit = g_strrstr (address, ">");
+
+ if (is_first)
+ is_first = FALSE;
+ else
+ result = g_string_append (result, ", ");
+
+ if ((left_limit == NULL)||(right_limit == NULL)|| (left_limit > right_limit)) {
+ result = g_string_append (result, address);
+ } else {
+ gchar *name_side;
+ gchar *email_side;
+ name_side = g_strndup (address, left_limit - address);
+ name_side = g_strstrip (name_side);
+ remove_quotes (&name_side);
+ email_side = get_email_from_address (address);
+ if (name_side && email_side && !strcmp (name_side, email_side)) {
+ result = g_string_append (result, email_side);
+ } else {
+ result = g_string_append (result, address);
+ }
+ g_free (name_side);
+ g_free (email_side);
+ }
+
+ }
+ g_slist_foreach (addresses, (GFunc)g_free, NULL);
+ g_slist_free (addresses);
+
+ return g_string_free (result, FALSE);
+
+}
+
+GSList *
+modest_text_utils_remove_duplicate_addresses_list (GSList *address_list)
+{
+ GSList *new_list, *iter;
+ GHashTable *table;
+
+ g_return_val_if_fail (address_list, NULL);
+
+ table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+ new_list = address_list;
+ iter = address_list;
+ while (iter) {
+ const gchar* address = (const gchar*)iter->data;
+
+ /* We need only the email to just compare it and not
+ the full address which would make "a <a@a.com>"
+ different from "a@a.com" */
+ const gchar *email = get_email_from_address (address);
+
+ /* ignore the address if already seen */
+ if (g_hash_table_lookup (table, email) == 0) {
+ g_hash_table_insert (table, (gchar*)email, GINT_TO_POINTER(1));
+ iter = g_slist_next (iter);
+ } else {
+ GSList *tmp = g_slist_next (iter);
+ new_list = g_slist_delete_link (new_list, iter);
+ iter = tmp;
+ }
+ }
+
+ g_hash_table_unref (table);
+
+ return new_list;
+}
+
+gchar *
+modest_text_utils_get_secure_header (const gchar *value,
+ const gchar *header)
+{
+ const gint max_len = 128;
+ gchar *new_value = NULL;
+ gchar *needle = g_strrstr (value, header);
+
+ if (needle && value != needle)
+ new_value = g_strdup (needle + strlen (header));
+
+ if (!new_value)
+ new_value = g_strdup (value);
+
+ /* Do a max length check to prevent DoS attacks caused by huge
+ malformed headers */
+ if (g_utf8_validate (new_value, -1, NULL)) {
+ if (g_utf8_strlen (new_value, -1) > max_len) {
+ gchar *tmp = g_malloc0 (max_len * 4);
+ g_utf8_strncpy (tmp, (const gchar *) new_value, max_len);
+ g_free (new_value);
+ new_value = tmp;
+ }
+ } else {
+ if (strlen (new_value) > max_len) {
+ gchar *tmp = g_malloc0 (max_len);
+ strncpy (new_value, tmp, max_len);
+ g_free (new_value);
+ new_value = tmp;
+ }
+ }
+
+ return new_value;
+}
projects / modest / blobdiff