X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=2c09387fdefe2b1877ec5fe8636264f456fd2076;hp=0bcc66c574f7977b4a602aa56c5ec22df74f98c5;hb=556398d85f1803ab8d4871a107bc4b8938c444ae;hpb=7682620c7cd97669d2d99283c038c63433c1d66d diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index 0bcc66c..2c09387 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -48,6 +48,7 @@ #define SENT_STRING _("Sent:") #define TO_STRING _("To:") #define SUBJECT_STRING _("Subject:") +#define EMPTY_STRING "" /* * we need these regexps to find URLs in plain text e-mails @@ -113,6 +114,7 @@ static gchar* modest_text_utils_quote_html (const gchar *text, gchar * modest_text_utils_quote (const gchar *text, const gchar *content_type, + const gchar *signature, const gchar *from, const time_t sent_date, int limit) @@ -121,7 +123,6 @@ modest_text_utils_quote (const gchar *text, g_return_val_if_fail (text, NULL); g_return_val_if_fail (content_type, NULL); - g_return_val_if_fail (from, NULL); cited = cite (sent_date, from); @@ -141,17 +142,27 @@ modest_text_utils_quote (const gchar *text, gchar * modest_text_utils_cite (const gchar *text, const gchar *content_type, + const gchar *signature, const gchar *from, time_t sent_date) { gchar *tmp, *retval; + gchar *tmp_sig; g_return_val_if_fail (text, NULL); g_return_val_if_fail (content_type, NULL); - g_return_val_if_fail (from, NULL); + + if (!signature) + tmp_sig = g_strdup (""); + else if (!strcmp(content_type, "text/html")) { + tmp_sig = modest_text_utils_convert_to_html_body(signature); + } else { + tmp_sig = g_strdup (signature); + } tmp = cite (sent_date, from); - retval = g_strdup_printf ("%s%s\n", tmp, text); + retval = g_strdup_printf ("%s%s%s\n", tmp_sig, tmp, text); + g_free (tmp_sig); g_free (tmp); return retval; @@ -160,15 +171,17 @@ modest_text_utils_cite (const gchar *text, gchar * modest_text_utils_inline (const gchar *text, const gchar *content_type, + const gchar *signature, const gchar *from, time_t sent_date, const gchar *to, const gchar *subject) { gchar sent_str[101]; - const gchar *plain_format = "%s\n%s %s\n%s %s\n%s %s\n%s %s\n\n%s"; + gchar *formatted_signature; + const gchar *plain_format = "%s%s\n%s %s\n%s %s\n%s %s\n%s %s\n\n%s"; const gchar *html_format = \ - "%s
\n\n" \ + "%s%s
\n

\n" \ "\n" \ "\n" \ "\n" \ @@ -178,9 +191,7 @@ modest_text_utils_inline (const gchar *text, g_return_val_if_fail (text, NULL); g_return_val_if_fail (content_type, NULL); - g_return_val_if_fail (from, NULL); g_return_val_if_fail (text, NULL); - g_return_val_if_fail (to, NULL); modest_text_utils_strftime (sent_str, 100, "%c", sent_date); @@ -191,12 +202,22 @@ modest_text_utils_inline (const gchar *text, else format = plain_format; - return g_strdup_printf (format, + if (signature != NULL) { + if (!strcmp (content_type, "text/html")) { + formatted_signature = g_strconcat (signature, "
", NULL); + } else { + formatted_signature = g_strconcat (signature, "\n"); + } + } else { + formatted_signature = ""; + } + + return g_strdup_printf (format, formatted_signature, FORWARD_STRING, - FROM_STRING, from, + FROM_STRING, (from) ? from : EMPTY_STRING, SENT_STRING, sent_str, - TO_STRING, to, - SUBJECT_STRING, subject, + TO_STRING, (to) ? to : EMPTY_STRING, + SUBJECT_STRING, (subject) ? subject : EMPTY_STRING, text); } @@ -206,17 +227,14 @@ modest_text_utils_inline (const gchar *text, gsize modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet) { - /* only since Gtk 2.10 - * - *static GDate date; - *g_date_set_time_t (&date, timet); - *return g_date_strftime (s, max, fmt, (const GDate*) &date); + struct tm tm; + + /* does not work on old maemo glib: + * g_date_set_time_t (&date, timet); */ + localtime_r (&timet, &tm); - struct tm *time_tm; - time_tm = localtime (&timet); - - return strftime (s, max, fmt, time_tm); + return strftime(s, max, fmt, &tm); } gchar * @@ -278,67 +296,230 @@ modest_text_utils_remove_address (const gchar *address_list, const gchar *addres return result; } +static void +modest_text_utils_convert_buffer_to_html (GString *html, const gchar *data) +{ + guint i; + gboolean space_seen = FALSE; + gsize len; + + len = strlen (data); + + /* replace with special html chars where needed*/ + for (i = 0; i != len; ++i) { + char kar = data[i]; + + if (space_seen && kar != ' ') { + g_string_append_c (html, ' '); + space_seen = FALSE; + } + + switch (kar) { + case 0: break; /* ignore embedded \0s */ + case '<' : g_string_append (html, "<"); break; + case '>' : g_string_append (html, ">"); break; + case '&' : g_string_append (html, "&"); break; + case '"' : g_string_append (html, """); break; + case '\'' : g_string_append (html, "'"); break; + case '\n' : g_string_append (html, "
\n"); break; + case '\t' : g_string_append (html, " "); break; /* note the space at the end*/ + case ' ': + if (space_seen) { /* second space in a row */ + g_string_append (html, " "); + space_seen = FALSE; + } else + space_seen = TRUE; + break; + default: + g_string_append_c (html, kar); + } + } +} + gchar* modest_text_utils_convert_to_html (const gchar *data) { - guint i; - gboolean first_space = TRUE; GString *html; gsize len; - + if (!data) return NULL; len = strlen (data); - html = g_string_sized_new (len + 100); /* just a guess... */ - + html = g_string_sized_new (1.5 * len); /* just a guess... */ + g_string_append_printf (html, - "" - "" - "" + "" + "" "" - ""); + ""); + + modest_text_utils_convert_buffer_to_html (html, data); - /* replace with special html chars where needed*/ - for (i = 0; i != len; ++i) { - char kar = data[i]; - switch (kar) { - - case 0: break; /* ignore embedded \0s */ - case '<' : g_string_append (html, "<"); break; - case '>' : g_string_append (html, ">"); break; - case '&' : g_string_append (html, """); break; - case '\n': g_string_append (html, " \n"); break; - default: - if (kar == ' ') { - g_string_append (html, first_space ? " " : " "); - first_space = FALSE; - } else if (kar == '\t') - g_string_append (html, " "); - else { - int charnum = 0; - first_space = TRUE; - /* optimization trick: accumulate 'normal' chars, then copy */ - do { - kar = data [++charnum + i]; - - } while ((i + charnum < len) && - (kar > '>' || (kar != '<' && kar != '>' - && kar != '&' && kar != ' ' - && kar != '\n' && kar != '\t'))); - g_string_append_len (html, &data[i], charnum); - i += (charnum - 1); + g_string_append (html, ""); + hyperlinkify_plain_text (html); + + return g_string_free (html, FALSE); +} + +gchar * +modest_text_utils_convert_to_html_body (const gchar *data) +{ + GString *html; + gsize len; + + if (!data) + return NULL; + + len = strlen (data); + html = g_string_sized_new (1.5 * len); /* just a guess... */ + + modest_text_utils_convert_buffer_to_html (html, data); + + hyperlinkify_plain_text (html); + + return g_string_free (html, FALSE); +} + +void +modest_text_utils_get_addresses_indexes (const gchar *addresses, GSList **start_indexes, GSList **end_indexes) +{ + gchar *current, *start, *last_blank; + gint start_offset = 0, current_offset = 0; + + g_return_if_fail (start_indexes != NULL); + g_return_if_fail (end_indexes != NULL); + + start = (gchar *) addresses; + current = start; + last_blank = start; + + while (*current != '\0') { + if ((start == current)&&((*current == ' ')||(*current == ',')||(*current == ';'))) { + start = g_utf8_next_char (start); + start_offset++; + last_blank = current; + } else if ((*current == ',')||(*current == ';')) { + gint *start_index, *end_index; + start_index = g_new0(gint, 1); + end_index = g_new0(gint, 1); + *start_index = start_offset; + *end_index = current_offset; + *start_indexes = g_slist_prepend (*start_indexes, start_index); + *end_indexes = g_slist_prepend (*end_indexes, end_index); + start = g_utf8_next_char (current); + start_offset = current_offset + 1; + last_blank = start; + } else if (*current == '"') { + current = g_utf8_next_char (current); + current_offset ++; + while ((*current != '"')&&(*current != '\0')) { + current = g_utf8_next_char (current); + current_offset ++; } } + + current = g_utf8_next_char (current); + current_offset ++; + } + + if (start != current) { + gint *start_index, *end_index; + start_index = g_new0(gint, 1); + end_index = g_new0(gint, 1); + *start_index = start_offset; + *end_index = current_offset; + *start_indexes = g_slist_prepend (*start_indexes, start_index); + *end_indexes = g_slist_prepend (*end_indexes, end_index); } - g_string_append (html, ""); - hyperlinkify_plain_text (html); + *start_indexes = g_slist_reverse (*start_indexes); + *end_indexes = g_slist_reverse (*end_indexes); - return g_string_free (html, FALSE); + return; } +GSList * +modest_text_utils_split_addresses_list (const gchar *addresses) +{ + gchar *current, *start, *last_blank; + GSList *result = NULL; + + start = (gchar *) addresses; + current = start; + last_blank = start; + + while (*current != '\0') { + if ((start == current)&&((*current == ' ')||(*current == ',')||(*current == ';'))) { + start = g_utf8_next_char (start); + last_blank = current; + } else if ((*current == ',')||(*current == ';')) { + gchar *new_address = NULL; + new_address = g_strndup (start, current - last_blank); + result = g_slist_prepend (result, new_address); + start = g_utf8_next_char (current); + last_blank = start; + } else if (*current == '\"') { + if (current == start) { + current = g_utf8_next_char (current); + start = g_utf8_next_char (start); + } + while ((*current != '\"')&&(*current != '\0')) + current = g_utf8_next_char (current); + } + + current = g_utf8_next_char (current); + } + + if (start != current) { + gchar *new_address = NULL; + new_address = g_strndup (start, current - last_blank); + result = g_slist_prepend (result, new_address); + } + + result = g_slist_reverse (result); + return result; + +} + +void +modest_text_utils_address_range_at_position (const gchar *recipients_list, + gint position, + gint *start, + gint *end) +{ + gchar *current = NULL; + gint range_start = 0; + gint range_end = 0; + gint index; + gboolean is_quoted = FALSE; + + index = 0; + for (current = (gchar *) recipients_list; *current != '\0'; current = g_utf8_find_next_char (current, NULL)) { + gunichar c = g_utf8_get_char (current); + + if ((c == ',') && (!is_quoted)) { + if (index < position) { + range_start = index + 1; + } else { + break; + } + } else if (c == '\"') { + is_quoted = !is_quoted; + } else if ((c == ' ') &&(range_start == index)) { + range_start ++; + } + index ++; + range_end = index; + } + + if (start) + *start = range_start; + if (end) + *end = range_end; +} + + /* ******************************************************************* */ /* ************************* UTILIY FUNCTIONS ************************ */ /* ******************************************************************* */ @@ -493,7 +674,9 @@ cite (const time_t sent_date, const gchar *from) /* format sent_date */ modest_text_utils_strftime (sent_str, 100, "%c", sent_date); - return g_strdup_printf (N_("On %s, %s wrote:\n"), sent_str, from); + return g_strdup_printf (N_("On %s, %s wrote:\n"), + sent_str, + (from) ? from : EMPTY_STRING); } @@ -667,7 +850,8 @@ hyperlinkify_plain_text (GString *txt) /* the prefix is NULL: use the one that is already there */ repl = g_strdup_printf ("%s", - match->prefix ? match->prefix : "", url, url); + match->prefix ? match->prefix : EMPTY_STRING, + url, url); /* replace the old thing with our hyperlink * replacement thing */ @@ -769,55 +953,34 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens return result; } -static GHashTable* -get_display_date_cache (void) -{ - return modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr (), - MODEST_CACHE_MGR_CACHE_TYPE_DATE_STRING); -} - - -const gchar* +gchar* modest_text_utils_get_display_date (time_t date) { - static GHashTable *date_cache = NULL; - time_t now; const guint BUF_SIZE = 64; gchar date_buf[BUF_SIZE]; gchar now_buf [BUF_SIZE]; - gchar* cached_val; - - if (G_UNLIKELY(!date_cache)) - date_cache = get_display_date_cache (); - cached_val = g_hash_table_lookup (date_cache, &date); - if (cached_val) - return cached_val; - now = time (NULL); - - /* get today's date */ - modest_text_utils_strftime (date_buf, BUF_SIZE, "%x", date); - modest_text_utils_strftime (now_buf, BUF_SIZE, "%x", now); - /* today */ + modest_text_utils_strftime (date_buf, BUF_SIZE, "%d/%m/%Y", date); + modest_text_utils_strftime (now_buf, BUF_SIZE, "%d/%m/%Y", now); /* today */ +/* modest_text_utils_strftime (date_buf, BUF_SIZE, "%x", date); */ +/* modest_text_utils_strftime (now_buf, BUF_SIZE, "%x", now); /\* today *\/ */ + /* if this is today, get the time instead of the date */ if (strcmp (date_buf, now_buf) == 0) - modest_text_utils_strftime (date_buf, BUF_SIZE, _("%X"), date); - - cached_val = g_strdup(date_buf); - g_hash_table_insert (date_cache, (gpointer)&date, (gpointer)cached_val); + modest_text_utils_strftime (date_buf, BUF_SIZE, "%H:%M %P", date); - return cached_val; + return g_strdup(date_buf); } gboolean modest_text_utils_validate_email_address (const gchar *email_address) { int count = 0; - const gchar *c, *domain; + const gchar *c = NULL, *domain = NULL; static gchar *rfc822_specials = "()<>@,;:\\\"[]"; /* first we validate the name portion (name@domain) */ @@ -870,7 +1033,74 @@ modest_text_utils_validate_email_address (const gchar *email_address) return (count >= 1) ? TRUE : FALSE; } +gboolean +modest_text_utils_validate_recipient (const gchar *recipient) +{ + gchar *stripped, *current; + gchar *right_part; + gboolean has_error = FALSE; + + if (modest_text_utils_validate_email_address (recipient)) + return TRUE; + stripped = g_strdup (recipient); + stripped = g_strstrip (stripped); + current = stripped; + + if (*current == '\0') { + g_free (stripped); + return FALSE; + } + /* quoted string */ + if (*current == '\"') { + current = g_utf8_next_char (current); + has_error = TRUE; + for (; *current != '\0'; current = g_utf8_next_char (current)) { + if (*current == '\\') { + if (current[1] <0) { + has_error = TRUE; + break; + } + } else if (*current == '\"') { + has_error = FALSE; + current = g_utf8_next_char (current); + break; + } + } + } else { + has_error = TRUE; + for (current = stripped ; *current != '\0'; current = g_utf8_next_char (current)) { + if (*current == '<') { + has_error = FALSE; + break; + } + } + } + + if (has_error) { + g_free (stripped); + return FALSE; + } + + right_part = g_strdup (current); + g_free (stripped); + right_part = g_strstrip (right_part); + + if (g_str_has_prefix (right_part, "<") && + g_str_has_suffix (right_part, ">")) { + gchar *address; + gboolean valid; + + address = g_strndup (right_part+1, strlen (right_part) - 2); + g_free (right_part); + valid = modest_text_utils_validate_email_address (address); + g_free (address); + return valid; + } else { + g_free (right_part); + return FALSE; + } +} gchar * @@ -879,16 +1109,17 @@ modest_text_utils_get_display_size (guint size) const guint KB=1024; const guint MB=1024 * KB; const guint GB=1024 * MB; - const guint TB=1024 * GB; - - if (size < KB) - return g_strdup_printf (_("%0.1f Kb"), (double)size / KB); - else if (size < MB) - return g_strdup_printf (_("%d Kb"), size / KB); - else if (size < GB) - return g_strdup_printf (_("%d Mb"), size / MB); - else if (size < TB) - return g_strdup_printf (_("%d Gb"), size/ GB); + + if (0 < size && size < KB) + return g_strdup_printf (_FM("sfil_li_size_kb"), 1); + else if (KB <= size && size < 100 * KB) + return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB); + else if (100*KB <= size && size < MB) + return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), size / MB); + else if (MB <= size && size < 10*MB) + return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), size / MB); + else if (10*MB <= size && size < GB) + return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), size / MB); else - return g_strdup_printf (_("Very big")); + return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), size / GB); }

%s	%s
%s	%s
%s	%s