From e8a2ad43158bf94d55e64a23040c4a84a9414720 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 30 Dec 2016 02:31:53 -0800
Subject: logger typos

---
 include/import.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/import.php b/include/import.php
index 0d8398acb..e3d3e7e81 100644
--- a/include/import.php
+++ b/include/import.php
@@ -86,7 +86,7 @@ function import_channel($channel, $account_id, $seize) {
 	}
 
 	if(! $r) {
-		logger('mod_import: channel clone failed. ', print_r($channel,true));
+		logger('mod_import: channel clone failed. ' . print_r($channel,true));
 		notice( t('Channel clone failed. Import failed.') . EOL);
 		return false;
 	}
@@ -96,7 +96,7 @@ function import_channel($channel, $account_id, $seize) {
 		$channel['channel_guid']   // Already dbesc'd
 	);
 	if(! $r) {
-		logger('mod_import: channel not found. ', print_r($channel,true));
+		logger('mod_import: channel not found. ' . print_r($channel,true));
 		notice( t('Cloned channel not found. Import failed.') . EOL);
 		return false;
 	}
-- 
cgit v1.2.3


From 2e2254371a0d6bdc2bb6e13b699e6353e42b1c2f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 30 Dec 2016 02:45:16 -0800
Subject: move api version call back to core

---
 include/api_zot.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/include/api_zot.php b/include/api_zot.php
index 82de85454..0881211d0 100644
--- a/include/api_zot.php
+++ b/include/api_zot.php
@@ -1,6 +1,8 @@
 <?php
 
 	function zot_api_init() {
+        api_register_func('api/red/version','api_zot_version',false);
+        api_register_func('api/z/1.0/version','api_zot_version',false);
 		api_register_func('api/export/basic','api_export_basic', true);
 		api_register_func('api/red/channel/export/basic','api_export_basic', true);
 		api_register_func('api/z/1.0/channel/export/basic','api_export_basic', true);
@@ -42,6 +44,22 @@
 	}
 
 
+	function api_zot_version($type) {
+
+		if($type === 'xml') {
+			header('Content-type: application/xml');
+			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . Zotlabs\Lib\System::get_project_version() . '</version>' . "\r\n";
+			killme();
+		}
+		elseif($type === 'json') {
+			header('Content-type: application/json');
+			echo '"' . Zotlabs\Lib\System::get_project_version() . '"';
+			killme();
+		}
+	}
+
+
+
 	/*
 	 * Red basic channel export
 	 */
-- 
cgit v1.2.3