diff --git a/database/security.go b/database/security.go index 3398305..34ac39e 100644 --- a/database/security.go +++ b/database/security.go @@ -31,13 +31,13 @@ type securityScope struct { // scopelist defines the boundaries of the known scopes. There are 16 in all, most are unused. var scopelist = []securityScope{ - {0, 1999, 63000, 64999}, // global scope - {2000, 3999, 61000, 62999}, // community scope - {4000, 5999, 59000, 60999}, // conference scope - {6000, 7999, 57000, 58999}, + {0, 1999, 63000, 64999}, // global scope + {2000, 3999, 61000, 62999}, + {4000, 5999, 59000, 60999}, + {6000, 7999, 57000, 58999}, // community scope {8000, 9999, 55000, 56999}, {10000, 11999, 53000, 54999}, - {12000, 13999, 51000, 52999}, + {12000, 13999, 51000, 52999}, // conference scope {14000, 15999, 49000, 50999}, {16000, 17999, 47000, 48999}, {18000, 19999, 45000, 46999}, diff --git a/database/securitydefs.yaml b/database/securitydefs.yaml index e68934b..7daa19c 100644 --- a/database/securitydefs.yaml +++ b/database/securitydefs.yaml @@ -10,9 +10,9 @@ scopes: - name: Global index: 0 - name: Community - index: 1 + index: 3 - name: Conference - index: 2 + index: 6 roles: - name: "NotInList" display: "Not In List" diff --git a/setup/database.sql b/setup/database.sql index 7696a42..cf617c6 100644 --- a/setup/database.sql +++ b/setup/database.sql @@ -1009,7 +1009,7 @@ INSERT INTO commmember (commid, uid, granted_lvl, locked) # (CONFID = 2) INSERT INTO confs (confid, createdate, read_lvl, post_lvl, create_lvl, hide_lvl, nuke_lvl, change_lvl, delete_lvl, top_topic, name, descr) - VALUES (2, '2000-12-01 00:00:00', 2500, 2500, 2500, 60500, 60500, 60500, 61000, 0, 'General Discussion', + VALUES (2, '2000-12-01 00:00:00', 6500, 6500, 6500, 52500, 52500, 52500, 58000, 0, 'General Discussion', 'Your place for general discussion about the system and general topics.'); INSERT INTO commtoconf (commid, confid, sequence) VALUES (2, 2, 10); INSERT INTO confalias (confid, alias) VALUES (2, 'General'); @@ -1022,7 +1022,7 @@ INSERT INTO confmember (confid, uid, granted_lvl) VALUES (2, 2, 52500); # (CONFID = 3) INSERT INTO confs (confid, createdate, read_lvl, post_lvl, create_lvl, hide_lvl, nuke_lvl, change_lvl, delete_lvl, top_topic, name, descr) - VALUES (3, '2000-12-01 00:00:00', 2500, 2500, 2500, 60500, 60500, 60500, 61000, 0, 'Test Postings', + VALUES (3, '2000-12-01 00:00:00', 6500, 6500, 6500, 52500, 52500, 52500, 58000, 0, 'Test Postings', 'Use this conference to test the conferencing system.'); INSERT INTO commtoconf (commid, confid, sequence) VALUES (2, 3, 20); INSERT INTO confalias (confid, alias) VALUES (3, 'Test');