diff --git a/Admin/Activate.php b/Admin/Activate.php index 37e415b..35d20f3 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -16,7 +16,7 @@ namespace Modules\Admin\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\ActivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Activate extends ActivateAbstract /** * {@inheritdoc} */ - public static function activate(Pool $dbPool, InfoManager $info) + public static function activate(DatabasePool $dbPool, InfoManager $info) { parent::activate($dbPool, $info); } diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index c20f7c6..7de3621 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -16,7 +16,7 @@ namespace Modules\Admin\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract /** * {@inheritdoc} */ - public static function deactivate(Pool $dbPool, InfoManager $info) + public static function deactivate(DatabasePool $dbPool, InfoManager $info) { parent::deactivate($dbPool, $info); } diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index bda5401..2805621 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -14,7 +14,7 @@ * @link http://orange-management.com */ namespace Modules\Admin\Admin\Install; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Navigation class. @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(Pool $dbPool) + public static function install(string $path, DatabasePool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index 2aa754c..c1383d8 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -16,7 +16,7 @@ namespace Modules\Admin\Admin; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; @@ -37,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, DatabasePool $dbPool, InfoManager $info) { - parent::install($dbPool, $info); + parent::install($path, $dbPool, $info); switch ($dbPool->get('core')->getType()) { case DatabaseType::MYSQL: @@ -50,6 +50,7 @@ class Installer extends InstallerAbstract 'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'group` ( `group_id` int(11) NOT NULL AUTO_INCREMENT, `group_name` varchar(50) NOT NULL, + `group_status` int(11) NOT NULL, `group_desc` varchar(100) DEFAULT NULL, `group_created` datetime DEFAULT NULL, PRIMARY KEY (`group_id`) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php new file mode 100644 index 0000000..f14f21f --- /dev/null +++ b/Admin/Routes/Web/Api.php @@ -0,0 +1,62 @@ + [ + [ + 'dest' => '\Modules\Admin\Controller:apiSettingsSet', + 'verb' => RouteVerb::SET, + ], + [ + 'dest' => '\Modules\Admin\Controller:apiSettingsGet', + 'verb' => RouteVerb::GET, + ], + ], + + '^.*/api/admin/group.*$' => [ + [ + 'dest' => '\Modules\Admin\Controller:apiGroupCreate', + 'verb' => RouteVerb::PUT, + ], + [ + 'dest' => '\Modules\Admin\Controller:apiGroupUpdate', + 'verb' => RouteVerb::SET, + ], + [ + 'dest' => '\Modules\Admin\Controller:apiGroupDelete', + 'verb' => RouteVerb::DELETE, + ], + [ + 'dest' => '\Modules\Admin\Controller:apiGroupGet', + 'verb' => RouteVerb::GET, + ], + ], + + '^.*/api/admin/account.*$' => [ + [ + 'dest' => '\Modules\Admin\Controller:apiAccountCreate', + 'verb' => RouteVerb::PUT, + ], + [ + 'dest' => '\Modules\Admin\Controller:apiAccountUpdate', + 'verb' => RouteVerb::SET, + ], + [ + 'dest' => '\Modules\Admin\Controller:apiAccountDelete', + 'verb' => RouteVerb::DELETE, + ], + [ + 'dest' => '\Modules\Admin\Controller:apiAccountGet', + 'verb' => RouteVerb::GET, + ], + ], + + '^.*/api/admin/module/status.*$' => [ + [ + 'dest' => '\Modules\Admin\Controller:apiModuleStatusUpdate', + 'verb' => RouteVerb::SET, + ], + ], +]; diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 89aacc5..cb99b59 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -57,60 +57,4 @@ return [ 'verb' => RouteVerb::GET, ], ], - - '^.*/api/admin/settings.*$' => [ - [ - 'dest' => '\Modules\Admin\Controller:apiSettingsSet', - 'verb' => RouteVerb::SET, - ], - [ - 'dest' => '\Modules\Admin\Controller:apiSettingsGet', - 'verb' => RouteVerb::GET, - ], - ], - - '^.*/api/admin/group.*$' => [ - [ - 'dest' => '\Modules\Admin\Controller:apiGroupCreate', - 'verb' => RouteVerb::PUT, - ], - [ - 'dest' => '\Modules\Admin\Controller:apiGroupUpdate', - 'verb' => RouteVerb::SET, - ], - [ - 'dest' => '\Modules\Admin\Controller:apiGroupDelete', - 'verb' => RouteVerb::DELETE, - ], - [ - 'dest' => '\Modules\Admin\Controller:apiGroupGet', - 'verb' => RouteVerb::GET, - ], - ], - - '^.*/api/admin/account.*$' => [ - [ - 'dest' => '\Modules\Admin\Controller:apiAccountCreate', - 'verb' => RouteVerb::PUT, - ], - [ - 'dest' => '\Modules\Admin\Controller:apiAccountUpdate', - 'verb' => RouteVerb::SET, - ], - [ - 'dest' => '\Modules\Admin\Controller:apiAccountDelete', - 'verb' => RouteVerb::DELETE, - ], - [ - 'dest' => '\Modules\Admin\Controller:apiAccountGet', - 'verb' => RouteVerb::GET, - ], - ], - - '^.*/api/admin/module/status.*$' => [ - [ - 'dest' => '\Modules\Admin\Controller:apiModuleStatusUpdate', - 'verb' => RouteVerb::SET, - ], - ], ]; diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index ecfa122..c968eb6 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -16,7 +16,7 @@ namespace Modules\Admin\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UninstallAbstract; /** @@ -36,7 +36,7 @@ class Uninstall extends UninstallAbstract /** * {@inheritdoc} */ - public static function uninstall(Pool $dbPool, InfoManager $info) + public static function uninstall(DatabasePool $dbPool, InfoManager $info) { parent::uninstall($dbPool, $info); } diff --git a/Admin/Update.php b/Admin/Update.php index 904fe7d..4cfdf2a 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -16,7 +16,7 @@ namespace Modules\Admin\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UpdateAbstract; use phpOMS\System\File\Directory; @@ -37,7 +37,7 @@ class Update extends UpdateAbstract /** * {@inheritdoc} */ - public static function update(Pool $dbPool, array $info) + public static function update(DatabasePool $dbPool, array $info) { Directory::deletePath(__DIR__ . '/Update'); mkdir('Update'); diff --git a/Controller.php b/Controller.php index 079e232..28b963c 100644 --- a/Controller.php +++ b/Controller.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -15,10 +15,14 @@ */ namespace Modules\Admin; +use Model\Message\FormValidation; use Modules\Admin\Models\Account; +use phpOMS\Account\AccountStatus; +use phpOMS\Account\AccountType; use Modules\Admin\Models\AccountMapper; -use Modules\Admin\Models\GroupMapper; use Modules\Admin\Models\Group; +use Modules\Admin\Models\GroupMapper; +use phpOMS\Account\GroupStatus; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Module\ModuleAbstract; @@ -46,7 +50,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_PATH = __DIR__; + /* public */ const MODULE_PATH = __DIR__; /** * Module version. @@ -54,7 +58,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_VERSION = '1.0.0'; + /* public */ const MODULE_VERSION = '1.0.0'; /** * Module name. @@ -62,7 +66,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_NAME = 'Admin'; + /* public */ const MODULE_NAME = 'Admin'; /** * Providing. @@ -296,11 +300,34 @@ class Controller extends ModuleAbstract implements WebInterface $response->set('group', GroupMapper::getByRequest($request)); } + private function validateGroupCreate(RequestAbstract $request) : array + { + $val = []; + if ( + ($val['name'] = empty($request->getData('name'))) + || ($val['status'] = ( + $request->getData('status') === null + || !GroupStatus::isValidValue((int) $request->getData('status')) + )) + ) { + return $val; + } + + return []; + } + public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) { + if (!empty($val = $this->validateGroupCreate($request))) { + $response->set('group_create', new FormValidation($val)); + + return; + } + $group = new Group(); - $group->setName($request->getData('name')); - $group->setDescription($request->getData('desc')); + $group->setName($request->getData('name') ?? ''); + $group->setStatus((int) $request->getData('status')); + $group->setDescription($request->getData('description') ?? ''); GroupMapper::create($group); @@ -331,11 +358,38 @@ class Controller extends ModuleAbstract implements WebInterface $response->set('account', AccountMapper::getByRequest($request)); } + private function validateAccountCreate(RequestAbstract $request) : array + { + $val = []; + if ( + ($val['name'] = empty($request->getData('name'))) + || ($val['name1'] = empty($request->getData('name1'))) + || ($val['type'] = !AccountType::isValidValue((int) $request->getData('type'))) + || ($val['status'] = !AccountStatus::isValidValue((int) $request->getData('status'))) + ) { + return $val; + } + + return []; + } + public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) { + if (!empty($val = $this->validateAccountCreate($request))) { + $response->set('account_create', new FormValidation($val)); + + return; + } + $account = new Account(); + $account->setStatus($request->getData('status')); + $account->setType($request->getData('type')); $account->setName($request->getData('name')); - $account->setDescription($request->getData('desc')); + $account->setName1($request->getData('name1')); + $account->setName2($request->getData('name2')); + $account->setName3($request->getData('name3')); + $account->setEmail($request->getData('email')); + $account->generatePassword($request->getData('password')); AccountMapper::create($account); @@ -365,11 +419,11 @@ class Controller extends ModuleAbstract implements WebInterface $module = $request->getData('module'); $status = $request->getData('status'); - if(!$module || !$status) { + if (!$module || !$status) { // todo: create failure response } - switch($status) { + switch ($status) { case 'activate': $done = $this->app->moduleManager->activate($module); break; diff --git a/Models/Account.php b/Models/Account.php index 5480859..f627b25 100644 --- a/Models/Account.php +++ b/Models/Account.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index 88e2e11..c1fc563 100644 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -15,7 +15,10 @@ */ namespace Modules\Admin\Models; +use Modules\Media\Models\MediaMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\Query\Builder; +use phpOMS\DataStorage\Database\Query\Column; use phpOMS\DataStorage\Database\RelationType; class AccountMapper extends DataMapperAbstract @@ -23,7 +26,7 @@ class AccountMapper extends DataMapperAbstract /** * Columns. * - * @var array + * @var array * @since 1.0.0 */ protected static $columns = [ @@ -66,6 +69,49 @@ class AccountMapper extends DataMapperAbstract */ protected static $createdAt = 'account_created_at'; + /** + * Create object. + * + * @param mixed $obj Object + * @param int $relations Behavior for relations creation + * + * @return mixed + * + * @since 1.0.0 + * @author Dennis Eichhorn + */ + public static function create($obj, int $relations = RelationType::ALL) + { + try { + $objId = parent::create($obj, $relations); + $query = new Builder(self::$db); + + $query->prefix(self::$db->getPrefix()) + ->insert( + 'account_permission_account', + 'account_permission_from', + 'account_permission_for', + 'account_permission_id1', + 'account_permission_id2', + 'account_permission_r', + 'account_permission_w', + 'account_permission_m', + 'account_permission_d', + 'account_permission_p' + ) + ->into('account_permission') + ->values(1, 'account', 'account', 1, $objId, 1, 1, 1, 1, 1); + + self::$db->con->prepare($query->toSql())->execute(); + } catch (\Exception $e) { + var_dump($e->getMessage()); + + return false; + } + + return $objId; + } + /** * Get object. * diff --git a/Models/Group.php b/Models/Group.php index c2b7df1..1f81cc6 100644 --- a/Models/Group.php +++ b/Models/Group.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php index 7a49587..244cd29 100644 --- a/Models/GroupMapper.php +++ b/Models/GroupMapper.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -24,12 +24,13 @@ class GroupMapper extends DataMapperAbstract /** * Columns. * - * @var array + * @var array * @since 1.0.0 */ protected static $columns = [ 'group_id' => ['name' => 'group_id', 'type' => 'int', 'internal' => 'id'], 'group_name' => ['name' => 'group_name', 'type' => 'string', 'internal' => 'name'], + 'group_status' => ['name' => 'group_status', 'type' => 'int', 'internal' => 'status'], 'group_desc' => ['name' => 'group_desc', 'type' => 'string', 'internal' => 'description'], 'group_created' => ['name' => 'group_created', 'type' => 'DateTime', 'internal' => 'createdAt'], ]; diff --git a/Models/NullAccount.php b/Models/NullAccount.php index 7dae86e..ba68cca 100644 --- a/Models/NullAccount.php +++ b/Models/NullAccount.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/NullGroup.php b/Models/NullGroup.php index 25027fe..22aa441 100644 --- a/Models/NullGroup.php +++ b/Models/NullGroup.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 6526cf8..ddb3c2b 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php index e593bf9..a82e530 100644 --- a/Theme/Backend/Lang/api.en.lang.php +++ b/Theme/Backend/Lang/api.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 258fcb3..9418907 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -21,6 +21,7 @@ return ['Admin' => [ 'Activity' => 'Activity', 'Available' => 'Available', 'All' => 'All', + 'Area' => 'Area', 'Banned' => 'Banned', 'Cache' => 'Cache', 'Children' => 'Children', @@ -34,19 +35,28 @@ return ['Admin' => [ 'Deactivate' => 'Deactivate', 'Email' => 'Email', 'EmailAdmin' => 'Email Admin', + 'Fast' => 'Fast', 'Features' => 'Features', 'File' => 'File', + 'General' => 'General', + 'Glass' => 'Glass', 'Group' => 'Group', 'Groups' => 'Groups', + 'Heavy' => 'Heavy', 'Inactive' => 'Inactive', 'Install' => 'Install', 'Installed' => 'Installed', 'LAddress' => 'Local Address', 'Language' => 'Language', + 'Large' => 'Large', + 'Length' => 'Length', + 'Light' => 'Light', 'Localization' => 'Localization', + 'Long' => 'Long', 'Loginname' => 'Login Name', 'Lowercase' => 'Lowercase', 'Maintenance' => 'Maintenance', + 'Medium' => 'Medium', 'Member' => 'Member', 'Members' => 'Members', 'Memcache' => 'Memcache', @@ -74,13 +84,21 @@ return ['Admin' => [ 'RAddress' => 'Remote Address', 'ReCache' => 'Re-Cache', 'Running' => 'Running', + 'Short' => 'Short', + 'Sea' => 'Sea', 'Settings' => 'Settings', 'SettingsGeneral' => 'Settings - General', 'Single' => 'Single', + 'Slow' => 'Slow', + 'Small' => 'Small', + 'Speed' => 'Speed', 'Specialchar' => 'Special character', 'Status' => 'Status', 'Total' => 'Total', 'Release' => 'Release', + 'Tablespoon' => 'Tablespoon', + 'Teaspoon' => 'Teaspoon', + 'Temperature' => 'Temperature', 'Theme' => 'Theme', 'ThousandsSeparator' => 'Thousands Separator', 'Time' => 'Time', @@ -93,8 +111,18 @@ return ['Admin' => [ 'Uppercase' => 'Uppercase', 'Username' => 'Username', 'Version' => 'Version', + 'VeryFast' => 'Very Fast', + 'VeryHeavy' => 'Very Heavy', + 'VeryLarge' => 'Very Large', + 'VeryLight' => 'Very Light', + 'VeryLong' => 'Very Long', + 'VerySlow' => 'Very Slow', + 'VeryShort' => 'Very Short', + 'VerySmall' => 'Very Small', + 'Volume' => 'Volume', 'Warnings' => 'Warnings', 'Website' => 'Website', + 'Weight' => 'Weight', 'i:loc' => 'IP address or URL for remote access.', 'i:mail' => 'Email address.', 'i:oname' => 'Organization name.', diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php index f79e315..20842ea 100644 --- a/Theme/Backend/accounts-create.tpl.php +++ b/Theme/Backend/accounts-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -18,20 +18,20 @@ echo $this->getData('nav')->render(); ?>

getText('Account') ?>

-
+
@@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?>
-
+
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php index 72e640e..6b72a21 100644 --- a/Theme/Backend/accounts-list.tpl.php +++ b/Theme/Backend/accounts-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -44,8 +44,8 @@ echo $this->getData('nav')->render(); getData('list:elements') as $key => $value) : $c++; $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/account/settings?id=' . $value->getId()); ?> - getStatus(); ?> getId(); ?> + getStatus(); ?> getName1(); ?> getLastActive()->format('Y-m-d H:i:s'); ?> getCreatedAt()->format('Y-m-d H:i:s'); ?> diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index f85fd8a..dc8eb43 100644 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -26,7 +26,7 @@ echo $this->getData('nav')->render(); ?>
-
+
-
+
@@ -52,7 +52,7 @@ echo $this->getData('nav')->render(); ?>
-
+
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php index 9010229..a292fd5 100644 --- a/Theme/Backend/groups-create.tpl.php +++ b/Theme/Backend/groups-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -25,8 +25,12 @@ echo $this->getData('nav')->render(); ?>
+
+
-
+
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php index 61b6bf5..34fa9a3 100644 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php index 81011e0..b51fba7 100644 --- a/Theme/Backend/groups-single.tpl.php +++ b/Theme/Backend/groups-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index 4be3da7..3dd862e 100644 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php index 3cdd877..3b7205f 100644 --- a/Theme/Backend/modules-single.tpl.php +++ b/Theme/Backend/modules-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -55,7 +55,7 @@ $id = $this->request->getData('id') ?? 1; - +
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index f6e74d9..454be2e 100644 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -27,72 +27,245 @@ $_thousands_sep = $this->getData('thousands_sep') ?? ''; $_password = $this->getData('password') ?? ''; $_country = $this->getData('country') ?? ''; -$countries = \phpOMS\Localization\ISO3166EnumArray::getConstants(); +$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); $timezones = \phpOMS\Localization\TimeZoneEnumArray::getConstants(); $timeformats = \phpOMS\Localization\ISO8601EnumArray::getConstants(); -$languages = \phpOMS\Localization\ISO639EnumArray::getConstants(); -$currencies = \phpOMS\Localization\ISO4217EnumArray::getConstants(); - +$languages = \phpOMS\Localization\ISO639Enum::getConstants(); +$currencies = \phpOMS\Localization\ISO4217Enum::getConstants(); ?> -
-

getText('Settings') ?>

-
- - - -
-
-
-
-
-
- -
-
-
-

getText('Localization') ?>

-
-
- - -
-
-
-
-
-
-
-
-
-
-

getText('Numberformat') ?>

-
- -
- -
-
-
+
+
+
    +
    • +
    • +
-
+
+ +
+
+

getText('Settings') ?>

+
+
+ + +
+
+
+
+
+
+
+
+
+
+ +
+
+

getText('Localization') ?>

+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+

getText('Numeric') ?>

+
+
+ +
+
+

getText('Numberformat') ?>

+
+ +
+ +
+
+
+
+ +
+

getText('Weight') ?>

+
+
+ + + + + + + + + + + + +
+
+
+
+ +
+

getText('Speed') ?>

+
+
+ + + + + + + + + + + + + + +
+
+
+
+ +
+

getText('Length') ?>

+
+
+ + + + + + + + + + + + + + +
+
+
+
+ +
+

getText('Area') ?>

+
+
+ + + + + + + + + + + + +
+
+
+
+ +
+

getText('Volume') ?>

+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php index 6526cf8..ddb3c2b 100644 --- a/Theme/backend/Lang/Navigation.en.lang.php +++ b/Theme/backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index 258fcb3..9418907 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -21,6 +21,7 @@ return ['Admin' => [ 'Activity' => 'Activity', 'Available' => 'Available', 'All' => 'All', + 'Area' => 'Area', 'Banned' => 'Banned', 'Cache' => 'Cache', 'Children' => 'Children', @@ -34,19 +35,28 @@ return ['Admin' => [ 'Deactivate' => 'Deactivate', 'Email' => 'Email', 'EmailAdmin' => 'Email Admin', + 'Fast' => 'Fast', 'Features' => 'Features', 'File' => 'File', + 'General' => 'General', + 'Glass' => 'Glass', 'Group' => 'Group', 'Groups' => 'Groups', + 'Heavy' => 'Heavy', 'Inactive' => 'Inactive', 'Install' => 'Install', 'Installed' => 'Installed', 'LAddress' => 'Local Address', 'Language' => 'Language', + 'Large' => 'Large', + 'Length' => 'Length', + 'Light' => 'Light', 'Localization' => 'Localization', + 'Long' => 'Long', 'Loginname' => 'Login Name', 'Lowercase' => 'Lowercase', 'Maintenance' => 'Maintenance', + 'Medium' => 'Medium', 'Member' => 'Member', 'Members' => 'Members', 'Memcache' => 'Memcache', @@ -74,13 +84,21 @@ return ['Admin' => [ 'RAddress' => 'Remote Address', 'ReCache' => 'Re-Cache', 'Running' => 'Running', + 'Short' => 'Short', + 'Sea' => 'Sea', 'Settings' => 'Settings', 'SettingsGeneral' => 'Settings - General', 'Single' => 'Single', + 'Slow' => 'Slow', + 'Small' => 'Small', + 'Speed' => 'Speed', 'Specialchar' => 'Special character', 'Status' => 'Status', 'Total' => 'Total', 'Release' => 'Release', + 'Tablespoon' => 'Tablespoon', + 'Teaspoon' => 'Teaspoon', + 'Temperature' => 'Temperature', 'Theme' => 'Theme', 'ThousandsSeparator' => 'Thousands Separator', 'Time' => 'Time', @@ -93,8 +111,18 @@ return ['Admin' => [ 'Uppercase' => 'Uppercase', 'Username' => 'Username', 'Version' => 'Version', + 'VeryFast' => 'Very Fast', + 'VeryHeavy' => 'Very Heavy', + 'VeryLarge' => 'Very Large', + 'VeryLight' => 'Very Light', + 'VeryLong' => 'Very Long', + 'VerySlow' => 'Very Slow', + 'VeryShort' => 'Very Short', + 'VerySmall' => 'Very Small', + 'Volume' => 'Volume', 'Warnings' => 'Warnings', 'Website' => 'Website', + 'Weight' => 'Weight', 'i:loc' => 'IP address or URL for remote access.', 'i:mail' => 'Email address.', 'i:oname' => 'Organization name.', diff --git a/Theme/backend/accounts-list.tpl.php b/Theme/backend/accounts-list.tpl.php index 72e640e..6b72a21 100644 --- a/Theme/backend/accounts-list.tpl.php +++ b/Theme/backend/accounts-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -44,8 +44,8 @@ echo $this->getData('nav')->render(); getData('list:elements') as $key => $value) : $c++; $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/account/settings?id=' . $value->getId()); ?> - getStatus(); ?> getId(); ?> + getStatus(); ?> getName1(); ?> getLastActive()->format('Y-m-d H:i:s'); ?> getCreatedAt()->format('Y-m-d H:i:s'); ?> diff --git a/Theme/backend/accounts-single.tpl.php b/Theme/backend/accounts-single.tpl.php index f85fd8a..dc8eb43 100644 --- a/Theme/backend/accounts-single.tpl.php +++ b/Theme/backend/accounts-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -26,7 +26,7 @@ echo $this->getData('nav')->render(); ?>
-
+
-
+
@@ -52,7 +52,7 @@ echo $this->getData('nav')->render(); ?>
-
+
diff --git a/Theme/backend/groups-single.tpl.php b/Theme/backend/groups-single.tpl.php index 81011e0..b51fba7 100644 --- a/Theme/backend/groups-single.tpl.php +++ b/Theme/backend/groups-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/modules-single.tpl.php b/Theme/backend/modules-single.tpl.php index 3cdd877..3b7205f 100644 --- a/Theme/backend/modules-single.tpl.php +++ b/Theme/backend/modules-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -55,7 +55,7 @@ $id = $this->request->getData('id') ?? 1; - +