From 2997890cb40920f6a2e4c8c20d2b158f1d9ac5d8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 3 Feb 2018 13:09:09 +0100 Subject: [PATCH] phpcbf --- Admin/Install/Navigation.php | 2 +- Admin/InstallType.php | 2 +- Controller.php | 7 +++---- Models/AccountMapper.php | 1 - Models/PermissionState.php | 8 ++++---- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index e146696..c8fca21 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -39,7 +39,7 @@ class Navigation public static function install(string $path = null, DatabasePool $dbPool = null) /* : void */ { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); - $class = '\\Modules\\Navigation\\Admin\\Installer'; + $class = '\\Modules\\Navigation\\Admin\\Installer'; /** @var $class \Modules\Navigation\Admin\Installer */ $class::installExternal($dbPool, $navData); diff --git a/Admin/InstallType.php b/Admin/InstallType.php index a20f12d..6ce14b3 100644 --- a/Admin/InstallType.php +++ b/Admin/InstallType.php @@ -27,5 +27,5 @@ use phpOMS\Stdlib\Base\Enum; abstract class InstallType extends Enum { /* public */ const PERMISSION = 0; - /* public */ const GROUP = 1; + /* public */ const GROUP = 1; } diff --git a/Controller.php b/Controller.php index 7a13562..e49871f 100644 --- a/Controller.php +++ b/Controller.php @@ -617,7 +617,7 @@ class Controller extends ModuleAbstract implements WebInterface return; } - $group = GroupMapper::get((int) $request->getData('id')); + $group = GroupMapper::get((int) $request->getData('id')); $status = GroupMapper::delete($group); $response->set($request->__toString(), $status); @@ -686,8 +686,7 @@ class Controller extends ModuleAbstract implements WebInterface { // todo: validate email correctness $val = []; - if ( - ($val['login'] = empty($request->getData('login'))) + 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'))) @@ -777,7 +776,7 @@ class Controller extends ModuleAbstract implements WebInterface } $account = AccountMapper::get((int) ($request->getData('id'))); - $status = AccountMapper::delete($account); + $status = AccountMapper::delete($account); $response->set($request->__toString(), $status); } diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index 8b3119f..e777d2d 100644 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -110,7 +110,6 @@ class AccountMapper extends DataMapperAbstract switch (self::$db->getType()) { case DatabaseType::MYSQL: - $sth = self::$db->con->prepare( 'SELECT `' . self::$db->prefix . 'account`.* diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 604135a..77a09b3 100644 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -27,8 +27,8 @@ use phpOMS\Stdlib\Base\Enum; abstract class PermissionState extends Enum { /* public */ const SETTINGS = 1; - /* public */ const ACCOUNT = 2; - /* public */ const GROUP = 3; - /* public */ const MODULE = 4; - /* public */ const LOG = 5; + /* public */ const ACCOUNT = 2; + /* public */ const GROUP = 3; + /* public */ const MODULE = 4; + /* public */ const LOG = 5; }