Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
open-source
MetaGer
Commits
5c997339
Commit
5c997339
authored
Dec 12, 2017
by
Dominik Hebeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Telefonnummer
aus dem Spendenformular entfernt. Spenden gehen jetzt an spenden@suma-ev.de
parent
72db5a2c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
42 deletions
+36
-42
app/Http/Controllers/MailController.php
app/Http/Controllers/MailController.php
+5
-3
resources/views/spende/danke.blade.php
resources/views/spende/danke.blade.php
+0
-4
resources/views/spende/spende.blade.php
resources/views/spende/spende.blade.php
+0
-4
resources/views/spende/spendenaufruf.blade.php
resources/views/spende/spendenaufruf.blade.php
+31
-31
No files found.
app/Http/Controllers/MailController.php
View file @
5c997339
...
...
@@ -82,7 +82,6 @@ class MailController extends Controller
$messageType
=
"error"
;
}
else
{
$message
=
"
\r\n
Name: "
.
$request
->
input
(
'Name'
,
'Keine Angabe'
);
$message
.
=
"
\r\n
Telefon: "
.
$request
->
input
(
'Telefon'
,
'Keine Angabe'
);
$message
.
=
"
\r\n
Kontonummer: "
.
$request
->
input
(
'Kontonummer'
);
$message
.
=
"
\r\n
Bankleitzahl: "
.
$request
->
input
(
'Bankleitzahl'
);
$message
.
=
"
\r\n
Betrag: "
.
$request
->
input
(
'Betrag'
);
...
...
@@ -92,12 +91,15 @@ class MailController extends Controller
$message
.
=
"
\r\n
User-Agent: "
.
$request
->
header
(
'User-Agent'
,
""
);
$replyTo
=
$request
->
input
(
'email'
,
'anonymous-user@metager.de'
);
if
(
$replyTo
==
""
){
$replyTo
=
"noreply@metager.de"
;
}
if
(
!
filter_var
(
$replyTo
,
FILTER_VALIDATE_EMAIL
))
{
$messageToUser
.
=
"Die eingegebene Email-Addresse (
$replyTo
) scheint nicht korrekt zu sein."
;
}
try
{
Mail
::
to
(
"
dominik
@suma-ev.de"
)
Mail
::
to
(
"
spenden
@suma-ev.de"
)
->
send
(
new
Spende
(
$replyTo
,
$message
));
$messageType
=
"success"
;
...
...
@@ -115,7 +117,7 @@ class MailController extends Controller
->
with
(
'title'
,
'Kontakt'
)
->
with
(
$messageType
,
$messageToUser
);
}
else
{
$data
=
[
'name'
=>
$request
->
input
(
'Name'
,
'Keine Angabe'
),
'telefon'
=>
$request
->
input
(
'Telefon'
,
'Keine Angabe'
),
'kontonummer'
=>
$request
->
input
(
'Kontonummer'
),
'bankleitzahl'
=>
$request
->
input
(
'Bankleitzahl'
),
'email'
=>
$request
->
input
(
'email'
,
'anonymous-user@metager.de'
),
'betrag'
=>
$request
->
input
(
'Betrag'
),
'nachricht'
=>
$request
->
input
(
'Nachricht'
)];
$data
=
[
'name'
=>
$request
->
input
(
'Name'
,
'Keine Angabe'
),
'kontonummer'
=>
$request
->
input
(
'Kontonummer'
),
'bankleitzahl'
=>
$request
->
input
(
'Bankleitzahl'
),
'email'
=>
$request
->
input
(
'email'
,
'anonymous-user@metager.de'
),
'betrag'
=>
$request
->
input
(
'Betrag'
),
'nachricht'
=>
$request
->
input
(
'Nachricht'
)];
$data
=
base64_encode
(
serialize
(
$data
));
return
redirect
(
LaravelLocalization
::
getLocalizedURL
(
LaravelLocalization
::
getCurrentLocale
(),
route
(
"danke"
,
[
'data'
=>
$data
])));
}
...
...
resources/views/spende/danke.blade.php
View file @
5c997339
...
...
@@ -16,10 +16,6 @@
<
td
>
{{
trans
(
'spende.lastschrift.3.placeholder'
)}}
</
td
>
<
td
>
{{
$data
[
'name'
]
}}
</
td
>
</
tr
>
<
tr
>
<
td
>
{{
trans
(
'spende.telefonnummer'
)
}}
</
td
>
<
td
>
{{
$data
[
'telefon'
]
}}
</
td
>
</
tr
>
<
tr
>
<
td
>
Email
</
td
>
<
td
>
{{
$data
[
'email'
]
}}
</
td
>
...
...
resources/views/spende/spende.blade.php
View file @
5c997339
...
...
@@ -24,10 +24,6 @@
<
input
type
=
"email"
class
=
"form-control"
id
=
"email"
name
=
"email"
placeholder
=
"Email"
value
=
"{{ old('email') }}"
>
</
div
>
<
div
class
=
"form-group donation-form-group"
>
<
label
for
=
"tel"
>
{
!!
trans
(
'spende.lastschrift.5'
)
!!
}
</
label
>
<
input
type
=
"tel"
class
=
"form-control"
id
=
"tel"
name
=
"Telefon"
placeholder
=
"xxxx-xxxxx"
value
=
"{{ old('Telefon') }}"
>
</
div
>
<
div
class
=
"form-group donation-form-group"
>
<
label
for
=
"iban"
>
{
!!
trans
(
'spende.lastschrift.6'
)
!!
}
</
label
>
<
input
type
=
"text"
class
=
"form-control"
id
=
"iban"
required
=
""
name
=
"Kontonummer"
placeholder
=
"IBAN"
value
=
"{{ old('Kontonummer') }}"
>
</
div
>
...
...
resources/views/spende/spendenaufruf.blade.php
View file @
5c997339
...
...
@@ -68,37 +68,37 @@
<
div
class
=
"clearfix"
></
div
>
<
hr
>
<
div
class
=
"col-md-6"
>
<
h
2
id
=
"lastschrift"
>
{
{
trans
(
'spende.lastschrift.1'
)
}
}
</
h
2
>
<
p
>
{
{
trans
(
'spende.lastschrift.2'
)
}
}
</
p
>
<
form
role
=
"form"
method
=
"POST"
action
=
"
{{ action('MailController@donation') }}
"
>
<
input
type
=
"hidden"
name
=
"dt"
value
=
"{{ md5(date('Y') . date('m') . date('d')) }}"
/
>
<
div
class
=
"form-group
"
style
=
"text-align:left;
"
>
<
label
for
=
"Name"
>
{
{
trans
(
'spende.lastschrift.3'
)
}
}
</
label
>
<
input
type
=
"text"
class
=
"form-control"
id
=
"Name"
required
=
""
name
=
"Name"
placeholder
=
"{
{
trans('spende.lastschrift.3.placeholder') }}"
>
</
div
>
<
div
class
=
"form-group
"
style
=
"text-align:left;
"
>
<
label
for
=
"email"
>
{
{
trans
(
'spende.lastschrift.4'
)
}
}
</
label
>
<
input
type
=
"email"
class
=
"form-control"
id
=
"email"
name
=
"email"
placeholder
=
"Email"
>
</
div
>
<
div
class
=
"form-group
"
style
=
"text-align:left;
"
>
<
label
for
=
"
tel
"
>
{
{
trans
(
'spende.lastschrift.
5
'
)
}
}
</
label
>
<
input
type
=
"te
l
"
class
=
"form-control"
id
=
"
tel"
name
=
"Telefon"
placeholder
=
"xxxx-xxxxx
"
>
</
div
>
<
div
class
=
"form-group
"
style
=
"text-align:left;
"
>
<
label
for
=
"
iban
"
>
{
{
trans
(
'spende.lastschrift.
6
'
)
}
}
</
label
>
<
input
type
=
"text"
class
=
"form-control"
id
=
"
iban
"
required
=
""
name
=
"
Kontonummer
"
placeholder
=
"
IBAN
"
>
</
div
>
<
div
class
=
"form-group
"
style
=
"text-align:left;
"
>
<
label
for
=
"
bic
"
>
{
{
trans
(
'spende.lastschrift.
7'
)
}}
</
label
>
<
input
type
=
"
text
"
class
=
"form-control"
id
=
"
bic
"
required
=
""
name
=
"B
ankleitzahl"
placeholder
=
"BIC
"
>
</
div
>
<
div
class
=
"form-group
"
style
=
"text-align:left;
"
>
<
label
for
=
"msg"
>
{
{
trans
(
'spende.lastschrift.8
'
)
}
}
</
label
>
<
textarea
class
=
"form-control"
id
=
"msg"
required
=
""
name
=
"Nachricht"
placeholder
=
"{{ trans('spende.lastschrift.8.placeholder') }}"
></
textarea
>
</
div
>
<
button
type
=
"submit"
class
=
"btn btn-default"
>
{{
trans
(
'spende.lastschrift.9'
)
}}
</
button
>
<
/
form
>
<
p
>
{{
trans
(
'spende.lastschrift.10'
)
}}
</
p
>
<
h
3
id
=
"lastschrift"
>
{
!!
trans
(
'spende.lastschrift.1'
)
!!
}
</
h
3
>
<
p
>
{
!!
trans
(
'spende.lastschrift.2'
)
!!
}
</
p
>
<
form
id
=
"donate"
role
=
"form"
method
=
"POST"
action
=
"
/spende
"
>
<
input
type
=
"hidden"
name
=
"dt"
value
=
"{{ md5(date('Y') . date('m') . date('d')) }}"
>
<
div
class
=
"form-group
donation-form-group
"
>
<
label
for
=
"Name"
>
{
!!
trans
(
'spende.lastschrift.3'
)
!!
}
</
label
>
<
input
type
=
"text"
class
=
"form-control"
id
=
"Name"
required
=
""
name
=
"Name"
placeholder
=
"{
!!
trans('spende.lastschrift.3.placeholder')
!!}"
value
=
"{{ old('Name')
}}"
/
>
</
div
>
<
div
class
=
"form-group
donation-form-group
"
>
<
label
for
=
"email"
>
{
!!
trans
(
'spende.lastschrift.4'
)
!!
}
</
label
>
<
input
type
=
"email"
class
=
"form-control"
id
=
"email"
name
=
"email"
placeholder
=
"Email"
value
=
"{{ old('email') }}"
>
</
div
>
<
div
class
=
"form-group
donation-form-group
"
>
<
label
for
=
"
iban
"
>
{
!!
trans
(
'spende.lastschrift.
6
'
)
!!
}
</
label
>
<
input
type
=
"te
xt
"
class
=
"form-control"
id
=
"
iban"
required
=
""
name
=
"Kontonummer"
placeholder
=
"IBAN"
value
=
"{{ old('Kontonummer') }}
"
>
</
div
>
<
div
class
=
"form-group
donation-form-group
"
>
<
label
for
=
"
bic
"
>
{
!!
trans
(
'spende.lastschrift.
7
'
)
!!
}
</
label
>
<
input
type
=
"text"
class
=
"form-control"
id
=
"
bic
"
required
=
""
name
=
"
Bankleitzahl
"
placeholder
=
"
BIC"
value
=
"{{ old('Bankleitzahl') }}
"
>
</
div
>
<
div
class
=
"form-group
donation-form-group
"
>
<
label
for
=
"
value
"
>
{
!!
trans
(
'spende.lastschrift.
8.value'
)
!!
}
</
label
>
<
input
type
=
"
number
"
class
=
"form-control"
id
=
"
value
"
required
=
""
name
=
"B
etrag"
placeholder
=
"{!! trans('spende.lastschrift.8.value.placeholder') !!}"
value
=
"{{ old('Bankleitzahl') }}
"
>
</
div
>
<
div
class
=
"form-group
donation-form-group
"
>
<
label
for
=
"msg"
>
{
!!
trans
(
'spende.lastschrift.8
.message'
)
!!
}
</
label
>
<
label
for
=
"msg"
><
u
>
{
!!
trans
(
'spende.bankinfo.3'
)
!!
}
</
u
></
label
>
<
textarea
class
=
"form-control"
id
=
"msg"
name
=
"Nachricht"
placeholder
=
"{!! trans('spende.lastschrift.8.message.placeholder') !!}"
>
{{
old
(
'Nachricht'
)
}}
</
textarea
>
</
div
>
<
button
type
=
"submit"
form
=
"donate"
class
=
"btn btn-default"
>
{
!!
trans
(
'spende.lastschrift.9'
)
!!
}
</
button
>
</
form
>
</
div
>
<
div
class
=
"col-md-6"
>
<
h2
id
=
"mails"
>
Aus
den
EMails
vorheriger
Spender
:</
h2
>
...
...
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