aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-12 15:55:37 -0800
committerfriendica <info@friendica.com>2013-01-12 15:55:37 -0800
commitf24ce356039e9988b25a7fa6b1e74a3ad880745a (patch)
treeaf561fca5ccc9198310016c7b712734b2e44ad9c
parent5cb970963b4c5c9d7c8169451470072e0d149f93 (diff)
downloadvolse-hubzilla-f24ce356039e9988b25a7fa6b1e74a3ad880745a.tar.gz
volse-hubzilla-f24ce356039e9988b25a7fa6b1e74a3ad880745a.tar.bz2
volse-hubzilla-f24ce356039e9988b25a7fa6b1e74a3ad880745a.zip
implement "finger" command
-rw-r--r--include/zot.php4
-rwxr-xr-xutil/fresh25
2 files changed, 28 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index b1853ff25..55e2dbe92 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -154,6 +154,7 @@ function zot_finger($webbie,$channel) {
$rhs = '/.well-known/zot-info';
+
if($channel) {
$postvars = array(
'address' => $address,
@@ -161,12 +162,13 @@ function zot_finger($webbie,$channel) {
'target_sig' => $channel['channel_guid_sig'],
'key' => $channel['channel_pubkey']
);
+
$result = z_post_url($url . $rhs,$postvars);
if(! $result['success'])
$result = z_post_url('http://' . $host . $rhs,$postvars);
}
else {
- $rhs .= 'address=' . urlencode($address);
+ $rhs .= '?f=&address=' . urlencode($address);
$result = z_fetch_url($url . $rhs);
if(! $result['success'])
diff --git a/util/fresh b/util/fresh
index 450d17464..3e9b55ae1 100755
--- a/util/fresh
+++ b/util/fresh
@@ -4,6 +4,7 @@
// Red cli interpreter
require_once('include/cli_startup.php');
+require_once('include/zot.php');
cli_startup();
@@ -42,14 +43,38 @@ fresh_main($argc,$argv);
function process_command($line) {
+ $a = get_app();
+
// split args
+ $a->cmd = $line;
+ $a->argv = explode(' ',$line);
+ $a->argc = count($a->argv);
+
+ $authenticated = false;
+ $channel = null;
+
if($line == 'version') {
echo 'Fresh version 0.1';
return;
}
+ switch(argv(0)) {
+ case 'finger':
+ if(argv(1)) {
+ $x = zot_finger(argv(1),$channel);
+ if($x['success'])
+ print_r(json_decode($x['body'],true));
+ }
+ break;
+
+
+
+
+ default:
+ break;
+ }
}