Merge branch 'dev' into oauth2

Zotlabs/Module/Admin/Site.php

@@ -38,7 +38,12 @@ class Site {
 		$site_sellpage		=	((x($_POST,'site_sellpage'))	? notags(trim($_POST['site_sellpage']))		: '');
 		$site_location		=	((x($_POST,'site_location'))	? notags(trim($_POST['site_location']))		: '');
 		$frontpage			=	((x($_POST,'frontpage'))	? notags(trim($_POST['frontpage']))		: '');
-		$firstpage		    =	((x(trim($_POST,'firstpage')))	? notags(trim($_POST['firstpage']))		: 'profiles');
+		$firstpage		    =	((x($_POST,'firstpage'))	? notags(trim($_POST['firstpage']))		: 'profiles');
+		$first_page		    =	((x($_POST,'first_page'))	? notags(trim($_POST['first_page']))		: 'profiles');
+		// check value after trim
+		if(! $first_page) {
+			$first_page = 'profiles';
+		}
 		$mirror_frontpage	=	((x($_POST,'mirror_frontpage'))	? intval(trim($_POST['mirror_frontpage']))		: 0);
 		$directory_server	=	((x($_POST,'directory_server')) ? trim($_POST['directory_server']) : '');
 		$allowed_sites		=	((x($_POST,'allowed_sites'))	? notags(trim($_POST['allowed_sites']))		: '');
@@ -82,7 +87,7 @@ class Site {
 		set_config('system', 'maxloadavg', $maxloadavg);
 		set_config('system', 'frontpage', $frontpage);
 		set_config('system', 'sellpage', $site_sellpage);
-		set_config('system', 'workflow_channel_next', $firstpage);
+		set_config('system', 'workflow_channel_next', $first_page);
 		set_config('system', 'site_location', $site_location);
 		set_config('system', 'mirror_frontpage', $mirror_frontpage);
 		set_config('system', 'sitename', $sitename);
@@ -345,7 +350,7 @@ class Site {
 			'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
 
 			'$sellpage' => array('site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root())),
-			'$firstpage' => array('firstpage', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Recommend: profiles, go, or settings')),
+			'$first_page' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Recommend: profiles, go, or settings')),
 
 			'$location' => array('site_location', t('Optional: site location'), get_config('system','site_location',''), t('Region or country')),
 

Zotlabs/Module/Import.php

@@ -114,15 +114,16 @@ class Import extends \Zotlabs\Web\Controller {
 				return;
 		}
 
-		if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
+// This is only an info message but it is alarming to folks who then report failure with this as the cause, when in fact we ignore this completely.
-			$v1 = substr($data['compatibility']['database'],-4);
+//		if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
-			$v2 = substr(DB_UPDATE_VERSION,-4);
+//			$v1 = substr($data['compatibility']['database'],-4);
-			if($v2 > $v1) {
+//			$v2 = substr(DB_UPDATE_VERSION,-4);
-				$t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
+//			if($v2 > $v1) {
-				notice($t);
+//				$t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
-			}
+//				notice($t);
-
+//			}
-		}
+//
+//		}
 
 		if($moving)
 			$seize = 1;

Zotlabs/Module/Setup.php

@@ -563,16 +563,20 @@ class Setup extends \Zotlabs\Web\Controller {
 		$status = true;
 		$help = '';
 
-		if( (file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
+		$fname = '.htconfig.php';
-			(!file_exists('.htconfig.php') && !is_writable('.')) ) {
+
+		if((file_exists($fname) && is_writable($fname)) || 
+			(! (file_exists($fname) && is_writable('.')))) {
+			$this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
+			return;
+		}
+
 		$status = false;
 		$help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL;
 		$help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL;
-				$help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder.').EOL;
+		$help .= t('Please see install/INSTALL.txt for additional information.');
-				$help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "install/INSTALL.txt" for instructions.').EOL;
-		}
 
-		$this->check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
+		$this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
 	}
 
 	/**

install/schema_mysql.sql

@@ -659,13 +659,10 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `uid_item_retained` (`uid`, `item_retained`),
   KEY `uid_item_private` (`uid`, `item_private`),
   KEY `uid_resource_type` (`uid`, `resource_type`),
-  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`),
   KEY `commented` (`commented`),
   KEY `verb` (`verb`),
   KEY `obj_type` (`obj_type`),

view/tpl/admin_site.tpl

@@ -74,7 +74,7 @@
 	{{include file="field_select.tpl" field=$access_policy}}
 	{{include file="field_input.tpl" field=$location}}
 	{{include file="field_input.tpl" field=$sellpage}}
-	{{include file="field_input.tpl" field=$firstpage}}
+	{{include file="field_input.tpl" field=$first_page}}
 
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>