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
73adfd53
Commit
73adfd53
authored
Jun 22, 2019
by
Carsten Rose
Browse files
Merge branch 'B6917MonitorDoesNotWork' into 'master'
Fixes #6917 - Monitor does not work. See merge request
!162
parents
16230f91
0c680d19
Pipeline
#2017
passed with stages
in 2 minutes and 31 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Classes/Core/Report/Link.php
View file @
73adfd53
...
...
@@ -23,13 +23,13 @@
namespace
IMATHUZH\Qfq\Core\Report
;
use
IMATHUZH\Qfq\Core\Helper\KeyValueStringParser
;
use
IMATHUZH\Qfq\Core\Helper\OnArray
;
use
IMATHUZH\Qfq\Core\Helper\Support
;
use
IMATHUZH\Qfq\Core\Store\Store
;
use
IMATHUZH\Qfq\Core\Store\Sip
;
use
IMATHUZH\Qfq\Core\Helper\KeyValueStringParser
;
use
IMATHUZH\Qfq\Core\Helper\Token
;
use
IMATHUZH\Qfq\Core\Store\Sip
;
use
IMATHUZH\Qfq\Core\Store\Store
;
/*
* a:AltText
...
...
@@ -1343,6 +1343,11 @@ EOF;
$vars
[
NAME_RENDER
]
=
RENDER_MODE_1
;
}
}
if
(
$vars
[
NAME_MONITOR
]
==
'1'
)
{
return
1
;
}
$modeRender
=
$vars
[
NAME_RENDER
];
$modeUrl
=
(
$vars
[
FINAL_HREF
]
===
''
)
?
0
:
1
;
$modeText
=
(
$vars
[
FINAL_CONTENT
]
===
''
)
?
0
:
1
;
...
...
extension/Classes/Core/Report/Monitor.php
View file @
73adfd53
...
...
@@ -74,7 +74,7 @@ class Monitor {
$arr
=
store
::
getSipInstance
()
->
queryStringToSip
(
'../../../'
.
API_DIR_EXT
.
'/'
.
API_DOWNLOAD_PHP
.
'?'
.
$queryString
,
RETURN_ARRAY
);
$url
=
$arr
[
SIP_SIP_URL
];
// On page reload, take care to remove optional ex
s
iting old seek position.
// On page reload, take care to remove optional exi
s
ting old seek position.
$key
=
$this
->
getSeekSessionKey
(
$arr
[
CLIENT_SIP
]);
$this
->
session
::
unsetItem
(
$key
);
...
...
@@ -157,7 +157,9 @@ EOF;
// Open file
$f
=
@
fopen
(
$filepath
,
$mode
);
if
(
$f
===
false
)
{
throw
new
\
DownloadException
(
"Error open '"
.
$filepath
.
"': "
.
error_get_last
(),
ERROR_IO_CHDIR
);
$err
=
error_get_last
();
$msg
=
$err
[
'message'
]
??
''
;
throw
new
\
DownloadException
(
"Error open '"
.
$filepath
.
"': "
.
$msg
,
ERROR_IO_FILE_NOT_FOUND
);
}
return
$f
;
...
...
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