Merge branch '1.10RC'1.10

3 files changed, 229 insertions, 7 deletions

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index a536c3f9a..5335c231e 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1,7 +1,7 @@
 
 CREATE TABLE IF NOT EXISTS `abconfig` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `chan` char(255) NOT NULL DEFAULT '',
+  `chan` int(10) unsigned NOT NULL DEFAULT '0',
   `xchan` char(255) NOT NULL DEFAULT '',
   `cat` char(255) NOT NULL DEFAULT '',
   `k` char(255) NOT NULL DEFAULT '',
@@ -141,6 +141,23 @@ CREATE TABLE IF NOT EXISTS `app` (
   KEY `app_edited` (`app_edited`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+
+CREATE TABLE IF NOT EXISTS `atoken` (
+  `atoken_id` int(11) NOT NULL AUTO_INCREMENT,
+  `atoken_aid` int(11) NOT NULL DEFAULT 0,
+  `atoken_uid` int(11) NOT NULL DEFAULT 0,
+  `atoken_name` char(255) NOT NULL DEFAULT '',
+  `atoken_token` char(255) NOT NULL DEFAULT '',
+  `atoken_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`atoken_id`),
+  KEY `atoken_aid` (`atoken_aid`),
+  KEY `atoken_uid` (`atoken_uid`),
+  KEY `atoken_uid_2` (`atoken_uid`),
+  KEY `atoken_name` (`atoken_name`),
+  KEY `atoken_token` (`atoken_token`),
+  KEY `atoken_expires` (`atoken_expires`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 CREATE TABLE IF NOT EXISTS `attach` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -199,6 +216,26 @@ CREATE TABLE IF NOT EXISTS `cache` (
   PRIMARY KEY (`k`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `cal` (
+  `cal_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cal_aid` int(10) unsigned NOT NULL DEFAULT '0',
+  `cal_uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `cal_hash` varchar(255) NOT NULL DEFAULT '',
+  `cal_name` varchar(255) NOT NULL DEFAULT '',
+  `uri` varchar(255) NOT NULL DEFAULT '',
+  `logname` varchar(255) NOT NULL DEFAULT '',
+  `pass` varchar(255) NOT NULL DEFAULT '',
+  `ctag` varchar(255) NOT NULL DEFAULT '',
+  `synctoken` varchar(255) NOT NULL DEFAULT '',
+  `cal_types` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`cal_id`),
+  KEY `cal_aid` (`cal_aid`),
+  KEY `cal_uid` (`cal_uid`),
+  KEY `cal_hash` (`cal_hash`),
+  KEY `cal_name` (`cal_name`),
+  KEY `cal_types` (`cal_types`)
+) 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',
@@ -394,6 +431,7 @@ 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',
+  `cal_id` int(11) unsigned 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',
@@ -420,6 +458,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `event_vdata` text NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
+  KEY `cal_id` (`cal_id`),
   KEY `etype` (`etype`),
   KEY `dtstart` (`dtstart`),
   KEY `dtend` (`dtend`),
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index f0c41dc2a..8a387a8fe 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -1,6 +1,6 @@
 CREATE TABLE "abconfig" (
   "id" serial  NOT NULL,
-  "chan" text NOT NULL,
+  "chan" bigint NOT NULL DEFAULT '0',
   "xchan" text NOT NULL,
   "cat" text NOT NULL,
   "k" text NOT NULL,
@@ -137,6 +137,21 @@ create index "app_created" on app ("app_created");
 create index "app_edited" on app ("app_edited");
 create index "app_deleted" on app ("app_deleted");
 create index "app_system" on app ("app_system");
+
+CREATE TABLE "atoken" (
+  "atoken_id" serial NOT NULL,
+  "atoken_aid" bigint NOT NULL DEFAULT 0,
+  "atoken_uid" bigint NOT NULL DEFAULT 0,
+  "atoken_name" varchar(255) NOT NULL DEFAULT '',
+  "atoken_token" varchar(255) NOT NULL DEFAULT '',
+  "atoken_expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  PRIMARY KEY ("atoken_id"));
+create index atoken_aid on atoken (atoken_aid);
+create index atoken_uid on atoken (atoken_uid);
+create index atoken_name on atoken (atoken_name);
+create index atoken_token on atoken (atoken_token);
+create index atoken_expires on atoken (atoken_expires);
+
 CREATE TABLE "attach" (
   "id" serial  NOT NULL,
   "aid" bigint  NOT NULL DEFAULT '0',
@@ -193,6 +208,26 @@ CREATE TABLE "cache" (
   "updated" timestamp NOT NULL,
   PRIMARY KEY ("k")
 );
+CREATE TABLE "cal" (
+  "cal_id" serial  NOT NULL,
+  "cal_aid" bigint NOT NULL DEFAULT '0',
+  "cal_uid" bigint NOT NULL DEFAULT '0',
+  "cal_hash" text NOT NULL,
+  "cal_name" text NOT NULL,
+  "uri" text NOT NULL,
+  "logname" text NOT NULL,
+  "pass" text NOT NULL,
+  "ctag" text NOT NULL,
+  "synctoken" text NOT NULL,
+  "cal_types" text NOT NULL DEFAULT "0",
+  PRIMARY KEY ("cal_id")
+);
+create index "cal_hash_idx" on cal ("cal_hash");
+create index "cal_name_idx" on cal ("cal_name");
+create index "cal_types_idx" on cal ("cal_types");
+create index "cal_aid_idx" on cal ("cal_aid");
+create index "cal_uid_idx" on cal ("cal_uid");
+
 CREATE TABLE "channel" (
   "channel_id" serial  NOT NULL,
   "channel_account_id" bigint  NOT NULL DEFAULT '0',
@@ -380,14 +415,11 @@ create index "dreport_xchan" on dreport ("dreport_xchan");
 create index "dreport_queue" on dreport ("dreport_queue");
 create index "dreport_channel" on dreport ("dreport_channel");
 
-
-
-
-
 CREATE TABLE "event" (
   "id" serial NOT NULL,
   "aid" bigint  NOT NULL DEFAULT '0',
   "uid" bigint NOT NULL,
+  "cal_id" bigint NOT NULL DEFAULT '0',
   "event_xchan" text NOT NULL DEFAULT '',
   "event_hash" text NOT NULL DEFAULT '',
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -415,6 +447,7 @@ CREATE TABLE "event" (
   PRIMARY KEY ("id")
 );
 create index "event_uid_idx" on event ("uid");
+create index "event_cal_idx" on event ("cal_id");
 create index "event_etype_idx" on event ("etype");
 create index "event_dtstart_idx" on event ("dtstart");
 create index "event_dtend_idx" on event ("dtend");
diff --git a/install/update.php b/install/update.php
index 908f60498..f2d97430b 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1176 );
+define( 'UPDATE_VERSION' , 1180 );
 
 /**
  *
@@ -2254,3 +2254,153 @@ function update_r1175() {
 	return UPDATE_FAILED;
 
 }
+
+
+function update_r1176() {
+
+	$r = q("select * from item_id where true");
+	if($r) {
+		foreach($r as $rr) {
+			\Zotlabs\Lib\IConfig::Set($rr['iid'],'system',$rr['service'],$rr['sid'],true);
+		}
+	}
+	return UPDATE_SUCCESS;
+
+}
+
+function update_r1177() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("alter table event add cal_id bigint NOT NULL DEFAULT '0'");
+		$r2 = q("create index \"event_cal_idx\" on event (\"cal_id\") "); 
+
+		$r3 = q("CREATE TABLE \"cal\" (
+			\"cal_id\" serial  NOT NULL,
+		 	\"cal_aid\" bigint NOT NULL DEFAULT '0',
+		 	\"cal_uid\" bigint NOT NULL DEFAULT '0',
+		 	\"cal_hash\" text NOT NULL,
+			\"cal_name\" text NOT NULL,
+			\"uri\" text NOT NULL,
+			\"logname\" text NOT NULL,
+			\"pass\" text NOT NULL,
+			\"ctag\" text NOT NULL,
+			\"synctoken\" text NOT NULL,
+			\"cal_types\" text NOT NULL,
+			PRIMARY KEY (\"cal_id\") ");
+		$r4 = q("create index \"cal_hash_idx\" on cal (\"cal_hash\") ");
+		$r5 = q("create index \"cal_name_idx\" on cal (\"cal_name\") ");
+		$r6 = q("create index \"cal_types_idx\" on cal (\"cal_types\") ");
+		$r7 = q("create index \"cal_aid_idx\" on cal (\"cal_aid\") ");
+		$r8 = q("create index \"cal_uid_idx\" on cal (\"cal_uid\") ");
+		$r = $r1 && $r2 && $r3 && $r4 && $r5 && $r6 && $r7 && $r8;
+	}
+	else {
+		$r1 = q("alter table event add cal_id int(10) unsigned NOT NULL DEFAULT '0', 
+			add index ( cal_id ) ");
+
+		$r2 = q("CREATE TABLE IF NOT EXISTS `cal` (
+			`cal_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+			`cal_aid` int(10) unsigned NOT NULL DEFAULT '0',
+			`cal_uid` int(10) unsigned NOT NULL DEFAULT '0',
+			`cal_hash` varchar(255) NOT NULL DEFAULT '',
+			`cal_name` varchar(255) NOT NULL DEFAULT '',
+			`uri` varchar(255) NOT NULL DEFAULT '',
+			`logname` varchar(255) NOT NULL DEFAULT '',
+			`pass` varchar(255) NOT NULL DEFAULT '',
+			`ctag` varchar(255) NOT NULL DEFAULT '',
+			`synctoken` varchar(255) NOT NULL DEFAULT '',
+			`cal_types` varchar(255) NOT NULL DEFAULT '',
+			PRIMARY KEY (`cal_id`),
+			KEY `cal_aid` (`cal_aid`),
+			KEY `cal_uid` (`cal_uid`),
+			KEY `cal_hash` (`cal_hash`),
+			KEY `cal_name` (`cal_name`),
+			KEY `cal_types` (`cal_types`)
+			) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ");
+
+		$r = $r1 && $r2;
+	}
+
+    if($r)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+}
+
+
+function update_r1178() {
+
+	$c2 = null;
+
+	$c1 = q("SELECT channel_id, channel_hash from channel where true");
+	if($c1) {
+		$c2 = q("SELECT id, chan from abconfig where true");
+		if($c2) {
+			for($x = 0; $x < count($c2); $x ++) {
+				foreach($c1 as $c) {
+					if($c['channel_hash'] == $c2[$x]['chan']) {
+						$c2[$x]['chan'] = $c['channel_id'];
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	$r1 = q("ALTER TABLE abconfig CHANGE chan chan int(10) unsigned NOT NULL DEFAULT '0' ");
+
+	if($c2) {
+		foreach($c2 as $c) {
+			q("UPDATE abconfig SET chan = %d where id = %d",
+				intval($c['chan']),
+				intval($c['id'])
+			);
+		}
+	}
+
+	if($r1)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+
+function update_r1179() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("CREATE TABLE atoken (
+  atoken_id serial NOT NULL,
+  atoken_aid bigint NOT NULL DEFAULT 0,
+  atoken_uid bigint NOT NULL DEFAULT 0,
+  atoken_name varchar(255) NOT NULL DEFAULT '',
+  atoken_token varchar(255) NOT NULL DEFAULT '',
+  atoken_expires timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  PRIMARY KEY (atoken_id)) ");
+	$r2 = q("create index atoken_aid on atoken (atoken_aid)");
+	$r3 = q("create index atoken_uid on atoken (atoken_uid)");
+	$r4 = q("create index atoken_name on atoken (atoken_name)");
+	$r5 = q("create index atoken_token on atoken (atoken_token)");
+	$r6 = q("create index atoken_expires on atoken (atoken_expires)");
+
+	$r = $r1 && $r2 && $r3 && $r4 && $r5 && $r6;
+ 
+	}
+	else {
+		$r = q("CREATE TABLE IF NOT EXISTS `atoken` (
+  `atoken_id` int(11) NOT NULL AUTO_INCREMENT,
+  `atoken_aid` int(11) NOT NULL DEFAULT 0,
+  `atoken_uid` int(11) NOT NULL DEFAULT 0,
+  `atoken_name` char(255) NOT NULL DEFAULT '',
+  `atoken_token` char(255) NOT NULL DEFAULT '',
+  `atoken_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`atoken_id`),
+  KEY `atoken_aid` (`atoken_aid`),
+  KEY `atoken_uid` (`atoken_uid`),
+  KEY `atoken_name` (`atoken_name`),
+  KEY `atoken_token` (`atoken_token`),
+  KEY `atoken_expires` (`atoken_expires`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ");
+	}
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+	
+
+}
\ No newline at end of file