diff --git a/api.php b/api.php index dbfa58e..6cd4971 100644 --- a/api.php +++ b/api.php @@ -318,6 +318,8 @@ switch ($VARS['action']) { } if ($VARS['get'] == "username") { $users = $database->select('assigned_groups', ['[>]accounts' => ['uid' => 'uid']], 'username', ['groupid' => $groupid]); + } else if ($VARS['get'] == "detail") { + $users = $database->select('assigned_groups', ['[>]accounts' => ['uid' => 'uid']], ['username', 'realname (name)', 'accounts.uid'], ['groupid' => $groupid]); } else { $users = $database->select('assigned_groups', 'uid', ['groupid' => $groupid]); } diff --git a/composer.lock b/composer.lock index e291a3b..ef5c039 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a1ab1292625031f57ba3cf577b355128", + "hash": "4a910fad7c8983cdfa5ec4195ab35357", "content-hash": "79bc6f74e009aaacddb13903f6b88bed", "packages": [ { "name": "beberlei/assert", - "version": "v2.7.11", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/beberlei/assert.git", - "reference": "53991547d6f0b8c81354fb2d098dcb71e81678cb" + "reference": "fd8dc8f6de4645ccf4d1a0b38a6b8fdaf2e8b337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/53991547d6f0b8c81354fb2d098dcb71e81678cb", - "reference": "53991547d6f0b8c81354fb2d098dcb71e81678cb", + "url": "https://api.github.com/repos/beberlei/assert/zipball/fd8dc8f6de4645ccf4d1a0b38a6b8fdaf2e8b337", + "reference": "fd8dc8f6de4645ccf4d1a0b38a6b8fdaf2e8b337", "shasum": "" }, "require": { @@ -60,20 +60,20 @@ "assertion", "validation" ], - "time": "2017-11-13 18:35:09" + "time": "2017-11-30 13:25:15" }, { "name": "catfan/medoo", - "version": "v1.4.5", + "version": "v1.5.3", "source": { "type": "git", "url": "https://github.com/catfan/Medoo.git", - "reference": "8ee8ae1c4df0fee3822a01333eab88893e548fcc" + "reference": "1aa25a4001e0cfb739ba2996f00f4a3d2a7fdf07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/catfan/Medoo/zipball/8ee8ae1c4df0fee3822a01333eab88893e548fcc", - "reference": "8ee8ae1c4df0fee3822a01333eab88893e548fcc", + "url": "https://api.github.com/repos/catfan/Medoo/zipball/1aa25a4001e0cfb739ba2996f00f4a3d2a7fdf07", + "reference": "1aa25a4001e0cfb739ba2996f00f4a3d2a7fdf07", "shasum": "" }, "require": { @@ -87,7 +87,7 @@ "ext-pdo_oci8": "For Oracle version 8 database", "ext-pdo_pqsql": "For PostgreSQL database", "ext-pdo_sqlite": "For SQLite database", - "ext-pdo_sqlsrv": "For MSSQL database on Windows platform" + "ext-pdo_sqlsrv": "For MSSQL database" }, "type": "framework", "autoload": { @@ -119,7 +119,7 @@ "sql", "sqlite" ], - "time": "2017-06-24 14:43:07" + "time": "2017-12-25 17:02:41" }, { "name": "christian-riesen/base32", @@ -861,30 +861,30 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.3.13", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9" + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/271d8c27c3ec5ecee6e2ac06016232e249d638d9", - "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d4face19ed8002eec8280bc1c5ec18130472bf43", + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -893,7 +893,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -920,20 +920,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-11-05 15:47:03" + "time": "2017-12-14 19:48:22" }, { "name": "symfony/options-resolver", - "version": "v3.3.13", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "623d9c210a137205f7e6e98166105625402cbb2f" + "reference": "4576693efc58c022c3fe9f144aa61d204c86ad2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/623d9c210a137205f7e6e98166105625402cbb2f", - "reference": "623d9c210a137205f7e6e98166105625402cbb2f", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4576693efc58c022c3fe9f144aa61d204c86ad2c", + "reference": "4576693efc58c022c3fe9f144aa61d204c86ad2c", "shasum": "" }, "require": { @@ -942,7 +942,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -974,7 +974,7 @@ "configuration", "options" ], - "time": "2017-11-05 15:47:03" + "time": "2017-12-14 19:40:10" }, { "name": "symfony/polyfill-mbstring", @@ -1145,23 +1145,26 @@ }, { "name": "symfony/yaml", - "version": "v3.3.13", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "0938408c4faa518d95230deabb5f595bf0de31b9" + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0938408c4faa518d95230deabb5f595bf0de31b9", - "reference": "0938408c4faa518d95230deabb5f595bf0de31b9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a5ee52d155f06ad23b19eb63c31228ff56ad1116", + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" + }, + "conflict": { + "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1169,7 +1172,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1196,7 +1199,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-11-10 18:26:04" + "time": "2017-12-12 08:41:51" } ], "packages-dev": [], diff --git a/database.mwb b/database.mwb index dbcce56..d4ff4b8 100644 Binary files a/database.mwb and b/database.mwb differ diff --git a/database_upgrade/1.0.1_1.1.sql b/database_upgrade/1.0.1_1.1.sql index 3c199f5..678fd36 100644 --- a/database_upgrade/1.0.1_1.1.sql +++ b/database_upgrade/1.0.1_1.1.sql @@ -11,7 +11,9 @@ CREATE TABLE IF NOT EXISTS `onetimekeys` ( ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8 +DEFAULT CHARACTER SET = utf8; +SET FOREIGN_KEY_CHECKS = 0; ALTER TABLE `groups` -CHANGE COLUMN `groupid` `groupid` INT(11) NOT NULL AUTO_INCREMENT \ No newline at end of file +CHANGE COLUMN `groupid` `groupid` INT(11) NOT NULL AUTO_INCREMENT; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file