diff options
| -rw-r--r-- | include/text.php | 7 | ||||
| -rw-r--r-- | include/zot.php | 13 | ||||
| -rw-r--r-- | mod/group.php | 6 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 21 insertions, 7 deletions
diff --git a/include/text.php b/include/text.php index 36b465bea..c91803f30 100644 --- a/include/text.php +++ b/include/text.php @@ -598,10 +598,13 @@ function chanlink_cid($d) { if(! function_exists('micropro')) { function micropro($contact, $redirect = false, $class = '', $textmode = false) { - $url = chanlink_hash($contact['xchan_hash']); + if($contact['click']) + $url = '#'; + else + $url = chanlink_hash($contact['xchan_hash']); return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( - '$click' => $click, + '$click' => (($contact['click']) ? $contact['click'] : ''), '$class' => $class, '$url' => $url, '$photo' => $contact['xchan_photo_s'], diff --git a/include/zot.php b/include/zot.php index 7915132fe..0f444be15 100644 --- a/include/zot.php +++ b/include/zot.php @@ -179,6 +179,9 @@ function zot_finger($webbie,$channel) { function zot_refresh($them,$channel = null) { + logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA); + logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA); + if($them['hubloc_url']) $url = $them['hubloc_url']; else { @@ -189,8 +192,10 @@ function zot_refresh($them,$channel = null) { if($r) $url = $r[0]['hubloc_url']; } - if(! $url) + if(! $url) { + logger('zot_refresh: no url'); return; + } $postvars = array(); @@ -495,7 +500,7 @@ function import_xchan($arr) { $import_photos = false; if(! rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key'])) { - logger('import_xchan_from_json: Unable to verify channel signature for ' . $arr['address']); + logger('import_xchan: Unable to verify channel signature for ' . $arr['address']); $ret['message'] = t('Unable to verify channel signature'); return $ret; } @@ -556,7 +561,7 @@ function import_xchan($arr) { if($arr['locations']) { foreach($arr['locations'] as $location) { if(! rsa_verify($location['url'],base64url_decode($location['url_sig']),$arr['key'])) { - logger('import_xchan_from_json: Unable to verify site signature for ' . $location['url']); + logger('import_xchan: Unable to verify site signature for ' . $location['url']); $ret['message'] .= sprintf( t('Unable to verify site signature for %s'), $location['url']) . EOL; continue; } @@ -597,6 +602,8 @@ function import_xchan($arr) { $ret['success'] = true; $ret['hash'] = $xchan_hash; } + + logger('import_xchan: result: ' . print_r($ret,true), LOGGER_DATA); return $ret; } diff --git a/mod/group.php b/mod/group.php index 40f7d756a..91b9999dc 100644 --- a/mod/group.php +++ b/mod/group.php @@ -1,8 +1,9 @@ <?php +require_once('include/group.php'); + function group_aside(&$a) { if(local_user()) { - require_once('include/group.php'); $a->set_widget('groups_edit',group_side('collections','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0))); } } @@ -62,6 +63,8 @@ function group_post(&$a) { function group_content(&$a) { $change = false; + + logger('mod_group: ' . $a->cmd,LOGGER_DEBUG); if(! local_user()) { notice( t('Permission denied') . EOL); @@ -112,6 +115,7 @@ function group_content(&$a) { if((argc() > 2) && intval(argv(1)) && argv(2)) { + check_form_security_token_ForbiddenOnErr('group_member_change', 't'); $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", diff --git a/version.inc b/version.inc index 507ff23a1..bcf27472c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-12-29.184 +2012-12-30.185 |