spacefreak/user_sql
1
0
Fork 0
Code Pull Requests Activity

GID group column

Browse Source
This commit is contained in:
Marcin Łojewski
2020-04-13 13:08:16 +02:00
parent e607f5c5d3
commit 7e9af00145
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- System wide values option - System wide values option
- Allow email login option - Allow email login option
- UID user table column - UID user table column
- GID user table column
## [4.4.1] - 2020-02-02 ## [4.4.1] - 2020-02-02
### Fixed ### Fixed

30
README.md
View File

@@ -69,7 +69,7 @@ The definition of user table. The table containing user accounts.
Name | Description | Details Name | Description | Details
--- | --- | --- --- | --- | ---
**Table name** | The table name. | Mandatory for user backend. **Table name** | The table name. | Mandatory for user backend.
**UID** | UID column. | Mandatory for user backend. **UID** | User ID column. | Mandatory for user backend.
**Username** | Username column. | Optional. **Username** | Username column. | Optional.
**Email** | E-mail column. | Mandatory for *Email sync* option. **Email** | E-mail column. | Mandatory for *Email sync* option.
**Quota** | Quota column. | Mandatory for *Quota sync* option. **Quota** | Quota column. | Mandatory for *Quota sync* option.
@@ -90,9 +90,9 @@ The group definitions table.
Name | Description | Details Name | Description | Details
--- | --- | --- --- | --- | ---
**Table name** | The table name. | Mandatory for group backend. **Table name** | The table name. | Mandatory for group backend.
**Is admin** | Flag indicating if its the admin group | Optional. **GID** | Group ID column. | Mandatory for group backend.
**Display name** | Display name column. | Optional. **Display name** | Display name column. | Optional.
**Group name** | Group name column. | Mandatory for group backend. **Is admin** | Flag indicating if its the admin group | Optional.
#### User group table #### User group table
@@ -101,8 +101,8 @@ Associative table which maps users to groups.
Name | Description | Details Name | Description | Details
--- | --- | --- --- | --- | ---
**Table name** | The table name. | Mandatory for group backend. **Table name** | The table name. | Mandatory for group backend.
**Username** | Username column. | Mandatory for group backend. **UID** | User ID column. | Mandatory for group backend.
**Group name** | Group name column. | Mandatory for group backend. **GID** | Group ID column. | Mandatory for group backend.
## Integrations ## Integrations
@@ -135,20 +135,20 @@ CREATE TABLE sql_user
CREATE TABLE sql_group CREATE TABLE sql_group
( (
name VARCHAR(16) PRIMARY KEY, gid INT PRIMARY KEY AUTO_INCREMENT,
display_name TEXT NULL, name VARCHAR(16) NOT NULL UNIQUE,
admin BOOLEAN NOT NULL DEFAULT FALSE admin BOOLEAN NOT NULL DEFAULT FALSE
); );
CREATE TABLE sql_user_group CREATE TABLE sql_user_group
( (
username VARCHAR(16) NOT NULL, uid INT NOT NULL,
group_name VARCHAR(16) NOT NULL, gid INT NOT NULL,
PRIMARY KEY (username, group_name), PRIMARY KEY (uid, gid),
FOREIGN KEY (username) REFERENCES sql_user (username), FOREIGN KEY (uid) REFERENCES sql_user (uid),
FOREIGN KEY (group_name) REFERENCES sql_group (name), FOREIGN KEY (gid) REFERENCES sql_group (gid),
INDEX sql_user_group_username_idx (username), INDEX user_group_username_idx (uid),
INDEX sql_user_group_group_name_idx (group_name) INDEX user_group_group_name_idx (gid)
); );
``` ```

2
lib/Query/DataQuery.php
View File

@@ -115,7 +115,7 @@ class DataQuery
} }
$this->logger->debug( $this->logger->debug(
"Executing query:" . $query . ", " . implode(",", $params), "Executing query: " . $query . ", " . implode(",", $params),
["app" => $this->appName] ["app" => $this->appName]
); );

8
templates/admin.php
View File

@@ -179,9 +179,9 @@ function print_select_options(
print_text_input($l, "db-table-group", "Table name", $_["db.table.group"]); ?> print_text_input($l, "db-table-group", "Table name", $_["db.table.group"]); ?>
<h3><?php p($l->t("Columns")); ?></h3> <h3><?php p($l->t("Columns")); ?></h3>
<?php <?php
print_text_input($l, "db-table-group-column-admin", "Is admin", $_["db.table.group.column.admin"]); print_text_input($l, "db-table-group-column-gid", "GID", $_["db.table.group.column.gid"]);
print_text_input($l, "db-table-group-column-name", "Display name", $_["db.table.group.column.name"]); print_text_input($l, "db-table-group-column-name", "Display name", $_["db.table.group.column.name"]);
print_text_input($l, "db-table-group-column-gid", "Group name", $_["db.table.group.column.gid"]); ?> print_text_input($l, "db-table-group-column-admin", "Is admin", $_["db.table.group.column.admin"]); ?>
</fieldset> </fieldset>
</div> </div>
<div class="section"> <div class="section">
@@ -191,8 +191,8 @@ function print_select_options(
print_text_input($l, "db-table-user_group", "Table name", $_["db.table.user_group"]); ?> print_text_input($l, "db-table-user_group", "Table name", $_["db.table.user_group"]); ?>
<h3><?php p($l->t("Columns")); ?></h3> <h3><?php p($l->t("Columns")); ?></h3>
<?php <?php
print_text_input($l, "db-table-user_group-column-uid", "Username", $_["db.table.user_group.column.uid"]); print_text_input($l, "db-table-user_group-column-uid", "UID", $_["db.table.user_group.column.uid"]);
print_text_input($l, "db-table-user_group-column-gid", "Group name", $_["db.table.user_group.column.gid"]); ?> print_text_input($l, "db-table-user_group-column-gid", "GID", $_["db.table.user_group.column.gid"]); ?>
</fieldset> </fieldset>
</div> </div>
</div> </div>