From d9c7f7390ee064fd3e4c62aff6eb159ab723e6da Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 20 Sep 2016 08:51:43 +0200
Subject: [PATCH] =?UTF-8?q?Die=20Inputs=20im=20Formular=20enthielten=20ung?=
=?UTF-8?q?=C3=BCltige=20Zeichen=20(".",=20...)=20Ich=20lasse=20die=20Name?=
=?UTF-8?q?n=20der=20Variablen=20nun=20einfach=20Base64=20enkodieren=20und?=
=?UTF-8?q?=20mache=20das=20ganze=20beim=20auslesen=20wieder=20r=C3=BCckg?=
=?UTF-8?q?=C3=A4ngig.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/MailController.php | 4 +++-
resources/views/languages/edit.blade.php | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index 9ff576a5a..11f493491 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -123,16 +123,17 @@ class MailController extends Controller
public function sendLanguageFile(Request $request, $from, $to, $exclude = "")
{
-
$filename = $request->input('filename');
# Wir erstellen nun zunächst den Inhalt der Datei:
$data = [];
$new = 0;
foreach ($request->all() as $key => $value) {
+
if ($key === "filename" || $value === "") {
continue;
}
+ $key = base64_decode($key);
if (strpos($key, "_new_") === 0 && $value !== "") {
$new++;
$key = substr($key, strpos($key, "_new_") + 5);
@@ -151,6 +152,7 @@ class MailController extends Controller
}
}
+
$output = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
$output = preg_replace("/\{/si", "[", $output);
$output = preg_replace("/\}/si", "]", $output);
diff --git a/resources/views/languages/edit.blade.php b/resources/views/languages/edit.blade.php
index f31918f2b..6ce0b5975 100644
--- a/resources/views/languages/edit.blade.php
+++ b/resources/views/languages/edit.blade.php
@@ -37,13 +37,12 @@
@else
<tr>
<td class="name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
- <td>@if(isset($langValues[$to])) <textarea type="text" rows="1" cols="50" form="submit" name="{{$name}}" readonly >{{$langValues[$to]}}</textarea> @else <textarea rows="1" cols="50" form="submit" name="_new_{{$name}}" ></textarea> @endif</td>
+ <td>@if(isset($langValues[$to])) <textarea type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}" readonly >{{$langValues[$to]}}</textarea> @else <textarea rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $name)}}" ></textarea> @endif</td>
@foreach($langs as $lang => $value)
<td>{!! $langValues[$lang] or "" !!}</td>
@endforeach
</tr>
@endif
-
@endforeach
</tbody>
</table>
--
GitLab