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

phpcbf

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-02-03 13:09:09 +01:00
parent a44e709ef8
commit 2997890cb4
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Install/Navigation.php
View File

@ -39,7 +39,7 @@ class Navigation
public static function install(string $path = null, DatabasePool $dbPool = null) /* : void */ public static function install(string $path = null, DatabasePool $dbPool = null) /* : void */
{ {
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $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 */ /** @var $class \Modules\Navigation\Admin\Installer */
$class::installExternal($dbPool, $navData); $class::installExternal($dbPool, $navData);

2
Admin/InstallType.php
View File

@ -27,5 +27,5 @@ use phpOMS\Stdlib\Base\Enum;
abstract class InstallType extends Enum abstract class InstallType extends Enum
{ {
/* public */ const PERMISSION = 0; /* public */ const PERMISSION = 0;
/* public */ const GROUP = 1; /* public */ const GROUP = 1;
} }

7
Controller.php
View File

@ -617,7 +617,7 @@ class Controller extends ModuleAbstract implements WebInterface
return; return;
} }
$group = GroupMapper::get((int) $request->getData('id')); $group = GroupMapper::get((int) $request->getData('id'));
$status = GroupMapper::delete($group); $status = GroupMapper::delete($group);
$response->set($request->__toString(), $status); $response->set($request->__toString(), $status);
@ -686,8 +686,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
// todo: validate email correctness // todo: validate email correctness
$val = []; $val = [];
if ( if (($val['login'] = empty($request->getData('login')))
($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')))
@ -777,7 +776,7 @@ class Controller extends ModuleAbstract implements WebInterface
} }
$account = AccountMapper::get((int) ($request->getData('id'))); $account = AccountMapper::get((int) ($request->getData('id')));
$status = AccountMapper::delete($account); $status = AccountMapper::delete($account);
$response->set($request->__toString(), $status); $response->set($request->__toString(), $status);
} }

1
Models/AccountMapper.php
View File

@ -110,7 +110,6 @@ class AccountMapper extends DataMapperAbstract
switch (self::$db->getType()) { switch (self::$db->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:
$sth = self::$db->con->prepare( $sth = self::$db->con->prepare(
'SELECT 'SELECT
`' . self::$db->prefix . 'account`.* `' . self::$db->prefix . 'account`.*

8
Models/PermissionState.php
View File

@ -27,8 +27,8 @@ use phpOMS\Stdlib\Base\Enum;
abstract class PermissionState extends Enum abstract class PermissionState extends Enum
{ {
/* public */ const SETTINGS = 1; /* public */ const SETTINGS = 1;
/* public */ const ACCOUNT = 2; /* public */ const ACCOUNT = 2;
/* public */ const GROUP = 3; /* public */ const GROUP = 3;
/* public */ const MODULE = 4; /* public */ const MODULE = 4;
/* public */ const LOG = 5; /* public */ const LOG = 5;
} }