Merge https://github.com/friendica/red into zpull

2 files changed, 12 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 64d3633cd..b3c8701fd 100755
--- a/boot.php
+++ b/boot.php
@@ -346,6 +346,17 @@ define ( 'XCHAN_FLAGS_HIDDEN',        0x0001);
 define ( 'XCHAN_FLAGS_ORPHAN',        0x0002);
 
 
+/*
+ * Traficlights for Administration of HubLoc
+ * to detect problems in inter server communication
+ */
+define ('HUBLOC_NOTUSED',	0x0000);
+define ('HUBLOC_SEND_ERROR',	0x0001);
+define ('HUBLOC_RECEIVE_ERROR',	0x0002);
+define ('HUBLOC_WORKS',		0x0004);
+define ('HUBLOC_OFFLINE',	0x0008);
+
+
 /**
  * Tag/term types
  */
diff --git a/include/zot.php b/include/zot.php
index 88a7f4529..e9084496c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1538,7 +1538,7 @@ function import_site($arr,$pubkey) {
 		}
 	}
 	else {
-		$r = q("insert into site ( site_url, site_acccess, site_flags, site_update, site_directory, site_register )
+		$r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register )
 			values ( '%s', %d, %d, '%s', '%s', %d )",
 			dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)),
 			intval($site_directory),