port Lib/Crypto from zap

1 files changed, 8 insertions, 8 deletions

diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 0ead8402e..a615cee6e 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -130,7 +130,7 @@ class Libzot {
 		if ($remote_key) {
 			$algorithm = self::best_algorithm($methods);
 			if ($algorithm) {
-				$data = crypto_encapsulate(json_encode($data), $remote_key, $algorithm);
+				$data = Crypto::encapsulate(json_encode($data), $remote_key, $algorithm);
 			}
 		}
 
@@ -143,7 +143,7 @@ class Libzot {
 	 *
 	 * @param string $methods
 	 *   Comma separated list of encryption methods
-	 * @return string first match from our site method preferences crypto_methods() array
+	 * @return string first match from our site method preferences Crypto::methods() array
 	 *   of a method which is common to both sites; or 'aes256cbc' if no matches are found.
 	 */
 	static function best_algorithm($methods) {
@@ -167,7 +167,7 @@ class Libzot {
 		if ($methods) {
 			$x = explode(',', $methods);
 			if ($x) {
-				$y = crypto_methods();
+				$y = Crypto::methods();
 				if ($y) {
 					foreach ($y as $yv) {
 						$yv = trim($yv);
@@ -763,8 +763,8 @@ class Libzot {
 					'xchan_guid'           => $arr['id'],
 					'xchan_guid_sig'       => $arr['id_sig'],
 					'xchan_pubkey'         => $arr['public_key'],
-					'xchan_photo_mimetype' => $arr['photo']['type'],
-					'xchan_photo_l'        => $arr['photo']['url'],
+					'xchan_photo_mimetype' => $arr['photo_mimetype'],
+					'xchan_photo_l'        => $arr['photo'],
 					'xchan_addr'           => escape_tags($arr['primary_location']['address']),
 					'xchan_url'            => escape_tags($arr['primary_location']['url']),
 					'xchan_connurl'        => $arr['primary_location']['connections_url'],
@@ -772,7 +772,7 @@ class Libzot {
 					'xchan_connpage'       => $arr['connect_url'],
 					'xchan_name'           => (($arr['name']) ? escape_tags($arr['name']) : '-'),
 					'xchan_network'        => 'zot6',
-					'xchan_photo_date'     => $arr['photo']['updated'],
+					'xchan_photo_date'     => $arr['photo_updated'],
 					'xchan_name_date'      => $arr['name_updated'],
 					'xchan_hidden'         => intval(1 - intval($arr['searchable'])),
 					'xchan_selfcensored'   => $arr['adult_content'],
@@ -983,7 +983,7 @@ class Libzot {
 			logger('Headers: ' . print_r($arr['header'], true), LOGGER_DATA, LOG_DEBUG);
 		}
 
-		$x = crypto_unencapsulate($x, get_config('system', 'prvkey'));
+		$x = Crypto::unencapsulate($x, get_config('system', 'prvkey'));
 
 		if (!is_array($x)) {
 			$x = json_decode($x, true);
@@ -3020,7 +3020,7 @@ class Libzot {
 			$ret['site']['directory_url'] = z_root() . '/dirsearch';
 
 
-		$ret['site']['encryption'] = crypto_methods();
+		$ret['site']['encryption'] = Crypto::methods();
 		$ret['site']['zot']        = System::get_zot_revision();
 
 		// hide detailed site information if you're off the grid