From 3b3d23213d5addbdeb556b5f27bf9cd8650e528b Mon Sep 17 00:00:00 2001
From: Aria <aria@suma-ev.de>
Date: Tue, 15 Aug 2017 11:05:53 +0200
Subject: [PATCH] alle dateien werden in array gespeichert um eine auswahl der
datei zu ermoeglichen
---
app/Http/Controllers/LanguageController.php | 11 +++++++++--
app/Models/LanguageObject.php | 1 +
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php
index e580c78fd..e4bf28995 100644
--- a/app/Http/Controllers/LanguageController.php
+++ b/app/Http/Controllers/LanguageController.php
@@ -146,9 +146,12 @@ class LanguageController extends Controller
public function createSynopticEditPage(Request $request, $exclude = "")
{
$languageFolders = scandir($this->languageFilePath);
+
# Enthält zu jeder Sprache ein Objekt mit allen Daten
$languageObjects = [];
- $to = []; # Alle vorhandenen Sprachen
+
+ # Alle vorhandenen Sprachen
+ $to = [];
# Dekodieren ausgeschlossener Dateien anhand des URL-Parameters
$ex = $this->decodeExcludedFiles($exclude);
@@ -159,12 +162,15 @@ class LanguageController extends Controller
$languageObjects[$folder] = new LanguageObject($folder, $this->languageFilePath.$folder);
}
}
-
+ $fileNames = [];
# Speichere Daten in LanguageObject, überspringe ausgeschlossene Dateien
foreach ($languageObjects as $folder => $languageObject) {
$to[] = $folder;
$di = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($languageObject->filePath));
foreach($di as $filename => $file) {
+ if(!$this->endsWith($filename, ".") && !in_array(basename($filename), $fileNames)) {
+ $fileNames[] = basename($filename);
+ }
foreach($ex['files'] as $file) {
if($file === basename($filename)) {
continue 2;
@@ -226,6 +232,7 @@ class LanguageController extends Controller
->with('texts', $snippets) # Array mit Sprachsnippets
->with('filename', $fn) # Name der Datei
->with('recentlyChangedFiles', $recentlyChangedFiles)
+ ->with('otherFiles', $fileNames) # Namen der restlichen Sprachdateien
->with('title', trans('titles.languages.edit'));
}
diff --git a/app/Models/LanguageObject.php b/app/Models/LanguageObject.php
index 93235dc8e..0902270a9 100644
--- a/app/Models/LanguageObject.php
+++ b/app/Models/LanguageObject.php
@@ -9,6 +9,7 @@ class LanguageObject
{
public $language = "";
+ # bspw. /home/MetaGer/resources/lang/de
public $filePath = "";
# 2D-Array der Form [$filename][$key]
--
GitLab