Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
services
T
t3o sites
extensions.typo3.org
extensions.typo3.org
Commits
64b0b1eb
Commit
64b0b1eb
authored
Aug 17, 2017
by
Thomas Löffler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes review form
parent
e015be42
Pipeline
#1970
passed with stages
in 1 minute and 26 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
32 deletions
+15
-32
html/typo3conf/RealurlConfiguration.php
html/typo3conf/RealurlConfiguration.php
+4
-2
html/typo3conf/ext/ter_fe2/Classes/Controller/ReviewController.php
...3conf/ext/ter_fe2/Classes/Controller/ReviewController.php
+11
-30
No files found.
html/typo3conf/RealurlConfiguration.php
View file @
64b0b1eb
...
...
@@ -35,7 +35,8 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['_DEFAULT'] = [
[
'GETvar'
=>
'tx_terfe2_pi1[controller]'
,
'valueMap'
=>
[
'Extension'
=>
''
'Extension'
=>
''
,
'Review'
=>
'security-review'
],
'noMatch'
=>
'bypass'
],
...
...
@@ -43,7 +44,8 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['_DEFAULT'] = [
'GETvar'
=>
'tx_terfe2_pi1[action]'
,
'valueMap'
=>
[
'detail'
=>
''
,
'download'
=>
'download'
'download'
=>
'download'
,
'update'
=>
'update'
],
'noMatch'
=>
'bypass'
],
...
...
html/typo3conf/ext/ter_fe2/Classes/Controller/ReviewController.php
View file @
64b0b1eb
...
...
@@ -31,41 +31,22 @@ namespace T3o\TerFe2\Controller;
class
ReviewController
extends
\
T3o\TerFe2\Controller\AbstractTerBasedController
{
/**
* @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
*/
protected
$persistenceManager
;
/**
* Initializes the controller
*
* @return void
*/
protected
function
initializeController
()
{
$this
->
persistenceManager
=
$this
->
objectManager
->
get
(
\
TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
::
class
);
}
/**
* Set unsecure flag of all given versions
*
* @param \T3o\TerFe2\Domain\Model\Extension $extension The extension to update
* @param
mixed
$insecureVersions Version UIDs or empty string of no version was selected
* @param
array
$insecureVersions Version UIDs or empty string of no version was selected
* @return void
*/
public
function
updateAction
(
\
T3o\TerFe2\Domain\Model\Extension
$extension
,
$insecureVersions
)
public
function
updateAction
(
\
T3o\TerFe2\Domain\Model\Extension
$extension
,
array
$insecureVersions
)
{
$insecureVersions
=
(
is_array
(
$insecureVersions
)
?
$insecureVersions
:
array
());
$extensionKey
=
$extension
->
getExtKey
();
$actionParameters
=
[
'extension'
=>
$extension
];
$versions
=
$extension
->
getVersions
();
$persist
=
FALSE
;
$versionChanged
=
false
;
$versionRepository
=
$this
->
objectManager
->
get
(
\
T3o\TerFe2\Domain\Repository\VersionRepository
::
class
);
foreach
(
$versions
as
$version
)
{
$versionString
=
$version
->
getVersionString
();
$actionParameters
=
array
(
'extension'
=>
$extension
);
/** @var \T3o\TerFe2\Domain\Model\Version $version */
$reviewState
=
0
;
if
(
in_array
(
$version
->
getUid
(),
$insecureVersions
))
{
$reviewState
=
-
1
;
...
...
@@ -76,17 +57,17 @@ class ReviewController extends \T3o\TerFe2\Controller\AbstractTerBasedController
}
$error
=
''
;
if
(
$this
->
terConnection
->
setReviewState
(
$extensionKey
,
$versionString
,
$reviewState
,
$error
))
{
if
(
$this
->
terConnection
->
setReviewState
(
$extension
->
getExt
Key
()
,
$version
->
getVersion
String
()
,
$reviewState
,
$error
))
{
$version
->
setReviewState
(
$reviewState
);
$persist
=
TRUE
;
$versionChanged
=
true
;
$versionRepository
->
update
(
$version
);
}
else
{
$message
=
$this
->
translate
(
'msg.reviewstate_not_enabled'
,
array
(
$versionString
,
$error
)
);
$message
=
$this
->
translate
(
'msg.reviewstate_not_enabled'
,
[
$version
->
getVersion
String
()
,
$error
]
);
$this
->
redirectWithMessage
(
$message
,
'show'
,
''
,
\
TYPO3\CMS\Core\Messaging\FlashMessage
::
ERROR
,
'Extension'
,
NULL
,
$actionParameters
);
}
}
if
(
$persist
)
{
$this
->
persistenceManager
->
persistAll
();
if
(
$versionChanged
)
{
$this
->
redirectWithMessage
(
$this
->
translate
(
'msg.reviewstate_enabled'
),
'show'
,
''
,
\
TYPO3\CMS\Core\Messaging\FlashMessage
::
OK
,
'Extension'
,
NULL
,
$actionParameters
);
}
...
...
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