From 9da90b983ab1d9b51331bed20126657233a9f9c0 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 10 May 2016 10:02:05 +0200
Subject: [PATCH] =?UTF-8?q?1.=20Alertbox=20beim=20absenden=20des=20Formula?=
=?UTF-8?q?rs=20entfernt=202.=20Kontaktformular=20kann=20nun=20auch=20wied?=
=?UTF-8?q?er=20ohne=20angabe=20einer=20Email-Adresse=20abgesendet=20werde?=
=?UTF-8?q?n.=203.=20Bug=20im=20Template=20gefixt=20bei=20dem=20es=20zu=20?=
=?UTF-8?q?einem=20Error=20kam,=20wenn=20kein=20Javascript=20zum=20einbind?=
=?UTF-8?q?en=20=C3=BCebrgeben=20wurde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/MailController.php | 10 +++-
composer.lock | 50 +++++++++----------
public/js/kontakt.js | 2 -
resources/views/layouts/staticPages.blade.php | 10 ++--
4 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index 5273289fb..3f2160a89 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -19,12 +19,18 @@ class MailController extends Controller
# Nachricht, die wir an den Nutzer weiterleiten:
$messageType = ""; # [success|error]
$returnMessage = '';
- if(!$request->has('email') || !$request->has('message')){
+ $replyTo = $request->input('email', 'noreply@metager.de');
+ if($replyTo === ""){
+ $replyTo = "noreply@metager.de";
+ }else{
+ $replyTo = $request->input('email');
+ }
+
+ if(!$request->has('message')){
$messageType = "error";
$returnMessage = "Tut uns leid, aber leider haben wir mit Ihrer Kontaktanfrage keine Daten erhalten. Die Email wurde nicht versand";
}else{
# Wir versenden die Mail des Benutzers an uns:
- $replyTo = $request->input('email');
$message = $request->input('message');
if( Mail::send(['text' => 'kontakt.mail'], ['messageText'=>$message], function($message) use($replyTo){
diff --git a/composer.lock b/composer.lock
index 10a4602d2..24e6e9209 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1219,7 +1219,7 @@
},
{
"name": "symfony/console",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
@@ -1279,7 +1279,7 @@
},
{
"name": "symfony/debug",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
@@ -1336,16 +1336,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4"
+ "reference": "807dde98589f9b2b00624dca326740380d78dbbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/17b04e6b1ede45b57d3ad5146abe50df6c3968b4",
- "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/807dde98589f9b2b00624dca326740380d78dbbc",
+ "reference": "807dde98589f9b2b00624dca326740380d78dbbc",
"shasum": ""
},
"require": {
@@ -1392,11 +1392,11 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-04-12 18:09:53"
+ "time": "2016-05-05 06:56:13"
},
{
"name": "symfony/finder",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -1445,7 +1445,7 @@
},
{
"name": "symfony/http-foundation",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
@@ -1498,16 +1498,16 @@
},
{
"name": "symfony/http-kernel",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "1aa25588241f915cf176b7c371e5d629dfff8b43"
+ "reference": "6a5010978edf0a9646342232531e53bfc7abbcd3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1aa25588241f915cf176b7c371e5d629dfff8b43",
- "reference": "1aa25588241f915cf176b7c371e5d629dfff8b43",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6a5010978edf0a9646342232531e53bfc7abbcd3",
+ "reference": "6a5010978edf0a9646342232531e53bfc7abbcd3",
"shasum": ""
},
"require": {
@@ -1576,7 +1576,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-05-03 05:58:27"
+ "time": "2016-05-09 22:13:13"
},
{
"name": "symfony/polyfill-mbstring",
@@ -1747,7 +1747,7 @@
},
{
"name": "symfony/process",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -1796,16 +1796,16 @@
},
{
"name": "symfony/routing",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "6ab6fd5ee754fb53a303a5621ae35f3afd5970ac"
+ "reference": "a6cd168310066176599442aa21f5da86c3f8e0b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/6ab6fd5ee754fb53a303a5621ae35f3afd5970ac",
- "reference": "6ab6fd5ee754fb53a303a5621ae35f3afd5970ac",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/a6cd168310066176599442aa21f5da86c3f8e0b3",
+ "reference": "a6cd168310066176599442aa21f5da86c3f8e0b3",
"shasum": ""
},
"require": {
@@ -1867,11 +1867,11 @@
"uri",
"url"
],
- "time": "2016-04-28 09:48:42"
+ "time": "2016-05-03 12:23:49"
},
{
"name": "symfony/translation",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
@@ -1935,7 +1935,7 @@
},
{
"name": "symfony/var-dumper",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
@@ -3112,7 +3112,7 @@
},
{
"name": "symfony/css-selector",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -3165,7 +3165,7 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
@@ -3221,7 +3221,7 @@
},
{
"name": "symfony/yaml",
- "version": "v3.0.5",
+ "version": "v3.0.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
diff --git a/public/js/kontakt.js b/public/js/kontakt.js
index db3a24c3e..6c71b67ce 100644
--- a/public/js/kontakt.js
+++ b/public/js/kontakt.js
@@ -19,7 +19,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
function encrypt() {
if (window.crypto && window.crypto.getRandomValues) {
var message = document.getElementById("message");
- console.log(message);
if (message.value.indexOf("-----BEGIN PGP MESSAGE-----") !== -1 && message.value.indexOf("-----END PGP MESSAGE-----") !== -1) {
// encryption done
} else {
@@ -27,7 +26,6 @@ function encrypt() {
var plaintext = message.value;
var ciphertext = openpgp.encryptMessage([pub_key],plaintext);
message.value = ciphertext;
- alert(message.value);
return true;
}
} else {
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index e3dcf6988..768546b5c 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -164,9 +164,11 @@
<script type="text/javascript" src="/js/jquery.js"></script>
<script type="text/javascript" src="/js/bootstrap.js"></script>
<script type="text/javascript" src="/js/scriptStartPage.js"></script>
- @foreach ($js as $script)
- <script type="text/javascript" src="/js/{{ $script }}"></script>
- @endforeach
+ @if (isset($js))
+ @foreach ($js as $script)
+ <script type="text/javascript" src="/js/{{ $script }}"></script>
+ @endforeach
+ @endif
<!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
</body>
-</html>
\ No newline at end of file
+</html>
--
GitLab