mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 11:08:45 +02:00
N°3169 - Add feature to connect Gsuite mail box with OAuth
N°2504 - Add feature to connect Office mail box with OAuth2 for Microsoft Graph N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth * 2.7 migration
This commit is contained in:
@@ -71,14 +71,14 @@ abstract class Controller
|
||||
* @param string $sViewPath Path of the twig files
|
||||
* @param string $sModuleName name of the module (or 'core' if not a module)
|
||||
*/
|
||||
public function __construct($sViewPath, $sModuleName = 'core')
|
||||
public function __construct($sViewPath, $sModuleName = 'core', $aAdditionalPaths = [])
|
||||
{
|
||||
$this->m_aLinkedScripts = array();
|
||||
$this->m_aLinkedStylesheets = array();
|
||||
$this->m_aSaas = array();
|
||||
$this->m_aAjaxTabs = array();
|
||||
$this->m_aDefaultParams = array();
|
||||
$this->SetViewPath($sViewPath);
|
||||
$this->SetViewPath($sViewPath, $aAdditionalPaths);
|
||||
$this->SetModuleName($sModuleName);
|
||||
if ($sModuleName != 'core')
|
||||
{
|
||||
@@ -116,9 +116,9 @@ abstract class Controller
|
||||
*
|
||||
* @param string $sViewPath
|
||||
*/
|
||||
public function SetViewPath($sViewPath)
|
||||
public function SetViewPath($sViewPath, $aAdditionalPaths = [])
|
||||
{
|
||||
$oTwig = TwigHelper::GetTwigEnvironment($sViewPath);
|
||||
$oTwig = TwigHelper::GetTwigEnvironment($sViewPath, $aAdditionalPaths);
|
||||
$this->m_oTwig = $oTwig;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user