change AbConfig to use channel_id instead of channel_hash; which was a mistake in retrospect

3 files changed, 11 insertions, 12 deletions

diff --git a/include/channel.php b/include/channel.php
index a0424ee39..a7624f060 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -516,7 +516,7 @@ function identity_basic_export($channel_id, $items = false) {
 
 		for($x = 0; $x < count($ret['abook']); $x ++) {
 			$xchans[] = $ret['abook'][$x]['abook_chan'];
-			$abconfig = load_abconfig($ret['channel']['channel_hash'],$ret['abook'][$x]['abook_xchan']);
+			$abconfig = load_abconfig($channel_id,$ret['abook'][$x]['abook_xchan']);
 			if($abconfig)
 				$ret['abook'][$x]['abconfig'] = $abconfig;
 		}		 
diff --git a/include/config.php b/include/config.php
index 65199283d..ece22793f 100644
--- a/include/config.php
+++ b/include/config.php
@@ -98,20 +98,20 @@ function del_aconfig($account_id, $family, $key) {
 }
 
 
-function load_abconfig($chash,$xhash) {
-	Zlib\AbConfig::Load($chash,$xhash);
+function load_abconfig($chan,$xhash) {
+	Zlib\AbConfig::Load($chan,$xhash);
 }
 
-function get_abconfig($chash,$xhash,$family,$key) {
-	return Zlib\AbConfig::Get($chash,$xhash,$family,$key);
+function get_abconfig($chan,$xhash,$family,$key) {
+	return Zlib\AbConfig::Get($chan,$xhash,$family,$key);
 }
 
-function set_abconfig($chash,$xhash,$family,$key,$value) {
-	return Zlib\AbConfig::Set($chash,$xhash,$family,$key,$value);
+function set_abconfig($chan,$xhash,$family,$key,$value) {
+	return Zlib\AbConfig::Set($chan,$xhash,$family,$key,$value);
 }
 
-function del_abconfig($chash,$xhash,$family,$key) {
-	return Zlib\AbConfig::Delete($chash,$xhash,$family,$key);
+function del_abconfig($chan,$xhash,$family,$key) {
+	return Zlib\AbConfig::Delete($chan,$xhash,$family,$key);
 }
 
 function load_iconfig(&$item) {
diff --git a/include/zot.php b/include/zot.php
index 2530e55bb..6dd789181 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -552,7 +552,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 						unset($new_connection[0]['abook_account']);
 						unset($new_connection[0]['abook_channel']);
 
-						$abconfig = load_abconfig($channel['channel_hash'],$new_connection['abook_xchan']);
+						$abconfig = load_abconfig($channel['channel_id'],$new_connection['abook_xchan']);
 						if($abconfig)
 							$new_connection['abconfig'] = $abconfig;
 
@@ -3335,8 +3335,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 				if($abconfig) {
 					// @fixme does not handle sync of del_abconfig
 					foreach($abconfig as $abc) {
-						if($abc['chan'] === $channel['channel_hash'])
-							set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
+						set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
 					}
 				}
 			}