Changeset 597170f in github for program/steps/mail/compose.inc

Timestamp:

Oct 4, 2005 4:28:01 PM (8 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

42b1135

Parents:

6dc0269

Message:

Added new languages, hierarchical folder tree and attachments in forwarded messages

File:

• program/steps/mail/compose.inc (modified) (9 diffs)

program/steps/mail/compose.inc

@@ -121 +121 @@
       
       // we have contact id's as get parameters
-      if (strlen($_GET['_to']) && preg_match('/[0-9]+,?/', $_GET['_to']))
+      if (!empty($_GET['_to']) && preg_match('/[0-9]+,?/', $_GET['_to']))
         {
         $a_recipients = array();
@@ -139 +139 @@
           $fvalue = join(', ', $a_recipients);
         }
-      else if (strlen($_GET['_to']))
+      else if (!empty($_GET['_to']))
         $fvalue = $_GET['_to'];
         
@@ -166 +166 @@
     
     
-  if ($fname && $_POST[$fname])
+  if ($fname && !empty($_POST[$fname]))
     $fvalue = $_POST[$fname];
   else if ($header && is_object($REPLY_MESSAGE['headers']))
@@ -283 +283 @@
   
   // use posted message body
-  if ($_POST['_message'])
+  if (!empty($_POST['_message']))
     $body = stripslashes($_POST['_message']);
     
@@ -353 +353 @@
                    $IMAP->decode_header($FORWARD_MESSAGE['headers']->to));
 
+  // add attachments
+  if (!isset($_SESSION['compose']['forward_attachments']) && is_array($FORWARD_MESSAGE['parts']) && sizeof($FORWARD_MESSAGE['parts'])>1)
+    {
+    $temp_dir = rcmail_create_compose_tempdir();
+
+    if (!is_array($_SESSION['compose']['attachments']))
+      $_SESSION['compose']['attachments'] = array();
+  
+    foreach ($FORWARD_MESSAGE['parts'] as $part)
+      {
+      if ($part->disposition != 'attachment')
+        continue;
+
+      $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);
+        }
+      }
+
+    $_SESSION['compose']['forward_attachments'] = TRUE;
+    }
+
   return $prefix.$body;
   }
@@ -371 +399 @@
 
   // use subject from post
-  if ($_POST['_subject'])
+  if (isset($_POST['_subject']))
     $subject = stripslashes($_POST['_subject']);
     
@@ -474 +502 @@
                  array(1, 2, 0, 4, 5));
                  
-  $sel = $_POST['_priority'] ? $_POST['_priority'] : 0;
+  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0;
 
   $out = $form_start ? "$form_start\n" : '';
@@ -494 +522 @@
     $hiddenfields->add(array('name' => '_action', 'value' => 'send'));
     
-    $form_start = !strlen($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
+    $form_start = empty($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
     $form_start .= "\n$SESS_HIDDEN_FIELD\n";
     $form_start .= $hiddenfields->show();
@@ -500 +528 @@
     
   $form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
-  $form_name = strlen($attrib['form']) ? $attrib['form'] : 'form';
+  $form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
   
   if (!strlen($MESSAGE_FORM))