jekyll-theme-consulting 0.10.2 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e6ed8a4f554d2c4b74d4640ab120e85ab0ae09e8c77cf4dbd5ea83d66f322b
-  data.tar.gz: f4e9374cb05b29fbfba15529c8c4b9c4bb0fd9887fb27f18a3d194bd8b1f5287
+  metadata.gz: 347a757205a09656983285677789e0cbec55f65554c35d599e377a791df5f038
+  data.tar.gz: 88e7ac638a75e585d5fd40bcf98b01317eddaac19468745bba87d7d8dbcf5b59
 SHA512:
-  metadata.gz: 598f6755974843cafdaa78bbfaeec04bc18b2ab7cc65466afc2e2d5cfb9fab6dc63c53b043c1d1a42e5eba829125ddefcf0210dc158671e4f11db8d69de3debb
-  data.tar.gz: c4764a57651719dd683b7f27919907432710dc303a2eb88848782123ffabb6625f8d5aa2d7f94f6f07eb405f52a0c88a765d56925ef8b597f72d9698953b9322
+  metadata.gz: 36b05b7ef191bba9782cc431bab31e2ea187da12dea2103c558c04278379436ecef3fe88c8e44628cc976ba036357dfeb2eda241a5d379154082a9c2321791e5
+  data.tar.gz: b6f5f055e3d20ca026a0d1008670344474c2b989fb1b5b6731248aed0d291347f43d17d552664077b144443fb82b5db6ec162924b8625dfac7dc262a552786b9

data/_includes/contact_client_script.html

@@ -54,25 +54,17 @@
     };
     
     const sendContactMessage = function() {
-        const data = {
-            name: encodeURIComponent(nameInputElement.value),
-            email: encodeURIComponent(emailInputElement.value),
-            message: encodeURIComponent(messageInputElement),
-            token: grecaptcha.getResponse(recaptchaWidget)
-        };
+        const formData = new FormData();
+        formData.append('name', encodeURI(nameInputElement.value));
+        formData.append('email', encodeURI(emailInputElement.value));
+        formData.append('message', encodeURI(messageInputElement.value));
+        formData.append('token', grecaptcha.getResponse(recaptchaWidget));
         
         fetch("{{ '/contact.php' | absolute_url }}", {
             method: 'POST',
-            mode: 'same-origin',
-            headers: {'Content-Type': 'application/json',},
-            body: JSON.stringify(data),
-        })
-        .then((response) => {
-            alert('Message sent!');
-        })
-        .catch((error) => {
-            console.error('Error:', error);
-        });
+            body: formData})
+        .then((response) => alert('Message sent!'))
+        .catch((error) => console.error('Error:', error));
     };
     
     var onRecaptchaLoadCallback = function() {
@@ -80,8 +72,7 @@
             'sitekey' : '{{ site.recaptcha.sitekey }}',
             'theme' : 'dark',
             'size' : 'compact',
-            'callback' : processContactRequest
-        });
+            'callback' : processContactRequest});
     };
 
     modalWindowElement.addEventListener('click', hideModalWindow);

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);
+        if (is_recaptcha_valid($token)) {
+            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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-consulting
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.7
 platform: ruby
 authors:
 - Moodule
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll