mirror of https://github.com/MISP/MISP
fix: [internal] Code style
Jakub Onderka
parent
a0424697e6
commit
f169d23be1
|
|
@ -24,7 +24,7 @@ class SendEmailTemplate
|
|||
/**
|
||||
* This value will be used for grouping emails in mail client.
|
||||
* @param string|null $referenceId
|
||||
* @return string
|
||||
* @return string|void
|
||||
*/
|
||||
public function referenceId($referenceId = null)
|
||||
{
|
||||
|
|
@ -49,7 +49,7 @@ class SendEmailTemplate
|
|||
/**
|
||||
* Get subject from template. Must be called after render method.
|
||||
* @param string|null $subject
|
||||
* @return string
|
||||
* @return string|void
|
||||
*/
|
||||
public function subject($subject = null)
|
||||
{
|
||||
|
|
@ -84,7 +84,6 @@ class SendEmailTemplate
|
|||
$View->set($this->viewVars);
|
||||
$View->set('hideDetails', $hideDetails);
|
||||
|
||||
$View->viewPath = $View->layoutPath = 'Emails' . DS . 'html';
|
||||
try {
|
||||
$View->viewPath = $View->layoutPath = 'Emails' . DS . 'html' . DS . 'Custom';
|
||||
$html = $View->render($this->viewName); // Attempt to load a custom template if it exists
|
||||
|
|
@ -93,7 +92,7 @@ class SendEmailTemplate
|
|||
try {
|
||||
$html = $View->render($this->viewName);
|
||||
} catch (MissingViewException $e) {
|
||||
$html = null; // HTMl template is optional
|
||||
$html = null; // HTML template is optional
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1780,25 +1780,25 @@ class User extends AppModel
|
|||
/**
|
||||
* generatePeriodicSummary
|
||||
*
|
||||
* @param int $user_id
|
||||
* @param string $period
|
||||
* @param int $userId
|
||||
* @param string $period Can be 'daily', 'weekly' or 'monthly'
|
||||
* @param bool $rendered When false, instance of SendEmailTemplate will returned
|
||||
* @return string|SendEmailTemplate
|
||||
* @throws NotFoundException
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public function generatePeriodicSummary(int $user_id, string $period, $rendered=true)
|
||||
public function generatePeriodicSummary(int $userId, string $period, $rendered=true)
|
||||
{
|
||||
$existingUser = $this->getUserById($user_id);
|
||||
$user = $this->rearrangeToAuthForm($existingUser);
|
||||
$allowed_periods = array_map(function($period) {
|
||||
$allowedPeriods = array_map(function($period) {
|
||||
return substr($period, strlen('notification_'));
|
||||
}, self::PERIODIC_NOTIFICATIONS);
|
||||
if (!in_array($period, $allowed_periods)) {
|
||||
if (!in_array($period, $allowedPeriods, true)) {
|
||||
throw new InvalidArgumentException(__('Invalid period. Must be one of %s', JsonTool::encode(self::PERIODIC_NOTIFICATIONS)));
|
||||
}
|
||||
|
||||
$user = $this->getAuthUser($userId);
|
||||
App::import('Tools', 'SendEmail');
|
||||
$emailTemplate = $this->prepareEmailTemplate($period);
|
||||
$periodicSettings = $this->fetchPeriodicSettingForUser($user_id, true);
|
||||
$periodicSettings = $this->fetchPeriodicSettingForUser($userId, true);
|
||||
$filters = $this->getUsablePeriodicSettingForUser($periodicSettings, $period);
|
||||
$filtersForRestSearch = $filters; // filters for restSearch are slightly different than fetchEvent
|
||||
$filters['last'] = $this->resolveTimeDelta($filters['last']);
|
||||
|
|
@ -1821,7 +1821,7 @@ class User extends AppModel
|
|||
unset($filtersForRestSearch['tags']);
|
||||
}
|
||||
$finalContext = $this->Event->restSearch($user, 'context', $filtersForRestSearch, false, false, $elementCounter, $renderView);
|
||||
$finalContext = json_decode($finalContext->intoString(), true);
|
||||
$finalContext = JsonTool::decode($finalContext->intoString());
|
||||
$aggregated_context = $this->__renderAggregatedContext($finalContext);
|
||||
|
||||
$rollingWindows = 2;
|
||||
|
|
@ -1833,6 +1833,7 @@ class User extends AppModel
|
|||
];
|
||||
$trending_summary = $this->__renderTrendingSummary($trendData);
|
||||
|
||||
$emailTemplate = $this->prepareEmailTemplate($period);
|
||||
$emailTemplate->set('baseurl', $this->Event->__getAnnounceBaseurl());
|
||||
$emailTemplate->set('events', $events);
|
||||
$emailTemplate->set('filters', $filters);
|
||||
|
|
@ -1843,9 +1844,9 @@ class User extends AppModel
|
|||
$emailTemplate->set('trending_summary', $trending_summary);
|
||||
$emailTemplate->set('analysisLevels', $this->Event->analysisLevels);
|
||||
$emailTemplate->set('distributionLevels', $this->Event->distributionLevels);
|
||||
if (!empty($rendered)) {
|
||||
if ($rendered) {
|
||||
$summary = $emailTemplate->render();
|
||||
return $summary->format() == 'text' ? $summary->text : $summary->html;
|
||||
return $summary->format() === 'text' ? $summary->text : $summary->html;
|
||||
}
|
||||
return $emailTemplate;
|
||||
}
|
||||
|
|
@ -1875,23 +1876,21 @@ class User extends AppModel
|
|||
|
||||
private function __genTimerangeFilter(string $period='daily'): string
|
||||
{
|
||||
$timerange = '1d';
|
||||
if ($period == 'weekly') {
|
||||
$timerange = '7d';
|
||||
} else if ($period == 'monthly'){
|
||||
$timerange = '31d';
|
||||
}
|
||||
return $timerange;
|
||||
return $this->periodToDays($period) . 'd';
|
||||
}
|
||||
|
||||
public function periodToDays(string $period='daily'): int
|
||||
private function periodToDays(string $period='daily'): int
|
||||
{
|
||||
return ($period == 'daily' ? 1 : (
|
||||
$period == 'weekly' ? 7 : 31)
|
||||
);
|
||||
if ($period === 'daily') {
|
||||
return 1;
|
||||
} else if ($period === 'weekly') {
|
||||
return 7;
|
||||
} else {
|
||||
return 31;
|
||||
}
|
||||
}
|
||||
|
||||
public function prepareEmailTemplate(string $period='daily'): SendEmailTemplate
|
||||
private function prepareEmailTemplate(string $period = 'daily'): SendEmailTemplate
|
||||
{
|
||||
$subject = sprintf('[%s MISP] %s %s', Configure::read('MISP.org'), Inflector::humanize($period), __('Notification - %s', (new DateTime())->format('Y-m-d')));
|
||||
$template = new SendEmailTemplate("notification_$period");
|
||||
|
|
|
|||
|
|
@ -105,15 +105,15 @@ if (!function_exists('computeLinePositions')) {
|
|||
</tr>
|
||||
<tr>
|
||||
<td><?= __('Starting period') ?></td>
|
||||
<td><?= sprintf('%s', $currentPeriodDate->format('M d, o. (\W\e\e\k W)')); ?></td>
|
||||
<td><?= $currentPeriodDate->format('M d, o. (\W\e\e\k W)'); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?= __('Previous period') ?></td>
|
||||
<td><?= sprintf('%s', $previousPeriodDate->format('M d, o. (\W\e\e\k W)')); ?></td>
|
||||
<td><?= $previousPeriodDate->format('M d, o. (\W\e\e\k W)'); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?= __('Period-2') ?></td>
|
||||
<td><?= sprintf('%s', $previousPeriod2Date->format('M d, o. (\W\e\e\k W)')); ?></td>
|
||||
<td><?= $previousPeriod2Date->format('M d, o. (\W\e\e\k W)'); ?></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -125,7 +125,7 @@ if (!function_exists('computeLinePositions')) {
|
|||
<div>
|
||||
<span class="y-axis-label" style="<?= sprintf('left: %spx; top: %spx; transform: translate(-100%%, %s%%)', 0, 0, -25) ?>"><?= h($maxValue) ?></span>
|
||||
<span class="y-axis-label" style="<?= sprintf('left: %spx; top: %spx; transform: translate(-100%%, %s%%)', 0, ($canvasHeight - 20) / 2, 0) ?>"><?= h(round($maxValue / 2, 2)) ?></span>
|
||||
<span class="y-axis-label" style="<?= sprintf('left: %spx; top: %spx; transform: translate(-100%%, %s%%)', 0, ($canvasHeight - 20), 25) ?>"><?= 0 ?></span>
|
||||
<span class="y-axis-label" style="<?= sprintf('left: %spx; top: %spx; transform: translate(-100%%, %s%%)', 0, ($canvasHeight - 20), 25) ?>">0</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="canvas">
|
||||
|
|
@ -288,7 +288,6 @@ if (!function_exists('computeLinePositions')) {
|
|||
$colorGradient[] = sprintf('%s %s%%', $color, $length);
|
||||
}
|
||||
?>
|
||||
|
||||
<div class="heatbar" style="background: <?= sprintf('linear-gradient(90deg, %s);', implode(', ', $colorGradient)) ?>;"></div>
|
||||
</td>
|
||||
<?php endforeach; ?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue