commit 3594ae6e31ca918e918ec10f6dac39a0b35502f5
parent b370bfc293e5dec706ac2041b51d997a69c2e114
Author: markseu <mark2011@mayberg.se>
Date: Tue, 22 May 2018 14:45:53 +0200
Updated plugins, ask for consent before collecting personal data
Diffstat:
7 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/system/plugins/edit.css b/system/plugins/edit.css
@@ -157,42 +157,42 @@
}
.yellow-btn:active { box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.1); }
-#yellow-pane-login { text-align:center; white-space:nowrap; }
+#yellow-pane-login { text-align:center; }
#yellow-pane-login .yellow-form-control { width:15em; box-sizing:border-box; }
#yellow-pane-login .yellow-btn { width:15em; margin:1em 1em 0.5em 0; }
#yellow-pane-login-fields { width:15em; text-align:left; margin:0 auto; }
#yellow-pane-login-buttons { margin:0.5em 0; }
#yellow-pane-login-buttons p { margin:0; }
-#yellow-pane-signup { text-align:center; white-space:nowrap; }
+#yellow-pane-signup { text-align:center; }
#yellow-pane-signup .yellow-form-control { width:15em; box-sizing:border-box; }
#yellow-pane-signup .yellow-btn { width:15em; margin:1em 1em 0.5em 0; }
#yellow-pane-signup-status { margin:0.5em 0; display:inline-block; }
#yellow-pane-signup-fields { width:15em; text-align:left; margin:0 auto; }
#yellow-pane-signup-buttons { margin-top:-0.5em; }
-#yellow-pane-forgot { text-align:center; white-space:nowrap; }
+#yellow-pane-forgot { text-align:center; }
#yellow-pane-forgot .yellow-form-control { width:15em; box-sizing:border-box; }
#yellow-pane-forgot .yellow-btn { width:15em; margin:1em 1em 0.5em 0; }
#yellow-pane-forgot-status { margin:0.5em 0; display:inline-block; }
#yellow-pane-forgot-fields { width:15em; text-align:left; margin:0 auto; }
#yellow-pane-forgot-buttons { margin-top:-0.5em; }
-#yellow-pane-recover { text-align:center; white-space:nowrap; }
+#yellow-pane-recover { text-align:center; }
#yellow-pane-recover .yellow-form-control { width:15em; box-sizing:border-box; }
#yellow-pane-recover .yellow-btn { width:15em; margin:1em 1em 0.5em 0; }
#yellow-pane-recover-status { margin:0.5em 0; display:inline-block; }
#yellow-pane-recover-fields { width:15em; text-align:left; margin:0 auto; }
#yellow-pane-recover-buttons { margin-top:-0.5em; }
-#yellow-pane-settings { text-align:center; white-space:nowrap; }
+#yellow-pane-settings { text-align:center; }
#yellow-pane-settings .yellow-form-control { width:15em; box-sizing:border-box; }
#yellow-pane-settings .yellow-btn { width:15em; margin:1em 1em 0.5em 0; }
#yellow-pane-settings-status { margin:0.5em 0; display:inline-block; }
#yellow-pane-settings-fields { width:15em; text-align:left; margin:0 auto; }
#yellow-pane-settings-buttons { margin-top:-0.5em; }
-#yellow-pane-version { text-align:center; white-space:nowrap; }
+#yellow-pane-version { text-align:center; }
#yellow-pane-version .yellow-btn { width:15em; margin:1em 1em 0.5em 0; }
#yellow-pane-version-status { margin:0.5em 0; display:inline-block; }
#yellow-pane-version-fields { text-align:center; margin:0.5em 0; }
diff --git a/system/plugins/edit.js b/system/plugins/edit.js
@@ -199,6 +199,7 @@ yellow.edit =
"<p><label for=\"yellow-pane-signup-name\">"+this.getText("SignupName")+"</label><br /><input class=\"yellow-form-control\" name=\"name\" id=\"yellow-pane-signup-name\" maxlength=\"64\" value=\""+yellow.toolbox.encodeHtml(this.getRequest("name"))+"\" /></p>"+
"<p><label for=\"yellow-pane-signup-email\">"+this.getText("SignupEmail")+"</label><br /><input class=\"yellow-form-control\" name=\"email\" id=\"yellow-pane-signup-email\" maxlength=\"64\" value=\""+yellow.toolbox.encodeHtml(this.getRequest("email"))+"\" /></p>"+
"<p><label for=\"yellow-pane-signup-password\">"+this.getText("SignupPassword")+"</label><br /><input class=\"yellow-form-control\" type=\"password\" name=\"password\" id=\"yellow-pane-signup-password\" maxlength=\"64\" value=\"\" /></p>"+
+ "<p><input type=\"checkbox\" name=\"consent\" value=\"consent\" id=\"consent\""+(this.getRequest("consent") ? " checked=\"checked\"" : "")+"> <label for=\"consent\">"+this.getText("SignupConsent")+"</label></p>"+
"<p><input class=\"yellow-btn\" type=\"submit\" value=\""+this.getText("SignupButton")+"\" /></p>"+
"</div>"+
"<div id=\"yellow-pane-signup-buttons\">"+
diff --git a/system/plugins/edit.php b/system/plugins/edit.php
@@ -5,7 +5,7 @@
class YellowEdit
{
- const VERSION = "0.7.16";
+ const VERSION = "0.7.17";
var $yellow; //access to API
var $response; //web response
var $users; //user accounts
@@ -286,7 +286,8 @@ class YellowEdit
$name = trim(preg_replace("/[^\pL\d\-\. ]/u", "-", $_REQUEST["name"]));
$email = trim($_REQUEST["email"]);
$password = trim($_REQUEST["password"]);
- if(empty($name) || empty($email) || empty($password)) $this->response->status = "incomplete";
+ $consent = trim($_REQUEST["consent"]);
+ if(empty($name) || empty($email) || empty($password) || empty($consent)) $this->response->status = "incomplete";
if($this->response->status=="ok") $this->response->status = $this->getUserAccount($email, $password, $this->response->action);
if($this->response->status=="ok" && $this->response->isLoginRestrictions()) $this->response->status = "next";
if($this->response->status=="ok" && $this->users->isTaken($email)) $this->response->status = "next";
diff --git a/system/plugins/language-de.txt b/system/plugins/language-de.txt
@@ -3,7 +3,7 @@
Language: de
LanguageDescription: Deutsch
LanguageTranslator: David Fehrmann
-LanguageVersion: 0.7.7
+LanguageVersion: 0.7.8
BlogBy: von
BlogFilter: Blog:
@@ -12,6 +12,7 @@ BlogMore: Lies mehr…
ContactName: Name:
ContactEmail: E-Mail:
ContactMessage: Nachricht:
+ContactConsent: Ich stimme zu, dass diese Webseite meine persönlichen Daten speichert und zur Kontaktaufnahme verwendet.
ContactButton: Nachricht absenden
ContactStatusNone: Sag Hallo! Dein Feedback ist sehr willkommen.
ContactStatusIncomplete: Bitte alle Felder ausfüllen.
@@ -40,6 +41,7 @@ EditSignupTitle: Benutzerkonto erstellen
EditSignupName: Name:
EditSignupEmail: E-Mail:
EditSignupPassword: Kennwort:
+EditSignupConsent: Ich stimme zu, dass diese Webseite meine persönlichen Daten speichert.
EditSignupButton: Erstellen
EditSignupStatusNone: Hier kannst du ein neues Benutzerkonto erstellen.
EditSignupStatusIncomplete: Bitte alle Felder ausfüllen.
diff --git a/system/plugins/language-en.txt b/system/plugins/language-en.txt
@@ -3,7 +3,7 @@
Language: en
LanguageDescription: English
LanguageTranslator: Mark Seuffert
-LanguageVersion: 0.7.7
+LanguageVersion: 0.7.8
BlogBy: by
BlogFilter: Blog:
@@ -12,6 +12,7 @@ BlogMore: Read more…
ContactName: Name:
ContactEmail: Email:
ContactMessage: Message:
+ContactConsent: I consent that this website stores my personal data and uses it to contact me.
ContactButton: Send message
ContactStatusNone: Say hello. Your feedback is very welcome.
ContactStatusIncomplete: Please fill out all fields.
@@ -40,6 +41,7 @@ EditSignupTitle: Create user account
EditSignupName: Name:
EditSignupEmail: Email:
EditSignupPassword: Password:
+EditSignupConsent: I consent that this website stores my personal data.
EditSignupButton: Create
EditSignupStatusNone: Here you can create a new user account.
EditSignupStatusIncomplete: Please fill out all fields.
diff --git a/system/plugins/language-fr.txt b/system/plugins/language-fr.txt
@@ -3,7 +3,7 @@
Language: fr
LanguageDescription: Français
LanguageTranslator: Juh Nibreh
-LanguageVersion: 0.7.7
+LanguageVersion: 0.7.8
BlogBy: par
BlogFilter: Blog:
@@ -12,6 +12,7 @@ BlogMore: Lire la suite…
ContactName: Nom:
ContactEmail: Email:
ContactMessage: Message:
+ContactConsent: Je consens que ce site web stocke mes données personnelles et l'utilise pour me contacter.
ContactButton: Envoyer le message
ContactStatusNone: Dites bonjour! Vos commentaires sont les bienvenus.
ContactStatusIncomplete: S'il vous plaît, veuillez remplir tous les champs.
@@ -40,6 +41,7 @@ EditSignupTitle: Créer un compte utilisateur
EditSignupName: Nom:
EditSignupEmail: Email:
EditSignupPassword: Mot de passe:
+EditSignupConsent: Je consens que ce site web stocke mes données personnelles.
EditSignupButton: Créer
EditSignupStatusNone: Ici, vous pouvez créer un nouveau compte utilisateur.
EditSignupStatusIncomplete: Veuillez remplir tous les champs.
diff --git a/system/plugins/language.php b/system/plugins/language.php
@@ -5,7 +5,7 @@
class YellowLanguage
{
- const VERSION = "0.7.7";
+ const VERSION = "0.7.8";
}
$yellow->plugins->register("language", "YellowLanguage", YellowLanguage::VERSION);
