Some big update
This commit is contained in:
@@ -53,7 +53,7 @@ class NotInternal implements Validator
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!$this->hostCheck->isNotInternalHost($value)) {
|
||||
if (!$this->hostCheck->isHostAndNotInternal($value)) {
|
||||
return Failure::create();
|
||||
}
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ class NotInternal implements Validator
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!$this->urlCheck->isNotInternalUrl($value)) {
|
||||
if (!$this->urlCheck->isUrlAndNotIternal($value)) {
|
||||
return Failure::create();
|
||||
}
|
||||
|
||||
|
||||
@@ -178,7 +178,9 @@ class MassUpdate implements MassAction
|
||||
|
||||
private function clearRoleCache(string $id): void
|
||||
{
|
||||
$this->fileManager->removeFile('data/cache/application/acl/' . $id . '.php');
|
||||
$part = basename($id);
|
||||
|
||||
$this->fileManager->removeFile("data/cache/application/acl/$part.php");
|
||||
}
|
||||
|
||||
private function clearPortalRolesCache(): void
|
||||
|
||||
@@ -76,7 +76,7 @@ class BeforeSaveValidateHosts implements SaveHook
|
||||
return;
|
||||
}
|
||||
|
||||
if (!$this->hostCheck->isNotInternalHost($host)) {
|
||||
if (!$this->hostCheck->isHostAndNotInternal($host)) {
|
||||
$message = $this->composeErrorMessage($host, $address);
|
||||
|
||||
throw new Forbidden($message);
|
||||
@@ -97,7 +97,11 @@ class BeforeSaveValidateHosts implements SaveHook
|
||||
|
||||
$address = $host . ':' . $port;
|
||||
|
||||
if (!$this->hostCheck->isNotInternalHost($host)) {
|
||||
if (in_array($address, $this->getAllowedAddressList())) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!$this->hostCheck->isHostAndNotInternal($host)) {
|
||||
$message = $this->composeErrorMessage($host, $address);
|
||||
|
||||
throw new Forbidden($message);
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace Espo\Classes\TemplateHelpers;
|
||||
use Espo\Core\Htmlizer\Helper;
|
||||
use Espo\Core\Htmlizer\Helper\Data;
|
||||
use Espo\Core\Htmlizer\Helper\Result;
|
||||
use Michelf\MarkdownExtra as MarkdownTransformer;
|
||||
use Espo\Core\Utils\Markdown\Markdown;
|
||||
|
||||
class MarkdownText implements Helper
|
||||
{
|
||||
@@ -44,7 +44,7 @@ class MarkdownText implements Helper
|
||||
return Result::createEmpty();
|
||||
}
|
||||
|
||||
$transformed = MarkdownTransformer::defaultTransform($value);
|
||||
$transformed = Markdown::transform($value);
|
||||
|
||||
return Result::createSafeString($transformed);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user