From 87e3ed6ed09a9fcd3cab45a6ce674396e51b95bb Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 10 Aug 2006 14:53:07 -0400
Subject: [PATCH] Updated Slovak translation

---
 program/steps/mail/compose.inc |  258 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 218 insertions(+), 40 deletions(-)

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 80f69b5..639ea68 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -22,23 +22,40 @@
 
 require_once('Mail/mimeDecode.php');
 
+// remove an attachment
+if ($_action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
+  {
+  $id = $regs[1];
+  if (is_array($_SESSION['compose']['attachments'][$id]))
+    {
+    @unlink($_SESSION['compose']['attachments'][$id]['path']);
+    $_SESSION['compose']['attachments'][$id] = NULL;
+    $commands = sprintf("parent.%s.remove_from_attachment_list('rcmfile%d');\n", $JS_OBJECT_NAME, $id);
+    rcube_remote_response($commands);  
+    exit;
+    }
+  }
+
 
 $MESSAGE_FORM = NULL;
 $REPLY_MESSAGE = NULL;
 $FORWARD_MESSAGE = NULL;
+$DRAFT_MESSAGE = NULL;
 
+// nothing below is called during message composition, only at "new/forward/reply/draft" initialization
+// since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
+// compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear
 
-if (!is_array($_SESSION['compose']))
-  $_SESSION['compose'] = array('id' => uniqid(rand()));
-
+rcmail_compose_cleanup();
+$_SESSION['compose'] = array('id' => uniqid(rand()));
 
 // add some labels to client
-rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'sendingmessage', 'notsentwarning');
+rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved');
 
 
-if ($_GET['_reply_uid'] || $_GET['_forward_uid'])
+if ($_GET['_reply_uid'] || $_GET['_forward_uid'] || $_GET['_draft_uid'])
   {
-  $msg_uid = $_GET['_reply_uid'] ? $_GET['_reply_uid'] : $_GET['_forward_uid'];
+  $msg_uid = ($_GET['_reply_uid'] ? $_GET['_reply_uid'] : ($_GET['_forward_uid'] ? $_GET['_forward_uid'] : $_GET['_draft_uid']));
 
   // similar as in program/steps/mail/show.inc
   $MESSAGE = array();
@@ -53,31 +70,39 @@
 
   $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
   $MESSAGE['parts'] = $mmd->getMimeNumbers($MESSAGE['structure']);
-  
+
   if ($_GET['_reply_uid'])
     {
     $REPLY_MESSAGE = &$MESSAGE;
     $_SESSION['compose']['reply_uid'] = $_GET['_reply_uid'];
     $_SESSION['compose']['reply_msgid'] = $REPLY_MESSAGE['headers']->messageID;
+    $_SESSION['compose']['references']  = $REPLY_MESSAGE['headers']->reference;
+    $_SESSION['compose']['references'] .= !empty($REPLY_MESSAGE['headers']->reference) ? ' ' : '';
+    $_SESSION['compose']['references'] .= $REPLY_MESSAGE['headers']->messageID;
 
     if ($_GET['_all'])
       $REPLY_MESSAGE['reply_all'] = 1;
+
     }
-  else
+  else if ($_GET['_forward_uid'])
     {
     $FORWARD_MESSAGE = $MESSAGE;
     $_SESSION['compose']['forward_uid'] = $_GET['_forward_uid'];
     }
+  else
+    {
+    $DRAFT_MESSAGE = $MESSAGE;
+    $_SESSION['compose']['draft_uid'] = $_GET['_draft_uid'];
+    }
+
   }
-
-
 
 /****** compose mode functions ********/
 
 
 function rcmail_compose_headers($attrib)
   {
-  global $IMAP, $REPLY_MESSAGE, $DB;
+  global $IMAP, $REPLY_MESSAGE, $DRAFT_MESSAGE, $DB;
   static $sa_recipients = array();
 
   list($form_start, $form_end) = get_form_tags($attrib);
@@ -95,7 +120,7 @@
       $header = 'to';
 
       // we have contact id's as get parameters
-      if (!empty($_GET['_to']) && preg_match('/^([0-9]+,?)+$/', $_GET['_to']))
+      if (!empty($_GET['_to']) && preg_match('/^[0-9]+(,[0-9]+)*$/', $_GET['_to']))
         {
         $a_recipients = array();
         $sql_result = $DB->query("SELECT name, email
@@ -136,10 +161,9 @@
       break;
     
     }
-
-    
+ 
   if ($fname && !empty($_POST[$fname]))
-    $fvalue = $_POST[$fname];
+    $fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE);
   else if ($header && is_object($REPLY_MESSAGE['headers']))
     {
     // get recipent address(es) out of the message headers
@@ -179,6 +203,19 @@
         }
       }
     }
+  else if ($header && is_object($DRAFT_MESSAGE['headers']))
+    {
+    // get drafted headers
+    if ($header=='to' && $DRAFT_MESSAGE['headers']->to)
+      $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->to);
+
+    if ($header=='cc' && $DRAFT_MESSAGE['headers']->cc)
+      $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->cc);
+
+    if ($header=='bcc' && $DRAFT_MESSAGE['headers']->bcc)
+      $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->bcc);
+
+    }
 
         
   if ($fname && $field_type)
@@ -196,7 +233,7 @@
   
   if ($form_start)
     $out = $form_start.$out;
-  
+
   return $out;  
   }
 
@@ -204,7 +241,7 @@
 
 function rcmail_compose_header_from($attrib)
   {
-  global $IMAP, $REPLY_MESSAGE, $DB, $OUTPUT, $JS_OBJECT_NAME;
+  global $IMAP, $REPLY_MESSAGE, $DRAFT_MESSAGE, $DB, $OUTPUT, $JS_OBJECT_NAME;
     
   // pass the following attributes to the form class
   $field_attrib = array('name' => '_from');
@@ -266,6 +303,10 @@
         
       if ($REPLY_MESSAGE && is_array($REPLY_MESSAGE['FROM']))
         $REPLY_MESSAGE['FROM'][] = $sql_arr['email'];
+
+      if (strstr($DRAFT_MESSAGE['headers']->from,$sql_arr['email']))
+        $from_id = $sql_arr['identity_id'];
+
       }
 
     // overwrite identity selection with post parameter
@@ -283,7 +324,7 @@
     $input_from = new textfield($field_attrib);
     $out = $input_from->show($_POST['_from']);
     }
-    
+  
   if ($form_start)
     $out = $form_start.$out;
 
@@ -294,10 +335,13 @@
 
 function rcmail_compose_body($attrib)
   {
-  global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE;
+  global $CONFIG, $OUTPUT, $REPLY_MESSAGE, $FORWARD_MESSAGE, $DRAFT_MESSAGE, $JS_OBJECT_NAME;
   
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
+  
+  if (empty($attrib['id']))
+    $attrib['id'] = 'rcmComposeMessage';
   
   $attrib['name'] = '_message';
   $textarea = new textarea($attrib);
@@ -306,7 +350,7 @@
   
   // use posted message body
   if (!empty($_POST['_message']))
-    $body = stripslashes($_POST['_message']);
+    $body = get_input_value('_message', RCUBE_INPUT_POST, TRUE);
     
   // compose reply-body
   else if (is_array($REPLY_MESSAGE['parts']))
@@ -323,11 +367,52 @@
     if (strlen($body))
       $body = rcmail_create_forward_body($body);
     }
+
+  // forward message body inline
+  else if (is_array($DRAFT_MESSAGE['parts']))
+    {
+    $body = rcmail_first_text_part($DRAFT_MESSAGE['parts']);
+    if (strlen($body))
+      $body = rcmail_create_draft_body($body);
+    }
   
   $out = $form_start ? "$form_start\n" : '';
+
+  $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => str_replace(array('<','>'),"",$DRAFT_MESSAGE['headers']->messageID) ));
+  $out .= $saveid->show();
+
+  $drafttoggle = new hiddenfield(array('name' => '_draft', 'value' => 'yes'));
+  $out .= $drafttoggle->show();
+
   $out .= $textarea->show($body);
   $out .= $form_end ? "\n$form_end" : '';
-         
+  
+  // include GoogieSpell
+  if (!empty($CONFIG['enable_spellcheck']))
+    {
+    $OUTPUT->include_script('googiespell.js');
+    $OUTPUT->add_script(sprintf("var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
+                                "googie.lang_chck_spell = \"%s\";\n".
+                                "googie.lang_rsm_edt = \"%s\";\n".
+                                "googie.lang_close = \"%s\";\n".
+                                "googie.lang_revert = \"%s\";\n".
+                                "googie.lang_no_error_found = \"%s\";\n".
+                                "googie.decorateTextarea('%s');\n".
+                                "%s.set_env('spellcheck', googie);",
+                                $GLOBALS['COMM_PATH'],
+                                rep_specialchars_output(rcube_label('checkspelling')),
+                                rep_specialchars_output(rcube_label('resumeediting')),
+                                rep_specialchars_output(rcube_label('close')),
+                                rep_specialchars_output(rcube_label('revertto')),
+                                rep_specialchars_output(rcube_label('nospellerrors')),
+                                $attrib['id'],
+                                $JS_OBJECT_NAME), 'foot');
+
+    rcube_add_label('checking');
+    }
+ 
+  $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
+
   return $out;
   }
 
@@ -393,19 +478,31 @@
   
     foreach ($FORWARD_MESSAGE['parts'] as $part)
       {
-      if ($part->disposition != 'attachment')
-        continue;
-
-      $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
-      if ($fp = fopen($tmp_path, 'w'))
+      if ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
+               (empty($part->disposition) && ($part->d_parameters['filename'] || $part->ctype_parameters['name'])))
         {
-        fwrite($fp, $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']));
-        fclose($fp);
+        $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
+        if ($fp = fopen($tmp_path, 'w'))
+          {
+          fwrite($fp, $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']));
+          fclose($fp);
 
-        $_SESSION['compose']['attachments'][] = array('name' => $part->d_parameters['filename'],
-                                                      'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
-                                                      'path' => $tmp_path);
-        }
+          if ($part->d_parameters['filename'])
+            $_SESSION['compose']['attachments'][] = array('name' => $part->d_parameters['filename'],
+                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+                                                          'path' => $tmp_path);
+                                   
+          else if ($part->ctype_parameters['name'])
+	    $_SESSION['compose']['attachments'][] = array('name' => $part->ctype_parameters['name'],
+                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+                                                          'path' => $tmp_path);
+							  
+          else if ($part->headers['content-description'])
+	    $_SESSION['compose']['attachments'][] = array('name' => $part->headers['content-description'],
+                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+                                                          'path' => $tmp_path);
+          }
+	}
       }
 
     $_SESSION['compose']['forward_attachments'] = TRUE;
@@ -414,11 +511,57 @@
   return $prefix.$body;
   }
 
+function rcmail_create_draft_body($body)
+  {
+  global $IMAP, $DRAFT_MESSAGE;
+    
+  // add attachments
+  if (!isset($_SESSION['compose']['forward_attachments']) && is_array($DRAFT_MESSAGE['parts']) && sizeof($DRAFT_MESSAGE['parts'])>1)
+    { 
+    $temp_dir = rcmail_create_compose_tempdir();
+
+    if (!is_array($_SESSION['compose']['attachments']))
+      $_SESSION['compose']['attachments'] = array();
+  
+    foreach ($DRAFT_MESSAGE['parts'] as $part)
+      {
+      if ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
+               (empty($part->disposition) && ($part->d_parameters['filename'] || $part->ctype_parameters['name'])))
+        {
+        $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
+        if ($fp = fopen($tmp_path, 'w'))
+          {                     
+          fwrite($fp, $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']));
+          fclose($fp);          
+                                
+          if ($part->d_parameters['filename'])
+            $_SESSION['compose']['attachments'][] = array('name' => $part->d_parameters['filename'],
+                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+                                                          'path' => $tmp_path);
+
+          else if ($part->ctype_parameters['name'])
+            $_SESSION['compose']['attachments'][] = array('name' => $part->ctype_parameters['name'],
+                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+                                                          'path' => $tmp_path);
+
+          else if ($part->headers['content-description'])
+            $_SESSION['compose']['attachments'][] = array('name' => $part->headers['content-description'],
+                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+                                                          'path' => $tmp_path);
+          }
+        }
+      }
+
+    $_SESSION['compose']['forward_attachments'] = TRUE;
+    }
+
+  return $body;
+  }
 
 
 function rcmail_compose_subject($attrib)
   {
-  global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE;
+  global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE, $DRAFT_MESSAGE;
   
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
@@ -430,7 +573,7 @@
 
   // use subject from post
   if (isset($_POST['_subject']))
-    $subject = stripslashes($_POST['_subject']);
+    $subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE);
     
   // create a reply-subject
   else if (isset($REPLY_MESSAGE['subject']))
@@ -450,6 +593,9 @@
       $subject = 'Fwd: '.$FORWARD_MESSAGE['subject'];
     }
 
+  // creeate a draft-subject
+  else if (isset($DRAFT_MESSAGE['subject']))
+    $subject = $DRAFT_MESSAGE['subject'];
   
   $out = $form_start ? "$form_start\n" : '';
   $out .= $textfield->show($subject);
@@ -474,8 +620,22 @@
   
   if (is_array($_SESSION['compose']['attachments']))
     {
-    foreach ($_SESSION['compose']['attachments'] as $i => $a_prop)
-      $out .= sprintf("<li>%s</li>\n", $a_prop['name']);
+    if ($attrib['deleteicon'])
+      $button = sprintf('<img src="%s%s" alt="%s" border="0" style="padding-right:2px;vertical-align:middle" />',
+                        $CONFIG['skin_path'],
+                        $attrib['deleteicon'],
+                        rcube_label('delete'));
+    else
+      $button = rcube_label('delete');
+
+    foreach ($_SESSION['compose']['attachments'] as $id => $a_prop)
+      $out .= sprintf('<li id="rcmfile%d"><a href="#delete" onclick="return %s.command(\'remove-attachment\',\'rcmfile%d\', this)" title="%s">%s</a>%s</li>',
+                      $id,
+                      $JS_OBJECT_NAME,
+                      $id,
+                      rcube_label('delete'), 
+                      $button,
+                      rep_specialchars_output($a_prop['name']));
     }
 
   $OUTPUT->add_script(sprintf("%s.gui_object('attachmentlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));  
@@ -552,6 +712,26 @@
   }
 
 
+function rcmail_receipt_checkbox($attrib)
+  {
+  list($form_start, $form_end) = get_form_tags($attrib);
+  unset($attrib['form']);
+  
+  if (!isset($attrib['id']))
+    $attrib['id'] = 'receipt';  
+
+  $attrib['name'] = '_receipt';
+  $attrib['value'] = '1';
+  $checkbox = new checkbox($attrib);
+
+  $out = $form_start ? "$form_start\n" : '';
+  $out .= $checkbox->show(0);
+  $out .= $form_end ? "\n$form_end" : '';
+
+  return $out;
+  }
+
+
 function get_form_tags($attrib)
   {
   global $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;  
@@ -561,7 +741,7 @@
     {
     $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
     $hiddenfields->add(array('name' => '_action', 'value' => 'send'));
-    
+
     $form_start = empty($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
     $form_start .= "\n$SESS_HIDDEN_FIELD\n";
     $form_start .= $hiddenfields->show();
@@ -614,7 +794,5 @@
   }
 
 
-
-
 parse_template('compose');
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1