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

more logging, some debugging of group membership page

Browse Source
This commit is contained in:
friendica 2012-12-30 15:28:13 -08:00
parent a8e16c48b1
commit 8eee37e1fa
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/text.php
View File

@ -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'],

13
include/zot.php
View File

@ -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;
}

6
mod/group.php
View File

@ -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",

2
version.inc
View File

@ -1 +1 @@
2012-12-29.184
2012-12-30.185