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
c33c1345
Commit
c33c1345
authored
Feb 02, 2020
by
Carsten Rose
Browse files
Refs #9959 Merge QFQ T3 classes into one
parent
8ffeb8d4
Pipeline
#3204
passed with stages
in 3 minutes and 36 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Classes/Core/Evaluate.php
View file @
c33c1345
...
...
@@ -16,7 +16,7 @@ use IMATHUZH\Qfq\Core\Report\Link;
use
IMATHUZH\Qfq\Core\Report\Tablesorter
;
use
IMATHUZH\Qfq\Core\Store\Sip
;
use
IMATHUZH\Qfq\Core\Store\Store
;
use
IMATHUZH\Qfq\Core\Typo3\
Password
;
use
IMATHUZH\Qfq\Core\Typo3\
T3Handler
;
const
EVALUATE_DB_INDEX_DEFAULT
=
0
;
...
...
@@ -423,7 +423,7 @@ class Evaluate {
case
TOKEN_ESCAPE_NONE
:
// do nothing
break
;
case
TOKEN_ESCAPE_PASSWORD_T3FE
:
$value
=
Password
::
getHash
(
$value
);
$value
=
T3Handler
::
getHash
(
$value
);
break
;
case
TOKEN_ESCAPE_STOP_REPLACE
:
$value
=
Support
::
encryptDoubleCurlyBraces
(
$value
);
...
...
extension/Classes/Core/Store/Session.php
View file @
c33c1345
...
...
@@ -8,8 +8,8 @@
namespace
IMATHUZH\Qfq\Core\Store
;
use
IMATHUZH\Qfq\Core\Typo3\
Misc
;
use
IMATHUZH\Qfq\Core\Typo3\
T3Handler
;
/**
...
...
@@ -322,7 +322,7 @@ class Session
if
(
time
()
-
self
::
$lastActivity
>
$timeout
)
{
Misc
::
feLogOff
();
T3Handler
::
feLogOff
();
self
::
destroy
();
}
}
...
...
extension/Classes/Core/Typo3/Misc.php
deleted
100644 → 0
View file @
8ffeb8d4
<?php
/**
* Created by PhpStorm.
* User: crose
* Date: 16.02.19
* Time: 18:44
*/
namespace
IMATHUZH\Qfq\Core\Typo3
;
/**
* Class Misc
* @package IMATHUZH\Qfq\Core\Typo3
*/
class
Misc
{
public
static
function
feLogOff
()
{
$GLOBALS
[
'TSFE'
]
->
fe_user
->
logoff
();
}
}
\ No newline at end of file
extension/Classes/Core/Typo3/
Password
.php
→
extension/Classes/Core/Typo3/
T3Handler
.php
View file @
c33c1345
...
...
@@ -2,17 +2,26 @@
/**
* Created by PhpStorm.
* User: crose
* Date: 2/
1/19
* Time:
10:31 P
M
* Date: 2/
2/20
* Time:
9:02 A
M
*/
namespace
IMATHUZH\Qfq\Core\Typo3
;
/**
* Class
FePassword
* @package
qfq
* Class
T3Handler
* @package
IMATHUZH\Qfq\Core\Typo3
*/
class
Password
{
class
T3Handler
{
/**
* Call logoff of current FE User
*/
public
static
function
feLogOff
()
{
$GLOBALS
[
'TSFE'
]
->
fe_user
->
logoff
();
}
/**
* Based on https://docs.typo3.org/typo3cms/extensions/saltedpasswords/8.7/DevelopersGuide/Index.html
...
...
extension/Tests/Unit/Core/Typo3/
Password
Test.php
→
extension/Tests/Unit/Core/Typo3/
T3Handler
Test.php
View file @
c33c1345
...
...
@@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase;
* Class PasswordTest
* @package qfq
*/
class
Password
Test
extends
TestCase
{
class
T3Handler
Test
extends
TestCase
{
public
function
testPasswordHashAndCheck
()
{
...
...
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