diff --git a/database.sql b/database.sql index d30ad46d7e..b26a9d57cc 100644 --- a/database.sql +++ b/database.sql @@ -970,7 +970,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `title` varchar(255) NOT NULL DEFAULT '' COMMENT '', `desc` text COMMENT '', `album` varchar(255) NOT NULL DEFAULT '' COMMENT 'The name of the album to which the photo belongs', - `photo-type` tinyint unsigned COMMENT 'User avatar, contact avatar or default', + `photo-type` tinyint unsigned COMMENT 'User avatar, user banner, contact avatar, contact banner or default', `filename` varchar(255) NOT NULL DEFAULT '' COMMENT '', `type` varchar(30) NOT NULL DEFAULT 'image/jpeg', `height` smallint unsigned NOT NULL DEFAULT 0 COMMENT '', diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md index 8f1905bc7d..a93cf65f91 100644 --- a/doc/database/db_photo.md +++ b/doc/database/db_photo.md @@ -6,36 +6,36 @@ photo storage Fields ------ -| Field | Description | Type | Null | Key | Default | Extra | -| ------------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- | -| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| uid | Owner User id | mediumint unsigned | NO | | 0 | | -| contact-id | contact.id | int unsigned | NO | | 0 | | -| guid | A unique identifier for this photo | char(16) | NO | | | | -| resource-id | | char(32) | NO | | | | -| hash | hash value of the photo | char(32) | YES | | NULL | | -| created | creation date | datetime | NO | | 0001-01-01 00:00:00 | | -| edited | last edited date | datetime | NO | | 0001-01-01 00:00:00 | | -| title | | varchar(255) | NO | | | | -| desc | | text | YES | | NULL | | -| album | The name of the album to which the photo belongs | varchar(255) | NO | | | | -| photo-type | User avatar, contact avatar or default | tinyint unsigned | YES | | NULL | | -| filename | | varchar(255) | NO | | | | -| type | | varchar(30) | NO | | image/jpeg | | -| height | | smallint unsigned | NO | | 0 | | -| width | | smallint unsigned | NO | | 0 | | -| datasize | | int unsigned | NO | | 0 | | -| data | | mediumblob | NO | | NULL | | -| 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 | | -| deny_cid | Access Control - list of denied contact.id | mediumtext | YES | | NULL | | -| deny_gid | Access Control - list of denied groups | 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 | | -| updated | | datetime | NO | | 0001-01-01 00:00:00 | | +| Field | Description | Type | Null | Key | Default | Extra | +| ------------- | ------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- | +| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | +| uid | Owner User id | mediumint unsigned | NO | | 0 | | +| contact-id | contact.id | int unsigned | NO | | 0 | | +| guid | A unique identifier for this photo | char(16) | NO | | | | +| resource-id | | char(32) | NO | | | | +| hash | hash value of the photo | char(32) | YES | | NULL | | +| created | creation date | datetime | NO | | 0001-01-01 00:00:00 | | +| edited | last edited date | datetime | NO | | 0001-01-01 00:00:00 | | +| title | | varchar(255) | NO | | | | +| desc | | text | YES | | NULL | | +| album | The name of the album to which the photo belongs | varchar(255) | NO | | | | +| photo-type | User avatar, user banner, contact avatar, contact banner or default | tinyint unsigned | YES | | NULL | | +| filename | | varchar(255) | NO | | | | +| type | | varchar(30) | NO | | image/jpeg | | +| height | | smallint unsigned | NO | | 0 | | +| width | | smallint unsigned | NO | | 0 | | +| datasize | | int unsigned | NO | | 0 | | +| data | | mediumblob | NO | | NULL | | +| 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 | | +| deny_cid | Access Control - list of denied contact.id | mediumtext | YES | | NULL | | +| deny_gid | Access Control - list of denied groups | 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 | | +| updated | | datetime | NO | | 0001-01-01 00:00:00 | | Indexes ------------ diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 454d7c54e4..e333c136f4 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -1023,7 +1023,7 @@ return [ "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "desc" => ["type" => "text", "comment" => ""], "album" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "The name of the album to which the photo belongs"], - "photo-type" => ["type" => "tinyint unsigned", "comment" => "User avatar, contact avatar or default"], + "photo-type" => ["type" => "tinyint unsigned", "comment" => "User avatar, user banner, contact avatar, contact banner or default"], "filename" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "type" => ["type" => "varchar(30)", "not null" => "1", "default" => "image/jpeg"], "height" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],