From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 9 Feb 2012 19:13:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'old/master' into mergeto
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=858758e92c5d8c1c41e188284fea53ae50fb0855;p=friendica-addons.git

Merge remote-tracking branch 'old/master' into mergeto
---

858758e92c5d8c1c41e188284fea53ae50fb0855
diff --cc js_upload.tgz
index 96afb12e,96afb12e..11401175
mode 100755,100644..100755
Binary files differ
diff --cc sniper.tgz
index 2481d0b8,a6917c2d..369fcf6d
mode 100755,100644..100755
Binary files differ
diff --cc uhremotestorage.tgz
index 9e91f49a,5515aeaa..055fa76e
mode 100755,100644..100755
Binary files differ
diff --cc uhremotestorage/settings.tpl
index 45036dd4,22d7d608..22d7d608
mode 100755,100644..100755
--- a/uhremotestorage/settings.tpl
+++ b/uhremotestorage/settings.tpl
diff --cc uhremotestorage/uhremotestorage.php
index 30600369,3b8ab34c..a2a8cc3d
mode 100755,100644..100755
--- a/uhremotestorage/uhremotestorage.php
+++ b/uhremotestorage/uhremotestorage.php
@@@ -53,8 -81,11 +81,11 @@@ function uhremotestorage_settings($a, &
  	$tpl = file_get_contents(dirname(__file__)."/settings.tpl");
  	$s .= replace_macros($tpl, array(
  		'$title' => 'Unhosted remote storage',
- 		'$desc' => sprintf( t('Allow to use your friendica 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 ),
++		'$desc' => sprintf( t('Allow to use your friendica 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'),
  	));