zid fixes

2 files changed, 16 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 3173e1268..e4452dcb7 100644
--- a/boot.php
+++ b/boot.php
@@ -2029,10 +2029,23 @@ function zid_init(&$a) {
 	}
 }
 
+/**
+ * @function zid($s,$force = false)
+ *   Adds a zid parameter to a url
+ * @param string $s
+ *   The url to accept the zid
+ * @param boolean $force
+ *   Currently unused
+ * @return string
+ *
+ */
+
+
 function zid($s,$force = false) {
-	if(! strlen($s))
+	if(! strlen($s) || strpos('zid=',$s))
 		return $s;
 	$has_params = ((strpos($s,'?')) ? true : false);
+	$num_slashes = substr_count($s,'/');
 	if(! $has_params)
 		$has_params = ((strpos($s,'&')) ? true : false);
 	$achar = strpos($s,'?') ? '&' : '?';
@@ -2040,7 +2053,7 @@ function zid($s,$force = false) {
 	$mine = get_my_url();
 	$myaddr = get_my_address();
 	if($mine and ! link_compare($mine,$s))
-		return $s . (($has_params) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
+		return $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
 	return $s;
 }
 
diff --git a/version.inc b/version.inc
index 40e9c14b8..4839c76d4 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-04-15.284
+2013-04-16.285