Commit c33c1345 authored by Carsten  Rose's avatar Carsten Rose

Refs #9959 Merge QFQ T3 classes into one

parent 8ffeb8d4
Pipeline #3204 passed with stages
in 3 minutes and 36 seconds
......@@ -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);
......
......@@ -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();
}
}
......
<?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
......@@ -2,17 +2,26 @@
/**
* Created by PhpStorm.
* User: crose
* Date: 2/1/19
* Time: 10:31 PM
* Date: 2/2/20
* Time: 9:02 AM
*/
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
......
......@@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase;
* Class PasswordTest
* @package qfq
*/
class PasswordTest extends TestCase {
class T3HandlerTest extends TestCase {
public function testPasswordHashAndCheck() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment