diff options
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/include/channel.php b/include/channel.php index 1179697a4..7bfa2b6a2 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1103,8 +1103,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa require_once('include/widgets.php'); - if(! feature_enabled($profile['uid'],'hide_rating')) - $z = widget_rating(array('target' => $profile['channel_hash'])); +// if(! feature_enabled($profile['uid'],'hide_rating')) + $z = widget_rating(array('target' => $profile['channel_hash'])); $o .= replace_macros($tpl, array( '$zcard' => $zcard, @@ -1381,6 +1381,11 @@ function zid($s,$address = '') { if (! strlen($s) || strpos($s,'zid=')) return $s; + $m = parse_url($s); + $fragment = ((array_key_exists('fragment',$m) && $m['fragment']) ? $m['fragment'] : false); + if($fragment !== false) + $s = str_replace('#' . $fragment,'',$s); + $has_params = ((strpos($s,'?')) ? true : false); $num_slashes = substr_count($s, '/'); if (! $has_params) @@ -1401,6 +1406,11 @@ function zid($s,$address = '') { else $zurl = $s; + // put fragment at the end + + if($fragment) + $zurl .= '#' . $fragment; + $arr = array('url' => $s, 'zid' => urlencode($myaddr), 'result' => $zurl); call_hooks('zid', $arr); @@ -1627,13 +1637,24 @@ function notifications_on($channel_id,$value) { function get_channel_default_perms($uid) { + + $ret = []; + $r = q("select abook_xchan from abook where abook_channel = %d and abook_self = 1 limit 1", intval($uid) ); - if($r) - return load_abconfig($uid,$r[0]['abook_xchan'],'my_perms'); + if($r) { + $x = load_abconfig($uid,$r[0]['abook_xchan'],'my_perms'); + if($x) { + foreach($x as $xv) { + if(intval($xv['v'])) { + $ret[] = $xv['k']; + } + } + } + } - return array(); + return $ret; } |