diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/editpost.php | 7 | ||||
| -rw-r--r-- | mod/fsuggest.php | 5 | ||||
| -rwxr-xr-x | mod/like.php | 4 | ||||
| -rw-r--r-- | mod/post.php | 1 | ||||
| -rw-r--r-- | mod/probe.php | 1 | ||||
| -rw-r--r-- | mod/zfinger.php | 6 |
6 files changed, 16 insertions, 8 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index 43c71ca8a..1d7b7b6fb 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -18,13 +18,14 @@ function editpost_content(&$a) { return; } - $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", + $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d and author_xchan = '%s' LIMIT 1", intval($post_id), - intval(local_user()) + intval(local_user()), + dbesc(get_observer_hash()) ); if(! count($itm)) { - notice( t('Item not found') . EOL); + notice( t('Item is not editable') . EOL); return; } diff --git a/mod/fsuggest.php b/mod/fsuggest.php index 9ef8f4c55..8b6f077d3 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -100,8 +100,9 @@ function fsuggest_content(&$a) { $o .= '<form id="fsuggest-form" action="fsuggest/' . $contact_id . '" method="post" >'; - $o .= contact_selector('suggest','suggest-select', false, - array('size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true)); +// FIXME contact_selector deprecated, removed +// $o .= contact_selector('suggest','suggest-select', false, +// array('size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true)); $o .= '<div id="fsuggest-submit-wrapper"><input id="fsuggest-submit" type="submit" name="submit" value="' . t('Submit') . '" /></div>'; diff --git a/mod/like.php b/mod/like.php index 7c3df98ba..16be071bc 100755 --- a/mod/like.php +++ b/mod/like.php @@ -149,11 +149,11 @@ function like_content(&$a) { $arr['author_xchan'] = $observer['xchan_hash']; - $ulink = '[url=' . $item_owner['xchan_url'] . ']' . $item_owner['xchan_name'] . '[/url]'; + $ulink = '[url=' . $thread_owner['xchan_url'] . ']' . $thread_owner['xchan_name'] . '[/url]'; $alink = '[url=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/url]'; $plink = '[url=' . $a->get_baseurl() . '/display/' . $item['uri'] . ']' . $post_type . '[/url]'; - $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink ); + $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); $arr['verb'] = $activity; $arr['obj_type'] = $objtype; diff --git a/mod/post.php b/mod/post.php index e5fa1a418..af08d3f98 100644 --- a/mod/post.php +++ b/mod/post.php @@ -261,6 +261,7 @@ function post_post(&$a) { } } + if($msgtype === 'refresh') { // remote channel info (such as permissions or photo or something) diff --git a/mod/probe.php b/mod/probe.php index f90728df2..397f571c5 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -1,6 +1,5 @@ <?php -require_once('include/Scrape.php'); require_once('include/zot.php'); function probe_content(&$a) { diff --git a/mod/zfinger.php b/mod/zfinger.php index 74353e8f9..48582b3d6 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -145,6 +145,12 @@ function zfinger_init(&$a) { // array of (verified) hubs this channel uses $ret['locations'] = array(); + + + + + + $x = zot_get_hubloc(array($e['channel_hash'])); if($x && count($x)) { foreach($x as $hub) { |