harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network-wide poll voting structure

Browse Source
This commit is contained in:
friendica 2013-08-20 20:39:00 -07:00
parent c4f1431215
commit 5d35d21100
3 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -43,7 +43,7 @@ require_once('include/taxonomy.php');
define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1060 ); define ( 'DB_UPDATE_VERSION', 1061 );
define ( 'EOL', '<br />' . "\r\n" ); define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

44
install/database.sql
View File

@ -136,7 +136,7 @@ CREATE TABLE IF NOT EXISTS `challenge` (
`type` char(255) NOT NULL, `type` char(255) NOT NULL,
`last_update` char(255) NOT NULL, `last_update` char(255) NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `channel` ( CREATE TABLE IF NOT EXISTS `channel` (
`channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@ -267,7 +267,7 @@ CREATE TABLE IF NOT EXISTS `event` (
KEY `aid` (`aid`), KEY `aid` (`aid`),
KEY `event_hash` (`event_hash`), KEY `event_hash` (`event_hash`),
KEY `event_xchan` (`event_xchan`) KEY `event_xchan` (`event_xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `fcontact` ( CREATE TABLE IF NOT EXISTS `fcontact` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@ -348,7 +348,7 @@ CREATE TABLE IF NOT EXISTS `group_member` (
KEY `uid` (`uid`), KEY `uid` (`uid`),
KEY `gid` (`gid`), KEY `gid` (`gid`),
KEY `xchan` (`xchan`) KEY `xchan` (`xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `hook` ( CREATE TABLE IF NOT EXISTS `hook` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
@ -421,7 +421,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`owner_xchan` char(255) NOT NULL DEFAULT '', `owner_xchan` char(255) NOT NULL DEFAULT '',
`author_xchan` char(255) NOT NULL DEFAULT '', `author_xchan` char(255) NOT NULL DEFAULT '',
`mimetype` char(255) NOT NULL DEFAULT '', `mimetype` char(255) NOT NULL DEFAULT '',
`title` text NOT NULL DEFAULT '', `title` text NOT NULL,
`body` mediumtext NOT NULL, `body` mediumtext NOT NULL,
`app` char(255) NOT NULL DEFAULT '', `app` char(255) NOT NULL DEFAULT '',
`lang` char(64) NOT NULL DEFAULT '', `lang` char(64) NOT NULL DEFAULT '',
@ -493,7 +493,7 @@ CREATE TABLE IF NOT EXISTS `item_id` (
KEY `sid` (`sid`), KEY `sid` (`sid`),
KEY `service` (`service`), KEY `service` (`service`),
KEY `iid` (`iid`) KEY `iid` (`iid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `mail` ( CREATE TABLE IF NOT EXISTS `mail` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@ -504,7 +504,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
`channel_id` int(10) unsigned NOT NULL, `channel_id` int(10) unsigned NOT NULL,
`title` text NOT NULL, `title` text NOT NULL,
`body` mediumtext NOT NULL, `body` mediumtext NOT NULL,
`attach` mediumtext NOT NULL DEFAULT '', `attach` mediumtext NOT NULL,
`mid` char(255) NOT NULL, `mid` char(255) NOT NULL,
`parent_mid` char(255) NOT NULL, `parent_mid` char(255) NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@ -536,7 +536,7 @@ CREATE TABLE IF NOT EXISTS `menu` (
PRIMARY KEY (`menu_id`), PRIMARY KEY (`menu_id`),
KEY `menu_channel_id` (`menu_channel_id`), KEY `menu_channel_id` (`menu_channel_id`),
KEY `menu_name` (`menu_name`) KEY `menu_name` (`menu_name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `menu_item` ( CREATE TABLE IF NOT EXISTS `menu_item` (
`mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@ -551,10 +551,10 @@ CREATE TABLE IF NOT EXISTS `menu_item` (
`mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0', `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0',
`mitem_order` int(11) NOT NULL DEFAULT '0', `mitem_order` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`mitem_id`), PRIMARY KEY (`mitem_id`),
KEY `mitem_flags` (`mitem_flags`),
KEY `mitem_channel_id` (`mitem_channel_id`), KEY `mitem_channel_id` (`mitem_channel_id`),
KEY `mitem_menu_id` (`mitem_menu_id`) KEY `mitem_menu_id` (`mitem_menu_id`),
) ENGINE=MyISAM DEFAULT CHARSET=utf8; KEY `mitem_flags` (`mitem_flags`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `notify` ( CREATE TABLE IF NOT EXISTS `notify` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
@ -595,7 +595,7 @@ CREATE TABLE IF NOT EXISTS `obj` (
KEY `obj_type` (`obj_type`), KEY `obj_type` (`obj_type`),
KEY `obj_channel` (`obj_channel`), KEY `obj_channel` (`obj_channel`),
KEY `obj_obj` (`obj_obj`) KEY `obj_obj` (`obj_obj`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `outq` ( CREATE TABLE IF NOT EXISTS `outq` (
`outq_hash` char(255) NOT NULL, `outq_hash` char(255) NOT NULL,
@ -676,7 +676,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`hide_friends` tinyint(1) NOT NULL DEFAULT '0', `hide_friends` tinyint(1) NOT NULL DEFAULT '0',
`name` char(255) NOT NULL, `name` char(255) NOT NULL,
`pdesc` char(255) NOT NULL, `pdesc` char(255) NOT NULL,
`chandesc` text NOT NULL DEFAULT '', `chandesc` text NOT NULL,
`dob` char(32) NOT NULL DEFAULT '0000-00-00', `dob` char(32) NOT NULL DEFAULT '0000-00-00',
`dob_tz` char(255) NOT NULL DEFAULT 'UTC', `dob_tz` char(255) NOT NULL DEFAULT 'UTC',
`address` char(255) NOT NULL, `address` char(255) NOT NULL,
@ -770,7 +770,7 @@ CREATE TABLE IF NOT EXISTS `register` (
KEY `hash` (`hash`), KEY `hash` (`hash`),
KEY `created` (`created`), KEY `created` (`created`),
KEY `uid` (`uid`) KEY `uid` (`uid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `session` ( CREATE TABLE IF NOT EXISTS `session` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
@ -842,7 +842,7 @@ CREATE TABLE IF NOT EXISTS `term` (
KEY `imgurl` (`imgurl`), KEY `imgurl` (`imgurl`),
KEY `term_hash` (`term_hash`), KEY `term_hash` (`term_hash`),
KEY `parent_hash` (`parent_hash`) KEY `parent_hash` (`parent_hash`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `tokens` ( CREATE TABLE IF NOT EXISTS `tokens` (
`id` varchar(40) NOT NULL, `id` varchar(40) NOT NULL,
@ -877,7 +877,17 @@ CREATE TABLE IF NOT EXISTS `verify` (
KEY `token` (`token`), KEY `token` (`token`),
KEY `meta` (`meta`), KEY `meta` (`meta`),
KEY `created` (`created`) KEY `created` (`created`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `vote` (
`vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`vote_poll` int(11) NOT NULL DEFAULT '0',
`vote_element` int(11) NOT NULL DEFAULT '0',
`vote_result` text NOT NULL,
`vote_xchan` char(255) NOT NULL DEFAULT '',
PRIMARY KEY (`vote_id`),
UNIQUE KEY `vote_vote` (`vote_poll`,`vote_element`,`vote_xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `xchan` ( CREATE TABLE IF NOT EXISTS `xchan` (
`xchan_hash` char(255) NOT NULL, `xchan_hash` char(255) NOT NULL,
@ -902,10 +912,10 @@ CREATE TABLE IF NOT EXISTS `xchan` (
KEY `xchan_addr` (`xchan_addr`), KEY `xchan_addr` (`xchan_addr`),
KEY `xchan_name` (`xchan_name`), KEY `xchan_name` (`xchan_name`),
KEY `xchan_network` (`xchan_network`), KEY `xchan_network` (`xchan_network`),
KEY `xchan_instance_url` (`xchan_instance_url`),
KEY `xchan_url` (`xchan_url`), KEY `xchan_url` (`xchan_url`),
KEY `xchan_flags` (`xchan_flags`), KEY `xchan_flags` (`xchan_flags`),
KEY `xchan_connurl` (`xchan_connurl`) KEY `xchan_connurl` (`xchan_connurl`),
KEY `xchan_instance_url` (`xchan_instance_url`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `xconfig` ( CREATE TABLE IF NOT EXISTS `xconfig` (

19
install/update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1060 ); define( 'UPDATE_VERSION' , 1061 );
/** /**
* *
@ -689,3 +689,20 @@ function update_r1059() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1060() {
$r = q("CREATE TABLE IF NOT EXISTS `vote` (
`vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`vote_poll` int(11) NOT NULL DEFAULT '0',
`vote_element` int(11) NOT NULL DEFAULT '0',
`vote_result` text NOT NULL,
`vote_xchan` char(255) NOT NULL DEFAULT '',
PRIMARY KEY (`vote_id`),
UNIQUE KEY `vote_vote` (`vote_poll`,`vote_element`,`vote_xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ");
if($r)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}