From 97015162282989913d6b54c373af3b73b8043bad Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 28 Jul 2018 17:17:12 -0700
Subject: fix unsanitised xchan_name

---
 Zotlabs/Update/_1216.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 Zotlabs/Update/_1216.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1216.php b/Zotlabs/Update/_1216.php
new file mode 100644
index 000000000..843567633
--- /dev/null
+++ b/Zotlabs/Update/_1216.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1215 {
+
+	function run() {
+
+		$r = q("UPDATE xchan set xchan_name = 'unknown' where xchan_name like '%<%' ");
+
+		if($r) {
+			return UPDATE_SUCCESS;
+		}
+		else {        
+			return UPDATE_FAILED;
+		}
+	}
+
+}
-- 
cgit v1.2.3


From 9dc5a3bfc9152f04b9e39d61e90310d660029108 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 29 Jul 2018 17:59:40 -0700
Subject: this may conflict

---
 Zotlabs/Update/_1216.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1216.php b/Zotlabs/Update/_1216.php
index 843567633..69f2be15a 100644
--- a/Zotlabs/Update/_1216.php
+++ b/Zotlabs/Update/_1216.php
@@ -2,11 +2,11 @@
 
 namespace Zotlabs\Update;
 
-class _1215 {
+class _1216 {
 
 	function run() {
 
-		$r = q("UPDATE xchan set xchan_name = 'unknown' where xchan_name like '%<%' ");
+		$r = dbq("UPDATE xchan set xchan_name = 'unknown' where xchan_name like '%<%' ");
 
 		if($r) {
 			return UPDATE_SUCCESS;
-- 
cgit v1.2.3


From d908f53607512b8bfa3fbf65cb6fc9623fab5c63 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 2 Aug 2018 22:49:30 -0700
Subject: add app_options field

---
 Zotlabs/Update/_1217.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 Zotlabs/Update/_1217.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1217.php b/Zotlabs/Update/_1217.php
new file mode 100644
index 000000000..15d2d06b3
--- /dev/null
+++ b/Zotlabs/Update/_1217.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1217 {
+
+	function run() {
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+			$r = q("ALTER TABLE app ADD app_options smallint NOT NULL DEFAULT '0' ");
+		}
+		else {
+			$r = q("ALTER TABLE app ADD app_options int(11) NOT NULL DEFAULT 0 ");
+			
+		}
+
+		if($r) {
+			return UPDATE_SUCCESS;
+		}
+		return UPDATE_FAILED;
+	}
+}
+
-- 
cgit v1.2.3


From f15c1c4e54a49d1e76747ca5e3034ca2cef909aa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Aug 2018 21:18:20 -0700
Subject: hubloc DB changes needed for z6

---
 Zotlabs/Update/_1218.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Zotlabs/Update/_1218.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1218.php b/Zotlabs/Update/_1218.php
new file mode 100644
index 000000000..67d8b49a5
--- /dev/null
+++ b/Zotlabs/Update/_1218.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1218 {
+
+	function run() {
+
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+			$r1 = q("ALTER TABLE hubloc add hubloc_id_url text NOT NULL");
+			$r2 = q("create index \"hubloc_id_url\" on hubloc (\"hubloc_id_url\")");
+			$r3 = q("ALTER TABLE hubloc add hubloc_site_id text NOT NULL");
+			$r4 = q("create index \"hubloc_site_id\" on hubloc (\"hubloc_site_id\")");
+
+			$r = $r1 && $r2 && $r3 && $r4;
+		}
+
+		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+			$r1 = q("ALTER TABLE hubloc add hubloc_id_url varchar(191) NOT NULL, ADD INDEX hubloc_id_url (hubloc_id_url)");
+			$r2 = q("ALTER TABLE hubloc add hubloc_site_id varchar(191) NOT NULL, ADD INDEX hubloc_site_id (hubloc_site_id)");
+
+			$r = $r1 && $r2;
+		}
+
+		if($r)
+			return UPDATE_SUCCESS;
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3


From 42093aedcf9af8433ad9764116b98182e4fba658 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Aug 2018 13:57:36 +0200
Subject: db update to get rid of bogus activitypub xchans which got created
 due to a bug in the pubcrawl addon

---
 Zotlabs/Update/_1219.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Zotlabs/Update/_1219.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1219.php b/Zotlabs/Update/_1219.php
new file mode 100644
index 000000000..be2534001
--- /dev/null
+++ b/Zotlabs/Update/_1219.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1219 {
+
+	function run() {
+		q("START TRANSACTION");
+
+		$r = q("DELETE FROM xchan WHERE
+			xchan_hash like '%s' AND
+			xchan_network = 'activitypub'",
+			dbesc(z_root()) . '%'
+		);
+
+		if($r) {
+			q("COMMIT");
+			return UPDATE_SUCCESS;
+		}
+		else {        
+			q("ROLLBACK");
+			return UPDATE_FAILED;
+		}
+	}
+
+}
-- 
cgit v1.2.3


From d377660b5a8800fdce33bbafcc166a8b2a6076d1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 31 Aug 2018 20:26:31 +0200
Subject: update 1218: missing default value for pg

---
 Zotlabs/Update/_1218.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1218.php b/Zotlabs/Update/_1218.php
index 67d8b49a5..07c7dba20 100644
--- a/Zotlabs/Update/_1218.php
+++ b/Zotlabs/Update/_1218.php
@@ -7,9 +7,9 @@ class _1218 {
 	function run() {
 
 		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
-			$r1 = q("ALTER TABLE hubloc add hubloc_id_url text NOT NULL");
+			$r1 = q("ALTER TABLE hubloc add hubloc_id_url text NOT NULL DEFAULT ''");
 			$r2 = q("create index \"hubloc_id_url\" on hubloc (\"hubloc_id_url\")");
-			$r3 = q("ALTER TABLE hubloc add hubloc_site_id text NOT NULL");
+			$r3 = q("ALTER TABLE hubloc add hubloc_site_id text NOT NULL DEFAULT ''");
 			$r4 = q("create index \"hubloc_site_id\" on hubloc (\"hubloc_site_id\")");
 
 			$r = $r1 && $r2 && $r3 && $r4;
-- 
cgit v1.2.3


From be3b6304742a6c39d73674b1f7422c029e7cd804 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 9 Sep 2018 20:53:20 -0700
Subject: important hyperdrive component

---
 Zotlabs/Update/_1220.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 Zotlabs/Update/_1220.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1220.php b/Zotlabs/Update/_1220.php
new file mode 100644
index 000000000..adcb8c9c6
--- /dev/null
+++ b/Zotlabs/Update/_1220.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1220 {
+
+	function run() {
+
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+			$r1 = q("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)
+)");
+
+			$r2 = q("create index \"target_id_idx\" on listeners (\"target_id\")");
+			$r3 = q("create index \"portable_id_idx\" on listeners (\"portable_id\")");
+			$r4 = q("create index \"ltype_idx\" on listeners (\"ltype\")");
+
+			$r = $r1 && $r2 && $r3 && $r4;
+
+		}
+
+		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+			$r = q("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=utf8");
+
+		}
+
+		if($r) {
+			return UPDATE_SUCCESS;
+		}
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3


From cc5ef57843f4012f7319a0ffd687fe26950a7790 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 17 Sep 2018 18:40:49 -0700
Subject: fix listeners table create and expire federation had a syntax error

---
 Zotlabs/Update/_1220.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1220.php b/Zotlabs/Update/_1220.php
index adcb8c9c6..6ce09c16b 100644
--- a/Zotlabs/Update/_1220.php
+++ b/Zotlabs/Update/_1220.php
@@ -26,14 +26,14 @@ class _1220 {
 		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
 			$r = q("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',
+  target_id varchar(191) NOT NULL DEFAULT '',
+  portable_id varchar(191) 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=utf8");
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
 
 		}
 
-- 
cgit v1.2.3


From 98b3946fca91fbacb662c14a1545e8eb1982ef3e Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Thu, 27 Sep 2018 23:42:11 +0200
Subject: rename groups and group_members tables for MySQL 8 compatibility

---
 Zotlabs/Update/_1221.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 Zotlabs/Update/_1221.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1221.php b/Zotlabs/Update/_1221.php
new file mode 100644
index 000000000..252fcaa90
--- /dev/null
+++ b/Zotlabs/Update/_1221.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1221 {
+
+	function run() {
+
+		$r1 = q("ALTER table " . TQUOT . 'groups' . TQUOT . " rename to pgrp ");
+		$r2 = q("ALTER table " . TQUOT . 'group_member' . TQUOT . " rename to pgrp_member ");
+
+
+		if($r1 && $r2) {
+			return UPDATE_SUCCESS;
+		}
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3


From 44bb0702030e0c7d6c15e1052b8c49d4cb109157 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 28 Sep 2018 09:55:10 +0200
Subject: add transaction, commit and rollback to update 1221

---
 Zotlabs/Update/_1221.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1221.php b/Zotlabs/Update/_1221.php
index 252fcaa90..75b400adc 100644
--- a/Zotlabs/Update/_1221.php
+++ b/Zotlabs/Update/_1221.php
@@ -6,13 +6,18 @@ class _1221 {
 
 	function run() {
 
+		q("START TRANSACTION");
+
 		$r1 = q("ALTER table " . TQUOT . 'groups' . TQUOT . " rename to pgrp ");
 		$r2 = q("ALTER table " . TQUOT . 'group_member' . TQUOT . " rename to pgrp_member ");
 
 
 		if($r1 && $r2) {
+			q("COMMIT");
 			return UPDATE_SUCCESS;
 		}
+
+		q("ROLLBACK");
 		return UPDATE_FAILED;
 
 	}
-- 
cgit v1.2.3


From 7877e2467e61fd48c52c8fc6325db5320eb5e03e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 6 Oct 2018 14:40:30 +0000
Subject: rename grid to network (for consistency) and activity to stream (as
 seen in osada) because it makes much more sense.

(cherry picked from commit 96277372d55a58349e318e694f4dab3a00fb2f13)
---
 Zotlabs/Update/_1222.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Zotlabs/Update/_1222.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1222.php b/Zotlabs/Update/_1222.php
new file mode 100644
index 000000000..579025457
--- /dev/null
+++ b/Zotlabs/Update/_1222.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Zotlabs\Update;
+
+use Zotlabs\Lib\Apps;
+
+class _1222 {
+
+	function run() {
+
+		q("START TRANSACTION");
+
+		$r1 = q("DELETE FROM app WHERE app_name = 'Grid' and app_system = 1");
+
+		if($r1) {
+			q("COMMIT");
+
+			Apps::import_system_apps();
+
+			return UPDATE_SUCCESS;
+		}
+
+		q("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3


From 567448e2fdddb7e9d9f1da64f9b70648ad1c2b65 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 6 Oct 2018 15:43:37 +0000
Subject: this did not actually make sense

(cherry picked from commit d1745319318b47932cf5d4acf400bfbf62f94ddc)
---
 Zotlabs/Update/_1222.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1222.php b/Zotlabs/Update/_1222.php
index 579025457..ad8d03197 100644
--- a/Zotlabs/Update/_1222.php
+++ b/Zotlabs/Update/_1222.php
@@ -2,8 +2,6 @@
 
 namespace Zotlabs\Update;
 
-use Zotlabs\Lib\Apps;
-
 class _1222 {
 
 	function run() {
@@ -14,9 +12,6 @@ class _1222 {
 
 		if($r1) {
 			q("COMMIT");
-
-			Apps::import_system_apps();
-
 			return UPDATE_SUCCESS;
 		}
 
-- 
cgit v1.2.3


From 0a840c02f73b224f40c8a985a7b57d950aa7be48 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 6 Oct 2018 18:48:29 +0000
Subject: another db update to get rid of the old view bookmarks entries

(cherry picked from commit 6ffdf3880f89b83c701f866a6188ef6f079078c5)
---
 Zotlabs/Update/_1223.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 Zotlabs/Update/_1223.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1223.php b/Zotlabs/Update/_1223.php
new file mode 100644
index 000000000..c6f05c806
--- /dev/null
+++ b/Zotlabs/Update/_1223.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1223 {
+
+	function run() {
+
+		q("START TRANSACTION");
+
+		$r1 = q("DELETE FROM app WHERE app_name = 'View Bookmarks' and app_system = 1");
+
+		if($r1) {
+			q("COMMIT");
+			return UPDATE_SUCCESS;
+		}
+
+		q("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3


From 2eb93387c257045b746a6fb27d34a00b115158d5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 6 Oct 2018 21:05:45 +0000
Subject: fix issue #1281 - hubloc default values

(cherry picked from commit dd3ec468f65f05c0fbf233a161cffae2698bd3db)
---
 Zotlabs/Update/_1224.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 Zotlabs/Update/_1224.php

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1224.php b/Zotlabs/Update/_1224.php
new file mode 100644
index 000000000..d687afce7
--- /dev/null
+++ b/Zotlabs/Update/_1224.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1224 {
+
+	function run() {
+		q("START TRANSACTION");
+
+		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+			$r1 = q("ALTER TABLE hubloc ALTER hubloc_id_url SET DEFAULT ''");
+			$r2 = q("ALTER TABLE hubloc ALTER hubloc_site_id SET DEFAULT ''");
+		}
+
+		if($r1 && $r2) {
+			q("COMMIT");
+			return UPDATE_SUCCESS;
+		}
+
+		q("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3


From f85cce714f91c877a86a57d95943d1ff7a22b31c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 6 Oct 2018 21:10:52 +0000
Subject: return success for postgres

(cherry picked from commit 2d9fe72215f0853f9234f57466095ee762253d82)
---
 Zotlabs/Update/_1224.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'Zotlabs/Update')

diff --git a/Zotlabs/Update/_1224.php b/Zotlabs/Update/_1224.php
index d687afce7..d160cea5d 100644
--- a/Zotlabs/Update/_1224.php
+++ b/Zotlabs/Update/_1224.php
@@ -5,21 +5,24 @@ namespace Zotlabs\Update;
 class _1224 {
 
 	function run() {
-		q("START TRANSACTION");
-
 		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+			q("START TRANSACTION");
+
 			$r1 = q("ALTER TABLE hubloc ALTER hubloc_id_url SET DEFAULT ''");
 			$r2 = q("ALTER TABLE hubloc ALTER hubloc_site_id SET DEFAULT ''");
-		}
 
-		if($r1 && $r2) {
-			q("COMMIT");
+			if($r1 && $r2) {
+				q("COMMIT");
+				return UPDATE_SUCCESS;
+			}
+
+			q("ROLLBACK");
+			return UPDATE_FAILED;
+		}
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
 			return UPDATE_SUCCESS;
 		}
 
-		q("ROLLBACK");
-		return UPDATE_FAILED;
-
 	}
 
 }
-- 
cgit v1.2.3