Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 10 insertions, 1 deletions

diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index b68a7cb97..438b29d49 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -29,6 +29,7 @@ CREATE TABLE "abook" (
   create index  "abook_dob" on abook  ("abook_dob");
   create index  "abook_connected" on abook  ("abook_connected");
   create index  "abook_rating" on abook  ("abook_rating");
+  create index  "abook_channel_closeness" on abook ("abook_channel", "abook_closeness");
 
 CREATE TABLE "account" (
   "account_id" serial  NOT NULL,
@@ -165,6 +166,7 @@ CREATE TABLE "channel" (
   "channel_notifyflags" bigint  NOT NULL DEFAULT '65535',
   "channel_pageflags" bigint  NOT NULL DEFAULT '0',
   "channel_dirdate" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  "channel_lastpost" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "channel_deleted" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "channel_max_anon_mail" bigint  NOT NULL DEFAULT '10',
   "channel_max_friend_req" bigint  NOT NULL DEFAULT '10',
@@ -230,6 +232,7 @@ create index "channel_deleted" on channel ("channel_deleted");
 create index "channel_a_republish" on channel ("channel_a_republish");
 create index "channel_w_like" on channel ("channel_w_like");
 create index "channel_dirdate" on channel ("channel_dirdate");
+create index "channel_lastpost" on channel ("channel_lastpost");
 CREATE TABLE "chat" (
   "chat_id" serial  NOT NULL,
   "chat_room" bigint  NOT NULL DEFAULT '0',
@@ -528,6 +531,7 @@ CREATE TABLE "item" (
   "item_restrict" bigint NOT NULL DEFAULT '0',
   "item_flags" bigint NOT NULL DEFAULT '0',
   "item_private" numeric(4) NOT NULL DEFAULT '0',
+  "item_unseen" smallint NOT NULL DEFAULT '0',
   "item_search_vector" tsvector,
   PRIMARY KEY ("id")
 );
@@ -559,6 +563,7 @@ create index "item_uid_mid" on item ("mid","uid");
 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");
+create index "item_unseen" on item ("item_unseen");
 
 -- fulltext indexes
 create index "item_search_idx" on  item USING gist("item_search_vector");
@@ -723,6 +728,7 @@ CREATE TABLE "outq" (
   "outq_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "outq_notify" text NOT NULL,
   "outq_msg" text NOT NULL,
+  "outq_priority" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("outq_hash")
 );
 create index "outq_account" on outq ("outq_account");
@@ -732,6 +738,7 @@ create index "outq_created" on outq ("outq_created");
 create index "outq_updated" on outq ("outq_updated");
 create index "outq_async" on outq ("outq_async");
 create index "outq_delivered" on outq ("outq_delivered");
+create index "outq_priority" on outq ("outq_priority");
 
 CREATE TABLE "pconfig" (
   "id" serial NOT NULL,
@@ -957,6 +964,7 @@ CREATE TABLE "site" (
   "site_sellpage" text NOT NULL DEFAULT '',
   "site_location" text NOT NULL DEFAULT '',
   "site_realm" text NOT NULL DEFAULT '',
+  "site_valid" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("site_url")
 );
 create index "site_flags" on site ("site_flags");
@@ -966,6 +974,7 @@ create index "site_register" on site ("site_register");
 create index "site_access" on site ("site_access");
 create index "site_sellpage" on site ("site_sellpage");
 create index "site_realm" on site ("site_realm");
+create index "site_valid" on site ("site_valid");
 
 CREATE TABLE "source" (
   "src_id" serial  NOT NULL,
@@ -1159,7 +1168,7 @@ CREATE TABLE "xperm" (
   "xp_client" varchar( 20 ) NOT NULL DEFAULT '',
   "xp_channel" bigint NOT NULL DEFAULT '0',
   "xp_perm" varchar( 64 ) NOT NULL DEFAULT '',
-  PRIMARY_KEY ("xp_id")
+  PRIMARY KEY ("xp_id")
 );
 create index "xp_client" on xperm ("xp_client");
 create index "xp_channel" on xperm ("xp_channel");