Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php

3 files changed, 16 insertions, 2 deletions

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 4aaa70825..3dab6c822 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1134,6 +1134,7 @@ CREATE TABLE IF NOT EXISTS `site` (
   `site_valid` smallint NOT NULL DEFAULT '0',
   `site_dead` smallint NOT NULL DEFAULT '0',
   `site_type` smallint NOT NULL DEFAULT '0',
+  `site_project` char(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`site_url`),
   KEY `site_flags` (`site_flags`),
   KEY `site_update` (`site_update`),
@@ -1145,7 +1146,8 @@ CREATE TABLE IF NOT EXISTS `site` (
   KEY `site_realm` (`site_realm`),
   KEY `site_valid` (`site_valid`),
   KEY `site_dead` (`site_dead`),
-  KEY `site_type` (`site_type`)
+  KEY `site_type` (`site_type`),
+  KEY `site_project` (`site_project`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `source` (
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index f42f6b297..70a7a576a 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -1125,6 +1125,7 @@ CREATE TABLE "site" (
   "site_valid" smallint NOT NULL DEFAULT '0',
   "site_dead" smallint NOT NULL DEFAULT '0',
   "site_type" smallint NOT NULL DEFAULT '0',
+  "site_project" text NOT NULL DEFAULT '',
   PRIMARY KEY ("site_url")
 );
 create index "site_flags" on site ("site_flags");
@@ -1137,6 +1138,7 @@ create index "site_realm" on site ("site_realm");
 create index "site_valid" on site ("site_valid");
 create index "site_dead" on site ("site_dead");
 create index "site_type" on site ("site_type");
+create index "site_project" on site ("site_project");
 
 CREATE TABLE "source" (
   "src_id" serial  NOT NULL,
diff --git a/install/update.php b/install/update.php
index dc9377892..d6b543466 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1157 );
+define( 'UPDATE_VERSION' , 1158 );
 
 /**
  *
@@ -1907,3 +1907,13 @@ function update_r1156() {
 	return UPDATE_FAILED;
 }
 
+function update_r1157() {
+	$r1 = q("alter table site add site_project char(255) not null default '' ");
+    $r2 = q("create index site_project on site ( site_project ) ");
+    if($r1 && $r2)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+
+}
+
+