Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
c05976f9
Commit
c05976f9
authored
7 years ago
by
Aria Givi
Browse files
Options
Downloads
Patches
Plain Diff
Emailfeld für Rückfragen hinzugefügt
parent
fa9e01d2
No related branches found
Branches containing commit
No related tags found
2 merge requests
!859
Development
,
!808
Emailfeld für Rückfragen hinzugefügt
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/Http/Controllers/MailController.php
+12
-1
12 additions, 1 deletion
app/Http/Controllers/MailController.php
app/Mail/Sprachdatei.php
+2
-2
2 additions, 2 deletions
app/Mail/Sprachdatei.php
resources/views/languages/edit.blade.php
+2
-0
2 additions, 0 deletions
resources/views/languages/edit.blade.php
with
16 additions
and
3 deletions
app/Http/Controllers/MailController.php
+
12
−
1
View file @
c05976f9
...
...
@@ -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,8 +184,14 @@ class MailController extends Controller
$ex
[
"new"
]
+=
$new
;
if
(
$new
>
0
)
{
Mail
::
to
(
"dev@suma-ev.de"
)
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
]));
...
...
This diff is collapsed.
Click to expand it.
app/Mail/Sprachdatei.php
+
2
−
2
View file @
c05976f9
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
resources/views/languages/edit.blade.php
+
2
−
0
View file @
c05976f9
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment