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

more db structure

Browse Source
This commit is contained in:
redmatrix 2015-05-19 22:43:24 -07:00
parent 507dfb9f85
commit e68a00d381
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/socgraph.php
View File

@ -40,7 +40,7 @@ function poco_load($xchan = '', $url = null) {
return; return;
} }
$url = $url . '?f=&fields=displayName,hash,urls,photos,rating' ; $url = $url . '?f=&fields=displayName,hash,urls,photos' ;
logger('poco_load: ' . $url, LOGGER_DEBUG); logger('poco_load: ' . $url, LOGGER_DEBUG);
@ -115,8 +115,6 @@ function poco_load($xchan = '', $url = null) {
$name = $entry['displayName']; $name = $entry['displayName'];
$hash = $entry['hash']; $hash = $entry['hash'];
$rating = ((array_key_exists('rating',$entry) && (! is_array($entry['rating']))) ? intval($entry['rating']) : 0);
$rating_text = ((array_key_exists('rating_text',$entry)) ? escape_tags($entry['rating_text']) :'');
if(x($entry,'urls') && is_array($entry['urls'])) { if(x($entry,'urls') && is_array($entry['urls'])) {
foreach($entry['urls'] as $url) { foreach($entry['urls'] as $url) {
@ -576,13 +574,6 @@ function poco($a,$extended = false) {
$entry['preferredUsername'] = substr($rr['xchan_addr'],0,strpos($rr['xchan_addr'],'@')); $entry['preferredUsername'] = substr($rr['xchan_addr'],0,strpos($rr['xchan_addr'],'@'));
if($fields_ret['photos']) if($fields_ret['photos'])
$entry['photos'] = array(array('value' => $rr['xchan_photo_l'], 'mimetype' => $rr['xchan_photo_mimetype'], 'type' => 'profile')); $entry['photos'] = array(array('value' => $rr['xchan_photo_l'], 'mimetype' => $rr['xchan_photo_mimetype'], 'type' => 'profile'));
if($fields_ret['rating']) {
$entry['rating'] = ((array_key_exists('abook_rating',$rr)) ? intval($rr['abook_rating']) : 0);
$entry['rating_text'] = ((array_key_exists('abook_rating_text',$rr)) ? $rr['abook_rating_text'] : '');
// maybe this should be a composite calculated rating in $system_mode
if($system_mode)
$entry['rating'] = 0;
}
$ret['entry'][] = $entry; $ret['entry'][] = $entry;
} }
} }

33
install/schema_mysql.sql
View File

@ -7,13 +7,19 @@ CREATE TABLE IF NOT EXISTS `abook` (
`abook_my_perms` int(11) NOT NULL DEFAULT '0', `abook_my_perms` int(11) NOT NULL DEFAULT '0',
`abook_their_perms` int(11) NOT NULL DEFAULT '0', `abook_their_perms` int(11) NOT NULL DEFAULT '0',
`abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99', `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99',
`abook_rating` int(11) NOT NULL DEFAULT '0',
`abook_rating_text` text NOT NULL,
`abook_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_connected` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_connected` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_dob` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_dob` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_flags` int(11) NOT NULL DEFAULT '0', `abook_flags` int(11) NOT NULL DEFAULT '0',
`abook_blocked` tinyint(4) NOT NULL DEFAULT '0',
`abook_ignored` tinyint(4) NOT NULL DEFAULT '0',
`abook_hidden` tinyint(4) NOT NULL DEFAULT '0',
`abook_archived` tinyint(4) NOT NULL DEFAULT '0',
`abook_pending` tinyint(4) NOT NULL DEFAULT '0',
`abook_unconnected` tinyint(4) NOT NULL DEFAULT '0',
`abook_self` tinyint(4) NOT NULL DEFAULT '0',
`abook_feed` tinyint(4) NOT NULL DEFAULT '0',
`abook_profile` char(64) NOT NULL DEFAULT '', `abook_profile` char(64) NOT NULL DEFAULT '',
PRIMARY KEY (`abook_id`), PRIMARY KEY (`abook_id`),
KEY `abook_account` (`abook_account`), KEY `abook_account` (`abook_account`),
@ -28,7 +34,14 @@ CREATE TABLE IF NOT EXISTS `abook` (
KEY `abook_profile` (`abook_profile`), KEY `abook_profile` (`abook_profile`),
KEY `abook_dob` (`abook_dob`), KEY `abook_dob` (`abook_dob`),
KEY `abook_connected` (`abook_connected`), KEY `abook_connected` (`abook_connected`),
KEY `abook_rating` (`abook_rating`) KEY `abook_blocked` (`abook_blocked`),
KEY `abook_ignored` (`abook_ignored`),
KEY `abook_hidden` (`abook_hidden`),
KEY `abook_archived` (`abook_archived`),
KEY `abook_pending` (`abook_pending`),
KEY `abook_unconnected` (`abook_unconnected`),
KEY `abook_self` (`abook_self`),
KEY `abook_feed` (`abook_feed`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `account` ( CREATE TABLE IF NOT EXISTS `account` (
@ -677,6 +690,12 @@ CREATE TABLE IF NOT EXISTS `mail` (
`attach` mediumtext NOT NULL, `attach` mediumtext NOT NULL,
`mid` char(255) NOT NULL DEFAULT '', `mid` char(255) NOT NULL DEFAULT '',
`parent_mid` char(255) NOT NULL DEFAULT '', `parent_mid` char(255) NOT NULL DEFAULT '',
`mail_deleted` tinyint(4) NOT NULL DEFAULT '0',
`mail_replied` tinyint(4) NOT NULL DEFAULT '0',
`mail_isreply` tinyint(4) NOT NULL DEFAULT '0',
`mail_seen` tinyint(4) NOT NULL DEFAULT '0',
`mail_recalled` tinyint(4) NOT NULL DEFAULT '0',
`mail_obscured` smallint(6) NOT NULL DEFAULT '0',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
@ -689,7 +708,13 @@ CREATE TABLE IF NOT EXISTS `mail` (
KEY `mid` (`mid`), KEY `mid` (`mid`),
KEY `parent_mid` (`parent_mid`), KEY `parent_mid` (`parent_mid`),
KEY `expires` (`expires`), KEY `expires` (`expires`),
KEY `convid` (`convid`) KEY `convid` (`convid`),
KEY `mail_deleted` (`mail_deleted`),
KEY `mail_replied` (`mail_replied`),
KEY `mail_isreply` (`mail_isreply`),
KEY `mail_seen` (`mail_seen`),
KEY `mail_recalled` (`mail_recalled`),
KEY `mail_obscured` (`mail_obscured`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `manage` ( CREATE TABLE IF NOT EXISTS `manage` (