From ff3c3e7016780f43aa692f0828ae4ad3659b638f Mon Sep 17 00:00:00 2001
From: Aria <aria@suma-ev.de>
Date: Tue, 16 May 2017 09:54:52 +0200
Subject: [PATCH] Daten werden dargestellt

---
 app/Http/Controllers/LanguageController.php  | 27 +++++++-------
 app/Http/Controllers/MailController.php      |  4 +--
 resources/views/languages/synoptic.blade.php | 37 +++++++-------------
 3 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php
index 1f3487158..0e6330453 100644
--- a/app/Http/Controllers/LanguageController.php
+++ b/app/Http/Controllers/LanguageController.php
@@ -195,7 +195,6 @@ class LanguageController extends Controller
             }
         }
 
-        $t = [];
         $fn = "";
 
         #Wähle die erste Datei aus, welche nicht ausgeschlossen worden ist
@@ -209,29 +208,33 @@ class LanguageController extends Controller
                 }                
             }
         }
-        
-        #Speichere den Inhalt der ausgewählten Datei in Array $t ab
+
+        $snippets = [];
+
+        #Speichere den Inhalt der ausgewählten Datei in allen Sprachen in $snippets ab
         foreach($languageObjects as $folder => $languageObject) {
             foreach($languageObject->stringMap as $languageFileName => $languageFile) {
                 if($languageFileName === $fn) {
-                    $t[$languageObject->language] = $languageFile;
+                    foreach($languageFile as $key => $value) {
+                        $snippets[$key][$languageObject->language] = $value;      
+                    }
                     continue 2;
                 }
             }
         }
 
-        foreach($t as $language => $text) {
-           // foreach($text as $key => $value) {
-                echo("<p>");
-                var_dump($text);
-                echo("</p>");
-            //}
+        #Fülle $snippets auf mit leeren Einträgen für übrige Sprachen
+        foreach($to as $t) {
+            foreach($snippets as $key => $langArray) {
+                if(!isset($langArray[$t])) {
+                    $snippets[$key][$t] = "";
+                }
+            }
         }
-        die();
 
         return view('languages.synoptic')
             ->with('to', $to)           #Alle vorhandenen Sprachen
-            ->with('texts', $t)         #Array mit Sprachsnippets
+            ->with('texts', $snippets)         #Array mit Sprachsnippets
             ->with('filename', $fn)     #Name der Datei
             ->with('title', trans('titles.languages.edit'));
     }
diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index 2416f2702..90dd4dcee 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -204,11 +204,11 @@ class MailController extends Controller
 
         if ($new > 0) {
             if($emailAddress !== "") { 
-                Mail::to("aria@suma-ev.de")
+                Mail::to("dev@suma-ev.de")
                 ->send(new Sprachdatei($message, $output, basename($filename), $emailAddress));
             }
             else {
-                Mail::to("aria@suma-ev.de")
+                Mail::to("dev@suma-ev.de")
                 ->send(new Sprachdatei($message, $output, basename($filename)));
             }
         }
diff --git a/resources/views/languages/synoptic.blade.php b/resources/views/languages/synoptic.blade.php
index 713cea0e8..1ce303621 100644
--- a/resources/views/languages/synoptic.blade.php
+++ b/resources/views/languages/synoptic.blade.php
@@ -26,32 +26,19 @@
 				@endforeach				
 			</tr>
 		</thead>
-<?php /*<tbody> 
-			@foreach($texts as $name => $langValues)
-				@if($langValues === "")
-					<tr>
-						<td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
-						<td></td>
-						<td></td>
-					</tr>
-				@else
-					<tr> <!--Key -->
-						<td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
-						<td>
-							@if(isset($langValues[$to]))
-								<textarea class="language-text-area" type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}">{{$langValues[$to]}}</textarea>
-							@else
-								<textarea class="language-text-area" 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
+ <tbody> 
+			@foreach($texts as $key => $language)
+				<tr> <!--Key -->
+				<td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $key)}}</td>
+				@foreach($language as $lang => $languageValue)
+					<td>
+						<textarea class="language-text-area" rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $key)}}">{{ $languageValue }} </textarea>
+					</td>
+				@endforeach
+				</tr>
 			@endforeach
-		</tbody> */ 
-?>
+		</tbody>  
+
 	</table>
 	<!--
 	<p>{{ trans('languages.hinweis.1') }}</p>
-- 
GitLab