composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2315 - Markup extensibility: interface refactor

Browse Source
This commit is contained in:
Eric
2019-10-23 16:49:00 +02:00
parent b7c3fbb176
commit 8455abdfe9
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/applicationextension.inc.php
View File

@@ -178,12 +178,12 @@ interface iLogoutExtension extends iLoginExtension
public function LogoutAction();
}
interface iLoginDataExtension extends iLoginExtension
interface iLoginUIExtension extends iLoginExtension
{
/**
* @return LoginTwigData
*/
public function GetLoginData();
public function GetTwigBlockData();
}

4
application/loginform.class.inc.php
View File

@@ -7,7 +7,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
class LoginForm extends AbstractLoginFSMExtension implements iLoginDataExtension
class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
{
private $bForceFormOnError = false;
@@ -108,7 +108,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginDataExtension
* @return LoginTwigData
* @throws \Exception
*/
public function GetLoginData()
public function GetTwigBlockData()
{
$aPostedVars = array('auth_user', 'auth_pwd');

8
application/logintwig.class.inc.php
View File

@@ -112,14 +112,14 @@ class LoginTwigContext
public function __construct()
{
$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginDataExtension', false);
$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginUIExtension', false);
$this->aPluginFormData = array();
$aTwigLoaders = array();
$this->aPostedVars = array();
foreach ($this->aLoginPluginList as $oLoginPlugin)
{
/** @var \iLoginDataExtension $oLoginPlugin */
$oLoginData = $oLoginPlugin->GetLoginData();
/** @var \iLoginUIExtension $oLoginPlugin */
$oLoginData = $oLoginPlugin->GetTwigBlockData();
$this->aPluginFormData[] = $oLoginData;
$sTwigLoaderPath = $oLoginData->GetTwigLoaderPath();
if ($sTwigLoaderPath != null)
@@ -224,4 +224,4 @@ class LoginTwigContext
{
return $this->oTwig;
}
}
}