X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=24d42de9229cbe77776e0b0c8e26844fa5eb210d;hp=b66137ab7e94e64c855ca3dcc4d3b6e440a041d4;hb=3eeed6b1fca821fa041b9aa1fdfd682e45534c66;hpb=6cb32e72eb10254fb607b09cf4690d93ec97044c diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index b66137a..24d42de 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -33,7 +33,9 @@ #include #include #include -#include "modest-text-utils.h" +#include +#include +#include #ifdef HAVE_CONFIG_H @@ -46,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 @@ -111,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) @@ -119,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); @@ -139,13 +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); + + 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; @@ -154,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" \ @@ -172,12 +191,9 @@ 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); - g_return_val_if_fail (subject, NULL); - modest_text_utils_strftime (sent_str, 100, "%c", localtime (&sent_date)); + modest_text_utils_strftime (sent_str, 100, "%c", sent_date); if (!strcmp (content_type, "text/html")) /* TODO: extract the of the HTML and pass it to @@ -186,22 +202,39 @@ 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", NULL); + } + } 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); } /* just to prevent warnings: * warning: `%x' yields only last 2 digits of year in some locales */ -size_t -modest_text_utils_strftime(char *s, size_t max, const char *fmt, const struct tm *tm) +gsize +modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet) { - return strftime(s, max, fmt, tm); + struct tm tm; + + /* does not work on old maemo glib: + * g_date_set_time_t (&date, timet); + */ + localtime_r (&timet, &tm); + + return strftime(s, max, fmt, &tm); } gchar * @@ -263,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 ************************ */ /* ******************************************************************* */ @@ -477,8 +673,10 @@ cite (const time_t sent_date, const gchar *from) gchar sent_str[101]; /* format sent_date */ - modest_text_utils_strftime (sent_str, 100, "%c", localtime (&sent_date)); - return g_strdup_printf (N_("On %s, %s wrote:\n"), sent_str, from); + modest_text_utils_strftime (sent_str, 100, "%c", sent_date); + return g_strdup_printf (N_("On %s, %s wrote:\n"), + sent_str, + (from) ? from : EMPTY_STRING); } @@ -491,7 +689,6 @@ modest_text_utils_quote_plain_text (const gchar *text, gint indent, breakpoint, rem_indent = 0; GString *q, *l, *remaining; gsize len; - gchar *tmp; /* remaining will store the rest of the line if we have to break it */ q = g_string_new (cite); @@ -512,7 +709,7 @@ modest_text_utils_quote_plain_text (const gchar *text, } else { do { breakpoint = - get_breakpoint (remaining-> str, + get_breakpoint (remaining->str, rem_indent, limit); append_quoted (q, rem_indent, @@ -586,9 +783,11 @@ get_url_matches (GString *txt) /* initalize the regexps */ for (i = 0; i != pattern_num; ++i) { - patterns[i].preg = g_new0 (regex_t,1); - g_assert(regcomp (patterns[i].preg, patterns[i].regex, - REG_ICASE|REG_EXTENDED|REG_NEWLINE) == 0); + patterns[i].preg = g_slice_new0 (regex_t); + + /* this should not happen */ + g_return_val_if_fail (regcomp (patterns[i].preg, patterns[i].regex, + REG_ICASE|REG_EXTENDED|REG_NEWLINE) == 0, NULL); } /* find all the matches */ for (i = 0; i != pattern_num; ++i) { @@ -596,7 +795,7 @@ get_url_matches (GString *txt) while (1) { int test_offset; if ((rv = regexec (patterns[i].preg, txt->str + offset, 1, &rm, 0)) != 0) { - g_assert (rv == REG_NOMATCH); /* this should not happen */ + g_return_val_if_fail (rv == REG_NOMATCH, NULL); /* this should not happen */ break; /* try next regexp */ } if (rm.rm_so == -1) @@ -610,7 +809,7 @@ get_url_matches (GString *txt) /* make a list of our matches ( tupels)*/ if (test_offset != -1) { - url_match_t *match = g_new (url_match_t,1); + url_match_t *match = g_slice_new (url_match_t); match->offset = offset + rm.rm_so; match->len = rm.rm_eo - rm.rm_so; match->prefix = patterns[i].prefix; @@ -622,7 +821,7 @@ get_url_matches (GString *txt) for (i = 0; i != pattern_num; ++i) { regfree (patterns[i].preg); - g_free (patterns[i].preg); + g_slice_free (regex_t, patterns[i].preg); } /* don't free patterns itself -- it's static */ /* now sort the list, so the matches are in reverse order of occurence. @@ -651,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 */ @@ -661,7 +861,7 @@ hyperlinkify_plain_text (GString *txt) g_free (url); g_free (repl); - g_free (cursor->data); + g_slice_free (url_match_t, match); } g_slist_free (match_list); @@ -676,9 +876,9 @@ modest_text_utils_get_display_address (gchar *address) if (!address) return NULL; - + g_return_val_if_fail (g_utf8_validate (address, -1, NULL), NULL); - + g_strchug (address); /* remove leading whitespace */ /* from display name */ @@ -737,17 +937,13 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens /* work even when s1 and/or s2 == NULL */ if (G_UNLIKELY(s1 == s2)) return 0; - if (G_UNLIKELY(!s1)) - return -1; - if (G_UNLIKELY(!s2)) - return 1; /* if it's not case sensitive */ if (!insensitive) - return strcmp (s1, s2); + return strcmp (s1 ? s1 : "", s2 ? s2 : ""); - n1 = g_utf8_collate_key (s1, -1); - n2 = g_utf8_collate_key (s2, -1); + n1 = g_utf8_collate_key (s1 ? s1 : "", -1); + n2 = g_utf8_collate_key (s2 ? s2 : "", -1); result = strcmp (n1, n2); @@ -758,29 +954,178 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens } -const gchar* +gchar* modest_text_utils_get_display_date (time_t date) { - struct tm date_tm, now_tm; time_t now; - - const gint buf_size = 64; - static gchar date_buf[64]; /* buf_size is not ... */ - static gchar now_buf[64]; /* ...const enough... */ + const guint BUF_SIZE = 64; + gchar date_buf[BUF_SIZE]; + gchar now_buf [BUF_SIZE]; now = time (NULL); - - localtime_r(&now, &now_tm); - localtime_r(&date, &date_tm); - - /* get today's date */ - modest_text_utils_strftime (date_buf, buf_size, "%x", &date_tm); - modest_text_utils_strftime (now_buf, buf_size, "%x", &now_tm); - /* 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) - strftime (date_buf, buf_size, _("%X"), &date_tm); + modest_text_utils_strftime (date_buf, BUF_SIZE, "%H:%M %P", date); + + return g_strdup(date_buf); +} + +gboolean +modest_text_utils_validate_email_address (const gchar *email_address) +{ + int count = 0; + const gchar *c = NULL, *domain = NULL; + static gchar *rfc822_specials = "()<>@,;:\\\"[]"; + + /* first we validate the name portion (name@domain) */ + for (c = email_address; *c; c++) { + if (*c == '\"' && + (c == email_address || + *(c - 1) == '.' || + *(c - 1) == '\"')) { + while (*++c) { + if (*c == '\"') + break; + if (*c == '\\' && (*++c == ' ')) + continue; + if (*c <= ' ' || *c >= 127) + return FALSE; + } + if (!*c++) + return FALSE; + if (*c == '@') + break; + if (*c != '.') + return FALSE; + continue; + } + if (*c == '@') + break; + if (*c <= ' ' || *c >= 127) + return FALSE; + if (strchr(rfc822_specials, *c)) + return FALSE; + } + if (c == email_address || *(c - 1) == '.') + return FALSE; + + /* next we validate the domain portion (name@domain) */ + if (!*(domain = ++c)) + return FALSE; + do { + if (*c == '.') { + if (c == domain || *(c - 1) == '.') + return FALSE; + count++; + } + if (*c <= ' ' || *c >= 127) + return FALSE; + if (strchr(rfc822_specials, *c)) + return FALSE; + } while (*++c); + + 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 == '\\') { + /* TODO: This causes a warning, which breaks the build, + * because a gchar cannot be < 0. + * murrayc. + 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; + } + } + } - return date_buf; + 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 * +modest_text_utils_get_display_size (guint64 size) +{ + const guint KB=1024; + const guint MB=1024 * KB; + const guint GB=1024 * MB; + + if (size == 0) + return g_strdup_printf(_FM("sfil_li_size_kb"), 0); + 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 (_FM("sfil_li_size_1gb_or_greater"), size / GB); }

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