jekyll-theme-consulting 0.9.10 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 932d49ffa22e1d3d7d193480335d1a4454c4019b9c4b6e06a87e821b68e75093
-  data.tar.gz: 855a9305e80a249deb69b534496f6266a0f7583a505c388ff1cbe1c5dc8fe72c
+  metadata.gz: '0267749ef77dd82f236dd948e2aa7414eeda519ca5c13f54546e06d9933681be'
+  data.tar.gz: b84c63d4fef729187874985609a8866131caa3d927fdfdb97677c68f2f5c965c
 SHA512:
-  metadata.gz: 20bdc93735275156c2b1039b236863339ffe614478b94801d9a57185e1b1791b826aa063f209030689d7b44fffa39acb45959eeddd8d8e82d6602aaad57df709
-  data.tar.gz: cc20b071e41e1d54dde82e786fafee7c89d23f76d8cf7e61a028a0de087579828e79e7f9877255341983835cf2d517ecbaed1cfc5611e456b084e6ed50b6a4b6
+  metadata.gz: 376739a8d52226d30c647ffe07b3343fb813047493a37c7150ac8c20e5212bcc99282820dc97b01ce701545af31c59e587bb9feca106e76f167219af08f3fd56
+  data.tar.gz: 1afd669eb76697a58b947c15a69b2e433600cd1fa088337850fd6cbddac90f841f5bdcfe54bd71c7e4e9673142cd469f2d84ce14aec4e9041fb04883979055de

data/_includes/contact.html

@@ -27,4 +27,4 @@
     </div>
 </section>
 
-{% include contact_script.html form_id=form_id name_input_id=name_input_id email_input_id=email_input_id message_input_id=message_input_id submit_input_id=submit_input_id reset_input_id=reset_input_id recaptcha_widget_id=recaptcha_widget_id onsubmit_callback=onsubmit_callback onreset_callback=onreset_callback onfocusout_callback=onfocusout_callback %}
+{% include contact_client_script.html form_id=form_id name_input_id=name_input_id email_input_id=email_input_id message_input_id=message_input_id submit_input_id=submit_input_id reset_input_id=reset_input_id recaptcha_widget_id=recaptcha_widget_id onsubmit_callback=onsubmit_callback onreset_callback=onreset_callback onfocusout_callback=onfocusout_callback %}

data/_includes/{contact_script.html → contact_client_script.html}

@@ -61,7 +61,7 @@
             token: grecaptcha.getResponse(recaptchaWidget)
         };
         
-        fetch("{{ '/contact' | absolute_url }}", {
+        fetch("{{ '/contact.php' | absolute_url }}", {
             method: 'POST',
             mode: 'same-origin',
             headers: {'Content-Type': 'application/json',},

data/_layouts/contact.html

@@ -0,0 +1,89 @@
+---
+permalink: /contact.php
+mail:
+    subject:
+    intro:
+---
+{%- capture mail-intro -%}You received a message on <a href="{{ site.url }}">your website</a>.{%- endcapture -%}
+<?php
+
+$contact_name = $contact_email = $contact_message = $token = $contact_ip = "";
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if (has_required_data($_POST)) {
+        $contact_name = filter_var(
+            $_POST["name"],
+            FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $contact_email = filter_var(
+            $_POST["email"],
+            FILTER_SANITIZE_EMAIL);
+        $contact_message = filter_var(
+            $_POST["message"],
+            FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $token = filter_var(
+            $_POST["token"],
+            FILTER_SANITIZE_URL);
+        if (filter_var(
+            $_SERVER['REMOTE_ADDR'],
+            FILTER_VALIDATE_IP)) {
+            $contact_ip = $_SERVER['REMOTE_ADDR'];
+        }
+
+        if (is_recaptcha_valid($token)) {
+            send_mail($contact_name, $contact_email, $contact_message, $contact_ip);
+        } else {
+            send_mail($contact_name, $contact_email, "Tried to contact you, but his recaptcha is not valid.", $contact_ip);
+        }
+    }
+}
+
+function has_required_data($request) {
+    return (
+        (
+            isset($request['name'])
+            && isset($request['email'])
+            && isset($request['message'])
+            && isset($request['token']))
+        && (
+            !empty($request['name'])
+            && !empty($request['email'])
+            && !empty($request['message'])
+            && !empty($request['token'])));
+}
+
+function is_recaptcha_valid($token) {
+    $validation_url = "https://www.google.com/recaptcha/api/siteverify";
+    $data = array('secret' => '{{ site.recaptcha.secretkey }}', 'response' => $token);
+    $options = array(
+        'http' => array(
+            'header'  => "Content-type: application/x-www-form-urlencoded\r\n",
+            'method'  => 'POST',
+            'content' => http_build_query($data)));
+    $context  = stream_context_create($options);
+    $result = json_decode(file_get_contents($validation_url, false, $context));
+
+    return (
+        ($result !== FALSE)
+        && isset($result->success)
+        && $result->success);
+}
+
+function send_mail ($name, $email, $message, $ip) {
+    return mail(
+        "{{ site.email }}",
+        "{{ 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"));
+}
+
+?>
+

data/_sass/libs/_vars.scss

@@ -27,7 +27,7 @@ $font: (
     family-heading:     ('Roboto Slab', serif),
     family-fixed:       ('Courier New', monospace),
     weight:             400,
-    weight-bold:        600,
+    weight-bold:        900,
     weight-heading:     700,
     weight-heading-alt: 400,
     kerning-heading:    0.075em
@@ -40,7 +40,7 @@ $palette: (
     bg-inverted:        #6666ff,
     bg-alt-inverted:    #223344,
     fg:                 #000000,
-    fg-bold:            #3d4449,
+    fg-bold:            #000000,
     fg-light:           #9fa3a6,
     fg-inverted:        #ffffff,
     fg-bold-inverted:   #ffffff,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-consulting
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.10.4
 platform: ruby
 authors:
 - Moodule
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -77,8 +77,8 @@ files:
 - README.md
 - _includes/banner.html
 - _includes/contact.html
+- _includes/contact_client_script.html
 - _includes/contact_form.html
-- _includes/contact_script.html
 - _includes/date.html
 - _includes/fact.html
 - _includes/feature.html
@@ -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