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

Minor functioinality improvements

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-11-23 11:37:30 +01:00
parent b0d5839ba6
commit 67bca98fb0
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Controller/ApiController.php
View File

@ -39,6 +39,7 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionAbstract;
use phpOMS\Account\PermissionOwner; use phpOMS\Account\PermissionOwner;
use phpOMS\Validation\Network\Email;
/** /**
* Admin controller class. * Admin controller class.
@ -305,6 +306,7 @@ final class ApiController extends Controller
*/ */
public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
$response->set( $response->set(
$request->getUri()->__toString(), $request->getUri()->__toString(),
\array_values( \array_values(
@ -354,6 +356,7 @@ final class ApiController extends Controller
*/ */
public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
$response->set( $response->set(
$request->getUri()->__toString(), $request->getUri()->__toString(),
\array_values( \array_values(
@ -373,12 +376,12 @@ final class ApiController extends Controller
*/ */
private function validateAccountCreate(RequestAbstract $request) : array private function validateAccountCreate(RequestAbstract $request) : array
{ {
// todo: validate email correctness
$val = []; $val = [];
if (($val['login'] = empty($request->getData('login'))) if (($val['login'] = empty($request->getData('login')))
|| ($val['name1'] = empty($request->getData('name1'))) || ($val['name1'] = empty($request->getData('name1')))
|| ($val['type'] = !AccountType::isValidValue((int) $request->getData('type'))) || ($val['type'] = !AccountType::isValidValue((int) $request->getData('type')))
|| ($val['status'] = !AccountStatus::isValidValue((int) $request->getData('status'))) || ($val['status'] = !AccountStatus::isValidValue((int) $request->getData('status')))
|| ($val['email'] = !empty($request->getData('email')) && !Email::isValid((string) $request->getData('email')))
) { ) {
return $val; return $val;
} }
@ -443,6 +446,8 @@ final class ApiController extends Controller
$account->setEmail((string) ($request->getData('email') ?? '')); $account->setEmail((string) ($request->getData('email') ?? ''));
$account->generatePassword((string) ($request->getData('password') ?? '')); $account->generatePassword((string) ($request->getData('password') ?? ''));
// todo: set remaining login tries based on global default config here. but before you have to add it to the model and mapper
return $account; return $account;
} }

22
Models/Module.php
View File

@ -78,7 +78,7 @@ class Module
} }
/** /**
* Get group id. * Get module id.
* *
* @return int * @return int
* *
@ -102,7 +102,7 @@ class Module
} }
/** /**
* Get group name. * Get module name.
* *
* @return string * @return string
* *
@ -114,9 +114,9 @@ class Module
} }
/** /**
* Set group name. * Set module name.
* *
* @param string $name Group name * @param string $name module name
* *
* @return void * @return void
* *
@ -128,7 +128,7 @@ class Module
} }
/** /**
* Get group description. * Get module description.
* *
* @return string * @return string
* *
@ -140,9 +140,9 @@ class Module
} }
/** /**
* Set group description. * Set module description.
* *
* @param string $description Group description * @param string $description Module description
* *
* @return void * @return void
* *
@ -154,9 +154,9 @@ class Module
} }
/** /**
* Get group status. * Get module status.
* *
* @return int Group status * @return int Module status
* *
* @since 1.0.0 * @since 1.0.0
*/ */
@ -166,9 +166,9 @@ class Module
} }
/** /**
* Set group status. * Set module status.
* *
* @param int $status Group status * @param int $status Module status
* *
* @return void * @return void
* *