Merge remote-tracking branch 'github/pull/426'

[chef.git] / cookbooks / dmca / files / default / html / index.php
diff --git a/cookbooks/dmca/files/default/html/index.php b/cookbooks/dmca/files/default/html/index.php

index 33c28006e1fb1423dd2ca318e83ba59aa5888749..47e1afb064388f2c6858df365b942018e7fbd869 100644 (file)
--- a/cookbooks/dmca/files/default/html/index.php
+++ b/cookbooks/dmca/files/default/html/index.php
@@ -10,7 +10,10 @@ function process_data ($values) {
          $email_body = 'OpenStreetMap - Claim of Copyright Infringement form:'."\n\n";
          $email_body .= 'Automated Email - Form Posted.'."\n\n";
          $email_body .= print_r($values, true);
-        mail('dmca@osmfoundation.org','OSM Claim of Copyright Infringement', $email_body, 'From: OSMF Copyright Form <dmca@osmfoundation.org>', '-fdmca@osmfoundation.org');
+        $reply_address = $values['name_first'].' '.$values['name_last'].' <'.$values['email'].'>';
+        $email_body .= 'Formatted address: '.$reply_address."\n\n";
+        $email_header = 'From: OSMF Copyright Form <dmca@osmfoundation.org>' . "\r\n" . 'Content-Type: text/plain; charset="utf-8"';
+        mail('dmca@osmfoundation.org','OSM Claim of Copyright Infringement', $email_body, $email_header, '-fdmca@osmfoundation.org');
  }
  ?>
  <!DOCTYPE html>