Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php

3 files changed, 18 insertions, 3 deletions

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 407565f79..c1344e6df 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1067,7 +1067,8 @@ CREATE TABLE IF NOT EXISTS `site` (
   `site_sellpage` char(255) NOT NULL DEFAULT '',
   `site_location` char(255) NOT NULL DEFAULT '',
   `site_realm` char(255) NOT NULL DEFAULT '',
-  `site_valid` smallint(6) NOT NULL DEFAULT '0',
+  `site_valid` smallint NOT NULL DEFAULT '0',
+  `site_dead` smallint NOT NULL DEFAULT '0',
   PRIMARY KEY (`site_url`),
   KEY `site_flags` (`site_flags`),
   KEY `site_update` (`site_update`),
@@ -1077,7 +1078,8 @@ CREATE TABLE IF NOT EXISTS `site` (
   KEY `site_sellpage` (`site_sellpage`),
   KEY `site_pull` (`site_pull`),
   KEY `site_realm` (`site_realm`),
-  KEY `site_valid` (`site_valid`)
+  KEY `site_valid` (`site_valid`),
+  KEY `site_dead` (`site_dead`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `source` (
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 0db9e341f..7c8d74ae5 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -972,6 +972,7 @@ CREATE TABLE "site" (
   "site_location" text NOT NULL DEFAULT '',
   "site_realm" text NOT NULL DEFAULT '',
   "site_valid" smallint NOT NULL DEFAULT '0',
+  "site_dead" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("site_url")
 );
 create index "site_flags" on site ("site_flags");
@@ -982,6 +983,7 @@ 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 index "site_dead" on site ("site_dead");
 
 CREATE TABLE "source" (
   "src_id" serial  NOT NULL,
diff --git a/install/update.php b/install/update.php
index 13a45d301..62c976218 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1142 );
+define( 'UPDATE_VERSION' , 1143 );
 
 /**
  *
@@ -1645,4 +1645,15 @@ function update_r1141() {
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 
+}
+
+function update_r1142() {
+
+	$r1 = q("alter table site add site_dead smallint not null default '0' ");
+	$r2 = q("create index site_dead on site ( site_dead ) ");
+	if($r1 && $r2)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+
 }
\ No newline at end of file