jekyll-theme-consulting 0.10.3 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf4b346828d9745cd0d92091c845db875f04036618372d32d58c29e025422ad9
-  data.tar.gz: 411b6948e3a4c218b4a579dd8c8376722ebf51a330fdbb2add99a2947001c54d
+  metadata.gz: 61451966bf71c92fb1c654269258b3ef93ffe5ce4a5006332cc1470ca473f9fb
+  data.tar.gz: a6035dcb10c0c86d9217d7bc9bb6a2d352f842407fb00991ef655bdaf89cccba
 SHA512:
-  metadata.gz: a475fcc6994e78e1fd36047ffa70c4640ca5f8f179f0520ffa441ef7a21fcb037f88574517788bacd3f1a52aa1f35055a81aa86dc3fb43ba475a42fe9250c293
-  data.tar.gz: e702de5b269e20bd6d0150c3df6e449aba94a3a328b68af822bf0278e5e3e6b85436d819a76977e195c011a68fd75f37ec62dce32acb90be8466967d1c070e7d
+  metadata.gz: a5ac036008412269e38ebabab480292cb88130c146475df3bce4f17b4394ba3e7e32f1823869ba123c5548f2a0020a159bdd146d15faf859ef873d579240040c
+  data.tar.gz: c8cf966dcab7b1dc64286b3b70dcbd55dfa42b0164dde72c70771fc28cf890a5dfbd630e06634c3e566b34067aa5392db1b25849b7e4493c656495c35d4b36ae

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,35 +1,38 @@
 ---
 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 = urldecode(filter_var(
             $_POST["name"],
-            FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $email = filter_var(
+            FILTER_SANITIZE_FULL_SPECIAL_CHARS));
+        $contact_email = urldecode(filter_var(
             $_POST["email"],
-            FILTER_SANITIZE_EMAIL);
-        $message = filter_var(
+            FILTER_SANITIZE_EMAIL));
+        $contact_message = urldecode(filter_var(
             $_POST["message"],
-            FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+            FILTER_SANITIZE_FULL_SPECIAL_CHARS));
         $token = filter_var(
             $_POST["token"],
             FILTER_SANITIZE_URL);
         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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-consulting
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.8
 platform: ruby
 authors:
 - Moodule
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll