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

bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-10-15 11:54:10 +00:00
parent 68ff204f10
commit d3ce7eda9d
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Admin/Install/settings.php
View File

@ -22,6 +22,13 @@ return [
'content' => '/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[.,\/\(\)\{\}\[\]#?!@$%^&*+=\':-]).{8,}$/', 'content' => '/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[.,\/\(\)\{\}\[\]#?!@$%^&*+=\':-]).{8,}$/',
'module' => 'Admin', 'module' => 'Admin',
], ],
[
'type' => 'setting',
'name' => SettingsEnum::LOGIN_TIMEOUT,
'content' => '3',
'pattern' => '/\\d+/',
'module' => 'Admin',
],
[ [
'type' => 'setting', 'type' => 'setting',
'name' => SettingsEnum::LOGIN_TRIES, 'name' => SettingsEnum::LOGIN_TRIES,

2
Admin/Settings/Theme/Backend/settings.tpl.php
View File

@ -207,7 +207,7 @@ echo $this->data['nav']->render();
<label for="iCountries"><?= $this->getHtml('Country'); ?></label> <label for="iCountries"><?= $this->getHtml('Country'); ?></label>
<select id="iCountries" name="settings_country"> <select id="iCountries" name="settings_country">
<?php foreach ($countryCodes as $code3 => $code2) : ?> <?php foreach ($countryCodes as $code3 => $code2) : ?>
<option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $l11n->getCountry() ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?> <option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $l11n->country ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>

11
Theme/Backend/modules-log.tpl.php
View File

@ -37,7 +37,6 @@ echo $this->data['nav']->render();
<col style="width: 150px"> <col style="width: 150px">
<col style="width: 100px"> <col style="width: 100px">
<col> <col>
<col>
<col style="width: 125px"> <col style="width: 125px">
<col style="width: 75px"> <col style="width: 75px">
<col style="width: 150px"> <col style="width: 150px">
@ -48,25 +47,25 @@ echo $this->data['nav']->render();
<td><?= $this->getHtml('Module', 'Auditor'); ?> <td><?= $this->getHtml('Module', 'Auditor'); ?>
<td><?= $this->getHtml('Type', 'Auditor'); ?> <td><?= $this->getHtml('Type', 'Auditor'); ?>
<td><?= $this->getHtml('Trigger', 'Auditor'); ?> <td><?= $this->getHtml('Trigger', 'Auditor'); ?>
<td><?= $this->getHtml('Content', 'Auditor'); ?>
<td><?= $this->getHtml('By', 'Auditor'); ?> <td><?= $this->getHtml('By', 'Auditor'); ?>
<td><?= $this->getHtml('Ref', 'Auditor'); ?> <td><?= $this->getHtml('Ref', 'Auditor'); ?>
<td><?= $this->getHtml('Date', 'Auditor'); ?> <td><?= $this->getHtml('Date', 'Auditor'); ?>
<tbody> <tbody>
<?php $count = 0; foreach ($audits as $key => $audit) : ++$count; <?php
$url = UriFactory::build('{/base}/admin/audit/single?{?}&id=' . $audit->id); ?> $count = 0;
foreach ($audits as $key => $audit) : ++$count;
$url = UriFactory::build('{/base}/admin/audit/single?{?}&id=' . $audit->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td><?= $audit->id; ?> <td><?= $audit->id; ?>
<td><?= $this->printHtml($audit->module); ?> <td><?= $this->printHtml($audit->module); ?>
<td><?= $audit->type; ?> <td><?= $audit->type; ?>
<td><?= $this->printHtml($audit->trigger); ?> <td><?= $this->printHtml($audit->trigger); ?>
<td><?= $this->printHtml((string) $audit->content); ?>
<td><?= $this->printHtml($audit->createdBy->login); ?> <td><?= $this->printHtml($audit->createdBy->login); ?>
<td><?= $this->printHtml((string) $audit->ref); ?> <td><?= $this->printHtml((string) $audit->ref); ?>
<td><?= $audit->createdAt->format('Y-m-d H:i'); ?> <td><?= $audit->createdAt->format('Y-m-d H:i'); ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php if ($count === 0) : ?> <?php if ($count === 0) : ?>
<tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?> <tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>