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
7dd9ec23
Commit
7dd9ec23
authored
Apr 06, 2017
by
Aria Givi
Browse files
Emailfeld für Rückfragen hinzugefügt
parent
d830514e
Changes
3
Show whitespace changes
Inline
Side-by-side
app/Http/Controllers/MailController.php
View file @
7dd9ec23
...
...
@@ -124,6 +124,7 @@ class MailController extends Controller
# Wir erstellen nun zunächst den Inhalt der Datei:
$data
=
[];
$new
=
0
;
$emailAddress
=
""
;
foreach
(
$request
->
all
()
as
$key
=>
$value
)
{
if
(
$key
===
"filename"
||
$value
===
""
)
{
...
...
@@ -135,6 +136,10 @@ class MailController extends Controller
$key
=
substr
(
$key
,
strpos
(
$key
,
"_new_"
)
+
5
);
}
$key
=
trim
(
$key
);
if
(
$key
===
"email"
)
{
$emailAddress
=
$value
;
continue
;
}
if
(
!
strpos
(
$key
,
"#"
))
{
$data
[
$key
]
=
$value
;
}
else
{
...
...
@@ -179,9 +184,15 @@ class MailController extends Controller
$ex
[
"new"
]
+=
$new
;
if
(
$new
>
0
)
{
if
(
$emailAddress
!==
""
)
{
Mail
::
to
(
"dev@suma-ev.de"
)
->
send
(
new
Sprachdatei
(
$message
,
$output
,
basename
(
$filename
),
$emailAddress
));
}
else
{
Mail
::
to
(
"dev@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
]));
}
...
...
app/Mail/Sprachdatei.php
View file @
7dd9ec23
...
...
@@ -15,10 +15,10 @@ class Sprachdatei extends Mailable
*
* @return void
*/
public
function
__construct
(
$message
,
$fileContent
,
$filename
)
public
function
__construct
(
$message
,
$fileContent
,
$filename
,
$replyAddress
=
"noreply@metager.de"
)
{
$this
->
subject
=
"MetaGer - Sprachdatei"
;
$this
->
reply
=
"no
reply
@metager.de"
;
$this
->
reply
=
$
reply
Address
;
$this
->
message
=
$message
;
$this
->
fileContent
=
$fileContent
;
$this
->
filename
=
$filename
;
...
...
resources/views/languages/edit.blade.php
View file @
7dd9ec23
...
...
@@ -55,5 +55,7 @@
<
p
>
{{
trans
(
'languages.hinweis.1'
)
}}
</
p
>
<
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
>
<
button
class
=
"btn btn-success"
type
=
"submit"
form
=
"submit"
>
Daten
übermitteln
</
button
>
@
endsection
Write
Preview
Supports
Markdown
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