composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-26 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.0' into develop

Browse Source 
# Conflicts:
#	sources/Core/Email/EmailSwiftMailer.php
This commit is contained in:
Eric Espie
2022-12-14 15:48:52 +01:00
parent fe997d1254 e1c28a5c22
commit 6412f1ab23
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
View File

@@ -33,6 +33,7 @@ use Twig\TwigFilter;
use Twig\TwigFunction;
use utils;
/**
* Class AppExtension
*

4
setup/setup.js
View File

@@ -54,8 +54,8 @@ function ExecuteStep(sStep)
}
function CheckDirectoryConfFilesPermissions(sWikiVersion){
$.ajax('permissions-test-folder/permissions-test-subfolder/permissions-test-file',
{
$.ajax('permissions-test-folder/permissions-test-subfolder/permissions-test-file', {
cache: false,
statusCode: {
200: function() {
$('#details').prepend('<div class="message message-warning"><span class="message-title">Security issue:</span> iTop is bundled with directory-level configuration files. You must check that those files will be read by your web server (eg. ' +

3
sources/Core/Email/EmailLaminas.php
View File

@@ -299,7 +299,8 @@ class EMailLaminas extends Email
if ($bForceSynchronous) {
return $this->SendSynchronous($aIssues, $oLog);
} else {
$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
$oConfig = $this->LoadConfig();
$bConfigASYNC = $oConfig->Get('email_asynchronous');
if ($bConfigASYNC) {
return $this->SendAsynchronous($aIssues, $oLog);
} else {