joomla/jedchecker
33
2
Fork 0
mirror of https://github.com/joomla-extensions/jedchecker.git synced 2024-12-01 01:03:55 +00:00
Code Issues Releases Activity

unify code lines displaying

Browse Source
This commit is contained in:
Denis Ryabov 2021-04-04 11:41:33 +03:00
parent f42ed7c300
commit 7b8532f372
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
administrator/components/com_jedchecker/libraries/rules/jamss.php
View File

@ -339,18 +339,34 @@ class JedcheckerRulesJamss extends JEDcheckerRule
{ {
$count++; $count++;
foreach ($all_results as $match)
{
// Output the line of malware code, but sanitize it before
// The offset is in $match[1]
$offset = $match[1];
// Note: negative 3rd argument is used for right-to-left search
$start = strrpos($content, "\n", -(strlen($content) - $offset));
if ($start === false)
{
$start = 0;
}
$end = strpos($content, "\n", $offset);
if ($end === false)
{
$end = strlen($content);
}
$first_code = substr($content, $start, min($end - $start, 200));
$first_line = $this->calculate_line_number($offset, $content);
break;
}
if (is_array($pattern)) if (is_array($pattern))
{ {
// Then it has some additional comments // Then it has some additional comments
foreach ($all_results as $match)
{
// Output the line of malware code, but sanitize it before
// The offset is in $match[1]
$first_code = substr($content, $match[1], 200);
$first_line = $this->calculate_line_number($match[1], $content);
break;
}
$this->jamssWarning( $this->jamssWarning(
$path, $path,
JText::_('COM_JEDCHECKER_ERROR_JAMSS_PATTERN') . "#$pattern[2] - $pattern[1]", JText::_('COM_JEDCHECKER_ERROR_JAMSS_PATTERN') . "#$pattern[2] - $pattern[1]",
@ -362,16 +378,6 @@ class JedcheckerRulesJamss extends JEDcheckerRule
else else
{ {
// It's a string, no comments available // It's a string, no comments available
$first_content = "";
foreach ($all_results as $match)
{
// Output the line of malware code, but sanitize it before
$first_code = substr($content, $match[1], 200);
$first_line = $this->calculate_line_number($match[1], $content);
break;
}
$this->jamssWarning( $this->jamssWarning(
$path, $path,
JText::_('COM_JEDCHECKER_ERROR_JAMSS_STRING') . $pattern, JText::_('COM_JEDCHECKER_ERROR_JAMSS_STRING') . $pattern,
@ -423,7 +429,6 @@ class JedcheckerRulesJamss extends JEDcheckerRule
private function jamssWarning($path, $title, $info, $code, $line) private function jamssWarning($path, $title, $info, $code, $line)
{ {
$info = !empty($info)?sprintf($this->params->get('info'), htmlentities($info, ENT_QUOTES)):""; $info = !empty($info)?sprintf($this->params->get('info'), htmlentities($info, ENT_QUOTES)):"";
$code = !empty($code)?sprintf($this->params->get('code'), htmlentities($code, ENT_QUOTES)):""; $this->report->addWarning($path, $info . $title, $line, $code);
$this->report->addWarning($path, $info . $code . $title, $line);
} }
} }