jekyll-theme-consulting 0.10.1 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ca15a34984ff88be827b0e3669dd7f8edcb5b94699a9eff382b513e1ff0a84
-  data.tar.gz: 56f338f8a0af42f63a87687790791fca07666a5aa96e65c5ab4a5e25554ddbbc
+  metadata.gz: 37ee0b2db3e3d8f52b751a575ca96ae422803c6331449ccc6db21bf8e5992f7c
+  data.tar.gz: 944e65b0385226d3183eff1bd604d92f6d93153d9e8fdeff4dbf7e9288179fda
 SHA512:
-  metadata.gz: b92a7b6ff45e3809d5a7cbab7e279a4f5f017a0386a7ea7afd073b4eac41d2238a6bdfbf803d721d2ae8bb35c5cfeaffee5e82c942b03240506fb0c6359015f9
-  data.tar.gz: c4ec1fc7bdcb7e8619d542f5f97f24b1ae1d4ae6a117b87db24764c73dbe8451f23f87526f58e870b94f41f330a8f5155a8b9ce9b75661c7e833c3f8ba481ca7
+  metadata.gz: eeb1cf9d5d85fa5b241ecbe94538ac6c60d705548096ca758b3f8c18f336624946c0751dc6e022585801380bfc987f493ef98c82ab482ddd3a88629cdee37ff4
+  data.tar.gz: 74de75686d4508d26a40ef3df06abe78634ebd494aa6bb1709aaba1b7730e26874e570799fd1163c0d2f9fb838ed383b07cafdf37fe700c703b0329a455085c7

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', encodeURIComponent(nameInputElement.value));
+        formData.append('email', encodeURIComponent(emailInputElement.value));
+        formData.append('message', encodeURIComponent(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/{contact.php → _layouts/contact.html}

@@ -1,19 +1,23 @@
 ---
-layout: null
+permalink: /contact.php
+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(
@@ -22,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);
         }
     }
 }
@@ -44,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) {
@@ -55,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));
 
@@ -67,12 +68,22 @@ function is_recaptcha_valid($token) {
         && $result->success);
 }
 
-function send_mail ($name, $email, $message) {
+function send_mail ($name, $email, $message, $ip) {
     return mail(
         "{{ site.email }}",
-        "{{ site.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.1
+  version: 0.10.6
 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
@@ -98,6 +98,7 @@ files:
 - _includes/toggle.html
 - _includes/waves/bottom.html
 - _includes/waves/top.html
+- _layouts/contact.html
 - _layouts/default.html
 - _layouts/home.html
 - _layouts/index.html
@@ -279,7 +280,6 @@ files:
 - assets/webfonts/fa-solid-900.ttf
 - assets/webfonts/fa-solid-900.woff
 - assets/webfonts/fa-solid-900.woff2
-- contact.php
 homepage: https://github.com/moodule/jekyll-theme-consulting
 licenses:
 - CC-BY-NC-SA-4.0