diff options
Diffstat (limited to 'apps/files_sharing')
105 files changed, 1646 insertions, 175 deletions
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php index bb8df82775d..99a5bdaa859 100644 --- a/apps/files_sharing/ajax/publicpreview.php +++ b/apps/files_sharing/ajax/publicpreview.php @@ -63,6 +63,13 @@ $view = new \OC\Files\View('/' . $userId . '/files'); $pathId = $linkedItem['file_source']; $path = $view->getPath($pathId); + +if($path === null) { + \OC_Response::setStatus(\OC_Response::STATUS_NOT_FOUND); + \OC_Log::write('core-preview', 'Could not resolve file for shared item', OC_Log::WARN); + exit; +} + $pathInfo = $view->getFileInfo($path); $sharedFile = null; diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php index 5a20ebcb061..3ea0fae8522 100644 --- a/apps/files_sharing/ajax/shareinfo.php +++ b/apps/files_sharing/ajax/shareinfo.php @@ -3,6 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 @@ -28,6 +29,11 @@ if (!isset($_GET['t'])) { exit; } +if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) { + \OC_Response::setStatus(404); // 404 not found + exit; +} + $token = $_GET['t']; $password = null; diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php index 03812800c17..308965192b9 100644 --- a/apps/files_sharing/api/local.php +++ b/apps/files_sharing/api/local.php @@ -3,7 +3,6 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> @@ -27,6 +26,8 @@ namespace OCA\Files_Sharing\API; +use OC\HintException; + class Local { /** @@ -163,7 +164,7 @@ class Local { } $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path` , `*PREFIX*share`.`permissions`, `stime`, `expiration`, `token`, `storage`, `mail_send`, `mail_send`'; - $getReshares = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*share`.`file_source` = ? AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\') AND `uid_owner` != ?'); + $getReshares = \OCP\DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*share`.`file_source` = ? AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\') AND `uid_owner` != ?'); $reshares = $getReshares->execute(array($itemSource, \OCP\User::getUser()))->fetchAll(); foreach ($reshares as $key => $reshare) { @@ -294,6 +295,8 @@ class Local { $shareWith, $permissions ); + } catch (HintException $e) { + return new \OC_OCS_Result(null, 400, $e->getHint()); } catch (\Exception $e) { return new \OC_OCS_Result(null, 403, $e->getMessage()); } @@ -572,7 +575,7 @@ class Local { $result = $query->execute($args); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('files_sharing', \OC_DB::getErrorMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('files_sharing', \OCP\DB::getErrorMessage(), \OCP\Util::ERROR); return null; } if ($share = $result->fetchRow()) { diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 19d3b6cd9cc..f72f5024622 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -2,10 +2,8 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Gadzy <dev@gadzy.fr> - * @author j-ed <juergen@eisfair.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> - * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * @@ -49,6 +47,7 @@ $application->registerMountProviders(); $application->setupPropagation(); \OCP\App::registerAdmin('files_sharing', 'settings-admin'); +\OCP\App::registerPersonal('files_sharing', 'settings-personal'); \OCA\Files_Sharing\Helper::registerHooks(); diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php index 0eb20945070..b9c2844d78c 100644 --- a/apps/files_sharing/appinfo/application.php +++ b/apps/files_sharing/appinfo/application.php @@ -1,9 +1,23 @@ <?php /** - * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * */ namespace OCA\Files_Sharing\Appinfo; diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 78fa138f5b5..2686abed0ae 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -2,9 +2,11 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Georg Ehrke <georg@owncloud.com> + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index f19c9ee1f9b..e98b60ea36d 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -1,7 +1,6 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_sharing/css/3rdparty/gs-share/style.css b/apps/files_sharing/css/3rdparty/gs-share/style.css new file mode 100644 index 00000000000..c699ddb3db5 --- /dev/null +++ b/apps/files_sharing/css/3rdparty/gs-share/style.css @@ -0,0 +1,49 @@ +.js-gs-share, .gs-share [aria-hidden="true"], .gs-share-form[aria-hidden="true"] { + display: none; +} + +.js-gs-share-enabled .js-gs-share { + display: inline; + float: left; +} + +.gs-share .js-gs-share[href] { + display: inline; +} + +.gs-share [aria-hidden="false"], .gs-share-form[aria-hidden="false"] { + display: block; + margin-top: 40px; +} + +.gs-share { + position: relative; +} + +.gs-share-form { + background: #FFF; + border: 1px solid #000; + border-radius: 5px; + padding: 5px; + position: absolute; + z-index: 1; +} + +.gs-share [for="gs-account"], .gs-share [type="text"] { + display: block; + margin-bottom: 8px; +} + +.gs-share [type="submit"] { + display: block; + margin-top: 8px; +} + +.gs-share--icon { + border: none; + cursor: pointer; + min-height: 32px; + padding: 0; + padding-left: 33px; + background: transparent url('../../../img/gs-share.png') no-repeat left center; +} diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index fc78ced0b76..a649ecfe885 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -2,6 +2,7 @@ background: #fff; text-align: center; margin: 45px auto 0; + min-height: 200px; } #preview .notCreatable { diff --git a/apps/files_sharing/css/settings-personal.css b/apps/files_sharing/css/settings-personal.css new file mode 100644 index 00000000000..c9af6c08c40 --- /dev/null +++ b/apps/files_sharing/css/settings-personal.css @@ -0,0 +1,32 @@ +#fileSharingSettings img { + cursor: pointer; +} + +#fileSharingSettings xmp { + margin-top: 0; +} + +[class^="social-"], [class*=" social-"] { + background-repeat: no-repeat; + background-position: 2px; + min-width: 16px; + min-height: 16px; + padding-left: 29px; + background-size: 24px; +} + +.social-gnu { + background-image: url('../img/social-gnu.svg'); +} +.social-diaspora { + background-image: url('../img/social-diaspora.svg'); +} +.social-twitter { + background-image: url('../img/social-twitter.svg'); +} +.social-facebook { + background-image: url('../img/social-facebook.svg'); +} +.social-googleplus { + background-image: url('../img/social-googleplus.svg'); +} diff --git a/apps/files_sharing/img/social-diaspora.svg b/apps/files_sharing/img/social-diaspora.svg new file mode 100644 index 00000000000..1d5131129a9 --- /dev/null +++ b/apps/files_sharing/img/social-diaspora.svg @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="32" + height="32" + id="svg3937" + inkscape:version="0.91 r13725" + sodipodi:docname="social-diaspora.svg"> + <metadata + id="metadata4166"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs4164" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview4162" + showgrid="false" + inkscape:zoom="13.549078" + inkscape:cx="-5.9149036" + inkscape:cy="9.8488708" + inkscape:current-layer="svg3937" /> + <path + d="m 15.956724,31 c -0.896548,4.3e-5 -1.344812,-0.448233 -1.344812,-1.344828 L 14.715361,19 5.612032,24.689655 C 4.9223812,25.172463 4.336189,25.034532 3.8534355,24.275862 L 3.3362024,23.448276 C 2.8534488,22.758671 2.991377,22.172465 3.7499869,21.689655 L 13.163651,16 3.6465383,10.310345 C 2.9568974,9.8966152 2.8189693,9.3104089 3.2327538,8.551724 L 3.8534355,7.517241 C 4.1982609,6.965584 4.7499735,6.896618 5.5085834,7.310345 L 14.715361,13 14.611912,2.344828 c 0,-0.89648 0.448264,-1.344756 1.344812,-1.344828 l 0.827569,0 c 0.896538,7.2e-5 1.344812,0.448348 1.344812,1.344828 L 18.025656,13 27.128985,7.206897 c 0.620651,-0.344761 1.206854,-0.206831 1.758596,0.413793 l 0.517233,0.827586 c 0.344796,0.7586846 0.206898,1.344891 -0.413784,1.758621 L 19.473917,16 l 9.620561,5.793103 c 0.689611,0.413845 0.827549,0.965568 0.413785,1.655173 L 28.99103,24.37931 c -0.482784,0.75867 -1.103465,0.896601 -1.862045,0.413793 L 18.025656,19 18.129105,29.655172 c 0,0.896595 -0.448274,1.344871 -1.344812,1.344828 l -0.827569,0" + id="star" + style="opacity:0.5;fill:#000000;fill-opacity:1" + inkscape:connector-curvature="0" /> +</svg> diff --git a/apps/files_sharing/img/social-facebook.svg b/apps/files_sharing/img/social-facebook.svg new file mode 100644 index 00000000000..aad02bc3853 --- /dev/null +++ b/apps/files_sharing/img/social-facebook.svg @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + enable-background="new 0 0 56.693 56.693" + height="32" + id="Layer_1" + version="1.1" + viewBox="0 0 32 32" + width="32" + xml:space="preserve" + inkscape:version="0.91 r13725" + sodipodi:docname="social-facebook.svg"><metadata + id="metadata5818"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs5816" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview5814" + showgrid="false" + inkscape:zoom="11.271233" + inkscape:cx="5.0995367" + inkscape:cy="28.322502" + inkscape:current-layer="Layer_1" /><path + d="m 22.396887,16.008872 -4.203409,0 0,14.991128 -6.230193,0 0,-14.991128 -2.963285,0 0,-5.292784 2.963285,0 0,-3.429613 C 11.963285,4.831822 13.128489,1 18.251639,1 l 4.613498,0.01774 0,5.140971 -3.349714,0 c -0.547114,0 -1.320959,0.273067 -1.320959,1.44026 l 0,3.118099 4.749536,0 z" + id="path5812" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccscccssccc" + style="fill:#000000;fill-opacity:1;opacity:0.5" /></svg>
\ No newline at end of file diff --git a/apps/files_sharing/img/social-gnu.svg b/apps/files_sharing/img/social-gnu.svg new file mode 100644 index 00000000000..24556aaa024 --- /dev/null +++ b/apps/files_sharing/img/social-gnu.svg @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="32" + height="32" + id="svg2880" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="social-gnu.svg" + inkscape:export-filename="/home/robmyers/Desktop/social_logo_competition/gnu-social-logo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs2882"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2888" /> + <inkscape:perspective + id="perspective2859" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="17.21204" + inkscape:cx="13.854211" + inkscape:cy="18.472465" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1022" + inkscape:window-height="730" + inkscape:window-x="0" + inkscape:window-y="49" + inkscape:window-maximized="0" /> + <metadata + id="metadata2885"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-119.19595,-352.32438)"> + <path + style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none" + d="m 125.14074,354.32438 c -2.18531,0 -3.94479,1.75948 -3.94479,3.94479 l 0,15.76964 c 0,2.18531 1.75948,3.94419 3.94479,3.94419 l 11.72461,0 c -0.0131,4.46851 -6.05322,6.34138 -6.05322,6.34138 0,0 10.21217,-0.0335 11.65719,-6.34138 l 2.12751,0 c 2.18532,0 3.94479,-1.75888 3.94479,-3.94419 l 0,-15.76964 c 0,-2.18531 -1.75947,-3.94479 -3.94479,-3.94479 l -19.45609,0 z m 5.66602,3.16145 c 0.042,-0.007 0.0803,-0.007 0.11455,0 0.0366,0.007 0.0681,0.022 0.0943,0.0454 0.41895,0.37367 -0.69461,0.73954 -0.60497,2.57737 0.0394,0.80713 -0.2017,1.43484 1.34476,1.43484 1.03195,0 0.60505,-0.91938 1.90498,-0.91938 0.77317,0 1.0581,0.49786 1.16578,0.90268 0.10769,-0.40482 0.39265,-0.90268 1.16577,-0.90268 1.29994,0 0.87304,0.91938 1.90498,0.91938 1.54648,0 1.3054,-0.62771 1.34477,-1.43484 0.0896,-1.83783 -1.02452,-2.2037 -0.60556,-2.57737 0.41895,-0.37366 2.21932,1.81578 2.26414,2.66745 0.0469,0.89057 0.0697,2.29462 -1.25467,3.02244 1.47777,1.45682 1.67588,3.38756 1.67588,3.38756 l -2.55469,-0.0447 c 0,0 -0.58278,-2.64503 -3.67572,-2.51054 -3.09293,0.13447 -3.49614,0.67255 -3.49614,3.94479 0,3.27223 1.43378,4.39676 3.63037,4.48234 3.45154,0.13448 3.13818,-1.79282 3.13818,-1.79282 l -1.61383,0.0895 -0.89671,-2.42045 5.51329,0 c 0,2.64468 -1.12011,6.76843 -6.36465,6.49949 -5.24455,-0.26896 -6.41052,-4.39271 -6.45534,-7.17187 -0.0246,-1.52551 0.22386,-3.24602 1.47363,-4.46265 -1.31045,-0.72721 -1.2678,-2.13094 -1.2678,-3.02303 0,-1.10312 1.42517,-2.61621 2.05473,-2.71279 z" + id="path4639" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/apps/files_sharing/img/social-googleplus.svg b/apps/files_sharing/img/social-googleplus.svg new file mode 100644 index 00000000000..123273f2d38 --- /dev/null +++ b/apps/files_sharing/img/social-googleplus.svg @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="32" + id="Layer_1" + version="1.1" + viewBox="0 0 32 32" + width="32" + xml:space="preserve" + inkscape:version="0.91 r13725" + sodipodi:docname="social-googleplus.svg"><metadata + id="metadata4721"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs4719" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview4717" + showgrid="false" + inkscape:zoom="14.120039" + inkscape:cx="16.803685" + inkscape:cy="25.296916" + inkscape:current-layer="Layer_1" /><style + type="text/css" + id="style4709"><![CDATA[ + .st0{fill-rule:evenodd;clip-rule:evenodd;} +]]></style><path + d="m 12.260365,1.00001 c -1.044403,0 -2.164648,0.121381 -3.360551,0.364723 C 7.692812,1.648864 6.529074,2.249513 5.409199,3.171551 3.776833,4.74759 2.962354,6.502187 2.962354,8.437552 c 0,1.600734 0.575619,3.003332 1.728237,4.209224 1.099897,1.293294 2.698442,1.953874 4.796683,1.980234 0.39512,0 0.817861,-0.0267 1.265423,-0.0775 -0.07353,0.20755 -0.154327,0.43048 -0.240621,0.67688 -0.0985,0.23057 -0.147948,0.52213 -0.147948,0.8698 0,0.57798 0.128855,1.07502 0.388569,1.48762 0.221977,0.42453 0.475109,0.82365 0.759795,1.19768 -0.920096,0.0244 -2.074179,0.14101 -3.465144,0.34467 -1.405117,0.24362 -2.74619,0.73028 -4.021172,1.45781 C 2.888819,21.26184 2.103483,22.04929 1.67146,22.94303 1.222511,23.83815 1,24.65257 1,25.38066 1,26.87734 1.688069,28.1616 3.060444,29.23708 4.421998,30.38637 6.482307,30.97531 9.242318,31 c 3.296919,-0.0505 5.820381,-0.83703 7.567065,-2.36284 1.686196,-1.47532 2.530304,-3.16622 2.530304,-5.07578 -0.02608,-1.34436 -0.332749,-2.43326 -0.922377,-3.26734 -0.625976,-0.82049 -1.354352,-1.56623 -2.184547,-2.24687 l -1.336959,-1.0958 c -0.192565,-0.19229 -0.392744,-0.41698 -0.59613,-0.67308 -0.241401,-0.26887 -0.361472,-0.60732 -0.361472,-1.02047 0,-0.42231 0.118073,-0.79294 0.352259,-1.11314 0.199779,-0.30855 0.415557,-0.58393 0.651408,-0.827 0.410103,-0.35849 0.796786,-0.711889 1.160829,-1.056231 0.329081,-0.34684 0.640495,-0.724448 0.932673,-1.134274 0.599894,-0.846566 0.912101,-1.973756 0.934299,-3.383312 0,-0.768597 -0.08672,-1.441865 -0.259587,-2.018173 C 17.498927,5.148549 17.257171,4.650391 16.984971,4.226692 16.700007,3.779685 16.410431,3.400399 16.113536,3.09296 15.80471,2.79773 15.527026,2.574136 15.278412,2.420417 l 2.429503,0 L 20.140669,1 12.260365,1 Z m 12.417942,0.168542 0,4.135521 -4.133895,0 0,2.002999 4.133895,0 0,4.133894 2.00354,0 0,-4.133894 4.133895,0 0,-2.002999 -4.133895,0 0,-4.135521 -2.00354,0 z M 9.822733,2.304994 c 0.806887,0.02581 1.520753,0.264821 2.141734,0.712105 0.608218,0.474477 1.099244,1.092424 1.472443,1.849089 0.794402,1.577704 1.192261,3.145874 1.192261,4.698051 0,0.360713 -0.02983,0.802452 -0.08671,1.329371 -0.0949,0.526364 -0.308925,1.039903 -0.643279,1.540185 -0.690627,0.706445 -1.554617,1.080265 -2.592084,1.118555 -0.821594,0 -1.551253,-0.25054 -2.188883,-0.752206 C 8.478088,12.299585 7.957919,11.690036 7.553643,10.971107 6.719841,9.429474 6.303937,7.947693 6.303937,6.523431 6.277017,5.444621 6.562813,4.468801 7.159655,3.59643 7.86804,2.76124 8.754744,2.330799 9.822733,2.304994 Z m 1.66754,17.540326 c 0.08939,-4e-5 0.159034,0.003 0.209187,0.009 0.337683,0 0.633039,0.0118 0.884983,0.0385 1.468658,1.02609 2.547169,1.89084 3.238073,2.59534 0.650949,0.74279 0.977113,1.61238 0.977113,2.61322 0,1.23142 -0.476766,2.23692 -1.430714,3.01967 -0.977255,0.7944 -2.395196,1.20356 -4.252037,1.2302 C 9.046107,29.32465 7.415497,28.8642 6.222646,27.96768 4.968474,27.07062 4.343209,25.92939 4.343209,24.54481 c 0,-0.70422 0.142508,-1.30655 0.432465,-1.80628 0.249447,-0.47503 0.556709,-0.87233 0.920751,-1.19226 0.377084,-0.30688 0.746941,-0.54508 1.110429,-0.71156 0.364043,-0.15344 0.645616,-0.26945 0.846505,-0.34576 0.853226,-0.25666 1.68826,-0.44222 2.503749,-0.55765 0.620565,-0.0574 1.064984,-0.0861 1.333165,-0.0862 z" + id="path4713" + style="opacity:0.5;fill:#000000;fill-opacity:1" + inkscape:connector-curvature="0" /></svg>
\ No newline at end of file diff --git a/apps/files_sharing/img/social-twitter.svg b/apps/files_sharing/img/social-twitter.svg new file mode 100644 index 00000000000..00ce390de6b --- /dev/null +++ b/apps/files_sharing/img/social-twitter.svg @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="32" + id="svg2" + version="1.1" + width="32" + inkscape:version="0.91 r13725" + sodipodi:docname="social-twitter.svg"> + <metadata + id="metadata5269"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview5267" + showgrid="false" + inkscape:zoom="10.224" + inkscape:cx="-7.2593811" + inkscape:cy="16.128046" + inkscape:current-layer="svg2" /> + <defs + id="defs4" /> + <path + sodipodi:nodetypes="sscccccsscsccscsccsccss" + inkscape:connector-curvature="0" + style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero" + id="rect2995" + d="m 21.611501,4.61946 c 0.05279,-0.002 0.106021,0 0.159127,0 1.770342,0 3.36956,0.74756 4.491932,1.94362 C 27.665067,6.2866 28.983178,5.77311 30.172539,5.06729 29.712752,6.50573 28.736679,7.71137 27.465106,8.4726 28.710494,8.32462 29.897115,7.99445 31,7.50421 c -0.824575,1.23442 -1.869002,2.31882 -3.071153,3.18481 0.01156,0.26431 0.01819,0.53117 0.01819,0.79791 C 27.947037,19.62063 21.755733,29 10.433964,29 6.9584454,29 3.7246302,27.98066 1,26.23346 c 0.481711,0.0572 0.9721881,0.0864 1.4685161,0.0864 2.8841872,0 5.5361434,-0.98372 7.6426469,-2.63469 -2.6929626,-0.0493 -4.9652637,-1.83087 -5.7490348,-4.27598 0.375747,0.0725 0.7622921,0.11139 1.1593551,0.11139 0.561492,0 1.1043981,-0.0759 1.6208231,-0.21596 -2.8159792,-0.56635 -4.9374873,-3.05156 -4.9374873,-6.03318 0,-0.0262 -4.66e-4,-0.054 0,-0.0796 0.830058,0.46101 1.7807801,0.73835 2.7892712,0.77063 -1.6515871,-1.10349 -2.7392592,-2.98649 -2.7392592,-5.12162 0,-1.12907 0.304455,-2.18754 0.834281,-3.09616 3.0358242,3.72399 7.5714429,6.17402 12.6869759,6.43101 -0.105355,-0.45126 -0.159128,-0.92088 -0.159128,-1.4026 0,-3.34627 2.669159,-6.0694 5.994545,-6.15366 z" /> +</svg> diff --git a/apps/files_sharing/js/3rdparty/gs-share/gs-share.js b/apps/files_sharing/js/3rdparty/gs-share/gs-share.js new file mode 100644 index 00000000000..fd4442708a4 --- /dev/null +++ b/apps/files_sharing/js/3rdparty/gs-share/gs-share.js @@ -0,0 +1,206 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// @license magnet:?xt=urn:btih:3877d6d54b3accd4bc32f8a48bf32ebc0901502a&dn=mpl-2.0.txt MPL 2.0 +document.addEventListener('DOMContentLoaded', function () { + 'use strict'; + /** + * 'Share' widget for GNU social + * http://code.chromic.org/project/view/2/ + * + * We make a few assumptions about the target instance: + * 1) The API root is in the default location + * 2) Fancy URLs are enabled + * 3) CORS is allowed + * 4) The Bookmark plugin is enabled + * + * If 1), 3) or 4) are wrong, we fall back to a regular + * notice (instead of a bookmark notice) + * + * If 2) is wrong the user will be directed to a 404 :( + */ + + // TODO: input sanitation [1], [2] + // TODO: server-side fallback if JS is disabled + + var createForm, + bindClicks, + frm, + shareAsNotice, + shareAsBookmark, + extractURLParams, + shareURL, + shareTitle, + closest, + i18n = window.i18n; + + /** + * Internationalization + */ + if (i18n === undefined) { + i18n = { + invalidId: 'The account id provided is invalid', + yourAcctId: 'Your account ID:', + idPlaceholder: 'user@example.org', + shareAsBookmark: 'Share as a bookmark' + }; + } + + shareAsNotice = function (title, url, domain) { + window.open('http://' + domain + '/notice/new?status_textarea=' + title + ' ' + url); // [1] + }; + + shareAsBookmark = function (title, url, domain) { + window.open('http://' + domain + '/main/bookmark/new?url=' + url + '&title=' + title); // [2] + }; + + /** + * Extract parameters from query string + * + * ex: + * ?foo=bar&baz=test + * will return: + * {foo: 'bar', baz: 'test'} + */ + extractURLParams = function (queryStr) { + var parts = queryStr.substr(1).split('&'), + i, len, keyVal, params = {}; + + for (i = 0, len = parts.length; i < len; i += 1) { + keyVal = parts[i].split('='); + params[keyVal[0]] = keyVal[1]; + } + + return params; + }; + + // Create the form that we'll re-use throughout the page + createForm = function () { + var err = document.createElement('div'); + err.setAttribute('class', 'gs-share-err'); + err.setAttribute('tabindex', '-1'); + err.setAttribute('aria-hidden', 'true'); + err.textContent = i18n.invalidId; + + frm = document.createElement('form'); + + frm.setAttribute('class', 'gs-share-form'); + frm.setAttribute('tabindex', '-1'); + frm.setAttribute('aria-hidden', 'true'); + + frm.innerHTML = '<label for="gs-account">' + i18n.yourAcctId + '</label>' + + '<input type="text" id="gs-account" placeholder="' + i18n.idPlaceholder + '" />' + + '<input type="checkbox" id="gs-bookmark" /> <label for="gs-bookmark">' + i18n.shareAsBookmark + '</label>' + + '<input type="submit" value="Share"/>'; + frm.insertBefore(err, frm.firstChild); + + // Submit handler + frm.addEventListener('submit', function (e) { + e.preventDefault(); + + var accountParts = document.getElementById('gs-account').value.split('@'), + username, domain, xhr, bookmarkURL; + + if (accountParts.length === 2) { + err.setAttribute('aria-hidden', 'true'); + + username = accountParts[0]; + domain = accountParts[1]; + bookmarkURL = 'http://' + domain + '/api/bookmarks/' + username + '.json'; + + // Try bookmark + if (document.getElementById('gs-bookmark').checked) { + xhr = new XMLHttpRequest(); + + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + if (xhr.status === 200) { // Success + shareAsBookmark(shareTitle, shareURL, domain); + } else { // Failure, fallback to regular notice + shareAsNotice(shareTitle, shareURL, domain); + } + } + }; + + xhr.open('GET', bookmarkURL, true); + xhr.send(); + } else { // Regular notice + shareAsNotice(shareTitle, shareURL, domain); + } + } else { // Invalid account id + err.setAttribute('aria-hidden', 'false'); + err.focus(); + } + }); + + // Keydown handler + frm.addEventListener('keydown', function (e) { + if (e.keyCode === 27) { // Escape key closes the dialog + frm.parentElement.getElementsByClassName('js-gs-share')[0].focus(); + frm.setAttribute('aria-hidden', 'true'); + } + }); + + document.body.appendChild(frm); + }; + + /** + * Something similar to jQuery.closest + * + * Given `elm`, return the closest parent with class `cls` + * or false if there is no matching ancestor. + */ + closest = function (elm, cls) { + while (elm !== document) { + if (elm.classList.contains(cls)) { + return elm; + } + + elm = elm.parentNode; + } + + return false; + }; + + bindClicks = function () { + document.addEventListener('click', function (e) { + var target = e.target, + urlParams, + lnk = closest(target, 'js-gs-share'); + + // Don't do anything on right/middle click or if ctrl or shift was pressed while left-clicking + if (!e.button && !e.ctrlKey && !e.shiftKey && lnk) { + e.preventDefault(); + + // Check for submission information in href first + if (lnk.search !== undefined) { + urlParams = extractURLParams(lnk.search); + shareURL = urlParams.url; + shareTitle = urlParams.title; + } else { // If it's not there, try data-* attributes. If not, use current document url and title + shareURL = lnk.getAttribute('data-url') || window.location.href; + shareTitle = lnk.getAttribute('data-title') || document.title; + } + + // Move form after the clicked link + lnk.parentNode.appendChild(frm); + + // Show form + frm.setAttribute('aria-hidden', 'false'); + + // Focus on form + frm.focus(); + } else if (!frm.contains(target)) { + frm.setAttribute('aria-hidden', 'true'); + } + }); + }; + + // Flag that js is enabled + document.body.classList.add('js-gs-share-enabled'); + + createForm(); + bindClicks(); +}); +// @license-end diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 79bd0bb0c47..5923e426f05 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -89,8 +89,8 @@ OCA.Sharing.PublicApp = { // dynamically load image previews var token = $('#sharingToken').val(); var bottomMargin = 350; - var previewWidth = $(window).width() * window.devicePixelRatio; - var previewHeight = $(window).height() - bottomMargin * window.devicePixelRatio; + var previewWidth = Math.floor($(window).width() * window.devicePixelRatio); + var previewHeight = Math.floor(($(window).height() - bottomMargin) * window.devicePixelRatio); previewHeight = Math.max(200, previewHeight); var params = { x: previewWidth, @@ -110,7 +110,7 @@ OCA.Sharing.PublicApp = { (maxGifSize === -1 || fileSize <= (maxGifSize * 1024 * 1024))) { img.attr('src', $('#downloadURL').val()); img.appendTo('#imgframe'); - } else if (mimetype.substr(0, mimetype.indexOf('/')) === 'text') { + } else if (mimetype.substr(0, mimetype.indexOf('/')) === 'text' && window.btoa) { // Undocumented Url to public WebDAV endpoint var url = parent.location.protocol + '//' + location.host + OC.linkTo('', 'public.php/webdav'); $.ajax({ @@ -144,7 +144,7 @@ OCA.Sharing.PublicApp = { path: path, files: filename }; - return OC.generateUrl('/s/' + token + '/download', params); + return OC.generateUrl('/s/' + token + '/download') + '?' + OC.buildQueryString(params); }; this.fileList.getAjaxUrl = function (action, params) { @@ -159,6 +159,8 @@ OCA.Sharing.PublicApp = { this.fileList.generatePreviewUrl = function (urlSpec) { urlSpec.t = $('#dirToken').val(); + urlSpec.y = Math.floor(36 * window.devicePixelRatio); + urlSpec.x = Math.floor(36 * window.devicePixelRatio); return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec); }; @@ -277,6 +279,11 @@ OCA.Sharing.PublicApp = { }; $(document).ready(function () { + // FIXME: replace with OC.Plugins.register() + if (window.TESTING) { + return; + } + var App = OCA.Sharing.PublicApp; // defer app init, to give a chance to plugins to register file actions _.defer(function () { diff --git a/apps/files_sharing/js/settings-personal.js b/apps/files_sharing/js/settings-personal.js new file mode 100644 index 00000000000..1c7aea0b9d6 --- /dev/null +++ b/apps/files_sharing/js/settings-personal.js @@ -0,0 +1,15 @@ +$(document).ready(function() { + + $('#fileSharingSettings button.pop-up').click(function() { + var url = $(this).data('url'); + if (url) { + var width = 600; + var height = 400; + var left = (screen.width/2)-(width/2); + var top = (screen.height/2)-(height/2); + + window.open(url, 'name', 'width=' + width + ', height=' + height + ', top=' + top + ', left=' + left); + } + }); + +}); diff --git a/apps/files_sharing/l10n/az.js b/apps/files_sharing/l10n/az.js index 957ab4a7306..7c8b2f812fc 100644 --- a/apps/files_sharing/l10n/az.js +++ b/apps/files_sharing/l10n/az.js @@ -21,6 +21,7 @@ OC.L10N.register( "Remote share password" : "Uzaq yayımlanma şifrəsi", "Cancel" : "Dayandır", "Add remote share" : "Uzaq yayımlanmanı əlavə et", + "You can upload into this folder" : "Siz bu qovluğun içinə yükləyə bilərsiniz", "No ownCloud installation (7 or higher) found at {remote}" : "Yüklənmiş (7 yada yuxarı) ownCloud {uzaq} unvanında tapılmadı ", "Invalid ownCloud url" : "Yalnış ownCloud url-i", "Share" : "Yayımla", @@ -56,6 +57,7 @@ OC.L10N.register( "Download %s" : "Endir %s", "Direct link" : "Birbaşa link", "Federated Cloud Sharing" : "Federal Cloud Paylaşım", + "Open documentation" : "Sənədləri aç", "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" }, diff --git a/apps/files_sharing/l10n/az.json b/apps/files_sharing/l10n/az.json index 6d8bc7fb8dd..4de0b9df5c8 100644 --- a/apps/files_sharing/l10n/az.json +++ b/apps/files_sharing/l10n/az.json @@ -19,6 +19,7 @@ "Remote share password" : "Uzaq yayımlanma şifrəsi", "Cancel" : "Dayandır", "Add remote share" : "Uzaq yayımlanmanı əlavə et", + "You can upload into this folder" : "Siz bu qovluğun içinə yükləyə bilərsiniz", "No ownCloud installation (7 or higher) found at {remote}" : "Yüklənmiş (7 yada yuxarı) ownCloud {uzaq} unvanında tapılmadı ", "Invalid ownCloud url" : "Yalnış ownCloud url-i", "Share" : "Yayımla", @@ -54,6 +55,7 @@ "Download %s" : "Endir %s", "Direct link" : "Birbaşa link", "Federated Cloud Sharing" : "Federal Cloud Paylaşım", + "Open documentation" : "Sənədləri aç", "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index d1d89a15999..66a1314ff29 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s", "You shared %1$s via link" : "Sdílíte %1$s přes odkaz", "Shares" : "Sdílení", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", "This share is password-protected" : "Toto sdílení je chráněno heslem", "The password is wrong. Try again." : "Heslo není správné. Zkuste to znovu.", "Password" : "Heslo", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Propojené cloudové sdílení", "Open documentation" : "Otevřít dokumentaci", "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", - "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů" + "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů", + "Federated Cloud" : "Sdružený cloud", + "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", + "Share it:" : "Sdílet:", + "Add it to your website:" : "Přidat na svou webovou stránku:", + "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", + "HTML Code:" : "HTML kód:" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index 95fea4806cf..330d64061e4 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s", "You shared %1$s via link" : "Sdílíte %1$s přes odkaz", "Shares" : "Sdílení", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", "This share is password-protected" : "Toto sdílení je chráněno heslem", "The password is wrong. Try again." : "Heslo není správné. Zkuste to znovu.", "Password" : "Heslo", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Propojené cloudové sdílení", "Open documentation" : "Otevřít dokumentaci", "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", - "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů" + "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů", + "Federated Cloud" : "Sdružený cloud", + "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", + "Share it:" : "Sdílet:", + "Add it to your website:" : "Přidat na svou webovou stránku:", + "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", + "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index 89b8e980372..a31e6363f25 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -21,6 +21,7 @@ OC.L10N.register( "Remote share password" : "Adgangskode for ekstern deling", "Cancel" : "Annuller", "Add remote share" : "Tilføj ekstern deling", + "You can upload into this folder" : "Du kan overføre til denne mappe", "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-URL", "Share" : "Del", @@ -58,6 +59,10 @@ OC.L10N.register( "Federated Cloud Sharing" : "Sammensluttet Cloud deling", "Open documentation" : "Åben dokumentation", "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", + "Federated Cloud" : "Federated Cloud", + "Share it:" : "Del:", + "Add it to your website:" : "Tilføj den til din hjemmeside:", + "HTML Code:" : "HTMLkode:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index 158d782b729..b91fbf21eb0 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -19,6 +19,7 @@ "Remote share password" : "Adgangskode for ekstern deling", "Cancel" : "Annuller", "Add remote share" : "Tilføj ekstern deling", + "You can upload into this folder" : "Du kan overføre til denne mappe", "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-URL", "Share" : "Del", @@ -56,6 +57,10 @@ "Federated Cloud Sharing" : "Sammensluttet Cloud deling", "Open documentation" : "Åben dokumentation", "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", + "Federated Cloud" : "Federated Cloud", + "Share it:" : "Del:", + "Add it to your website:" : "Tilføj den til din hjemmeside:", + "HTML Code:" : "HTMLkode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index e5b7b7bcb32..d46e907e0c8 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -57,8 +57,11 @@ OC.L10N.register( "Download %s" : "Download %s", "Direct link" : "Direkter Link", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Offene Dokumentation", + "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index a323072083d..30d6badbb34 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -55,8 +55,11 @@ "Download %s" : "Download %s", "Direct link" : "Direkter Link", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Offene Dokumentation", + "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index b75864375e2..0074bdbecad 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -57,8 +57,12 @@ OC.L10N.register( "Download %s" : "Download %s", "Direct link" : "Direkte Verlinkung", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Offene Dokumentation", + "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 730ec010017..fef8ebf7b9d 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -55,8 +55,12 @@ "Download %s" : "Download %s", "Direct link" : "Direkte Verlinkung", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Offene Dokumentation", + "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index 9e3cbf9621a..4f20489a687 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", - "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 3a796c25ae4..8d5a947f4c2 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", - "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 75956e85025..0053f64b037 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -59,6 +59,7 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentation", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", - "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", + "Federated Cloud" : "Federated Cloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index 85d6ac5a2f8..70f137fc707 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -57,6 +57,7 @@ "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentation", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", - "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", + "Federated Cloud" : "Federated Cloud" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js index 1db25a1c780..ae96dbda69f 100644 --- a/apps/files_sharing/l10n/eo.js +++ b/apps/files_sharing/l10n/eo.js @@ -2,17 +2,27 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Interservila kunhavo ne kapabliĝis en ĉi tiu servilo", + "Invalid or untrusted SSL certificate" : "SSL-atestilo ne validas aŭ ne fidindas", "Shared with you" : "Kunhavata kun vi", "Shared with others" : "Kunhavata kun aliaj", "Shared by link" : "Kunhavata per ligilo", + "Nothing shared with you yet" : "Nenio kunhavatas kun vi ankoraŭ", + "Nothing shared yet" : "Nenio kunhavatas ankoraŭ", + "No shared links" : "Neniu kunhavata ligilo", "Cancel" : "Nuligi", + "You can upload into this folder" : "Vi povas alŝuti en ĉi tiun dosierujon", + "No ownCloud installation (7 or higher) found at {remote}" : "Ne troviĝis instalo de ownCloud (7 aŭ pli alta) ĉe {remote}", "Invalid ownCloud url" : "Nevalidas URL de ownCloud", "Share" : "Kunhavigi", "Shared by" : "Kunhavigita de", "A file or folder has been <strong>shared</strong>" : "Dosiero aŭ dosierujo <strong>kunhaviĝis</strong>", + "%1$s unshared %2$s from you" : "%1$s malkunhavigis %2$s el vi", + "Public shared folder %1$s was downloaded" : "La publika kunhavata dosierujo %1$s elŝutiĝis", + "Public shared file %1$s was downloaded" : "La publika kunhavata dosiero %1$s elŝutiĝis", "You shared %1$s with %2$s" : "Vi kunhavigis %1$s kun %2$s", "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s", "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi", + "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", "Password" : "Pasvorto", @@ -23,8 +33,10 @@ OC.L10N.register( "the link expired" : "la ligilo eksvalidiĝis", "sharing is disabled" : "kunhavigo malkapablas", "For more info, please ask the person who sent this link." : "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.", + "Add to your ownCloud" : "Aldoni al via ownCloud", "Download" : "Elŝuti", "Download %s" : "Elŝuti %s", - "Direct link" : "Direkta ligilo" + "Direct link" : "Direkta ligilo", + "Open documentation" : "Malfermi la dokumentaron" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json index d1ea7f2d0ea..9bbc26d7119 100644 --- a/apps/files_sharing/l10n/eo.json +++ b/apps/files_sharing/l10n/eo.json @@ -1,16 +1,26 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Interservila kunhavo ne kapabliĝis en ĉi tiu servilo", + "Invalid or untrusted SSL certificate" : "SSL-atestilo ne validas aŭ ne fidindas", "Shared with you" : "Kunhavata kun vi", "Shared with others" : "Kunhavata kun aliaj", "Shared by link" : "Kunhavata per ligilo", + "Nothing shared with you yet" : "Nenio kunhavatas kun vi ankoraŭ", + "Nothing shared yet" : "Nenio kunhavatas ankoraŭ", + "No shared links" : "Neniu kunhavata ligilo", "Cancel" : "Nuligi", + "You can upload into this folder" : "Vi povas alŝuti en ĉi tiun dosierujon", + "No ownCloud installation (7 or higher) found at {remote}" : "Ne troviĝis instalo de ownCloud (7 aŭ pli alta) ĉe {remote}", "Invalid ownCloud url" : "Nevalidas URL de ownCloud", "Share" : "Kunhavigi", "Shared by" : "Kunhavigita de", "A file or folder has been <strong>shared</strong>" : "Dosiero aŭ dosierujo <strong>kunhaviĝis</strong>", + "%1$s unshared %2$s from you" : "%1$s malkunhavigis %2$s el vi", + "Public shared folder %1$s was downloaded" : "La publika kunhavata dosierujo %1$s elŝutiĝis", + "Public shared file %1$s was downloaded" : "La publika kunhavata dosiero %1$s elŝutiĝis", "You shared %1$s with %2$s" : "Vi kunhavigis %1$s kun %2$s", "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s", "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi", + "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", "Password" : "Pasvorto", @@ -21,8 +31,10 @@ "the link expired" : "la ligilo eksvalidiĝis", "sharing is disabled" : "kunhavigo malkapablas", "For more info, please ask the person who sent this link." : "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.", + "Add to your ownCloud" : "Aldoni al via ownCloud", "Download" : "Elŝuti", "Download %s" : "Elŝuti %s", - "Direct link" : "Direkta ligilo" + "Direct link" : "Direkta ligilo", + "Open documentation" : "Malfermi la dokumentaron" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index e77217a8427..e6f7c5e6caf 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted", "You shared %1$s via link" : "Ha compartido %1$s vía enlace", "Shares" : "Compartidos", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", "This share is password-protected" : "Este elemento compartido está protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" : "Contraseña", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Compartido en Cloud Federado", "Open documentation" : "Documentación abierta", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Federated Cloud" : "Nube Federada", + "Your Federated Cloud ID:" : "Su ID Nube Federada:", + "Share it:" : "Compartir:", + "Add it to your website:" : "Agregarlo a su sitio de internet:", + "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index c3c414dcaba..ece130edb0e 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted", "You shared %1$s via link" : "Ha compartido %1$s vía enlace", "Shares" : "Compartidos", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", "This share is password-protected" : "Este elemento compartido está protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" : "Contraseña", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Compartido en Cloud Federado", "Open documentation" : "Documentación abierta", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Federated Cloud" : "Nube Federada", + "Your Federated Cloud ID:" : "Su ID Nube Federada:", + "Share it:" : "Compartir:", + "Add it to your website:" : "Agregarlo a su sitio de internet:", + "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index bbe0b020b42..aa6dde2d7bb 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -8,11 +8,15 @@ OC.L10N.register( "Shared with you" : "Sinuga jagatud", "Shared with others" : "Teistega jagatud", "Shared by link" : "Jagatud lingiga", + "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud", + "Nothing shared yet" : "Midagi pole veel jagatud", + "No shared links" : "Jagatud linke pole", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?", "Remote share" : "Kaugjagamine", "Remote share password" : "Kaugjagamise parool", "Cancel" : "Loobu", "Add remote share" : "Lisa kaugjagamine", + "You can upload into this folder" : "Sa saad sellesse kausta faile üles laadida", "Invalid ownCloud url" : "Vigane ownCloud url", "Share" : "Jaga", "Shared by" : "Jagas", @@ -38,7 +42,12 @@ OC.L10N.register( "Download" : "Lae alla", "Download %s" : "Laadi alla %s", "Direct link" : "Otsene link", + "Open documentation" : "Ava dokumentatsioon", "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", - "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest" + "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", + "Share it:" : "Jaga seda:", + "Add it to your website:" : "Lisa see oma veebisaidile:", + "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", + "HTML Code:" : "HTML kood:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index 3e36c3540fa..0f0c3c492dd 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -6,11 +6,15 @@ "Shared with you" : "Sinuga jagatud", "Shared with others" : "Teistega jagatud", "Shared by link" : "Jagatud lingiga", + "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud", + "Nothing shared yet" : "Midagi pole veel jagatud", + "No shared links" : "Jagatud linke pole", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?", "Remote share" : "Kaugjagamine", "Remote share password" : "Kaugjagamise parool", "Cancel" : "Loobu", "Add remote share" : "Lisa kaugjagamine", + "You can upload into this folder" : "Sa saad sellesse kausta faile üles laadida", "Invalid ownCloud url" : "Vigane ownCloud url", "Share" : "Jaga", "Shared by" : "Jagas", @@ -36,7 +40,12 @@ "Download" : "Lae alla", "Download %s" : "Laadi alla %s", "Direct link" : "Otsene link", + "Open documentation" : "Ava dokumentatsioon", "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", - "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest" + "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", + "Share it:" : "Jaga seda:", + "Add it to your website:" : "Lisa see oma veebisaidile:", + "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", + "HTML Code:" : "HTML kood:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 7d9cc87dcba..223660dec0c 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", "Shares" : "Jaot", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federoitu pilvijakaminen", "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", - "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", + "Share it:" : "Jaa se:", + "Add it to your website:" : "Lisää verkkosivustollesi:", + "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", + "HTML Code:" : "HTML-koodi:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index 3c7f40bd76c..b70098d049e 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", "Shares" : "Jaot", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Federoitu pilvijakaminen", "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", - "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", + "Share it:" : "Jaa se:", + "Add it to your website:" : "Lisää verkkosivustollesi:", + "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", + "HTML Code:" : "HTML-koodi:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 6fd7bf4a9d9..61ee5c1a61b 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -2,7 +2,7 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur", - "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.", + "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères non valides.", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", "Storage not valid" : "Support de stockage non valide", @@ -13,9 +13,9 @@ OC.L10N.register( "Nothing shared with you yet" : "Aucun fichier n'est partagé avec vous pour l'instant", "Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici", "Nothing shared yet" : "Rien n'est partagé pour l'instant", - "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagerez apparaîtront ici", + "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagez apparaîtront ici", "No shared links" : "Aucun partage par lien", - "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici", + "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagez par lien apparaîtront ici", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?", "Remote share" : "Partage distant", "Remote share password" : "Mot de passe du partage distant", @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", "Shares" : "Partages", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.", "Password" : "Mot de passe", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Voir la documentation", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", - "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs" + "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Votre ID Federated Cloud :", + "Share it:" : "Partager :", + "Add it to your website:" : "Ajouter à votre site web :", + "Share with me via ownCloud" : "Partagez avec moi via ownCloud", + "HTML Code:" : "Code HTML:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 07629def1d3..a57b1befbcc 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -1,6 +1,6 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur", - "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.", + "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères non valides.", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", "Storage not valid" : "Support de stockage non valide", @@ -11,9 +11,9 @@ "Nothing shared with you yet" : "Aucun fichier n'est partagé avec vous pour l'instant", "Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici", "Nothing shared yet" : "Rien n'est partagé pour l'instant", - "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagerez apparaîtront ici", + "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagez apparaîtront ici", "No shared links" : "Aucun partage par lien", - "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici", + "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagez par lien apparaîtront ici", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?", "Remote share" : "Partage distant", "Remote share password" : "Mot de passe du partage distant", @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", "Shares" : "Partages", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.", "Password" : "Mot de passe", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Voir la documentation", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", - "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs" + "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Votre ID Federated Cloud :", + "Share it:" : "Partager :", + "Add it to your website:" : "Ajouter à votre site web :", + "Share with me via ownCloud" : "Partagez avec moi via ownCloud", + "HTML Code:" : "Code HTML:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 11cc0348f34..1a5e1d10e77 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede", "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón", "Shares" : "Comparticións", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartido comigo a través do meu ID da nube federada do #ownCloud , vexa %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartido comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.", "Password" : "Contrasinal", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Compartición de nube federada", "Open documentation" : "Abrir a documentación", "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID:" : "ID da súa nube federada:", + "Share it:" : "Compártao:", + "Add it to your website:" : "Engádao o seu sitio web:", + "Share with me via ownCloud" : "Compartido comigo a través do ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index 01972ddee16..25532580e78 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede", "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón", "Shares" : "Comparticións", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartido comigo a través do meu ID da nube federada do #ownCloud , vexa %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartido comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.", "Password" : "Contrasinal", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Compartición de nube federada", "Open documentation" : "Abrir a documentación", "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID:" : "ID da súa nube federada:", + "Share it:" : "Compártao:", + "Add it to your website:" : "Engádao o seu sitio web:", + "Share with me via ownCloud" : "Compartido comigo a través do ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 33cb2e81bcf..1b17e1b28c9 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", "Shares" : "Condivisioni", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivione è protetta da password", "The password is wrong. Try again." : "La password è errata. Prova ancora.", "Password" : "Password", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Condivisione cloud federata", "Open documentation" : "Apri la documentazione", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", - "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server" + "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", + "Federated Cloud" : "Cloud federata", + "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", + "Share it:" : "Condividilo:", + "Add it to your website:" : "Aggiungilo al tuo sito web:", + "Share with me via ownCloud" : "Condividi con me tramite ownCloud", + "HTML Code:" : "Codice HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index a738a79154e..bcac10073d0 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", "Shares" : "Condivisioni", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivione è protetta da password", "The password is wrong. Try again." : "La password è errata. Prova ancora.", "Password" : "Password", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Condivisione cloud federata", "Open documentation" : "Apri la documentazione", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", - "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server" + "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", + "Federated Cloud" : "Cloud federata", + "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", + "Share it:" : "Condividilo:", + "Add it to your website:" : "Aggiungilo al tuo sito web:", + "Share with me via ownCloud" : "Condividi con me tramite ownCloud", + "HTML Code:" : "Codice HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js index 6a63a856069..b7e2dfc9b07 100644 --- a/apps/files_sharing/l10n/nb_NO.js +++ b/apps/files_sharing/l10n/nb_NO.js @@ -21,6 +21,7 @@ OC.L10N.register( "Remote share password" : "Passord for ekstern deling", "Cancel" : "Avbryt", "Add remote share" : "Legg til ekstern deling", + "You can upload into this folder" : "Du kan laste opp til denne mappen", "No ownCloud installation (7 or higher) found at {remote}" : "Ingen ownCloud-installasjon (7 eller høyere) funnet på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-url", "Share" : "Del", @@ -39,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s delte %1$s med deg", "You shared %1$s via link" : "Du delte %1$s via lenke", "Shares" : "Delinger", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", "This share is password-protected" : "Denne delingen er passordbeskyttet", "The password is wrong. Try again." : "Passordet er feil. Prøv på nytt.", "Password" : "Passord", @@ -56,7 +59,14 @@ OC.L10N.register( "Download %s" : "Last ned %s", "Direct link" : "Direkte lenke", "Federated Cloud Sharing" : "Sammenknyttet sky-deling", + "Open documentation" : "Åpne dokumentasjonen", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere" + "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere", + "Federated Cloud" : "Sammenknyttet sky", + "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", + "Share it:" : "Del den:", + "Add it to your website:" : "Legg den på websiden din:", + "Share with me via ownCloud" : "Del med meg via ownCloud", + "HTML Code:" : "HTML-kode:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json index 0710062ba49..2e490bbcde7 100644 --- a/apps/files_sharing/l10n/nb_NO.json +++ b/apps/files_sharing/l10n/nb_NO.json @@ -19,6 +19,7 @@ "Remote share password" : "Passord for ekstern deling", "Cancel" : "Avbryt", "Add remote share" : "Legg til ekstern deling", + "You can upload into this folder" : "Du kan laste opp til denne mappen", "No ownCloud installation (7 or higher) found at {remote}" : "Ingen ownCloud-installasjon (7 eller høyere) funnet på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-url", "Share" : "Del", @@ -37,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s delte %1$s med deg", "You shared %1$s via link" : "Du delte %1$s via lenke", "Shares" : "Delinger", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", "This share is password-protected" : "Denne delingen er passordbeskyttet", "The password is wrong. Try again." : "Passordet er feil. Prøv på nytt.", "Password" : "Passord", @@ -54,7 +57,14 @@ "Download %s" : "Last ned %s", "Direct link" : "Direkte lenke", "Federated Cloud Sharing" : "Sammenknyttet sky-deling", + "Open documentation" : "Åpne dokumentasjonen", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere" + "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere", + "Federated Cloud" : "Sammenknyttet sky", + "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", + "Share it:" : "Del den:", + "Add it to your website:" : "Legg den på websiden din:", + "Share with me via ownCloud" : "Del med meg via ownCloud", + "HTML Code:" : "HTML-kode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 5bebbcfdae0..91329d6236f 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", "Shares" : "Gedeeld", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.", "Password" : "Wachtwoord", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentatie", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", - "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", + "Share it:" : "Deel het:", + "Add it to your website:" : "Voeg het toe aan uw website:", + "Share with me via ownCloud" : "Deel met mij via ownCloud", + "HTML Code:" : "HTML Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index e5d1d7c3a7f..298d0b24380 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", "Shares" : "Gedeeld", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.", "Password" : "Wachtwoord", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentatie", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", - "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", + "Share it:" : "Deel het:", + "Add it to your website:" : "Voeg het toe aan uw website:", + "Share with me via ownCloud" : "Deel met mij via ownCloud", + "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js index 083b8b4d0af..b171633a337 100644 --- a/apps/files_sharing/l10n/oc.js +++ b/apps/files_sharing/l10n/oc.js @@ -4,7 +4,9 @@ OC.L10N.register( "Cancel" : "Annula", "Share" : "Parteja", "Password" : "Senhal", + "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", "Name" : "Nom", - "Download" : "Avalcarga" + "Download" : "Avalcarga", + "Open documentation" : "Veire la documentacion" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json index 9146b14e902..0dd565d1a29 100644 --- a/apps/files_sharing/l10n/oc.json +++ b/apps/files_sharing/l10n/oc.json @@ -2,7 +2,9 @@ "Cancel" : "Annula", "Share" : "Parteja", "Password" : "Senhal", + "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", "Name" : "Nom", - "Download" : "Avalcarga" + "Download" : "Avalcarga", + "Open documentation" : "Veire la documentacion" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 308cdc4a161..af80d4b380c 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", "Shares" : "Compartilhamentos", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID", "This share is password-protected" : "Este compartilhamento esta protegido por senha", "The password is wrong. Try again." : "Senha incorreta. Tente novamente.", "Password" : "Senha", @@ -56,9 +58,15 @@ OC.L10N.register( "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada", + "Federated Cloud Sharing" : "Compartilhamento de Nuvem Conglomerada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", + "Federated Cloud" : "Nuvem Conglomerada", + "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", + "Share it:" : "Compartilhe:", + "Add it to your website:" : "Adicione ao seu site:", + "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 9941074430a..cd6e4492f51 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", "Shares" : "Compartilhamentos", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID", "This share is password-protected" : "Este compartilhamento esta protegido por senha", "The password is wrong. Try again." : "Senha incorreta. Tente novamente.", "Password" : "Senha", @@ -54,9 +56,15 @@ "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada", + "Federated Cloud Sharing" : "Compartilhamento de Nuvem Conglomerada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", + "Federated Cloud" : "Nuvem Conglomerada", + "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", + "Share it:" : "Compartilhe:", + "Add it to your website:" : "Adicione ao seu site:", + "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index 6015d359684..f58cc27c19e 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -58,6 +58,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Partilha de Cloud Federada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", + "Share with me via ownCloud" : "Partilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index e3f95d18117..cac69a145bb 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -56,6 +56,8 @@ "Federated Cloud Sharing" : "Partilha de Cloud Federada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", + "Share with me via ownCloud" : "Partilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index b0c6aa04563..50ea0c28631 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s", "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки", "Shares" : "События обмена файлами", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", @@ -59,6 +61,12 @@ OC.L10N.register( "Federated Cloud Sharing" : "Объединение облачных хранилищ", "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", - "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов" + "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", + "Federated Cloud" : "Объединение облачных хранилищ", + "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", + "Share it:" : "Поделись этим:", + "Add it to your website:" : "Добавь это на свой сайт:", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index 0896cab7dd2..9fd69583970 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s", "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки", "Shares" : "События обмена файлами", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", @@ -57,6 +59,12 @@ "Federated Cloud Sharing" : "Объединение облачных хранилищ", "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", - "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов" + "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", + "Federated Cloud" : "Объединение облачных хранилищ", + "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", + "Share it:" : "Поделись этим:", + "Add it to your website:" : "Добавь это на свой сайт:", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js index 6e72a0b009b..c7e199cf4b5 100644 --- a/apps/files_sharing/l10n/sk_SK.js +++ b/apps/files_sharing/l10n/sk_SK.js @@ -57,6 +57,8 @@ OC.L10N.register( "Direct link" : "Priama linka", "Federated Cloud Sharing" : "Združené cloudové zdieľanie", "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", - "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov" + "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", + "Your Federated Cloud ID:" : "Vaše združené Cloud ID", + "HTML Code:" : "HTML kód:" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json index 3fcef6b6cc7..d8bbbf6a57d 100644 --- a/apps/files_sharing/l10n/sk_SK.json +++ b/apps/files_sharing/l10n/sk_SK.json @@ -55,6 +55,8 @@ "Direct link" : "Priama linka", "Federated Cloud Sharing" : "Združené cloudové zdieľanie", "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", - "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov" + "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", + "Your Federated Cloud ID:" : "Vaše združené Cloud ID", + "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index 2666c8e3eaa..be6c0bd93fe 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -56,8 +56,9 @@ OC.L10N.register( "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", "Federated Cloud Sharing" : "Upravljana souporaba oblaka", - "Open documentation" : "Odprta dokumentacija", + "Open documentation" : "Odpri dokumentacijo", "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", - "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", + "HTML Code:" : "Koda HTML:" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index a301a495cf1..e4ec892d764 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -54,8 +54,9 @@ "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", "Federated Cloud Sharing" : "Upravljana souporaba oblaka", - "Open documentation" : "Odprta dokumentacija", + "Open documentation" : "Odpri dokumentacijo", "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", - "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", + "HTML Code:" : "Koda HTML:" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index 97b4b3aee24..fe36c06b75e 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -59,6 +59,7 @@ OC.L10N.register( "Federated Cloud Sharing" : "Здружено дељење у облаку", "Open documentation" : "Отвори документацију", "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", - "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера" + "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", + "Federated Cloud" : "Здружени облак" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index f28772afe57..1d7e9b155b7 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -57,6 +57,7 @@ "Federated Cloud Sharing" : "Здружено дељење у облаку", "Open documentation" : "Отвори документацију", "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", - "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера" + "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", + "Federated Cloud" : "Здружени облак" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js index d879c3d25af..2ab0d72bb56 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -1,11 +1,72 @@ OC.L10N.register( "files_sharing", { + "Server to server sharing is not enabled on this server" : "เซิร์ฟเวอร์ไปยังแชร์เซิร์ฟเวอร์ไม่ได้เปิดใช้งานบนเซิร์ฟเวอร์นี้", + "The mountpoint name contains invalid characters." : "ชื่อจุดเชื่อมต่อมีตัวอักษรที่ไม่ถูกต้อง", + "Invalid or untrusted SSL certificate" : "ใบรับรอง SSL ไม่ถูกต้องหรือไม่น่าเชื่อถือ", + "Could not authenticate to remote share, password might be wrong" : "ไม่สามารถรับรองความถูกต้องจากการแชร์ระยะไกลรหัสผ่านอาจจะผิด", + "Storage not valid" : "การจัดเก็บข้อมูลไม่ถูกต้อง", + "Couldn't add remote share" : "ไม่สามารถเพิ่มแชร์ระยะไกล", + "Shared with you" : "แชร์กับคุณ", + "Shared with others" : "แชร์กับผู้อื่น", + "Shared by link" : "แชร์โดยลิงค์", + "Nothing shared with you yet" : "ไม่มีอะไรที่แชร์กับคุณเลย", + "Files and folders others share with you will show up here" : "ไฟล์และโฟลเดอร์อื่นๆ ที่แชร์กับคุณจะปรากฏขึ้นที่นี่", + "Nothing shared yet" : "ไม่มีการแชร์ใดๆ", + "Files and folders you share will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์จะปรากฏขึ้นที่นี่", + "No shared links" : "ไม่มีลิงค์ที่แชร์", + "Files and folders you share by link will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์โดยลิงค์จะปรากฏขึ้นที่นี่", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "คุณต้องการที่จะเพิ่มการแชร์ระยะไกล {name} จาก {owner}@{remote}?", + "Remote share" : "แชร์ระยะไกล", + "Remote share password" : "รหัสผ่านการแชร์ระยะไกล", "Cancel" : "ยกเลิก", + "Add remote share" : "เพิ่มการแชร์ระยะไกล", + "You can upload into this folder" : "คุณสามารถอัพโหลดลงในโฟลเดอร์นี้", + "No ownCloud installation (7 or higher) found at {remote}" : "ไม่มีการติดตั้ง ownCloud (7 หรือสูงกว่า) พบได้ที่ {remote}", + "Invalid ownCloud url" : "URL ownCloud ไม่ถูกต้อง", "Share" : "แชร์", "Shared by" : "ถูกแชร์โดย", + "A file or folder has been <strong>shared</strong>" : "ไฟล์หรือโฟลเดอร์ได้ถูก <strong>แชร์</strong>", + "A file or folder was shared from <strong>another server</strong>" : "ไฟล์หรือโฟลเดอร์จะถูกแชร์จาก <strong>เซิร์ฟเวอร์อื่นๆ</ strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "แชร์ไฟล์หรือโฟลเดอร์สาธารณะถูก <strong>ดาวน์โหลด</strong>", + "You received a new remote share from %s" : "คุณได้รับการแชร์ระยะไกลใหม่จาก %s", + "%1$s accepted remote share %2$s" : "%1$s ยอมรับการแชร์ %2$s จากระยะไกล", + "%1$s declined remote share %2$s" : "%1$s ปฏิเสธการแชร์ %2$s จากระยะไกล", + "%1$s unshared %2$s from you" : "%1$s ไม่ได้แชร์ %2$s จากคุณ", + "Public shared folder %1$s was downloaded" : "โฟลเดอร์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", + "Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", + "You shared %1$s with %2$s" : "คุณแชร์ %1$s กับ %2$s", + "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s", + "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", + "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", + "Shares" : "แชร์", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s", + "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", + "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", + "The password is wrong. Try again." : "รหัสผ่านที่ไม่ถูกต้อง กรุณาลองอีกครั้ง", "Password" : "รหัสผ่าน", + "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", "Name" : "ชื่อ", - "Download" : "ดาวน์โหลด" + "Share time" : "แชร์เวลา", + "Sorry, this link doesn’t seem to work anymore." : "ขออภัยลิงค์นี้ดูเหมือนจะไม่ทำงานอีกต่อไป", + "Reasons might be:" : "เหตุผลอาจจะ:", + "the item was removed" : "รายการที่ถูกลบออก", + "the link expired" : "ลิงค์หมดอายุ", + "sharing is disabled" : "การแชร์ถูกปิดใช้งาน", + "For more info, please ask the person who sent this link." : "สำหรับข้อมูลเพิ่มเติมกรุณาสอบถามผู้ที่ส่งลิงค์นี้", + "Add to your ownCloud" : "เพิ่มลงใน ownCloud ของคุณ", + "Download" : "ดาวน์โหลด", + "Download %s" : "ดาวน์โหลด %s", + "Direct link" : "ลิงค์โดยตรง", + "Federated Cloud Sharing" : "สหพันธ์การแชร์คลาวด์", + "Open documentation" : "เปิดเอกสาร", + "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", + "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", + "Federated Cloud" : "สหพันธ์คลาวด์", + "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", + "Share it:" : "แชร์มัน:", + "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:", + "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", + "HTML Code:" : "โค้ด HTML:" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index 1e793855e2b..a4525d255f4 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -1,9 +1,70 @@ { "translations": { + "Server to server sharing is not enabled on this server" : "เซิร์ฟเวอร์ไปยังแชร์เซิร์ฟเวอร์ไม่ได้เปิดใช้งานบนเซิร์ฟเวอร์นี้", + "The mountpoint name contains invalid characters." : "ชื่อจุดเชื่อมต่อมีตัวอักษรที่ไม่ถูกต้อง", + "Invalid or untrusted SSL certificate" : "ใบรับรอง SSL ไม่ถูกต้องหรือไม่น่าเชื่อถือ", + "Could not authenticate to remote share, password might be wrong" : "ไม่สามารถรับรองความถูกต้องจากการแชร์ระยะไกลรหัสผ่านอาจจะผิด", + "Storage not valid" : "การจัดเก็บข้อมูลไม่ถูกต้อง", + "Couldn't add remote share" : "ไม่สามารถเพิ่มแชร์ระยะไกล", + "Shared with you" : "แชร์กับคุณ", + "Shared with others" : "แชร์กับผู้อื่น", + "Shared by link" : "แชร์โดยลิงค์", + "Nothing shared with you yet" : "ไม่มีอะไรที่แชร์กับคุณเลย", + "Files and folders others share with you will show up here" : "ไฟล์และโฟลเดอร์อื่นๆ ที่แชร์กับคุณจะปรากฏขึ้นที่นี่", + "Nothing shared yet" : "ไม่มีการแชร์ใดๆ", + "Files and folders you share will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์จะปรากฏขึ้นที่นี่", + "No shared links" : "ไม่มีลิงค์ที่แชร์", + "Files and folders you share by link will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์โดยลิงค์จะปรากฏขึ้นที่นี่", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "คุณต้องการที่จะเพิ่มการแชร์ระยะไกล {name} จาก {owner}@{remote}?", + "Remote share" : "แชร์ระยะไกล", + "Remote share password" : "รหัสผ่านการแชร์ระยะไกล", "Cancel" : "ยกเลิก", + "Add remote share" : "เพิ่มการแชร์ระยะไกล", + "You can upload into this folder" : "คุณสามารถอัพโหลดลงในโฟลเดอร์นี้", + "No ownCloud installation (7 or higher) found at {remote}" : "ไม่มีการติดตั้ง ownCloud (7 หรือสูงกว่า) พบได้ที่ {remote}", + "Invalid ownCloud url" : "URL ownCloud ไม่ถูกต้อง", "Share" : "แชร์", "Shared by" : "ถูกแชร์โดย", + "A file or folder has been <strong>shared</strong>" : "ไฟล์หรือโฟลเดอร์ได้ถูก <strong>แชร์</strong>", + "A file or folder was shared from <strong>another server</strong>" : "ไฟล์หรือโฟลเดอร์จะถูกแชร์จาก <strong>เซิร์ฟเวอร์อื่นๆ</ strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "แชร์ไฟล์หรือโฟลเดอร์สาธารณะถูก <strong>ดาวน์โหลด</strong>", + "You received a new remote share from %s" : "คุณได้รับการแชร์ระยะไกลใหม่จาก %s", + "%1$s accepted remote share %2$s" : "%1$s ยอมรับการแชร์ %2$s จากระยะไกล", + "%1$s declined remote share %2$s" : "%1$s ปฏิเสธการแชร์ %2$s จากระยะไกล", + "%1$s unshared %2$s from you" : "%1$s ไม่ได้แชร์ %2$s จากคุณ", + "Public shared folder %1$s was downloaded" : "โฟลเดอร์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", + "Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", + "You shared %1$s with %2$s" : "คุณแชร์ %1$s กับ %2$s", + "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s", + "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", + "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", + "Shares" : "แชร์", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s", + "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", + "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", + "The password is wrong. Try again." : "รหัสผ่านที่ไม่ถูกต้อง กรุณาลองอีกครั้ง", "Password" : "รหัสผ่าน", + "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", "Name" : "ชื่อ", - "Download" : "ดาวน์โหลด" + "Share time" : "แชร์เวลา", + "Sorry, this link doesn’t seem to work anymore." : "ขออภัยลิงค์นี้ดูเหมือนจะไม่ทำงานอีกต่อไป", + "Reasons might be:" : "เหตุผลอาจจะ:", + "the item was removed" : "รายการที่ถูกลบออก", + "the link expired" : "ลิงค์หมดอายุ", + "sharing is disabled" : "การแชร์ถูกปิดใช้งาน", + "For more info, please ask the person who sent this link." : "สำหรับข้อมูลเพิ่มเติมกรุณาสอบถามผู้ที่ส่งลิงค์นี้", + "Add to your ownCloud" : "เพิ่มลงใน ownCloud ของคุณ", + "Download" : "ดาวน์โหลด", + "Download %s" : "ดาวน์โหลด %s", + "Direct link" : "ลิงค์โดยตรง", + "Federated Cloud Sharing" : "สหพันธ์การแชร์คลาวด์", + "Open documentation" : "เปิดเอกสาร", + "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", + "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", + "Federated Cloud" : "สหพันธ์คลาวด์", + "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", + "Share it:" : "แชร์มัน:", + "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:", + "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", + "HTML Code:" : "โค้ด HTML:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index 6bcfce0cca2..b822570238b 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -21,7 +21,7 @@ OC.L10N.register( "Remote share password" : "Uzak paylaşım parolası", "Cancel" : "İptal", "Add remote share" : "Uzak paylaşım ekle", - "You can upload into this folder" : "Bu dizine yükleme yapabilirsin", + "You can upload into this folder" : "Bu dizine yükleme yapabilirsiniz", "No ownCloud installation (7 or higher) found at {remote}" : "{remote} üzerinde ownCloud (7 veya daha üstü) kurulumu bulunamadı", "Invalid ownCloud url" : "Geçersiz ownCloud adresi", "Share" : "Paylaş", @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı", "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız", "Shares" : "Paylaşımlar", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -57,8 +59,14 @@ OC.L10N.register( "Download %s" : "İndir: %s", "Direct link" : "Doğrudan bağlantı", "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", - "Open documentation" : "Dokümantasyonu aç", + "Open documentation" : "Belgelendirmeyi aç", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", - "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver" + "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", + "Federated Cloud" : "Birleşmiş Bulut", + "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", + "Share it:" : "Paylaşın:", + "Add it to your website:" : "Web sitenize ekleyin:", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", + "HTML Code:" : "HTML Kodu:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index de2770b963a..4e6ed7f967d 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -19,7 +19,7 @@ "Remote share password" : "Uzak paylaşım parolası", "Cancel" : "İptal", "Add remote share" : "Uzak paylaşım ekle", - "You can upload into this folder" : "Bu dizine yükleme yapabilirsin", + "You can upload into this folder" : "Bu dizine yükleme yapabilirsiniz", "No ownCloud installation (7 or higher) found at {remote}" : "{remote} üzerinde ownCloud (7 veya daha üstü) kurulumu bulunamadı", "Invalid ownCloud url" : "Geçersiz ownCloud adresi", "Share" : "Paylaş", @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı", "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız", "Shares" : "Paylaşımlar", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -55,8 +57,14 @@ "Download %s" : "İndir: %s", "Direct link" : "Doğrudan bağlantı", "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", - "Open documentation" : "Dokümantasyonu aç", + "Open documentation" : "Belgelendirmeyi aç", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", - "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver" + "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", + "Federated Cloud" : "Birleşmiş Bulut", + "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", + "Share it:" : "Paylaşın:", + "Add it to your website:" : "Web sitenize ekleyin:", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", + "HTML Code:" : "HTML Kodu:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/vi.js b/apps/files_sharing/l10n/vi.js index ccefbfacda3..a96969df222 100644 --- a/apps/files_sharing/l10n/vi.js +++ b/apps/files_sharing/l10n/vi.js @@ -1,6 +1,9 @@ OC.L10N.register( "files_sharing", { + "Server to server sharing is not enabled on this server" : "Máy chủ để chia sẻ máy chủ không được kích hoạt trên máy chủ này", + "The mountpoint name contains invalid characters." : "Tên mountpoint chứa các ký tự không hợp lệ.", + "Invalid or untrusted SSL certificate" : "Chứng chỉ SSL không hợp lệ hoặc không đáng tin cậy", "Shared with you" : "Chia sẻ với bạn", "Shared with others" : "Chia sẻ với người khác", "Shared by link" : "Chia sẻ theo liên kết", diff --git a/apps/files_sharing/l10n/vi.json b/apps/files_sharing/l10n/vi.json index 6140ca95cd9..a53d3c9e386 100644 --- a/apps/files_sharing/l10n/vi.json +++ b/apps/files_sharing/l10n/vi.json @@ -1,4 +1,7 @@ { "translations": { + "Server to server sharing is not enabled on this server" : "Máy chủ để chia sẻ máy chủ không được kích hoạt trên máy chủ này", + "The mountpoint name contains invalid characters." : "Tên mountpoint chứa các ký tự không hợp lệ.", + "Invalid or untrusted SSL certificate" : "Chứng chỉ SSL không hợp lệ hoặc không đáng tin cậy", "Shared with you" : "Chia sẻ với bạn", "Shared with others" : "Chia sẻ với người khác", "Shared by link" : "Chia sẻ theo liên kết", diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 49f5a4e8e7c..bb62e8078ad 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -120,7 +120,7 @@ class Shared_Cache extends Cache { if (!is_int($sourceId) || $sourceId === 0) { $sourceId = $this->storage->getSourceId(); } - $query = \OC_DB::prepare( + $query = \OCP\DB::prepare( 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,' . ' `size`, `mtime`, `encrypted`, `storage_mtime`, `etag`, `permissions`' . ' FROM `*PREFIX*filecache` WHERE `fileid` = ?'); @@ -499,7 +499,7 @@ class Shared_Cache extends Cache { */ private function getParentInfo($id) { $sql = 'SELECT `parent`, `name` FROM `*PREFIX*filecache` WHERE `fileid` = ?'; - $query = \OC_DB::prepare($sql); + $query = \OCP\DB::prepare($sql); $result = $query->execute(array($id)); if ($row = $result->fetchRow()) { return array((int)$row['parent'], $row['name']); diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php index da0951d8e7c..494a544b2b8 100644 --- a/apps/files_sharing/lib/controllers/externalsharescontroller.php +++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php @@ -1,6 +1,7 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index 182342c22e5..ecf3ee853ee 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -46,7 +46,6 @@ use OCA\Files_Sharing\Helper; use OCP\User; use OCP\Util; use OCA\Files_Sharing\Activity; -use OCP\AppFramework\Http\DataResponse; /** * Class ShareController @@ -215,6 +214,7 @@ class ShareController extends Controller { $shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', array('token' => $token)); $shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10); + $shareTmpl['previewEnabled'] = $this->config->getSystemValue('enable_previews', true); $csp = new OCP\AppFramework\Http\ContentSecurityPolicy(); $csp->addAllowedFrameDomain('\'self\''); diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php index 653d4b7dd47..dd2c086e84c 100644 --- a/apps/files_sharing/lib/external/scanner.php +++ b/apps/files_sharing/lib/external/scanner.php @@ -34,7 +34,7 @@ class Scanner extends \OC\Files\Cache\Scanner { protected $storage; /** {@inheritDoc} */ - public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) { + public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) { $this->scanAll(); } diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php index 7c1dc5aeaf5..39e182feb60 100644 --- a/apps/files_sharing/lib/external/storage.php +++ b/apps/files_sharing/lib/external/storage.php @@ -25,7 +25,6 @@ namespace OCA\Files_Sharing\External; -use OC\Files\Filesystem; use OC\Files\Storage\DAV; use OC\ForbiddenException; use OCA\Files_Sharing\ISharedStorage; diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index 488a72a8824..38cb73be29c 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -306,4 +306,20 @@ class Helper { \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder); } + /** + * remove protocol from URL + * + * @param string $url + * @return string + */ + public static function removeProtocolFromUrl($url) { + if (strpos($url, 'https://') === 0) { + return substr($url, strlen('https://')); + } else if (strpos($url, 'http://') === 0) { + return substr($url, strlen('http://')); + } + + return $url; + } + } diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php index c3588ecdfe5..7dd04f2f4a0 100644 --- a/apps/files_sharing/lib/hooks.php +++ b/apps/files_sharing/lib/hooks.php @@ -2,6 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php index 94fb473883d..3f59fd131d0 100644 --- a/apps/files_sharing/lib/mountprovider.php +++ b/apps/files_sharing/lib/mountprovider.php @@ -1,14 +1,29 @@ <?php /** - * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * */ namespace OCA\Files_Sharing; use OC\Files\Filesystem; +use OC\User\NoUserException; use OCA\Files_Sharing\Propagation\PropagationManager; use OCP\Files\Config\IMountProvider; use OCP\Files\Storage\IStorageFactory; @@ -50,8 +65,13 @@ class MountProvider implements IMountProvider { $shares = array_filter($shares, function ($share) { return $share['permissions'] > 0; }); - return array_map(function ($share) use ($user, $storageFactory) { - Filesystem::initMountPoints($share['uid_owner']); + $shares = array_map(function ($share) use ($user, $storageFactory) { + try { + Filesystem::initMountPoints($share['uid_owner']); + } catch(NoUserException $e) { + \OC::$server->getLogger()->warning('The user \'' . $share['uid_owner'] . '\' of share with ID \'' . $share['id'] . '\' can\'t be retrieved.', array('app' => 'files_sharing')); + return null; + } // for updating etags for the share owner when we make changes to this share. $ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']); @@ -68,5 +88,7 @@ class MountProvider implements IMountProvider { $storageFactory ); }, $shares); + // array_filter removes the null values from the array + return array_filter($shares); } } diff --git a/apps/files_sharing/lib/propagation/changewatcher.php b/apps/files_sharing/lib/propagation/changewatcher.php index 483f436e289..9f23c19be88 100644 --- a/apps/files_sharing/lib/propagation/changewatcher.php +++ b/apps/files_sharing/lib/propagation/changewatcher.php @@ -1,9 +1,23 @@ <?php /** - * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * */ namespace OCA\Files_Sharing\Propagation; @@ -25,10 +39,17 @@ class ChangeWatcher { private $baseView; /** + * @var RecipientPropagator + */ + private $recipientPropagator; + + /** * @param \OC\Files\View $baseView the view for the logged in user + * @param RecipientPropagator $recipientPropagator */ - public function __construct(View $baseView) { + public function __construct(View $baseView, RecipientPropagator $recipientPropagator) { $this->baseView = $baseView; + $this->recipientPropagator = $recipientPropagator; } @@ -39,6 +60,12 @@ class ChangeWatcher { if ($mount instanceof SharedMount) { $this->propagateForOwner($mount->getShare(), $mount->getInternalPath($fullPath), $mount->getOwnerPropagator()); } + $info = $this->baseView->getFileInfo($path); + if ($info) { + // trigger propagation if the subject of the write hook is shared. + // if a parent folder of $path is shared the propagation will be triggered from the change propagator hooks + $this->recipientPropagator->propagateById($info->getId()); + } } public function renameHook($params) { diff --git a/apps/files_sharing/lib/propagation/propagationmanager.php b/apps/files_sharing/lib/propagation/propagationmanager.php index fa073be7f60..7929c2aa5bb 100644 --- a/apps/files_sharing/lib/propagation/propagationmanager.php +++ b/apps/files_sharing/lib/propagation/propagationmanager.php @@ -1,9 +1,23 @@ <?php /** - * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * */ namespace OCA\Files_Sharing\Propagation; @@ -75,7 +89,7 @@ class PropagationManager { if (isset($this->sharePropagators[$user])) { return $this->sharePropagators[$user]; } - $this->sharePropagators[$user] = new RecipientPropagator($user, $this->getChangePropagator($user), $this->config); + $this->sharePropagators[$user] = new RecipientPropagator($user, $this->getChangePropagator($user), $this->config, $this); return $this->sharePropagators[$user]; } @@ -101,7 +115,8 @@ class PropagationManager { if (!$user) { return; } - $watcher = new ChangeWatcher(Filesystem::getView()); + $recipientPropagator = $this->getSharePropagator($user->getUID()); + $watcher = new ChangeWatcher(Filesystem::getView(), $recipientPropagator); // for marking shares owned by the active user as dirty when a file inside them changes $this->listenToOwnerChanges($user->getUID(), $user->getUID()); diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php index 5b7651f2ce7..97ea452aa6c 100644 --- a/apps/files_sharing/lib/propagation/recipientpropagator.php +++ b/apps/files_sharing/lib/propagation/recipientpropagator.php @@ -1,9 +1,23 @@ <?php /** - * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * */ namespace OCA\Files_Sharing\Propagation; @@ -32,16 +46,23 @@ class RecipientPropagator { protected $config; /** + * @var PropagationManager + */ + private $manager; + + /** * @param string $userId current user, must match the propagator's * user * @param \OC\Files\Cache\ChangePropagator $changePropagator change propagator * initialized with a view for $user * @param \OCP\IConfig $config + * @param PropagationManager $manager */ - public function __construct($userId, $changePropagator, $config) { + public function __construct($userId, $changePropagator, $config, PropagationManager $manager) { $this->userId = $userId; $this->changePropagator = $changePropagator; $this->config = $config; + $this->manager = $manager; } /** @@ -101,18 +122,24 @@ class RecipientPropagator { */ public function attachToPropagator(ChangePropagator $propagator, $owner) { $propagator->listen('\OC\Files', 'propagate', function ($path, $entry) use ($owner) { - $shares = Share::getAllSharesForFileId($entry['fileid']); - foreach ($shares as $share) { - // propagate down the share tree - $this->markDirty($share, microtime(true)); + $this->propagateById($entry['fileid']); + }); + } - // propagate up the share tree - $user = $share['uid_owner']; + public function propagateById($id) { + $shares = Share::getAllSharesForFileId($id); + foreach ($shares as $share) { + // propagate down the share tree + $this->markDirty($share, microtime(true)); + + // propagate up the share tree + $user = $share['uid_owner']; + if($user !== $this->userId) { $view = new View('/' . $user . '/files'); $path = $view->getPath($share['file_source']); - $watcher = new ChangeWatcher($view); + $watcher = new ChangeWatcher($view, $this->manager->getSharePropagator($user)); $watcher->writeHook(['path' => $path]); } - }); + } } } diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 1822c2468f1..9c09e05408b 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -183,7 +183,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { if (isset($source['parent'])) { $parent = $source['parent']; while (isset($parent)) { - $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1); + $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1); $item = $query->execute(array($parent))->fetchRow(); if (isset($item['parent'])) { $parent = $item['parent']; diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php index d7b7c0c8f30..e18839b577d 100644 --- a/apps/files_sharing/lib/share/folder.php +++ b/apps/files_sharing/lib/share/folder.php @@ -64,7 +64,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share * @return mixed parent ID or null */ private function getParentId($child) { - $query = \OC_DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); + $query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); $result = $query->execute(array($child)); $row = $result->fetchRow(); $parent = ($row) ? $row['parent'] : null; @@ -75,7 +75,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share public function getChildren($itemSource) { $children = array(); $parents = array($itemSource); - $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?'); + $query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?'); $result = $query->execute(array('httpd/unix-directory')); if ($row = $result->fetchRow()) { $mimetype = $row['id']; @@ -84,7 +84,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share } while (!empty($parents)) { $parents = "'".implode("','", $parents)."'"; - $query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`' + $query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`' .' WHERE `parent` IN ('.$parents.')'); $result = $query->execute(); $parents = array(); diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php index 15aea0aa52a..2afc0f1f270 100644 --- a/apps/files_sharing/lib/sharedmount.php +++ b/apps/files_sharing/lib/sharedmount.php @@ -87,7 +87,7 @@ class SharedMount extends MountPoint implements MoveableMount { // if the user renames a mount point from a group share we need to create a new db entry // for the unique name if ($share['share_type'] === \OCP\Share::SHARE_TYPE_GROUP && empty($share['unique_name'])) { - $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,' + $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,' .' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,' .' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)'); $arguments = array($share['item_type'], $share['item_source'], $share['item_target'], @@ -95,7 +95,7 @@ class SharedMount extends MountPoint implements MoveableMount { $newPath, $share['token'], $share['id']); } else { // rename mount point - $query = \OC_DB::prepare( + $query = \OCP\DB::prepare( 'Update `*PREFIX*share` SET `file_target` = ? WHERE `id` = ?' diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 33b7f887e19..50957663b34 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -7,6 +7,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author scambra <sergio@entrecables.com> * @author Vincent Petry <pvince81@owncloud.com> * @@ -29,11 +30,11 @@ namespace OC\Files\Storage; -use OC\Files\Cache\ChangePropagator; use OC\Files\Filesystem; use OCA\Files_Sharing\ISharedStorage; use OCA\Files_Sharing\Propagator; use OCA\Files_Sharing\SharedMount; +use OCP\Lock\ILockingProvider; /** * Convert target path to source path and pass the function call to the correct storage provider @@ -70,7 +71,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { * Get the source file path, permissions, and owner for a shared file * * @param string $target Shared target file path - * @return Returns array with the keys path, permissions, and owner or false if not found + * @return array Returns array with the keys path, permissions, and owner or false if not found */ public function getFile($target) { if (!isset($this->files[$target])) { @@ -217,7 +218,13 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { } public function isReadable($path) { - return $this->file_exists($path); + $isReadable = false; + if ($source = $this->getSourcePath($path)) { + list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source); + $isReadable = $storage->isReadable($internalPath); + } + + return $isReadable && $this->file_exists($path); } public function isUpdatable($path) { @@ -605,4 +612,38 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { list($targetStorage, $targetInternalPath) = $this->resolvePath($targetInternalPath); return $targetStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); } + + /** + * @param string $path + * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE + * @param \OCP\Lock\ILockingProvider $provider + * @throws \OCP\Lock\LockedException + */ + public function acquireLock($path, $type, ILockingProvider $provider) { + /** @var \OCP\Files\Storage $targetStorage */ + list($targetStorage, $targetInternalPath) = $this->resolvePath($path); + $targetStorage->acquireLock($targetInternalPath, $type, $provider); + } + + /** + * @param string $path + * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE + * @param \OCP\Lock\ILockingProvider $provider + */ + public function releaseLock($path, $type, ILockingProvider $provider) { + /** @var \OCP\Files\Storage $targetStorage */ + list($targetStorage, $targetInternalPath) = $this->resolvePath($path); + $targetStorage->releaseLock($targetInternalPath, $type, $provider); + } + + /** + * @param string $path + * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE + * @param \OCP\Lock\ILockingProvider $provider + */ + public function changeLock($path, $type, ILockingProvider $provider) { + /** @var \OCP\Files\Storage $targetStorage */ + list($targetStorage, $targetInternalPath) = $this->resolvePath($path); + $targetStorage->changeLock($targetInternalPath, $type, $provider); + } } diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 88bb68aa36e..9dd106a548c 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -77,10 +77,10 @@ class Shared_Updater { $shareType = $params['shareType']; if ($shareType === \OCP\Share::SHARE_TYPE_USER) { - self::correctUsersFolder($shareWith, '/'); + self::correctUsersFolder($shareWith, $params['fileTarget']); } elseif ($shareType === \OCP\Share::SHARE_TYPE_GROUP) { foreach (\OC_Group::usersInGroup($shareWith) as $user) { - self::correctUsersFolder($user, '/'); + self::correctUsersFolder($user, $params['fileTarget']); } } } @@ -138,7 +138,7 @@ class Shared_Updater { */ static public function fixBrokenSharesOnAppUpdate() { // delete all shares where the original file no longer exists - $findAndRemoveShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` ' . + $findAndRemoveShares = \OCP\DB::prepare('DELETE FROM `*PREFIX*share` ' . 'WHERE `item_type` IN (\'file\', \'folder\') ' . 'AND `file_source` NOT IN (SELECT `fileid` FROM `*PREFIX*filecache`)' ); diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index da640fd08d3..2577ed91006 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -1,6 +1,5 @@ <?php /** - * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php index 3be464c64f0..be7530897f6 100644 --- a/apps/files_sharing/publicwebdav.php +++ b/apps/files_sharing/publicwebdav.php @@ -1,7 +1,6 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> @@ -24,10 +23,6 @@ * */ -if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) { - return false; -} - // load needed apps $RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging'); @@ -48,13 +43,19 @@ $server->setBaseUri($baseuri); // Load plugins $defaults = new OC_Defaults(); $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName())); -$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false)); // Show something in the Browser, but no upload +// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to / +$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin()); $server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree)); -$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin()); +$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig())); $server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC::$server->getLogger())); // wait with registering these until auth is handled and the filesystem is setup $server->on('beforeMethod', function () use ($server, $objectTree, $authBackend) { + if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) { + // this is what is thrown when trying to access a non-existing share + throw new \Sabre\DAV\Exception\NotAuthenticated(); + } + $share = $authBackend->getShare(); $rootShare = \OCP\Share::resolveReShare($share); $owner = $rootShare['uid_owner']; diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php new file mode 100644 index 00000000000..9ff94eb16c8 --- /dev/null +++ b/apps/files_sharing/settings-personal.php @@ -0,0 +1,42 @@ +<?php +/** + * @author Björn Schießle <schiessle@owncloud.com> + * @author Jan-Christoph Borchardt <hey@jancborchardt.net> + * @author Morris Jobke <hey@morrisjobke.de> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +\OC_Util::checkLoggedIn(); + +$l = \OC::$server->getL10N('files_sharing'); + +$uid = \OC::$server->getUserSession()->getUser()->getUID(); +$server = \OC::$server->getURLGenerator()->getAbsoluteURL('/'); +$cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/'); +$url = 'https://owncloud.org/federation#' . $cloudID; +$ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg'); + +$tmpl = new OCP\Template('files_sharing', 'settings-personal'); +$tmpl->assign('outgoingServer2serverShareEnabled', \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled()); +$tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID, see %s', [$url])); +$tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID', [$cloudID])); +$tmpl->assign('owncloud_logo_path', $ownCloudLogoPath); +$tmpl->assign('reference', $url); +$tmpl->assign('cloudId', $cloudID); + +return $tmpl->fetchPage(); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index fa349f29811..dd0b2eebe21 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -46,12 +46,22 @@ $thumbSize = 1024; <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"> - <div class="logo-wide svg"> - <h1 class="hidden-visually"> - <?php p($theme->getName()); ?> - </h1> + <div class="logo-icon svg"> </div> </a> + + <div class="header-appname-container"> + <h1 class="header-appname"> + <?php + if(OC_Util::getEditionString() === '') { + p($theme->getName()); + } else { + print_unescaped($theme->getHTMLName()); + } + ?> + </h1> + </div> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div class="header-right"> <span id="details"> @@ -79,7 +89,7 @@ $thumbSize = 1024; <?php if (isset($_['folder'])): ?> <?php print_unescaped($_['folder']); ?> <?php else: ?> - <?php if (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?> + <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?> <div id="imgframe"> <video tabindex="0" controls="" preload="none"> <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php new file mode 100644 index 00000000000..ee761ff5897 --- /dev/null +++ b/apps/files_sharing/templates/settings-personal.php @@ -0,0 +1,73 @@ +<?php +/** @var OC_L10N $l */ +/** @var array $_ */ +script('files_sharing', 'settings-personal'); +style('files_sharing', 'settings-personal'); +script('files_sharing', '3rdparty/gs-share/gs-share'); +style('files_sharing', '3rdparty/gs-share/style'); +?> + +<?php if ($_['outgoingServer2serverShareEnabled']): ?> + <div id="fileSharingSettings" class="section"> + <h2><?php p($l->t('Federated Cloud')); ?></h2> + + <p> + <?php p($l->t('Your Federated Cloud ID:')); ?> + <strong><?php p($_['cloudId']); ?></strong> + </p> + + <br> + + <p> + <?php p($l->t('Share it:')); ?> + <div class="gs-share"> + <button data-url="<?php p(urlencode($_['reference'])); ?>" + data-title='<?php p(urlencode($_['message_without_URL'])); ?>' + class='js-gs-share social-gnu'> + GNU Social + </button> + </div> + <button class="social-diaspora pop-up" + data-url='http://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p(urlencode($_['reference'])); ?>'> + Diaspora + </button> + <button class="social-twitter pop-up" + data-url='https://twitter.com/intent/tweet?text=<?php p(urlencode($_['message_with_URL'])); ?>'> + Twitter + </button> + <button class="social-facebook pop-up" + data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'> + Facebook + </button> + <button class="social-googleplus pop-up" + data-url='https://plus.google.com/share?url=<?php p(urlencode($_['reference'])); ?>'/> + Google+ + </button> + </p> + + <br> + + <p> + <?php p($l->t('Add it to your website:')); ?> + + <a target="_blank" href="<?php p($_['reference']); ?>" + style="padding:10px;background-color:#1d2d44;color:#fff;border-radius:3px;padding-left:4px;"> + <img src="<?php p($_['owncloud_logo_path']); ?>" + style="width:50px;position:relative;top:8px;"> + <?php p($l->t('Share with me via ownCloud')); ?> + </a> + </p> + + <p> + <?php p($l->t('HTML Code:')); ?> + <xmp><a target="_blank" href="<?php p($_['reference']); ?>" + style="padding:10px;background-color:#1d2d44;color:#fff;border-radius:3px;padding-left:4px;"> + <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['owncloud_logo_path'])); ?>" + style="width:50px;position:relative;top:8px;"> + <?php p($l->t('Share with me via ownCloud')); ?> + +</a></xmp> + </p> + + </div> +<?php endif; ?> diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 44c6b1dc4b9..d5a6fd5b657 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -888,7 +888,6 @@ class Test_Files_Sharing_Api extends TestCase { $this->assertEquals('1', $newUserShare['permissions']); // update password for link share - $this->assertTrue(empty($linkShare['share_with'])); $params = array(); @@ -913,6 +912,29 @@ class Test_Files_Sharing_Api extends TestCase { $this->assertTrue(is_array($newLinkShare)); $this->assertTrue(!empty($newLinkShare['share_with'])); + // Remove password for link share + $params = array(); + $params['id'] = $linkShare['id']; + $params['_put'] = array(); + $params['_put']['password'] = ''; + + $result = \OCA\Files_Sharing\API\Local::updateShare($params); + + $this->assertTrue($result->succeeded()); + + $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); + + $newLinkShare = null; + foreach ($items as $item) { + if ($item['share_type'] === \OCP\Share::SHARE_TYPE_LINK) { + $newLinkShare = $item; + break; + } + } + + $this->assertTrue(is_array($newLinkShare)); + $this->assertTrue(empty($newLinkShare['share_with'])); + \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index 64ee5b8ce51..0b56aafc8a9 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -4,6 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Cloutier <vincent1cloutier@gmail.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. @@ -29,7 +30,6 @@ use OC\Files\Filesystem; use OCA\Files_Sharing\AppInfo\Application; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\IAppContainer; -use OCP\Files; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\Security\ISecureRandom; @@ -78,10 +78,7 @@ class ShareControllerTest extends \Test\TestCase { \OC_User::createUser($this->user, $this->user); \OC_Util::tearDownFS(); - \OC_User::setUserId(''); - Filesystem::tearDown(); - \OC_User::setUserId($this->user); - \OC_Util::setupFS($this->user); + $this->loginAsUser($this->user); // Create a dummy shared file $view = new View('/'. $this->user . '/files'); @@ -182,6 +179,7 @@ class ShareControllerTest extends \Test\TestCase { 'nonHumanFileSize' => 33, 'maxSizeAnimateGif' => 10, 'previewSupported' => true, + 'previewEnabled' => true, ); $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy(); diff --git a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php index 8b5afcb9149..124cb83e6f0 100644 --- a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php +++ b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php @@ -1,6 +1,5 @@ <?php /** - * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php index 60b7c525e35..d978daf200c 100644 --- a/apps/files_sharing/tests/etagpropagation.php +++ b/apps/files_sharing/tests/etagpropagation.php @@ -1,5 +1,7 @@ <?php /** + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. @@ -69,9 +71,12 @@ class EtagPropagation extends TestCase { $view1->mkdir('/directReshare'); $view1->mkdir('/sub1/sub2/folder/other'); $view1->mkdir('/sub1/sub2/folder/other'); + $view1->file_put_contents('/foo.txt', 'foobar'); $view1->file_put_contents('/sub1/sub2/folder/file.txt', 'foobar'); $view1->file_put_contents('/sub1/sub2/folder/inside/file.txt', 'foobar'); $folderInfo = $view1->getFileInfo('/sub1/sub2/folder'); + $fileInfo = $view1->getFileInfo('/foo.txt'); + \OCP\Share::shareItem('file', $fileInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31); \OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31); \OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER3, 31); $folderInfo = $view1->getFileInfo('/directReshare'); @@ -179,6 +184,15 @@ class EtagPropagation extends TestCase { $this->assertAllUnchaged(); } + public function testOwnerWritesToSingleFileShare() { + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); + Filesystem::file_put_contents('/foo.txt', 'bar'); + $this->assertEtagsNotChanged([self::TEST_FILES_SHARING_API_USER4, self::TEST_FILES_SHARING_API_USER3]); + $this->assertEtagsChanged([self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER2]); + + $this->assertAllUnchaged(); + } + public function testOwnerWritesToShareWithReshare() { $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); Filesystem::file_put_contents('/sub1/sub2/folder/inside/bar.txt', 'bar'); diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php index f7b216530d5..df01ea0f738 100644 --- a/apps/files_sharing/tests/external/managertest.php +++ b/apps/files_sharing/tests/external/managertest.php @@ -76,7 +76,7 @@ class ManagerTest extends TestCase { $this->assertCount(1, $openShares); $this->assertExternalShareEntry($shareData1, $openShares[0], 1, '{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertNotMount('SharedFolder'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); @@ -88,7 +88,7 @@ class ManagerTest extends TestCase { // New share falls back to "-1" appendix, because the name is already taken $this->assertExternalShareEntry($shareData2, $openShares[1], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertNotMount('SharedFolder'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -101,7 +101,7 @@ class ManagerTest extends TestCase { $this->manager->acceptShare($openShares[0]['id']); // Check remaining shares - Accepted - $acceptedShares = \Test_Helper::invokePrivate($this->manager, 'getShares', [true]); + $acceptedShares = self::invokePrivate($this->manager, 'getShares', [true]); $this->assertCount(1, $acceptedShares); $shareData1['accepted'] = true; $this->assertExternalShareEntry($shareData1, $acceptedShares[0], 1, $shareData1['name']); @@ -110,7 +110,7 @@ class ManagerTest extends TestCase { $this->assertCount(1, $openShares); $this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -123,7 +123,7 @@ class ManagerTest extends TestCase { // New share falls back to the original name (no "-\d", because the name is not taken) $this->assertExternalShareEntry($shareData3, $openShares[1], 3, '{{TemporaryMountPointName#' . $shareData3['name'] . '}}'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -135,13 +135,13 @@ class ManagerTest extends TestCase { // Decline the third share $this->manager->declineShare($openShares[1]['id']); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); // Check remaining shares - Accepted - $acceptedShares = \Test_Helper::invokePrivate($this->manager, 'getShares', [true]); + $acceptedShares = self::invokePrivate($this->manager, 'getShares', [true]); $this->assertCount(1, $acceptedShares); $shareData1['accepted'] = true; $this->assertExternalShareEntry($shareData1, $acceptedShares[0], 1, $shareData1['name']); @@ -150,7 +150,7 @@ class ManagerTest extends TestCase { $this->assertCount(1, $openShares); $this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -163,10 +163,10 @@ class ManagerTest extends TestCase { ->with($this->stringStartsWith('http://localhost/ocs/v1.php/cloud/shares/' . $acceptedShares[0]['remote_id'] . '/decline'), $this->anything()); $this->manager->removeUserShares($this->uid); - $this->assertEmpty(\Test_Helper::invokePrivate($this->manager, 'getShares', [null]), 'Asserting all shares for the user have been deleted'); + $this->assertEmpty(self::invokePrivate($this->manager, 'getShares', [null]), 'Asserting all shares for the user have been deleted'); $this->mountManager->clear(); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertNotMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); diff --git a/apps/files_sharing/tests/js/publicAppSpec.js b/apps/files_sharing/tests/js/publicAppSpec.js new file mode 100644 index 00000000000..d496b78acfa --- /dev/null +++ b/apps/files_sharing/tests/js/publicAppSpec.js @@ -0,0 +1,107 @@ +/** +* ownCloud +* +* @author Vincent Petry +* @copyright 2015 Vincent Petry <pvince81@owncloud.com> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +describe('OCA.Sharing.PublicApp tests', function() { + var App = OCA.Sharing.PublicApp; + var $preview; + var fileListIn; + var fileListOut; + + beforeEach(function() { + $preview = $('<div id="preview"></div>'); + $('#testArea').append($preview); + $preview.append( + '<div id="mimetype"></div>' + + '<div id="mimetypeIcon"></div>' + + '<input type="hidden" id="sharingToken" value="sh4tok"></input>' + ); + }); + + describe('File list', function() { + // TODO: this should be moved to a separate file once the PublicFileList is extracted from public.js + beforeEach(function() { + $preview.append( + '<div id="app-content-files">' + + // init horrible parameters + '<input type="hidden" id="dir" value="/subdir"/>' + + '<input type="hidden" id="permissions" value="31"/>' + + // dummy controls + '<div id="controls">' + + ' <div class="actions creatable"></div>' + + ' <div class="notCreatable"></div>' + + '</div>' + + // uploader + '<input type="file" id="file_upload_start" name="files[]" multiple="multiple">' + + // dummy table + // TODO: at some point this will be rendered by the fileList class itself! + '<table id="filestable">' + + '<thead><tr>' + + '<th id="headerName" class="hidden column-name">' + + '<input type="checkbox" id="select_all_files" class="select-all">' + + '<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' + + '<span class="selectedActions hidden">' + + '<a href class="download">Download</a>' + + '</th>' + + '<th class="hidden column-size"><a class="columntitle" data-sort="size"><span class="sort-indicator"></span></a></th>' + + '<th class="hidden column-mtime"><a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a></th>' + + '</tr></thead>' + + '<tbody id="fileList"></tbody>' + + '<tfoot></tfoot>' + + '</table>' + + // TODO: move to handlebars template + '<div id="emptycontent"><h2>Empty content message</h2><p class="uploadmessage">Upload message</p></div>' + + '<div class="nofilterresults hidden"></div>' + + '</div>' + ); + + App.initialize($('#preview')); + }); + afterEach(function() { + App._initialized = false; + }); + + describe('Download Url', function() { + var fileList; + + beforeEach(function() { + fileList = App.fileList; + }); + + it('returns correct download URL for single files', function() { + expect(fileList.getDownloadUrl('some file.txt')) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2Fsubdir&files=some%20file.txt'); + expect(fileList.getDownloadUrl('some file.txt', '/anotherpath/abc')) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2Fanotherpath%2Fabc&files=some%20file.txt'); + fileList.changeDirectory('/'); + expect(fileList.getDownloadUrl('some file.txt')) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2F&files=some%20file.txt'); + }); + it('returns correct download URL for multiple files', function() { + expect(fileList.getDownloadUrl(['a b c.txt', 'd e f.txt'])) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2Fsubdir&files=%5B%22a%20b%20c.txt%22%2C%22d%20e%20f.txt%22%5D'); + }); + it('returns the correct ajax URL', function() { + expect(fileList.getAjaxUrl('test', {a:1, b:'x y'})) + .toEqual(OC.webroot + '/index.php/apps/files_sharing/ajax/test.php?a=1&b=x%20y&t=sh4tok'); + }); + }); + }); +}); diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php index b1113e7a455..0db8a1ed5bc 100644 --- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php +++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php @@ -1,5 +1,6 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> @@ -58,7 +59,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { ->with('core', 'shareapi_allow_links', 'yes') ->will($this->returnValue('yes')); - $this->assertTrue(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); + $this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); } public function testIsSharingEnabledWithAppDisabled() { @@ -68,7 +69,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { ->with('files_sharing') ->will($this->returnValue(false)); - $this->assertFalse(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); + $this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); } public function testIsSharingEnabledWithSharingDisabled() { @@ -84,6 +85,6 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { ->with('core', 'shareapi_allow_links', 'yes') ->will($this->returnValue('no')); - $this->assertFalse(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); + $this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); } } diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php index 91f0347163a..c10333defaa 100644 --- a/apps/files_sharing/tests/permissions.php +++ b/apps/files_sharing/tests/permissions.php @@ -3,6 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index ff4cb4c0e49..d1db6a644f0 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -5,6 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 @@ -61,11 +62,11 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { self::TEST_FILES_SHARING_API_USER2, 31); $statement = "UPDATE `*PREFIX*share` SET `file_target` = ? where `share_with` = ?"; - $query = \OC_DB::prepare($statement); + $query = \OCP\DB::prepare($statement); $arguments = array('/foo/bar' . $this->folder, self::TEST_FILES_SHARING_API_USER2); $query->execute($arguments); - $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`'); + $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`'); $result = $query->execute(); $shares = $result->fetchAll(); @@ -79,7 +80,7 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { // share should have moved up - $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`'); + $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`'); $result = $query->execute(); $shares = $result->fetchAll(); diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php index 4ab3475ccfc..dbaa316f603 100644 --- a/apps/files_sharing/tests/sizepropagation.php +++ b/apps/files_sharing/tests/sizepropagation.php @@ -1,6 +1,7 @@ <?php /** - * @author Vincent Petry <pvince81@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index b9e9f077201..7533b13f79d 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -153,6 +153,7 @@ abstract class TestCase extends \Test\TestCase { \OC::$server->getUserSession()->setUser(null); \OC\Files\Filesystem::tearDown(); \OC::$server->getUserSession()->login($user, $password); + \OC::$server->getUserFolder($user); \OC_Util::setupFS($user); } diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php index b49180fdc83..0cf551c0500 100644 --- a/apps/files_sharing/tests/unsharechildren.php +++ b/apps/files_sharing/tests/unsharechildren.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Robin Appelman <icewind@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php index 294388bfe26..63ab452a5e1 100644 --- a/apps/files_sharing/tests/updater.php +++ b/apps/files_sharing/tests/updater.php @@ -3,7 +3,6 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. @@ -117,14 +116,34 @@ class Test_Files_Sharing_Updater extends OCA\Files_Sharing\Tests\TestCase { \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); } + public function shareFolderProvider() { + return [ + ['/'], + ['/my_shares'], + ]; + } + /** * if a file gets shared the etag for the recipients root should change + * + * @dataProvider shareFolderProvider + * + * @param string $shareFolder share folder to use */ - function testShareFile() { + public function testShareFile($shareFolder) { + $config = \OC::$server->getConfig(); + $oldShareFolder = $config->getSystemValue('share_folder'); + $config->setSystemValue('share_folder', $shareFolder); + $this->loginHelper(self::TEST_FILES_SHARING_API_USER2); - $beforeShare = \OC\Files\Filesystem::getFileInfo(''); - $etagBeforeShare = $beforeShare->getEtag(); + $beforeShareRoot = \OC\Files\Filesystem::getFileInfo(''); + $etagBeforeShareRoot = $beforeShareRoot->getEtag(); + + \OC\Files\Filesystem::mkdir($shareFolder); + + $beforeShareDir = \OC\Files\Filesystem::getFileInfo($shareFolder); + $etagBeforeShareDir = $beforeShareDir->getEtag(); $this->loginHelper(self::TEST_FILES_SHARING_API_USER1); $fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder); @@ -133,17 +152,25 @@ class Test_Files_Sharing_Updater extends OCA\Files_Sharing\Tests\TestCase { $this->loginHelper(self::TEST_FILES_SHARING_API_USER2); - $afterShare = \OC\Files\Filesystem::getFileInfo(''); - $etagAfterShare = $afterShare->getEtag(); + $afterShareRoot = \OC\Files\Filesystem::getFileInfo(''); + $etagAfterShareRoot = $afterShareRoot->getEtag(); + + $afterShareDir = \OC\Files\Filesystem::getFileInfo($shareFolder); + $etagAfterShareDir = $afterShareDir->getEtag(); - $this->assertTrue(is_string($etagBeforeShare)); - $this->assertTrue(is_string($etagAfterShare)); - $this->assertTrue($etagBeforeShare !== $etagAfterShare); + $this->assertTrue(is_string($etagBeforeShareRoot)); + $this->assertTrue(is_string($etagBeforeShareDir)); + $this->assertTrue(is_string($etagAfterShareRoot)); + $this->assertTrue(is_string($etagAfterShareDir)); + $this->assertTrue($etagBeforeShareRoot !== $etagAfterShareRoot); + $this->assertTrue($etagBeforeShareDir !== $etagAfterShareDir); // cleanup $this->loginHelper(self::TEST_FILES_SHARING_API_USER1); $result = \OCP\Share::unshare('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2); $this->assertTrue($result); + + $config->setSystemValue('share_folder', $oldShareFolder); } /** diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php index 4af5de6aaae..488792db4ef 100644 --- a/apps/files_sharing/tests/watcher.php +++ b/apps/files_sharing/tests/watcher.php @@ -4,6 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * |
