composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Eric Espie
2023-02-14 09:35:59 +01:00
parent 33717b9610 9f81e4875a
commit 8b18fd7cc0
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/utils.inc.php
View File

@@ -2937,12 +2937,18 @@ HTML;
$bSkipped = true;
}
else {
foreach ($aExcludedPath as $sExcludedPath) {
// Note: We use '#' as delimiters as usual '/' is often used in paths.
if ($sExcludedPath !== '' && preg_match('#'.$sExcludedPath.'#', $sPHPFile) === 1) {
$bSkipped = true;
break;
$sPHPFile = self::LocalPath($sPHPFile);
if ($sPHPFile !== false) {
$sPHPFile = '/'.$sPHPFile; // for regex
foreach ($aExcludedPath as $sExcludedPath) {
// Note: We use '#' as delimiters as usual '/' is often used in paths.
if ($sExcludedPath !== '' && preg_match('#'.$sExcludedPath.'#', $sPHPFile) === 1) {
$bSkipped = true;
break;
}
}
} else {
$bSkipped = true; // file not found
}
}
@@ -2980,7 +2986,7 @@ HTML;
$aResultPref = [];
$aShortcutPrefs = appUserPreferences::GetPref('keyboard_shortcuts', []);
// Note: Mind the 4 blackslashes, see utils::GetClassesForInterface()
$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]'));
$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
foreach ($aShortcutClasses as $cShortcutPlugin) {
$sTriggeredElement = $cShortcutPlugin::GetShortcutTriggeredElementSelector();

2
pages/preferences.php
View File

@@ -774,7 +774,7 @@ try {
break;
case 'apply_keyboard_shortcuts':
// Note: Mind the 4 blackslashes, see utils::GetClassesForInterface()
$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]'));
$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
$aShortcutPrefs = [];
foreach ($aShortcutClasses as $cShortcutPlugin) {
foreach ($cShortcutPlugin::GetShortcutKeys() as $aShortcutKey) {

6
sources/Application/TwigBase/UI/UIBlockExtension.php
View File

@@ -8,9 +8,7 @@
namespace Combodo\iTop\Application\TwigBase\UI;
use Exception;
use ReflectionClass;
use SetupUtils;
use Combodo\iTop\Application\UI\Base\iUIBlockFactory;
use Twig\Extension\AbstractExtension;
use utils;
@@ -30,7 +28,7 @@ class UIBlockExtension extends AbstractExtension
{
$aParsers = [];
$sInterface = "Combodo\\iTop\\Application\\UI\\Base\\iUIBlockFactory";
$sInterface = iUIBlockFactory::class;
$aFactoryClasses = utils::GetClassesForInterface($sInterface, 'UIBlockFactory');
foreach ($aFactoryClasses as $sFactoryClass) {