From 84f9312e1d17725db6040554a993db38292d46bd Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Tue, 21 Nov 2006 07:30:48 -0500
Subject: [PATCH] Updated Russian localization
---
program/steps/mail/func.inc | 96 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 0cd6652..76bb9b7 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -79,6 +79,7 @@
// add some labels to client
rcube_add_label('purgefolderconfirm');
+ rcube_add_label('deletemessagesconfirm');
// $mboxlist_start = rcube_timer();
@@ -495,6 +496,7 @@
$javascript .= sprintf("%s.set_env('messages', %s);", $JS_OBJECT_NAME, array2js($a_js_message_arr));
$OUTPUT->add_script($javascript);
+ $OUTPUT->include_script('list.js');
return $out;
}
@@ -689,7 +691,7 @@
global $IMAP, $REMOTE_OBJECTS, $JS_OBJECT_NAME;
$body = is_array($part->replaces) ? strtr($part->body, $part->replaces) : $part->body;
-
+
// text/html
if ($part->ctype_secondary=='html')
{
@@ -1082,12 +1084,12 @@
else if ($part->type=='content')
{
if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset']))
- $$part->ctype_parameters['charset'] = $MESSAGE['headers']->charset;
-
+ $part->ctype_parameters['charset'] = $MESSAGE['headers']->charset;
+
// fetch part if not available
if (!isset($part->body))
$part->body = $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part);
-
+
$body = rcmail_print_body($part, $safe_mode);
$out .= '<div class="message-part">';
@@ -1187,13 +1189,13 @@
'/(<\/?meta[^>]*>)/i'),
'<!--\\1-->',
$body);
-
+
$out = preg_replace(array('/(<body[^>]*>)/i',
'/(<\/body>)/i'),
array('<div class="rcmBody">',
'</div>'),
$out);
-
+
return $out;
}
@@ -1239,15 +1241,65 @@
}
+function rcmail_has_html_part($message_parts)
+{
+ if (!is_array($message_parts))
+ return FALSE;
-// return first text part of a message
-function rcmail_first_text_part($message_struct)
+ // check all message parts
+ foreach ($message_parts as $pid => $part)
+ {
+ $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
+ if ($mimetype=='text/html')
+ {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+// return first HTML part of a message
+function rcmail_first_html_part($message_struct)
{
global $IMAP;
if (!is_array($message_struct['parts']))
return FALSE;
+ $html_part = NULL;
+
+ // check all message parts
+ foreach ($message_struct['parts'] as $pid => $part)
+ {
+ $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
+ if ($mimetype=='text/html')
+ {
+ $html_part = $IMAP->get_message_part($message_struct['UID'], $pid, $part);
+ }
+ }
+
+ if ($html_part)
+ {
+ // remove special chars encoding
+ //$trans = array_flip(get_html_translation_table(HTML_ENTITIES));
+ //$html_part = strtr($html_part, $trans);
+
+ return $html_part;
+ }
+
+ return FALSE;
+}
+
+
+// return first text part of a message
+function rcmail_first_text_part($message_struct)
+ {
+ global $IMAP;
+
+ if (empty($message_struct['parts']))
+ return $message_struct['UID'] ? $IMAP->get_body($message_struct['UID']) : false;
+
// check all message parts
foreach ($message_struct['parts'] as $pid => $part)
{
@@ -1384,42 +1436,16 @@
}
-// create temp dir for attachments
-function rcmail_create_compose_tempdir()
- {
- global $CONFIG;
-
- if ($_SESSION['compose']['temp_dir'])
- return $_SESSION['compose']['temp_dir'];
-
- if (!empty($CONFIG['temp_dir']))
- $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '').$_SESSION['compose']['id'];
-
- // create temp-dir for uploaded attachments
- if (!empty($CONFIG['temp_dir']) && is_writeable($CONFIG['temp_dir']))
- {
- mkdir($temp_dir);
- $_SESSION['compose']['temp_dir'] = $temp_dir;
- }
-
- return $_SESSION['compose']['temp_dir'];
- }
-
-
// clear message composing settings
function rcmail_compose_cleanup()
{
if (!isset($_SESSION['compose']))
return;
-
+
// remove attachment files from temp dir
if (is_array($_SESSION['compose']['attachments']))
foreach ($_SESSION['compose']['attachments'] as $attachment)
@unlink($attachment['path']);
-
- // kill temp dir
- if ($_SESSION['compose']['temp_dir'])
- @rmdir($_SESSION['compose']['temp_dir']);
unset($_SESSION['compose']);
}
--
Gitblit v1.9.1