joomla/jedchecker
33
2
Fork 0
mirror of https://github.com/joomla-extensions/jedchecker.git synced 2025-01-03 14:47:22 +00:00
Code Issues Releases Activity

Merge PR #147 into develop

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2021-08-31 14:47:02 +02:00
commit 0bbd95a030
Signed by: Llewellyn
GPG Key ID: EFC0C720A240551C
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
administrator/components/com_jedchecker/libraries/rules/language.php
View File

@ -144,15 +144,7 @@ class JedcheckerRulesLanguage extends JEDcheckerRule
// Check for BOM sequence // Check for BOM sequence
if ($lineno === 0 && strncmp($line, "\xEF\xBB\xBF", 3) === 0) if ($lineno === 0 && strncmp($line, "\xEF\xBB\xBF", 3) === 0)
{ {
// Report as an error if BOM is directly followed by key name (and become a part of the name) $this->report->addWarning($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), $startLineno);
if (isset($line[3]) && strpos(";\n\r", $line[3]) === false)
{
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), $startLineno);
}
else // Otherwise report a warning
{
$this->report->addWarning($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), $startLineno);
}
// Remove BOM for further checks // Remove BOM for further checks
$line = substr($line, 3); $line = substr($line, 3);
@ -238,7 +230,7 @@ class JedcheckerRulesLanguage extends JEDcheckerRule
$value = ltrim($value); $value = ltrim($value);
// Parse multiline values // Parse multiline values
while (!preg_match('/^((?>\'(?>[^\'\\\\]+|\\\\.)*\'|"(?>[^"\\\\]+|\\\\.)*"|[^\'";]+)*)(;.*)?$/', $value, $matches)) while (!preg_match('/^((?>\'[^\']*\'|"(?>[^"\\\\]+|\\\\.)*"|[^\'";]+)*)(;.*)?$/', $value, $matches))
{ {
if ($lineno + 1 >= $nLines) if ($lineno + 1 >= $nLines)
{ {