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

diff --cc js_upload.tgz
index 96afb12e2a15908dfec9978a1b82855c0181a0dc,96afb12e2a15908dfec9978a1b82855c0181a0dc..1140117525937590c716211402ff9311de09dfc7
mode 100755,100644..100755
Binary files differ

diff --cc sniper.tgz
index 2481d0b8a01e98fd431adf8997cadd21353e1545,a6917c2d29ef05928b3d704a7c1ff2ff82ea8613..369fcf6da7e636d955364aa283050a6f0defaf81
mode 100755,100644..100755
Binary files differ

diff --cc uhremotestorage.tgz
index 9e91f49ab1633d0b889eb3bfac3234f51bf19f5b,5515aeaa531754c10a571fd30815fb825a7cd9a0..055fa76e50543f66100a49fc239f6d0e0304924d
mode 100755,100644..100755
Binary files differ

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

diff --cc uhremotestorage/uhremotestorage.php
index 30600369f192d2a3718786655f32df91176e74b2,3b8ab34c231dac837fa3f415ba4826a9f9d20e81..a2a8cc3dd107cf4ccdc0ca2e6c5416b82e14eb0d
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'),
        ));