From 67bca98fb027308fb3e3c3cd3c67fcbe1e5ba70d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 23 Nov 2018 11:37:30 +0100
Subject: [PATCH] Minor functioinality improvements

---
 Controller/ApiController.php |  7 ++++++-
 Models/Module.php            | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 9b68f50..2c95675 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -39,6 +39,7 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
 use phpOMS\Module\InfoManager;
 use phpOMS\Account\PermissionAbstract;
 use phpOMS\Account\PermissionOwner;
+use phpOMS\Validation\Network\Email;
 
 /**
  * Admin controller class.
@@ -305,6 +306,7 @@ final class ApiController extends Controller
      */
     public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        $response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
         $response->set(
             $request->getUri()->__toString(),
             \array_values(
@@ -354,6 +356,7 @@ final class ApiController extends Controller
      */
     public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        $response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
         $response->set(
             $request->getUri()->__toString(),
             \array_values(
@@ -373,12 +376,12 @@ final class ApiController extends Controller
      */
     private function validateAccountCreate(RequestAbstract $request) : array
     {
-        // todo: validate email correctness
         $val = [];
         if (($val['login'] = empty($request->getData('login')))
             || ($val['name1'] = empty($request->getData('name1')))
             || ($val['type'] = !AccountType::isValidValue((int) $request->getData('type')))
             || ($val['status'] = !AccountStatus::isValidValue((int) $request->getData('status')))
+            || ($val['email'] = !empty($request->getData('email')) && !Email::isValid((string) $request->getData('email')))
         ) {
             return $val;
         }
@@ -443,6 +446,8 @@ final class ApiController extends Controller
         $account->setEmail((string) ($request->getData('email') ?? ''));
         $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;
     }
 
diff --git a/Models/Module.php b/Models/Module.php
index d3515a2..c6476f9 100644
--- a/Models/Module.php
+++ b/Models/Module.php
@@ -78,7 +78,7 @@ class Module
     }
 
     /**
-     * Get group id.
+     * Get module id.
      *
      * @return int
      *
@@ -102,7 +102,7 @@ class Module
     }
 
     /**
-     * Get group name.
+     * Get module name.
      *
      * @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
      *
@@ -128,7 +128,7 @@ class Module
     }
 
     /**
-     * Get group description.
+     * Get module description.
      *
      * @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
      *
@@ -154,9 +154,9 @@ class Module
     }
 
     /**
-     * Get group status.
+     * Get module status.
      *
-     * @return int Group status
+     * @return int Module status
      *
      * @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
      *