GList *attachments,
int limit);
static gchar* get_email_from_address (const gchar *address);
+static void remove_extra_spaces (gchar *string);
+
/* ******************************************************************* */
}
gchar *
-modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
+modest_text_utils_derived_subject (const gchar *subject, gboolean is_reply)
{
- gchar *tmp, *subject_dup, *retval;
- gint prefix_len;
-
- g_return_val_if_fail (prefix, NULL);
+ gchar *tmp, *subject_dup, *retval, *prefix;
+ const gchar *untranslated_prefix;
+ gint prefix_len, untranslated_prefix_len;
+ gboolean translated_found = FALSE;
+ gboolean first_time;
if (!subject || subject[0] == '\0')
subject = _("mail_va_no_subject");
subject_dup = g_strdup (subject);
tmp = g_strchug (subject_dup);
+ prefix = (is_reply) ? _("mail_va_re") : _("mail_va_fw");
+ prefix = g_strconcat (prefix, ":", NULL);
+ prefix_len = g_utf8_strlen (prefix, -1);
+
+ untranslated_prefix = (is_reply) ? "Re:" : "Fw:";
+ untranslated_prefix_len = 3;
+
/* We do not want things like "Re: Re: Re:" or "Fw: Fw:" so
delete the previous ones */
- prefix_len = strlen (prefix);
+ first_time = TRUE;
do {
if (g_str_has_prefix (tmp, prefix)) {
tmp += prefix_len;
tmp = g_strchug (tmp);
+ /* Do not consider translated prefixes in the
+ middle of a Re:Re:..Re: like sequence */
+ if (G_UNLIKELY (first_time))
+ translated_found = TRUE;
+ } else if (g_str_has_prefix (tmp, untranslated_prefix)) {
+ tmp += untranslated_prefix_len;
+ tmp = g_strchug (tmp);
} else {
gchar *prefix_down, *tmp_down;
break;
}
}
+ first_time = FALSE;
} while (tmp);
- retval = g_strdup_printf ("%s %s", prefix, tmp);
+ if (!g_strcmp0 (subject, tmp)) {
+ /* normal case */
+ retval = g_strdup_printf ("%s %s", untranslated_prefix, tmp);
+ } else {
+ if (translated_found) {
+ /* Found a translated prefix, i.e, "VS:" in Finish */
+ retval = g_strdup_printf ("%s %s", prefix, tmp);
+ } else {
+ retval = g_strdup_printf ("%s %s", untranslated_prefix, tmp);
+ }
+ }
g_free (subject_dup);
+ g_free (prefix);
return retval;
}
+
+/* Performs a case-insensitive strstr for ASCII strings */
+static const gchar *
+ascii_stristr(const gchar *haystack, const gchar *needle)
+{
+ int needle_len;
+ int haystack_len;
+ const gchar *pos;
+ const gchar *max_pos;
+
+ if (haystack == NULL || needle == NULL) {
+ return haystack; /* as in strstr */
+ }
+
+ needle_len = strlen(needle);
+
+ if (needle_len == 0) {
+ return haystack; /* as in strstr */
+ }
+
+ haystack_len = strlen(haystack);
+ max_pos = haystack + haystack_len - needle_len;
+
+ for (pos = haystack; pos <= max_pos; pos++) {
+ if (g_ascii_strncasecmp (pos, needle, needle_len) == 0) {
+ return pos;
+ }
+ }
+
+ return NULL;
+}
+
+
gchar*
modest_text_utils_remove_address (const gchar *address_list, const gchar *address)
{
gchar *email_address;
g_return_val_if_fail (address_list, NULL);
-
+
if (!address)
return g_strdup (address_list);
email_address = get_email_from_address (address);
-
+
/* search for substring */
- if (!strstr ((const char *) address_list, (const char *) email_address)) {
+ if (!ascii_stristr ((const char *) address_list, (const char *) email_address)) {
g_free (email_address);
return g_strdup (address_list);
}
dup = g_strdup (address_list);
filtered_emails = g_string_new (NULL);
-
+
token = strtok_r (dup, ",", &ptr);
while (token != NULL) {
/* Add to list if not found */
- if (!strstr ((const char *) token, (const char *) email_address)) {
+ if (!ascii_stristr ((const char *) token, (const char *) email_address)) {
if (filtered_emails->len == 0)
g_string_append_printf (filtered_emails, "%s", g_strstrip (token));
else
guchar kar = data[i];
if (space_seen && kar != ' ') {
- g_string_append (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;
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;
+ GString *str;
+ gchar *start, *cur;
+
+ if (!addresses)
+ return;
- g_return_if_fail (start_indexes != NULL);
- g_return_if_fail (end_indexes != NULL);
+ if (strlen (addresses) == 0)
+ return;
- start = (gchar *) addresses;
- current = start;
- last_blank = start;
+ str = g_string_new ("");
+ start = (gchar*) addresses;
+ cur = (gchar*) addresses;
- while (*current != '\0') {
- if ((start == current)&&((*current == ' ')||(*current == ',')||(*current == ';'))) {
- start = g_utf8_next_char (start);
- start_offset++;
- last_blank = current;
- } else if ((*current == ',')||(*current == ';')) {
+ for (cur = start; *cur != '\0'; cur = g_utf8_next_char (cur)) {
+ if (*cur == ',' || *cur == ';') {
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;
+ gchar *next_char = g_utf8_next_char (cur);
+
+ if (!g_utf8_strchr (start, (cur - start + 1), g_utf8_get_char ("@")) &&
+ next_char && *next_char != '\n' && *next_char != '\0')
+ continue;
+
+ start_index = g_new0 (gint, 1);
+ end_index = g_new0 (gint, 1);
+ *start_index = g_utf8_pointer_to_offset (addresses, start);
+ *end_index = g_utf8_pointer_to_offset (addresses, cur);;
*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 ++;
- }
+ start = g_utf8_next_char (cur);
}
-
- 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);
+ if (start != cur) {
+ gint *start_index, *end_index;
+ start_index = g_new0 (gint, 1);
+ end_index = g_new0 (gint, 1);
+ *start_index = g_utf8_pointer_to_offset (addresses, start);
+ *end_index = g_utf8_pointer_to_offset (addresses, cur);;
+ *start_indexes = g_slist_prepend (*start_indexes, start_index);
+ *end_indexes = g_slist_prepend (*end_indexes, end_index);
}
-
- *start_indexes = g_slist_reverse (*start_indexes);
- *end_indexes = g_slist_reverse (*end_indexes);
- return;
+ if (*start_indexes)
+ *start_indexes = g_slist_reverse (*start_indexes);
+ if (*end_indexes)
+ *end_indexes = g_slist_reverse (*end_indexes);
}
gboolean after_at = FALSE;
g_return_val_if_fail (addresses, NULL);
-
- /* skip any space, ',', ';' at the start */
- while (my_addrs && (my_addrs[0] == ' ' || my_addrs[0] == ',' || my_addrs[0] == ';'))
+
+ /* skip any space, ',', ';' '\n' at the start */
+ while (my_addrs && (my_addrs[0] == ' ' || my_addrs[0] == ',' ||
+ my_addrs[0] == ';' || my_addrs[0] == '\n'))
++my_addrs;
/* are we at the end of addresses list? */
if (!my_addrs[0])
return NULL;
-
+
/* nope, we are at the start of some address
* now, let's find the end of the address */
end = my_addrs + 1;
addr = g_strndup (my_addrs, end - my_addrs);
g_strchomp (addr);
+ remove_extra_spaces (addr);
+
head = g_slist_append (NULL, addr);
head->next = modest_text_utils_split_addresses_list (end); /* recurse */
return head;
}
+gchar *
+modest_text_utils_join_addresses (const gchar *from,
+ const gchar *to,
+ const gchar *cc,
+ const gchar *bcc)
+{
+ GString *buffer;
+ gboolean add_separator = FALSE;
+
+ buffer = g_string_new ("");
+
+ if (from && strlen (from)) {
+ buffer = g_string_append (buffer, from);
+ add_separator = TRUE;
+ }
+ if (to && strlen (to)) {
+ if (add_separator)
+ buffer = g_string_append (buffer, "; ");
+ else
+ add_separator = TRUE;
+
+ buffer = g_string_append (buffer, to);
+ }
+ if (cc && strlen (cc)) {
+ if (add_separator)
+ buffer = g_string_append (buffer, "; ");
+ else
+ add_separator = TRUE;
+
+ buffer = g_string_append (buffer, cc);
+ }
+ if (bcc && strlen (bcc)) {
+ if (add_separator)
+ buffer = g_string_append (buffer, "; ");
+ else
+ add_separator = TRUE;
+
+ buffer = g_string_append (buffer, bcc);
+ }
+
+ return g_string_free (buffer, FALSE);
+}
void
modest_text_utils_address_range_at_position (const gchar *recipients_list,
g_string_prepend (l, remaining->str);
} else {
do {
+ gunichar remaining_first;
breakpoint =
get_breakpoint (remaining->str,
rem_indent,
remaining, breakpoint);
g_string_erase (remaining, 0,
breakpoint);
- if (remaining->str[0] == ' ') {
- g_string_erase (remaining, 0,
- 1);
+ remaining_first = g_utf8_get_char_validated (remaining->str, remaining->len);
+ if (remaining_first != ((gunichar) -1)) {
+ if (g_unichar_isspace (remaining_first)) {
+ g_string_erase (remaining, 0, g_utf8_next_char (remaining->str) - remaining->str);
+ }
}
} while (remaining->len);
}
/* quoted string */
if (*current == '\"') {
+ gchar *last_quote = NULL;
current = g_utf8_next_char (current);
has_error = TRUE;
for (; *current != '\0'; current = g_utf8_next_char (current)) {
} else if (*current == '\"') {
has_error = FALSE;
current = g_utf8_next_char (current);
- break;
+ last_quote = current;
}
}
+ if (last_quote)
+ current = g_utf8_next_char (last_quote);
} else {
has_error = TRUE;
for (current = stripped ; *current != '\0'; current = g_utf8_next_char (current)) {
g_free (stripped);
right_part = g_strstrip (right_part);
+ if (g_str_has_suffix (right_part, ",") || g_str_has_suffix (right_part, ";"))
+ right_part [(strlen (right_part) - 1)] = '\0';
+
if (g_str_has_prefix (right_part, "<") &&
g_str_has_suffix (right_part, ">")) {
gchar *address;
}
}
+static void
+remove_extra_spaces (gchar *string)
+{
+ gchar *start;
+
+ start = string;
+ while (start && start[0] != '\0') {
+ if ((start[0] == ' ') && (start[1] == ' ')) {
+ g_strchug (start+1);
+ }
+ start++;
+ }
+}
+
gchar *
modest_text_utils_escape_mnemonics (const gchar *text)
{
}
gchar *
-modest_text_utils_get_secure_header (gchar *value,
+modest_text_utils_get_secure_header (const gchar *value,
const gchar *header)
{
- gchar *new_value = value;
+ const gint max_len = 16384;
+ gchar *new_value = NULL;
gchar *needle = g_strrstr (value, header);
- if (needle) {
- gchar *tmp = value;
+ if (needle && value != needle)
new_value = g_strdup (needle + strlen (header));
- g_free (tmp);
+
+ 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;
}
+
+static gboolean
+is_quoted (const char *start, const gchar *end)
+{
+ gchar *c;
+
+ c = (gchar *) start;
+ while (*c == ' ')
+ c = g_utf8_next_char (c);
+
+ if (*c == '\0' || *c != '\"')
+ return FALSE;
+
+ c = (gchar *) end;
+ while (*c == ' ' && c != start)
+ c = g_utf8_prev_char (c);
+
+ if (c == start || *c != '\"')
+ return FALSE;
+
+ return TRUE;
+}
+
+
+static void
+quote_name_part (GString **str, gchar **cur, gchar **start)
+{
+ gchar *blank;
+ gint str_len = *cur - *start;
+
+ while (**start == ' ') {
+ *start = g_utf8_next_char (*start);
+ str_len--;
+ }
+
+ blank = g_utf8_strrchr (*start, str_len, g_utf8_get_char (" "));
+ if (blank && (blank != *start)) {
+ if (is_quoted (*start, blank - 1)) {
+ *str = g_string_append_len (*str, *start, str_len);
+ *str = g_string_append (*str, ";");
+ *start = g_utf8_next_char (*cur);
+ } else {
+ *str = g_string_append_c (*str, '"');
+ *str = g_string_append_len (*str, *start, (blank - *start));
+ *str = g_string_append_c (*str, '"');
+ *str = g_string_append_len (*str, blank, (*cur - blank));
+ *str = g_string_append (*str, ";");
+ *start = g_utf8_next_char (*cur);
+ }
+ } else {
+ *str = g_string_append_len (*str, *start, str_len);
+ *str = g_string_append (*str, ";");
+ *start = g_utf8_next_char (*cur);
+ }
+}
+
+gchar *
+modest_text_utils_quote_names (const gchar *recipients)
+{
+ GString *str;
+ gchar *start, *cur;
+
+ str = g_string_new ("");
+ start = (gchar*) recipients;
+ cur = (gchar*) recipients;
+
+ for (cur = start; *cur != '\0'; cur = g_utf8_next_char (cur)) {
+ if (*cur == ',' || *cur == ';') {
+ if (!g_utf8_strchr (start, (cur - start + 1), g_utf8_get_char ("@")))
+ continue;
+ quote_name_part (&str, &cur, &start);
+ }
+ }
+
+ quote_name_part (&str, &cur, &start);
+
+ return g_string_free (str, FALSE);
+}
+
+/* Returns TRUE if there is no recipients in the text buffer. Note
+ that strings like " ; , " contain only separators and thus no
+ recipients */
+gboolean
+modest_text_utils_no_recipient (GtkTextBuffer *buffer)
+{
+ gboolean retval = TRUE;
+ gchar *text, *tmp;
+ GtkTextIter start, end;
+
+ if (gtk_text_buffer_get_char_count (buffer) == 0)
+ return TRUE;
+
+ gtk_text_buffer_get_start_iter (buffer, &start);
+ gtk_text_buffer_get_end_iter (buffer, &end);
+
+ text = g_strstrip (gtk_text_buffer_get_text (buffer, &start, &end, FALSE));
+ if (!g_strcmp0 (text, ""))
+ return TRUE;
+
+ tmp = text;
+ while (tmp && *tmp != '\0') {
+ if ((*tmp != ',') && (*tmp != ';') &&
+ (*tmp != '\r') && (*tmp != '\n') &&
+ (*tmp != ' ')) {
+ retval = FALSE;
+ break;
+ } else {
+ tmp++;
+ }
+ }
+ g_free (text);
+
+ return retval;
+}