start implementing zot-id

8 files changed, 10 insertions, 10 deletions

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index dc329aa19..95b2ec3a4 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -196,7 +196,7 @@ function dfrn_request_post(&$a) {
 				
 				// (ignore reply, nothing we can do it failed)
 
-				goaway(zrl($dfrn_url));
+				goaway(zid($dfrn_url));
 				return; // NOTREACHED
 
 			}
@@ -780,7 +780,7 @@ function dfrn_request_content(&$a) {
 			$myaddr = ((x($_GET,'address')) ? $_GET['address'] : '');
 		}
 
-		// last, try a zrl
+		// last, try a zid
 		if(! strlen($myaddr))
 			$myaddr = get_my_url();
 
diff --git a/mod/directory.php b/mod/directory.php
index 1854a0e62..58e9be293 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -41,7 +41,7 @@ function directory_content(&$a) {
 	$gdirpath = dirname(get_config('system','directory_submit_url'));
 	if(strlen($gdirpath)) {
 		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
-		. zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
+		. zid($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
 	}
 
 	$admin = '';
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 5c5d0e933..54bbf31af 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -49,7 +49,7 @@ function dirfind_content(&$a) {
 			foreach($j->results as $jj) {
 				
 				$o .= replace_macros($tpl,array(
-					'$url' => zrl($jj->url),
+					'$url' => zid($jj->url),
 					'$name' => $jj->name,
 					'$photo' => $jj->photo,
 					'$tags' => $jj->tags
diff --git a/mod/match.php b/mod/match.php
index fbe3aa91f..b845b0d46 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -51,7 +51,7 @@ function match_content(&$a) {
 				
 				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
 				$o .= replace_macros($tpl,array(
-					'$url' => zrl($jj->url),
+					'$url' => zid($jj->url),
 					'$name' => $jj->name,
 					'$photo' => $jj->photo,
 					'$inttxt' => ' ' . t('is interested in:'),
diff --git a/mod/notifications.php b/mod/notifications.php
index 8221dd7c3..7d861037c 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -149,7 +149,7 @@ function notifications_content(&$a) {
 						'$contact_id' => $rr['contact-id'],
 						'$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"),
 						'$fullname' => $rr['fname'],
-						'$url' => zrl($rr['furl']),
+						'$url' => zid($rr['furl']),
 						'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
 						'$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
 
@@ -199,7 +199,7 @@ function notifications_content(&$a) {
 					'$fullname' => $rr['name'],
 					'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
 					'$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
-					'$url' => zrl($rr['url']),
+					'$url' => zid($rr['url']),
 					'$knowyou' => $knowyou,
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
diff --git a/mod/randprof.php b/mod/randprof.php
index 6713a81d9..0726b231a 100644
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -5,6 +5,6 @@ function randprof_init(&$a) {
 	require_once('include/Contact.php');
 	$x = random_profile();
 	if($x)
-		goaway(zrl($x));
+		goaway(zid($x));
 	goaway($a->get_baseurl() . '/profile');
 }
diff --git a/mod/suggest.php b/mod/suggest.php
index 7a86d53a1..4aed2e61a 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -52,7 +52,7 @@ function suggest_content(&$a) {
 		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
 
 		$o .= replace_macros($tpl,array(
-			'$url' => zrl($rr['url']),
+			'$url' => zid($rr['url']),
 			'$name' => $rr['name'],
 			'$photo' => $rr['photo'],
 			'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 3c595567f..8133fb4a0 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -55,7 +55,7 @@ function viewcontacts_content(&$a) {
 		if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
 			$url = 'redir/' . $rr['id'];
 		else
-			$url = zrl($url);
+			$url = zid($url);
 
 		$contacts[] = array(
 			'id' => $rr['id'],