jekyll-theme-consulting 0.9.7 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f616d7ba3326e0bc9931e4b6cc3eb571f35780aae5d813aef0d41e2208aa6def
-  data.tar.gz: 87ef0cc53528ac8392e8b88ac19f2256b33f478603baf7422770fb5cfd788f54
+  metadata.gz: 17ca15a34984ff88be827b0e3669dd7f8edcb5b94699a9eff382b513e1ff0a84
+  data.tar.gz: 56f338f8a0af42f63a87687790791fca07666a5aa96e65c5ab4a5e25554ddbbc
 SHA512:
-  metadata.gz: 20fc851e5f2eac14c79d9941e20c6f9943864c74cd75677bda40dfa897f0b8e4337f8398ddcaac759b7df08920cf321a1fe64a103020efbfbba2d896aacbf55f
-  data.tar.gz: 10ed173db443e472828f5df8957a94de0a8051e49223662b87af11da83329056153a76e8c0b805983e6dc3c7776b7532f7b7f4525c461d71b3b1e8066420a035
+  metadata.gz: b92a7b6ff45e3809d5a7cbab7e279a4f5f017a0386a7ea7afd073b4eac41d2238a6bdfbf803d721d2ae8bb35c5cfeaffee5e82c942b03240506fb0c6359015f9
+  data.tar.gz: c4ec1fc7bdcb7e8619d542f5f97f24b1ae1d4ae6a117b87db24764c73dbe8451f23f87526f58e870b94f41f330a8f5155a8b9ce9b75661c7e833c3f8ba481ca7

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/_includes/head.html

@@ -7,9 +7,9 @@
     <link rel="stylesheet" href="{{ 'assets/css/large.css' | absolute_url }}" media="screen and (min-width: 981px)" />
     <link rel="stylesheet" href="{{ 'assets/css/medium.css' | absolute_url }}" media="screen and (min-width: 737px) and (max-width:980px)" />
     <link rel="stylesheet" href="{{ 'assets/css/small.css' | absolute_url }}" media="screen and (max-width:736px)" />
-    <link rel="preload" href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,400italic,600italic|Roboto+Slab:400,700&display=swap" as="style" onload="this.onload=null;this.rel='stylesheet';this.media='all'">
-    <link rel="preload" href="{{ 'assets/css/fontawesome-all.min.css' | absolute_url }}" as="style" onload="this.onload=null;this.rel='stylesheet';this.media='all'">
-    <link rel="preload" href="{{ 'assets/css/cookieconsent.min.css' | absolute_url }}" as="style" onload="this.onload=null;this.rel='stylesheet';this.media='all'">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,400italic,600italic|Roboto+Slab:400,700&display=swap" type="text/css" media="all">
+    <link rel="stylesheet" href="{{ 'assets/css/fontawesome-all.min.css' | absolute_url }}" type="text/css" media="all">
+    <link rel="stylesheet" href="{{ 'assets/css/cookieconsent.min.css' | absolute_url }}" type="text/css" media="all">
     {%- if include.stylesheets -%}
     {%- for file in include.stylesheets -%}
     <link rel="stylesheet" href="{{ file.url | absolute_url }}" />

data/_includes/tabs.html

@@ -11,7 +11,7 @@
         <label for="option-{{ tab-id }}" style="width: {{ include.header-width | default: 30 }}%;">{{ tab.title }}</label>
         <section class="tab-panel" style="left: {{ include.header-width | default: 30 }}%;">
             {% if show-title == true %}<h2>{{ tab.title }}</h2>{% endif %}
-            <p>{{ tab.content }}</p>
+            {{ tab.content }}
         </section>
     </div>
     {%- endfor -%}

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,

data/contact.php

@@ -0,0 +1,78 @@
+---
+layout: null
+---
+<?php
+
+$name = $email = $message = $token = $ip = "";
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if (has_required_data($_POST)) {
+        $name = filter_var(
+            $_POST["name"],
+            FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $email = filter_var(
+            $_POST["email"],
+            FILTER_SANITIZE_EMAIL);
+        $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)) {
+            $ip = $_SERVER['REMOTE_ADDR'];
+        }
+
+        if is_recaptcha_valid($token) {
+            send_mail($name, $email, $message);
+        } else {
+            send_mail($name, $email, "Got a fishy request from ".$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) {
+    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");
+}
+
+?>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-consulting
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.1
 platform: ruby
 authors:
 - Moodule
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-07 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
@@ -279,6 +279,7 @@ 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