diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php index 5a3c0d0256bce7ec42c63b685d667dba74a413b0..fa8b1c05ac128bc4e30492aa35f8fa20a4bd947e 100644 --- a/app/Http/Controllers/LanguageController.php +++ b/app/Http/Controllers/LanguageController.php @@ -49,7 +49,7 @@ class LanguageController extends Controller ->with('deComplete', $deComplete); } - public function createEditPage($from, $to, $exclude = "") + public function createEditPage($from, $to, $exclude = "", $email = "") { $languageFilePath = resource_path() . "/lang/"; $files = scandir($languageFilePath); @@ -153,7 +153,8 @@ class LanguageController extends Controller ->with('to', $to) ->with('langTexts', $langTexts) ->with('sum', $sum) - ->with('new', $ex["new"]); + ->with('new', $ex["new"]) + ->with('email', $email); } private function htmlEscape($t, $to) diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php index 48bb41118584357e52aa8924fa4a7333f8caf464..c0d85837c6fbd8e61b30f2d2610292c2d98a1169 100644 --- a/app/Http/Controllers/MailController.php +++ b/app/Http/Controllers/MailController.php @@ -120,7 +120,6 @@ 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; @@ -130,16 +129,16 @@ class MailController extends Controller if ($key === "filename" || $value === "") { continue; } + if($key === "email") { + $emailAddress = $value; + continue; + } $key = base64_decode($key); if (strpos($key, "_new_") === 0 && $value !== "") { $new++; $key = substr($key, strpos($key, "_new_") + 5); } $key = trim($key); - if($key === "email") { - $emailAddress = $value; - continue; - } if (!strpos($key, "#")) { $data[$key] = $value; } else { @@ -158,11 +157,13 @@ class MailController extends Controller $output = preg_replace("/\{/si", "[", $output); $output = preg_replace("/\}/si", "]", $output); $output = preg_replace("/\": ([\"\[])/si", "\"\t=>\t$1", $output); - + $output = "<?php\n\nreturn $output;\n"; $message = "Moin moin,\n\nein Benutzer hat eine Sprachdatei aktualisiert.\nSollten die Texte so in Ordnung sein, ersetzt, oder erstellt die Datei aus dem Anhang in folgendem Pfad:\n$filename\n\nFolgend zusätzlich der Inhalt der Datei:\n\n$output"; - + // echo $request->old('email'); + //echo $request->input('email','test'); + // die(""); # Wir haben nun eine Mail an uns geschickt, welche die entsprechende Datei beinhaltet. # Nun müssen wir den Nutzer eigentlich nur noch zurück leiten und die Letzte bearbeitete Datei ausschließen: $ex = []; @@ -185,15 +186,16 @@ class MailController extends Controller if ($new > 0) { if($emailAddress !== "") { - Mail::to("dev@suma-ev.de") + Mail::to("aria@suma-ev.de") ->send(new Sprachdatei($message, $output, basename($filename), $emailAddress)); } else { - Mail::to("dev@suma-ev.de") + Mail::to("aria@suma-ev.de") ->send(new Sprachdatei($message, $output, basename($filename))); } } $ex = base64_encode(serialize($ex)); - return redirect(url('languages/edit', ['from' => $from, 'to' => $to, 'exclude' => $ex])); + + return redirect(url('languages/edit', ['from' => $from, 'to' => $to, 'exclude' => $ex, 'email' => $emailAddress])); } } diff --git a/resources/views/languages/edit.blade.php b/resources/views/languages/edit.blade.php index d76a6c23189f9d10ad6c9c0c5daeee701e57b831..16990e22aaf9ee59eaa9fa9a226b725b25c7f213 100644 --- a/resources/views/languages/edit.blade.php +++ b/resources/views/languages/edit.blade.php @@ -56,6 +56,6 @@ <p>{!! trans('languages.hinweis.2') !!}</p> <p>{!! trans('languages.hinweis.3') !!}</p> <p><b>E-Mail-Adresse für Rückfragen</b> (optional):</p> - <p><input type="email" form="submit" name="{{ base64_encode("email") }}" placeholder="name@provider.com"/></input></p> + <p><input type="email" name="email" form="submit" value="{{$email}}" placeholder="name@provider.com"/></p> <button class="btn btn-success" type="submit" form="submit">Daten übermitteln</button> @endsection diff --git a/routes/web.php b/routes/web.php index 70bb8ac1239267c609c963c856e059db83091067..6f56932aacc55e7ad3666f26b015df9caab0abb5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -158,7 +158,7 @@ Route::group( return redirect('https://metager.de/klassik/databund'); }); Route::get('languages', 'LanguageController@createOverview'); - Route::get('languages/edit/{from}/{to}/{exclude?}', 'LanguageController@createEditPage'); + Route::get('languages/edit/{from}/{to}/{exclude?}/{email?}', 'LanguageController@createEditPage'); Route::post('languages/edit/{from}/{to}/{exclude?}', 'MailController@sendLanguageFile'); Route::get('berlin', 'StartpageController@berlin');