aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zotlabs/Module/Cdav.php5
-rw-r--r--Zotlabs/Module/Channel_calendar.php119
-rw-r--r--Zotlabs/Update/_1232.php47
-rw-r--r--Zotlabs/Update/_1233.php38
-rw-r--r--Zotlabs/Widget/Cdav.php2
-rwxr-xr-xboot.php2
-rw-r--r--doc/hidden_configs.bb3
-rw-r--r--include/event.php2
-rw-r--r--include/follow.php15
-rw-r--r--install/database-w-defaults-v1131.diff1914
-rw-r--r--install/schema_mysql.sql23
-rw-r--r--install/schema_postgres.sql3
-rw-r--r--view/js/main.js14
-rw-r--r--view/theme/redbasic/js/redbasic.js3
-rw-r--r--view/tpl/cdav_calendar.tpl22
15 files changed, 177 insertions, 2035 deletions
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index 6b935deff..5888356d7 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -965,7 +965,7 @@ class Cdav extends Controller {
foreach($calendars as $calendar) {
$editable = (($calendar['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript
- $color = (($calendar['{http://apple.com/ns/ical/}calendar-color']) ? $calendar['{http://apple.com/ns/ical/}calendar-color'] : '#3a87ad');
+ $color = (($calendar['{http://apple.com/ns/ical/}calendar-color']) ? $calendar['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39');
$sharer = (($calendar['share-access'] == 3) ? $calendar['{urn:ietf:params:xml:ns:caldav}calendar-description'] : '');
$switch = get_pconfig(local_channel(), 'cdav_calendar', $calendar['id'][0]);
if($switch) {
@@ -1399,12 +1399,13 @@ class Cdav extends Controller {
$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
$properties = [
'{DAV:}displayname' => t('Default Calendar'),
- '{http://apple.com/ns/ical/}calendar-color' => '#3a87ad',
+ '{http://apple.com/ns/ical/}calendar-color' => '#6cad39',
'{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name']
];
$id = $caldavBackend->createCalendar($uri, 'default', $properties);
set_pconfig(local_channel(), 'cdav_calendar' , $id[0], 1);
+ set_pconfig(local_channel(), 'cdav_calendar' , 'channel_calendar', 1);
//create default addressbook
$carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 67e6557f9..e6c5e6e54 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -72,8 +72,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$finish = NULL_DATE;
}
-
-
if($adjust) {
$start = datetime_convert($tz,'UTC',$start);
if(! $nofinish)
@@ -86,12 +84,10 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
}
-
// Don't allow the event to finish before it begins.
// It won't hurt anything, but somebody will file a bug report
// and we'll waste a bunch of time responding to it. Time that
// could've been spent doing something else.
-
$summary = escape_tags(trim($_POST['summary']));
$desc = escape_tags(trim($_POST['desc']));
@@ -102,28 +98,20 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
linkify_tags($desc, local_channel());
linkify_tags($location, local_channel());
- //$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
-
- //fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location)
- //$onerror_url = z_root() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type";
- //$onerror_url = z_root() . "/events";
-
if(strcmp($finish,$start) < 0 && !$nofinish) {
notice( t('Event can not end before it has started.') . EOL);
if(intval($_REQUEST['preview'])) {
echo( t('Unable to generate preview.'));
- killme();
}
- //goaway($onerror_url);
+ killme();
}
if((! $summary) || (! $start)) {
notice( t('Event title and start time are required.') . EOL);
if(intval($_REQUEST['preview'])) {
echo( t('Unable to generate preview.'));
- killme();
}
- //goaway($onerror_url);
+ killme();
}
$channel = \App::get_channel();
@@ -275,8 +263,9 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$channel = \App::get_channel();
$mode = 'view';
- $y = 0;
- $m = 0;
+ $export = false;
+ //$y = 0;
+ //$m = 0;
$ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
if(argc() > 1) {
@@ -288,10 +277,13 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$mode = 'drop';
$event_id = argv(2);
}
+ if(argc() <= 2 && argv(1) === 'export') {
+ $export = true;
+ }
if(argc() > 2 && intval(argv(1)) && intval(argv(2))) {
$mode = 'view';
- $y = intval(argv(1));
- $m = intval(argv(2));
+ //$y = intval(argv(1));
+ //$m = intval(argv(2));
}
if(argc() <= 2) {
$mode = 'view';
@@ -317,7 +309,8 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
}
$channel = \App::get_channel();
-
+
+/*
// Passed parameters overrides anything found in the DB
if(!x($orig_event))
$orig_event = array();
@@ -370,10 +363,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
if(! $m)
$m = intval($thismonth);
- $export = false;
- if(argc() === 4 && argv(3) === 'export')
- $export = true;
-
+
// Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
// An upper limit was chosen to keep search engines from exploring links millions of years in the future.
@@ -400,7 +390,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$dim = get_dim($y,$m);
$start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
-
+*/
if (argv(1) === 'json'){
if (x($_GET,'start')) $start = $_GET['start'];
@@ -414,20 +404,16 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
if (x($_GET,'id')){
- $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
- from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
+ $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
+ from event left join item on item.resource_id = event.event_hash
+ where item.resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
intval(local_channel()),
intval($_GET['id'])
);
- } elseif($export) {
- $r = q("SELECT * from event where uid = %d
- AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )
- OR ( adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
- intval(local_channel()),
- dbesc($start),
- dbesc($finish),
- dbesc($adjust_start),
- dbesc($adjust_finish)
+ }
+ elseif($export) {
+ $r = q("SELECT * from event where uid = %d",
+ intval(local_channel())
);
}
else {
@@ -437,10 +423,10 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
// Ultimately the finish date shouldn't be involved in the query.
$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
- from event left join item on event_hash = resource_id
- where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored
- AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )
- OR ( adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
+ from event left join item on event.event_hash = item.resource_id
+ where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored
+ AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )
+ OR ( event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) ",
intval(local_channel()),
dbesc($start),
dbesc($finish),
@@ -448,10 +434,9 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
dbesc($adjust_finish)
);
-
}
- $links = array();
+ //$links = [];
if($r && ! $export) {
xchan_query($r);
@@ -459,7 +444,8 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$r = sort_by_date($r);
}
-
+
+/*
if($r) {
foreach($r as $rr) {
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
@@ -467,18 +453,19 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j;
}
}
+*/
- $events=array();
+ $events = [];
- $last_date = '';
- $fmt = t('l, F j');
+ //$last_date = '';
+ //$fmt = t('l, F j');
if($r) {
foreach($r as $rr) {
- $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
- $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
- $d = day_translate($d);
+ //$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+ //$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
+ //$d = day_translate($d);
$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
if ($rr['nofinish']){
@@ -514,23 +501,23 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
if(strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00'))
$allDay = true;
- $is_first = ($d !== $last_date);
+ //$is_first = ($d !== $last_date);
- $last_date = $d;
+ //$last_date = $d;
$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
$drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
- $title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])),ENT_QUOTES,'UTF-8'));
- if(! $title) {
- list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
- $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
- }
- $html = format_event_html($rr);
- $rr['desc'] = zidify_links(smilies(bbcode($rr['desc'])));
- $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false);
- $rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
+ //$title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])),ENT_QUOTES,'UTF-8'));
+ //if(! $title) {
+ // list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
+ // $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
+ //}
+ //$html = format_event_html($rr);
+ //$rr['desc'] = zidify_links(smilies(bbcode($rr['desc'])));
+ //$rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false);
+ //$rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
$events[] = array(
'calendar_id' => 'channel_calendar',
'rw' => true,
@@ -541,20 +528,20 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
'end' => $end,
'drop' => $drop,
'allDay' => $allDay,
- 'title' => $title,
+ 'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8'),
- 'j' => $j,
- 'd' => $d,
+ //'j' => $j,
+ //'d' => $d,
'editable' => $edit ? true : false,
- 'is_first'=>$is_first,
+ //'is_first'=>$is_first,
'item'=>$rr,
- 'html'=>$html,
+ //'html'=>$html,
'plink' => [$rr['plink'], t('Link to source')],
- 'description' => $rr['description'],
- 'location' => $rr['location'],
+ 'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8'),
+ 'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8'),
'allow_cid' => expand_acl($rr['allow_cid']),
'allow_gid' => expand_acl($rr['allow_gid']),
diff --git a/Zotlabs/Update/_1232.php b/Zotlabs/Update/_1232.php
new file mode 100644
index 000000000..d1e3d75b5
--- /dev/null
+++ b/Zotlabs/Update/_1232.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1232 {
+
+ function run() {
+
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ return UPDATE_SUCCESS;
+ }
+ else {
+ q("START TRANSACTION");
+
+ $r = q("ALTER TABLE channel
+ DROP channel_r_stream,
+ DROP channel_r_profile,
+ DROP channel_r_photos,
+ DROP channel_r_abook,
+ DROP channel_w_stream,
+ DROP channel_w_wall,
+ DROP channel_w_tagwall,
+ DROP channel_w_comment,
+ DROP channel_w_mail,
+ DROP channel_w_photos,
+ DROP channel_w_chat,
+ DROP channel_a_delegate,
+ DROP channel_r_storage,
+ DROP channel_w_storage,
+ DROP channel_r_pages,
+ DROP channel_w_pages,
+ DROP channel_a_republish,
+ DROP channel_w_like"
+ );
+ }
+
+ if($r) {
+ q("COMMIT");
+ return UPDATE_SUCCESS;
+ }
+
+ q("ROLLBACK");
+ return UPDATE_FAILED;
+
+ }
+
+}
diff --git a/Zotlabs/Update/_1233.php b/Zotlabs/Update/_1233.php
new file mode 100644
index 000000000..bd85aa379
--- /dev/null
+++ b/Zotlabs/Update/_1233.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1233 {
+
+ function run() {
+
+ q("START TRANSACTION");
+
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ $r1 = q("DROP INDEX item_uid_mid");
+
+ $r2 = q("create index item_uid_mid on item (uid, mid)");
+ $r3 = q("create index xchan_photo_m on xchan (xchan_photo_m)");
+
+ $r = ($r1 && $r2 && $r3);
+ }
+ else {
+ $r1 = q("ALTER TABLE item DROP INDEX uid_mid");
+
+ $r2 = q("ALTER TABLE item ADD INDEX uid_mid (uid, mid)");
+ $r3 = q("ALTER TABLE xchan ADD INDEX xchan_photo_m (xchan_photo_m)");
+
+ $r = ($r1 && $r2 && $r3);
+ }
+
+ if($r) {
+ q("COMMIT");
+ return UPDATE_SUCCESS;
+ }
+
+ q("ROLLBACK");
+ return UPDATE_FAILED;
+
+ }
+
+}
diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php
index 20c70903f..7794d7617 100644
--- a/Zotlabs/Widget/Cdav.php
+++ b/Zotlabs/Widget/Cdav.php
@@ -57,7 +57,7 @@ class Cdav {
$switch = get_pconfig(local_channel(), 'cdav_calendar', $sabrecal['id'][0]);
- $color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#3a87ad');
+ $color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39');
$editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript
diff --git a/boot.php b/boot.php
index 89c6d5e1f..df8308a70 100755
--- a/boot.php
+++ b/boot.php
@@ -53,7 +53,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '4.1.2' );
define ( 'ZOT_REVISION', '6.0a' );
-define ( 'DB_UPDATE_VERSION', 1231 );
+define ( 'DB_UPDATE_VERSION', 1233 );
define ( 'PROJECT_BASE', __DIR__ );
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 8b5429deb..dc3906df1 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -51,6 +51,7 @@ Options are:
[*= system.email_notify_icon_url ] URL of image (32x32) to display in email notifications (HTML bodies).
[*= system.expire_delivery_reports ] Expiration in days for delivery reports - default 10
[*= system.expire_limit ] Don't expire any more than this number of posts per channel per expiration run to keep from exhausting memory. Default 5000.
+ [*= system.filesystem_storage_thumbnails ] If '1', use filesystem instead SQL database to store thumbnails. Default is '0'. Introduced in 4.2
[*= system.hidden_version_siteinfo ] If true, do not report the software version on siteinfo pages (system.hide_version also hides the version on these pages, this setting *only* hides the version on siteinfo pages).
[*= system.hide_help ] Don't display help documentation link in nav bar
[*= system.hide_in_statistics ] Tell the red statistics servers to completely hide this hub in hub lists.
@@ -79,7 +80,7 @@ Options are:
[*= system.startpage ] Set the default page to be taken to after a login for all channels at this website. Can be overwritten by user settings.
[*= system.sys_expire_days ] How many days to keep discovered public content from other sites
[*= system.taganyone ] Allow the @mention tagging of anyone whether you are connected or not.
- [*= system.tempdir ] Place to store temporary files (currently unused), default is defined in the PHP configuration
+ [*= system.tempdir ] Place to store temporary files (currently unused), default is defined in the PHP configuration.
[*= system.tos_url ] Set an alternative link for the ToS location.
[*= system.transport_security_header ] if non-zero and SSL is being used, include a strict-transport-security header on webpages
[*= system.uploaddir ] Location to upload files (default is system.tempdir, currently used only by js_upload plugin)
diff --git a/include/event.php b/include/event.php
index 01122abed..471fb7afa 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1163,7 +1163,7 @@ function event_store_item($arr, $event) {
$item_arr['item_thread_top'] = $item_thread_top;
$attach = array(array(
- 'href' => z_root() . '/events/ical/' . urlencode($event['event_hash']),
+ 'href' => z_root() . '/channel_calendar/ical/' . urlencode($event['event_hash']),
'length' => 0,
'type' => 'text/calendar',
'title' => t('event') . '-' . $event['event_hash'],
diff --git a/include/follow.php b/include/follow.php
index 1b35f1b32..50b952881 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -142,7 +142,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$sql_options = (($protocol) ? " and xchan_network = '" . dbesc($protocol) . "' " : '');
- $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' $sql_options limit 1",
+ $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' $sql_options ",
dbesc($url),
dbesc($url)
);
@@ -169,18 +169,19 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
}
if($wf || $d) {
- $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1",
+ $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s'",
dbesc(($wf) ? $wf : $url),
dbesc($url)
);
}
}
+ $xchan = zot_record_preferred($r,'xchan_network');
+
// if discovery was a success we should have an xchan record in $r
- if($r) {
- $xchan = $r[0];
- $xchan_hash = $r[0]['xchan_hash'];
+ if($xchan) {
+ $xchan_hash = $xchan['xchan_hash'];
$their_perms = 0;
}
}
@@ -191,9 +192,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
return $result;
}
- $allowed = (($is_zot || in_array($r[0]['xchan_network'],['rss','zot6'])) ? 1 : 0);
+ $allowed = (($is_zot || in_array($xchan['xchan_network'],['rss','zot6'])) ? 1 : 0);
- $x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $r[0], 'allowed' => $allowed, 'singleton' => 0);
+ $x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $xchan, 'allowed' => $allowed, 'singleton' => 0);
call_hooks('follow_allow',$x);
diff --git a/install/database-w-defaults-v1131.diff b/install/database-w-defaults-v1131.diff
deleted file mode 100644
index c8870f9c4..000000000
--- a/install/database-w-defaults-v1131.diff
+++ /dev/null
@@ -1,1914 +0,0 @@
-*** database.sql Mon Sep 8 20:28:00 2014
---- database-w-defaults.sql Sun Nov 9 19:20:32 2014
-***************
-*** 1,15 ****
-! SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-!
-! /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-! /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-! /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-! /*!40101 SET NAMES utf8 */;
-
-
- CREATE TABLE IF NOT EXISTS `abook` (
- `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `abook_account` int(10) unsigned NOT NULL,
-! `abook_channel` int(10) unsigned NOT NULL,
- `abook_xchan` char(255) NOT NULL DEFAULT '',
- `abook_my_perms` int(11) NOT NULL DEFAULT '0',
- `abook_their_perms` int(11) NOT NULL DEFAULT '0',
---- 1,13 ----
-! -- --------------------------------------------------------
-
-+ --
-+ -- Table structure for table `abook`
-+ --
-
- CREATE TABLE IF NOT EXISTS `abook` (
- `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `abook_account` int(10) unsigned NOT NULL DEFAULT '0',
-! `abook_channel` int(10) unsigned NOT NULL DEFAULT '0',
- `abook_xchan` char(255) NOT NULL DEFAULT '',
- `abook_my_perms` int(11) NOT NULL DEFAULT '0',
- `abook_their_perms` int(11) NOT NULL DEFAULT '0',
-***************
-*** 37,42 ****
---- 35,46 ----
- KEY `abook_rating` (`abook_rating`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `account`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `account` (
- `account_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `account_parent` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 70,79 ****
- KEY `account_password_changed` (`account_password_changed`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `addon` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `name` char(255) NOT NULL,
-! `version` char(255) NOT NULL,
- `installed` tinyint(1) NOT NULL DEFAULT '0',
- `hidden` tinyint(1) NOT NULL DEFAULT '0',
- `timestamp` bigint(20) NOT NULL DEFAULT '0',
---- 74,89 ----
- KEY `account_password_changed` (`account_password_changed`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `addon`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `addon` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `name` char(255) NOT NULL DEFAULT '',
-! `version` char(255) NOT NULL DEFAULT '',
- `installed` tinyint(1) NOT NULL DEFAULT '0',
- `hidden` tinyint(1) NOT NULL DEFAULT '0',
- `timestamp` bigint(20) NOT NULL DEFAULT '0',
-***************
-*** 84,89 ****
---- 94,104 ----
- KEY `installed` (`installed`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `app`
-+ --
-
- CREATE TABLE IF NOT EXISTS `app` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-***************
-*** 108,115 ****
- KEY `app_version` (`app_version`),
- KEY `app_channel` (`app_channel`),
- KEY `app_price` (`app_price`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
- CREATE TABLE IF NOT EXISTS `attach` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
---- 123,135 ----
- KEY `app_version` (`app_version`),
- KEY `app_channel` (`app_channel`),
- KEY `app_price` (`app_price`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-
-+ --
-+ -- Table structure for table `attach`
-+ --
-
- CREATE TABLE IF NOT EXISTS `attach` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-***************
-*** 145,166 ****
- KEY `creator` (`creator`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `auth_codes` (
-! `id` varchar(40) NOT NULL,
-! `client_id` varchar(20) NOT NULL,
-! `redirect_uri` varchar(200) NOT NULL,
-! `expires` int(11) NOT NULL,
-! `scope` varchar(250) NOT NULL,
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `cache` (
-! `k` char(255) NOT NULL,
- `v` text NOT NULL,
-! `updated` datetime NOT NULL,
- PRIMARY KEY (`k`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `channel` (
- `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0',
---- 165,204 ----
- KEY `creator` (`creator`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `auth_codes`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `auth_codes` (
-! `id` varchar(40) NOT NULL DEFAULT '',
-! `client_id` varchar(20) NOT NULL DEFAULT '',
-! `redirect_uri` varchar(200) NOT NULL DEFAULT '',
-! `expires` int(11) NOT NULL DEFAULT '0',
-! `scope` varchar(250) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `cache`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `cache` (
-! `k` char(255) NOT NULL DEFAULT '',
- `v` text NOT NULL,
-! `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (`k`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `channel`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `channel` (
- `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 189,212 ****
- `channel_allow_gid` mediumtext NOT NULL,
- `channel_deny_cid` mediumtext NOT NULL,
- `channel_deny_gid` mediumtext NOT NULL,
-! `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '128',
- `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '128',
-! `channel_w_like` int(10) unsigned NOT NULL DEFAULT '128',
- PRIMARY KEY (`channel_id`),
- UNIQUE KEY `channel_address_unique` (`channel_address`),
- KEY `channel_account_id` (`channel_account_id`),
---- 227,250 ----
- `channel_allow_gid` mediumtext NOT NULL,
- `channel_deny_cid` mediumtext NOT NULL,
- `channel_deny_gid` mediumtext NOT NULL,
-! `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '0',
- `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_w_like` int(10) unsigned NOT NULL DEFAULT '0',
- PRIMARY KEY (`channel_id`),
- UNIQUE KEY `channel_address_unique` (`channel_address`),
- KEY `channel_account_id` (`channel_account_id`),
-***************
-*** 241,250 ****
- KEY `channel_w_pages` (`channel_w_pages`),
- KEY `channel_deleted` (`channel_deleted`),
- KEY `channel_a_republish` (`channel_a_republish`),
-! KEY `channel_w_like` (`channel_w_like`),
-! KEY `channel_dirdate` (`channel_dirdate`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `chat` (
- `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `chat_room` int(10) unsigned NOT NULL DEFAULT '0',
---- 279,294 ----
- KEY `channel_w_pages` (`channel_w_pages`),
- KEY `channel_deleted` (`channel_deleted`),
- KEY `channel_a_republish` (`channel_a_republish`),
-! KEY `channel_dirdate` (`channel_dirdate`),
-! KEY `channel_w_like` (`channel_w_like`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `chat`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `chat` (
- `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `chat_room` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 255,275 ****
- KEY `chat_room` (`chat_room`),
- KEY `chat_xchan` (`chat_xchan`),
- KEY `created` (`created`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `chatpresence` (
- `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `cp_room` int(10) unsigned NOT NULL DEFAULT '0',
- `cp_xchan` char(255) NOT NULL DEFAULT '',
- `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `cp_status` char(255) NOT NULL,
- `cp_client` char(128) NOT NULL DEFAULT '',
- PRIMARY KEY (`cp_id`),
- KEY `cp_room` (`cp_room`),
- KEY `cp_xchan` (`cp_xchan`),
- KEY `cp_last` (`cp_last`),
- KEY `cp_status` (`cp_status`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `chatroom` (
- `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
---- 299,331 ----
- KEY `chat_room` (`chat_room`),
- KEY `chat_xchan` (`chat_xchan`),
- KEY `created` (`created`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `chatpresence`
-! --
-
- CREATE TABLE IF NOT EXISTS `chatpresence` (
- `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `cp_room` int(10) unsigned NOT NULL DEFAULT '0',
- `cp_xchan` char(255) NOT NULL DEFAULT '',
- `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `cp_status` char(255) NOT NULL DEFAULT '',
- `cp_client` char(128) NOT NULL DEFAULT '',
- PRIMARY KEY (`cp_id`),
- KEY `cp_room` (`cp_room`),
- KEY `cp_xchan` (`cp_xchan`),
- KEY `cp_last` (`cp_last`),
- KEY `cp_status` (`cp_status`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `chatroom`
-! --
-
- CREATE TABLE IF NOT EXISTS `chatroom` (
- `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-***************
-*** 290,322 ****
- KEY `cr_created` (`cr_created`),
- KEY `cr_edited` (`cr_edited`),
- KEY `cr_expire` (`cr_expire`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `clients` (
-! `client_id` varchar(20) NOT NULL,
-! `pw` varchar(20) NOT NULL,
-! `redirect_uri` varchar(200) NOT NULL,
- `name` text,
- `icon` text,
- `uid` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`client_id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `config` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `cat` char(255) CHARACTER SET ascii NOT NULL,
-! `k` char(255) CHARACTER SET ascii NOT NULL,
- `v` text NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `access` (`cat`,`k`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `conv` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `guid` char(255) NOT NULL,
- `recips` mediumtext NOT NULL,
-! `uid` int(11) NOT NULL,
-! `creator` char(255) NOT NULL,
- `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `subject` mediumtext NOT NULL,
---- 346,396 ----
- KEY `cr_created` (`cr_created`),
- KEY `cr_edited` (`cr_edited`),
- KEY `cr_expire` (`cr_expire`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `clients`
-! --
-
- CREATE TABLE IF NOT EXISTS `clients` (
-! `client_id` varchar(20) NOT NULL DEFAULT '',
-! `pw` varchar(20) NOT NULL DEFAULT '',
-! `redirect_uri` varchar(200) NOT NULL DEFAULT '',
- `name` text,
- `icon` text,
- `uid` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`client_id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `config`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `config` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
-! `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
- `v` text NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `access` (`cat`,`k`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `conv`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `conv` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `guid` char(255) NOT NULL DEFAULT '',
- `recips` mediumtext NOT NULL,
-! `uid` int(11) NOT NULL DEFAULT '0',
-! `creator` char(255) NOT NULL DEFAULT '',
- `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `subject` mediumtext NOT NULL,
-***************
-*** 325,344 ****
- KEY `updated` (`updated`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `event` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
-! `uid` int(11) NOT NULL,
- `event_xchan` char(255) NOT NULL DEFAULT '',
- `event_hash` char(255) NOT NULL DEFAULT '',
-! `created` datetime NOT NULL,
-! `edited` datetime NOT NULL,
-! `start` datetime NOT NULL,
-! `finish` datetime NOT NULL,
- `summary` text NOT NULL,
- `description` text NOT NULL,
- `location` text NOT NULL,
-! `type` char(255) NOT NULL,
- `nofinish` tinyint(1) NOT NULL DEFAULT '0',
- `adjust` tinyint(1) NOT NULL DEFAULT '1',
- `ignore` tinyint(1) NOT NULL DEFAULT '0',
---- 399,424 ----
- KEY `updated` (`updated`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `event`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `event` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
-! `uid` int(11) NOT NULL DEFAULT '0',
- `event_xchan` char(255) NOT NULL DEFAULT '',
- `event_hash` char(255) NOT NULL DEFAULT '',
-! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `summary` text NOT NULL,
- `description` text NOT NULL,
- `location` text NOT NULL,
-! `type` char(255) NOT NULL DEFAULT '',
- `nofinish` tinyint(1) NOT NULL DEFAULT '0',
- `adjust` tinyint(1) NOT NULL DEFAULT '1',
- `ignore` tinyint(1) NOT NULL DEFAULT '0',
-***************
-*** 357,363 ****
- KEY `aid` (`aid`),
- KEY `event_hash` (`event_hash`),
- KEY `event_xchan` (`event_xchan`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `fcontact` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
---- 437,449 ----
- KEY `aid` (`aid`),
- KEY `event_hash` (`event_hash`),
- KEY `event_xchan` (`event_xchan`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `fcontact`
-! --
-
- CREATE TABLE IF NOT EXISTS `fcontact` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-***************
-*** 381,386 ****
---- 467,478 ----
- KEY `network` (`network`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `ffinder`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `ffinder` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `uid` int(10) unsigned NOT NULL,
-***************
-*** 392,427 ****
- KEY `fid` (`fid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `fserver` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `server` char(255) NOT NULL,
-! `posturl` char(255) NOT NULL,
- `key` text NOT NULL,
- PRIMARY KEY (`id`),
- KEY `server` (`server`),
- KEY `posturl` (`posturl`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `fsuggest` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `uid` int(11) NOT NULL,
-! `cid` int(11) NOT NULL,
-! `name` char(255) NOT NULL,
-! `url` char(255) NOT NULL,
-! `request` char(255) NOT NULL,
-! `photo` char(255) NOT NULL,
- `note` text NOT NULL,
-! `created` datetime NOT NULL,
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `groups` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `hash` char(255) NOT NULL DEFAULT '',
-! `uid` int(10) unsigned NOT NULL,
- `visible` tinyint(1) NOT NULL DEFAULT '0',
- `deleted` tinyint(1) NOT NULL DEFAULT '0',
-! `name` char(255) NOT NULL,
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `visible` (`visible`),
---- 484,537 ----
- KEY `fid` (`fid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `fserver`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `fserver` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `server` char(255) NOT NULL DEFAULT '',
-! `posturl` char(255) NOT NULL DEFAULT '',
- `key` text NOT NULL,
- PRIMARY KEY (`id`),
- KEY `server` (`server`),
- KEY `posturl` (`posturl`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `fsuggest`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `fsuggest` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `uid` int(11) NOT NULL DEFAULT '0',
-! `cid` int(11) NOT NULL DEFAULT '0',
-! `name` char(255) NOT NULL DEFAULT '',
-! `url` char(255) NOT NULL DEFAULT '',
-! `request` char(255) NOT NULL DEFAULT '',
-! `photo` char(255) NOT NULL DEFAULT '',
- `note` text NOT NULL,
-! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `groups`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `groups` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `hash` char(255) NOT NULL DEFAULT '',
-! `uid` int(10) unsigned NOT NULL DEFAULT '0',
- `visible` tinyint(1) NOT NULL DEFAULT '0',
- `deleted` tinyint(1) NOT NULL DEFAULT '0',
-! `name` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `visible` (`visible`),
-***************
-*** 429,438 ****
- KEY `hash` (`hash`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `group_member` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `uid` int(10) unsigned NOT NULL,
-! `gid` int(10) unsigned NOT NULL,
- `xchan` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
---- 539,554 ----
- KEY `hash` (`hash`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `group_member`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `group_member` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `uid` int(10) unsigned NOT NULL DEFAULT '0',
-! `gid` int(10) unsigned NOT NULL DEFAULT '0',
- `xchan` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
-***************
-*** 440,460 ****
- KEY `xchan` (`xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `hook` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `hook` char(255) NOT NULL,
-! `file` char(255) NOT NULL,
-! `function` char(255) NOT NULL,
- `priority` int(11) unsigned NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
- KEY `hook` (`hook`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `hubloc` (
- `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `hubloc_guid` char(255) NOT NULL DEFAULT '',
- `hubloc_guid_sig` text NOT NULL,
-! `hubloc_hash` char(255) NOT NULL,
- `hubloc_addr` char(255) NOT NULL DEFAULT '',
- `hubloc_network` char(32) NOT NULL DEFAULT '',
- `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0',
---- 556,588 ----
- KEY `xchan` (`xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `hook`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `hook` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `hook` char(255) NOT NULL DEFAULT '',
-! `file` char(255) NOT NULL DEFAULT '',
-! `function` char(255) NOT NULL DEFAULT '',
- `priority` int(11) unsigned NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
- KEY `hook` (`hook`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `hubloc`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `hubloc` (
- `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `hubloc_guid` char(255) NOT NULL DEFAULT '',
- `hubloc_guid_sig` text NOT NULL,
-! `hubloc_hash` char(255) NOT NULL DEFAULT '',
- `hubloc_addr` char(255) NOT NULL DEFAULT '',
- `hubloc_network` char(32) NOT NULL DEFAULT '',
- `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 474,493 ****
- KEY `hubloc_connect` (`hubloc_connect`),
- KEY `hubloc_host` (`hubloc_host`),
- KEY `hubloc_addr` (`hubloc_addr`),
-- KEY `hubloc_network` (`hubloc_network`),
- KEY `hubloc_updated` (`hubloc_updated`),
- KEY `hubloc_connected` (`hubloc_connected`),
-! KEY `hubloc_status` (`hubloc_status`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `issue` (
- `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `issue_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `issue_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `issue_assigned` char(255) NOT NULL,
-! `issue_priority` int(11) NOT NULL,
-! `issue_status` int(11) NOT NULL,
-! `issue_component` char(255) NOT NULL,
- PRIMARY KEY (`issue_id`),
- KEY `issue_created` (`issue_created`),
- KEY `issue_updated` (`issue_updated`),
---- 602,627 ----
- KEY `hubloc_connect` (`hubloc_connect`),
- KEY `hubloc_host` (`hubloc_host`),
- KEY `hubloc_addr` (`hubloc_addr`),
- KEY `hubloc_updated` (`hubloc_updated`),
- KEY `hubloc_connected` (`hubloc_connected`),
-! KEY `hubloc_status` (`hubloc_status`),
-! KEY `hubloc_network` (`hubloc_network`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `issue`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `issue` (
- `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `issue_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `issue_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `issue_assigned` char(255) NOT NULL DEFAULT '',
-! `issue_priority` int(11) NOT NULL DEFAULT '0',
-! `issue_status` int(11) NOT NULL DEFAULT '0',
-! `issue_component` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`issue_id`),
- KEY `issue_created` (`issue_created`),
- KEY `issue_updated` (`issue_updated`),
-***************
-*** 497,502 ****
---- 631,642 ----
- KEY `issue_component` (`issue_component`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `item`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `item` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
-***************
-*** 516,549 ****
- `author_xchan` char(255) NOT NULL DEFAULT '',
- `source_xchan` char(255) NOT NULL DEFAULT '',
- `mimetype` char(255) NOT NULL DEFAULT '',
-! `title` text NOT NULL DEFAULT '',
-! `body` mediumtext NOT NULL DEFAULT '',
- `app` char(255) NOT NULL DEFAULT '',
- `lang` char(64) NOT NULL DEFAULT '',
- `revision` int(10) unsigned NOT NULL DEFAULT '0',
- `verb` char(255) NOT NULL DEFAULT '',
- `obj_type` char(255) NOT NULL DEFAULT '',
-! `object` text NOT NULL DEFAULT '',
- `tgt_type` char(255) NOT NULL DEFAULT '',
-! `target` text NOT NULL DEFAULT '',
- `layout_mid` char(255) NOT NULL DEFAULT '',
-! `postopts` text NOT NULL DEFAULT '',
-! `route` text NOT NULL DEFAULT '',
- `llink` char(255) NOT NULL DEFAULT '',
- `plink` char(255) NOT NULL DEFAULT '',
- `resource_id` char(255) NOT NULL DEFAULT '',
- `resource_type` char(16) NOT NULL DEFAULT '',
-! `attach` mediumtext NOT NULL DEFAULT '',
-! `sig` text NOT NULL DEFAULT '',
-! `diaspora_meta` mediumtext NOT NULL DEFAULT '',
- `location` char(255) NOT NULL DEFAULT '',
- `coord` char(255) NOT NULL DEFAULT '',
- `public_policy` char(255) NOT NULL DEFAULT '',
- `comment_policy` char(255) NOT NULL DEFAULT '',
-! `allow_cid` mediumtext NOT NULL DEFAULT '',
-! `allow_gid` mediumtext NOT NULL DEFAULT '',
-! `deny_cid` mediumtext NOT NULL DEFAULT '',
-! `deny_gid` mediumtext NOT NULL DEFAULT '',
- `item_restrict` int(11) NOT NULL DEFAULT '0',
- `item_flags` int(11) NOT NULL DEFAULT '0',
- `item_private` tinyint(4) NOT NULL DEFAULT '0',
---- 656,689 ----
- `author_xchan` char(255) NOT NULL DEFAULT '',
- `source_xchan` char(255) NOT NULL DEFAULT '',
- `mimetype` char(255) NOT NULL DEFAULT '',
-! `title` text NOT NULL,
-! `body` mediumtext NOT NULL,
- `app` char(255) NOT NULL DEFAULT '',
- `lang` char(64) NOT NULL DEFAULT '',
- `revision` int(10) unsigned NOT NULL DEFAULT '0',
- `verb` char(255) NOT NULL DEFAULT '',
- `obj_type` char(255) NOT NULL DEFAULT '',
-! `object` text NOT NULL,
- `tgt_type` char(255) NOT NULL DEFAULT '',
-! `target` text NOT NULL,
- `layout_mid` char(255) NOT NULL DEFAULT '',
-! `postopts` text NOT NULL,
-! `route` text NOT NULL,
- `llink` char(255) NOT NULL DEFAULT '',
- `plink` char(255) NOT NULL DEFAULT '',
- `resource_id` char(255) NOT NULL DEFAULT '',
- `resource_type` char(16) NOT NULL DEFAULT '',
-! `attach` mediumtext NOT NULL,
-! `sig` text NOT NULL,
-! `diaspora_meta` mediumtext NOT NULL,
- `location` char(255) NOT NULL DEFAULT '',
- `coord` char(255) NOT NULL DEFAULT '',
- `public_policy` char(255) NOT NULL DEFAULT '',
- `comment_policy` char(255) NOT NULL DEFAULT '',
-! `allow_cid` mediumtext NOT NULL,
-! `allow_gid` mediumtext NOT NULL,
-! `deny_cid` mediumtext NOT NULL,
-! `deny_gid` mediumtext NOT NULL,
- `item_restrict` int(11) NOT NULL DEFAULT '0',
- `item_flags` int(11) NOT NULL DEFAULT '0',
- `item_private` tinyint(4) NOT NULL DEFAULT '0',
-***************
-*** 555,562 ****
- KEY `received` (`received`),
- KEY `uid_commented` (`uid`,`commented`),
- KEY `uid_created` (`uid`,`created`),
-- KEY `changed` (`changed`),
-- KEY `comments_closed` (`comments_closed`),
- KEY `aid` (`aid`),
- KEY `owner_xchan` (`owner_xchan`),
- KEY `author_xchan` (`author_xchan`),
---- 695,700 ----
-***************
-*** 573,581 ****
- KEY `mid` (`mid`),
- KEY `parent_mid` (`parent_mid`),
- KEY `uid_mid` (`mid`,`uid`),
-- KEY `public_policy` (`public_policy`),
- KEY `comment_policy` (`comment_policy`),
- KEY `layout_mid` (`layout_mid`),
- FULLTEXT KEY `title` (`title`),
- FULLTEXT KEY `body` (`body`),
- FULLTEXT KEY `allow_cid` (`allow_cid`),
---- 711,721 ----
- KEY `mid` (`mid`),
- KEY `parent_mid` (`parent_mid`),
- KEY `uid_mid` (`mid`,`uid`),
- KEY `comment_policy` (`comment_policy`),
- KEY `layout_mid` (`layout_mid`),
-+ KEY `public_policy` (`public_policy`),
-+ KEY `comments_closed` (`comments_closed`),
-+ KEY `changed` (`changed`),
- FULLTEXT KEY `title` (`title`),
- FULLTEXT KEY `body` (`body`),
- FULLTEXT KEY `allow_cid` (`allow_cid`),
-***************
-*** 584,595 ****
- FULLTEXT KEY `deny_gid` (`deny_gid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `item_id` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `iid` int(11) NOT NULL,
-! `uid` int(11) NOT NULL,
-! `sid` char(255) NOT NULL,
-! `service` char(255) NOT NULL,
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `sid` (`sid`),
---- 724,741 ----
- FULLTEXT KEY `deny_gid` (`deny_gid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `item_id`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `item_id` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `iid` int(11) NOT NULL DEFAULT '0',
-! `uid` int(11) NOT NULL DEFAULT '0',
-! `sid` char(255) NOT NULL DEFAULT '',
-! `service` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `sid` (`sid`),
-***************
-*** 597,621 ****
- KEY `iid` (`iid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `likes` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `channel_id` int(11) unsigned NOT NULL DEFAULT '0',
- `liker` char(128) NOT NULL DEFAULT '',
- `likee` char(128) NOT NULL DEFAULT '',
-! `iid` int(10) unsigned NOT NULL DEFAULT '0',
- `verb` char(255) NOT NULL DEFAULT '',
- `target_type` char(255) NOT NULL DEFAULT '',
- `target_id` char(128) NOT NULL DEFAULT '',
- `target` mediumtext NOT NULL,
- PRIMARY KEY (`id`),
-- KEY `channel_id` (`channel_id`),
- KEY `liker` (`liker`),
- KEY `likee` (`likee`),
- KEY `iid` (`iid`),
- KEY `verb` (`verb`),
- KEY `target_type` (`target_type`),
- KEY `target_id` (`target_id`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `mail` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
---- 743,779 ----
- KEY `iid` (`iid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `likes`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `likes` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
- `liker` char(128) NOT NULL DEFAULT '',
- `likee` char(128) NOT NULL DEFAULT '',
-! `iid` int(11) unsigned NOT NULL DEFAULT '0',
- `verb` char(255) NOT NULL DEFAULT '',
- `target_type` char(255) NOT NULL DEFAULT '',
- `target_id` char(128) NOT NULL DEFAULT '',
- `target` mediumtext NOT NULL,
- PRIMARY KEY (`id`),
- KEY `liker` (`liker`),
- KEY `likee` (`likee`),
- KEY `iid` (`iid`),
- KEY `verb` (`verb`),
- KEY `target_type` (`target_type`),
-+ KEY `channel_id` (`channel_id`),
- KEY `target_id` (`target_id`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `mail`
-! --
-
- CREATE TABLE IF NOT EXISTS `mail` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-***************
-*** 624,639 ****
- `from_xchan` char(255) NOT NULL DEFAULT '',
- `to_xchan` char(255) NOT NULL DEFAULT '',
- `account_id` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_id` int(10) unsigned NOT NULL,
- `title` text NOT NULL,
- `body` mediumtext NOT NULL,
- `attach` mediumtext NOT NULL,
-! `mid` char(255) NOT NULL,
-! `parent_mid` char(255) NOT NULL,
- `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (`id`),
-- KEY `convid` (`convid`),
- KEY `created` (`created`),
- KEY `mail_flags` (`mail_flags`),
- KEY `account_id` (`account_id`),
---- 782,796 ----
- `from_xchan` char(255) NOT NULL DEFAULT '',
- `to_xchan` char(255) NOT NULL DEFAULT '',
- `account_id` int(10) unsigned NOT NULL DEFAULT '0',
-! `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
- `title` text NOT NULL,
- `body` mediumtext NOT NULL,
- `attach` mediumtext NOT NULL,
-! `mid` char(255) NOT NULL DEFAULT '',
-! `parent_mid` char(255) NOT NULL DEFAULT '',
- `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (`id`),
- KEY `created` (`created`),
- KEY `mail_flags` (`mail_flags`),
- KEY `account_id` (`account_id`),
-***************
-*** 642,659 ****
- KEY `to_xchan` (`to_xchan`),
- KEY `mid` (`mid`),
- KEY `parent_mid` (`parent_mid`),
-! KEY `expires` (`expires`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `manage` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `uid` int(11) NOT NULL,
- `xchan` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `xchan` (`xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `menu` (
- `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
---- 799,829 ----
- KEY `to_xchan` (`to_xchan`),
- KEY `mid` (`mid`),
- KEY `parent_mid` (`parent_mid`),
-! KEY `expires` (`expires`),
-! KEY `convid` (`convid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `manage`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `manage` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `uid` int(11) NOT NULL DEFAULT '0',
- `xchan` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `xchan` (`xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `menu`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `menu` (
- `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 666,671 ****
---- 836,847 ----
- KEY `menu_flags` (`menu_flags`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `menu_item`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `menu_item` (
- `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `mitem_link` char(255) NOT NULL DEFAULT '',
-***************
-*** 675,681 ****
- `allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
- `deny_gid` mediumtext NOT NULL,
-! `mitem_channel_id` int(10) unsigned NOT NULL,
- `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0',
- `mitem_order` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`mitem_id`),
---- 851,857 ----
- `allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
- `deny_gid` mediumtext NOT NULL,
-! `mitem_channel_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',
- PRIMARY KEY (`mitem_id`),
-***************
-*** 684,705 ****
- KEY `mitem_flags` (`mitem_flags`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `notify` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `hash` char(64) NOT NULL,
-! `name` char(255) NOT NULL,
-! `url` char(255) NOT NULL,
-! `photo` char(255) NOT NULL,
-! `date` datetime NOT NULL,
- `msg` mediumtext NOT NULL,
-! `aid` int(11) NOT NULL,
-! `uid` int(11) NOT NULL,
-! `link` char(255) NOT NULL,
- `parent` char(255) NOT NULL DEFAULT '',
- `seen` tinyint(1) NOT NULL DEFAULT '0',
-! `type` int(11) NOT NULL,
-! `verb` char(255) NOT NULL,
-! `otype` char(16) NOT NULL,
- PRIMARY KEY (`id`),
- KEY `type` (`type`),
- KEY `seen` (`seen`),
---- 860,887 ----
- KEY `mitem_flags` (`mitem_flags`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `notify`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `notify` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `hash` char(64) NOT NULL DEFAULT '',
-! `name` char(255) NOT NULL DEFAULT '',
-! `url` char(255) NOT NULL DEFAULT '',
-! `photo` char(255) NOT NULL DEFAULT '',
-! `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `msg` mediumtext NOT NULL,
-! `aid` int(11) NOT NULL DEFAULT '0',
-! `uid` int(11) NOT NULL DEFAULT '0',
-! `link` char(255) NOT NULL DEFAULT '',
- `parent` char(255) NOT NULL DEFAULT '',
- `seen` tinyint(1) NOT NULL DEFAULT '0',
-! `type` int(11) NOT NULL DEFAULT '0',
-! `verb` char(255) NOT NULL DEFAULT '',
-! `otype` char(16) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `type` (`type`),
- KEY `seen` (`seen`),
-***************
-*** 712,717 ****
---- 894,905 ----
- KEY `aid` (`aid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `obj`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `obj` (
- `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `obj_page` char(64) NOT NULL DEFAULT '',
-***************
-*** 731,736 ****
---- 919,930 ----
- KEY `obj_obj` (`obj_obj`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `outq`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `outq` (
- `outq_hash` char(255) NOT NULL,
- `outq_account` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 753,786 ****
- KEY `outq_delivered` (`outq_delivered`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `pconfig` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `uid` int(11) NOT NULL DEFAULT '0',
-! `cat` char(255) CHARACTER SET ascii NOT NULL,
-! `k` char(255) CHARACTER SET ascii NOT NULL,
- `v` mediumtext NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `access` (`uid`,`cat`,`k`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `photo` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
-! `uid` int(10) unsigned NOT NULL,
- `xchan` char(255) NOT NULL DEFAULT '',
-! `resource_id` char(255) NOT NULL,
-! `created` datetime NOT NULL,
-! `edited` datetime NOT NULL,
-! `title` char(255) NOT NULL,
- `description` text NOT NULL,
-! `album` char(255) NOT NULL,
-! `filename` char(255) NOT NULL,
- `type` char(128) NOT NULL DEFAULT 'image/jpeg',
-! `height` smallint(6) NOT NULL,
-! `width` smallint(6) NOT NULL,
- `size` int(10) unsigned NOT NULL DEFAULT '0',
- `data` mediumblob NOT NULL,
-! `scale` tinyint(3) NOT NULL,
- `profile` tinyint(1) NOT NULL DEFAULT '0',
- `photo_flags` int(10) unsigned NOT NULL DEFAULT '0',
- `allow_cid` mediumtext NOT NULL,
---- 947,992 ----
- KEY `outq_delivered` (`outq_delivered`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `pconfig`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `pconfig` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `uid` int(11) NOT NULL DEFAULT '0',
-! `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
-! `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
- `v` mediumtext NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `access` (`uid`,`cat`,`k`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `photo`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `photo` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
-! `uid` int(10) unsigned NOT NULL DEFAULT '0',
- `xchan` char(255) NOT NULL DEFAULT '',
-! `resource_id` char(255) NOT NULL DEFAULT '',
-! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `title` char(255) NOT NULL DEFAULT '',
- `description` text NOT NULL,
-! `album` char(255) NOT NULL DEFAULT '',
-! `filename` char(255) NOT NULL DEFAULT '',
- `type` char(128) NOT NULL DEFAULT 'image/jpeg',
-! `height` smallint(6) NOT NULL DEFAULT '0',
-! `width` smallint(6) NOT NULL DEFAULT '0',
- `size` int(10) unsigned NOT NULL DEFAULT '0',
- `data` mediumblob NOT NULL,
-! `scale` tinyint(3) NOT NULL DEFAULT '0',
- `profile` tinyint(1) NOT NULL DEFAULT '0',
- `photo_flags` int(10) unsigned NOT NULL DEFAULT '0',
- `allow_cid` mediumtext NOT NULL,
-***************
-*** 800,805 ****
---- 1006,1017 ----
- KEY `resource_id` (`resource_id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `poll`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `poll` (
- `poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `poll_channel` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 812,817 ****
---- 1024,1035 ----
- KEY `poll_votes` (`poll_votes`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `poll_elm`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `poll_elm` (
- `pelm_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `pelm_poll` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 823,838 ****
- KEY `pelm_result` (`pelm_result`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `profdef` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `field_name` char(255) NOT NULL DEFAULT '',
- `field_type` char(16) NOT NULL DEFAULT '',
- `field_desc` char(255) NOT NULL DEFAULT '',
- `field_help` char(255) NOT NULL DEFAULT '',
-! `field_inputs` mediumtext NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `field_name` (`field_name`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `profext` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
---- 1041,1068 ----
- KEY `pelm_result` (`pelm_result`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `profdef`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `profdef` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `field_name` char(255) NOT NULL DEFAULT '',
- `field_type` char(16) NOT NULL DEFAULT '',
- `field_desc` char(255) NOT NULL DEFAULT '',
- `field_help` char(255) NOT NULL DEFAULT '',
-! `field_inputs` mediumtext NOT NULL,
- PRIMARY KEY (`id`),
- KEY `field_name` (`field_name`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `profext`
-! --
-
- CREATE TABLE IF NOT EXISTS `profext` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-***************
-*** 844,882 ****
- KEY `channel_id` (`channel_id`),
- KEY `hash` (`hash`),
- KEY `k` (`k`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `profile` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `profile_guid` char(64) NOT NULL DEFAULT '',
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
-! `uid` int(11) NOT NULL,
-! `profile_name` char(255) NOT NULL,
- `is_default` tinyint(1) NOT NULL DEFAULT '0',
- `hide_friends` tinyint(1) NOT NULL DEFAULT '0',
-! `name` char(255) NOT NULL,
-! `pdesc` char(255) NOT NULL,
- `chandesc` text NOT NULL,
- `dob` char(32) NOT NULL DEFAULT '0000-00-00',
- `dob_tz` char(255) NOT NULL DEFAULT 'UTC',
-! `address` char(255) NOT NULL,
-! `locality` char(255) NOT NULL,
-! `region` char(255) NOT NULL,
-! `postal_code` char(32) NOT NULL,
-! `country_name` char(255) NOT NULL,
-! `hometown` char(255) NOT NULL,
-! `gender` char(32) NOT NULL,
-! `marital` char(255) NOT NULL,
- `with` text NOT NULL,
- `howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `sexual` char(255) NOT NULL,
-! `politic` char(255) NOT NULL,
-! `religion` char(255) NOT NULL,
- `keywords` text NOT NULL,
- `likes` text NOT NULL,
- `dislikes` text NOT NULL,
- `about` text NOT NULL,
-! `summary` char(255) NOT NULL,
- `music` text NOT NULL,
- `book` text NOT NULL,
- `tv` text NOT NULL,
---- 1074,1118 ----
- KEY `channel_id` (`channel_id`),
- KEY `hash` (`hash`),
- KEY `k` (`k`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `profile`
-! --
-
- CREATE TABLE IF NOT EXISTS `profile` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `profile_guid` char(64) NOT NULL DEFAULT '',
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
-! `uid` int(11) NOT NULL DEFAULT '0',
-! `profile_name` char(255) NOT NULL DEFAULT '',
- `is_default` tinyint(1) NOT NULL DEFAULT '0',
- `hide_friends` tinyint(1) NOT NULL DEFAULT '0',
-! `name` char(255) NOT NULL DEFAULT '',
-! `pdesc` char(255) NOT NULL DEFAULT '',
- `chandesc` text NOT NULL,
- `dob` char(32) NOT NULL DEFAULT '0000-00-00',
- `dob_tz` char(255) NOT NULL DEFAULT 'UTC',
-! `address` char(255) NOT NULL DEFAULT '',
-! `locality` char(255) NOT NULL DEFAULT '',
-! `region` char(255) NOT NULL DEFAULT '',
-! `postal_code` char(32) NOT NULL DEFAULT '',
-! `country_name` char(255) NOT NULL DEFAULT '',
-! `hometown` char(255) NOT NULL DEFAULT '',
-! `gender` char(32) NOT NULL DEFAULT '',
-! `marital` char(255) NOT NULL DEFAULT '',
- `with` text NOT NULL,
- `howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `sexual` char(255) NOT NULL DEFAULT '',
-! `politic` char(255) NOT NULL DEFAULT '',
-! `religion` char(255) NOT NULL DEFAULT '',
- `keywords` text NOT NULL,
- `likes` text NOT NULL,
- `dislikes` text NOT NULL,
- `about` text NOT NULL,
-! `summary` char(255) NOT NULL DEFAULT '',
- `music` text NOT NULL,
- `book` text NOT NULL,
- `tv` text NOT NULL,
-***************
-*** 887,895 ****
- `education` text NOT NULL,
- `contact` text NOT NULL,
- `channels` text NOT NULL,
-! `homepage` char(255) NOT NULL,
-! `photo` char(255) NOT NULL,
-! `thumb` char(255) NOT NULL,
- `publish` tinyint(1) NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
- UNIQUE KEY `guid` (`profile_guid`,`uid`),
---- 1123,1131 ----
- `education` text NOT NULL,
- `contact` text NOT NULL,
- `channels` text NOT NULL,
-! `homepage` char(255) NOT NULL DEFAULT '',
-! `photo` char(255) NOT NULL DEFAULT '',
-! `thumb` char(255) NOT NULL DEFAULT '',
- `publish` tinyint(1) NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
- UNIQUE KEY `guid` (`profile_guid`,`uid`),
-***************
-*** 908,920 ****
- KEY `profile_guid` (`profile_guid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `profile_check` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `uid` int(10) unsigned NOT NULL,
- `cid` int(10) unsigned NOT NULL DEFAULT '0',
-! `dfrn_id` char(255) NOT NULL,
-! `sec` char(255) NOT NULL,
-! `expire` int(11) NOT NULL,
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `cid` (`cid`),
---- 1144,1162 ----
- KEY `profile_guid` (`profile_guid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `profile_check`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `profile_check` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `uid` int(10) unsigned NOT NULL DEFAULT '0',
- `cid` int(10) unsigned NOT NULL DEFAULT '0',
-! `dfrn_id` char(255) NOT NULL DEFAULT '',
-! `sec` char(255) NOT NULL DEFAULT '',
-! `expire` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
- KEY `cid` (`cid`),
-***************
-*** 923,951 ****
- KEY `expire` (`expire`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `register` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `hash` char(255) NOT NULL,
-! `created` datetime NOT NULL,
-! `uid` int(10) unsigned NOT NULL,
-! `password` char(255) NOT NULL,
-! `language` char(16) NOT NULL,
- PRIMARY KEY (`id`),
- KEY `hash` (`hash`),
- KEY `created` (`created`),
- KEY `uid` (`uid`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `session` (
- `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-! `sid` char(255) NOT NULL,
- `data` text NOT NULL,
-! `expire` bigint(20) unsigned NOT NULL,
- PRIMARY KEY (`id`),
- KEY `sid` (`sid`),
- KEY `expire` (`expire`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `shares` (
- `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `share_type` int(11) NOT NULL DEFAULT '0',
---- 1165,1211 ----
- KEY `expire` (`expire`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `register`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `register` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `hash` char(255) NOT NULL DEFAULT '',
-! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-! `uid` int(10) unsigned NOT NULL DEFAULT '0',
-! `password` char(255) NOT NULL DEFAULT '',
-! `language` char(16) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `hash` (`hash`),
- KEY `created` (`created`),
- KEY `uid` (`uid`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `session`
-! --
-
- CREATE TABLE IF NOT EXISTS `session` (
- `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-! `sid` char(255) NOT NULL DEFAULT '',
- `data` text NOT NULL,
-! `expire` bigint(20) unsigned NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
- KEY `sid` (`sid`),
- KEY `expire` (`expire`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `shares`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `shares` (
- `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `share_type` int(11) NOT NULL DEFAULT '0',
-***************
-*** 957,974 ****
- KEY `share_xchan` (`share_xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `sign` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `iid` int(10) unsigned NOT NULL DEFAULT '0',
- `retract_iid` int(10) unsigned NOT NULL DEFAULT '0',
- `signed_text` mediumtext NOT NULL,
- `signature` text NOT NULL,
-! `signer` char(255) NOT NULL,
- PRIMARY KEY (`id`),
- KEY `iid` (`iid`),
- KEY `retract_iid` (`retract_iid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `site` (
- `site_url` char(255) NOT NULL,
- `site_access` int(11) NOT NULL DEFAULT '0',
---- 1217,1246 ----
- KEY `share_xchan` (`share_xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `sign`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `sign` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `iid` int(10) unsigned NOT NULL DEFAULT '0',
- `retract_iid` int(10) unsigned NOT NULL DEFAULT '0',
- `signed_text` mediumtext NOT NULL,
- `signature` text NOT NULL,
-! `signer` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`id`),
- KEY `iid` (`iid`),
- KEY `retract_iid` (`retract_iid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `site`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `site` (
- `site_url` char(255) NOT NULL,
- `site_access` int(11) NOT NULL DEFAULT '0',
-***************
-*** 988,996 ****
---- 1260,1275 ----
- KEY `site_register` (`site_register`),
- KEY `site_access` (`site_access`),
- KEY `site_sellpage` (`site_sellpage`),
-+ KEY `site_pull` (`site_pull`),
- KEY `site_realm` (`site_realm`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `source`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `source` (
- `src_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `src_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 1003,1014 ****
- KEY `src_xchan` (`src_xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `spam` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `uid` int(11) NOT NULL,
- `spam` int(11) NOT NULL DEFAULT '0',
- `ham` int(11) NOT NULL DEFAULT '0',
-! `term` char(255) NOT NULL,
- `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
---- 1282,1299 ----
- KEY `src_xchan` (`src_xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `spam`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `spam` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
-! `uid` int(11) NOT NULL DEFAULT '0',
- `spam` int(11) NOT NULL DEFAULT '0',
- `ham` int(11) NOT NULL DEFAULT '0',
-! `term` char(255) NOT NULL DEFAULT '',
- `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (`id`),
- KEY `uid` (`uid`),
-***************
-*** 1017,1041 ****
- KEY `term` (`term`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `sys_perms` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `cat` char(255) NOT NULL,
-! `k` char(255) NOT NULL,
- `v` mediumtext NOT NULL,
-! `public_perm` tinyint(1) unsigned NOT NULL,
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `term` (
- `tid` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
- `uid` int(10) unsigned NOT NULL DEFAULT '0',
-! `oid` int(10) unsigned NOT NULL,
-! `otype` tinyint(3) unsigned NOT NULL,
-! `type` tinyint(3) unsigned NOT NULL,
-! `term` char(255) NOT NULL,
-! `url` char(255) NOT NULL,
-! `imgurl` char(255) NOT NULL,
- `term_hash` char(255) NOT NULL DEFAULT '',
- `parent_hash` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`tid`),
---- 1302,1338 ----
- KEY `term` (`term`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `sys_perms`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `sys_perms` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `cat` char(255) NOT NULL DEFAULT '',
-! `k` char(255) NOT NULL DEFAULT '',
- `v` mediumtext NOT NULL,
-! `public_perm` tinyint(1) unsigned NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `term`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `term` (
- `tid` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `aid` int(10) unsigned NOT NULL DEFAULT '0',
- `uid` int(10) unsigned NOT NULL DEFAULT '0',
-! `oid` int(10) unsigned NOT NULL DEFAULT '0',
-! `otype` tinyint(3) unsigned NOT NULL DEFAULT '0',
-! `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-! `term` char(255) NOT NULL DEFAULT '',
-! `url` char(255) NOT NULL DEFAULT '',
-! `imgurl` char(255) NOT NULL DEFAULT '',
- `term_hash` char(255) NOT NULL DEFAULT '',
- `parent_hash` char(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`tid`),
-***************
-*** 1050,1071 ****
- KEY `parent_hash` (`parent_hash`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `tokens` (
-! `id` varchar(40) NOT NULL,
- `secret` text NOT NULL,
-! `client_id` varchar(20) NOT NULL,
-! `expires` bigint(20) unsigned NOT NULL,
-! `scope` varchar(200) NOT NULL,
-! `uid` int(11) NOT NULL,
- PRIMARY KEY (`id`),
- KEY `client_id` (`client_id`),
- KEY `expires` (`expires`),
- KEY `uid` (`uid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `updates` (
- `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `ud_hash` char(128) NOT NULL,
- `ud_guid` char(255) NOT NULL DEFAULT '',
- `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `ud_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
---- 1347,1380 ----
- KEY `parent_hash` (`parent_hash`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `tokens`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `tokens` (
-! `id` varchar(40) NOT NULL DEFAULT '',
- `secret` text NOT NULL,
-! `client_id` varchar(20) NOT NULL DEFAULT '',
-! `expires` bigint(20) unsigned NOT NULL DEFAULT '0',
-! `scope` varchar(200) NOT NULL DEFAULT '',
-! `uid` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
- KEY `client_id` (`client_id`),
- KEY `expires` (`expires`),
- KEY `uid` (`uid`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `updates`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `updates` (
- `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `ud_hash` char(128) NOT NULL DEFAULT '',
- `ud_guid` char(255) NOT NULL DEFAULT '',
- `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `ud_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-***************
-*** 1080,1085 ****
---- 1389,1400 ----
- KEY `ud_last` (`ud_last`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `verify`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `verify` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `channel` int(10) unsigned NOT NULL DEFAULT '0',
-***************
-*** 1095,1100 ****
---- 1410,1421 ----
- KEY `created` (`created`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `vote`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `vote` (
- `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `vote_poll` int(11) NOT NULL DEFAULT '0',
-***************
-*** 1107,1112 ****
---- 1428,1439 ----
- KEY `vote_element` (`vote_element`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `xchan`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `xchan` (
- `xchan_hash` char(255) NOT NULL,
- `xchan_guid` char(255) NOT NULL DEFAULT '',
-***************
-*** 1139,1144 ****
---- 1466,1477 ----
- KEY `xchan_follow` (`xchan_follow`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `xchat`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `xchat` (
- `xchat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `xchat_url` char(255) NOT NULL DEFAULT '',
-***************
-*** 1150,1162 ****
- KEY `xchat_desc` (`xchat_desc`),
- KEY `xchat_xchan` (`xchat_xchan`),
- KEY `xchat_edited` (`xchat_edited`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `xconfig` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `xchan` char(255) NOT NULL,
-! `cat` char(255) NOT NULL,
-! `k` char(255) NOT NULL,
- `v` mediumtext NOT NULL,
- PRIMARY KEY (`id`),
- KEY `xchan` (`xchan`),
---- 1483,1501 ----
- KEY `xchat_desc` (`xchat_desc`),
- KEY `xchat_xchan` (`xchat_xchan`),
- KEY `xchat_edited` (`xchat_edited`)
-! ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-!
-! -- --------------------------------------------------------
-!
-! --
-! -- Table structure for table `xconfig`
-! --
-
- CREATE TABLE IF NOT EXISTS `xconfig` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `xchan` char(255) NOT NULL DEFAULT '',
-! `cat` char(255) NOT NULL DEFAULT '',
-! `k` char(255) NOT NULL DEFAULT '',
- `v` mediumtext NOT NULL,
- PRIMARY KEY (`id`),
- KEY `xchan` (`xchan`),
-***************
-*** 1164,1169 ****
---- 1503,1514 ----
- KEY `k` (`k`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `xign`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `xign` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `uid` int(11) NOT NULL DEFAULT '0',
-***************
-*** 1173,1178 ****
---- 1518,1529 ----
- KEY `xchan` (`xchan`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `xlink`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `xlink` (
- `xlink_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `xlink_xchan` char(255) NOT NULL DEFAULT '',
-***************
-*** 1186,1191 ****
---- 1537,1548 ----
- KEY `xlink_rating` (`xlink_rating`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `xprof`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `xprof` (
- `xprof_hash` char(255) NOT NULL,
- `xprof_age` tinyint(3) unsigned NOT NULL DEFAULT '0',
-***************
-*** 1216,1224 ****
- KEY `xprof_hometown` (`xprof_hometown`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE IF NOT EXISTS `xtag` (
- `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `xtag_hash` char(255) NOT NULL,
- `xtag_term` char(255) NOT NULL DEFAULT '',
- `xtag_flags` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`xtag_id`),
---- 1573,1587 ----
- KEY `xprof_hometown` (`xprof_hometown`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-+ -- --------------------------------------------------------
-+
-+ --
-+ -- Table structure for table `xtag`
-+ --
-+
- CREATE TABLE IF NOT EXISTS `xtag` (
- `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-! `xtag_hash` char(255) NOT NULL DEFAULT '',
- `xtag_term` char(255) NOT NULL DEFAULT '',
- `xtag_flags` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`xtag_id`),
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index cb4a3fa74..e7550455f 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -269,24 +269,6 @@ CREATE TABLE IF NOT EXISTS `channel` (
`channel_allow_gid` mediumtext NOT NULL,
`channel_deny_cid` mediumtext NOT NULL,
`channel_deny_gid` mediumtext NOT NULL,
- `channel_r_stream` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_r_profile` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_r_photos` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_r_abook` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_stream` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_wall` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_comment` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_mail` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_photos` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_chat` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_r_storage` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_storage` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_r_pages` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_pages` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_a_republish` int(10) unsigned NOT NULL DEFAULT 0 ,
- `channel_w_like` int(10) unsigned NOT NULL DEFAULT 0 ,
`channel_removed` tinyint(1) NOT NULL DEFAULT 0 ,
`channel_system` tinyint(1) NOT NULL DEFAULT 0 ,
`channel_moved` char(191) NOT NULL DEFAULT '',
@@ -683,7 +665,7 @@ CREATE TABLE IF NOT EXISTS `item` (
KEY `mimetype` (`mimetype`),
KEY `mid` (`mid`),
KEY `parent_mid` (`parent_mid`),
- KEY `uid_mid` (`mid`,`uid`),
+ KEY `uid_mid` (`uid`,`mid`),
KEY `comment_policy` (`comment_policy`),
KEY `layout_mid` (`layout_mid`),
KEY `public_policy` (`public_policy`),
@@ -1342,7 +1324,8 @@ CREATE TABLE IF NOT EXISTS `xchan` (
KEY `xchan_selfcensored` (`xchan_selfcensored`),
KEY `xchan_system` (`xchan_system`),
KEY `xchan_pubforum` (`xchan_pubforum`),
- KEY `xchan_deleted` (`xchan_deleted`)
+ KEY `xchan_deleted` (`xchan_deleted`),
+ KEY `xchan_photo_m` (`xchan_photo_m`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `xchat` (
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index e56e054b0..c1c222b37 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -650,7 +650,7 @@ create index "item_revision" on item ("revision");
create index "item_mimetype" on item ("mimetype");
create index "item_mid" on item ("mid");
create index "item_parent_mid" on item ("parent_mid");
-create index "item_uid_mid" on item ("mid","uid");
+create index "item_uid_mid" on item ("uid","mid");
create index "item_public_policy" on item ("public_policy");
create index "item_comment_policy" on item ("comment_policy");
create index "item_layout_mid" on item ("layout_mid");
@@ -1312,6 +1312,7 @@ create index "xchan_selfcensored" on xchan ("xchan_selfcensored");
create index "xchan_system" on xchan ("xchan_system");
create index "xchan_pubforum" on xchan ("xchan_pubforum");
create index "xchan_deleted" on xchan ("xchan_deleted");
+create index "xchan_photo_m" on xchan ("xchan_photo_m");
CREATE TABLE "xchat" (
"xchat_id" serial NOT NULL,
diff --git a/view/js/main.js b/view/js/main.js
index 5592fd63d..48159e6e8 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1160,15 +1160,12 @@ function doreply(parent, ident, owner, hint) {
}
function doscroll(parent, hidden) {
- var back = $('.back-to-reply');
- if(back.length == 0) {
- var pos = Math.round($(window).scrollTop());
- }
- else {
- var pos = back.attr('href').replace(/\D/g,'')
- }
- back.remove();
var x = '#hide-comments-outer-' + hidden.toString();
+ var back = $('.back-to-reply');
+ if(back.length == 0)
+ var pos = $(window).scrollTop();
+ else
+ var pos = back.attr('href').replace(/[^\d|\.]/g,'');
if($(x).length !== 0) {
x = $(x).attr("onclick").replace(/\D/g,'');
var c = '#collapsed-comments-' + x;
@@ -1177,6 +1174,7 @@ function doscroll(parent, hidden) {
pos += $(c).height();
}
}
+ back.remove();
var id = $('[data-mid="' + parent + '"]');
$('html, body').animate({scrollTop:(id.offset().top) - 50}, 'slow');
$('<a href="javascript:doscrollback(' + pos + ');" class="back-to-reply" title="' + aStr['to_reply'] + '"><i class="fa fa-angle-double-down float-right">&nbsp;&nbsp;&nbsp;</i></a>').insertBefore('#wall-item-info-' + id.attr('id').replace(/\D/g,''));
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index b8e7946c2..8d3b795cc 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -21,8 +21,7 @@ $(document).ready(function() {
$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
- spacer: '.aside_spacer',
- recalc_every: 10
+ spacer: '.aside_spacer'
});
}
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 88a322339..22579227a 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -63,6 +63,11 @@ $(document).ready(function() {
event_uri = '';
$('#id_title').val('New event');
+ $('#id_title').attr('disabled', false);
+ $('#id_dtstart').attr('disabled', false);
+ $('#id_dtend').attr('disabled', false);
+ $('#id_description').attr('disabled', false);
+ $('#id_location').attr('disabled', false);
$('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false);
$('#id_dtstart').val(info.date.toUTCString());
$('#id_dtend').val(dtend ? dtend.toUTCString() : '');
@@ -102,6 +107,11 @@ $(document).ready(function() {
$('.section-content-tools-wrapper, #event_form_wrapper').show();
$('#recurrence_warning').hide();
$('#id_title').focus().val('');
+ $('#id_title').attr('disabled', false);
+ $('#id_dtstart').attr('disabled', false);
+ $('#id_dtend').attr('disabled', false);
+ $('#id_description').attr('disabled', false);
+ $('#id_location').attr('disabled', false);
return false;
}
@@ -186,7 +196,6 @@ $(document).ready(function() {
'event_id': event_id,
'event_hash': event_uri,
'xchan': event_xchan,
- //'mid': mid,
'type': 'event',
'preview': 0,
'summary': event.title,
@@ -196,7 +205,6 @@ $(document).ready(function() {
'categories': event.extendedProps.categories,
'desc': event.extendedProps.description,
'location': event.extendedProps.location,
- //'submit': $('#event_submit').val()
})
.fail(function() {
info.revert();
@@ -234,7 +242,6 @@ $(document).ready(function() {
'event_id': event_id,
'event_hash': event_uri,
'xchan': event_xchan,
- //'mid': mid,
'type': 'event',
'preview': 0,
'summary': event.title,
@@ -244,7 +251,6 @@ $(document).ready(function() {
'categories': event.extendedProps.categories,
'desc': event.extendedProps.description,
'location': event.extendedProps.location,
- //'submit': $('#event_submit').val()
})
.fail(function() {
info.revert();
@@ -406,7 +412,6 @@ function on_submit() {
'event_id': event_id,
'event_hash': event_uri,
'xchan': event_xchan,
- //'mid': mid,
'type': 'event',
'preview': 0,
'summary': $('#id_title').val(),
@@ -416,7 +421,6 @@ function on_submit() {
'categories': $('#id_categories').val(),
'desc': $('#id_description').val(),
'location': $('#id_location').val(),
- //'submit': $('#event_submit').val(),
'contact_allow[]': contact_allow,
'group_allow[]': group_allow,
'contact_deny[]': contact_deny,
@@ -508,11 +512,7 @@ function on_more() {
}
function exportDate() {
- alert('not implemented');
- console.log('not implemented');
- //var moment = $('#events-calendar').fullCalendar('getDate');
- //var sT = 'events/' + moment.year() + '/' + (moment.month() + 1) + '/export';
- //window.location.href=sT;
+ window.location.href= 'channel_calendar/export';
}
</script>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 14:11:15 +0000