Replace "group" with "circle" in database comments

- Table names "group" and "group_member" are unchanged

diff --git a/database.sql b/database.sql
index 4e674d63f4ba5c346aa76ac4351d64be2a663a79..f618960339bb56179f69cd7974413edda1fdc937 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -252,9 +252,9 @@ CREATE TABLE IF NOT EXISTS `permissionset` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id of this permission set',
        `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
-       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
        `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-       `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+       `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
         PRIMARY KEY(`id`),
         INDEX `uid_allow_cid_allow_gid_deny_cid_deny_gid` (`uid`,`allow_cid`(50),`allow_gid`(30),`deny_cid`(50),`deny_gid`(30)),
        FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
@@ -457,9 +457,9 @@ CREATE TABLE IF NOT EXISTS `attach` (
        `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time',
        `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edit time',
        `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>',
-       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
        `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-       `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+       `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
        `backend-class` tinytext COMMENT 'Storage backend class',
        `backend-ref` text COMMENT 'Storage backend data reference',
         PRIMARY KEY(`id`),
@@ -662,9 +662,9 @@ CREATE TABLE IF NOT EXISTS `event` (
        `nofinish` boolean NOT NULL DEFAULT '0' COMMENT 'if event does have no end this is 1',
        `ignore` boolean NOT NULL DEFAULT '0' COMMENT '0 or 1',
        `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
-       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
        `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-       `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+       `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
         PRIMARY KEY(`id`),
         INDEX `uid_start` (`uid`,`start`),
         INDEX `cid` (`cid`),
@@ -716,29 +716,29 @@ CREATE TABLE IF NOT EXISTS `group` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
        `visible` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the member list is not private',
-       `deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the group has been deleted',
+       `deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the circle has been deleted',
        `cid` int unsigned COMMENT 'Contact id of forum. When this field is filled then the members are synced automatically.',
-       `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of group',
+       `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of circle',
         PRIMARY KEY(`id`),
         INDEX `uid` (`uid`),
         INDEX `cid` (`cid`),
        FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
        FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, group info';
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy circles, circle info';
 
 --
 -- TABLE group_member
 --
 CREATE TABLE IF NOT EXISTS `group_member` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
-       `gid` int unsigned NOT NULL DEFAULT 0 COMMENT 'groups.id of the associated group',
-       `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id of the member assigned to the associated group',
+       `gid` int unsigned NOT NULL DEFAULT 0 COMMENT 'group.id of the associated circle',
+       `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id of the member assigned to the associated circle',
         PRIMARY KEY(`id`),
         INDEX `contactid` (`contact-id`),
         UNIQUE INDEX `gid_contactid` (`gid`,`contact-id`),
        FOREIGN KEY (`gid`) REFERENCES `group` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
        FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, member info';
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy circles, member info';
 
 --
 -- TABLE gserver-tag
@@ -1114,9 +1114,9 @@ CREATE TABLE IF NOT EXISTS `photo` (
        `scale` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
        `profile` boolean NOT NULL DEFAULT '0' COMMENT '',
        `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
-       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+       `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
        `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-       `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+       `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
        `accessible` boolean NOT NULL DEFAULT '0' COMMENT 'Make photo publicly accessible, ignoring permissions',
        `backend-class` tinytext COMMENT 'Storage backend class',
        `backend-ref` text COMMENT 'Storage backend data reference',

diff --git a/doc/database.md b/doc/database.md
index 461c1c2d9bc19298b3c13298bbcca3f4c73de290..3c03d31b1fe1cea82c7c9e3d89bb7bc1894795bb 100644 (file)
--- a/doc/database.md
+++ b/doc/database.md
@@ -30,8 +30,8 @@ Database Tables
 | [fetch-entry](help/database/db_fetch-entry) |  |
 | [fetched-activity](help/database/db_fetched-activity) | Id of fetched activities |
 | [fsuggest](help/database/db_fsuggest) | friend suggestion stuff |
-| [group](help/database/db_group) | privacy groups, group info |
-| [group_member](help/database/db_group_member) | privacy groups, member info |
+| [group](help/database/db_group) | privacy circles, circle info |
+| [group_member](help/database/db_group_member) | privacy circles, member info |
 | [gserver](help/database/db_gserver) | Global servers |
 | [gserver-tag](help/database/db_gserver-tag) | Tags that the server has subscribed |
 | [hook](help/database/db_hook) | addon hook registry |

diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 76d8e01f2094a64c1fc38eac7b39cefcfe82195c..38ce83a7c5c0e2aa118f666e7ec0ba8ca337e0de 100644 (file)
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -18,9 +18,9 @@ Fields
 | created       | creation time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | edited        | last edit time                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | allow_cid     | Access Control - list of allowed contact.id '<19><78> | mediumtext         | YES  |     | NULL                |                |
-| allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES  |     | NULL                |                |
+| allow_gid     | Access Control - list of allowed circles              | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES  |     | NULL                |                |
-| deny_gid      | Access Control - list of denied groups                | mediumtext         | YES  |     | NULL                |                |
+| deny_gid      | Access Control - list of denied circles               | mediumtext         | YES  |     | NULL                |                |
 | backend-class | Storage backend class                                 | tinytext           | YES  |     | NULL                |                |
 | backend-ref   | Storage backend data reference                        | text               | YES  |     | NULL                |                |
 

diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index 499e550c443cda1d0fc94266243bc2f7d7cd3afd..c7daea987365edc1bef0baf7750edfb6544bb2c4 100644 (file)
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -25,9 +25,9 @@ Fields
 | nofinish  | if event does have no end this is 1                        | boolean            | NO   |     | 0                   |                |
 | ignore    | 0 or 1                                                     | boolean            | NO   |     | 0                   |                |
 | allow_cid | Access Control - list of allowed contact.id '<19><78>'     | mediumtext         | YES  |     | NULL                |                |
-| allow_gid | Access Control - list of allowed groups                    | mediumtext         | YES  |     | NULL                |                |
+| allow_gid | Access Control - list of allowed circles                   | mediumtext         | YES  |     | NULL                |                |
 | deny_cid  | Access Control - list of denied contact.id                 | mediumtext         | YES  |     | NULL                |                |
-| deny_gid  | Access Control - list of denied groups                     | mediumtext         | YES  |     | NULL                |                |
+| deny_gid  | Access Control - list of denied circles                    | mediumtext         | YES  |     | NULL                |                |
 
 Indexes
 ------------

diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index ad7fa4a3dde4dab728affad6c133a15b9c587c79..e94cf53ebfca7aad48bffddf9517127b8de3dd2f 100644 (file)
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -1,7 +1,7 @@
 Table group
 ===========
 
-privacy groups, group info
+privacy circles, circle info
 
 Fields
 ------
@@ -11,9 +11,9 @@ Fields
 | id      | sequential ID                                                                             | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid     | Owner User id                                                                             | mediumint unsigned | NO   |     | 0       |                |
 | visible | 1 indicates the member list is not private                                                | boolean            | NO   |     | 0       |                |
-| deleted | 1 indicates the group has been deleted                                                    | boolean            | NO   |     | 0       |                |
+| deleted | 1 indicates the circle has been deleted                                                   | boolean            | NO   |     | 0       |                |
 | cid     | Contact id of forum. When this field is filled then the members are synced automatically. | int unsigned       | YES  |     | NULL    |                |
-| name    | human readable name of group                                                              | varchar(255)       | NO   |     |         |                |
+| name    | human readable name of circle                                                             | varchar(255)       | NO   |     |         |                |
 
 Indexes
 ------------

diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index a544f3b0ec37504559ea2d3bda82cd2d5fd9ea1d..efe83e4aed4690b72db6f69c908e623813977dd0 100644 (file)
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -1,16 +1,16 @@
 Table group_member
 ===========
 
-privacy groups, member info
+privacy circles, member info
 
 Fields
 ------
 
-| Field      | Description                                               | Type         | Null | Key | Default | Extra          |
-| ---------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
-| id         | sequential ID                                             | int unsigned | NO   | PRI | NULL    | auto_increment |
-| gid        | groups.id of the associated group                         | int unsigned | NO   |     | 0       |                |
-| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO   |     | 0       |                |
+| Field      | Description                                                | Type         | Null | Key | Default | Extra          |
+| ---------- | ---------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
+| id         | sequential ID                                              | int unsigned | NO   | PRI | NULL    | auto_increment |
+| gid        | group.id of the associated circle                          | int unsigned | NO   |     | 0       |                |
+| contact-id | contact.id of the member assigned to the associated circle | int unsigned | NO   |     | 0       |                |
 
 Indexes
 ------------

diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 38c6fe8f3150fcae798711820d51aff00ada947a..82059b2f3d623268783dd8a47630506bebf4a4c1 100644 (file)
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -11,9 +11,9 @@ Fields
 | id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid       | Owner id of this permission set                        | mediumint unsigned | NO   |     | 0       |                |
 | allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL    |                |
-| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL    |                |
+| allow_gid | Access Control - list of allowed circles               | mediumtext         | YES  |     | NULL    |                |
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |
-| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |
+| deny_gid  | Access Control - list of denied circles                | mediumtext         | YES  |     | NULL    |                |
 
 Indexes
 ------------

diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index ed417f61470a7b2e2996c034637ca5fc813488b1..c41e913ca373d42f00233ca1860d38c13aa2a4d4 100644 (file)
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -30,9 +30,9 @@ Fields
 | scale         |                                                                     | tinyint unsigned   | NO   |     | 0                   |                |
 | profile       |                                                                     | boolean            | NO   |     | 0                   |                |
 | allow_cid     | Access Control - list of allowed contact.id '<19><78>'              | mediumtext         | YES  |     | NULL                |                |
-| allow_gid     | Access Control - list of allowed groups                             | mediumtext         | YES  |     | NULL                |                |
+| allow_gid     | Access Control - list of allowed circles                            | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id                          | mediumtext         | YES  |     | NULL                |                |
-| deny_gid      | Access Control - list of denied groups                              | mediumtext         | YES  |     | NULL                |                |
+| deny_gid      | Access Control - list of denied circles                             | mediumtext         | YES  |     | NULL                |                |
 | accessible    | Make photo publicly accessible, ignoring permissions                | boolean            | NO   |     | 0                   |                |
 | backend-class | Storage backend class                                               | tinytext           | YES  |     | NULL                |                |
 | backend-ref   | Storage backend data reference                                      | text               | YES  |     | NULL                |                |

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index ffb66d9701343eff98462e73aa28b55333bdf3a6..4c4e3cdbe794f0db893ee5a26670c21eefed0742 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -311,9 +311,9 @@ return [
                        "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
                        "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner id of this permission set"],
                        "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
-                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
                        "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
-                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
                ],
                "indexes" => [
                        "PRIMARY" => ["id"],
@@ -513,9 +513,9 @@ return [
                        "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time"],
                        "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "last edit time"],
                        "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>"],
-                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
                        "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
-                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
                        "backend-class" => ["type" => "tinytext", "comment" => "Storage backend class"],
                        "backend-ref" => ["type" => "text", "comment" => "Storage backend data reference"],
                ],
@@ -715,9 +715,9 @@ return [
                        "nofinish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if event does have no end this is 1"],
                        "ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "0 or 1"],
                        "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
-                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
                        "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
-                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
                ],
                "indexes" => [
                        "PRIMARY" => ["id"],
@@ -760,14 +760,14 @@ return [
                ]
        ],
        "group" => [
-               "comment" => "privacy groups, group info",
+               "comment" => "privacy circles, circle info",
                "fields" => [
                        "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
                        "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"],
                        "visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the member list is not private"],
-                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the group has been deleted"],
+                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the circle has been deleted"],
                        "cid" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Contact id of forum. When this field is filled then the members are synced automatically."],
-                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of group"],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of circle"],
                ],
                "indexes" => [
                        "PRIMARY" => ["id"],
@@ -776,11 +776,11 @@ return [
                ]
        ],
        "group_member" => [
-               "comment" => "privacy groups, member info",
+               "comment" => "privacy circles, member info",
                "fields" => [
                        "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
-                       "gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["group" => "id"], "comment" => "groups.id of the associated group"],
-                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated group"],
+                       "gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["group" => "id"], "comment" => "group.id of the associated circle"],
+                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated circle"],
                ],
                "indexes" => [
                        "PRIMARY" => ["id"],
@@ -1150,9 +1150,9 @@ return [
                        "scale" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
                        "profile" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
                        "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
-                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
                        "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
-                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
                        "accessible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Make photo publicly accessible, ignoring permissions"],
                        "backend-class" => ["type" => "tinytext", "comment" => "Storage backend class"],
                        "backend-ref" => ["type" => "text", "comment" => "Storage backend data reference"],