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

Merge branch '3.8RC'

Browse Source
This commit is contained in:
Mario Vavti
2018-10-19 11:18:28 +02:00
parent 32de123db0 06b3ad1071
commit fa9e9510e5
862 changed files with 98136 additions and 29195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install/INSTALL.txt
View File

@@ -89,9 +89,10 @@ web server platforms.
php.ini file - and with no hosting provider restrictions on the use of
exec() and proc_open().
- curl, gd (with at least jpeg and png support), mysqli, mbstring, xml, zip
and openssl extensions. The imagick extension MAY be used instead of gd,
but is not required and MAY also be disabled via configuration option.
- curl, gd (with at least jpeg and png support), mysqli, mbstring, xml,
xmlreader (FreeBSD), zip and openssl extensions. The imagick extension MAY be used
instead of gd, but is not required and MAY also be disabled via
configuration option.
- some form of email server or email gateway such that PHP mail() works.
@@ -229,7 +230,7 @@ Change "/base/directory", and "/path/to/php" as appropriate for your situation.
If you are using a Linux server, run "crontab -e" and add a line like the
one shown, substituting for your unique paths and settings:
*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php Zotlabs/Daemon/Master.php Cron
*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php Zotlabs/Daemon/Master.php Cron > /dev/null 2>&1
You can generally find the location of PHP by executing "which php". If you
have troubles with this section please contact your hosting provider for

23
install/schema_mysql.sql
View File

@@ -1,4 +1,3 @@
CREATE TABLE IF NOT EXISTS `abconfig` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`chan` int(10) unsigned NOT NULL DEFAULT 0 ,
@@ -127,6 +126,7 @@ CREATE TABLE IF NOT EXISTS `app` (
`app_deleted` int(11) NOT NULL DEFAULT 0 ,
`app_system` int(11) NOT NULL DEFAULT 0 ,
`app_plugin` char(191) NOT NULL DEFAULT '',
`app_options` int(11) NOT NULL DEFAULT 0 ,
`app_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
`app_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY (`id`),
@@ -461,7 +461,7 @@ CREATE TABLE IF NOT EXISTS `event` (
KEY `event_priority` (`event_priority`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `groups` (
CREATE TABLE IF NOT EXISTS `pgrp` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`hash` char(191) NOT NULL DEFAULT '',
`uid` int(10) unsigned NOT NULL DEFAULT 0 ,
@@ -476,7 +476,7 @@ CREATE TABLE IF NOT EXISTS `groups` (
KEY `gname` (`gname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `group_member` (
CREATE TABLE IF NOT EXISTS `pgrp_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 ,
@@ -500,10 +500,12 @@ CREATE TABLE IF NOT EXISTS `hook` (
KEY `hook_version` (`hook_version`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `hubloc` (
`hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`hubloc_guid` char(191) NOT NULL DEFAULT '',
`hubloc_guid_sig` text NOT NULL,
`hubloc_id_url` char(191) NOT NULL DEFAULT '',
`hubloc_hash` char(191) NOT NULL DEFAULT '',
`hubloc_addr` char(191) NOT NULL DEFAULT '',
`hubloc_network` char(32) NOT NULL DEFAULT '',
@@ -511,6 +513,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
`hubloc_status` int(10) unsigned NOT NULL DEFAULT 0 ,
`hubloc_url` char(191) NOT NULL DEFAULT '',
`hubloc_url_sig` text NOT NULL,
`hubloc_site_id` char(191) NOT NULL DEFAULT '',
`hubloc_host` char(191) NOT NULL DEFAULT '',
`hubloc_callback` char(191) NOT NULL DEFAULT '',
`hubloc_connect` char(191) NOT NULL DEFAULT '',
@@ -523,7 +526,9 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
`hubloc_deleted` tinyint(1) NOT NULL DEFAULT 0 ,
PRIMARY KEY (`hubloc_id`),
KEY `hubloc_url` (`hubloc_url`),
KEY `hubloc_site_id` (`hubloc_site_id`),
KEY `hubloc_guid` (`hubloc_guid`),
KEY `hubloc_id_url` (`hubloc_id_url`),
KEY `hubloc_hash` (`hubloc_hash`),
KEY `hubloc_flags` (`hubloc_flags`),
KEY `hubloc_connect` (`hubloc_connect`),
@@ -539,7 +544,6 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
KEY `hubloc_error` (`hubloc_error`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `iconfig` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`iid` int(11) NOT NULL DEFAULT 0 ,
@@ -731,6 +735,17 @@ CREATE TABLE IF NOT EXISTS `likes` (
KEY `target_id` (`target_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS listeners (
id int(11) NOT NULL AUTO_INCREMENT,
target_id varchar(191) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
portable_id varchar(191) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
ltype int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (id),
KEY target_id (target_id),
KEY portable_id (portable_id),
KEY ltype (ltype)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `mail` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`convid` int(10) unsigned NOT NULL DEFAULT 0 ,

35
install/schema_postgres.sql
View File

@@ -125,6 +125,7 @@ CREATE TABLE "app" (
"app_deleted" smallint NOT NULL DEFAULT 0 ,
"app_system" smallint NOT NULL DEFAULT 0 ,
"app_plugin" text NOT NULL DEFAULT '',
"app_options" smallint NOT NULL DEFAULT '0',
"app_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"app_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY ("id")
@@ -433,18 +434,18 @@ create index "event_status_idx" on event ("event_status");
create index "event_sequence_idx" on event ("event_sequence");
create index "event_priority_idx" on event ("event_priority");
CREATE TABLE "group_member" (
CREATE TABLE "pgrp_member" (
"id" serial NOT NULL,
"uid" bigint NOT NULL,
"gid" bigint NOT NULL,
"xchan" text NOT NULL DEFAULT '',
PRIMARY KEY ("id")
);
create index "groupmember_uid" on group_member ("uid");
create index "groupmember_gid" on group_member ("gid");
create index "groupmember_xchan" on group_member ("xchan");
create index "groupmember_uid" on pgrp_member ("uid");
create index "groupmember_gid" on pgrp_member ("gid");
create index "groupmember_xchan" on pgrp_member ("xchan");
CREATE TABLE "groups" (
CREATE TABLE "pgrp" (
"id" serial NOT NULL,
"hash" text NOT NULL DEFAULT '',
"uid" bigint NOT NULL,
@@ -454,10 +455,10 @@ CREATE TABLE "groups" (
PRIMARY KEY ("id")
);
create index "groups_uid_idx" on groups ("uid");
create index "groups_visible_idx" on groups ("visible");
create index "groups_deleted_idx" on groups ("deleted");
create index "groups_hash_idx" on groups ("hash");
create index "groups_uid_idx" on pgrp ("uid");
create index "groups_visible_idx" on pgrp ("visible");
create index "groups_deleted_idx" on pgrp ("deleted");
create index "groups_hash_idx" on pgrp ("hash");
CREATE TABLE "hook" (
"id" serial NOT NULL,
@@ -473,10 +474,12 @@ create index "hook_idx" on hook ("hook");
create index "hook_version_idx" on hook ("hook_version");
create index "hook_priority_idx" on hook ("priority");
CREATE TABLE "hubloc" (
"hubloc_id" serial NOT NULL,
"hubloc_guid" text NOT NULL DEFAULT '',
"hubloc_guid_sig" text NOT NULL DEFAULT '',
"hubloc_id_url" text NOT NULL DEFAULT '',
"hubloc_hash" text NOT NULL,
"hubloc_addr" text NOT NULL DEFAULT '',
"hubloc_network" text NOT NULL DEFAULT '',
@@ -484,6 +487,7 @@ CREATE TABLE "hubloc" (
"hubloc_status" bigint NOT NULL DEFAULT 0 ,
"hubloc_url" text NOT NULL DEFAULT '',
"hubloc_url_sig" text NOT NULL DEFAULT '',
"hubloc_site_id" text NOT NULL DEFAULT '',
"hubloc_host" text NOT NULL DEFAULT '',
"hubloc_callback" text NOT NULL DEFAULT '',
"hubloc_connect" text NOT NULL DEFAULT '',
@@ -497,7 +501,9 @@ CREATE TABLE "hubloc" (
PRIMARY KEY ("hubloc_id")
);
create index "hubloc_url" on hubloc ("hubloc_url");
create index "hubloc_site_id" on hubloc ("hubloc_site_id");
create index "hubloc_guid" on hubloc ("hubloc_guid");
create index "hubloc_id_url" on hubloc ("hubloc_id_url");
create index "hubloc_flags" on hubloc ("hubloc_flags");
create index "hubloc_connect" on hubloc ("hubloc_connect");
create index "hubloc_host" on hubloc ("hubloc_host");
@@ -712,6 +718,17 @@ create index "likes_i_mid" on likes ("i_mid");
create index "likes_verb" on likes ("verb");
create index "likes_target_type" on likes ("target_type");
create index "likes_target_id" on likes ("target_id");
CREATE TABLE listeners (
id serial NOT NULL,
target_id text NOT NULL,
portable_id text NOT NULL,
ltype smallint NOT NULL DEFAULT '0',
PRIMARY KEY (id)
);
create index "target_id_idx" on listeners ("target_id");
create index "portable_id_idx" on listeners ("portable_id");
create index "ltype_idx" on listeners ("ltype");
CREATE TABLE "mail" (
"id" serial NOT NULL,
"convid" bigint NOT NULL DEFAULT 0 ,