composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 00:28:47 +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;
}
}
}

4
core/metamodel.class.php
View File

@@ -27,7 +27,7 @@ require_once APPROOT.'core/expressioncache.class.inc.php';
/**
* We need to have all iLoginFSMExtension/iLoginDataExtension impl loaded ! Cannot use autoloader...
* We need to have all iLoginFSMExtension/iLoginUIExtension impl loaded ! Cannot use autoloader...
*/
require_once APPROOT.'application/loginform.class.inc.php';
require_once APPROOT.'application/loginbasic.class.inc.php';
@@ -2794,7 +2794,7 @@ abstract class MetaModel
// Build the list of available extensions
//
$aInterfaces = array('iApplicationUIExtension', 'iPreferencesExtension', 'iApplicationObjectExtension', 'iLoginFSMExtension', 'iLoginDataExtension', 'iLogoutExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension', 'ModuleHandlerApiInterface', 'iNewsroomProvider');
$aInterfaces = array('iApplicationUIExtension', 'iPreferencesExtension', 'iApplicationObjectExtension', 'iLoginFSMExtension', 'iLoginUIExtension', 'iLogoutExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension', 'ModuleHandlerApiInterface', 'iNewsroomProvider');
foreach($aInterfaces as $sInterface)
{
self::$m_aExtensionClasses[$sInterface] = array();

6
datamodels/2.x/authent-cas/src/CASLoginExtension.php
View File

@@ -11,7 +11,7 @@ use AbstractLoginFSMExtension;
use DBObjectSearch;
use DBObjectSet;
use Dict;
use iLoginDataExtension;
use iLoginUIExtension;
use iLogoutExtension;
use LoginBlockData;
use LoginTwigData;
@@ -26,7 +26,7 @@ use utils;
/**
* Class CASLoginExtension
*/
class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExtension, iLoginDataExtension
class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExtension, iLoginUIExtension
{
/**
* Return the list of supported login modes for this plugin
@@ -200,7 +200,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
/**
* @return LoginTwigData
*/
public function GetLoginData()
public function GetTwigBlockData()
{
$sPath = APPROOT.'env-'.utils::GetCurrentEnvironment().'/authent-cas/view';
$oLoginData = new LoginTwigData(array(), $sPath);

2
lib/composer/autoload_classmap.php
View File

@@ -1893,7 +1893,7 @@ return array(
'iDBObjectSetIterator' => $baseDir . '/core/dbobjectiterator.php',
'iDBObjectURLMaker' => $baseDir . '/application/applicationcontext.class.inc.php',
'iDisplay' => $baseDir . '/core/dbobject.class.php',
'iLoginDataExtension' => $baseDir . '/application/applicationextension.inc.php',
'iLoginUIExtension' => $baseDir . '/application/applicationextension.inc.php',
'iLoginExtension' => $baseDir . '/application/applicationextension.inc.php',
'iLoginFSMExtension' => $baseDir . '/application/applicationextension.inc.php',
'iLogoutExtension' => $baseDir . '/application/applicationextension.inc.php',

2
lib/composer/autoload_static.php
View File

@@ -2114,7 +2114,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
'iDBObjectSetIterator' => __DIR__ . '/../..' . '/core/dbobjectiterator.php',
'iDBObjectURLMaker' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
'iDisplay' => __DIR__ . '/../..' . '/core/dbobject.class.php',
'iLoginDataExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
'iLoginUIExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
'iLoginExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
'iLoginFSMExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
'iLogoutExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',