joomla/jedchecker
33
2
Fork 0
mirror of https://github.com/joomla-extensions/jedchecker.git synced 2025-01-05 23:40:41 +00:00
Code Issues Releases Activity

parse multiline values

Browse Source
This commit is contained in:
Denis Ryabov 2021-02-23 23:41:30 +03:00
parent 2e54c9fc7e
commit 134e4c0588
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,14 +72,18 @@ class JedcheckerRulesLanguage extends JEDcheckerRule
protected function find($file) protected function find($file)
{ {
$lines = file($file); $lines = file($file);
foreach ($lines as $lineno => $line) $nLines = count($lines);
for ($lineno = 0; $lineno < $nLines; $lineno++)
{ {
$line = trim($line); $startLineno = $lineno + 1;
$line = trim($lines[$lineno]);
// 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)
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), 1); $this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), $startLineno);
// Romeve BOM for further checks // Romeve BOM for further checks
$line = substr($line, 3); $line = substr($line, 3);
} }
@ -93,74 +97,96 @@ class JedcheckerRulesLanguage extends JEDcheckerRule
// Report incorrect comment character // Report incorrect comment character
if ($line[0] === '#') if ($line[0] === '#')
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_INCORRECT_COMMENT'), $lineno, $line); $this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_INCORRECT_COMMENT'), $startLineno, $line);
continue; continue;
} }
// Check for "=" character in the line // Check for "=" character in the line
if (strpos($line, '=') === false) if (strpos($line, '=') === false)
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_WRONG_LINE'), $lineno, $line); $this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_WRONG_LINE'), $startLineno, $line);
continue; continue;
} }
// Extract key and value // Extract key and value
list ($key, $value) = explode('=', $line, 2); list ($key, $value) = explode('=', $line, 2);
// Validate key
$key = rtrim($key); $key = rtrim($key);
// Check for empty key // Check for empty key
if ($key === '') if ($key === '')
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_EMPTY'), $lineno, $line); $this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_EMPTY'), $startLineno, $line);
continue; continue;
} }
// Check for spaces in the key name // Check for spaces in the key name
if (strpos($key, ' ') !== false) if (strpos($key, ' ') !== false)
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_WHITESPACE'), $lineno, $line); $this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_WHITESPACE'), $startLineno, $line);
continue; continue;
} }
// Check for invalid characters (see https://www.php.net/manual/en/function.parse-ini-file.php) // Check for invalid characters (see https://www.php.net/manual/en/function.parse-ini-file.php)
if (strpbrk($key, '{}|&~![()^"') !== false) if (strpbrk($key, '{}|&~![()^"') !== false)
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_INVALID_CHARACTER'), $lineno, $line); $this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_INVALID_CHARACTER'), $startLineno, $line);
continue; continue;
} }
// Check for invalid key names (see https://www.php.net/manual/en/function.parse-ini-file.php) // Check for invalid key names (see https://www.php.net/manual/en/function.parse-ini-file.php)
if (in_array($key, array('null', 'yes', 'no', 'true', 'false', 'on', 'off', 'none'), true)) if (in_array($key, array('null', 'yes', 'no', 'true', 'false', 'on', 'off', 'none'), true))
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_RESERVED'), $lineno, $line); $this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_KEY_RESERVED'), $startLineno, $line);
continue; continue;
} }
// Validate value
$value = ltrim($value); $value = ltrim($value);
if (strlen($value) <2 || $value[0] !== '"' || substr($value, -1) !== '"') // Parse multiline values
while (!preg_match('/^((?>\'(?>[^\'\\\\]+|\\\\.)*\'|"(?>[^"\\\\]+|\\\\.)*"|[^\'";]+)*)(;.*)?$/', $value, $matches))
{ {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_TRANSLATION_QUOTES'), $lineno, $line); if ($lineno + 1 >= $nLines)
{
break;
}
$lineno++;
$chunk = "\n" . trim($lines[$lineno]);
$line .= $chunk;
$value .= $chunk;
}
if (!isset($matches[0]))
{
$this->report->addWarning($file, JText::_('COM_JEDCHECKER_LANG_TRANSLATION_ERROR'), $startLineno, $line);
continue; continue;
} }
$value = trim($matches[1]); $value = trim($matches[1]);
// Check for empty value // Check for empty value
if ($value === '""') if ($value === '""')
{ {
$this->report->addWarning($file, JText::_('COM_JEDCHECKER_LANG_TRANSLATION_EMPTY'), $lineno, $line); $this->report->addWarning($file, JText::_('COM_JEDCHECKER_LANG_TRANSLATION_EMPTY'), $startLineno, $line);
continue; continue;
} }
if (strlen($value) < 2 || $value[0] !== '"' || substr($value, -1) !== '"') if (strlen($value) < 2 || $value[0] !== '"' || substr($value, -1) !== '"')
// Remove quotes around {
$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_TRANSLATION_QUOTES'), $startLineno, $line);
continue;
}
// // Remove quotes around
$value = substr($value, 1, -1); $value = substr($value, 1, -1);
// Check for legacy "_QQ_" code (deprecated since Joomla! 3.9 if favor of escaped double quote \"; removed in Joomla! 4) // Check for legacy "_QQ_" code (deprecated since Joomla! 3.9 if favor of escaped double quote \"; removed in Joomla! 4)
if (strpos($value, '"_QQ_"') !== false) if (strpos($value, '"_QQ_"') !== false)
{ {
$this->report->addInfo($file, JText::_('COM_JEDCHECKER_LANG_QQ_DEPRECATED'), $lineno, $line); $this->report->addInfo($file, JText::_('COM_JEDCHECKER_LANG_QQ_DEPRECATED'), $startLineno, $line);
} }
// Count %... formats in the string // Count %... formats in the string