From 5baadc72e7d63f548c62dea15ba23393307a0450 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Wed, 11 Apr 2018 12:48:11 -0400
Subject: update sendmail script, also fix line endings

---
 inc/sendEmail.php | 147 +++++++++++++++++++++++++++---------------------------
 1 file changed, 74 insertions(+), 73 deletions(-)

(limited to 'inc')

diff --git a/inc/sendEmail.php b/inc/sendEmail.php
index 52c4b85..187fdc3 100644
--- a/inc/sendEmail.php
+++ b/inc/sendEmail.php
@@ -1,73 +1,74 @@
-<?php
-
-// Replace this with your own email address
-$siteOwnersEmail = 'bharrismac@gmail.com';
-
-
-if ($_POST) {
-
-    $name            = trim(stripslashes($_POST['contactName']));
-    $email           = trim(stripslashes($_POST['contactEmail']));
-    $subject         = trim(stripslashes($_POST['contactSubject']));
-    $contact_message = trim(stripslashes($_POST['contactMessage']));
-
-   // Check Name
-	if (strlen($name) < 2) {
-		$error['name'] = "Please enter your name.";
-	}
-	// Check Email
-	if (!preg_match('/^[a-z0-9&\'\.\-_\+]+@[a-z0-9\-]+\.([a-z0-9\-]+\.)*+[a-z]{2}/is', $email)) {
-		$error['email'] = "Please enter a valid email address.";
-	}
-	// Check Message
-	if (strlen($contact_message) < 15) {
-		$error['message'] = "Please enter your message. It should have at least 15 characters.";
-	}
-   // Subject
-	if ($subject == '') {
-        $subject = "Contact Form Submission";
-    } else {
-        $subject = "Contact Form Submission: $subject";
-    }
-
-
-   // Set Message
-    $message .= "Email from: " . $name . "<br />";
-    $message .= "Email address: " . $email . "<br />";
-   $message .= "Message: <br /><pre>";
-   $message .= $contact_message;
-   $message .= "</pre><br /> ----- <br /> This email was sent from your site's contact form. <br />";
-
-   // Set From: header
-   $from =  $name . " <" . $email . ">";
-
-   // Email Headers
-	$headers = "From: admin<admin@benharri.com>\r\n";
-	$headers .= "Reply-To: ". $email . "\r\n";
- 	$headers .= "MIME-Version: 1.0\r\n";
-	$headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
-
-
-    if (!$error) {
-
-        ini_set("sendmail_from", $siteOwnersEmail); // for windows server
-        $mail = mail($siteOwnersEmail, $subject, $message, $headers);
-
-		if ($mail) {
-            echo "OK";
-        } else {
-            echo "Something went wrong. Please try again.";
-        }
-
-	} else {
-
-		$response = (isset($error['name'])) ? $error['name'] . "<br /> \n" : null;
-		$response .= (isset($error['email'])) ? $error['email'] . "<br /> \n" : null;
-		$response .= (isset($error['message'])) ? $error['message'] . "<br />" : null;
-
-		echo $response;
-
-	} # end if - there was a validation error
-
-}
-
+<?php
+
+// Replace this with your own email address
+$siteOwnersEmail = 'benharri@pm.me';
+
+
+if ($_POST) {
+
+    $name            = trim(stripslashes($_POST['contactName']));
+    $email           = trim(stripslashes($_POST['contactEmail']));
+    $subject         = trim(stripslashes($_POST['contactSubject']));
+    $contact_message = trim(stripslashes($_POST['contactMessage']));
+
+   // Check Name
+    $error = [];
+	if (strlen($name) < 2) {
+		$error['name'] = "Please enter your name.";
+	}
+	// Check Email
+	if (!preg_match('/^[a-z0-9&\'\.\-_\+]+@[a-z0-9\-]+\.([a-z0-9\-]+\.)*+[a-z]{2}/is', $email)) {
+		$error['email'] = "Please enter a valid email address.";
+	}
+	// Check Message
+	if (strlen($contact_message) < 15) {
+		$error['message'] = "Please enter your message. It should have at least 15 characters.";
+	}
+   // Subject
+	if ($subject == '') {
+        $subject = "benharr.is message from $name";
+    } else {
+        $subject = "benharr.is message from $name: $subject";
+    }
+
+
+   // Set Message
+    $message .= "Email from: " . $name . "<br />";
+    $message .= "Email address: " . $email . "<br />";
+   $message .= "Message: <br /><pre>";
+   $message .= $contact_message;
+   $message .= "</pre><br /> ----- <br /> This email was sent from your site's contact form. <br />";
+
+   // Set From: header
+   $from =  $name . " <" . $email . ">";
+
+   // Email Headers
+	$headers = "From: admin<admin@gingko>\r\n";
+	$headers .= "Reply-To: ". $email . "\r\n";
+ 	$headers .= "MIME-Version: 1.0\r\n";
+	$headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
+
+
+    if (count($error) == 0) {
+
+        ini_set("sendmail_from", $siteOwnersEmail); // for windows server
+        $mail = mail($siteOwnersEmail, $subject, $message, $headers);
+
+		if ($mail) {
+            echo "OK";
+        } else {
+            echo "Something went wrong. Please try again.";
+        }
+
+	} else {
+
+		$response = (isset($error['name'])) ? $error['name'] . "<br /> \n" : null;
+		$response .= (isset($error['email'])) ? $error['email'] . "<br /> \n" : null;
+		$response .= (isset($error['message'])) ? $error['message'] . "<br />" : null;
+
+		echo $response;
+
+	} # end if - there was a validation error
+
+}
+
-- 
cgit 1.4.1