Jingga/oms-Monitoring
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Monitoring.git synced 2026-01-11 16:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

too many changes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-03-11 23:38:18 +01:00
parent 2b34353a82
commit dfa29b02e3
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/CliController.php
View File

@ -68,20 +68,20 @@ final class CliController extends Controller
$mailHandler = $this->app->moduleManager->get('Admin', 'Api')->setUpServerMailHandler();
$mail = new Email();
$mail->setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR . '::Admin']->content, 'Karaka');
$mail->setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR . ':::Admin']->content, 'Karaka');
$mail->addTo('spl1nes.com@googlemail.com', \trim($account->name1 . ' ' . $account->name2 . ' ' . $account->name3));
$mail->subject = 'Log report';
$mail->body = '';
$mail->msgHTML('Attached please find the daily log report');
$mail->addAttachment(__DIR__ . '/../../../humans.txt');
if (!empty($emailSettings[SettingsEnum::MAIL_SERVER_CERT . '::Admin']->content ?? '')
&& !empty($emailSettings[SettingsEnum::MAIL_SERVER_KEY . '::Admin']->content ?? '')
if (!empty($emailSettings[SettingsEnum::MAIL_SERVER_CERT . ':::Admin']->content ?? '')
&& !empty($emailSettings[SettingsEnum::MAIL_SERVER_KEY . ':::Admin']->content ?? '')
) {
$mail->sign(
$emailSettings[SettingsEnum::MAIL_SERVER_CERT . '::Admin']->content,
$emailSettings[SettingsEnum::MAIL_SERVER_KEY . '::Admin']->content,
$emailSettings[SettingsEnum::MAIL_SERVER_KEYPASS . '::Admin']->content
$emailSettings[SettingsEnum::MAIL_SERVER_CERT . ':::Admin']->content,
$emailSettings[SettingsEnum::MAIL_SERVER_KEY . ':::Admin']->content,
$emailSettings[SettingsEnum::MAIL_SERVER_KEYPASS . ':::Admin']->content
);
}

17
Theme/Backend/monitoring-security.tpl.php
View File

@ -144,13 +144,18 @@ echo $this->getData('nav')->render(); ?>
</label>
<tbody>
<?php
$files = Directory::listByExtension(__DIR__ . '/../../../../phpOMS/', 'php', 'tests(\/|\\\)');
foreach ($files as $file) : $content = \file_get_contents(__DIR__ . '/../../../../phpOMS/' . $file); ?>
$files = Directory::listByExtension(__DIR__ . '/../../../../phpOMS/', 'php', 'tests(\/|\\\)');
foreach ($files as $file) :
$content = \file_get_contents(__DIR__ . '/../../../../phpOMS/' . $file);
$unicode = PhpCode::hasUnicode($content);
$deprecated = PhpCode::hasDeprecatedFunction($content);
$integrity = PhpCode::validateFileIntegrity(
__DIR__ . '/../../../../phpOMS/' . $file,
$hashs['phpOMS/' . $file] ?? ''
);
?>
<tr>
<td><?= ($unicode = PhpCode::hasUnicode($content)) || ($deprecated = PhpCode::hasDeprecatedFunction($content)) || !($integrity = PhpCode::validateFileIntegrity(
__DIR__ . '/../../../../phpOMS/' . $file,
$hashs['phpOMS/' . $file] ?? ''
)) ? $this->getHtml('NG') : $this->getHtml('OK'); ?>
<td><?= $unicode || $deprecated || !$integrity ? $this->getHtml('NG') : $this->getHtml('OK'); ?>
<td><?= $file; ?>
<td><?= $unicode ? $this->getHtml('NG') : $this->getHtml('OK'); ?>
<td><?= $deprecated ? $this->getHtml('NG') : $this->getHtml('OK'); ?>

2
composer.json
View File

@ -1,6 +1,6 @@
{
"name": "karaka/module",
"description": "Module for Karaka.",
"description": "Module for Jingga.",
"authors": [
{
"name": "Dennis Eichhorn",

2
info.json
View File

@ -11,7 +11,7 @@
"phpOMS-db": "1.0.0"
},
"creator": {
"name": "Karaka",
"name": "Jingga",
"website": "jingga.app"
},
"description": "The administration module.",