Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
dae6cd14
Commit
dae6cd14
authored
Aug 22, 2017
by
Aria Givi
Browse files
Auswahl ueber Dropdown funktioniert noch nicht richtig
parent
c7b366fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/LanguageController.php
View file @
dae6cd14
...
...
@@ -143,7 +143,7 @@ class LanguageController extends Controller
->
with
(
'email'
,
$email
);
//Email-Adresse des Benutzers
}
public
function
createSynopticEditPage
(
Request
$request
,
$exclude
=
""
)
public
function
createSynopticEditPage
(
Request
$request
,
$exclude
=
""
,
$chosenFile
=
""
)
{
$languageFolders
=
scandir
(
$this
->
languageFilePath
);
...
...
@@ -188,13 +188,16 @@ class LanguageController extends Controller
$fn
=
""
;
# Wähle die erste, unbearbeitete Datei aus
foreach
(
$languageObjects
as
$folder
=>
$languageObject
)
{
foreach
(
$languageObject
->
stringMap
as
$languageFileName
=>
$languageFile
)
{
$fn
=
$languageFileName
;
break
2
;
if
(
$chosenFile
!==
""
)
{
$fn
=
$chosenFile
;
}
else
{
foreach
(
$languageObjects
as
$folder
=>
$languageObject
)
{
foreach
(
$languageObject
->
stringMap
as
$languageFileName
=>
$languageFile
)
{
$fn
=
$languageFileName
;
break
2
;
}
}
}
$snippets
=
[];
$changeTime
=
0
;
$recentlyChangedFiles
=
[];
...
...
@@ -255,32 +258,8 @@ class LanguageController extends Controller
$filename
=
$request
->
input
(
'filename'
);
# Identifizieren des gedrückten Buttons
if
(
isset
(
$request
[
'nextpage'
]))
{
# Leite weiter zur nächsten Seite
$ex
=
[];
if
(
$exclude
!==
""
)
{
try
{
$ex
=
unserialize
(
base64_decode
(
$exclude
));
}
catch
(
\
ErrorException
$e
)
{
$ex
=
[];
}
if
(
!
isset
(
$ex
[
"files"
]))
{
$ex
[
"files"
]
=
[];
}
}
if
(
!
isset
(
$ex
[
"new"
]))
{
$ex
[
"new"
]
=
0
;
}
$ex
[
'files'
][]
=
basename
(
$filename
);
$ex
=
base64_encode
(
serialize
(
$ex
));
return
redirect
(
url
(
'synoptic'
,
[
'exclude'
=>
$ex
]));
}
elseif
(
isset
(
$request
[
'download'
]))
{
# Andernfalls auslesen, zippen und herunterladen der veränderten Dateien
if
(
isset
(
$request
[
'download'
]))
{
# Auslesen, zippen und herunterladen der veränderten Dateien
$data
=
[];
$new
=
0
;
...
...
@@ -365,6 +344,33 @@ class LanguageController extends Controller
}
catch
(
ErrorException
$e
)
{
echo
(
"Failed to write "
.
$filename
);
}
# Andernfalls weiterleiten zur nächsten Seite
}
else
{
$ex
=
[];
if
(
$exclude
!==
""
)
{
try
{
$ex
=
unserialize
(
base64_decode
(
$exclude
));
}
catch
(
\
ErrorException
$e
)
{
$ex
=
[];
}
if
(
!
isset
(
$ex
[
"files"
]))
{
$ex
[
"files"
]
=
[];
}
}
if
(
!
isset
(
$ex
[
"new"
]))
{
$ex
[
"new"
]
=
0
;
}
$ex
[
'files'
][]
=
basename
(
$filename
);
$ex
=
base64_encode
(
serialize
(
$ex
));
if
(
isset
(
$request
[
'nextpage'
]))
{
return
redirect
(
url
(
'synoptic'
,
[
'exclude'
=>
$ex
]));
}
elseif
(
isset
(
$request
[
'chosenFile'
]))
{
return
redirect
(
url
(
'synoptic'
,
[
'exclude'
=>
$ex
],
[
'chosenFile'
=>
$request
[
'chosenFile'
]]));
}
}
}
...
...
resources/views/languages/synoptic.blade.php
View file @
dae6cd14
...
...
@@ -18,7 +18,7 @@
<input
type=
"hidden"
name=
"filename"
value=
"{{$filename}}"
/>
</form>
<p
style=
"display: inline;"
>
Andere Datei auswählen:
</p>
<select
name=
"cho
o
seFile"
form=
"submit"
type=
"submit"
>
<select
name=
"chose
n
File"
form=
"submit"
onchange=
"this.form.submit()"
type=
"submit"
>
@foreach($otherFiles as $otherFile)
<option
value=
{{$otherFile}}
>
{{ $otherFile }}
</option>
@endforeach
...
...
routes/web.php
View file @
dae6cd14
...
...
@@ -164,7 +164,7 @@ Route::group(
return
redirect
(
'https://metager.de/klassik/databund'
);
});
Route
::
get
(
'languages'
,
'LanguageController@createOverview'
);
Route
::
get
(
'synoptic/{exclude?}'
,
'LanguageController@createSynopticEditPage'
);
Route
::
get
(
'synoptic/{exclude?}
/{chosenFile?}
'
,
'LanguageController@createSynopticEditPage'
);
Route
::
post
(
'synoptic/{exclude?}'
,
'LanguageController@processSynopticPageInput'
);
Route
::
get
(
'languages/edit/{from}/{to}/{exclude?}/{email?}'
,
'LanguageController@createEditPage'
);
Route
::
post
(
'languages/edit/{from}/{to}/{exclude?}/{email?}'
,
'MailController@sendLanguageFile'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment