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
typo3
qfq
Commits
86544fce
Commit
86544fce
authored
Jan 04, 2019
by
Carsten Rose
Browse files
Fixes #7600: Path to sendEmail has changed and is updated now.
parent
52135413
Pipeline
#1280
passed with stage
in 1 minute and 47 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Source/core/report/SendMail.php
View file @
86544fce
...
...
@@ -227,11 +227,22 @@ class SendMail {
$output
=
Support
::
qfqExec
(
$cmd
,
$rc
);
if
(
$rc
!=
0
)
{
// After first installation of QFQ extension, the PERL script is not executable: is this the problem here?
$perms
=
fileperms
(
$sendEmail
);
if
(
!
(
$perms
&
0x0040
))
{
chmod
(
$sendEmail
,
0755
);
// exec($cmd, $arr, $rc); // Give it a second try.
if
(
!
is_file
(
$sendEmail
)
||
is_readable
(
$sendEmail
)){
throw
new
UserFormException
(
json_encode
([
ERROR_MESSAGE_TO_USER
=>
"Command 'sendEmail' not found."
,
ERROR_MESSAGE_SUPPORT
=>
$sendEmail
]),
ERROR_SENDMAIL
);
}
if
(
is_executable
(
$sendEmail
)){
throw
new
UserFormException
(
json_encode
([
ERROR_MESSAGE_TO_USER
=>
"Command 'sendEmail' not executable."
,
ERROR_MESSAGE_SUPPORT
=>
$sendEmail
]),
ERROR_SENDMAIL
);
}
$output
=
Support
::
qfqExec
(
$cmd
,
$rc
);
}
...
...
extension/Source/core/store/Store.php
View file @
86544fce
...
...
@@ -297,7 +297,7 @@ class Store {
$config
[
SYSTEM_SHOW_DEBUG_INFO
]
=
self
::
adjustConfigShowDebugInfo
(
$config
[
SYSTEM_SHOW_DEBUG_INFO
],
self
::
beUserLoggdIn
());
$config
[
SYSTEM_SEND_E_MAIL
]
=
$config
[
SYSTEM_EXT_PATH
]
.
'/
qfq
/external/sendEmail'
;
$config
[
SYSTEM_SEND_E_MAIL
]
=
$config
[
SYSTEM_EXT_PATH
]
.
'/
Source
/external/sendEmail'
;
// In case the database credentials are given in the old style: copy them to the new style
if
(
!
isset
(
$config
[
SYSTEM_DB_1_USER
])
&&
isset
(
$config
[
SYSTEM_DB_USER
]))
{
...
...
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