Jingga/oms-Messages
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Messages.git synced 2026-02-15 16:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

auto fixes + some impl.

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-01-26 22:53:59 +00:00
parent 6184f6e916
commit 3aa5023b24
14 changed files with 105 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Admin/Installer.php
View File

@ -19,7 +19,6 @@ use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Module\InstallerAbstract; use phpOMS\Module\InstallerAbstract;
use phpOMS\System\File\PathException; use phpOMS\System\File\PathException;
use phpOMS\Uri\HttpUri;
/** /**
* Installer class. * Installer class.
@ -121,7 +120,7 @@ final class Installer extends InstallerAbstract
$module = $app->moduleManager->get('Messages'); $module = $app->moduleManager->get('Messages');
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest();
$request->header->account = 1; $request->header->account = 1;
$request->setData('from', $data['from'] ?? ''); $request->setData('from', $data['from'] ?? '');
@ -146,7 +145,7 @@ final class Installer extends InstallerAbstract
foreach ($data['l11n'] as $language => $l11n) { foreach ($data['l11n'] as $language => $l11n) {
$l11nResponse = new HttpResponse(); $l11nResponse = new HttpResponse();
$l11nRequest = new HttpRequest(new HttpUri('')); $l11nRequest = new HttpRequest();
$l11nRequest->header->account = 1; $l11nRequest->header->account = 1;
$l11nRequest->setData('email', $emailId); $l11nRequest->setData('email', $emailId);

20
Admin/Routes/Web/Backend.php
View File

@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
return [ return [
'^.*/messages/dashboard.*$' => [ '^.*/messages/dashboard(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageInbox', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageInbox',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -29,7 +29,7 @@ return [
], ],
], ],
], ],
'^.*/messages/outbox.*$' => [ '^.*/messages/outbox(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageOutbox', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageOutbox',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -40,7 +40,7 @@ return [
], ],
], ],
], ],
'^.*/messages/trash.*$' => [ '^.*/messages/trash(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTrash', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTrash',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -51,7 +51,7 @@ return [
], ],
], ],
], ],
'^.*/messages/spam.*$' => [ '^.*/messages/spam(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSpam', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSpam',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -62,7 +62,7 @@ return [
], ],
], ],
], ],
'^.*/messages/settings.*$' => [ '^.*/messages/settings(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSettings', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -73,7 +73,7 @@ return [
], ],
], ],
], ],
'^.*/messages/template/list.*$' => [ '^.*/messages/template/list(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTemplates', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTemplates',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -84,7 +84,7 @@ return [
], ],
], ],
], ],
'^.*/messages/template/single.*$' => [ '^.*/messages/template/view(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTemplate', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTemplate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -95,7 +95,7 @@ return [
], ],
], ],
], ],
'^.*/messages/mail/create.*$' => [ '^.*/messages/mail/create(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageCreate', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -106,7 +106,7 @@ return [
], ],
], ],
], ],
'^.*/messages/mail/single.*$' => [ '^.*/messages/mail/view(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -117,7 +117,7 @@ return [
], ],
], ],
], ],
'^.*/messages/mail/single.*$' => [ '^.*/messages/mail/view(\?.*$|$)' => [
[ [
'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView', 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,

5
Controller/ApiController.php
View File

@ -19,6 +19,7 @@ use Modules\Messages\Models\Email;
use Modules\Messages\Models\EmailL11n; use Modules\Messages\Models\EmailL11n;
use Modules\Messages\Models\EmailL11nMapper; use Modules\Messages\Models\EmailL11nMapper;
use Modules\Messages\Models\EmailMapper; use Modules\Messages\Models\EmailMapper;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
@ -155,9 +156,7 @@ final class ApiController extends Controller
{ {
$itemL11n = new EmailL11n(); $itemL11n = new EmailL11n();
$itemL11n->email = $request->getDataInt('email') ?? 0; $itemL11n->email = $request->getDataInt('email') ?? 0;
$itemL11n->setLanguage( $itemL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$request->getDataString('language') ?? $request->header->l11n->language
);
$itemL11n->subject = $request->getDataString('subject') ?? ''; $itemL11n->subject = $request->getDataString('subject') ?? '';
$itemL11n->body = $request->getDataString('body') ?? ''; $itemL11n->body = $request->getDataString('body') ?? '';
$itemL11n->bodyAlt = $request->getDataString('bodyalt') ?? ''; $itemL11n->bodyAlt = $request->getDataString('bodyalt') ?? '';

4
Models/Email.php
View File

@ -42,8 +42,6 @@ class Email extends MailEmail implements \JsonSerializable
public int $status = 0; public int $status = 0;
public array $media = [];
public array $l11n = []; public array $l11n = [];
public bool $isTemplate = false; public bool $isTemplate = false;
@ -96,4 +94,6 @@ class Email extends MailEmail implements \JsonSerializable
{ {
return $this->toArray(); return $this->toArray();
} }
use \Modules\Media\Models\MediaListTrait;
} }

2
Models/EmailMapper.php
View File

@ -70,7 +70,7 @@ final class EmailMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const HAS_MANY = [ public const HAS_MANY = [
'media' => [ 'files' => [
'mapper' => MediaMapper::class, 'mapper' => MediaMapper::class,
'table' => 'messages_mail_media', 'table' => 'messages_mail_media',
'external' => 'messages_mail_media_dst', 'external' => 'messages_mail_media_dst',

2
Theme/Backend/mail-dashboard.tpl.php
View File

@ -44,7 +44,7 @@ echo $this->data['nav']->render(); ?>
<tbody> <tbody>
<?php $count = 0; <?php $count = 0;
foreach ($messages as $key => $value) : ++$count; foreach ($messages as $key => $value) : ++$count;
$url = UriFactory::build('{/base}/messages/mail/single?{?}&id=' . $value->uid); ?> $url = UriFactory::build('{/base}/messages/mail/view?{?}&id=' . $value->uid); ?>
<tr> <tr>
<td><span class="check"><input type="checkbox" name=""></span> <td><span class="check"><input type="checkbox" name=""></span>
<td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a> <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>

2
Theme/Backend/mail-out-view.tpl.php
View File

@ -40,7 +40,7 @@ echo $this->data['nav']->render(); ?>
<tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?> <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
<tbody> <tbody>
<?php $count = 0; foreach ($sent as $key => $value) : ++$count; <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('messages/mail/single?{?}&id=' . $value->uid); ?> $url = \phpOMS\Uri\UriFactory::build('messages/mail/view?{?}&id=' . $value->uid); ?>
<tr> <tr>
<td><span class="check"><input type="checkbox" name=""></span> <td><span class="check"><input type="checkbox" name=""></span>
<td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a> <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>

2
Theme/Backend/mail-spam-view.tpl.php
View File

@ -40,7 +40,7 @@ echo $this->data['nav']->render(); ?>
<tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?> <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
<tbody> <tbody>
<?php $count = 0; foreach ($sent as $key => $value) : ++$count; <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('messages/mail/single?{?}&id=' . $value->uid); ?> $url = \phpOMS\Uri\UriFactory::build('messages/mail/view?{?}&id=' . $value->uid); ?>
<tr> <tr>
<td><span class="check"><input type="checkbox" name=""></span> <td><span class="check"><input type="checkbox" name=""></span>
<td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a> <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>

2
Theme/Backend/mail-templates.tpl.php
View File

@ -34,7 +34,7 @@ echo $this->data['nav']->render(); ?>
<tbody> <tbody>
<?php $count = 0; <?php $count = 0;
foreach ($messages as $key => $value) : ++$count; foreach ($messages as $key => $value) : ++$count;
$url = UriFactory::build('{/base}/messages/template/single?{?}&id=' . $value->id); ?> $url = UriFactory::build('{/base}/messages/template/view?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td><span class="check"><input type="checkbox" name=""></span> <td><span class="check"><input type="checkbox" name=""></span>
<td><a href="<?= $url; ?>"><?= $this->printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->header->l11n->language)->subject : $value->subject); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->header->l11n->language)->subject : $value->subject); ?></a>

2
Theme/Backend/mail-trash-view.tpl.php
View File

@ -40,7 +40,7 @@ echo $this->data['nav']->render(); ?>
<tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?> <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
<tbody> <tbody>
<?php $count = 0; foreach ($sent as $key => $value) : ++$count; <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('messages/mail/single?{?}&id=' . $value->uid); ?> $url = \phpOMS\Uri\UriFactory::build('messages/mail/view?{?}&id=' . $value->uid); ?>
<tr> <tr>
<td><span class="check"><input type="checkbox" name=""></span> <td><span class="check"><input type="checkbox" name=""></span>
<td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a> <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>

11
tests/Bootstrap.php
View File

@ -1,4 +1,15 @@
<?php <?php
/**
* Jingga
*
* PHP Version 8.1
*
* @package Modules\Messages\tests
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1); declare(strict_types=1);
\ini_set('memory_limit', '2048M'); \ini_set('memory_limit', '2048M');