comparison dbdefs.inc.php @ 1092:95b74632cfe2

Rename votekeys table to userkeys, and all related variables and settings.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 26 Jan 2017 13:38:19 +0200
parents 48e16e856646
children 563fc90de965
comparison
equal deleted inserted replaced
1091:c4b93729269d 1092:95b74632cfe2
1 <?php 1 <?php
2 2
3 $dbVersion = 30; 3 $dbVersion = 31;
4 4
5 // 5 //
6 // Site settings and defaults we put in 6 // Site settings and defaults we put in
7 // 7 //
8 $siteSettingsGroups = array( 8 $siteSettingsGroups = array(
286 array("evalue" , "INT", "DEFAULT 0"), 286 array("evalue" , "INT", "DEFAULT 0"),
287 array("file_id" , "INT", "DEFAULT 0"), // uploaded file id from "files" table 287 array("file_id" , "INT", "DEFAULT 0"), // uploaded file id from "files" table
288 array("preview_id" , "INT", "DEFAULT 0"), // uploaded preview file id from "files" table 288 array("preview_id" , "INT", "DEFAULT 0"), // uploaded preview file id from "files" table
289 array("preview_type" , "INT", "DEFAULT 0"), // see EFILE_*, overrides compo's general type if != 0 289 array("preview_type" , "INT", "DEFAULT 0"), // see EFILE_*, overrides compo's general type if != 0
290 array("utime" , "INT", "DEFAULT 0"), 290 array("utime" , "INT", "DEFAULT 0"),
291 array("owner_id" , "INT", "DEFAULT 0"), // 0 = admin, otherwise votekey id 291 array("owner_id" , "INT", "DEFAULT 0"), // 0 = admin, otherwise userkey id
292 ), 292 ),
293 293
294 "files" => array( 294 "files" => array(
295 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"), 295 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
296 array("filename" , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // stored filename 296 array("filename" , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // stored filename
297 array("origname" , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // original uploaded filename 297 array("origname" , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // original uploaded filename
298 array("filetype" , "VARCHAR(32)", "DEFAULT NULL"), // type of the file, if any, as key from $fileTypeData 298 array("filetype" , "VARCHAR(32)", "DEFAULT NULL"), // type of the file, if any, as key from $fileTypeData
299 array("uploadtype" , "VARCHAR(32)", "DEFAULT NULL"), // "preview", "entry" 299 array("uploadtype" , "VARCHAR(32)", "DEFAULT NULL"), // "preview", "entry"
300 array("filesize" , "INT", "DEFAULT 0"), // uploaded size 300 array("filesize" , "INT", "DEFAULT 0"), // uploaded size
301 array("entry_id" , "INT", "DEFAULT 0"), // belongs to this entry (0 = none) 301 array("entry_id" , "INT", "DEFAULT 0"), // belongs to this entry (0 = none)
302 array("uploader_id" , "INT", "DEFAULT 0"), // 0 = admin, otherwise votekey id 302 array("uploader_id" , "INT", "DEFAULT 0"), // 0 = admin, otherwise userkey id
303 array("deleted" , "INT", "DEFAULT 0"), // 1 = to be deleted 303 array("deleted" , "INT", "DEFAULT 0"), // 1 = to be deleted
304 array("utime" , "INT", "DEFAULT 0"), 304 array("utime" , "INT", "DEFAULT 0"),
305 ), 305 ),
306 306
307 "attendees" => array( 307 "attendees" => array(
315 array("key_id" , "INT", "DEFAULT NULL"), 315 array("key_id" , "INT", "DEFAULT NULL"),
316 array("usr_flags" , "INT", "DEFAULT 0"), 316 array("usr_flags" , "INT", "DEFAULT 0"),
317 array("adm_flags" , "INT", "DEFAULT 0"), 317 array("adm_flags" , "INT", "DEFAULT 0"),
318 ), 318 ),
319 319
320 "votekeys" => array( 320 "userkeys" => array(
321 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"), 321 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
322 array("key" , "VARCHAR(".SET_LEN_VOTEKEY.")"), 322 array("key" , "VARCHAR(".SET_LEN_USERKEY.")"),
323 array("active" , "INT", "DEFAULT 0"), 323 array("active" , "INT", "DEFAULT 0"),
324 ), 324 ),
325 325
326 "votes" => array( 326 "votes" => array(
327 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"), 327 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
402 time().",%s,%s,%s", 402 time().",%s,%s,%s",
403 array("Today's news", "We. Are. Back.", "orgaz"), 403 array("Today's news", "We. Are. Back.", "orgaz"),
404 array("Good news, everybody!", "...", "The Professor"), 404 array("Good news, everybody!", "...", "The Professor"),
405 ), 405 ),
406 406
407 "votekeys" => array( 407 "userkeys" => array(
408 "key", 408 "key",
409 "%s", 409 "%s",
410 array("test1"), 410 array("test1"),
411 array("test2"), 411 array("test2"),
412 array("7jjnqt5z"), 412 array("7jjnqt5z"),
480 480
481 17 => array( 481 17 => array(
482 "ctype" => array("key" => "type"), 482 "ctype" => array("key" => "type"),
483 "cpath" => array("key" => "path"), 483 "cpath" => array("key" => "path"),
484 ), 484 ),
485
486 31 => array(
487 "userkeys" => array("table" => "votekeys"),
488 ),
485 ); 489 );
486 490
487 491
488 ?> 492 ?>