From 6d2466b5b1dc24b96ee8b6a7259afeb96063c518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Garrido=20Labrador?=
 <jlgarrido97@gmail.com>
Date: Thu, 24 May 2018 16:08:29 +0200
Subject: [PATCH] TOS Update to RGPD

---
 Source/assets/html/TOS.twig           | 16 ++++++----------
 Source/assets/html/base.twig          |  4 +++-
 Source/assets/html/footer.twig        |  2 +-
 Source/assets/html/loginregister.twig | 21 ++++++++++++++-------
 Source/src/app.php                    |  4 +++-
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Source/assets/html/TOS.twig b/Source/assets/html/TOS.twig
index 9f9406e..cbec40c 100644
--- a/Source/assets/html/TOS.twig
+++ b/Source/assets/html/TOS.twig
@@ -7,9 +7,9 @@
             <li><p>Solution: Any code snippet and its enclosed information</p></li>
         </ul>
         <h4 class="docheader top10">Privacy</h4>
-        <p>All personal data bring to JKA Network in registration form are save under Spanish's law of data protection
-            (LO 15/1999).
-            You can claim your right through JKA Network email <a href="mailto:contacto@jkanetwork.com">contacto@jkanetwork.com</a>
+        <p>All personal data bring to JKA Network in registration form are save under the General Data Protection Regulation (GDPR) (EU) 2016/679.
+            You can claim your right through JKA Network email <a href="mailto:contacto@jkanetwork.com">contacto@jkanetwork.com</a>.
+            If you use CodeShare you authorized JKA Network to save and use your Email and Nickname to manage login and upload code snippets.
         </p>
         <h4 class="docheader top10">About content upload to CodeShare</h4>
         <p>All content which the user upload to CodeShare except his email, password or comments are ceded with their
@@ -22,7 +22,7 @@
             <br>JKA Network is reserved the right to ban the access to account of any user who engage <a
                     href="index.php?page=doc#vandalism">vandalism</a></p>
         <h4 class="docheader top10" id="cookiePolicy">Cookie policiy</h4>
-        <p>In CodeShare are used three differents cookies, two for login system and one for cookies' consent. You can
+        <p>In CodeShare are used two differents cookies, one for session system and other for cookies' consent. You can
             block CodeShare cookies but you cannot log in because we cannot check if login was right.
             <br>The differents cookies are:</p>
         <table class="table table-striped table-hover" style="width: 50%">
@@ -34,12 +34,8 @@
             </thead>
             <tbody>
             <tr class="active">
-                <td>sessionID</td>
-                <td>User identifier</td>
-            </tr>
-            <tr class="active">
-                <td>Token</td>
-                <td>Unique user token for this session</td>
+                <td>PHPSESSID</td>
+                <td>Session identifier to server</td>
             </tr>
             <tr class="active">
                 <td>cookieconsent_status</td>
diff --git a/Source/assets/html/base.twig b/Source/assets/html/base.twig
index a450500..9a26c9e 100644
--- a/Source/assets/html/base.twig
+++ b/Source/assets/html/base.twig
@@ -47,7 +47,9 @@
                 }
             },
             "content": {
-                "href": "?page=tos#cookiePolicy"
+                "href": "?page=tos#cookiePolicy",
+                "message": "This website uses cookies to ensure you get the best experience on on our website. If you don't accept any cookie won't be install on your browser.",
+                "dismiss": "I accept it"
             }
         })});
 </script>
diff --git a/Source/assets/html/footer.twig b/Source/assets/html/footer.twig
index da96841..fe3bae5 100644
--- a/Source/assets/html/footer.twig
+++ b/Source/assets/html/footer.twig
@@ -1,5 +1,5 @@
 <footer>
-    <p><span class="copyleft">&copy;</span> JKA Network 2017</p>
+    <p><span class="copyleft">&copy;</span> JKA Network 2017-{{ "now"|date("Y") }}</p>
     <p xmlns:dct="https://purl.org/dc/terms/" xmlns:vcard="https://www.w3.org/2001/vcard-rdf/3.0#">
         <a rel="license"
            href="https://creativecommons.org/publicdomain/zero/1.0/">
diff --git a/Source/assets/html/loginregister.twig b/Source/assets/html/loginregister.twig
index ff0127a..6baff46 100644
--- a/Source/assets/html/loginregister.twig
+++ b/Source/assets/html/loginregister.twig
@@ -1,13 +1,20 @@
 {% extends "base.twig" %}
 {% block content %}
     <div class="container">
-    <div class="col-sm-12">
-    {% if page.state == 1 %}
-        <p class="text-danger">Bad credentials</p>
-    {% elseif page.state == 2 %}
-        <p class="text-danger">Email already exits</p>
-    {% endif %}
-    </div>
+        <div class="row">
+            <div class="col-sm-12">
+                <p class="text-primary">Cookies must be available and accepted to login and register</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12">
+            {% if page.state == 1 %}
+                <p class="text-danger">Bad credentials</p>
+            {% elseif page.state == 2 %}
+                <p class="text-danger">Email already exits</p>
+            {% endif %}
+            </div>
+        </div>
     </div>
     <div id="login">
         <form class="form-horizontal" method="post">
diff --git a/Source/src/app.php b/Source/src/app.php
index 8f42418..e9dbc41 100644
--- a/Source/src/app.php
+++ b/Source/src/app.php
@@ -1,5 +1,7 @@
 <?php
-session_start(); //Start session in app, before loading vars ($_SESSION)
+if(isset($_COOKIE['cookieconsent_status'])) {
+    session_start(); //Start session in app, before loading vars ($_SESSION)
+}
 
 require_once __DIR__ . '/../vendor/autoload.php';
 //require_once __DIR__ . '/dbwrapper.php';