jekyll-theme-consulting 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf4b346828d9745cd0d92091c845db875f04036618372d32d58c29e025422ad9
-  data.tar.gz: 411b6948e3a4c218b4a579dd8c8376722ebf51a330fdbb2add99a2947001c54d
+  metadata.gz: '0267749ef77dd82f236dd948e2aa7414eeda519ca5c13f54546e06d9933681be'
+  data.tar.gz: b84c63d4fef729187874985609a8866131caa3d927fdfdb97677c68f2f5c965c
 SHA512:
-  metadata.gz: a475fcc6994e78e1fd36047ffa70c4640ca5f8f179f0520ffa441ef7a21fcb037f88574517788bacd3f1a52aa1f35055a81aa86dc3fb43ba475a42fe9250c293
-  data.tar.gz: e702de5b269e20bd6d0150c3df6e449aba94a3a328b68af822bf0278e5e3e6b85436d819a76977e195c011a68fd75f37ec62dce32acb90be8466967d1c070e7d
+  metadata.gz: 376739a8d52226d30c647ffe07b3343fb813047493a37c7150ac8c20e5212bcc99282820dc97b01ce701545af31c59e587bb9feca106e76f167219af08f3fd56
+  data.tar.gz: 1afd669eb76697a58b947c15a69b2e433600cd1fa088337850fd6cbddac90f841f5bdcfe54bd71c7e4e9673142cd469f2d84ce14aec4e9041fb04883979055de

data/_layouts/contact.html

@@ -1,20 +1,23 @@
 ---
 permalink: /contact.php
-subject: Contact request
+mail:
+    subject:
+    intro:
 ---
+{%- capture mail-intro -%}You received a message on <a href="{{ site.url }}">your website</a>.{%- endcapture -%}
 <?php
 
-$name = $email = $message = $token = $ip = "";
+$contact_name = $contact_email = $contact_message = $token = $contact_ip = "";
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     if (has_required_data($_POST)) {
-        $name = filter_var(
+        $contact_name = filter_var(
             $_POST["name"],
             FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $email = filter_var(
+        $contact_email = filter_var(
             $_POST["email"],
             FILTER_SANITIZE_EMAIL);
-        $message = filter_var(
+        $contact_message = filter_var(
             $_POST["message"],
             FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $token = filter_var(
@@ -23,13 +26,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         if (filter_var(
             $_SERVER['REMOTE_ADDR'],
             FILTER_VALIDATE_IP)) {
-            $ip = $_SERVER['REMOTE_ADDR'];
+            $contact_ip = $_SERVER['REMOTE_ADDR'];
         }
 
         if (is_recaptcha_valid($token)) {
-            send_mail($name, $email, $message);
+            send_mail($contact_name, $contact_email, $contact_message, $contact_ip);
         } else {
-            send_mail($name, $email, "Got a fishy request from ".$ip);
+            send_mail($contact_name, $contact_email, "Tried to contact you, but his recaptcha is not valid.", $contact_ip);
         }
     }
 }
@@ -45,8 +48,7 @@ function has_required_data($request) {
             !empty($request['name'])
             && !empty($request['email'])
             && !empty($request['message'])
-            && !empty($request['token']))   
-    );
+            && !empty($request['token'])));
 }
 
 function is_recaptcha_valid($token) {
@@ -56,9 +58,7 @@ function is_recaptcha_valid($token) {
         'http' => array(
             'header'  => "Content-type: application/x-www-form-urlencoded\r\n",
             'method'  => 'POST',
-            'content' => http_build_query($data)
-        )
-    );
+            'content' => http_build_query($data)));
     $context  = stream_context_create($options);
     $result = json_decode(file_get_contents($validation_url, false, $context));
 
@@ -68,12 +68,21 @@ function is_recaptcha_valid($token) {
         && $result->success);
 }
 
-function send_mail ($name, $email, $message) {
+function send_mail ($name, $email, $message, $ip) {
     return mail(
         "{{ site.email }}",
-        "{{ page.subject | default: 'Contact request' }}",
-        $message."\r\n\nFrom: ".$name." @ ".$ip,
-        "From: ".$name." <".$email.">\r\nMIME-Version: 1.0\r\nContent-type: text/html\r\n");
+        "{{ page.mail.subject | default: 'Contact request' }}",
+        (
+            "{{ page.mail.intro | default: mail-intro }}<br>\r\n"
+            ."Ip: ".$ip."<br>\r\n"
+            ."Name: ".$name."<br>\r\n"
+            ."Email: ".$email."<br>\r\n"
+            ."Message: ".$message."<br>\r\n"),
+        (
+            "From: ".$name
+            ." <".$email.">\r\n"
+            ."MIME-Version: 1.0\r\n"
+            ."Content-type: text/html\r\n"));
 }
 
 ?>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-consulting
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Moodule