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

todos fixed

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-10-12 22:49:20 +00:00
parent 87d44f7e97
commit 68ff204f10
10 changed files with 45 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin/Install/Media/ExcelListExporter/defaultExcelExporter.xls.php
View File

@ -33,7 +33,6 @@ $excel = new DefaultExcel();
foreach ($data as $i => $row) { foreach ($data as $i => $row) {
foreach ($row as $j => $cell) { foreach ($row as $j => $cell) {
// @todo: fix 26 column overflow.
$excel->getActiveSheet()->setCellValue(StringUtils::intToAlphabet($j + 1) . ($i + 1), $cell); $excel->getActiveSheet()->setCellValue(StringUtils::intToAlphabet($j + 1) . ($i + 1), $cell);
} }
} }

2
Admin/Install/settings.php
View File

@ -19,7 +19,7 @@ return [
[ [
'type' => 'setting', 'type' => 'setting',
'name' => SettingsEnum::PASSWORD_PATTERN, 'name' => SettingsEnum::PASSWORD_PATTERN,
'content' => '/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[.,\/\(\)\{\}\[\]#?!@$%^&*+=\':"-]).{8,}$/', 'content' => '/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[.,\/\(\)\{\}\[\]#?!@$%^&*+=\':-]).{8,}$/',
'module' => 'Admin', 'module' => 'Admin',
], ],
[ [

31
Controller/ApiController.php
View File

@ -633,20 +633,7 @@ final class ApiController extends Controller
$new->group = $group ?? $new->group; $new->group = $group ?? $new->group;
$new->account = $account ?? $new->account; $new->account = $account ?? $new->account;
// @todo: this function call seems stupid, it should just pass the $new object. $this->app->appSettings->set([$new], false);
$this->app->appSettings->set([
[
'id' => $new->id,
'name' => $new->name,
'content' => $new->content,
'unit' => $new->unit,
'app' => $new->app,
'module' => $new->module,
'group' => $new->group,
'account' => $new->account,
'isEncrypted' => $new->isEncrypted,
],
], false);
$this->updateModel($request->header->account, $old, $new, SettingMapper::class, 'settings', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, SettingMapper::class, 'settings', $request->getOrigin());
} }
@ -1332,8 +1319,6 @@ final class ApiController extends Controller
* *
* @return array<string, bool> * @return array<string, bool>
* *
* @todo: implement
*
* @since 1.0.0 * @since 1.0.0
*/ */
private function validateGroupDelete(RequestAbstract $request) : array private function validateGroupDelete(RequestAbstract $request) : array
@ -1981,6 +1966,7 @@ final class ApiController extends Controller
|| ($val['unit'] = !$request->hasData('unit')) || ($val['unit'] = !$request->hasData('unit'))
|| ($val['app'] = !$request->hasData('app')) || ($val['app'] = !$request->hasData('app'))
|| ($val['password'] = !$request->hasData('password')) || ($val['password'] = !$request->hasData('password'))
|| ($val['terms'] = (($request->getDataBool('terms_required') ?? false) && ($request->getDataBool('terms') ?? false)))
) { ) {
return $val; return $val;
} }
@ -2094,13 +2080,6 @@ final class ApiController extends Controller
*/ */
private function createProfileForAccount(Account $account, RequestAbstract $request) : void private function createProfileForAccount(Account $account, RequestAbstract $request) : void
{ {
// @todo: why do we need the following lines?
if (($request->getDataString('password') ?? '') === ''
|| ($request->getDataString('user') ?? '') === ''
) {
return;
}
$request->setData('iaccount-idlist', $account->id); $request->setData('iaccount-idlist', $account->id);
$internalResponse = new HttpResponse(); $internalResponse = new HttpResponse();
@ -3209,8 +3188,6 @@ final class ApiController extends Controller
* *
* @return array<string, bool> * @return array<string, bool>
* *
* @todo: implement
*
* @since 1.0.0 * @since 1.0.0
*/ */
private function validateSettingsDelete(RequestAbstract $request) : array private function validateSettingsDelete(RequestAbstract $request) : array
@ -3277,8 +3254,6 @@ final class ApiController extends Controller
* *
* @return array<string, bool> * @return array<string, bool>
* *
* @todo: implement
*
* @since 1.0.0 * @since 1.0.0
*/ */
private function validateApplicationUpdate(RequestAbstract $request) : array private function validateApplicationUpdate(RequestAbstract $request) : array
@ -3326,8 +3301,6 @@ final class ApiController extends Controller
* *
* @return array<string, bool> * @return array<string, bool>
* *
* @todo: implement
*
* @since 1.0.0 * @since 1.0.0
*/ */
private function validateApplicationDelete(RequestAbstract $request) : array private function validateApplicationDelete(RequestAbstract $request) : array

16
Controller/CliController.php
View File

@ -15,6 +15,8 @@ declare(strict_types=1);
namespace Modules\Admin\Controller; namespace Modules\Admin\Controller;
use Model\SettingMapper; use Model\SettingMapper;
use Modules\Admin\Models\SettingsEnum;
use phpOMS\Application\ApplicationStatus;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
@ -135,7 +137,14 @@ final class CliController extends Controller
*/ */
public function runEncryptionChangeFromHook(mixed ...$data) : void public function runEncryptionChangeFromHook(mixed ...$data) : void
{ {
// @todo: start read only mode /** @var \Model\Setting $setting */
$setting = $this->app->appSettings->get(null, names: SettingsEnum::LOGIN_STATUS);
$oldMode = $setting->content;
// Enter read only mode
$setting->content = (string) ApplicationStatus::READ_ONLY;
$this->app->appSetting->save([$setting]);
$mapper = SettingMapper::yield() $mapper = SettingMapper::yield()
->where('isEncrypted', true); ->where('isEncrypted', true);
@ -152,6 +161,9 @@ final class CliController extends Controller
SettingMapper::update()->execute($setting); SettingMapper::update()->execute($setting);
} }
// @todo: end read only mode
// Restore old mode
$setting->content = $oldMode;
$this->app->appSetting->save([$setting]);
} }
} }

2
Theme/Api/Lang/de.lang.php
View File

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
return ['Admin' => [ return ['Admin' => [
'AccountCreateMsg' => 'Account successfully created. Link: <a href={url}">Account</a>"', 'AccountCreateMsg' => 'Account successfully created. Link: <a href={url}>Account</a>""',
'AccountCreateTitle' => 'Account', 'AccountCreateTitle' => 'Account',
'FormDataInvalid' => 'Form data invalid, please check your input', 'FormDataInvalid' => 'Form data invalid, please check your input',
'LOGIN_ERROR' => 'Login failed due to wrong login information.', 'LOGIN_ERROR' => 'Login failed due to wrong login information.',

2
Theme/Api/Lang/en.lang.php
View File

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
return ['Admin' => [ return ['Admin' => [
'AccountCreateMsg' => 'Account successfully created. Link: <a href={url}">Account</a>"', 'AccountCreateMsg' => 'Account successfully created. Link: <a href={url}>Account</a>""',
'AccountCreateTitle' => 'Account', 'AccountCreateTitle' => 'Account',
'FormDataInvalid' => 'Form data invalid, please check your input', 'FormDataInvalid' => 'Form data invalid, please check your input',
'LOGIN_ERROR' => 'Login failed due to wrong login information.', 'LOGIN_ERROR' => 'Login failed due to wrong login information.',

4
Theme/Backend/Lang/Navigation.de.lang.php
View File

@ -20,9 +20,9 @@ return ['Navigation' => [
'Front' => 'Vorderseite', 'Front' => 'Vorderseite',
'General' => 'Allgemein', 'General' => 'Allgemein',
'Groups' => 'Gruppen', 'Groups' => 'Gruppen',
'Hooks' => '', 'Hooks' => 'Hooks',
'Info' => 'Die Info', 'Info' => 'Die Info',
'List' => 'Aufführen', 'List' => 'Liste',
'Log' => 'Protokoll', 'Log' => 'Protokoll',
'Members' => 'Mitglieder', 'Members' => 'Mitglieder',
'Modules' => 'Module', 'Modules' => 'Module',

2
Theme/Backend/Lang/da.lang.php
View File

@ -188,7 +188,7 @@ return ['Admin' => [
'Zip' => 'Zip.', 'Zip' => 'Zip.',
'active' => '', 'active' => '',
'available' => '', 'available' => '',
'i:LoginRetries' => "Mængden af \u{200b}\u{200b}tilladte retries (-1 = ubegrænset)", 'i:LoginRetries' => 'Mængden af ​​tilladte retries (-1 = ubegrænset)',
'i:PasswordChangeInterval' => 'Interval, hvor passager skal ændres (-1 = aldrig)', 'i:PasswordChangeInterval' => 'Interval, hvor passager skal ændres (-1 = aldrig)',
'i:PasswordHistory' => 'Ny adgangskode skal være forskellig fra de sidste N-adgangskoder', 'i:PasswordHistory' => 'Ny adgangskode skal være forskellig fra de sidste N-adgangskoder',
'i:PasswordRegex' => 'Adgangskode krav til brugere', 'i:PasswordRegex' => 'Adgangskode krav til brugere',

38
Theme/Backend/Lang/de.lang.php
View File

@ -52,7 +52,7 @@ return ['Admin' => [
'Delete' => 'Löschen', 'Delete' => 'Löschen',
'Description' => 'Beschreibung', 'Description' => 'Beschreibung',
'Design' => 'Entwurf', 'Design' => 'Entwurf',
'Destination' => '', 'Destination' => 'Ziel',
'Ele' => 'Ele.', 'Ele' => 'Ele.',
'Element' => 'Element', 'Element' => 'Element',
'Email' => 'Email', 'Email' => 'Email',
@ -68,9 +68,9 @@ return ['Admin' => [
'GroupStatus4' => 'Versteckt', 'GroupStatus4' => 'Versteckt',
'Groups' => 'Gruppen', 'Groups' => 'Gruppen',
'Heavy' => 'Schwer', 'Heavy' => 'Schwer',
'Hook' => '', 'Hook' => 'Hook',
'Hooks' => '', 'Hooks' => 'Hooks',
'Images' => 'Bilde', 'Images' => 'Bilder',
'Inactive' => 'Inaktiv', 'Inactive' => 'Inaktiv',
'Install' => 'Installieren', 'Install' => 'Installieren',
'Installed' => 'Eingerichtet', 'Installed' => 'Eingerichtet',
@ -107,9 +107,9 @@ return ['Admin' => [
'Numeric' => 'Numerisch', 'Numeric' => 'Numerisch',
'Organization' => 'Organisation', 'Organization' => 'Organisation',
'OrganizationName' => 'Organisationsname', 'OrganizationName' => 'Organisationsname',
'OwnPermission' => '', 'OwnPermission' => 'Eigene Rechte',
'Page' => 'Buchseite', 'Page' => 'Seite',
'Pages' => '', 'Pages' => 'Seiten',
'Parent' => 'Elternteil', 'Parent' => 'Elternteil',
'Parents' => 'Eltern', 'Parents' => 'Eltern',
'Password' => 'Passwort', 'Password' => 'Passwort',
@ -127,16 +127,16 @@ return ['Admin' => [
'Read' => 'Lesen', 'Read' => 'Lesen',
'Release' => 'Freisetzung', 'Release' => 'Freisetzung',
'Reset' => 'Zurücksetzen', 'Reset' => 'Zurücksetzen',
'Route' => '', 'Route' => 'Route',
'Routes' => '', 'Routes' => 'Routes',
'Running' => 'Betrieb', 'Running' => 'Betrieb',
'Sea' => 'Meer', 'Sea' => 'Meer',
'Search' => 'Suche', 'Search' => 'Suche',
'Security' => 'Sicherheit', 'Security' => 'Sicherheit',
'ServerMode-1' => '', 'ServerMode-1' => 'Normal',
'ServerMode-2' => '', 'ServerMode-2' => 'Lesezugang',
'ServerMode-3' => '', 'ServerMode-3' => 'Deaktiviert',
'ServerStatus' => '', 'ServerStatus' => 'Serverstatus',
'Settings' => 'Einstellungen', 'Settings' => 'Einstellungen',
'SettingsGeneral' => 'Einstellungen - Allgemein', 'SettingsGeneral' => 'Einstellungen - Allgemein',
'Short' => 'Kurz', 'Short' => 'Kurz',
@ -163,15 +163,15 @@ return ['Admin' => [
'Timestamp' => 'Zeitstempel', 'Timestamp' => 'Zeitstempel',
'Timezone' => 'Zeitzone', 'Timezone' => 'Zeitzone',
'Total' => 'Gesamt', 'Total' => 'Gesamt',
'Trigger' => '', 'Trigger' => 'Trigger',
'Type' => 'Typ', 'Type' => 'Typ',
'Uninstall' => 'Deinstallieren', 'Uninstall' => 'Deinstallieren',
'Unit' => 'Einheit', 'Unit' => 'Einheit',
'Update' => 'Aktualisieren', 'Update' => 'Aktualisieren',
'Uppercase' => 'In Großbuchstaben.', 'Uppercase' => 'In Großbuchstaben.',
'Username' => 'Nutzername', 'Username' => 'Nutzername',
'Value' => '', 'Value' => 'Wert',
'Verb' => '', 'Verb' => 'Verb',
'Version' => 'Ausführung', 'Version' => 'Ausführung',
'VeryFast' => 'Sehr schnell', 'VeryFast' => 'Sehr schnell',
'VeryHeavy' => 'Sehr schwer', 'VeryHeavy' => 'Sehr schwer',
@ -186,8 +186,8 @@ return ['Admin' => [
'Website' => 'Webseite', 'Website' => 'Webseite',
'Weight' => 'Gewicht', 'Weight' => 'Gewicht',
'Zip' => 'Reißverschluss', 'Zip' => 'Reißverschluss',
'active' => '', 'active' => 'aktiv',
'available' => '', 'available' => 'verfügbar',
'i:LoginRetries' => 'Betrag der erlaubten Wiederholungen (-1 = unbegrenzt)', 'i:LoginRetries' => 'Betrag der erlaubten Wiederholungen (-1 = unbegrenzt)',
'i:PasswordChangeInterval' => 'Intervall, in dem die Passweiterung geändert werden müssen (-1 = niemals)', 'i:PasswordChangeInterval' => 'Intervall, in dem die Passweiterung geändert werden müssen (-1 = niemals)',
'i:PasswordHistory' => 'Neues Passwort muss sich von den letzten n Kennwörtern unterscheiden', 'i:PasswordHistory' => 'Neues Passwort muss sich von den letzten n Kennwörtern unterscheiden',
@ -199,5 +199,5 @@ return ['Admin' => [
'i:rc' => 'RE-Cache für jeden Benutzer zwingen.', 'i:rc' => 'RE-Cache für jeden Benutzer zwingen.',
'i:rem' => 'IP-Adresse oder URL für den Fernzugriff.', 'i:rem' => 'IP-Adresse oder URL für den Fernzugriff.',
'i:timef' => 'Zeitformat.', 'i:timef' => 'Zeitformat.',
'inactive' => '', 'inactive' => 'inaktiv',
]]; ]];

8
Theme/Backend/Lang/en.lang.php
View File

@ -109,7 +109,7 @@ return ['Admin' => [
'OrganizationName' => 'Organization Name', 'OrganizationName' => 'Organization Name',
'OwnPermission' => '', 'OwnPermission' => '',
'Page' => 'Page', 'Page' => 'Page',
'Pages' => '', 'Pages' => 'Pages',
'Parent' => 'Parent', 'Parent' => 'Parent',
'Parents' => 'Parents', 'Parents' => 'Parents',
'Password' => 'Password', 'Password' => 'Password',
@ -186,8 +186,8 @@ return ['Admin' => [
'Website' => 'Website', 'Website' => 'Website',
'Weight' => 'Weight', 'Weight' => 'Weight',
'Zip' => 'Zip', 'Zip' => 'Zip',
'active' => '', 'active' => 'active',
'available' => '', 'available' => 'available',
'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)',
'i:PasswordChangeInterval' => 'Interval in which passwards need to be changed (-1 = never)', 'i:PasswordChangeInterval' => 'Interval in which passwards need to be changed (-1 = never)',
'i:PasswordHistory' => 'New password has to be different from the last N passwords', 'i:PasswordHistory' => 'New password has to be different from the last N passwords',
@ -199,5 +199,5 @@ return ['Admin' => [
'i:rc' => 'Forcing re-cache for every user.', 'i:rc' => 'Forcing re-cache for every user.',
'i:rem' => 'IP address or URL for remote access.', 'i:rem' => 'IP address or URL for remote access.',
'i:timef' => 'Time format.', 'i:timef' => 'Time format.',
'inactive' => '', 'inactive' => 'inactive',
]]; ]];