harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zid fixes

Browse Source
This commit is contained in:
friendica 2013-04-16 16:03:41 -07:00
parent 97957e0c1b
commit 6f24c7cb27
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
boot.php
View File

@ -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) { function zid($s,$force = false) {
if(! strlen($s)) if(! strlen($s) || strpos('zid=',$s))
return $s; return $s;
$has_params = ((strpos($s,'?')) ? true : false); $has_params = ((strpos($s,'?')) ? true : false);
$num_slashes = substr_count($s,'/');
if(! $has_params) if(! $has_params)
$has_params = ((strpos($s,'&')) ? true : false); $has_params = ((strpos($s,'&')) ? true : false);
$achar = strpos($s,'?') ? '&' : '?'; $achar = strpos($s,'?') ? '&' : '?';
@ -2040,7 +2053,7 @@ function zid($s,$force = false) {
$mine = get_my_url(); $mine = get_my_url();
$myaddr = get_my_address(); $myaddr = get_my_address();
if($mine and ! link_compare($mine,$s)) 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; return $s;
} }

2
version.inc
View File

@ -1 +1 @@
2013-04-15.284 2013-04-16.285