#include <glib/gi18n.h>
#include <regex.h>
#include <modest-tny-platform-factory.h>
-#include "modest-text-utils.h"
+#include <modest-text-utils.h>
+#include <modest-runtime.h>
#ifdef HAVE_CONFIG_H
#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
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)
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);
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;
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<br>\n<table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\">\n" \
+ "%s%s<br>\n<table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\">\n" \
"<tr><td>%s</td><td>%s</td></tr>\n" \
"<tr><td>%s</td><td>%s</td></tr>\n" \
"<tr><td>%s</td><td>%s</td></tr>\n" \
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 <body> of the HTML and pass it to
else
format = plain_format;
- return g_strdup_printf (format,
+ if (signature != NULL) {
+ if (!strcmp (content_type, "text/html")) {
+ formatted_signature = g_strconcat (signature, "<br/>", 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);
}
/* 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 *
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, "<br>\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,
- "<html>"
- "<head>"
- "<meta http-equiv=\"content-type\""
- " content=\"text/html; charset=utf8\">"
+ "<html><head>"
+ "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf8\">"
"</head>"
- "<body><tt>");
+ "<body>");
+
+ 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, "<br>\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, "</body></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, "</tt></body></html>");
- hyperlinkify_plain_text (html);
+ *start_indexes = g_slist_reverse (*start_indexes);
+ *end_indexes = g_slist_reverse (*end_indexes);
+
+ 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;
- return g_string_free (html, FALSE);
}
+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 ************************ */
/* ******************************************************************* */
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);
}
} else {
do {
breakpoint =
- get_breakpoint (remaining-> str,
+ get_breakpoint (remaining->str,
rem_indent,
limit);
append_quoted (q, rem_indent,
/* 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) {
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)
/* make a list of our matches (<offset, len, prefix> 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;
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.
/* the prefix is NULL: use the one that is already there */
repl = g_strdup_printf ("<a href=\"%s%s\">%s</a>",
- match->prefix ? match->prefix : "", url, url);
+ match->prefix ? match->prefix : EMPTY_STRING,
+ url, url);
/* replace the old thing with our hyperlink
* replacement thing */
g_free (url);
g_free (repl);
- g_free (cursor->data);
+ g_slice_free (url_match_t, match);
}
g_slist_free (match_list);
/* 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);
return result;
}
-static GHashTable*
-get_display_date_cache (void)
-{
- TnyPlatformFactory *fakt;
- ModestCacheMgr *cache_mgr;
-
- fakt = modest_tny_platform_factory_get_instance ();
-
- cache_mgr = modest_tny_platform_factory_get_cache_mgr_instance
- (MODEST_TNY_PLATFORM_FACTORY(fakt));
-
- return modest_cache_mgr_get_cache (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;
-
- 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... */
- gchar* cached_val;
-
- if (G_UNLIKELY(!date_cache))
- date_cache = get_display_date_cache ();
+ const guint BUF_SIZE = 64;
+ gchar date_buf[BUF_SIZE];
+ gchar now_buf [BUF_SIZE];
- cached_val = g_hash_table_lookup (date_cache, &date);
- if (cached_val)
- return cached_val;
-
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);
-
- 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) */
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 *
-modest_text_utils_get_display_size (gint size)
-{
- const int KB=1024;
- const int MB=1024 * KB;
- const int GB=1024 * MB;
- const int TB=1024 * GB;
- const int PB=1024 * TB;
-
- if (size < KB)
- return g_strdup_printf (_("%0.2f 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);
- else if (size < PB)
- return g_strdup_printf (_("%d Tb"), size/ TB);
+modest_text_utils_get_display_size (guint size)
+{
+ const guint KB=1024;
+ const guint MB=1024 * KB;
+ const guint GB=1024 * MB;
+
+ 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);
}
projects / modest / blobdiff