Merge branch '2.8RC'

4 files changed, 61 insertions, 33 deletions

diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 754504a33..88269f032 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -7,14 +7,14 @@ such as XAMPP and WAMP are not officially supported at this time - however
 we welcome patches if you manage to get it working. 
 
 Be aware that this software is more than a simple web application. It is a 
-complex communications system which more closely resembles an email server 
-than a web server. For reliability and performance, messages are delivered in
-the background and are queued for later delivery when sites are down. This
-kind of functionality requires a bit more of the host system than the typical
-blog. Not every PHP/MySQL hosting provider will be able to support the 
-Hubzilla. Many will - but please review the requirements and confirm these 
-with your hosting provider prior to installation. (And preferably before 
-entering into a long-term contract.)
+complex communications and content management system which more closely 
+resembles an email server than a web server. For reliability and performance, 
+messages are delivered in the background and are queued for later delivery 
+when sites are down. This kind of functionality requires a bit more of the
+host system than the typical blog. Not every PHP/MySQL hosting provider will
+be able to support Hubzilla. Many will - but please review the requirements
+and confirm these with your hosting provider prior to installation. (And 
+preferably before entering into a long-term contract.)
 
 If you encounter installation issues, please let us know via the Github issue 
 tracker where you downloaded the software. Please be as clear as
@@ -75,27 +75,6 @@ location may prevent some of these services from working correctly. This
 should not be a problem with Apache, but may be an issue with nginx or other
 web server platforms.
 
-**Server Roles**
-
-During installation you will be asked to choose a server role. Your choices are
-1. Basic
-2. Standard
-3. Pro
-
-Basic is highly simplified, with almost all the advanced functionality and 
-complexity removed or permanently disabled.
-
-Standard is typically used for federated network use, when you wish to interact
-with other networks using other protocols. Not all the built in features and
-functionality work correctly when other networks are involved. All advanced
-and complex features are available to all members by default.  
-
-Pro is for sites that wish to make full use of the built-in abilities and
-features, but **not** to interact with other networks. Advanced features are
-enabled according to a per-account 'techlevel' which reduces complexity
-initially and allows members to adjust the software complexity to match their
-technical abilities.   
-
 **Installation**
 
 1. Requirements
@@ -173,7 +152,8 @@ technical abilities.
             cd mywebsite
             util/update_addon_repo hzaddons
 
-	- Create searchable representations of the online documentation. You may do this any time
+	- Once the software is configured and the database installed, create searchable
+		representations of the online documentation. You may do this any time
 		that the documentation is updated.
 
 			cd mywebsite
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 9e2e401b5..3143854f5 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -650,11 +650,13 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `created` (`created`),
   KEY `edited` (`edited`),
   KEY `received` (`received`),
-  KEY `uid_commented` (`uid`,`commented`),
-  KEY `uid_created` (`uid`,`created`),
+  KEY `uid_commented` (`uid`, `commented`),
+  KEY `uid_created` (`uid`, `created`),
+  KEY `uid_item_unseen` (`uid`, `item_unseen`),
   KEY `aid` (`aid`),
   KEY `owner_xchan` (`owner_xchan`),
   KEY `author_xchan` (`author_xchan`),
+  KEY `resource_id` (`resource_id`),
   KEY `resource_type` (`resource_type`),
   KEY `item_restrict` (`item_restrict`),
   KEY `item_flags` (`item_flags`),
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 197cbb4d1..b8bbf5867 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -621,11 +621,13 @@ create index "item_edited" on item ("edited");
 create index "item_received" on item ("received");
 create index "item_uid_commented" on item ("uid","commented");
 create index "item_uid_created" on item ("uid","created");
+create index "item_uid_unseen" on item ("uid","item_unseen");
 create index "item_changed" on item ("changed");
 create index "item_comments_closed" on item ("comments_closed");
 create index "item_aid" on item ("aid");
 create index "item_owner_xchan" on item ("owner_xchan");
 create index "item_author_xchan" on item ("author_xchan");
+create index "item_resource_id" on item ("resource_id");
 create index "item_resource_type" on item ("resource_type");
 create index "item_restrict" on item ("item_restrict");
 create index "item_flags" on item ("item_flags");
diff --git a/install/update.php b/install/update.php
index 8798a3d69..07675a973 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1193 );
+define( 'UPDATE_VERSION' , 1196 );
 
 /**
  *
@@ -2978,3 +2978,47 @@ function update_r1192() {
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 }
+
+function update_r1193() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("CREATE INDEX item_uid_unseen ON item (uid, item_unseen)");
+	}
+	else {
+		$r1 = q("ALTER TABLE item ADD INDEX uid_item_unseen (uid, item_unseen)");
+	}
+
+	if($r1)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+
+
+function update_r1194() {
+	$r = q("select id, resource_id from item where resource_type = 'nwiki'"); 
+	if($r) {
+		foreach($r as $rv) {
+			$mimetype = get_iconfig($rv['id'],'wiki','mimeType');
+			q("update item set mimetype = '%s' where resource_type = 'nwikipage' and resource_id = '%s'",
+				dbesc($mimetype),
+				dbesc($rv['resource_id'])
+			);
+		}
+	}
+
+	return UPDATE_SUCCESS;
+}
+
+function update_r1195() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("CREATE INDEX item_resource_id ON item (resource_id)");
+	}
+	else {
+		$r1 = q("ALTER TABLE item ADD INDEX (resource_id)");
+	}
+
+	if($r1)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}