From 2a818e866f580c39ea403aa6dc31d3a8a2617cf2 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 19 Dec 2011 09:35:24 +0100
Subject: [PATCH] uhremotestorage: update webfinger link

---
 uhremotestorage.tgz                 | Bin 1144 -> 1577 bytes
 uhremotestorage/settings.tpl        |   3 ++
 uhremotestorage/uhremotestorage.php |  47 +++++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/uhremotestorage.tgz b/uhremotestorage.tgz
index 2654cd0317dc7bf6f9d9a36f3c72aff73e08767c..5515aeaa531754c10a571fd30815fb825a7cd9a0 100644
GIT binary patch
literal 1577
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
bK?N05P(cM1R8T<$|84jO!W%Nw04M+e%Dxh|

literal 1144
zcmV-;1c&<{iwFQ%^T1931MOFBZ`(Ey&R6SK+yrlu0!OkFzW}MMEoeGyz_1O?S`26d
zL6&HnFii>+l{g6e-*=Q0&vBD@K$8r^_<WH`9`Efr9_ex}$x<j%C?S&>2@YNWUBqZG
z(BIx@(5=S3e!u!QIOz3;{n2PJ><^C*y1kQ=UjG0FFX7BC%0eX);9#0esCZJ2$l^5|
zdR>$|{O^qYe4c-`4NdT{=KCT3`^Tf<4*#R$!N~!1pCP`z_@DD1evb@W!Qr6=hwy8%
zB&SgFxhNFLpsoaHN<j;plOmNgS5)v*c(=+$L4b15xq(05pM#ncV3aRF2_P#)Bu`ki
z>J%HbM}#L6hU&NUe#G2XI(vRskIzaq7xEN-)TF>$u`D@-aIRE-8Uza}XHt~8pNeIW
zOEIO41W2ExtJN~X?STarOiP|>KVhe$W6F_n##|3>t(GJ+icZORF2urha`Z!>&+$rT
zP6wPM%LLy&6AzscExc>!o-*&vm&RB*qdYE%Qk2h%ueP^QwBJ^Y%&BKHSZhP8R*Q+*
zj7ZmRl8h|xY_d^oZCTc%^dQq)1X-<;zbZ#xntMr>_E~#zp0wcAqbxm2(stV1cG7|G
z+7l0tlhtZx$yF&CjA2GpoTq|M>CA0UJ~>qzxWq5boXgIxlTOE}cUF0!Q*awiT5U`3
zUoDw)iFykqV@YzBq{PLgmJ<fpdLj&5kL=IN_MPw--Gn4zW4mb@ciqPqauyUhNdr_L
zbp4(U=*V<zJAPx(ckCc?eET!6726%HcjEyLw1?{_^K&obRf5|3myU%_-EV-26qBbj
z;(8uxlth)1quOFCY1=|i<g3$;fB)^`4@@kENOX*P_Hqw{cOEwE75iO7Zjm}9pq(5=
zdi|5bX}aKeXCN=W{e$gSOPY6`YrWulZyqm-e;8k*LgjkD?)9-&f;tr8s&F$ZD@$=)
zt;L>i2Y12wxJj3Ct6hLUhNf!bWs*vPk>hFy5-F1#T}Vz_QN@S@;|QD&58r`KrxMKY
z8m#1sTvD#4E-2SIV@zD@iw`4$8&OJ_N=kS}7YShA+;0m{ucG6er1<0B75T{B2ri=w
z0^*v#WunYH$HPj}EO@meIzKJ+qYeV@mq15*wF%_>?Bhmjl~&YLXBa!i&(qrDMB-wB
zsoR+B)C-$8fu`}AG6oZU)1z;pQc-ipLK^*ql^6yz3X(i8f;xE@O}E19I!}~tQd;uE
z#k=>F<b9zqKz&XVUQte#R8^VAP%i3`Uh}G=SX=-0>*>Fb-797L=scH=J@5bS$?@O+
z|Bm}TeE$!IL-YQB6@(eRf|MmiF}ClxKbl}`Uf7Y<3g;(L-4??Df8s<QRoyQPava^>
z;_E-frc79d@9Ml%x@@pNs5!K&*|Ba>uwJ92ZiOhkUZa+6qt&Ulqp;c!>Lw?fNzk2r
zZ0FU5MHR8(Dq$tgwC@ChC=5_p)UxWY=?De}1_lNO1_lNO1_lNO1_lNO1_lNOh`#`5
K2XC+dC;$M|3@R4@

diff --git a/uhremotestorage/settings.tpl b/uhremotestorage/settings.tpl
index 45036dd4..22d7d608 100644
--- a/uhremotestorage/settings.tpl
+++ b/uhremotestorage/settings.tpl
@@ -2,5 +2,8 @@
 	<h3>$title</h3>
 	<p>$desc</p>
 	{{ inc field_input.tpl with $field=$url }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$auth }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$api }}{{ endinc }}
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>	
+
 </div>
diff --git a/uhremotestorage/uhremotestorage.php b/uhremotestorage/uhremotestorage.php
index 5c182004..3b8ab34c 100644
--- a/uhremotestorage/uhremotestorage.php
+++ b/uhremotestorage/uhremotestorage.php
@@ -2,7 +2,7 @@
 /**
  * Name: unhosted remote storage
  * Description: Expose in user XRD the link to external user's unhosted-enabled storage
- * Version: 1.0
+ * Version: 1.2
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  */
  
@@ -25,12 +25,19 @@ function uhremotestorage_uninstall() {
 }
 
 function uhremotestorage_personal_xrd($a, &$b){
+	list($user, $host) = explode("@",$_GET['uri']);
+	$user = str_replace("acct:","",$user);
+	$r = q("SELECT uid FROM user WHERE nickname='%s'", dbesc($user));
+	$uid = $r[0]['uid'];
 	
-	$davurl = get_pconfig($b['user']['uid'],'uhremotestorage','davurl');
-	if ($davurl){
+	$url = get_pconfig($uid,'uhremotestorage','unhoestedurl');
+	$auth = get_pconfig($uid,'uhremotestorage','unhoestedauth');
+	$api = get_pconfig($uid,'uhremotestorage','unhoestedapi');
+	
+	if ($url){
 		$b['xml'] = str_replace(
 			'</XRD>', 
-			"\t".'<Link rel="http://unhosted.org/spec/dav/0.1" href="'.$davurl.'"/>'."\n</XRD>",
+			"\t".'<Link rel="remoteStorage" template="'.$url.'" api="'.$api.'" auth="'.$auth.'" ></Link>'."\n</XRD>",
 			$b['xml']
 		);
 	}
@@ -39,7 +46,9 @@ function uhremotestorage_personal_xrd($a, &$b){
 function uhremotestorage_settings_post($a, $post){
 	if(! local_user())
 		return;
-	set_pconfig(local_user(),'uhremotestorage','davurl',$_POST['unhoestedurl']);
+	set_pconfig(local_user(),'uhremotestorage','unhoestedurl',$_POST['unhoestedurl']);
+	set_pconfig(local_user(),'uhremotestorage','unhoestedauth',$_POST['unhoestedauth']);
+	set_pconfig(local_user(),'uhremotestorage','unhoestedapi',$_POST['unhoestedapi']);
 }
 
 function uhremotestorage_settings($a, &$s){
@@ -48,13 +57,35 @@ function uhremotestorage_settings($a, &$s){
 	
 	$uid = $a->user['nickname'] ."@". $a->get_hostname();
 	
-	$davurl = get_pconfig(local_user(),'uhremotestorage','davurl');
+	$url = get_pconfig(local_user(),'uhremotestorage','unhoestedurl');
+	$auth = get_pconfig(local_user(),'uhremotestorage','unhoestedauth');
+	$api = get_pconfig(local_user(),'uhremotestorage','unhoestedapi');
 	
+	
+	$arr_api = array(
+		'WebDAV' => "WebDAV",
+		'simple' => "simple WebDAV",
+		'CouchDB' => "CouchDB",
+	);
+	/* experimental apis */
+	/*
+	$api = array_merge($api, array(
+		'git' => "git",
+		'tahoe-lafs' => 'tahoe-lafs',
+		'camlistore' => 'camlistore',
+		'AmazonS3' => 'AmazonS3',
+		'GoogleDocs' => 'GoogleDocs',
+		'Dropbox' => 'Dropbox',
+	);
+	*/
 	$tpl = file_get_contents(dirname(__file__)."/settings.tpl");
 	$s .= replace_macros($tpl, array(
 		'$title' => 'Unhosted remote storage',
-		'$desc' => sprintf( t('Allow to use your friendika id (%s) to connecto to external unhosted-enabled storage (like ownCloud)'), $uid ),
-		'$url'	=> array( 'unhoestedurl', t('Unhosted DAV storage url'), $davurl, 'If your are using ownCloud, your unhosted url will be like <tt>http://<i>HOST</i>/apps/remoteStorage/compat.php/<i>USER</i>/remoteStorage/</tt>'),
+		'$desc' => sprintf( t('Allow to use your friendika id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href="http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger">RemoteStorage WebFinger</a>'), $uid ),
+		'$url'	=> array( 'unhoestedurl', t('Template URL (with {category})'), $url, 'If your are using ownCloud, your unhosted url will be like <tt>http://<i>HOST</i>/apps/remoteStorage/WebDAV.php/<i>USER</i>/remoteStorage/{category}</tt>'),
+		'$auth'	=> array( 'unhoestedauth', t('OAuth end-point'), $auth, 'If your are using ownCloud, your OAuth endpoint will be like <tt>http://<i>HOST</i>/apps/remoteStorage/auth.php/<i>USER</i></tt>'),
+		'$api'	=> array( 'unhoestedapi', t('Api'), $api, 'If your are using ownCloud, your api will be <tt>WebDAV</tt>', $arr_api),
+		
 		'$submit' => t('Submit'),
 	));