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

diff --cc js_upload.tgz
index 96afb12,96afb12..1140117
mode 100755,100644..100755
Binary files differ

diff --cc sniper.tgz
index 2481d0b,a6917c2..369fcf6
mode 100755,100644..100755
Binary files differ

diff --cc uhremotestorage.tgz
index 9e91f49,5515aea..055fa76
mode 100755,100644..100755
Binary files differ

diff --cc uhremotestorage/settings.tpl
index 45036dd,22d7d60..22d7d60
mode 100755,100644..100755
--- 1/uhremotestorage/settings.tpl
--- 2/uhremotestorage/settings.tpl
+++ b/uhremotestorage/settings.tpl

diff --cc uhremotestorage/uhremotestorage.php
index 3060036,3b8ab34..a2a8cc3
mode 100755,100644..100755
--- 1/uhremotestorage/uhremotestorage.php
--- 2/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'),
        ));