diff options
1398 files changed, 5978 insertions, 2879 deletions
diff --git a/.htaccess b/.htaccess index d86ed7162d8..1b516789563 100644 --- a/.htaccess +++ b/.htaccess @@ -12,6 +12,8 @@ Header set X-XSS-Protection "1; mode=block" Header set X-Robots-Tag "none" Header set X-Frame-Options "SAMEORIGIN" + Header set X-Download-Options "noopen" + Header set X-Permitted-Cross-Domain-Policies "none" SetEnv modHeadersAvailable true </IfModule> diff --git a/3rdparty b/3rdparty -Subproject 6ed0fba7d78ced45ea39bef5881597fcd47c89f +Subproject 38b9a44072fb8667fa9e73330a70ea012b6772e @@ -4,6 +4,7 @@ ownCloud is written by: - Administrator <Administrator@WINDOWS-2012> - Aldo "xoen" Giambelluca <xoen@xoen.org> - Alexander Bergolth <leo@strike.wu.ac.at> + - Andreas Böhler <dev@aboehler.at> - Andreas Ergenzinger <andreas.ergenzinger@gmx.de> - Andreas Fischer <bantu@owncloud.com> - Andrew Brown <andrew@casabrown.com> @@ -25,6 +26,8 @@ ownCloud is written by: - Christian Berendt <berendt@b1-systems.de> - Christian Kampka <christian@kampka.net> - Christian Reiner <github@christian-reiner.info> + - Christian Schnidrig <christian.schnidrig@switch.ch> + - Christian Weiske <cweiske@cweiske.de> - Christopher Schäpers <kondou@ts.unde.re> - Christopher T. Johnson <ctjctj@gmail.com> - Clark Tomlinson <fallen013@gmail.com> @@ -33,9 +36,9 @@ ownCloud is written by: - Daniel Hansson <enoch85@gmail.com> - Daniel Molkentin <daniel@molkentin.de> - David Prévot <taffit@debian.org> - - David Reagan <reagand@lanecc.edu> - Dominik Schmidt <dev@dominik-schmidt.de> - Donald Buczek <buczek@molgen.mpg.de> + - Edward Crompton <edward.crompton@gmail.com> - Fabian Henze <flyser42@gmx.de> - Felix Böhm <felixboehm@gmx.de> - Felix Moeller <mail@felixmoeller.de> @@ -50,6 +53,7 @@ ownCloud is written by: - Georg Ehrke <georg@owncloud.com> - Guillaume AMAT <guillaume.amat@informatique-libre.com> - Hasso Tepper <hasso@zone.ee> + - Hendrik Leppelsack <hendrik@leppelsack.de> - Hugo Gonzalez Labrador <hglavra@gmail.com> - Individual IT Services <info@individual-it.net> - Jakob Sack <mail@jakobsack.de> @@ -57,6 +61,7 @@ ownCloud is written by: - Jean-Louis Dupond <jean-louis@dupond.be> - Jens-Christian Fischer <jens-christian.fischer@switch.ch> - Jesus Macias <jmacias@full-on-net.com> + - Jesús Macias <jmacias@solidgear.es> - Joas Schilling <nickvergessen@owncloud.com> - Johan Björk <johanimon@gmail.com> - Johannes Willnecker <johannes@willnecker.com> @@ -73,13 +78,13 @@ ownCloud is written by: - Lukas Reschke <lukas@owncloud.com> - Luke Policinski <lpolicinski@gmail.com> - Lyonel Vincent <lyonel@ezix.org> + - Mario Kolling <mario.kolling@serpro.gov.br> - Markus Goetz <markus@woboq.com> - Martin Konrad <info@martin-konrad.net> - Martin Konrad <konrad@frib.msu.edu> - Martin Mattel <martin.mattel@diemattels.at> - Marvin Thomas Rabe <mrabe@marvinrabe.de> - Masaki Kawabata Neto <masaki.kawabata@gmail.com> - - Matthias Rieber <matthias@zu-con.org> - Michael Gapczynski <GapczynskiM@gmail.com> - Michael Göhler <somebody.here@gmx.de> - Michael Kuhn <suraia@ikkoku.de> @@ -87,6 +92,7 @@ ownCloud is written by: - Michael Roth <michael.roth@rz.uni-augsburg.de> - Michael Telatynski <7t3chguy@gmail.com> - Miguel Prokop <miguel.prokop@vtu.com> + - Mitar <mitar.git@tnode.com> - Morris Jobke <hey@morrisjobke.de> - Nicolai Ehemann <en@enlightened.de> - Nicolas Grekas <nicolas.grekas@gmail.com> @@ -105,13 +111,16 @@ ownCloud is written by: - Philippe Jung <phil.jung@free.fr> - Philippe Le Brouster <plb@nebkha.net> - Qingping Hou <dave2008713@gmail.com> + - Raghu Nayyar <hey@raghunayyar.com> - Raghu Nayyar <me@iraghu.com> + - Ralph Krimmel <rkrimme1@gwdg.de> - Ramiro Aparicio <rapariciog@gmail.com> - Randolph Carter <RandolphCarter@fantasymail.de> - RealRancor <Fisch.666@gmx.de> - Remco Brenninkmeijer <requist1@starmail.nl> + - Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca> - Robin Appelman <icewind@owncloud.com> - - Robin McCorkell <rmccorkell@karoshi.org.uk> + - Robin McCorkell <robin@mccorkell.me.uk> - Roeland Jago Douma <rullzer@owncloud.com> - Roman Geber <rgeber@owncloudapps.com> - Ross Nicoll <jrn@jrn.me.uk> @@ -135,16 +144,15 @@ ownCloud is written by: - Thomas Schmidt <tschmidt@suse.de> - Thomas Tanghus <thomas@tanghus.net> - Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> + - Tim Dettrick <t.dettrick@uq.edu.au> - Tobia De Koninck <tobia@ledfan.be> - Tobias Kaminsky <tobias@kaminsky.me> - Tom Needham <tom@owncloud.com> - - Valerio Ponte <valerio.ponte@gmail.com> - Victor Dubiniuk <dubiniuk@owncloud.com> - Viktor Szépe <viktor@szepe.net> - Vincent Cloutier <vincent1cloutier@gmail.com> - Vincent Petry <pvince81@owncloud.com> - Volkan Gezer <volkangezer@gmail.com> - - Volker Fröhlich <volker27@gmx.at> - adrien <adrien.waksberg@believedigital.com> - brumsel <brumsel@losecatcher.de> - cetra3 <peter@parashift.com.au> @@ -152,19 +160,18 @@ ownCloud is written by: - dampfklon <me@dampfklon.de> - davidgumberg <davidnoizgumberg@gmail.com> - derkostka <sebastian.kostka@gmail.com> - - drarko <drarko@users.noreply.github.com> - eduardo <eduardo@vnexu.net> - fabian <fabian@web2.0-apps.de> - goodkiller <markopraakli@gmail.com> - helix84 <helix84@centrum.sk> - hkjolhede <hkjolhede@gmail.com> - ideaship <ideaship@users.noreply.github.com> - - itheiss <ingo.theiss@i-matrixx.de> - j-ed <juergen@eisfair.org> - jknockaert <jasper@knockaert.nl> - macjohnny <estebanmarin@gmx.ch> - marc0s <marcos@tenak.net> - martin-rueegg <martin.rueegg@metaworx.ch> + - martin.mattel@diemattels.at <martin.mattel@diemattels.at> - michag86 <micha_g@arcor.de> - nishiki <nishiki@yaegashi.fr> - root <root@oc.(none)> diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php index 3651a5034c5..5ba7278e88e 100644 --- a/apps/dav/appinfo/app.php +++ b/apps/dav/appinfo/app.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -19,23 +19,21 @@ * */ +use OCA\DAV\CardDAV\CardDavBackend; +use OCA\DAV\CardDAV\SyncService; + +\OC::$server->registerService('CardDAVSyncService', function() { + + $app = new \OCA\Dav\AppInfo\Application(); + /** @var CardDavBackend */ + $backend = $app->getContainer()->query('CardDavBackend'); + + return new SyncService($backend); +}); + $cm = \OC::$server->getContactsManager(); $cm->register(function() use ($cm) { - $db = \OC::$server->getDatabaseConnection(); $userId = \OC::$server->getUserSession()->getUser()->getUID(); - $principal = new \OCA\DAV\Connector\Sabre\Principal( - \OC::$server->getUserManager() - ); - $cardDav = new \OCA\DAV\CardDAV\CardDavBackend($db, $principal, \OC::$server->getLogger()); - $addressBooks = $cardDav->getAddressBooksForUser("principals/$userId"); - foreach ($addressBooks as $addressBookInfo) { - $addressBook = new \OCA\DAV\CardDAV\AddressBook($cardDav, $addressBookInfo); - $cm->registerAddressBook( - new OCA\DAV\CardDAV\AddressBookImpl( - $addressBook, - $addressBookInfo, - $cardDav - ) - ); - } + $app = new \OCA\Dav\AppInfo\Application(); + $app->setupContactsProvider($cm, $userId); }); diff --git a/apps/dav/appinfo/application.php b/apps/dav/appinfo/application.php new file mode 100644 index 00000000000..71236a3325e --- /dev/null +++ b/apps/dav/appinfo/application.php @@ -0,0 +1,68 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\Dav\AppInfo; + +use OCA\DAV\CardDAV\ContactsManager; +use \OCP\AppFramework\App; +use OCP\AppFramework\IAppContainer; +use OCP\Contacts\IManager; + +class Application extends App { + + /** + * Application constructor. + * + * @param array $urlParams + */ + public function __construct (array $urlParams=array()) { + parent::__construct('dav', $urlParams); + + $container = $this->getContainer(); + $container->registerService('ContactsManager', function($c) { + /** @var IAppContainer $c */ + return new ContactsManager( + $c->query('CardDavBackend') + ); + }); + + $container->registerService('CardDavBackend', function($c) { + /** @var IAppContainer $c */ + $db = $c->getServer()->getDatabaseConnection(); + $logger = $c->getServer()->getLogger(); + $principal = new \OCA\DAV\Connector\Sabre\Principal( + $c->getServer()->getUserManager() + ); + return new \OCA\DAV\CardDAV\CardDavBackend($db, $principal, $logger); + }); + + } + + /** + * @param IManager $contactsManager + * @param string $userID + */ + public function setupContactsProvider(IManager $contactsManager, $userID) { + /** @var ContactsManager $cm */ + $cm = $this->getContainer()->query('ContactsManager'); + $cm->setupContactsProvider($contactsManager, $userID); + } + +} diff --git a/apps/dav/appinfo/register_command.php b/apps/dav/appinfo/register_command.php index 603832e0c48..10f68768751 100644 --- a/apps/dav/appinfo/register_command.php +++ b/apps/dav/appinfo/register_command.php @@ -1,5 +1,24 @@ <?php - +/** + * @author Björn Schießle <schiessle@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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/> + * + */ use OCA\DAV\Command\CreateAddressBook; use OCA\DAV\Command\CreateCalendar; use OCA\DAV\Command\SyncSystemAddressBook; diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php index cf0488038d3..6ddb570aca8 100644 --- a/apps/dav/appinfo/v1/publicwebdav.php +++ b/apps/dav/appinfo/v1/publicwebdav.php @@ -1,11 +1,13 @@ <?php /** * @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> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -39,7 +41,6 @@ $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory( \OC::$server->getUserSession(), \OC::$server->getMountManager(), \OC::$server->getTagManager(), - \OC::$server->getEventDispatcher(), \OC::$server->getRequest() ); diff --git a/apps/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php index 8324f962b8e..d75c3526bdd 100644 --- a/apps/dav/appinfo/v1/webdav.php +++ b/apps/dav/appinfo/v1/webdav.php @@ -1,16 +1,10 @@ <?php /** - * @author Bart Visscher <bartv@thisnet.nl> - * @author Frank Karlitschek <frank@owncloud.org> - * @author Jakob Sack <mail@jakobsack.de> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -40,7 +34,6 @@ $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory( \OC::$server->getUserSession(), \OC::$server->getMountManager(), \OC::$server->getTagManager(), - \OC::$server->getEventDispatcher(), \OC::$server->getRequest() ); diff --git a/apps/dav/appinfo/v2/remote.php b/apps/dav/appinfo/v2/remote.php index 02457bd3ccc..4e9cf8fd082 100644 --- a/apps/dav/appinfo/v2/remote.php +++ b/apps/dav/appinfo/v2/remote.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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/> + * + */ // no php execution timeout for webdav set_time_limit(0); diff --git a/apps/dav/command/createaddressbook.php b/apps/dav/command/createaddressbook.php index 7b70cea7f80..0e396074704 100644 --- a/apps/dav/command/createaddressbook.php +++ b/apps/dav/command/createaddressbook.php @@ -1,5 +1,24 @@ <?php - +/** + * @author Björn Schießle <schiessle@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Command; use OCA\DAV\CardDAV\CardDavBackend; @@ -63,7 +82,6 @@ class CreateAddressBook extends Command { throw new \InvalidArgumentException("User <$user> in unknown."); } $principalBackend = new Principal( - $this->config, $this->userManager ); diff --git a/apps/dav/command/createcalendar.php b/apps/dav/command/createcalendar.php index 5e7b17dae66..34bc061c45b 100644 --- a/apps/dav/command/createcalendar.php +++ b/apps/dav/command/createcalendar.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Command; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/command/syncsystemaddressbook.php b/apps/dav/command/syncsystemaddressbook.php index 162ab362892..338529c1952 100644 --- a/apps/dav/command/syncsystemaddressbook.php +++ b/apps/dav/command/syncsystemaddressbook.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Command; use OCA\DAV\CardDAV\CardDavBackend; @@ -57,7 +75,6 @@ class SyncSystemAddressBook extends Command { */ protected function execute(InputInterface $input, OutputInterface $output) { $principalBackend = new Principal( - $this->config, $this->userManager ); diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php index d912f209d46..6af75ca064c 100644 --- a/apps/dav/lib/caldav/caldavbackend.php +++ b/apps/dav/lib/caldav/caldavbackend.php @@ -1,8 +1,9 @@ <?php /** + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/caldav/schedule/imipplugin.php b/apps/dav/lib/caldav/schedule/imipplugin.php index eafdbe9c1bd..d9f2ec674f0 100644 --- a/apps/dav/lib/caldav/schedule/imipplugin.php +++ b/apps/dav/lib/caldav/schedule/imipplugin.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CalDAV\Schedule; use OCP\ILogger; diff --git a/apps/dav/lib/carddav/addressbook.php b/apps/dav/lib/carddav/addressbook.php index 507657e9682..3e3e751828e 100644 --- a/apps/dav/lib/carddav/addressbook.php +++ b/apps/dav/lib/carddav/addressbook.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CardDAV; use OCA\DAV\CardDAV\Sharing\IShareableAddressBook; diff --git a/apps/dav/lib/carddav/addressbookimpl.php b/apps/dav/lib/carddav/addressbookimpl.php index 838ef5aec65..240e40c9688 100644 --- a/apps/dav/lib/carddav/addressbookimpl.php +++ b/apps/dav/lib/carddav/addressbookimpl.php @@ -1,9 +1,8 @@ <?php /** - * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/carddav/addressbookroot.php b/apps/dav/lib/carddav/addressbookroot.php index 8c78d024556..2680135dec2 100644 --- a/apps/dav/lib/carddav/addressbookroot.php +++ b/apps/dav/lib/carddav/addressbookroot.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CardDAV; class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot { diff --git a/apps/dav/lib/carddav/card.php b/apps/dav/lib/carddav/card.php index cea0b1e41c7..5ec9a7e93a9 100644 --- a/apps/dav/lib/carddav/card.php +++ b/apps/dav/lib/carddav/card.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php index 95175b20d1b..7deda07497f 100644 --- a/apps/dav/lib/carddav/carddavbackend.php +++ b/apps/dav/lib/carddav/carddavbackend.php @@ -1,9 +1,11 @@ <?php - /** + * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Björn Schießle <schiessle@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -37,9 +39,6 @@ class CardDavBackend implements BackendInterface, SyncSupport { /** @var Principal */ private $principalBackend; - /** @var ILogger */ - private $logger; - /** @var string */ private $dbCardsTable = 'cards'; @@ -59,12 +58,10 @@ class CardDavBackend implements BackendInterface, SyncSupport { * * @param IDBConnection $db * @param Principal $principalBackend - * @param ILogger $logger */ - public function __construct(IDBConnection $db, Principal $principalBackend, ILogger $logger) { + public function __construct(IDBConnection $db, Principal $principalBackend) { $this->db = $db; $this->principalBackend = $principalBackend; - $this->logger = $logger; } /** diff --git a/apps/dav/lib/carddav/contactsmanager.php b/apps/dav/lib/carddav/contactsmanager.php new file mode 100644 index 00000000000..3fe4de4a15e --- /dev/null +++ b/apps/dav/lib/carddav/contactsmanager.php @@ -0,0 +1,55 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CardDAV; + +use OCP\Contacts\IManager; + +class ContactsManager { + + /** + * ContactsManager constructor. + * + * @param CardDavBackend $backend + */ + public function __construct(CardDavBackend $backend) { + $this->backend = $backend; + } + + /** + * @param IManager $cm + * @param string $userId + */ + public function setupContactsProvider(IManager $cm, $userId) { + $addressBooks = $this->backend->getAddressBooksForUser("principals/$userId"); + foreach ($addressBooks as $addressBookInfo) { + $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo); + $cm->registerAddressBook( + new AddressBookImpl( + $addressBook, + $addressBookInfo, + $this->backend + ) + ); + } + } + +} diff --git a/apps/dav/lib/carddav/converter.php b/apps/dav/lib/carddav/converter.php index 56b73eba4c0..06d3cb4f18e 100644 --- a/apps/dav/lib/carddav/converter.php +++ b/apps/dav/lib/carddav/converter.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/carddav/plugin.php b/apps/dav/lib/carddav/plugin.php index f2b3dcbfda9..4acc1037b52 100644 --- a/apps/dav/lib/carddav/plugin.php +++ b/apps/dav/lib/carddav/plugin.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/carddav/sharing/ishareableaddressbook.php b/apps/dav/lib/carddav/sharing/ishareableaddressbook.php index 856a9ed18e6..8e348a90991 100644 --- a/apps/dav/lib/carddav/sharing/ishareableaddressbook.php +++ b/apps/dav/lib/carddav/sharing/ishareableaddressbook.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CardDAV\Sharing; use Sabre\CardDAV\IAddressBook; diff --git a/apps/dav/lib/carddav/sharing/plugin.php b/apps/dav/lib/carddav/sharing/plugin.php index fd415b4566b..7ad3f43dca8 100644 --- a/apps/dav/lib/carddav/sharing/plugin.php +++ b/apps/dav/lib/carddav/sharing/plugin.php @@ -1,5 +1,24 @@ <?php - +/** + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CardDAV\Sharing; use OCA\DAV\Connector\Sabre\Auth; diff --git a/apps/dav/lib/carddav/sharing/xml/sharerequest.php b/apps/dav/lib/carddav/sharing/xml/sharerequest.php index 175c5ffc306..6be6bd795a1 100644 --- a/apps/dav/lib/carddav/sharing/xml/sharerequest.php +++ b/apps/dav/lib/carddav/sharing/xml/sharerequest.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CardDAV\Sharing\Xml; use Sabre\Xml\Reader; diff --git a/apps/dav/lib/carddav/syncservice.php b/apps/dav/lib/carddav/syncservice.php new file mode 100644 index 00000000000..30dc78c4877 --- /dev/null +++ b/apps/dav/lib/carddav/syncservice.php @@ -0,0 +1,184 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @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\DAV\CardDAV; + +use Sabre\DAV\Client; +use Sabre\DAV\Xml\Response\MultiStatus; +use Sabre\DAV\Xml\Service; +use Sabre\HTTP\ClientException; + +class SyncService { + + /** @var CardDavBackend */ + private $backend; + + public function __construct(CardDavBackend $backend) { + $this->backend = $backend; + } + + /** + * @param string $url + * @param string $userName + * @param string $sharedSecret + * @param string $syncToken + * @param int $targetBookId + * @param string $targetPrincipal + * @param array $targetProperties + * @return string + */ + public function syncRemoteAddressBook($url, $userName, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) { + // 1. create addressbook + $book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties); + $addressBookId = $book['id']; + + // 2. query changes + $response = $this->requestSyncReport($url, $userName, $sharedSecret, $syncToken); + + // 3. apply changes + // TODO: use multi-get for download + foreach ($response['response'] as $resource => $status) { + $cardUri = basename($resource); + if (isset($status[200])) { + $vCard = $this->download($url, $sharedSecret, $resource); + $existingCard = $this->backend->getCard($addressBookId, $cardUri); + if ($existingCard === false) { + $this->backend->createCard($addressBookId, $cardUri, $vCard['body']); + } else { + $this->backend->updateCard($addressBookId, $cardUri, $vCard['body']); + } + } else { + $this->backend->deleteCard($addressBookId, $cardUri); + } + } + + return $response['token']; + } + + /** + * @param string $principal + * @param string $id + * @param array $properties + * @return array|null + * @throws \Sabre\DAV\Exception\BadRequest + */ + protected function ensureSystemAddressBookExists($principal, $id, $properties) { + $book = $this->backend->getAddressBooksByUri($id); + if (!is_null($book)) { + return $book; + } + $this->backend->createAddressBook($principal, $id, $properties); + + return $this->backend->getAddressBooksByUri($id); + } + + /** + * @param string $url + * @param string $userName + * @param string $sharedSecret + * @param string $syncToken + * @return array + */ + protected function requestSyncReport($url, $userName, $sharedSecret, $syncToken) { + $settings = [ + 'baseUri' => $url . '/', + 'userName' => $userName, + 'password' => $sharedSecret, + ]; + $client = new Client($settings); + $client->setThrowExceptions(true); + + $addressBookUrl = "remote.php/dav/addressbooks/system/system/system"; + $body = $this->buildSyncCollectionRequestBody($syncToken); + + $response = $client->request('REPORT', $addressBookUrl, $body, [ + 'Content-Type' => 'application/xml' + ]); + + $result = $this->parseMultiStatus($response['body']); + + return $result; + } + + /** + * @param string $url + * @param string $sharedSecret + * @param string $resourcePath + * @return array + */ + protected function download($url, $sharedSecret, $resourcePath) { + $settings = [ + 'baseUri' => $url, + 'userName' => 'system', + 'password' => $sharedSecret, + ]; + $client = new Client($settings); + $client->setThrowExceptions(true); + + $response = $client->request('GET', $resourcePath); + return $response; + } + + /** + * @param string|null $syncToken + * @return string + */ + private function buildSyncCollectionRequestBody($syncToken) { + + $dom = new \DOMDocument('1.0', 'UTF-8'); + $dom->formatOutput = true; + $root = $dom->createElementNS('DAV:', 'd:sync-collection'); + $sync = $dom->createElement('d:sync-token', $syncToken); + $prop = $dom->createElement('d:prop'); + $cont = $dom->createElement('d:getcontenttype'); + $etag = $dom->createElement('d:getetag'); + + $prop->appendChild($cont); + $prop->appendChild($etag); + $root->appendChild($sync); + $root->appendChild($prop); + $dom->appendChild($root); + $body = $dom->saveXML(); + + return $body; + } + + /** + * @param string $body + * @return array + * @throws \Sabre\Xml\ParseException + */ + private function parseMultiStatus($body) { + $xml = new Service(); + + /** @var MultiStatus $multiStatus */ + $multiStatus = $xml->expect('{DAV:}multistatus', $body); + + $result = []; + foreach ($multiStatus->getResponses() as $response) { + $result[$response->getHref()] = $response->getResponseProperties(); + } + + return ['response' => $result, 'token' => $multiStatus->getSyncToken()]; + } + + +} diff --git a/apps/dav/lib/carddav/useraddressbooks.php b/apps/dav/lib/carddav/useraddressbooks.php index 093cee0e1b2..734e3829e69 100644 --- a/apps/dav/lib/carddav/useraddressbooks.php +++ b/apps/dav/lib/carddav/useraddressbooks.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\CardDAV; class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome { diff --git a/apps/dav/lib/connector/publicauth.php b/apps/dav/lib/connector/publicauth.php index f37be41402a..3d800e88004 100644 --- a/apps/dav/lib/connector/publicauth.php +++ b/apps/dav/lib/connector/publicauth.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/appenabledplugin.php b/apps/dav/lib/connector/sabre/appenabledplugin.php index e70512d0fd1..cb061d6a309 100644 --- a/apps/dav/lib/connector/sabre/appenabledplugin.php +++ b/apps/dav/lib/connector/sabre/appenabledplugin.php @@ -2,9 +2,10 @@ /** * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/auth.php b/apps/dav/lib/connector/sabre/auth.php index 02b88390bad..cc679e44dbe 100644 --- a/apps/dav/lib/connector/sabre/auth.php +++ b/apps/dav/lib/connector/sabre/auth.php @@ -2,16 +2,16 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> - * @author Christian Seiler <christian@iwakd.de> * @author Jakob Sack <mail@jakobsack.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Markus Goetz <markus@woboq.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php b/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php index ed61f43a536..70d19cb7f2a 100644 --- a/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php +++ b/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php @@ -1,8 +1,9 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/copyetagheaderplugin.php b/apps/dav/lib/connector/sabre/copyetagheaderplugin.php index b33b208adad..49b6a7b2de7 100644 --- a/apps/dav/lib/connector/sabre/copyetagheaderplugin.php +++ b/apps/dav/lib/connector/sabre/copyetagheaderplugin.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/custompropertiesbackend.php b/apps/dav/lib/connector/sabre/custompropertiesbackend.php index ff35476319f..5946c9910d4 100644 --- a/apps/dav/lib/connector/sabre/custompropertiesbackend.php +++ b/apps/dav/lib/connector/sabre/custompropertiesbackend.php @@ -4,7 +4,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/directory.php b/apps/dav/lib/connector/sabre/directory.php index b602dd2f7b1..59e2ef3d2ec 100644 --- a/apps/dav/lib/connector/sabre/directory.php +++ b/apps/dav/lib/connector/sabre/directory.php @@ -10,7 +10,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/dummygetresponseplugin.php b/apps/dav/lib/connector/sabre/dummygetresponseplugin.php index 7c7a332fedd..b10d5aaab36 100644 --- a/apps/dav/lib/connector/sabre/dummygetresponseplugin.php +++ b/apps/dav/lib/connector/sabre/dummygetresponseplugin.php @@ -1,8 +1,9 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/exception/entitytoolarge.php b/apps/dav/lib/connector/sabre/exception/entitytoolarge.php index f5a7aa99c6d..d16e93bb637 100644 --- a/apps/dav/lib/connector/sabre/exception/entitytoolarge.php +++ b/apps/dav/lib/connector/sabre/exception/entitytoolarge.php @@ -4,7 +4,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/exception/filelocked.php b/apps/dav/lib/connector/sabre/exception/filelocked.php index 1e1585edbda..03ced0e81e2 100644 --- a/apps/dav/lib/connector/sabre/exception/filelocked.php +++ b/apps/dav/lib/connector/sabre/exception/filelocked.php @@ -3,9 +3,10 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Owen Winkler <a_github@midnightcircus.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/exception/forbidden.php b/apps/dav/lib/connector/sabre/exception/forbidden.php index 673958349f3..f2467e6b298 100644 --- a/apps/dav/lib/connector/sabre/exception/forbidden.php +++ b/apps/dav/lib/connector/sabre/exception/forbidden.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/exception/invalidpath.php b/apps/dav/lib/connector/sabre/exception/invalidpath.php index 608e427a5aa..7951a0a89b7 100644 --- a/apps/dav/lib/connector/sabre/exception/invalidpath.php +++ b/apps/dav/lib/connector/sabre/exception/invalidpath.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php b/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php index 96b9b8332de..99e3c222c75 100644 --- a/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php +++ b/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php @@ -4,7 +4,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/exceptionloggerplugin.php b/apps/dav/lib/connector/sabre/exceptionloggerplugin.php index 64ec5cfda82..b514a917556 100644 --- a/apps/dav/lib/connector/sabre/exceptionloggerplugin.php +++ b/apps/dav/lib/connector/sabre/exceptionloggerplugin.php @@ -5,7 +5,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/fakelockerplugin.php b/apps/dav/lib/connector/sabre/fakelockerplugin.php index b75e7f137d8..f585a74444f 100644 --- a/apps/dav/lib/connector/sabre/fakelockerplugin.php +++ b/apps/dav/lib/connector/sabre/fakelockerplugin.php @@ -1,8 +1,10 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/file.php b/apps/dav/lib/connector/sabre/file.php index 6a0a39d04e7..4075c565f43 100644 --- a/apps/dav/lib/connector/sabre/file.php +++ b/apps/dav/lib/connector/sabre/file.php @@ -3,17 +3,18 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Jakob Sack <mail@jakobsack.de> + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Owen Winkler <a_github@midnightcircus.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/filesplugin.php b/apps/dav/lib/connector/sabre/filesplugin.php index aa756281745..ef139eae94a 100644 --- a/apps/dav/lib/connector/sabre/filesplugin.php +++ b/apps/dav/lib/connector/sabre/filesplugin.php @@ -3,11 +3,12 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/listenerplugin.php b/apps/dav/lib/connector/sabre/listenerplugin.php deleted file mode 100644 index d537d0577c6..00000000000 --- a/apps/dav/lib/connector/sabre/listenerplugin.php +++ /dev/null @@ -1,68 +0,0 @@ -<?php -/** - * @author Joas Schilling <nickvergessen@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\DAV\Connector\Sabre; - -use OCP\AppFramework\Http; -use OCP\SabrePluginEvent; -use OCP\SabrePluginException; -use Sabre\DAV\ServerPlugin; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; - -class ListenerPlugin extends ServerPlugin { - /** @var EventDispatcherInterface */ - protected $dispatcher; - - /** - * @param EventDispatcherInterface $dispatcher - */ - public function __construct(EventDispatcherInterface $dispatcher) { - $this->dispatcher = $dispatcher; - } - - /** - * This initialize the plugin - * - * @param \Sabre\DAV\Server $server - */ - public function initialize(\Sabre\DAV\Server $server) { - $server->on('beforeMethod', array($this, 'emitListener'), 15); - } - - /** - * This method is called before any HTTP method and returns http status code 503 - * in case the system is in maintenance mode. - * - * @return bool - * @throws \Exception - */ - public function emitListener() { - $event = new SabrePluginEvent(); - - $this->dispatcher->dispatch('OCA\DAV\Connector\Sabre::beforeMethod', $event); - - if ($event->getStatusCode() !== Http::STATUS_OK) { - throw new SabrePluginException($event->getMessage(), $event->getStatusCode()); - } - - return true; - } -} diff --git a/apps/dav/lib/connector/sabre/lockplugin.php b/apps/dav/lib/connector/sabre/lockplugin.php index d770b141eb9..ff4e1dc01bb 100644 --- a/apps/dav/lib/connector/sabre/lockplugin.php +++ b/apps/dav/lib/connector/sabre/lockplugin.php @@ -1,8 +1,10 @@ <?php /** * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/maintenanceplugin.php b/apps/dav/lib/connector/sabre/maintenanceplugin.php index b9b261fbe05..6e9a5930b78 100644 --- a/apps/dav/lib/connector/sabre/maintenanceplugin.php +++ b/apps/dav/lib/connector/sabre/maintenanceplugin.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/connector/sabre/node.php index c4e0614077f..64e9ec9d2b7 100644 --- a/apps/dav/lib/connector/sabre/node.php +++ b/apps/dav/lib/connector/sabre/node.php @@ -8,10 +8,11 @@ * @author Markus Goetz <markus@woboq.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/objecttree.php b/apps/dav/lib/connector/sabre/objecttree.php index 809d202aea4..ba4c855f58a 100644 --- a/apps/dav/lib/connector/sabre/objecttree.php +++ b/apps/dav/lib/connector/sabre/objecttree.php @@ -1,12 +1,13 @@ <?php /** * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/principal.php b/apps/dav/lib/connector/sabre/principal.php index c917b11225a..ece799c7019 100644 --- a/apps/dav/lib/connector/sabre/principal.php +++ b/apps/dav/lib/connector/sabre/principal.php @@ -1,17 +1,16 @@ <?php /** * @author Bart Visscher <bartv@thisnet.nl> - * @author Felix Moeller <mail@felixmoeller.de> * @author Jakob Sack <mail@jakobsack.de> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Sebastian Döll <sebastian.doell@libasys.de> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/quotaplugin.php b/apps/dav/lib/connector/sabre/quotaplugin.php index 8340d489dc0..a02827da499 100644 --- a/apps/dav/lib/connector/sabre/quotaplugin.php +++ b/apps/dav/lib/connector/sabre/quotaplugin.php @@ -3,13 +3,13 @@ * @author Felix Moeller <mail@felixmoeller.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author scambra <sergio@entrecables.com> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/server.php b/apps/dav/lib/connector/sabre/server.php index eafe1b537f8..421fc64422d 100644 --- a/apps/dav/lib/connector/sabre/server.php +++ b/apps/dav/lib/connector/sabre/server.php @@ -5,7 +5,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/serverfactory.php b/apps/dav/lib/connector/sabre/serverfactory.php index 0f0377e96bd..88e7e9a545f 100644 --- a/apps/dav/lib/connector/sabre/serverfactory.php +++ b/apps/dav/lib/connector/sabre/serverfactory.php @@ -1,9 +1,11 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -30,8 +32,6 @@ use OCP\IRequest; use OCP\ITagManager; use OCP\IUserSession; use Sabre\DAV\Auth\Backend\BackendInterface; -use Sabre\DAV\Locks\Plugin; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; class ServerFactory { /** @var IConfig */ @@ -46,8 +46,6 @@ class ServerFactory { private $mountManager; /** @var ITagManager */ private $tagManager; - /** @var EventDispatcherInterface */ - private $dispatcher; /** @var IRequest */ private $request; @@ -58,7 +56,6 @@ class ServerFactory { * @param IUserSession $userSession * @param IMountManager $mountManager * @param ITagManager $tagManager - * @param EventDispatcherInterface $dispatcher * @param IRequest $request */ public function __construct( @@ -68,7 +65,6 @@ class ServerFactory { IUserSession $userSession, IMountManager $mountManager, ITagManager $tagManager, - EventDispatcherInterface $dispatcher, IRequest $request ) { $this->config = $config; @@ -77,7 +73,6 @@ class ServerFactory { $this->userSession = $userSession; $this->mountManager = $mountManager; $this->tagManager = $tagManager; - $this->dispatcher = $dispatcher; $this->request = $request; } @@ -108,7 +103,6 @@ class ServerFactory { $server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin()); $server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger)); $server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin()); - $server->addPlugin(new \OCA\DAV\Connector\Sabre\ListenerPlugin($this->dispatcher)); // Finder on OS X requires Class 2 WebDAV support (locking), since we do // not provide locking we emulate it using a fake locking plugin. if($this->request->isUserAgent(['/WebDAVFS/'])) { diff --git a/apps/dav/lib/connector/sabre/taglist.php b/apps/dav/lib/connector/sabre/taglist.php index 1b32d4b1047..fda3aa04ecd 100644 --- a/apps/dav/lib/connector/sabre/taglist.php +++ b/apps/dav/lib/connector/sabre/taglist.php @@ -1,9 +1,10 @@ <?php /** * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/connector/sabre/tagsplugin.php b/apps/dav/lib/connector/sabre/tagsplugin.php index 778d43f1b3a..c26efe2f998 100644 --- a/apps/dav/lib/connector/sabre/tagsplugin.php +++ b/apps/dav/lib/connector/sabre/tagsplugin.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/dav/groupprincipalbackend.php b/apps/dav/lib/dav/groupprincipalbackend.php index 156dc2c1285..34c00b7927e 100644 --- a/apps/dav/lib/dav/groupprincipalbackend.php +++ b/apps/dav/lib/dav/groupprincipalbackend.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\DAV; use OCP\IGroup; diff --git a/apps/dav/lib/dav/systemprincipalbackend.php b/apps/dav/lib/dav/systemprincipalbackend.php index f65cd8bfc36..8001ec4e6c6 100644 --- a/apps/dav/lib/dav/systemprincipalbackend.php +++ b/apps/dav/lib/dav/systemprincipalbackend.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/files/custompropertiesbackend.php b/apps/dav/lib/files/custompropertiesbackend.php index 83776997a52..96082331cff 100644 --- a/apps/dav/lib/files/custompropertiesbackend.php +++ b/apps/dav/lib/files/custompropertiesbackend.php @@ -1,11 +1,8 @@ <?php /** - * @author Lukas Reschke <lukas@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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/files/fileshome.php b/apps/dav/lib/files/fileshome.php index 5e145a2b002..d56b95881c3 100644 --- a/apps/dav/lib/files/fileshome.php +++ b/apps/dav/lib/files/fileshome.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Files; use OCA\DAV\Connector\Sabre\Directory; diff --git a/apps/dav/lib/files/rootcollection.php b/apps/dav/lib/files/rootcollection.php index bbe3c784a53..63328aac8e3 100644 --- a/apps/dav/lib/files/rootcollection.php +++ b/apps/dav/lib/files/rootcollection.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Files; use Sabre\DAVACL\AbstractPrincipalCollection; diff --git a/apps/dav/lib/rootcollection.php b/apps/dav/lib/rootcollection.php index 2261712200a..8e0e0c6b86f 100644 --- a/apps/dav/lib/rootcollection.php +++ b/apps/dav/lib/rootcollection.php @@ -1,5 +1,24 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV; use OCA\DAV\CalDAV\CalDavBackend; @@ -46,11 +65,11 @@ class RootCollection extends SimpleCollection { \OC::$server->getSystemTagObjectMapper() ); - $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, \OC::$server->getLogger()); + $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend); $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users'); $usersAddressBookRoot->disableListing = $disableListing; - $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, \OC::$server->getLogger()); + $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend); $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system'); $systemAddressBookRoot->disableListing = $disableListing; diff --git a/apps/dav/lib/server.php b/apps/dav/lib/server.php index a6ad878d29f..78867ad2f4e 100644 --- a/apps/dav/lib/server.php +++ b/apps/dav/lib/server.php @@ -1,12 +1,34 @@ <?php - +/** + * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV; use OCA\DAV\CalDAV\Schedule\IMipPlugin; +use OCA\DAV\Connector\FedAuth; use OCA\DAV\Connector\Sabre\Auth; use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin; use OCA\DAV\Files\CustomPropertiesBackend; use OCP\IRequest; +use OCP\SabrePluginEvent; use Sabre\DAV\Auth\Plugin; class Server { @@ -18,8 +40,8 @@ class Server { $this->request = $request; $this->baseUri = $baseUri; $logger = \OC::$server->getLogger(); - $dispatcher = \OC::$server->getEventDispatcher(); $mailer = \OC::$server->getMailer(); + $dispatcher = \OC::$server->getEventDispatcher(); $root = new RootCollection(); $this->server = new \OCA\DAV\Connector\Sabre\Server($root); @@ -35,11 +57,16 @@ class Server { $this->server->setBaseUri($this->baseUri); $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig())); - $this->server->addPlugin(new Plugin($authBackend, 'ownCloud')); + $authPlugin = new Plugin($authBackend, 'ownCloud'); + $this->server->addPlugin($authPlugin); + + // allow setup of additional auth backends + $event = new SabrePluginEvent($this->server); + $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event); + $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin()); $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger)); $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin()); - $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ListenerPlugin($dispatcher)); $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin()); // acl diff --git a/apps/dav/lib/systemtag/systemtagmappingnode.php b/apps/dav/lib/systemtag/systemtagmappingnode.php index cbf8542a4fd..6911634975b 100644 --- a/apps/dav/lib/systemtag/systemtagmappingnode.php +++ b/apps/dav/lib/systemtag/systemtagmappingnode.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/systemtag/systemtagnode.php b/apps/dav/lib/systemtag/systemtagnode.php index 7ab4a8a14f4..eff1199a43c 100644 --- a/apps/dav/lib/systemtag/systemtagnode.php +++ b/apps/dav/lib/systemtag/systemtagnode.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/systemtag/systemtagplugin.php b/apps/dav/lib/systemtag/systemtagplugin.php index 51db0632549..2cab9ba8d50 100644 --- a/apps/dav/lib/systemtag/systemtagplugin.php +++ b/apps/dav/lib/systemtag/systemtagplugin.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/systemtag/systemtagsbyidcollection.php b/apps/dav/lib/systemtag/systemtagsbyidcollection.php index 974d04efa5f..5df3d3f8310 100644 --- a/apps/dav/lib/systemtag/systemtagsbyidcollection.php +++ b/apps/dav/lib/systemtag/systemtagsbyidcollection.php @@ -1,8 +1,10 @@ <?php /** + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php b/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php index 89e8620614b..3d683454673 100644 --- a/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php +++ b/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php @@ -2,7 +2,7 @@ /** * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php b/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php index 2a28b9c83aa..949c7df9fee 100644 --- a/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php +++ b/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php @@ -1,8 +1,10 @@ <?php /** + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/systemtag/systemtagsrelationscollection.php b/apps/dav/lib/systemtag/systemtagsrelationscollection.php index 44069bca02c..7d3d9ed75b1 100644 --- a/apps/dav/lib/systemtag/systemtagsrelationscollection.php +++ b/apps/dav/lib/systemtag/systemtagsrelationscollection.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/appinfo/applicationtest.php b/apps/dav/tests/unit/appinfo/applicationtest.php new file mode 100644 index 00000000000..36a75212ff5 --- /dev/null +++ b/apps/dav/tests/unit/appinfo/applicationtest.php @@ -0,0 +1,51 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\AppInfo; + +use OCA\Dav\AppInfo\Application; +use OCP\Contacts\IManager; +use Test\TestCase; + +/** + * Class ApplicationTest + * + * @group DB + * + * @package OCA\DAV\Tests\Unit\AppInfo + */ +class ApplicationTest extends TestCase { + public function test() { + $app = new Application(); + + // assert service instances in the container are properly setup + $s = $app->getContainer()->query('ContactsManager'); + $this->assertInstanceOf('OCA\DAV\CardDAV\ContactsManager', $s); + $s = $app->getContainer()->query('CardDavBackend'); + $this->assertInstanceOf('OCA\DAV\CardDAV\CardDavBackend', $s); + + // assert setupContactsProvider() is proper + /** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */ + $cm = $this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock(); + $app->setupContactsProvider($cm, 'user01'); + $this->assertTrue(true); + } +} diff --git a/apps/dav/tests/unit/bootstrap.php b/apps/dav/tests/unit/bootstrap.php index b6ea48ec903..f6733bc7a3e 100644 --- a/apps/dav/tests/unit/bootstrap.php +++ b/apps/dav/tests/unit/bootstrap.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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/> + * + */ if (!defined('PHPUNIT_RUN')) { define('PHPUNIT_RUN', 1); } diff --git a/apps/dav/tests/unit/caldav/caldavbackendtest.php b/apps/dav/tests/unit/caldav/caldavbackendtest.php index e9483a47a78..939fd36fba8 100644 --- a/apps/dav/tests/unit/caldav/caldavbackendtest.php +++ b/apps/dav/tests/unit/caldav/caldavbackendtest.php @@ -1,8 +1,8 @@ <?php /** - * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/caldav/schedule/imipplugintest.php b/apps/dav/tests/unit/caldav/schedule/imipplugintest.php index 49059e93aef..fcbf4fde04c 100644 --- a/apps/dav/tests/unit/caldav/schedule/imipplugintest.php +++ b/apps/dav/tests/unit/caldav/schedule/imipplugintest.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/carddav/addressbookimpltest.php b/apps/dav/tests/unit/carddav/addressbookimpltest.php index 73053888b9d..ff7b982abd4 100644 --- a/apps/dav/tests/unit/carddav/addressbookimpltest.php +++ b/apps/dav/tests/unit/carddav/addressbookimpltest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/carddav/carddavbackendtest.php b/apps/dav/tests/unit/carddav/carddavbackendtest.php index fe01aa65cca..3841d1904ab 100644 --- a/apps/dav/tests/unit/carddav/carddavbackendtest.php +++ b/apps/dav/tests/unit/carddav/carddavbackendtest.php @@ -1,8 +1,10 @@ <?php /** - * @author Lukas Reschke <lukas@owncloud.com> + * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Björn Schießle <schiessle@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -45,9 +47,6 @@ class CardDavBackendTest extends TestCase { /** @var Principal | \PHPUnit_Framework_MockObject_MockObject */ private $principal; - /** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */ - private $logger; - /** @var IDBConnection */ private $db; @@ -70,11 +69,10 @@ class CardDavBackendTest extends TestCase { ->willReturn([ 'uri' => 'principals/best-friend' ]); - $this->logger = $this->getMock('\OCP\ILogger'); $this->db = \OC::$server->getDatabaseConnection(); - $this->backend = new CardDavBackend($this->db, $this->principal, $this->logger); + $this->backend = new CardDavBackend($this->db, $this->principal); // start every test with a empty cards_properties and cards table $query = $this->db->getQueryBuilder(); @@ -129,7 +127,7 @@ class CardDavBackendTest extends TestCase { /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') - ->setConstructorArgs([$this->db, $this->principal, $this->logger]) + ->setConstructorArgs([$this->db, $this->principal]) ->setMethods(['updateProperties', 'purgeProperties'])->getMock(); // create a new address book @@ -175,7 +173,7 @@ class CardDavBackendTest extends TestCase { public function testMultiCard() { $this->backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') - ->setConstructorArgs([$this->db, $this->principal, $this->logger]) + ->setConstructorArgs([$this->db, $this->principal]) ->setMethods(['updateProperties'])->getMock(); // create a new address book @@ -222,7 +220,7 @@ class CardDavBackendTest extends TestCase { public function testSyncSupport() { $this->backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') - ->setConstructorArgs([$this->db, $this->principal, $this->logger]) + ->setConstructorArgs([$this->db, $this->principal]) ->setMethods(['updateProperties'])->getMock(); // create a new address book @@ -279,7 +277,7 @@ class CardDavBackendTest extends TestCase { $cardId = 2; $backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') - ->setConstructorArgs([$this->db, $this->principal, $this->logger]) + ->setConstructorArgs([$this->db, $this->principal]) ->setMethods(['getCardId'])->getMock(); $backend->expects($this->any())->method('getCardId')->willReturn($cardId); diff --git a/apps/dav/tests/unit/carddav/contactsmanagertest.php b/apps/dav/tests/unit/carddav/contactsmanagertest.php new file mode 100644 index 00000000000..c4ec4c29e39 --- /dev/null +++ b/apps/dav/tests/unit/carddav/contactsmanagertest.php @@ -0,0 +1,43 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\CardDAV; + +use OCA\DAV\CardDAV\CardDavBackend; +use OCA\DAV\CardDAV\ContactsManager; +use OCP\Contacts\IManager; +use Test\TestCase; + +class ContactsManagerTest extends TestCase { + public function test() { + /** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */ + $cm = $this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock(); + $cm->expects($this->once())->method('registerAddressBook'); + /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backEnd */ + $backEnd = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')->disableOriginalConstructor()->getMock(); + $backEnd->method('getAddressBooksForUser')->willReturn([ + [] + ]); + + $app = new ContactsManager($backEnd); + $app->setupContactsProvider($cm, 'user01'); + } +} diff --git a/apps/dav/tests/unit/carddav/convertertest.php b/apps/dav/tests/unit/carddav/convertertest.php index bae7e383f9a..52393616b3c 100644 --- a/apps/dav/tests/unit/carddav/convertertest.php +++ b/apps/dav/tests/unit/carddav/convertertest.php @@ -1,8 +1,9 @@ <?php /** + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/carddav/sharing/plugintest.php b/apps/dav/tests/unit/carddav/sharing/plugintest.php index e9532acbe3b..3dce0fb6083 100644 --- a/apps/dav/tests/unit/carddav/sharing/plugintest.php +++ b/apps/dav/tests/unit/carddav/sharing/plugintest.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/carddav/syncservicetest.php b/apps/dav/tests/unit/carddav/syncservicetest.php new file mode 100644 index 00000000000..a6a773babc2 --- /dev/null +++ b/apps/dav/tests/unit/carddav/syncservicetest.php @@ -0,0 +1,92 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @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\DAV\CardDAV; + +use Test\TestCase; + +class SyncServiceTest extends TestCase { + public function testEmptySync() { + $backend = $this->getBackendMock(0, 0, 0); + + $ss = $this->getSyncServiceMock($backend, []); + $return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []); + $this->assertEquals('sync-token-1', $return); + } + + public function testSyncWithNewElement() { + $backend = $this->getBackendMock(1, 0, 0); + $backend->method('getCard')->willReturn(false); + + $ss = $this->getSyncServiceMock($backend, ['0' => [200 => '']]); + $return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []); + $this->assertEquals('sync-token-1', $return); + } + + public function testSyncWithUpdatedElement() { + $backend = $this->getBackendMock(0, 1, 0); + $backend->method('getCard')->willReturn(true); + + $ss = $this->getSyncServiceMock($backend, ['0' => [200 => '']]); + $return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []); + $this->assertEquals('sync-token-1', $return); + } + + public function testSyncWithDeletedElement() { + $backend = $this->getBackendMock(0, 0, 1); + + $ss = $this->getSyncServiceMock($backend, ['0' => [404 => '']]); + $return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []); + $this->assertEquals('sync-token-1', $return); + } + + /** + * @param int $createCount + * @param int $updateCount + * @param int $deleteCount + * @return \PHPUnit_Framework_MockObject_MockObject + */ + private function getBackendMock($createCount, $updateCount, $deleteCount) { + $backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDAVBackend')->disableOriginalConstructor()->getMock(); + $backend->expects($this->exactly($createCount))->method('createCard'); + $backend->expects($this->exactly($updateCount))->method('updateCard'); + $backend->expects($this->exactly($deleteCount))->method('deleteCard'); + return $backend; + } + + /** + * @param $backend + * @param $response + * @return SyncService|\PHPUnit_Framework_MockObject_MockObject + */ + private function getSyncServiceMock($backend, $response) { + /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $ss */ + $ss = $this->getMock('OCA\DAV\CardDAV\SyncService', ['ensureSystemAddressBookExists', 'requestSyncReport', 'download'], [$backend]); + $ss->method('requestSyncReport')->withAnyParameters()->willReturn(['response' => $response, 'token' => 'sync-token-1']); + $ss->method('ensureSystemAddressBookExists')->willReturn(['id' => 1]); + $ss->method('download')->willReturn([ + 'body' => '', + 'statusCode' => 200, + 'headers' => [] + ]); + return $ss; + } + +} diff --git a/apps/dav/tests/unit/connector/sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/connector/sabre/BlockLegacyClientPluginTest.php index 3004c03b266..d02064531ab 100644 --- a/apps/dav/tests/unit/connector/sabre/BlockLegacyClientPluginTest.php +++ b/apps/dav/tests/unit/connector/sabre/BlockLegacyClientPluginTest.php @@ -1,8 +1,9 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/connector/sabre/DummyGetResponsePluginTest.php b/apps/dav/tests/unit/connector/sabre/DummyGetResponsePluginTest.php index d2d4a849a51..0ead617f461 100644 --- a/apps/dav/tests/unit/connector/sabre/DummyGetResponsePluginTest.php +++ b/apps/dav/tests/unit/connector/sabre/DummyGetResponsePluginTest.php @@ -1,8 +1,9 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/connector/sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/connector/sabre/FakeLockerPluginTest.php index 8539e9c06ee..30d2bf41810 100644 --- a/apps/dav/tests/unit/connector/sabre/FakeLockerPluginTest.php +++ b/apps/dav/tests/unit/connector/sabre/FakeLockerPluginTest.php @@ -1,8 +1,9 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/connector/sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/connector/sabre/MaintenancePluginTest.php index 34fa7f7eef9..dea1e64db1d 100644 --- a/apps/dav/tests/unit/connector/sabre/MaintenancePluginTest.php +++ b/apps/dav/tests/unit/connector/sabre/MaintenancePluginTest.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/connector/sabre/auth.php b/apps/dav/tests/unit/connector/sabre/auth.php index 5e1cdfb03d8..5ff736664f3 100644 --- a/apps/dav/tests/unit/connector/sabre/auth.php +++ b/apps/dav/tests/unit/connector/sabre/auth.php @@ -1,8 +1,11 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/connector/sabre/copyetagheaderplugintest.php b/apps/dav/tests/unit/connector/sabre/copyetagheaderplugintest.php index 74dd4edd8cf..7f6fb26e4d1 100644 --- a/apps/dav/tests/unit/connector/sabre/copyetagheaderplugintest.php +++ b/apps/dav/tests/unit/connector/sabre/copyetagheaderplugintest.php @@ -1,5 +1,24 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; /** diff --git a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php b/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php index 1a973a28ed4..e0ba61e9134 100644 --- a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php +++ b/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php @@ -1,5 +1,24 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; /** diff --git a/apps/dav/tests/unit/connector/sabre/directory.php b/apps/dav/tests/unit/connector/sabre/directory.php index 75c4828641b..317e089925b 100644 --- a/apps/dav/tests/unit/connector/sabre/directory.php +++ b/apps/dav/tests/unit/connector/sabre/directory.php @@ -1,10 +1,25 @@ <?php - /** - * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; diff --git a/apps/dav/tests/unit/connector/sabre/exception/forbiddentest.php b/apps/dav/tests/unit/connector/sabre/exception/forbiddentest.php index 19799c71b9e..36ea97df9f7 100644 --- a/apps/dav/tests/unit/connector/sabre/exception/forbiddentest.php +++ b/apps/dav/tests/unit/connector/sabre/exception/forbiddentest.php @@ -1,9 +1,22 @@ <?php /** - * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Joas Schilling <nickvergessen@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\Exception; diff --git a/apps/dav/tests/unit/connector/sabre/exception/invalidpathtest.php b/apps/dav/tests/unit/connector/sabre/exception/invalidpathtest.php index 4296a4d5618..431a0484d65 100644 --- a/apps/dav/tests/unit/connector/sabre/exception/invalidpathtest.php +++ b/apps/dav/tests/unit/connector/sabre/exception/invalidpathtest.php @@ -1,9 +1,23 @@ <?php /** - * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\Exception; diff --git a/apps/dav/tests/unit/connector/sabre/exceptionloggerplugin.php b/apps/dav/tests/unit/connector/sabre/exceptionloggerplugin.php index 0c364df012b..b76285be336 100644 --- a/apps/dav/tests/unit/connector/sabre/exceptionloggerplugin.php +++ b/apps/dav/tests/unit/connector/sabre/exceptionloggerplugin.php @@ -1,10 +1,22 @@ <?php - /** - * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; diff --git a/apps/dav/tests/unit/connector/sabre/file.php b/apps/dav/tests/unit/connector/sabre/file.php index ad4c1d29ed4..c1c162f1373 100644 --- a/apps/dav/tests/unit/connector/sabre/file.php +++ b/apps/dav/tests/unit/connector/sabre/file.php @@ -1,9 +1,26 @@ <?php /** - * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; diff --git a/apps/dav/tests/unit/connector/sabre/filesplugin.php b/apps/dav/tests/unit/connector/sabre/filesplugin.php index 642fc3258cd..cbc847ebdb8 100644 --- a/apps/dav/tests/unit/connector/sabre/filesplugin.php +++ b/apps/dav/tests/unit/connector/sabre/filesplugin.php @@ -1,5 +1,26 @@ <?php - +/** + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; use OCP\Files\StorageNotAvailableException; diff --git a/apps/dav/tests/unit/connector/sabre/node.php b/apps/dav/tests/unit/connector/sabre/node.php index cee64fb7dff..dfbd95bfad8 100644 --- a/apps/dav/tests/unit/connector/sabre/node.php +++ b/apps/dav/tests/unit/connector/sabre/node.php @@ -1,10 +1,24 @@ <?php - /** - * Copyright (c) 2014 Thomas Müller <thomas.mueller@tmit.eu> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; diff --git a/apps/dav/tests/unit/connector/sabre/objecttree.php b/apps/dav/tests/unit/connector/sabre/objecttree.php index 6164b96c986..e5e858ef17b 100644 --- a/apps/dav/tests/unit/connector/sabre/objecttree.php +++ b/apps/dav/tests/unit/connector/sabre/objecttree.php @@ -1,9 +1,26 @@ <?php /** - * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @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> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; diff --git a/apps/dav/tests/unit/connector/sabre/principal.php b/apps/dav/tests/unit/connector/sabre/principal.php index 160d5744260..e0b459495b6 100644 --- a/apps/dav/tests/unit/connector/sabre/principal.php +++ b/apps/dav/tests/unit/connector/sabre/principal.php @@ -1,11 +1,24 @@ <?php /** - * @author Lukas Reschke - * @copyright 2014 Lukas Reschke lukas@owncloud.com + * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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/> * - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. */ namespace OCA\DAV\Tests\Unit\Connector\Sabre; diff --git a/apps/dav/tests/unit/connector/sabre/quotaplugin.php b/apps/dav/tests/unit/connector/sabre/quotaplugin.php index 470fd9cbf85..cc4339ecc1a 100644 --- a/apps/dav/tests/unit/connector/sabre/quotaplugin.php +++ b/apps/dav/tests/unit/connector/sabre/quotaplugin.php @@ -1,5 +1,25 @@ <?php - +/** + * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; /** * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu> diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/auth.php b/apps/dav/tests/unit/connector/sabre/requesttest/auth.php index 3caa019af8d..b728a8f3bd8 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/auth.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/auth.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 Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\RequestTest; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php index 29454c38218..3d047399a1f 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.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 Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\RequestTest; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php index b79dfa0c265..c5c6d0da0c2 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.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 Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\RequestTest; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/exceptionplugin.php b/apps/dav/tests/unit/connector/sabre/requesttest/exceptionplugin.php index 53cd186bbc8..a6a0f9d3b86 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/exceptionplugin.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/exceptionplugin.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 Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\RequestTest; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php b/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php index a83f25c1585..e3cdca5abfa 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php @@ -1,9 +1,25 @@ <?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 Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\RequestTest; @@ -46,7 +62,6 @@ abstract class RequestTest extends TestCase { \OC::$server->getUserSession(), \OC::$server->getMountManager(), \OC::$server->getTagManager(), - \OC::$server->getEventDispatcher(), $this->getMock('\OCP\IRequest') ); } diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/sapi.php b/apps/dav/tests/unit/connector/sabre/requesttest/sapi.php index 3af94010288..6407d9bc28b 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/sapi.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/sapi.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 Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\RequestTest; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php index c1876a7f29f..ae30268e366 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.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 Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre\RequestTest; diff --git a/apps/dav/tests/unit/connector/sabre/tagsplugin.php b/apps/dav/tests/unit/connector/sabre/tagsplugin.php index f1f6cc40dab..95ba002e393 100644 --- a/apps/dav/tests/unit/connector/sabre/tagsplugin.php +++ b/apps/dav/tests/unit/connector/sabre/tagsplugin.php @@ -1,5 +1,24 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\Connector\Sabre; /** diff --git a/apps/dav/tests/unit/dav/groupprincipaltest.php b/apps/dav/tests/unit/dav/groupprincipaltest.php index bb1bd2526ed..9d012639310 100644 --- a/apps/dav/tests/unit/dav/groupprincipaltest.php +++ b/apps/dav/tests/unit/dav/groupprincipaltest.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\DAV; use OCA\DAV\DAV\GroupPrincipalBackend; diff --git a/apps/dav/tests/unit/dav/systemprincipalbackendtest.php b/apps/dav/tests/unit/dav/systemprincipalbackendtest.php index 96b1a8592c2..26717f7509b 100644 --- a/apps/dav/tests/unit/dav/systemprincipalbackendtest.php +++ b/apps/dav/tests/unit/dav/systemprincipalbackendtest.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/systemtag/systemtagmappingnode.php b/apps/dav/tests/unit/systemtag/systemtagmappingnode.php index aef62a1acb2..14661302d47 100644 --- a/apps/dav/tests/unit/systemtag/systemtagmappingnode.php +++ b/apps/dav/tests/unit/systemtag/systemtagmappingnode.php @@ -1,9 +1,22 @@ <?php /** - * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\SystemTag; diff --git a/apps/dav/tests/unit/systemtag/systemtagnode.php b/apps/dav/tests/unit/systemtag/systemtagnode.php index a43dda3025d..1407d2274f9 100644 --- a/apps/dav/tests/unit/systemtag/systemtagnode.php +++ b/apps/dav/tests/unit/systemtag/systemtagnode.php @@ -1,9 +1,22 @@ <?php /** - * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\SystemTag; diff --git a/apps/dav/tests/unit/systemtag/systemtagplugin.php b/apps/dav/tests/unit/systemtag/systemtagplugin.php index 48c9aa69f7b..e0fbd40f5b9 100644 --- a/apps/dav/tests/unit/systemtag/systemtagplugin.php +++ b/apps/dav/tests/unit/systemtag/systemtagplugin.php @@ -1,9 +1,22 @@ <?php /** - * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\SystemTag; @@ -34,7 +47,7 @@ class SystemTagPlugin extends \Test\TestCase { private $tagManager; /** - * @var \OCA\DAV\Connector\Sabre\TagsPlugin + * @var \OCA\DAV\SystemTag\SystemTagPlugin */ private $plugin; diff --git a/apps/dav/tests/unit/systemtag/systemtagsbyidcollection.php b/apps/dav/tests/unit/systemtag/systemtagsbyidcollection.php index fa9e42d04f9..4ed54cfef6f 100644 --- a/apps/dav/tests/unit/systemtag/systemtagsbyidcollection.php +++ b/apps/dav/tests/unit/systemtag/systemtagsbyidcollection.php @@ -1,9 +1,22 @@ <?php /** - * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\SystemTag; diff --git a/apps/dav/tests/unit/systemtag/systemtagsobjectmappingcollection.php b/apps/dav/tests/unit/systemtag/systemtagsobjectmappingcollection.php index a9b34f5ae19..07998082c3b 100644 --- a/apps/dav/tests/unit/systemtag/systemtagsobjectmappingcollection.php +++ b/apps/dav/tests/unit/systemtag/systemtagsobjectmappingcollection.php @@ -1,9 +1,22 @@ <?php /** - * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\SystemTag; diff --git a/apps/dav/tests/unit/systemtag/systemtagsobjecttypecollection.php b/apps/dav/tests/unit/systemtag/systemtagsobjecttypecollection.php index 39223ff9122..ba63fad39aa 100644 --- a/apps/dav/tests/unit/systemtag/systemtagsobjecttypecollection.php +++ b/apps/dav/tests/unit/systemtag/systemtagsobjecttypecollection.php @@ -1,9 +1,22 @@ <?php /** - * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. + * @author Vincent Petry <pvince81@owncloud.com> + * + * @copyright Copyright (c) 2016, 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\DAV\Tests\Unit\SystemTag; diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php index 1f336c05a8c..7c684b563d8 100644 --- a/apps/encryption/appinfo/app.php +++ b/apps/encryption/appinfo/app.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php index 6275047252e..433e9e86284 100644 --- a/apps/encryption/appinfo/application.php +++ b/apps/encryption/appinfo/application.php @@ -4,7 +4,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php index 4987ef24d61..2bb49d55c2e 100644 --- a/apps/encryption/appinfo/register_command.php +++ b/apps/encryption/appinfo/register_command.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php index 260337361e8..2ceba7898e9 100644 --- a/apps/encryption/appinfo/routes.php +++ b/apps/encryption/appinfo/routes.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/command/enablemasterkey.php b/apps/encryption/command/enablemasterkey.php index f49579a3b81..fd86c221176 100644 --- a/apps/encryption/command/enablemasterkey.php +++ b/apps/encryption/command/enablemasterkey.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/command/migratekeys.php b/apps/encryption/command/migratekeys.php index 89e2aa01610..88d8d46973f 100644 --- a/apps/encryption/command/migratekeys.php +++ b/apps/encryption/command/migratekeys.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php index f1a2651443e..e4b02e004dc 100644 --- a/apps/encryption/controller/recoverycontroller.php +++ b/apps/encryption/controller/recoverycontroller.php @@ -4,7 +4,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php index 59e23087b3a..5c171a23aec 100644 --- a/apps/encryption/controller/settingscontroller.php +++ b/apps/encryption/controller/settingscontroller.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/controller/statuscontroller.php b/apps/encryption/controller/statuscontroller.php index 409fe1a258b..99fdc68c3d0 100644 --- a/apps/encryption/controller/statuscontroller.php +++ b/apps/encryption/controller/statuscontroller.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/hooks/contracts/ihook.php b/apps/encryption/hooks/contracts/ihook.php index d4f20700d78..4bf7ead8c15 100644 --- a/apps/encryption/hooks/contracts/ihook.php +++ b/apps/encryption/hooks/contracts/ihook.php @@ -2,7 +2,7 @@ /** * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/hooks/userhooks.php b/apps/encryption/hooks/userhooks.php index 4a5f1198fcf..3f84187bc1e 100644 --- a/apps/encryption/hooks/userhooks.php +++ b/apps/encryption/hooks/userhooks.php @@ -2,9 +2,10 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php index 12e9008545a..e387380cd95 100644 --- a/apps/encryption/lib/crypto/crypt.php +++ b/apps/encryption/lib/crypto/crypt.php @@ -4,9 +4,10 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/crypto/decryptall.php index 1daf3699d13..fa9a3e0db95 100644 --- a/apps/encryption/lib/crypto/decryptall.php +++ b/apps/encryption/lib/crypto/decryptall.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/crypto/encryptall.php b/apps/encryption/lib/crypto/encryptall.php index ef67523d7e2..18e93d2e120 100644 --- a/apps/encryption/lib/crypto/encryptall.php +++ b/apps/encryption/lib/crypto/encryptall.php @@ -1,8 +1,10 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -344,7 +346,7 @@ class EncryptAll { * @return string password */ protected function generateOneTimePassword($uid) { - $password = $this->secureRandom->getMediumStrengthGenerator()->generate(8); + $password = $this->secureRandom->generate(8); $this->userPasswords[$uid] = $password; return $password; } diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index ea6c05c338f..3b66684a7f4 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -5,9 +5,10 @@ * @author Jan-Christoph Borchardt <hey@jancborchardt.net> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/exceptions/multikeydecryptexception.php b/apps/encryption/lib/exceptions/multikeydecryptexception.php index 48b916ff1b8..59bea59344d 100644 --- a/apps/encryption/lib/exceptions/multikeydecryptexception.php +++ b/apps/encryption/lib/exceptions/multikeydecryptexception.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/exceptions/multikeyencryptexception.php b/apps/encryption/lib/exceptions/multikeyencryptexception.php index 197e06adbf3..bc0872ffdd2 100644 --- a/apps/encryption/lib/exceptions/multikeyencryptexception.php +++ b/apps/encryption/lib/exceptions/multikeyencryptexception.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/exceptions/privatekeymissingexception.php b/apps/encryption/lib/exceptions/privatekeymissingexception.php index 29db5a16641..fe162a8f5c4 100644 --- a/apps/encryption/lib/exceptions/privatekeymissingexception.php +++ b/apps/encryption/lib/exceptions/privatekeymissingexception.php @@ -4,7 +4,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/exceptions/publickeymissingexception.php b/apps/encryption/lib/exceptions/publickeymissingexception.php index 078add0369a..6fad4693dcc 100644 --- a/apps/encryption/lib/exceptions/publickeymissingexception.php +++ b/apps/encryption/lib/exceptions/publickeymissingexception.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/hookmanager.php b/apps/encryption/lib/hookmanager.php index ab059369333..a4269dca031 100644 --- a/apps/encryption/lib/hookmanager.php +++ b/apps/encryption/lib/hookmanager.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php index 8fa42be27fc..b6365cf2cce 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/keymanager.php @@ -2,9 +2,11 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> + * @author Lukas Reschke <lukas@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -386,16 +388,17 @@ class KeyManager { public function getFileKey($path, $uid) { $encryptedFileKey = $this->keyStorage->getFileKey($path, $this->fileKeyId, Encryption::ID); - if ($this->util->isMasterKeyEnabled()) { - $uid = $this->getMasterKeyId(); - } - if (is_null($uid)) { $uid = $this->getPublicShareKeyId(); $shareKey = $this->getShareKey($path, $uid); $privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.privateKey', Encryption::ID); $privateKey = $this->crypt->decryptPrivateKey($privateKey); } else { + + if ($this->util->isMasterKeyEnabled()) { + $uid = $this->getMasterKeyId(); + } + $shareKey = $this->getShareKey($path, $uid); $privateKey = $this->session->getPrivateKey(); } diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php index 7bc399ddcbe..1b79ddfe7f1 100644 --- a/apps/encryption/lib/migration.php +++ b/apps/encryption/lib/migration.php @@ -2,8 +2,10 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php index 98d8c79a40a..8833ea8f0ed 100644 --- a/apps/encryption/lib/recovery.php +++ b/apps/encryption/lib/recovery.php @@ -2,8 +2,10 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> + * @author Lukas Reschke <lukas@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/session.php b/apps/encryption/lib/session.php index 2c83319d71e..62cc09b018d 100644 --- a/apps/encryption/lib/session.php +++ b/apps/encryption/lib/session.php @@ -4,7 +4,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php index 99368cab080..0b5fb351aca 100644 --- a/apps/encryption/lib/users/setup.php +++ b/apps/encryption/lib/users/setup.php @@ -5,7 +5,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/util.php b/apps/encryption/lib/util.php index 62907f8a460..e87ed478a1a 100644 --- a/apps/encryption/lib/util.php +++ b/apps/encryption/lib/util.php @@ -2,8 +2,9 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> + * @author Phil Davis <phil.davis@inf.org> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php index 32640ef0661..c3d523f27da 100644 --- a/apps/encryption/settings/settings-admin.php +++ b/apps/encryption/settings/settings-admin.php @@ -2,9 +2,10 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php index 3815626ee64..2dff5904850 100644 --- a/apps/encryption/settings/settings-personal.php +++ b/apps/encryption/settings/settings-personal.php @@ -4,7 +4,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/command/testenablemasterkey.php b/apps/encryption/tests/command/testenablemasterkey.php index c905329269e..e408a7c2b14 100644 --- a/apps/encryption/tests/command/testenablemasterkey.php +++ b/apps/encryption/tests/command/testenablemasterkey.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/controller/RecoveryControllerTest.php b/apps/encryption/tests/controller/RecoveryControllerTest.php index 6c554c97ae9..a4349139896 100644 --- a/apps/encryption/tests/controller/RecoveryControllerTest.php +++ b/apps/encryption/tests/controller/RecoveryControllerTest.php @@ -2,7 +2,7 @@ /** * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/controller/SettingsControllerTest.php b/apps/encryption/tests/controller/SettingsControllerTest.php index 3b30e61a45b..61391a33002 100644 --- a/apps/encryption/tests/controller/SettingsControllerTest.php +++ b/apps/encryption/tests/controller/SettingsControllerTest.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/controller/StatusControllerTest.php b/apps/encryption/tests/controller/StatusControllerTest.php index b57fd1cc33e..3c937623b7a 100644 --- a/apps/encryption/tests/controller/StatusControllerTest.php +++ b/apps/encryption/tests/controller/StatusControllerTest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/hooks/UserHooksTest.php index ada0081f649..08d1981266c 100644 --- a/apps/encryption/tests/hooks/UserHooksTest.php +++ b/apps/encryption/tests/hooks/UserHooksTest.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/HookManagerTest.php b/apps/encryption/tests/lib/HookManagerTest.php index 288b27b5d8b..d69674faec0 100644 --- a/apps/encryption/tests/lib/HookManagerTest.php +++ b/apps/encryption/tests/lib/HookManagerTest.php @@ -3,7 +3,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php index 35ae8ad6ca0..c69610fb541 100644 --- a/apps/encryption/tests/lib/KeyManagerTest.php +++ b/apps/encryption/tests/lib/KeyManagerTest.php @@ -5,7 +5,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -342,25 +342,77 @@ class KeyManagerTest extends TestCase { $this->assertTrue($this->instance->getEncryptedFileKey('/')); } - public function testGetFileKey() { - $this->keyStorageMock->expects($this->exactly(4)) + /** + * @dataProvider dataTestGetFileKey + * + * @param $uid + * @param $isMasterKeyEnabled + * @param $privateKey + * @param $expected + */ + public function testGetFileKey($uid, $isMasterKeyEnabled, $privateKey, $expected) { + + $path = '/foo.txt'; + + if ($isMasterKeyEnabled) { + $expectedUid = 'masterKeyId'; + } else { + $expectedUid = $uid; + } + + $this->invokePrivate($this->instance, 'masterKeyId', ['masterKeyId']); + + $this->keyStorageMock->expects($this->at(0)) ->method('getFileKey') + ->with($path, 'fileKey', 'OC_DEFAULT_MODULE') ->willReturn(true); - $this->keyStorageMock->expects($this->once()) - ->method('getSystemUserKey') + $this->keyStorageMock->expects($this->at(1)) + ->method('getFileKey') + ->with($path, $expectedUid . '.shareKey', 'OC_DEFAULT_MODULE') ->willReturn(true); - $this->cryptMock->expects($this->once()) - ->method('decryptPrivateKey') - ->willReturn(true); + if (is_null($uid)) { + $this->keyStorageMock->expects($this->once()) + ->method('getSystemUserKey') + ->willReturn(true); + $this->cryptMock->expects($this->once()) + ->method('decryptPrivateKey') + ->willReturn($privateKey); + } else { + $this->keyStorageMock->expects($this->never()) + ->method('getSystemUserKey'); + $this->utilMock->expects($this->once())->method('isMasterKeyEnabled') + ->willReturn($isMasterKeyEnabled); + $this->sessionMock->expects($this->once())->method('getPrivateKey')->willReturn($privateKey); + } - $this->cryptMock->expects($this->once()) - ->method('multiKeyDecrypt') - ->willReturn(true); + if($privateKey) { + $this->cryptMock->expects($this->once()) + ->method('multiKeyDecrypt') + ->willReturn(true); + } else { + $this->cryptMock->expects($this->never()) + ->method('multiKeyDecrypt'); + } - $this->assertTrue($this->instance->getFileKey('/', null)); - $this->assertEmpty($this->instance->getFileKey('/', $this->userId)); + $this->assertSame($expected, + $this->instance->getFileKey($path, $uid) + ); + + } + + public function dataTestGetFileKey() { + return [ + ['user1', false, 'privateKey', true], + ['user1', false, false, ''], + ['user1', true, 'privateKey', true], + ['user1', true, false, ''], + ['', false, 'privateKey', true], + ['', false, false, ''], + ['', true, 'privateKey', true], + ['', true, false, ''] + ]; } public function testDeletePrivateKey() { diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php index 6df72ac1bf6..f00704e42e8 100644 --- a/apps/encryption/tests/lib/MigrationTest.php +++ b/apps/encryption/tests/lib/MigrationTest.php @@ -3,8 +3,10 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/lib/RecoveryTest.php index 82f5341960e..68c21c80b34 100644 --- a/apps/encryption/tests/lib/RecoveryTest.php +++ b/apps/encryption/tests/lib/RecoveryTest.php @@ -3,8 +3,9 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/SessionTest.php b/apps/encryption/tests/lib/SessionTest.php index 1cc0d89a93d..f7a8a0369bb 100644 --- a/apps/encryption/tests/lib/SessionTest.php +++ b/apps/encryption/tests/lib/SessionTest.php @@ -4,7 +4,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/UtilTest.php b/apps/encryption/tests/lib/UtilTest.php index d55b6b50b3e..fa90125d6e9 100644 --- a/apps/encryption/tests/lib/UtilTest.php +++ b/apps/encryption/tests/lib/UtilTest.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php index cad34761840..e599cc28963 100644 --- a/apps/encryption/tests/lib/crypto/cryptTest.php +++ b/apps/encryption/tests/lib/crypto/cryptTest.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/crypto/decryptalltest.php b/apps/encryption/tests/lib/crypto/decryptalltest.php index d6a52fe97c0..84819aa73bd 100644 --- a/apps/encryption/tests/lib/crypto/decryptalltest.php +++ b/apps/encryption/tests/lib/crypto/decryptalltest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/crypto/encryptalltest.php b/apps/encryption/tests/lib/crypto/encryptalltest.php index e907d154a2d..04d931342a7 100644 --- a/apps/encryption/tests/lib/crypto/encryptalltest.php +++ b/apps/encryption/tests/lib/crypto/encryptalltest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php index 138c1bc9446..62e77c742d8 100644 --- a/apps/encryption/tests/lib/crypto/encryptionTest.php +++ b/apps/encryption/tests/lib/crypto/encryptionTest.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/encryption/tests/lib/users/SetupTest.php b/apps/encryption/tests/lib/users/SetupTest.php index 022bf5dc466..0cc59384b16 100644 --- a/apps/encryption/tests/lib/users/SetupTest.php +++ b/apps/encryption/tests/lib/users/SetupTest.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/api/ocsauthapi.php b/apps/federation/api/ocsauthapi.php index b94550fd4f2..083be1b7ecd 100644 --- a/apps/federation/api/ocsauthapi.php +++ b/apps/federation/api/ocsauthapi.php @@ -1,8 +1,12 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -139,7 +143,7 @@ class OCSAuthAPI { return new \OC_OCS_Result(null, HTTP::STATUS_FORBIDDEN); } - $sharedSecret = $this->secureRandom->getMediumStrengthGenerator()->generate(32); + $sharedSecret = $this->secureRandom->generate(32); $this->trustedServers->addSharedSecret($url, $sharedSecret); // reset token after the exchange of the shared secret was successful diff --git a/apps/federation/appinfo/app.php b/apps/federation/appinfo/app.php index 8cc77885d6f..6686f90121c 100644 --- a/apps/federation/appinfo/app.php +++ b/apps/federation/appinfo/app.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/appinfo/application.php b/apps/federation/appinfo/application.php index 45d88548b70..00b572aee9f 100644 --- a/apps/federation/appinfo/application.php +++ b/apps/federation/appinfo/application.php @@ -1,8 +1,9 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -23,6 +24,7 @@ namespace OCA\Federation\AppInfo; use OCA\Federation\API\OCSAuthAPI; use OCA\Federation\Controller\SettingsController; +use OCA\Federation\DAV\FedAuth; use OCA\Federation\DbHandler; use OCA\Federation\Hooks; use OCA\Federation\Middleware\AddServerMiddleware; @@ -30,7 +32,9 @@ use OCA\Federation\TrustedServers; use OCP\API; use OCP\App; use OCP\AppFramework\IAppContainer; +use OCP\SabrePluginEvent; use OCP\Util; +use Sabre\DAV\Auth\Plugin; class Application extends \OCP\AppFramework\App { @@ -144,6 +148,19 @@ class Application extends \OCP\AppFramework\App { $hooksManager, 'addServerHook' ); + + $dispatcher = $this->getContainer()->getServer()->getEventDispatcher(); + $dispatcher->addListener('OCA\DAV\Connector\Sabre::authInit', function($event) use($container) { + if ($event instanceof SabrePluginEvent) { + $authPlugin = $event->getServer()->getPlugin('auth'); + if ($authPlugin instanceof Plugin) { + $h = new DbHandler($container->getServer()->getDatabaseConnection(), + $container->getServer()->getL10N('federation') + ); + $authPlugin->addBackend(new FedAuth($h)); + } + } + }); } } diff --git a/apps/federation/appinfo/database.xml b/apps/federation/appinfo/database.xml index e0bb241918e..05b7fb12b49 100644 --- a/apps/federation/appinfo/database.xml +++ b/apps/federation/appinfo/database.xml @@ -34,7 +34,7 @@ <name>token</name> <type>text</type> <length>128</length> - <comments>toke used to exchange the shared secret</comments> + <comments>token used to exchange the shared secret</comments> </field> <field> <name>shared_secret</name> @@ -50,6 +50,12 @@ <default>2</default> <comments>current status of the connection</comments> </field> + <field> + <name>sync_token</name> + <type>text</type> + <length>512</length> + <comments>cardDav sync token</comments> + </field> <index> <name>url_hash</name> <unique>true</unique> diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index 92afc995366..54ea4831be0 100644 --- a/apps/federation/appinfo/info.xml +++ b/apps/federation/appinfo/info.xml @@ -5,10 +5,13 @@ <description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description> <licence>AGPL</licence> <author>Bjoern Schiessle</author> - <version>0.0.1</version> + <version>0.0.2</version> <namespace>Federation</namespace> <category>other</category> <dependencies> <owncloud min-version="9.0" max-version="9.0" /> </dependencies> + <types> + <authentication/> + </types> </info> diff --git a/apps/federation/appinfo/register_command.php b/apps/federation/appinfo/register_command.php new file mode 100644 index 00000000000..541b01706d0 --- /dev/null +++ b/apps/federation/appinfo/register_command.php @@ -0,0 +1,8 @@ +<?php + +$dbConnection = \OC::$server->getDatabaseConnection(); +$l10n = \OC::$server->getL10N('federation'); +$dbHandler = new \OCA\Federation\DbHandler($dbConnection, $l10n); + +/** @var Symfony\Component\Console\Application $application */ +$application->add(new \OCA\Federation\Command\SyncFederationAddressBooks($dbHandler)); diff --git a/apps/federation/appinfo/routes.php b/apps/federation/appinfo/routes.php index 8c1629a4fc6..6b4124094df 100644 --- a/apps/federation/appinfo/routes.php +++ b/apps/federation/appinfo/routes.php @@ -1,18 +1,18 @@ <?php /** -* @author Björn Schießle <schiessle@owncloud.com> + * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, 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, + * 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. + * 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/> diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php index 8aa8a08e07b..cae446f915c 100644 --- a/apps/federation/backgroundjob/getsharedsecret.php +++ b/apps/federation/backgroundjob/getsharedsecret.php @@ -1,8 +1,10 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php index a1906d20823..92305b7e8ea 100644 --- a/apps/federation/backgroundjob/requestsharedsecret.php +++ b/apps/federation/backgroundjob/requestsharedsecret.php @@ -1,8 +1,10 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/command/syncfederationaddressbooks.php b/apps/federation/command/syncfederationaddressbooks.php new file mode 100644 index 00000000000..516029d25ab --- /dev/null +++ b/apps/federation/command/syncfederationaddressbooks.php @@ -0,0 +1,72 @@ +<?php + +namespace OCA\Federation\Command; + +use OCA\DAV\CardDAV\SyncService; +use OCA\Federation\DbHandler; +use OCA\Federation\TrustedServers; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Helper\ProgressBar; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class SyncFederationAddressBooks extends Command { + + /** @var DbHandler */ + protected $dbHandler; + + /** @var SyncService */ + private $syncService; + + /** + * @param DbHandler $dbHandler + */ + function __construct(DbHandler $dbHandler) { + parent::__construct(); + + $this->syncService = \OC::$server->query('CardDAVSyncService'); + $this->dbHandler = $dbHandler; + } + + protected function configure() { + $this + ->setName('federation:sync-addressbooks') + ->setDescription('Synchronizes addressbooks of all federated clouds'); + } + + /** + * @param InputInterface $input + * @param OutputInterface $output + */ + protected function execute(InputInterface $input, OutputInterface $output) { + + $progress = new ProgressBar($output); + $progress->start(); + $trustedServers = $this->dbHandler->getAllServer(); + foreach ($trustedServers as $trustedServer) { + $progress->advance(); + $url = $trustedServer['url']; + $sharedSecret = $trustedServer['shared_secret']; + $syncToken = $trustedServer['sync_token']; + + if (is_null($sharedSecret)) { + continue; + } + $targetBookId = sha1($url); + $targetPrincipal = "principals/system/system"; + $targetBookProperties = [ + '{DAV:}displayname' => $url + ]; + try { + $newToken = $this->syncService->syncRemoteAddressBook($url, 'system', $sharedSecret, $syncToken, $targetPrincipal, $targetBookId, $targetBookProperties); + if ($newToken !== $syncToken) { + $this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken); + } + } catch (\Exception $ex) { + $output->writeln("Error while syncing $url : " . $ex->getMessage()); + } + } + $progress->finish(); + $output->writeln(''); + } +} diff --git a/apps/federation/controller/settingscontroller.php b/apps/federation/controller/settingscontroller.php index 2e28cd60cfa..e5e46606f12 100644 --- a/apps/federation/controller/settingscontroller.php +++ b/apps/federation/controller/settingscontroller.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/dav/fedauth.php b/apps/federation/dav/fedauth.php new file mode 100644 index 00000000000..09d61a1f2c7 --- /dev/null +++ b/apps/federation/dav/fedauth.php @@ -0,0 +1,54 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @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\Federation\DAV; + +use OCA\Federation\DbHandler; +use Sabre\DAV\Auth\Backend\AbstractBasic; + +class FedAuth extends AbstractBasic { + + /** @var DbHandler */ + private $db; + + /** + * FedAuth constructor. + * + * @param DbHandler $db + */ + public function __construct(DbHandler $db) { + $this->db = $db; + $this->principalPrefix = 'principals/system/'; + } + + /** + * Validates a username and password + * + * This method should return true or false depending on if login + * succeeded. + * + * @param string $username + * @param string $password + * @return bool + */ + protected function validateUserPass($username, $password) { + return $this->db->auth($username, $password); + } +} diff --git a/apps/federation/lib/dbhandler.php b/apps/federation/lib/dbhandler.php index 7606593f780..9e44c72cc42 100644 --- a/apps/federation/lib/dbhandler.php +++ b/apps/federation/lib/dbhandler.php @@ -1,8 +1,9 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -111,7 +112,7 @@ class DbHandler { */ public function getAllServer() { $query = $this->connection->getQueryBuilder(); - $query->select(['url', 'id', 'status'])->from($this->dbTable); + $query->select(['url', 'id', 'status', 'shared_secret', 'sync_token'])->from($this->dbTable); $result = $query->execute()->fetchAll(); return $result; } @@ -206,15 +207,17 @@ class DbHandler { * * @param string $url * @param int $status + * @param string|null $token */ - public function setServerStatus($url, $status) { + public function setServerStatus($url, $status, $token = null) { $hash = $this->hash($url); $query = $this->connection->getQueryBuilder(); $query->update($this->dbTable) - ->set('status', $query->createParameter('status')) - ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash'))) - ->setParameter('url_hash', $hash) - ->setParameter('status', $status); + ->set('status', $query->createNamedParameter($status)) + ->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash))); + if (!is_null($token)) { + $query->set('sync_token', $query->createNamedParameter($token)); + } $query->execute(); } @@ -267,4 +270,21 @@ class DbHandler { return $normalized; } + /** + * @param $username + * @param $password + * @return bool + */ + public function auth($username, $password) { + if ($username !== 'system') { + return false; + } + $query = $this->connection->getQueryBuilder(); + $query->select('url')->from($this->dbTable) + ->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password))); + + $result = $query->execute()->fetch(); + return !empty($result); + } + } diff --git a/apps/federation/lib/hooks.php b/apps/federation/lib/hooks.php index 4bf5be4e5b6..b7f63d27f55 100644 --- a/apps/federation/lib/hooks.php +++ b/apps/federation/lib/hooks.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/lib/trustedservers.php b/apps/federation/lib/trustedservers.php index 96a29178076..e3ce8228cc3 100644 --- a/apps/federation/lib/trustedservers.php +++ b/apps/federation/lib/trustedservers.php @@ -1,8 +1,9 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -90,7 +91,7 @@ class TrustedServers { $url = $this->updateProtocol($url); $result = $this->dbHandler->addServer($url); if ($result) { - $token = $this->secureRandom->getMediumStrengthGenerator()->generate(16); + $token = $this->secureRandom->generate(16); $this->dbHandler->addToken($url, $token); $this->jobList->add( 'OCA\Federation\BackgroundJob\RequestSharedSecret', diff --git a/apps/federation/middleware/addservermiddleware.php b/apps/federation/middleware/addservermiddleware.php index 56552021dc2..cd9ccff4403 100644 --- a/apps/federation/middleware/addservermiddleware.php +++ b/apps/federation/middleware/addservermiddleware.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/settings/settings-admin.php b/apps/federation/settings/settings-admin.php index 76ae0c3b6e0..8c6bfe6bbbb 100644 --- a/apps/federation/settings/settings-admin.php +++ b/apps/federation/settings/settings-admin.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/tests/api/ocsauthapitest.php b/apps/federation/tests/api/ocsauthapitest.php index e6a95af8585..9c751fff895 100644 --- a/apps/federation/tests/api/ocsauthapitest.php +++ b/apps/federation/tests/api/ocsauthapitest.php @@ -1,8 +1,9 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -155,8 +156,6 @@ class OCSAuthAPITest extends TestCase { ->method('isValidToken')->with($url, $token)->willReturn($isValidToken); if($expected === Http::STATUS_OK) { - $this->secureRandom->expects($this->once())->method('getMediumStrengthGenerator') - ->willReturn($this->secureRandom); $this->secureRandom->expects($this->once())->method('generate')->with(32) ->willReturn('secret'); $this->trustedServers->expects($this->once()) diff --git a/apps/federation/tests/backgroundjob/getsharedsecrettest.php b/apps/federation/tests/backgroundjob/getsharedsecrettest.php index cb3a294713a..08c8677415c 100644 --- a/apps/federation/tests/backgroundjob/getsharedsecrettest.php +++ b/apps/federation/tests/backgroundjob/getsharedsecrettest.php @@ -1,8 +1,9 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php b/apps/federation/tests/backgroundjob/requestsharedsecrettest.php index df81113c686..45f79e05249 100644 --- a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php +++ b/apps/federation/tests/backgroundjob/requestsharedsecrettest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/tests/controller/settingscontrollertest.php b/apps/federation/tests/controller/settingscontrollertest.php index efbc6911c52..65f7d5f91d3 100644 --- a/apps/federation/tests/controller/settingscontrollertest.php +++ b/apps/federation/tests/controller/settingscontrollertest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/tests/dav/fedauthtest.php b/apps/federation/tests/dav/fedauthtest.php new file mode 100644 index 00000000000..845cfc622d2 --- /dev/null +++ b/apps/federation/tests/dav/fedauthtest.php @@ -0,0 +1,52 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @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\Federation\Tests\DAV; + +use OCA\Federation\DAV\FedAuth; +use OCA\Federation\DbHandler; +use Test\TestCase; + +class FedAuthTest extends TestCase { + + /** + * @dataProvider providesUser + * + * @param array $expected + * @param string $user + * @param string $password + */ + public function testFedAuth($expected, $user, $password) { + /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $db */ + $db = $this->getMockBuilder('OCA\Federation\DbHandler')->disableOriginalConstructor()->getMock(); + $db->method('auth')->willReturn(true); + $auth = new FedAuth($db); + $result = $this->invokePrivate($auth, 'validateUserPass', [$user, $password]); + $this->assertEquals($expected, $result); + } + + public function providesUser() { + return [ + [true, 'system', '123456'] + ]; + } +} diff --git a/apps/federation/tests/lib/dbhandlertest.php b/apps/federation/tests/lib/dbhandlertest.php index 123eaaee450..6fe5d9ea8ef 100644 --- a/apps/federation/tests/lib/dbhandlertest.php +++ b/apps/federation/tests/lib/dbhandlertest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -26,6 +26,7 @@ namespace OCA\Federation\Tests\lib; use OCA\Federation\DbHandler; use OCA\Federation\TrustedServers; use OCP\IDBConnection; +use OCP\IL10N; use Test\TestCase; /** @@ -36,7 +37,7 @@ class DbHandlerTest extends TestCase { /** @var DbHandler */ private $dbHandler; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ private $il10n; /** @var IDBConnection */ @@ -209,6 +210,11 @@ class DbHandlerTest extends TestCase { $this->assertSame(TrustedServers::STATUS_OK, $this->dbHandler->getServerStatus('https://server1') ); + + // test sync token + $this->dbHandler->setServerStatus('http://server1', TrustedServers::STATUS_OK, 'token1234567890'); + $servers = $this->dbHandler->getAllServer(); + $this->assertSame('token1234567890', $servers[0]['sync_token']); } /** @@ -256,4 +262,22 @@ class DbHandlerTest extends TestCase { ]; } + /** + * @dataProvider providesAuth + */ + public function testAuth($expectedResult, $user, $password) { + if ($expectedResult) { + $this->dbHandler->addServer('url1'); + $this->dbHandler->addSharedSecret('url1', $password); + } + $result = $this->dbHandler->auth($user, $password); + $this->assertEquals($expectedResult, $result); + } + + public function providesAuth() { + return [ + [false, 'foo', ''], + [true, 'system', '123456789'], + ]; + } } diff --git a/apps/federation/tests/lib/hookstest.php b/apps/federation/tests/lib/hookstest.php index 5b19c167456..71569226dd2 100644 --- a/apps/federation/tests/lib/hookstest.php +++ b/apps/federation/tests/lib/hookstest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/tests/lib/trustedserverstest.php b/apps/federation/tests/lib/trustedserverstest.php index d067cd1c185..e57391ed198 100644 --- a/apps/federation/tests/lib/trustedserverstest.php +++ b/apps/federation/tests/lib/trustedserverstest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -113,8 +113,6 @@ class TrustedServersTest extends TestCase { ->willReturn($success); if ($success) { - $this->secureRandom->expects($this->once())->method('getMediumStrengthGenerator') - ->willReturn($this->secureRandom); $this->secureRandom->expects($this->once())->method('generate') ->willReturn('token'); $this->dbHandler->expects($this->once())->method('addToken')->with('https://url', 'token'); diff --git a/apps/federation/tests/middleware/addservermiddlewaretest.php b/apps/federation/tests/middleware/addservermiddlewaretest.php index 1be5a342285..a94d907ae76 100644 --- a/apps/federation/tests/middleware/addservermiddlewaretest.php +++ b/apps/federation/tests/middleware/addservermiddlewaretest.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/admin.php b/apps/files/admin.php index a2092c600a7..6e818a174bb 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -1,16 +1,16 @@ <?php /** * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Frank Karlitschek <frank@owncloud.org> * @author Jakob Sack <mail@jakobsack.de> - * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Göhler <somebody.here@gmx.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index 26bab8837b4..28ce4c6542e 100644 --- a/apps/files/ajax/download.php +++ b/apps/files/ajax/download.php @@ -9,7 +9,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php index 10f8704dded..83466ecc033 100644 --- a/apps/files/ajax/getstoragestats.php +++ b/apps/files/ajax/getstoragestats.php @@ -6,7 +6,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 6cfa04b49d6..26ec126becf 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 14f56a24b4b..5bf69d3e304 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -3,6 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Florian Pritz <bluewind@xinu.at> * @author Frank Karlitschek <frank@owncloud.org> * @author Individual IT Services <info@individual-it.net> @@ -16,7 +17,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 61ff6d748f9..94360786ac3 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -3,11 +3,12 @@ * @author Jakob Sack <mail@jakobsack.de> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Lukas Reschke <lukas@owncloud.com> * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/appinfo/application.php b/apps/files/appinfo/application.php index 6aff517e17f..bc6dc9fb9ed 100644 --- a/apps/files/appinfo/application.php +++ b/apps/files/appinfo/application.php @@ -4,7 +4,7 @@ * @author Tobias Kaminsky <tobias@kaminsky.me> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/appinfo/install.php b/apps/files/appinfo/install.php index b47bf6ac4b0..485a5f2976d 100644 --- a/apps/files/appinfo/install.php +++ b/apps/files/appinfo/install.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/appinfo/register_command.php b/apps/files/appinfo/register_command.php index 7e541ca26f2..4aaf49df9e2 100644 --- a/apps/files/appinfo/register_command.php +++ b/apps/files/appinfo/register_command.php @@ -2,8 +2,9 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php index 844b73b3c41..731c671b60a 100644 --- a/apps/files/appinfo/routes.php +++ b/apps/files/appinfo/routes.php @@ -7,7 +7,7 @@ * @author Tom Needham <tom@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index d181dff560b..df13696ab42 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -2,9 +2,10 @@ /** * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/command/deleteorphanedfiles.php b/apps/files/command/deleteorphanedfiles.php index 0dc9c29f4f7..d276e9a0993 100644 --- a/apps/files/command/deleteorphanedfiles.php +++ b/apps/files/command/deleteorphanedfiles.php @@ -2,7 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php index 7e00d8a2312..da387f40c48 100644 --- a/apps/files/command/scan.php +++ b/apps/files/command/scan.php @@ -2,11 +2,12 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author martin.mattel@diemattels.at <martin.mattel@diemattels.at> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php index ee54db63191..c96d92a046b 100644 --- a/apps/files/controller/apicontroller.php +++ b/apps/files/controller/apicontroller.php @@ -8,7 +8,7 @@ * @author Tobias Kaminsky <tobias@kaminsky.me> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/controller/viewcontroller.php b/apps/files/controller/viewcontroller.php index d9c59592863..800cf008fa7 100644 --- a/apps/files/controller/viewcontroller.php +++ b/apps/files/controller/viewcontroller.php @@ -1,8 +1,9 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/download.php b/apps/files/download.php index b058f0ebf5b..f71b54c4784 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -4,12 +4,12 @@ * @author Felix Moeller <mail@felixmoeller.de> * @author Frank Karlitschek <frank@owncloud.org> * @author Jakob Sack <mail@jakobsack.de> - * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index d5b30d62998..d0c7687e5b6 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -642,7 +642,13 @@ }; OCA.Files.FileActions.updateFileActionSpinner(downloadFileaction, true); - OCA.Files.Files.handleDownload(this.getDownloadUrl(files, dir, true), disableLoadingState); + if(this.getSelectedFiles().length > 1) { + OCA.Files.Files.handleDownload(this.getDownloadUrl(files, dir, true), disableLoadingState); + } + else { + first = this.getSelectedFiles()[0]; + OCA.Files.Files.handleDownload(this.getDownloadUrl(first.name, dir, true), disableLoadingState); + } return false; }, diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index 4b0ddbb7265..92e3b530d28 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -74,7 +74,7 @@ OC.L10N.register( "Favorite" : "Favorito", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", - "{newname} already exists" : "{new_name} ya existe", + "{newname} already exists" : "{newname} ya existe", "Upload" : "Subir", "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas", "A new file or folder has been <strong>created</strong>" : "Se ha <strong>creado</strong> un nuevo archivo o carpeta", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index 09411bc5b2a..cb65f8c1d87 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -72,7 +72,7 @@ "Favorite" : "Favorito", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", - "{newname} already exists" : "{new_name} ya existe", + "{newname} already exists" : "{newname} ya existe", "Upload" : "Subir", "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas", "A new file or folder has been <strong>created</strong>" : "Se ha <strong>creado</strong> un nuevo archivo o carpeta", diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 3843e89c797..64a24bbd0c1 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -45,6 +45,13 @@ OC.L10N.register( "Could not move \"{file}\", target exists" : "無法移動 \"{file}\"，目標已經存在", "Could not move \"{file}\"" : "無法移動 \"{file}\"", "{newName} already exists" : "{newName} 已經存在", + "Could not rename \"{fileName}\", it does not exist any more" : "無法命名檔案 \"{fileName}\"，因為此檔案已經不存在", + "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "此名稱 \"{targetName}\" 在這資料夾 \"{dir}\" 已經被使用。請重新選擇不同的名稱", + "Could not rename \"{fileName}\"" : "無法重新命名 \"{fileName}\"", + "Could not create file \"{file}\"" : "無法建立檔案 \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "無法建立檔案 \"{file}\"，因為此檔案已存在", + "Could not create folder \"{dir}\"" : "無法建立資料夾 \"{dir}\"", + "Could not create folder \"{dir}\" because it already exists" : "無法建立資料夾 \"{dir}\"，因為此資料夾已存在", "Error deleting file \"{fileName}\"." : "刪除 \"{fileName}\" 出錯", "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符", "Name" : "名稱", @@ -94,6 +101,7 @@ OC.L10N.register( "Maximum upload size" : "上傳限制", "max. possible: " : "最大允許：", "Save" : "儲存", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "如果使用 PHP-FPM ，此設定值需要5分鐘左右才會生效。", "Missing permissions to edit from here." : "您沒有在此編輯的權限", "Settings" : "設定", "WebDAV" : "WebDAV", diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index b70766ffa7f..c3c1443e0bc 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -43,6 +43,13 @@ "Could not move \"{file}\", target exists" : "無法移動 \"{file}\"，目標已經存在", "Could not move \"{file}\"" : "無法移動 \"{file}\"", "{newName} already exists" : "{newName} 已經存在", + "Could not rename \"{fileName}\", it does not exist any more" : "無法命名檔案 \"{fileName}\"，因為此檔案已經不存在", + "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "此名稱 \"{targetName}\" 在這資料夾 \"{dir}\" 已經被使用。請重新選擇不同的名稱", + "Could not rename \"{fileName}\"" : "無法重新命名 \"{fileName}\"", + "Could not create file \"{file}\"" : "無法建立檔案 \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "無法建立檔案 \"{file}\"，因為此檔案已存在", + "Could not create folder \"{dir}\"" : "無法建立資料夾 \"{dir}\"", + "Could not create folder \"{dir}\" because it already exists" : "無法建立資料夾 \"{dir}\"，因為此資料夾已存在", "Error deleting file \"{fileName}\"." : "刪除 \"{fileName}\" 出錯", "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符", "Name" : "名稱", @@ -92,6 +99,7 @@ "Maximum upload size" : "上傳限制", "max. possible: " : "最大允許：", "Save" : "儲存", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "如果使用 PHP-FPM ，此設定值需要5分鐘左右才會生效。", "Missing permissions to edit from here." : "您沒有在此編輯的權限", "Settings" : "設定", "WebDAV" : "WebDAV", diff --git a/apps/files/lib/activity.php b/apps/files/lib/activity.php index a941572ed15..8d53074da14 100644 --- a/apps/files/lib/activity.php +++ b/apps/files/lib/activity.php @@ -2,8 +2,9 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/lib/activityhelper.php b/apps/files/lib/activityhelper.php index f9ff722b1c2..046dd59bc76 100644 --- a/apps/files/lib/activityhelper.php +++ b/apps/files/lib/activityhelper.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php index 18813e224de..981c41ff413 100644 --- a/apps/files/lib/app.php +++ b/apps/files/lib/app.php @@ -1,13 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> * @author Christopher Schäpers <kondou@ts.unde.re> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/lib/backgroundjob/scanfiles.php b/apps/files/lib/backgroundjob/scanfiles.php index 7371429a268..dcc180bcfbe 100644 --- a/apps/files/lib/backgroundjob/scanfiles.php +++ b/apps/files/lib/backgroundjob/scanfiles.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/lib/capabilities.php b/apps/files/lib/capabilities.php index 14fb07a9d86..7d50b51bb97 100644 --- a/apps/files/lib/capabilities.php +++ b/apps/files/lib/capabilities.php @@ -4,7 +4,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 4f960518839..d21a65afcee 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -6,11 +6,12 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/list.php b/apps/files/list.php index f11becf5721..6d2c463a2d9 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/service/tagservice.php b/apps/files/service/tagservice.php index cf3f2bb7865..e1425c46615 100644 --- a/apps/files/service/tagservice.php +++ b/apps/files/service/tagservice.php @@ -2,9 +2,10 @@ /** * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/simplelist.php b/apps/files/simplelist.php index 80cf8c4a205..2e65eedd1b3 100644 --- a/apps/files/simplelist.php +++ b/apps/files/simplelist.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/activitytest.php index 59c020c9042..5e73ff0b5dd 100644 --- a/apps/files/tests/activitytest.php +++ b/apps/files/tests/activitytest.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/tests/backgroundjob/ScanFilesTest.php b/apps/files/tests/backgroundjob/ScanFilesTest.php index 087696f0cfc..eab28071b70 100644 --- a/apps/files/tests/backgroundjob/ScanFilesTest.php +++ b/apps/files/tests/backgroundjob/ScanFilesTest.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/tests/command/deleteorphanedfilestest.php b/apps/files/tests/command/deleteorphanedfilestest.php index 18f568036e4..ff29942bc4a 100644 --- a/apps/files/tests/command/deleteorphanedfilestest.php +++ b/apps/files/tests/command/deleteorphanedfilestest.php @@ -2,8 +2,9 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/controller/ViewControllerTest.php index 0e8ab5e752d..b5df3cfc904 100644 --- a/apps/files/tests/controller/ViewControllerTest.php +++ b/apps/files/tests/controller/ViewControllerTest.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/controller/apicontrollertest.php index bc66e4641b9..6fb8340ead8 100644 --- a/apps/files/tests/controller/apicontrollertest.php +++ b/apps/files/tests/controller/apicontrollertest.php @@ -3,8 +3,9 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php index 027152a1bb2..654ec8332ed 100644 --- a/apps/files/tests/helper.php +++ b/apps/files/tests/helper.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/tests/service/tagservice.php b/apps/files/tests/service/tagservice.php index b93dedd0efd..5fcf64b1352 100644 --- a/apps/files/tests/service/tagservice.php +++ b/apps/files/tests/service/tagservice.php @@ -1,8 +1,10 @@ <?php /** + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php index 7f1b4dc9221..5d30dfdbb51 100644 --- a/apps/files_external/ajax/applicable.php +++ b/apps/files_external/ajax/applicable.php @@ -2,9 +2,9 @@ /** * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/ajax/oauth1.php b/apps/files_external/ajax/oauth1.php index 3d6736b3b59..ea7db2523a8 100644 --- a/apps/files_external/ajax/oauth1.php +++ b/apps/files_external/ajax/oauth1.php @@ -4,10 +4,10 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php index fbe60e16e26..b110cba9fe0 100644 --- a/apps/files_external/ajax/oauth2.php +++ b/apps/files_external/ajax/oauth2.php @@ -6,10 +6,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Vincent Petry <pvince81@owncloud.com> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index 1fcd09cca51..9a2ec7286ca 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -1,16 +1,16 @@ <?php /** * @author Christian Berendt <berendt@b1-systems.de> - * @author j-ed <juergen@eisfair.org> * @author Jan-Christoph Borchardt <hey@jancborchardt.net> + * @author j-ed <juergen@eisfair.org> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Ross Nicoll <jrn@jrn.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php index 1d6e0d03400..b750734bf34 100644 --- a/apps/files_external/appinfo/application.php +++ b/apps/files_external/appinfo/application.php @@ -1,12 +1,12 @@ <?php /** * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Ross Nicoll <jrn@jrn.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php index 183d965d1a1..12bf6a45df3 100644 --- a/apps/files_external/appinfo/register_command.php +++ b/apps/files_external/appinfo/register_command.php @@ -1,8 +1,8 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -23,6 +23,7 @@ use OCA\Files_External\Command\ListCommand; use OCA\Files_External\Command\Config; use OCA\Files_External\Command\Option; +use \OCA\Files_External\Command\Import; $userManager = OC::$server->getUserManager(); $userSession = OC::$server->getUserSession(); @@ -31,8 +32,11 @@ $app = \OC_Mount_Config::$app; $globalStorageService = $app->getContainer()->query('\OCA\Files_external\Service\GlobalStoragesService'); $userStorageService = $app->getContainer()->query('\OCA\Files_external\Service\UserStoragesService'); +$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_external\Service\ImportLegacyStoragesService'); +$backendService = $app->getContainer()->query('OCA\Files_External\Service\BackendService'); /** @var Symfony\Component\Console\Application $application */ $application->add(new ListCommand($globalStorageService, $userStorageService, $userSession, $userManager)); $application->add(new Config($globalStorageService)); $application->add(new Option($globalStorageService)); +$application->add(new Import($globalStorageService, $userStorageService, $userSession, $userManager, $importLegacyStorageService, $backendService)); diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php index e66c010a8cf..c3149a300cf 100644 --- a/apps/files_external/appinfo/routes.php +++ b/apps/files_external/appinfo/routes.php @@ -3,12 +3,12 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Ross Nicoll <jrn@jrn.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php index 2eedfe9b88f..8cc2422c7ff 100644 --- a/apps/files_external/appinfo/update.php +++ b/apps/files_external/appinfo/update.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/command/config.php b/apps/files_external/command/config.php index 6a57b2dd961..1403c24b345 100644 --- a/apps/files_external/command/config.php +++ b/apps/files_external/command/config.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -88,7 +88,11 @@ class Config extends Base { * @param OutputInterface $output */ protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { - $value = $mount->getBackendOption($key); + if ($key === 'mountpoint' || $key === 'mount_point') { + $value = $mount->getMountPoint(); + } else { + $value = $mount->getBackendOption($key); + } if (!is_string($value)) { // show bools and objects correctly $value = json_encode($value); } @@ -106,7 +110,11 @@ class Config extends Base { if (!is_null($decoded)) { $value = $decoded; } - $mount->setBackendOption($key, $value); + if ($key === 'mountpoint' || $key === 'mount_point') { + $mount->setMountPoint($value); + } else { + $mount->setBackendOption($key, $value); + } $this->globalService->updateStorage($mount); } } diff --git a/apps/files_external/command/import.php b/apps/files_external/command/import.php new file mode 100644 index 00000000000..fe27051359c --- /dev/null +++ b/apps/files_external/command/import.php @@ -0,0 +1,227 @@ +<?php +/** + * @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_External\Command; + +use OC\Core\Command\Base; +use OC\User\NoUserException; +use OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Service\BackendService; +use OCA\Files_external\Service\GlobalStoragesService; +use OCA\Files_external\Service\ImportLegacyStoragesService; +use OCA\Files_external\Service\UserStoragesService; +use OCP\IUserManager; +use OCP\IUserSession; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Helper\Table; +use Symfony\Component\Console\Helper\TableHelper; +use Symfony\Component\Console\Input\ArrayInput; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Input\Input; +use Symfony\Component\Console\Output\OutputInterface; + +class Import extends Base { + /** + * @var GlobalStoragesService + */ + private $globalService; + + /** + * @var UserStoragesService + */ + private $userService; + + /** + * @var IUserSession + */ + private $userSession; + + /** + * @var IUserManager + */ + private $userManager; + + /** @var ImportLegacyStoragesService */ + private $importLegacyStorageService; + + /** @var BackendService */ + private $backendService; + + function __construct(GlobalStoragesService $globalService, + UserStoragesService $userService, + IUserSession $userSession, + IUserManager $userManager, + ImportLegacyStoragesService $importLegacyStorageService, + BackendService $backendService + ) { + parent::__construct(); + $this->globalService = $globalService; + $this->userService = $userService; + $this->userSession = $userSession; + $this->userManager = $userManager; + $this->importLegacyStorageService = $importLegacyStorageService; + $this->backendService = $backendService; + } + + protected function configure() { + $this + ->setName('files_external:import') + ->setDescription('Import mount configurations') + ->addOption( + 'user', + null, + InputOption::VALUE_OPTIONAL, + 'user to add the mount configurations for, if not set the mount will be added as system mount' + ) + ->addArgument( + 'path', + InputArgument::REQUIRED, + 'path to a json file containing the mounts to import, use "-" to read from stdin' + ) + ->addOption( + 'dry', + null, + InputOption::VALUE_NONE, + 'Don\'t save the imported mounts, only list the new mounts' + ); + parent::configure(); + } + + protected function execute(InputInterface $input, OutputInterface $output) { + $user = $input->getOption('user'); + $path = $input->getArgument('path'); + if ($path === '-') { + $json = file_get_contents('php://stdin'); + } else { + if (!file_exists($path)) { + $output->writeln('<error>File not found: ' . $path . '</error>'); + return 1; + } + $json = file_get_contents($path); + } + if (!is_string($json) || strlen($json) < 2) { + $output->writeln('<error>Error while reading json</error>'); + return 1; + } + $data = json_decode($json, true); + if (!is_array($data)) { + $output->writeln('<error>Error while parsing json</error>'); + return 1; + } + + $isLegacy = isset($data['user']) || isset($data['group']); + if ($isLegacy) { + $this->importLegacyStorageService->setData($data); + $mounts = $this->importLegacyStorageService->getAllStorages(); + foreach ($mounts as $mount) { + if ($mount->getBackendOption('password') === false) { + $output->writeln('<error>Failed to decrypt password</error>'); + return 1; + } + } + } else { + if (!isset($data[0])) { //normalize to an array of mounts + $data = [$data]; + } + $mounts = array_map([$this, 'parseData'], $data); + } + + if ($user) { + // ensure applicables are correct for personal mounts + foreach ($mounts as $mount) { + $mount->setApplicableGroups([]); + $mount->setApplicableUsers([$user]); + } + } + + $storageService = $this->getStorageService($user); + + $existingMounts = $storageService->getAllStorages(); + + foreach ($mounts as $mount) { + foreach ($existingMounts as $existingMount) { + if ( + $existingMount->getMountPoint() === $mount->getMountPoint() && + $existingMount->getApplicableGroups() === $mount->getApplicableGroups() && + $existingMount->getApplicableUsers() == $mount->getApplicableUsers() && + $existingMount->getBackendOptions() == $mount->getBackendOptions() + ) { + $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>"); + return 1; + } + } + } + + if ($input->getOption('dry')) { + if (count($mounts) === 0) { + $output->writeln('<error>No mounts to be imported</error>'); + return 1; + } + $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager); + $listInput = new ArrayInput([], $listCommand->getDefinition()); + $listInput->setOption('output', $input->getOption('output')); + $listInput->setOption('show-password', true); + $listCommand->listMounts($user, $mounts, $listInput, $output); + } else { + foreach ($mounts as $mount) { + $storageService->addStorage($mount); + } + } + return 0; + } + + private function parseData(array $data) { + $mount = new StorageConfig($data['mount_id']); + $mount->setMountPoint($data['mount_point']); + $mount->setBackend($this->getBackendByClass($data['storage'])); + $authBackends = $this->backendService->getAuthMechanismsByScheme([$data['authentication_type']]); + $mount->setAuthMechanism(current($authBackends)); + $mount->setBackendOptions($data['configuration']); + $mount->setMountOptions($data['options']); + $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []); + $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []); + return $mount; + } + + private function getBackendByClass($className) { + $backends = $this->backendService->getBackends(); + foreach ($backends as $backend) { + if ($backend->getStorageClass() === $className) { + return $backend; + } + } + } + + protected function getStorageService($userId) { + if (!empty($userId)) { + $user = $this->userManager->get($userId); + if (is_null($user)) { + throw new NoUserException("user $userId not found"); + } + $this->userSession->setUser($user); + return $this->userService; + } else { + return $this->globalService; + } + } +} diff --git a/apps/files_external/command/listcommand.php b/apps/files_external/command/listcommand.php index baba9be59f5..f55fb464c83 100644 --- a/apps/files_external/command/listcommand.php +++ b/apps/files_external/command/listcommand.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -102,6 +102,16 @@ class ListCommand extends Base { /** @var $mounts StorageConfig[] */ $mounts = $storageService->getAllStorages(); + $this->listMounts($userId, $mounts, $input, $output); + } + + /** + * @param $userId $userId + * @param StorageConfig[] $mounts + * @param InputInterface $input + * @param OutputInterface $output + */ + public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output){ if (count($mounts) === 0) { if ($userId) { $output->writeln("<info>No mounts configured by $userId</info>"); diff --git a/apps/files_external/command/option.php b/apps/files_external/command/option.php index 64dafb8f6dc..292005134cb 100644 --- a/apps/files_external/command/option.php +++ b/apps/files_external/command/option.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php index b278d66c1c0..cfccacb03ea 100644 --- a/apps/files_external/controller/ajaxcontroller.php +++ b/apps/files_external/controller/ajaxcontroller.php @@ -1,10 +1,10 @@ <?php /** * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Ross Nicoll <jrn@jrn.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php index e36d1fb2c03..64bbf0feb3f 100644 --- a/apps/files_external/controller/globalstoragescontroller.php +++ b/apps/files_external/controller/globalstoragescontroller.php @@ -1,9 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php index 7712f9769c9..07e2e69f601 100644 --- a/apps/files_external/controller/storagescontroller.php +++ b/apps/files_external/controller/storagescontroller.php @@ -1,9 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Jesús Macias <jmacias@solidgear.es> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/controller/userglobalstoragescontroller.php b/apps/files_external/controller/userglobalstoragescontroller.php index c6f777763e8..5aea7875ed4 100644 --- a/apps/files_external/controller/userglobalstoragescontroller.php +++ b/apps/files_external/controller/userglobalstoragescontroller.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php index 71d1f7cca46..345e4bf652b 100644 --- a/apps/files_external/controller/userstoragescontroller.php +++ b/apps/files_external/controller/userstoragescontroller.php @@ -1,9 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -63,6 +63,17 @@ class UserStoragesController extends StoragesController { } /** + * Get all storage entries + * + * @NoAdminRequired + * + * @return DataResponse + */ + public function index() { + return parent::index(); + } + + /** * Return storage * * @NoAdminRequired diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 59cf55d6ad5..2f879e1c850 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -1210,13 +1210,6 @@ $(document).ready(function() { }); mountConfigListView.loadStorages(); - $('#sslCertificate').on('click', 'td.remove>img', function() { - var $tr = $(this).closest('tr'); - $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: $tr.attr('id')}); - $tr.remove(); - return true; - }); - // TODO: move this into its own View class var $allowUserMounting = $('#allowUserMounting'); $allowUserMounting.bind('change', function() { diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js index c6252c4fc38..f7ec6fea3b3 100644 --- a/apps/files_external/l10n/fi_FI.js +++ b/apps/files_external/l10n/fi_FI.js @@ -29,6 +29,9 @@ OC.L10N.register( "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Erillisten liitospisteiden listauksen noutaminen epäonnistui: {type}", "There was an error with message: " : "Tapahtui virhe viestillä:", + "External mount error" : "Ulkoinen liitosvirhe", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows-verkkoasemien liitospisteiden listauksen noutaminen epäonnistui: tyhjä vastaus palvelimelta", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Jotkin määritetyt erilliset liitospisteet eivät ole yhdistettynä. Napsauta punaisia rivejä saadaksesi lisätietoja", "Builtin" : "Sisäänrakennettu", "None" : "Ei mitään", "OAuth1" : "OAuth1", diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json index 851bb280186..368121feae8 100644 --- a/apps/files_external/l10n/fi_FI.json +++ b/apps/files_external/l10n/fi_FI.json @@ -27,6 +27,9 @@ "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Erillisten liitospisteiden listauksen noutaminen epäonnistui: {type}", "There was an error with message: " : "Tapahtui virhe viestillä:", + "External mount error" : "Ulkoinen liitosvirhe", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows-verkkoasemien liitospisteiden listauksen noutaminen epäonnistui: tyhjä vastaus palvelimelta", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Jotkin määritetyt erilliset liitospisteet eivät ole yhdistettynä. Napsauta punaisia rivejä saadaksesi lisätietoja", "Builtin" : "Sisäänrakennettu", "None" : "Ei mitään", "OAuth1" : "OAuth1", diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js index d7b8f95166b..5bf00934608 100644 --- a/apps/files_external/l10n/th_TH.js +++ b/apps/files_external/l10n/th_TH.js @@ -41,6 +41,8 @@ OC.L10N.register( "Couldn't get the list of external mount points: {type}" : "ไม่สามารถรับรายชื่อของจุดเชื่อมต่อภายนอก: {type}", "There was an error with message: " : "มีข้อความแสดงข้อผิดพลาด", "External mount error" : "การติดจากตั้งภายนอกเกิดข้อผิดพลาด", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "ไม่สามารถรับรายชื่อไดรฟ์เครือข่ายของวินโดว์ส จุดที่ติดตั้ง: ไม่มีการตอบสนองจากเซิร์ฟเวอร์", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "การกำหนดค่าบางส่วนของจุดเชื่อมต่อภายนอกไม่ถูกเชื่อมต่อ กรุณาคลิกที่ตรงสีแดงสำหรับข้อมูลเพิ่มเติม", "Access key" : "คีย์การเข้าถึง", "Secret key" : "คีย์ลับ", "Builtin" : "ในตัว", diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json index 997ab58e332..935a0380a52 100644 --- a/apps/files_external/l10n/th_TH.json +++ b/apps/files_external/l10n/th_TH.json @@ -39,6 +39,8 @@ "Couldn't get the list of external mount points: {type}" : "ไม่สามารถรับรายชื่อของจุดเชื่อมต่อภายนอก: {type}", "There was an error with message: " : "มีข้อความแสดงข้อผิดพลาด", "External mount error" : "การติดจากตั้งภายนอกเกิดข้อผิดพลาด", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "ไม่สามารถรับรายชื่อไดรฟ์เครือข่ายของวินโดว์ส จุดที่ติดตั้ง: ไม่มีการตอบสนองจากเซิร์ฟเวอร์", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "การกำหนดค่าบางส่วนของจุดเชื่อมต่อภายนอกไม่ถูกเชื่อมต่อ กรุณาคลิกที่ตรงสีแดงสำหรับข้อมูลเพิ่มเติม", "Access key" : "คีย์การเข้าถึง", "Secret key" : "คีย์ลับ", "Builtin" : "ในตัว", diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 4b867c005a7..cb2082ee38b 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -12,11 +12,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/api.php b/apps/files_external/lib/api.php index f0c9e568c9e..50a2f38c65b 100644 --- a/apps/files_external/lib/api.php +++ b/apps/files_external/lib/api.php @@ -1,11 +1,12 @@ <?php /** + * @author Jesús Macias <jmacias@solidgear.es> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/auth/amazons3/accesskey.php index d265db6279f..296ed59a77a 100644 --- a/apps/files_external/lib/auth/amazons3/accesskey.php +++ b/apps/files_external/lib/auth/amazons3/accesskey.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php index e695cbbebd5..72b56e0bc06 100644 --- a/apps/files_external/lib/auth/authmechanism.php +++ b/apps/files_external/lib/auth/authmechanism.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/builtin.php b/apps/files_external/lib/auth/builtin.php index 8fb4c901cbc..8b43cb459cc 100644 --- a/apps/files_external/lib/auth/builtin.php +++ b/apps/files_external/lib/auth/builtin.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/nullmechanism.php b/apps/files_external/lib/auth/nullmechanism.php index 399c8301c5a..06083729e59 100644 --- a/apps/files_external/lib/auth/nullmechanism.php +++ b/apps/files_external/lib/auth/nullmechanism.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/auth/oauth1/oauth1.php index 7bdd01d4c16..dd83c9a6a69 100644 --- a/apps/files_external/lib/auth/oauth1/oauth1.php +++ b/apps/files_external/lib/auth/oauth1/oauth1.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/auth/oauth2/oauth2.php index 7123f8c16e3..c89007b52ba 100644 --- a/apps/files_external/lib/auth/oauth2/oauth2.php +++ b/apps/files_external/lib/auth/oauth2/oauth2.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/auth/openstack/openstack.php index 757fdab9ea6..80bbb1299f7 100644 --- a/apps/files_external/lib/auth/openstack/openstack.php +++ b/apps/files_external/lib/auth/openstack/openstack.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/auth/openstack/rackspace.php index 395b58e6fae..c968321ca6c 100644 --- a/apps/files_external/lib/auth/openstack/rackspace.php +++ b/apps/files_external/lib/auth/openstack/rackspace.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/password/password.php b/apps/files_external/lib/auth/password/password.php index d3444cb1419..3b1942cc4a8 100644 --- a/apps/files_external/lib/auth/password/password.php +++ b/apps/files_external/lib/auth/password/password.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/password/sessioncredentials.php b/apps/files_external/lib/auth/password/sessioncredentials.php index 8e36ff5f1d8..4f7d24c2f60 100644 --- a/apps/files_external/lib/auth/password/sessioncredentials.php +++ b/apps/files_external/lib/auth/password/sessioncredentials.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php index 4e19f90c83b..131b3f36526 100644 --- a/apps/files_external/lib/auth/publickey/rsa.php +++ b/apps/files_external/lib/auth/publickey/rsa.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/backend/amazons3.php index 538b53637e3..b2dedc10e4a 100644 --- a/apps/files_external/lib/backend/amazons3.php +++ b/apps/files_external/lib/backend/amazons3.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php index 9868519ed4f..8fb84b0e835 100644 --- a/apps/files_external/lib/backend/backend.php +++ b/apps/files_external/lib/backend/backend.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/backend/dav.php index abc5103c70f..c6e9630be9e 100644 --- a/apps/files_external/lib/backend/dav.php +++ b/apps/files_external/lib/backend/dav.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php index 01b7a62edbe..7a414731192 100644 --- a/apps/files_external/lib/backend/dropbox.php +++ b/apps/files_external/lib/backend/dropbox.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/backend/ftp.php index 8f3dfffc77b..b2b83a27405 100644 --- a/apps/files_external/lib/backend/ftp.php +++ b/apps/files_external/lib/backend/ftp.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php index 14b2815b6e5..93a8cd2177d 100644 --- a/apps/files_external/lib/backend/google.php +++ b/apps/files_external/lib/backend/google.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php index 5ebf143f749..084758ff78a 100644 --- a/apps/files_external/lib/backend/legacybackend.php +++ b/apps/files_external/lib/backend/legacybackend.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/backend/local.php index 7827055eeac..1db707e7247 100644 --- a/apps/files_external/lib/backend/local.php +++ b/apps/files_external/lib/backend/local.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/owncloud.php b/apps/files_external/lib/backend/owncloud.php index d10f0b3bd0b..e7da328c5f1 100644 --- a/apps/files_external/lib/backend/owncloud.php +++ b/apps/files_external/lib/backend/owncloud.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/backend/sftp.php index d3fcd41d520..3e5ecb90131 100644 --- a/apps/files_external/lib/backend/sftp.php +++ b/apps/files_external/lib/backend/sftp.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php index 8db5761c1b2..58dddedf784 100644 --- a/apps/files_external/lib/backend/sftp_key.php +++ b/apps/files_external/lib/backend/sftp_key.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php index aa91cf51e85..aaf7658751f 100644 --- a/apps/files_external/lib/backend/smb.php +++ b/apps/files_external/lib/backend/smb.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php index b84b0b9dcb1..57fdfc30ff3 100644 --- a/apps/files_external/lib/backend/smb_oc.php +++ b/apps/files_external/lib/backend/smb_oc.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php index 8c64c791ad8..d6e4ac12f9a 100644 --- a/apps/files_external/lib/backend/swift.php +++ b/apps/files_external/lib/backend/swift.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index f29e08dad25..578a8d82b2f 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -4,17 +4,19 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Frank Karlitschek <frank@owncloud.org> + * @author Jesús Macias <jmacias@solidgear.es> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php index 4f68c3c7fde..0cd1381c815 100644 --- a/apps/files_external/lib/config/configadapter.php +++ b/apps/files_external/lib/config/configadapter.php @@ -2,9 +2,9 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/definitionparameter.php index 7f883e5fad1..59a098e6320 100644 --- a/apps/files_external/lib/definitionparameter.php +++ b/apps/files_external/lib/definitionparameter.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/dependencytrait.php index f112f6c2e66..eed3ba1b327 100644 --- a/apps/files_external/lib/dependencytrait.php +++ b/apps/files_external/lib/dependencytrait.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index df8a0255134..3c4022f24ce 100644 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -5,12 +5,12 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Sascha Schmidt <realriot@realriot.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/failedstorage.php b/apps/files_external/lib/failedstorage.php index c3181fd6b02..95fe179f570 100644 --- a/apps/files_external/lib/failedstorage.php +++ b/apps/files_external/lib/failedstorage.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/frontenddefinitiontrait.php index d3b78aa56d4..eedd433f2d7 100644 --- a/apps/files_external/lib/frontenddefinitiontrait.php +++ b/apps/files_external/lib/frontenddefinitiontrait.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index f3631e53fa1..125888ef722 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -7,11 +7,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index eba2ee7f9b5..72ebd4e821d 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -10,11 +10,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/identifiertrait.php b/apps/files_external/lib/identifiertrait.php index 913e1899db8..c49f4fcbc8d 100644 --- a/apps/files_external/lib/identifiertrait.php +++ b/apps/files_external/lib/identifiertrait.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php b/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php index f77667cb70a..871301b9b51 100644 --- a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php +++ b/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/legacydependencycheckpolyfill.php index bd0095debcd..7d6c0c4b45b 100644 --- a/apps/files_external/lib/legacydependencycheckpolyfill.php +++ b/apps/files_external/lib/legacydependencycheckpolyfill.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/missingdependency.php b/apps/files_external/lib/missingdependency.php index 9b25aeacc9b..a4a20dd1128 100644 --- a/apps/files_external/lib/missingdependency.php +++ b/apps/files_external/lib/missingdependency.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/notfoundexception.php b/apps/files_external/lib/notfoundexception.php index 4a92ae2e889..dd3dd1907a5 100644 --- a/apps/files_external/lib/notfoundexception.php +++ b/apps/files_external/lib/notfoundexception.php @@ -2,7 +2,7 @@ /** * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/owncloud.php b/apps/files_external/lib/owncloud.php index 6e798ab8e33..c4824e6bd14 100644 --- a/apps/files_external/lib/owncloud.php +++ b/apps/files_external/lib/owncloud.php @@ -1,10 +1,10 @@ <?php /** * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/personalmount.php index 34ae516ea5e..4761866fa1a 100644 --- a/apps/files_external/lib/personalmount.php +++ b/apps/files_external/lib/personalmount.php @@ -2,9 +2,10 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/prioritytrait.php b/apps/files_external/lib/prioritytrait.php index 22f9fe275d8..9745015bef4 100644 --- a/apps/files_external/lib/prioritytrait.php +++ b/apps/files_external/lib/prioritytrait.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/sessionstoragewrapper.php b/apps/files_external/lib/sessionstoragewrapper.php index e45589c4472..c592cb87a34 100644 --- a/apps/files_external/lib/sessionstoragewrapper.php +++ b/apps/files_external/lib/sessionstoragewrapper.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index bcf3143736e..ec808cd76dc 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -8,12 +8,13 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Ross Nicoll <jrn@jrn.me.uk> * @author SA <stephen@mthosting.net> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 125e0a6dd2c..9da21dc88e6 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -6,11 +6,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -35,6 +35,7 @@ use Icewind\SMB\NativeServer; use Icewind\SMB\Server; use Icewind\Streams\CallbackWrapper; use Icewind\Streams\IteratorDirectory; +use OC\Cache\CappedMemoryCache; use OC\Files\Filesystem; class SMB extends Common { @@ -49,9 +50,14 @@ class SMB extends Common { protected $share; /** + * @var string + */ + protected $root; + + /** * @var \Icewind\SMB\FileInfo[] */ - protected $statCache = array(); + protected $statCache; public function __construct($params) { if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) { @@ -72,6 +78,7 @@ class SMB extends Common { } else { throw new \Exception('Invalid configuration'); } + $this->statCache = new CappedMemoryCache(); } /** diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/storageconfig.php index b369a45f407..33646e603c3 100644 --- a/apps/files_external/lib/storageconfig.php +++ b/apps/files_external/lib/storageconfig.php @@ -1,9 +1,11 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Lukas Reschke <lukas@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/storagemodifiertrait.php b/apps/files_external/lib/storagemodifiertrait.php index 6d31ce8999a..ec2b0a14ab1 100644 --- a/apps/files_external/lib/storagemodifiertrait.php +++ b/apps/files_external/lib/storagemodifiertrait.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php index 387667a81a9..1f1e52aff75 100644 --- a/apps/files_external/lib/streamwrapper.php +++ b/apps/files_external/lib/streamwrapper.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 4973f576ab6..8f58a50b294 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -9,11 +9,12 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Tim Dettrick <t.dettrick@uq.edu.au> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/visibilitytrait.php index dfd2d323ca6..916c8e69d9c 100644 --- a/apps/files_external/lib/visibilitytrait.php +++ b/apps/files_external/lib/visibilitytrait.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/list.php b/apps/files_external/list.php index 4bbe5588c26..15e05b0e35c 100644 --- a/apps/files_external/list.php +++ b/apps/files_external/list.php @@ -1,8 +1,9 @@ <?php /** + * @author Jesús Macias <jmacias@solidgear.es> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/migration/dummyusersession.php b/apps/files_external/migration/dummyusersession.php index 9ffbfd6309f..bb4ef19dace 100644 --- a/apps/files_external/migration/dummyusersession.php +++ b/apps/files_external/migration/dummyusersession.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/migration/storagemigrator.php b/apps/files_external/migration/storagemigrator.php index b469205ac55..2da47decf9f 100644 --- a/apps/files_external/migration/storagemigrator.php +++ b/apps/files_external/migration/storagemigrator.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php index 05196a58905..4d8f480ecc0 100644 --- a/apps/files_external/personal.php +++ b/apps/files_external/personal.php @@ -1,14 +1,13 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php index b325517e58a..9b23a441c7c 100644 --- a/apps/files_external/service/backendservice.php +++ b/apps/files_external/service/backendservice.php @@ -1,8 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/dbconfigservice.php b/apps/files_external/service/dbconfigservice.php index 810a57963f8..94debcd7ebe 100644 --- a/apps/files_external/service/dbconfigservice.php +++ b/apps/files_external/service/dbconfigservice.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/globallegacystoragesservice.php b/apps/files_external/service/globallegacystoragesservice.php index cc6a8862cdd..ed9b1bcf075 100644 --- a/apps/files_external/service/globallegacystoragesservice.php +++ b/apps/files_external/service/globallegacystoragesservice.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php index c524020e025..312d8417a92 100644 --- a/apps/files_external/service/globalstoragesservice.php +++ b/apps/files_external/service/globalstoragesservice.php @@ -1,10 +1,11 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/importlegacystoragesservice.php b/apps/files_external/service/importlegacystoragesservice.php new file mode 100644 index 00000000000..7219df314d7 --- /dev/null +++ b/apps/files_external/service/importlegacystoragesservice.php @@ -0,0 +1,46 @@ +<?php +/** + * @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_external\Service; + +class ImportLegacyStoragesService extends LegacyStoragesService { + private $data; + + /** + * @param BackendService $backendService + */ + public function __construct(BackendService $backendService) { + $this->backendService = $backendService; + } + + public function setData($data) { + $this->data = $data; + } + + /** + * Read legacy config data + * + * @return array list of mount configs + */ + protected function readLegacyConfig() { + return $this->data; + } +} diff --git a/apps/files_external/service/legacystoragesservice.php b/apps/files_external/service/legacystoragesservice.php index 19cec733c13..bab1008e561 100644 --- a/apps/files_external/service/legacystoragesservice.php +++ b/apps/files_external/service/legacystoragesservice.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php index 26ff956d27e..5d3f5f431b9 100644 --- a/apps/files_external/service/storagesservice.php +++ b/apps/files_external/service/storagesservice.php @@ -1,10 +1,13 @@ <?php /** + * @author Jesús Macias <jmacias@solidgear.es> * @author Lukas Reschke <lukas@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php index 50973883563..6407db2dd54 100644 --- a/apps/files_external/service/userglobalstoragesservice.php +++ b/apps/files_external/service/userglobalstoragesservice.php @@ -1,8 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/userlegacystoragesservice.php b/apps/files_external/service/userlegacystoragesservice.php index 13f34225d60..2f14857c633 100644 --- a/apps/files_external/service/userlegacystoragesservice.php +++ b/apps/files_external/service/userlegacystoragesservice.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php index 19981dd0137..2805d9e6935 100644 --- a/apps/files_external/service/userstoragesservice.php +++ b/apps/files_external/service/userstoragesservice.php @@ -1,9 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/service/usertrait.php b/apps/files_external/service/usertrait.php index 924f358f939..536c0f67e1f 100644 --- a/apps/files_external/service/usertrait.php +++ b/apps/files_external/service/usertrait.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php index 50d47d667fd..0d83d26ff97 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -2,14 +2,12 @@ /** * @author Frank Karlitschek <frank@owncloud.org> * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> - * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php index cc47107c7fe..679a880475e 100644 --- a/apps/files_external/tests/amazons3migration.php +++ b/apps/files_external/tests/amazons3migration.php @@ -3,9 +3,11 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/auth/authmechanismtest.php b/apps/files_external/tests/auth/authmechanismtest.php index 6933cc988b1..789d1f62478 100644 --- a/apps/files_external/tests/auth/authmechanismtest.php +++ b/apps/files_external/tests/auth/authmechanismtest.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backend/backendtest.php b/apps/files_external/tests/backend/backendtest.php index 9e0e27c824b..50f6d975bf0 100644 --- a/apps/files_external/tests/backend/backendtest.php +++ b/apps/files_external/tests/backend/backendtest.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php index 6c977522e9e..d825b7627b7 100644 --- a/apps/files_external/tests/backend/legacybackendtest.php +++ b/apps/files_external/tests/backend/legacybackendtest.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/amazons3.php b/apps/files_external/tests/backends/amazons3.php index e1465b51125..3b43f81a926 100644 --- a/apps/files_external/tests/backends/amazons3.php +++ b/apps/files_external/tests/backends/amazons3.php @@ -4,9 +4,10 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/dropbox.php b/apps/files_external/tests/backends/dropbox.php index 8dd0e58adc1..1bf8b4171fb 100644 --- a/apps/files_external/tests/backends/dropbox.php +++ b/apps/files_external/tests/backends/dropbox.php @@ -4,9 +4,10 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/ftp.php b/apps/files_external/tests/backends/ftp.php index b715f0f780d..868a022d38f 100644 --- a/apps/files_external/tests/backends/ftp.php +++ b/apps/files_external/tests/backends/ftp.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/google.php b/apps/files_external/tests/backends/google.php index c9a5d48382c..7622f796407 100644 --- a/apps/files_external/tests/backends/google.php +++ b/apps/files_external/tests/backends/google.php @@ -6,8 +6,9 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/owncloud.php b/apps/files_external/tests/backends/owncloud.php index d51fa638c50..a56e9b2a186 100644 --- a/apps/files_external/tests/backends/owncloud.php +++ b/apps/files_external/tests/backends/owncloud.php @@ -2,9 +2,10 @@ /** * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/sftp.php b/apps/files_external/tests/backends/sftp.php index 03f2dcc0d77..608982adbc4 100644 --- a/apps/files_external/tests/backends/sftp.php +++ b/apps/files_external/tests/backends/sftp.php @@ -4,9 +4,10 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/sftp_key.php b/apps/files_external/tests/backends/sftp_key.php index 762cb0887c1..73c6a0b6432 100644 --- a/apps/files_external/tests/backends/sftp_key.php +++ b/apps/files_external/tests/backends/sftp_key.php @@ -2,9 +2,10 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Ross Nicoll <jrn@jrn.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Viktor Szépe <viktor@szepe.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/smb.php b/apps/files_external/tests/backends/smb.php index 0c43aba24dd..f9a377c271b 100644 --- a/apps/files_external/tests/backends/smb.php +++ b/apps/files_external/tests/backends/smb.php @@ -3,9 +3,10 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/swift.php b/apps/files_external/tests/backends/swift.php index b71b4f77add..9bdcd48ee68 100644 --- a/apps/files_external/tests/backends/swift.php +++ b/apps/files_external/tests/backends/swift.php @@ -2,11 +2,12 @@ /** * @author Christian Berendt <berendt@b1-systems.de> * @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 Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/backends/webdav.php b/apps/files_external/tests/backends/webdav.php index 130e0c99cb3..e1a710c94b4 100644 --- a/apps/files_external/tests/backends/webdav.php +++ b/apps/files_external/tests/backends/webdav.php @@ -3,9 +3,10 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php index 19dad215a36..9784de7db15 100644 --- a/apps/files_external/tests/config.php +++ b/apps/files_external/tests/config.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/controller/globalstoragescontrollertest.php b/apps/files_external/tests/controller/globalstoragescontrollertest.php index 37b5fed1481..a3c911b511c 100644 --- a/apps/files_external/tests/controller/globalstoragescontrollertest.php +++ b/apps/files_external/tests/controller/globalstoragescontrollertest.php @@ -1,9 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php index 747bcd46e17..97fe3cf5176 100644 --- a/apps/files_external/tests/controller/storagescontrollertest.php +++ b/apps/files_external/tests/controller/storagescontrollertest.php @@ -1,9 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php index acb25d11d09..dd761fa9767 100644 --- a/apps/files_external/tests/controller/userstoragescontrollertest.php +++ b/apps/files_external/tests/controller/userstoragescontrollertest.php @@ -1,9 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/definitionparameterttest.php b/apps/files_external/tests/definitionparameterttest.php index 3983a805dad..dc7c150ec96 100644 --- a/apps/files_external/tests/definitionparameterttest.php +++ b/apps/files_external/tests/definitionparameterttest.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/frontenddefinitiontraittest.php index d446813fe92..209b1abc7e0 100644 --- a/apps/files_external/tests/frontenddefinitiontraittest.php +++ b/apps/files_external/tests/frontenddefinitiontraittest.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/legacydependencycheckpolyfilltest.php b/apps/files_external/tests/legacydependencycheckpolyfilltest.php index 41109b63c1e..4b1351a809d 100644 --- a/apps/files_external/tests/legacydependencycheckpolyfilltest.php +++ b/apps/files_external/tests/legacydependencycheckpolyfilltest.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php index 887dd91539b..019f988275e 100644 --- a/apps/files_external/tests/owncloudfunctions.php +++ b/apps/files_external/tests/owncloudfunctions.php @@ -2,10 +2,11 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/personalmounttest.php b/apps/files_external/tests/personalmounttest.php index b56d69aa9be..d82773ad749 100644 --- a/apps/files_external/tests/personalmounttest.php +++ b/apps/files_external/tests/personalmounttest.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php index e9cb0e2c368..9b4e728de22 100644 --- a/apps/files_external/tests/service/backendservicetest.php +++ b/apps/files_external/tests/service/backendservicetest.php @@ -1,8 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/service/dbconfigservicetest.php b/apps/files_external/tests/service/dbconfigservicetest.php index bfb564c6663..2ee4c232c0d 100644 --- a/apps/files_external/tests/service/dbconfigservicetest.php +++ b/apps/files_external/tests/service/dbconfigservicetest.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/service/globalstoragesservicetest.php index e620b05a51e..7fc60efca08 100644 --- a/apps/files_external/tests/service/globalstoragesservicetest.php +++ b/apps/files_external/tests/service/globalstoragesservicetest.php @@ -1,9 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php index d5430982899..710d804fd39 100644 --- a/apps/files_external/tests/service/storagesservicetest.php +++ b/apps/files_external/tests/service/storagesservicetest.php @@ -1,9 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php index d4c48b3f691..a22e2874073 100644 --- a/apps/files_external/tests/service/userglobalstoragesservicetest.php +++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php @@ -1,9 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/service/userstoragesservicetest.php index a2d3819427c..bf0efc13cf5 100644 --- a/apps/files_external/tests/service/userstoragesservicetest.php +++ b/apps/files_external/tests/service/userstoragesservicetest.php @@ -1,9 +1,10 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/storageconfigtest.php b/apps/files_external/tests/storageconfigtest.php index c987f7a84e2..d7f8d2b4d7d 100644 --- a/apps/files_external/tests/storageconfigtest.php +++ b/apps/files_external/tests/storageconfigtest.php @@ -1,9 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php index 2ba1cb470c2..1efe4356b4c 100644 --- a/apps/files_sharing/ajax/external.php +++ b/apps/files_sharing/ajax/external.php @@ -8,7 +8,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php index 2902969b21f..ac48ee01913 100644 --- a/apps/files_sharing/ajax/publicpreview.php +++ b/apps/files_sharing/ajax/publicpreview.php @@ -7,7 +7,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php index db6194d3f05..e531e84ebbc 100644 --- a/apps/files_sharing/ajax/shareinfo.php +++ b/apps/files_sharing/ajax/shareinfo.php @@ -5,7 +5,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php index 5b2f2e06e75..7d59d68ca6f 100644 --- a/apps/files_sharing/api/local.php +++ b/apps/files_sharing/api/local.php @@ -2,13 +2,14 @@ /** * @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 Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/api/ocssharewrapper.php b/apps/files_sharing/api/ocssharewrapper.php index 4640f4ea185..8195e92b29c 100644 --- a/apps/files_sharing/api/ocssharewrapper.php +++ b/apps/files_sharing/api/ocssharewrapper.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php index fb692f8a9a6..06b2e6c1687 100644 --- a/apps/files_sharing/api/remote.php +++ b/apps/files_sharing/api/remote.php @@ -1,9 +1,10 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index 93998ad774e..e1195cb9573 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -6,7 +6,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php index 003c028bf97..f81eb071a37 100644 --- a/apps/files_sharing/api/share20ocs.php +++ b/apps/files_sharing/api/share20ocs.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php index 24b51d7afe4..d23a6f56501 100644 --- a/apps/files_sharing/api/sharees.php +++ b/apps/files_sharing/api/sharees.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -353,7 +353,7 @@ class Sharees { $this->limit = (int) $perPage; $this->offset = $perPage * ($page - 1); - return $this->searchSharees(strtolower($search), $itemType, $shareTypes, $page, $perPage); + return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage); } /** diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index d7f3ba6e98d..7a418d179db 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -6,9 +6,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php index 6af450405a3..4f47027953a 100644 --- a/apps/files_sharing/appinfo/application.php +++ b/apps/files_sharing/appinfo/application.php @@ -4,9 +4,8 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> - * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/appinfo/install.php b/apps/files_sharing/appinfo/install.php index 5185ae883f3..33bbc8e2a84 100644 --- a/apps/files_sharing/appinfo/install.php +++ b/apps/files_sharing/appinfo/install.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 8755691c1e8..961206079be 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -8,7 +8,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index 8bff20cc442..549b25dae83 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/activity.php b/apps/files_sharing/lib/activity.php index c5eb7d09ede..37a8113b916 100644 --- a/apps/files_sharing/lib/activity.php +++ b/apps/files_sharing/lib/activity.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index c9032413783..714cc144c0b 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -7,13 +7,13 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php index 220878ec2aa..913f248b174 100644 --- a/apps/files_sharing/lib/capabilities.php +++ b/apps/files_sharing/lib/capabilities.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php index ec576065669..7ac2ef781a8 100644 --- a/apps/files_sharing/lib/controllers/externalsharescontroller.php +++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php @@ -4,8 +4,9 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index e28019c358c..63ab49b4df3 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -6,10 +6,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/deleteorphanedsharesjob.php b/apps/files_sharing/lib/deleteorphanedsharesjob.php index 0654c82dd94..72bf6b222e7 100644 --- a/apps/files_sharing/lib/deleteorphanedsharesjob.php +++ b/apps/files_sharing/lib/deleteorphanedsharesjob.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/exceptions/brokenpath.php b/apps/files_sharing/lib/exceptions/brokenpath.php index 71fe93f8e92..4639d47c4a6 100644 --- a/apps/files_sharing/lib/exceptions/brokenpath.php +++ b/apps/files_sharing/lib/exceptions/brokenpath.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/exceptions/s2sexception.php b/apps/files_sharing/lib/exceptions/s2sexception.php index fe2659d36ff..1ed6a9e2179 100644 --- a/apps/files_sharing/lib/exceptions/s2sexception.php +++ b/apps/files_sharing/lib/exceptions/s2sexception.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/expiresharesjob.php b/apps/files_sharing/lib/expiresharesjob.php index bcd3fbe4605..479f407e68f 100644 --- a/apps/files_sharing/lib/expiresharesjob.php +++ b/apps/files_sharing/lib/expiresharesjob.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/external/cache.php b/apps/files_sharing/lib/external/cache.php index e99c00e884f..da9bf83cdfa 100644 --- a/apps/files_sharing/lib/external/cache.php +++ b/apps/files_sharing/lib/external/cache.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php index 020f55c5157..7112aa63d17 100644 --- a/apps/files_sharing/lib/external/manager.php +++ b/apps/files_sharing/lib/external/manager.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/external/mount.php b/apps/files_sharing/lib/external/mount.php index 17923be8736..9cf66d3f8f0 100644 --- a/apps/files_sharing/lib/external/mount.php +++ b/apps/files_sharing/lib/external/mount.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/external/mountprovider.php b/apps/files_sharing/lib/external/mountprovider.php index 1739cec543f..0bef3539c42 100644 --- a/apps/files_sharing/lib/external/mountprovider.php +++ b/apps/files_sharing/lib/external/mountprovider.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php index 455225b2b79..3335fc4707c 100644 --- a/apps/files_sharing/lib/external/scanner.php +++ b/apps/files_sharing/lib/external/scanner.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php index 36ff4f0c226..783eea43c62 100644 --- a/apps/files_sharing/lib/external/storage.php +++ b/apps/files_sharing/lib/external/storage.php @@ -6,7 +6,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index 391b491e1ff..ca60f622844 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -10,7 +10,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php index 079824f7fb0..166905b9aa4 100644 --- a/apps/files_sharing/lib/hooks.php +++ b/apps/files_sharing/lib/hooks.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/isharedstorage.php b/apps/files_sharing/lib/isharedstorage.php index cbbb40a2688..bb47b011f48 100644 --- a/apps/files_sharing/lib/isharedstorage.php +++ b/apps/files_sharing/lib/isharedstorage.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/maintainer.php b/apps/files_sharing/lib/maintainer.php index af8e1ac6668..a728f6bbb67 100644 --- a/apps/files_sharing/lib/maintainer.php +++ b/apps/files_sharing/lib/maintainer.php @@ -1,9 +1,9 @@ <?php /** * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php index 04dd28574d6..a4a968b37fa 100644 --- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php +++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php @@ -5,7 +5,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/migration.php b/apps/files_sharing/lib/migration.php index f48467e1fad..0c5f46a5b3f 100644 --- a/apps/files_sharing/lib/migration.php +++ b/apps/files_sharing/lib/migration.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php index 74a2a3ff4d6..4a60e44bb26 100644 --- a/apps/files_sharing/lib/mountprovider.php +++ b/apps/files_sharing/lib/mountprovider.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/notifier.php b/apps/files_sharing/lib/notifier.php index 02765fcfd1c..c5c56151458 100644 --- a/apps/files_sharing/lib/notifier.php +++ b/apps/files_sharing/lib/notifier.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/scanner.php b/apps/files_sharing/lib/scanner.php index 23503bb56f2..1152c49755a 100644 --- a/apps/files_sharing/lib/scanner.php +++ b/apps/files_sharing/lib/scanner.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index ffc417db2f4..113675508fb 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -11,7 +11,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php index 5e7cd8099db..1004f049866 100644 --- a/apps/files_sharing/lib/share/folder.php +++ b/apps/files_sharing/lib/share/folder.php @@ -4,10 +4,10 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php index f205b1e78a5..41194ec5862 100644 --- a/apps/files_sharing/lib/sharedmount.php +++ b/apps/files_sharing/lib/sharedmount.php @@ -5,8 +5,9 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/sharedpropagator.php b/apps/files_sharing/lib/sharedpropagator.php index fcb4b92dd33..fd3e14b28f8 100644 --- a/apps/files_sharing/lib/sharedpropagator.php +++ b/apps/files_sharing/lib/sharedpropagator.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 38f79762dc6..697856e1de5 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -6,12 +6,12 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author scambra <sergio@entrecables.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -699,4 +699,11 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { public function setAvailability($available) { // shares do not participate in availability logic } + + public function isLocal() { + $this->init(); + $ownerPath = $this->ownerView->getPath($this->share['item_source']); + list($targetStorage) = $this->ownerView->resolvePath($ownerPath); + return $targetStorage->isLocal(); + } } diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 2d165a5df04..9a1e554046b 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -8,7 +8,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/watcher.php b/apps/files_sharing/lib/watcher.php index 3af6f733b51..9a8968f2265 100644 --- a/apps/files_sharing/lib/watcher.php +++ b/apps/files_sharing/lib/watcher.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 2577ed91006..5d5d061187c 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -2,7 +2,7 @@ /** * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 772419e64e4..0d67edcd362 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/settings-admin.php b/apps/files_sharing/settings-admin.php index 9a89c45bfd7..b2a305ebcdb 100644 --- a/apps/files_sharing/settings-admin.php +++ b/apps/files_sharing/settings-admin.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php index 85fad9c3eaf..982a8b05c15 100644 --- a/apps/files_sharing/settings-personal.php +++ b/apps/files_sharing/settings-personal.php @@ -2,10 +2,9 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Jan-Christoph Borchardt <hey@jancborchardt.net> - * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/activity.php b/apps/files_sharing/tests/activity.php index fa626749957..b3575b0b709 100644 --- a/apps/files_sharing/tests/activity.php +++ b/apps/files_sharing/tests/activity.php @@ -3,8 +3,9 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 36ae3398393..49a08d3d0ce 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -4,12 +4,12 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/api/share20ocstest.php b/apps/files_sharing/tests/api/share20ocstest.php index 74a5d0752a4..b594d253eb2 100644 --- a/apps/files_sharing/tests/api/share20ocstest.php +++ b/apps/files_sharing/tests/api/share20ocstest.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php index 96ffe4682c0..4b8034a48b7 100644 --- a/apps/files_sharing/tests/api/shareestest.php +++ b/apps/files_sharing/tests/api/shareestest.php @@ -2,8 +2,10 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -1043,6 +1045,10 @@ class ShareesTest extends TestCase { [[], 'no', 'yes', true, '', null, $allTypes, 1, 200, false, true], [[], 'no', 'no', true, '', null, $allTypes, 1, 200, false, false], + // Test keep case for search + [[ + 'search' => 'foo@example.com/ownCloud', + ], '', 'yes', true, 'foo@example.com/ownCloud', null, $allTypes, 1, 200, false, true], ]; } diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php index 57cdfc45115..0e151d9e76a 100644 --- a/apps/files_sharing/tests/backend.php +++ b/apps/files_sharing/tests/backend.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php index df7f4fd19a3..c137ba0728d 100644 --- a/apps/files_sharing/tests/cache.php +++ b/apps/files_sharing/tests/cache.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php index 6fb76f10c24..7572f5c84aa 100644 --- a/apps/files_sharing/tests/capabilities.php +++ b/apps/files_sharing/tests/capabilities.php @@ -2,8 +2,9 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/controller/externalsharecontroller.php b/apps/files_sharing/tests/controller/externalsharecontroller.php index 4913c7308ba..ab5f1c153f3 100644 --- a/apps/files_sharing/tests/controller/externalsharecontroller.php +++ b/apps/files_sharing/tests/controller/externalsharecontroller.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index 398538f0943..914c98d9470 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -1,13 +1,16 @@ <?php /** + * @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 <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Cloutier <vincent1cloutier@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -76,7 +79,7 @@ class ShareControllerTest extends \Test\TestCase { $this->oldUser = \OC_User::getUser(); // Create a dummy user - $this->user = \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(12, ISecureRandom::CHAR_LOWER); + $this->user = \OC::$server->getSecureRandom()->generate(12, ISecureRandom::CHAR_LOWER); \OC::$server->getUserManager()->createUser($this->user, $this->user); \OC_Util::tearDownFS(); diff --git a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php index a2e3f36f6ac..353520bd604 100644 --- a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php +++ b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php index 5a917fd1c67..55972dd9221 100644 --- a/apps/files_sharing/tests/etagpropagation.php +++ b/apps/files_sharing/tests/etagpropagation.php @@ -3,9 +3,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/expiresharesjobtest.php b/apps/files_sharing/tests/expiresharesjobtest.php index b21d095e6b1..bb4f756e6c7 100644 --- a/apps/files_sharing/tests/expiresharesjobtest.php +++ b/apps/files_sharing/tests/expiresharesjobtest.php @@ -1,8 +1,9 @@ <?php /** * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/external/cache.php b/apps/files_sharing/tests/external/cache.php index e44c935d3fd..52e01677fa3 100644 --- a/apps/files_sharing/tests/external/cache.php +++ b/apps/files_sharing/tests/external/cache.php @@ -1,8 +1,9 @@ <?php /** + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php index 015be47270e..f73fedaf05c 100644 --- a/apps/files_sharing/tests/external/managertest.php +++ b/apps/files_sharing/tests/external/managertest.php @@ -2,8 +2,9 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/external/scannertest.php b/apps/files_sharing/tests/external/scannertest.php index 43f33905608..f16e9952fce 100644 --- a/apps/files_sharing/tests/external/scannertest.php +++ b/apps/files_sharing/tests/external/scannertest.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php index 109545119ba..54cd7d1645c 100644 --- a/apps/files_sharing/tests/externalstorage.php +++ b/apps/files_sharing/tests/externalstorage.php @@ -3,9 +3,10 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/groupetagpropagation.php b/apps/files_sharing/tests/groupetagpropagation.php index 804d064eadb..9f6b1e2f720 100644 --- a/apps/files_sharing/tests/groupetagpropagation.php +++ b/apps/files_sharing/tests/groupetagpropagation.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/helper.php b/apps/files_sharing/tests/helper.php index 1a4a9ee7834..07f07f911cb 100644 --- a/apps/files_sharing/tests/helper.php +++ b/apps/files_sharing/tests/helper.php @@ -1,11 +1,10 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/locking.php b/apps/files_sharing/tests/locking.php index ad7b6b3e8a3..ef8b2bb1cd4 100644 --- a/apps/files_sharing/tests/locking.php +++ b/apps/files_sharing/tests/locking.php @@ -2,8 +2,9 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php index 031f8c1b970..e80be772a92 100644 --- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php +++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php @@ -5,7 +5,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/migrationtest.php b/apps/files_sharing/tests/migrationtest.php index 49d76126eb2..14df5af381d 100644 --- a/apps/files_sharing/tests/migrationtest.php +++ b/apps/files_sharing/tests/migrationtest.php @@ -2,8 +2,9 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php index 4261ede7a76..43a57266851 100644 --- a/apps/files_sharing/tests/permissions.php +++ b/apps/files_sharing/tests/permissions.php @@ -6,7 +6,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/propagationtestcase.php b/apps/files_sharing/tests/propagationtestcase.php index f397c1fb7a0..159a7b859aa 100644 --- a/apps/files_sharing/tests/propagationtestcase.php +++ b/apps/files_sharing/tests/propagationtestcase.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php index a0f0e18b769..a282f92ecb9 100644 --- a/apps/files_sharing/tests/server2server.php +++ b/apps/files_sharing/tests/server2server.php @@ -4,8 +4,9 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php index 05013ad2e00..6b8c685cc10 100644 --- a/apps/files_sharing/tests/share.php +++ b/apps/files_sharing/tests/share.php @@ -3,10 +3,12 @@ * @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 Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index 15ebc7caf71..347ec0d2a7b 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php index 0d4a6b56307..63f4334103f 100644 --- a/apps/files_sharing/tests/sharedstorage.php +++ b/apps/files_sharing/tests/sharedstorage.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php index 535a475276c..7b7884f3f96 100644 --- a/apps/files_sharing/tests/sizepropagation.php +++ b/apps/files_sharing/tests/sizepropagation.php @@ -2,8 +2,9 @@ /** * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index c4037c7c42e..a9da39f446b 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -6,11 +6,12 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php index 8de735363d1..1968007be4e 100644 --- a/apps/files_sharing/tests/unsharechildren.php +++ b/apps/files_sharing/tests/unsharechildren.php @@ -4,8 +4,9 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php index 312734523b5..02c5f487e0a 100644 --- a/apps/files_sharing/tests/updater.php +++ b/apps/files_sharing/tests/updater.php @@ -3,9 +3,10 @@ * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php index 6443be664a7..021f10bacca 100644 --- a/apps/files_sharing/tests/watcher.php +++ b/apps/files_sharing/tests/watcher.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 40d1811717c..a4f97a03486 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -7,7 +7,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/ajax/isEmpty.php b/apps/files_trashbin/ajax/isEmpty.php index a8122b94733..f8a7cf03a8b 100644 --- a/apps/files_trashbin/ajax/isEmpty.php +++ b/apps/files_trashbin/ajax/isEmpty.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php index 46168f7865e..45cc1254e59 100644 --- a/apps/files_trashbin/ajax/list.php +++ b/apps/files_trashbin/ajax/list.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php index ecb4971253f..86c5ea2dbe5 100644 --- a/apps/files_trashbin/ajax/preview.php +++ b/apps/files_trashbin/ajax/preview.php @@ -3,10 +3,11 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Georg Ehrke <georg@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index f0e5ce6d889..97d8425f0f5 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 7d99270557f..3f86dd5b17e 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -7,7 +7,7 @@ * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/appinfo/application.php b/apps/files_trashbin/appinfo/application.php index 59553abfb14..841c9d90f1b 100644 --- a/apps/files_trashbin/appinfo/application.php +++ b/apps/files_trashbin/appinfo/application.php @@ -3,7 +3,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/appinfo/install.php b/apps/files_trashbin/appinfo/install.php index dc4c2847c22..51b0bdf43c3 100644 --- a/apps/files_trashbin/appinfo/install.php +++ b/apps/files_trashbin/appinfo/install.php @@ -2,7 +2,7 @@ /** * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/appinfo/register_command.php b/apps/files_trashbin/appinfo/register_command.php index ae4196dd506..08c98741156 100644 --- a/apps/files_trashbin/appinfo/register_command.php +++ b/apps/files_trashbin/appinfo/register_command.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php index f3b97d8687c..717820adf49 100644 --- a/apps/files_trashbin/appinfo/routes.php +++ b/apps/files_trashbin/appinfo/routes.php @@ -4,7 +4,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php index 09b1b6931a7..f0c95baeb71 100644 --- a/apps/files_trashbin/appinfo/update.php +++ b/apps/files_trashbin/appinfo/update.php @@ -1,11 +1,9 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> - * @author Christopher Schäpers <kondou@ts.unde.re> - * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/command/cleanup.php b/apps/files_trashbin/command/cleanup.php index 8af5dee4fcb..cffe7f7d1dd 100644 --- a/apps/files_trashbin/command/cleanup.php +++ b/apps/files_trashbin/command/cleanup.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/command/expire.php b/apps/files_trashbin/command/expire.php index cb4e803ddc5..9e0f58e12ce 100644 --- a/apps/files_trashbin/command/expire.php +++ b/apps/files_trashbin/command/expire.php @@ -1,11 +1,12 @@ <?php /** * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/backgroundjob/expiretrash.php index 079fdd29912..7f4f4823918 100644 --- a/apps/files_trashbin/lib/backgroundjob/expiretrash.php +++ b/apps/files_trashbin/lib/backgroundjob/expiretrash.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/capabilities.php b/apps/files_trashbin/lib/capabilities.php index d903066e676..43daa8cfa47 100644 --- a/apps/files_trashbin/lib/capabilities.php +++ b/apps/files_trashbin/lib/capabilities.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php b/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php index 0edf9d35118..8ebc8dfbfe1 100644 --- a/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php +++ b/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/expiration.php b/apps/files_trashbin/lib/expiration.php index 1c08e2869f6..e5a37b88b49 100644 --- a/apps/files_trashbin/lib/expiration.php +++ b/apps/files_trashbin/lib/expiration.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index 0ccf15cd2bc..4d8b8b448ef 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/helper.php @@ -3,12 +3,12 @@ * @author Björn Schießle <schiessle@owncloud.com> * @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 Robin McCorkell <rmccorkell@karoshi.org.uk> - * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php index 57fc8d7a8d3..0a018f4f0f8 100644 --- a/apps/files_trashbin/lib/hooks.php +++ b/apps/files_trashbin/lib/hooks.php @@ -2,9 +2,9 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/storage.php index becde5e635b..c4c523810ac 100644 --- a/apps/files_trashbin/lib/storage.php +++ b/apps/files_trashbin/lib/storage.php @@ -5,7 +5,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index bd6798f0eff..fdca25ff457 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -11,14 +11,15 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Qingping Hou <dave2008713@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Sjors van der Pluijm <sjors@desjors.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php index 890f03aa09a..caf3296eb94 100644 --- a/apps/files_trashbin/list.php +++ b/apps/files_trashbin/list.php @@ -4,7 +4,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/tests/backgroundjob/expiretrash.php b/apps/files_trashbin/tests/backgroundjob/expiretrash.php index ad7b0fbca28..79fc91884fc 100644 --- a/apps/files_trashbin/tests/backgroundjob/expiretrash.php +++ b/apps/files_trashbin/tests/backgroundjob/expiretrash.php @@ -2,7 +2,7 @@ /** * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/tests/command/cleanuptest.php b/apps/files_trashbin/tests/command/cleanuptest.php index 82084a2d525..d71c4ecd85d 100644 --- a/apps/files_trashbin/tests/command/cleanuptest.php +++ b/apps/files_trashbin/tests/command/cleanuptest.php @@ -2,8 +2,9 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/tests/command/expiretest.php b/apps/files_trashbin/tests/command/expiretest.php index 463fca6080e..e481e29330f 100644 --- a/apps/files_trashbin/tests/command/expiretest.php +++ b/apps/files_trashbin/tests/command/expiretest.php @@ -1,8 +1,10 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/tests/expiration.php b/apps/files_trashbin/tests/expiration.php index c142133ceb7..420d255947e 100644 --- a/apps/files_trashbin/tests/expiration.php +++ b/apps/files_trashbin/tests/expiration.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php index 30735fe7bc3..958c5f79a98 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/storage.php @@ -3,9 +3,11 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index 9c19b67a904..7844e95084a 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -5,10 +5,12 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Victor Dubiniuk <dubiniuk@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php index d50545f7c69..1953a55d13d 100644 --- a/apps/files_versions/ajax/getVersions.php +++ b/apps/files_versions/ajax/getVersions.php @@ -7,7 +7,7 @@ * @author Sam Tuke <mail@samtuke.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php index f21911abc9b..c0a9828b1f0 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -1,11 +1,12 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php index e75df28dbcd..7700c03a144 100644 --- a/apps/files_versions/ajax/rollbackVersion.php +++ b/apps/files_versions/ajax/rollbackVersion.php @@ -9,7 +9,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 89990fdf0d8..b653d0d345b 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -4,7 +4,7 @@ * @author Frank Karlitschek <frank@owncloud.org> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/appinfo/application.php b/apps/files_versions/appinfo/application.php index ba0a2ae74cb..b32cf54729d 100644 --- a/apps/files_versions/appinfo/application.php +++ b/apps/files_versions/appinfo/application.php @@ -3,7 +3,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/appinfo/install.php b/apps/files_versions/appinfo/install.php index d72ba2f56e5..81ff6337aa0 100644 --- a/apps/files_versions/appinfo/install.php +++ b/apps/files_versions/appinfo/install.php @@ -2,7 +2,7 @@ /** * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/appinfo/register_command.php b/apps/files_versions/appinfo/register_command.php index 49efdbe6190..ee0e860dfba 100644 --- a/apps/files_versions/appinfo/register_command.php +++ b/apps/files_versions/appinfo/register_command.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index b2ed477de68..4db52cb3870 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php index eb04cf090ed..09ac6ce8a2f 100644 --- a/apps/files_versions/appinfo/update.php +++ b/apps/files_versions/appinfo/update.php @@ -1,10 +1,8 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/command/cleanup.php b/apps/files_versions/command/cleanup.php index bed6dd01773..1abf62763b1 100644 --- a/apps/files_versions/command/cleanup.php +++ b/apps/files_versions/command/cleanup.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/command/expire.php index 88723690603..b1f72980633 100644 --- a/apps/files_versions/command/expire.php +++ b/apps/files_versions/command/expire.php @@ -1,9 +1,10 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php index d3c38f3d4e1..b3742d79de1 100644 --- a/apps/files_versions/download.php +++ b/apps/files_versions/download.php @@ -4,9 +4,10 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/lib/backgroundjob/expireversions.php b/apps/files_versions/lib/backgroundjob/expireversions.php index afdd5eed57a..5d8eef4e351 100644 --- a/apps/files_versions/lib/backgroundjob/expireversions.php +++ b/apps/files_versions/lib/backgroundjob/expireversions.php @@ -2,7 +2,7 @@ /** * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/capabilities.php index ba4de906c70..441b2adfba3 100644 --- a/apps/files_versions/lib/capabilities.php +++ b/apps/files_versions/lib/capabilities.php @@ -5,7 +5,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/expiration.php index 4b3cecc1202..ffc7640e7f9 100644 --- a/apps/files_versions/lib/expiration.php +++ b/apps/files_versions/lib/expiration.php @@ -2,7 +2,7 @@ /** * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index f9d9eddf5e2..beaf81c7471 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -5,11 +5,11 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Sam Tuke <mail@samtuke.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php index 21b5e9e0e7b..74bf8fea49d 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/storage.php @@ -10,13 +10,13 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/tests/command/cleanuptest.php b/apps/files_versions/tests/command/cleanuptest.php index 141213774c0..af217b18893 100644 --- a/apps/files_versions/tests/command/cleanuptest.php +++ b/apps/files_versions/tests/command/cleanuptest.php @@ -1,8 +1,9 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/tests/command/expiretest.php b/apps/files_versions/tests/command/expiretest.php index 5048ab1ef31..f89ece82515 100644 --- a/apps/files_versions/tests/command/expiretest.php +++ b/apps/files_versions/tests/command/expiretest.php @@ -2,8 +2,9 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/tests/expirationtest.php b/apps/files_versions/tests/expirationtest.php index 1081e412ce9..2dfff19f230 100644 --- a/apps/files_versions/tests/expirationtest.php +++ b/apps/files_versions/tests/expirationtest.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php index ee4978ff784..74d6006cfd9 100644 --- a/apps/files_versions/tests/versions.php +++ b/apps/files_versions/tests/versions.php @@ -7,10 +7,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php index 1b9328d608a..08411856e7e 100644 --- a/apps/provisioning_api/appinfo/routes.php +++ b/apps/provisioning_api/appinfo/routes.php @@ -7,7 +7,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/apps.php index 2a3fd414d39..f0079b8a8f3 100644 --- a/apps/provisioning_api/lib/apps.php +++ b/apps/provisioning_api/lib/apps.php @@ -6,7 +6,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php index b54041ac0f2..6784894dbc9 100644 --- a/apps/provisioning_api/lib/groups.php +++ b/apps/provisioning_api/lib/groups.php @@ -6,7 +6,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php index ad067b03cfd..a385f2c1180 100644 --- a/apps/provisioning_api/lib/users.php +++ b/apps/provisioning_api/lib/users.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php index 871158c5545..260bb4d527e 100644 --- a/apps/provisioning_api/tests/appstest.php +++ b/apps/provisioning_api/tests/appstest.php @@ -1,11 +1,13 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php index 7f84b3015ff..a9c011d18ff 100644 --- a/apps/provisioning_api/tests/groupstest.php +++ b/apps/provisioning_api/tests/groupstest.php @@ -4,9 +4,10 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/tests/testcase.php b/apps/provisioning_api/tests/testcase.php index 0cbe0d89f86..743c1c9c44b 100644 --- a/apps/provisioning_api/tests/testcase.php +++ b/apps/provisioning_api/tests/testcase.php @@ -3,8 +3,9 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php index 72c76326ac5..25e723a13b4 100644 --- a/apps/provisioning_api/tests/userstest.php +++ b/apps/provisioning_api/tests/userstest.php @@ -2,12 +2,13 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> + * @author michag86 <micha_g@arcor.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php index bbc379a775f..8f9cf981e57 100644 --- a/apps/user_ldap/ajax/clearMappings.php +++ b/apps/user_ldap/ajax/clearMappings.php @@ -5,7 +5,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/ajax/deleteConfiguration.php b/apps/user_ldap/ajax/deleteConfiguration.php index c629c79d61f..780a4bc35d0 100644 --- a/apps/user_ldap/ajax/deleteConfiguration.php +++ b/apps/user_ldap/ajax/deleteConfiguration.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/ajax/getConfiguration.php b/apps/user_ldap/ajax/getConfiguration.php index 91a5a868536..795261bc91d 100644 --- a/apps/user_ldap/ajax/getConfiguration.php +++ b/apps/user_ldap/ajax/getConfiguration.php @@ -5,7 +5,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php index 41a061e6c50..df85d99f2c7 100644 --- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php +++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php index 3b0ba1b7754..a2e73783e00 100644 --- a/apps/user_ldap/ajax/setConfiguration.php +++ b/apps/user_ldap/ajax/setConfiguration.php @@ -6,7 +6,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index 47fc776983a..e9f5167bfe7 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index 267b9568a28..21396068267 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 60c2accdccb..763fdc99c6b 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -7,7 +7,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php index 844c724ac25..49c8f808ef3 100644 --- a/apps/user_ldap/appinfo/install.php +++ b/apps/user_ldap/appinfo/install.php @@ -4,7 +4,7 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index a13eeb6cdc3..f356f635023 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/appinfo/routes.php b/apps/user_ldap/appinfo/routes.php index f8640ba00ca..9308df6dc1a 100644 --- a/apps/user_ldap/appinfo/routes.php +++ b/apps/user_ldap/appinfo/routes.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php index 7a61101f578..82f3e86bd33 100644 --- a/apps/user_ldap/appinfo/update.php +++ b/apps/user_ldap/appinfo/update.php @@ -1,10 +1,9 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Lennart Rosam <hello@takuto.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/checkuser.php b/apps/user_ldap/command/checkuser.php index 574b59699ad..eb1a7e494d5 100644 --- a/apps/user_ldap/command/checkuser.php +++ b/apps/user_ldap/command/checkuser.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/createemptyconfig.php b/apps/user_ldap/command/createemptyconfig.php index 7f452626859..f1c94704415 100644 --- a/apps/user_ldap/command/createemptyconfig.php +++ b/apps/user_ldap/command/createemptyconfig.php @@ -4,7 +4,7 @@ * @author Martin Konrad <konrad@frib.msu.edu> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/deleteconfig.php b/apps/user_ldap/command/deleteconfig.php index 4479fe6bda1..4dfef9c18da 100644 --- a/apps/user_ldap/command/deleteconfig.php +++ b/apps/user_ldap/command/deleteconfig.php @@ -4,7 +4,7 @@ * @author Martin Konrad <info@martin-konrad.net> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/search.php b/apps/user_ldap/command/search.php index 7bb315a5fb8..8d43d15649a 100644 --- a/apps/user_ldap/command/search.php +++ b/apps/user_ldap/command/search.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/setconfig.php b/apps/user_ldap/command/setconfig.php index 53de5317207..575d429241b 100644 --- a/apps/user_ldap/command/setconfig.php +++ b/apps/user_ldap/command/setconfig.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/showconfig.php b/apps/user_ldap/command/showconfig.php index b076ecccdfb..164cdada100 100644 --- a/apps/user_ldap/command/showconfig.php +++ b/apps/user_ldap/command/showconfig.php @@ -4,7 +4,7 @@ * @author Laurens Post <Crote@users.noreply.github.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/showremnants.php b/apps/user_ldap/command/showremnants.php index 1aa3c49475f..83bb5eaefd3 100644 --- a/apps/user_ldap/command/showremnants.php +++ b/apps/user_ldap/command/showremnants.php @@ -2,8 +2,9 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author scolebrook <scolebrook@mac.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/command/testconfig.php b/apps/user_ldap/command/testconfig.php index 8c8d73cade8..62d40265777 100644 --- a/apps/user_ldap/command/testconfig.php +++ b/apps/user_ldap/command/testconfig.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 7c06e24293e..76152e1780a 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -9,11 +9,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Nicolas Grekas <nicolas.grekas@gmail.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php index b30563941bd..7d496a129a1 100644 --- a/apps/user_ldap/group_proxy.php +++ b/apps/user_ldap/group_proxy.php @@ -3,9 +3,9 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 7d2d355f9b4..97f795483a9 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -11,12 +11,15 @@ * @author Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it> * @author Lukas Reschke <lukas@owncloud.com> * @author Lyonel Vincent <lyonel@ezix.org> + * @author Mario Kolling <mario.kolling@serpro.gov.br> * @author Morris Jobke <hey@morrisjobke.de> * @author Nicolas Grekas <nicolas.grekas@gmail.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Ralph Krimmel <rkrimme1@gwdg.de> + * @author Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/backendutility.php b/apps/user_ldap/lib/backendutility.php index b0fee7cd25e..87c1649cada 100644 --- a/apps/user_ldap/lib/backendutility.php +++ b/apps/user_ldap/lib/backendutility.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index e1ca624af95..e810fb835d4 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -6,9 +6,9 @@ * @author Lennart Rosam <hello@takuto.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 67918bca409..97bb13c5f79 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -7,10 +7,10 @@ * @author Lyonel Vincent <lyonel@ezix.org> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/filesystemhelper.php b/apps/user_ldap/lib/filesystemhelper.php index ee8c26d2f59..03f4c4274f4 100644 --- a/apps/user_ldap/lib/filesystemhelper.php +++ b/apps/user_ldap/lib/filesystemhelper.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index c189e753853..bfff6baf0d3 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ildapwrapper.php index dceb038ba3d..44ec08f59fd 100644 --- a/apps/user_ldap/lib/ildapwrapper.php +++ b/apps/user_ldap/lib/ildapwrapper.php @@ -4,9 +4,9 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php index 5c8d631de3e..b27f66055a3 100644 --- a/apps/user_ldap/lib/jobs.php +++ b/apps/user_ldap/lib/jobs.php @@ -6,9 +6,9 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/jobs/cleanup.php b/apps/user_ldap/lib/jobs/cleanup.php index da2c332cf0e..c9f5f2021eb 100644 --- a/apps/user_ldap/lib/jobs/cleanup.php +++ b/apps/user_ldap/lib/jobs/cleanup.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php index e730bff82c3..ad8c338b587 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/ldap.php @@ -5,9 +5,9 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/ldaputility.php b/apps/user_ldap/lib/ldaputility.php index 01aabdaa1b0..e80fc12e087 100644 --- a/apps/user_ldap/lib/ldaputility.php +++ b/apps/user_ldap/lib/ldaputility.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/logwrapper.php b/apps/user_ldap/lib/logwrapper.php index 7080366c675..41ae4fc3426 100644 --- a/apps/user_ldap/lib/logwrapper.php +++ b/apps/user_ldap/lib/logwrapper.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/mapping/abstractmapping.php b/apps/user_ldap/lib/mapping/abstractmapping.php index c3d38ce8b71..1c896a9bbf4 100644 --- a/apps/user_ldap/lib/mapping/abstractmapping.php +++ b/apps/user_ldap/lib/mapping/abstractmapping.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/mapping/groupmapping.php b/apps/user_ldap/lib/mapping/groupmapping.php index 105155e72cc..49bb41b8c76 100644 --- a/apps/user_ldap/lib/mapping/groupmapping.php +++ b/apps/user_ldap/lib/mapping/groupmapping.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/mapping/usermapping.php b/apps/user_ldap/lib/mapping/usermapping.php index d83c6160527..b39f738ea8c 100644 --- a/apps/user_ldap/lib/mapping/usermapping.php +++ b/apps/user_ldap/lib/mapping/usermapping.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index 2a423cb0e4b..28233748790 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -6,10 +6,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/user/deletedusersindex.php b/apps/user_ldap/lib/user/deletedusersindex.php index 6b58595cce6..48daeb9b8bc 100644 --- a/apps/user_ldap/lib/user/deletedusersindex.php +++ b/apps/user_ldap/lib/user/deletedusersindex.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/user/iusertools.php b/apps/user_ldap/lib/user/iusertools.php index afd01856048..b0eb9e1ffb3 100644 --- a/apps/user_ldap/lib/user/iusertools.php +++ b/apps/user_ldap/lib/user/iusertools.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php index 4a687c0832a..dcaf40b80c4 100644 --- a/apps/user_ldap/lib/user/manager.php +++ b/apps/user_ldap/lib/user/manager.php @@ -5,7 +5,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/user/offlineuser.php b/apps/user_ldap/lib/user/offlineuser.php index 3456a27b412..aee1a137a96 100644 --- a/apps/user_ldap/lib/user/offlineuser.php +++ b/apps/user_ldap/lib/user/offlineuser.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 7a121920a35..23fd831b62f 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 20926fb06a4..4a12d411ec1 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -9,11 +9,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Nicolas Grekas <nicolas.grekas@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/lib/wizardresult.php b/apps/user_ldap/lib/wizardresult.php index 09ee43b716e..54f01cf59b8 100644 --- a/apps/user_ldap/lib/wizardresult.php +++ b/apps/user_ldap/lib/wizardresult.php @@ -4,9 +4,9 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index fb54276b463..9d54684685a 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -6,10 +6,10 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index ef31a1037dd..d9a3919dfcd 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -4,8 +4,9 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/configuration.php b/apps/user_ldap/tests/configuration.php index efe4d7eec83..3b87223b75b 100644 --- a/apps/user_ldap/tests/configuration.php +++ b/apps/user_ldap/tests/configuration.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php index 10a299a61b1..ecee25583ab 100644 --- a/apps/user_ldap/tests/connection.php +++ b/apps/user_ldap/tests/connection.php @@ -3,8 +3,9 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index 5362b97f216..5f9ded878ca 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -5,8 +5,9 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/abstractintegrationtest.php b/apps/user_ldap/tests/integration/abstractintegrationtest.php index f0f5e2de0a4..10ce7378830 100644 --- a/apps/user_ldap/tests/integration/abstractintegrationtest.php +++ b/apps/user_ldap/tests/integration/abstractintegrationtest.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php b/apps/user_ldap/tests/integration/exceptionOnLostConnection.php index a55d4822689..4813bd9ff5e 100644 --- a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php +++ b/apps/user_ldap/tests/integration/exceptionOnLostConnection.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/fakemanager.php b/apps/user_ldap/tests/integration/fakemanager.php index f47668aa15b..7d6ea0f3c13 100644 --- a/apps/user_ldap/tests/integration/fakemanager.php +++ b/apps/user_ldap/tests/integration/fakemanager.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php b/apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php index 17d046187e8..af553c01728 100644 --- a/apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php +++ b/apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php b/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php index 95cb4b8f270..4faf173af11 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php +++ b/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php b/apps/user_ldap/tests/integration/lib/integrationtestconnect.php index 878aa08f5ab..ad4d0a3da7e 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php +++ b/apps/user_ldap/tests/integration/lib/integrationtestconnect.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php b/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php index 6e3908c558b..861638e25bd 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php +++ b/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php b/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php index 403c3a0c73c..fb2cb45e9e7 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php +++ b/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php index f8d008d065f..94f7d7fd0f5 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php +++ b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php index ef000286109..8d36e1f2dfe 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php +++ b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php index 6bb8afc01a2..9fb0ffc1b7d 100644 --- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php +++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php index 8ac35a54528..57a304be057 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php +++ b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php index e22b72c452c..62480c5160c 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php +++ b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php b/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php index 3e9cb674254..e580dece40c 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php +++ b/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/jobs/cleanup.php b/apps/user_ldap/tests/jobs/cleanup.php index aad8fbd20ad..4c6893b19cf 100644 --- a/apps/user_ldap/tests/jobs/cleanup.php +++ b/apps/user_ldap/tests/jobs/cleanup.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/mapping/abstractmappingtest.php b/apps/user_ldap/tests/mapping/abstractmappingtest.php index dc9304fe325..c6427be516b 100644 --- a/apps/user_ldap/tests/mapping/abstractmappingtest.php +++ b/apps/user_ldap/tests/mapping/abstractmappingtest.php @@ -3,7 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/mapping/groupmapping.php b/apps/user_ldap/tests/mapping/groupmapping.php index f9136cf5290..e25fae9329f 100644 --- a/apps/user_ldap/tests/mapping/groupmapping.php +++ b/apps/user_ldap/tests/mapping/groupmapping.php @@ -2,8 +2,9 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/mapping/usermapping.php b/apps/user_ldap/tests/mapping/usermapping.php index e84f5020231..6138740b81a 100644 --- a/apps/user_ldap/tests/mapping/usermapping.php +++ b/apps/user_ldap/tests/mapping/usermapping.php @@ -2,8 +2,9 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php index d8602978a9d..2ad438fcba4 100644 --- a/apps/user_ldap/tests/user/manager.php +++ b/apps/user_ldap/tests/user/manager.php @@ -4,8 +4,9 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Philippe Jung <phil.jung@free.fr> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php index a5bb459d6fd..9b3bb4ace66 100644 --- a/apps/user_ldap/tests/user/user.php +++ b/apps/user_ldap/tests/user/user.php @@ -3,8 +3,9 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index 3aec2a5ce57..87c6fae0f5d 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -5,9 +5,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php index c29361096a1..33fb2712e23 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/wizard.php @@ -3,9 +3,10 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Viktor Szépe <viktor@szepe.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index c568905f3d9..8ebb5ab30e8 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -6,12 +6,13 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php index 2582355e4a3..9ea0b6dd235 100644 --- a/apps/user_ldap/user_proxy.php +++ b/apps/user_ldap/user_proxy.php @@ -4,10 +4,10 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 467ac448e94..1a184cb928c 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -70,6 +70,16 @@ Feature: provisioning And the HTTP status code should be "200" And group "new-group" exists + Scenario: Create a group with special characters + Given As an "admin" + And group "España" does not exist + When sending "POST" to "/cloud/groups" with + | groupid | España | + | password | 123456 | + Then the OCS status code should be "100" + And the HTTP status code should be "200" + And group "España" exists + Scenario: adding user to a group without sending the group Given As an "admin" And user "brand-new-user" exists @@ -134,6 +144,7 @@ Feature: provisioning And group "admin" exists When sending "GET" to "/cloud/groups" Then groups returned are + | España | | admin | | new-group | @@ -257,6 +268,14 @@ Feature: provisioning And the HTTP status code should be "200" And group "new-group" does not exist + Scenario: Delete a group with special characters + Given As an "admin" + And group "España" exists + When sending "DELETE" to "/cloud/groups/España" + Then the OCS status code should be "100" + And the HTTP status code should be "200" + And group "España" does not exist + Scenario: get enabled apps Given As an "admin" When sending "GET" to "/cloud/apps?filter=enabled" diff --git a/build/license.php b/build/license.php index 6f8388ee069..738ace8b1ad 100644 --- a/build/license.php +++ b/build/license.php @@ -186,8 +186,10 @@ if (isset($argv[1])) { $licenses->exec($argv[1]); } else { $licenses->exec([ - '../apps/files', + '../apps/dav', '../apps/encryption', + '../apps/federation', + '../apps/files', '../apps/files_external', '../apps/files_sharing', '../apps/files_trashbin', diff --git a/config/config.sample.php b/config/config.sample.php index 7ba3977fe3a..b0ede5cc6de 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -477,6 +477,13 @@ $CONFIG = array( 'check_for_working_webdav' => true, /** + * Allows ownCloud to verify a working .well-known URL redirects. This is done + * by attempting to make a request from JS to + * https://your-domain.com/.well-known/caldav/ + */ +'check_for_working_wellknown_setup' => true, + +/** * This is a crucial security check on Apache servers that should always be set * to ``true``. This verifies that the ``.htaccess`` file is writable and works. * If it is not, then any options controlled by ``.htaccess``, such as large @@ -847,6 +854,11 @@ $CONFIG = array( ), /** + * Allow the configuration of system wide trusted certificates + */ +'enable_certificate_management' => false, + +/** * Memory caching backend configuration * * Available cache backends: diff --git a/console.php b/console.php index 9386f544939..23f40a15437 100644 --- a/console.php +++ b/console.php @@ -2,13 +2,14 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Christian Kampka <christian@kampka.net> + * @author Edward Crompton <edward.crompton@gmail.com> * @author Jost Baron <Jost.Baron@gmx.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Philippe Le Brouster <plb@nebkha.net> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php index 3ad32ff1a3e..9602269d7a7 100644 --- a/core/ajax/appconfig.php +++ b/core/ajax/appconfig.php @@ -5,7 +5,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/ajax/preview.php b/core/ajax/preview.php index 05eb4b62b79..119bad1eea2 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/ajax/share.php b/core/ajax/share.php index e9bbef172af..cd4144bc6a7 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -16,9 +16,8 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> - * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/ajax/update.php b/core/ajax/update.php index 879f66e1024..4d8fe19f168 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -1,6 +1,6 @@ <?php /** - * @author Bart Visscher <bartv@thisnet.nl> + * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> @@ -10,7 +10,7 @@ * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/application.php b/core/application.php index dfc4fc38c7d..bfe79f89938 100644 --- a/core/application.php +++ b/core/application.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php index e67f4ae8ba0..8a9219964a5 100644 --- a/core/avatar/avatarcontroller.php +++ b/core/avatar/avatarcontroller.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php index bc3ae07890c..78f4390e70a 100644 --- a/core/command/app/checkcode.php +++ b/core/command/app/checkcode.php @@ -2,10 +2,10 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/app/disable.php b/core/command/app/disable.php index 6c04860789f..b5e776d7e03 100644 --- a/core/command/app/disable.php +++ b/core/command/app/disable.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/app/enable.php b/core/command/app/enable.php index f82c23e7e60..d50b1c4773e 100644 --- a/core/command/app/enable.php +++ b/core/command/app/enable.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/app/getpath.php b/core/command/app/getpath.php index 7cfa01d48af..33a3f64c53d 100644 --- a/core/command/app/getpath.php +++ b/core/command/app/getpath.php @@ -2,7 +2,7 @@ /** * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/app/listapps.php b/core/command/app/listapps.php index 542420ee6b7..504944dd707 100644 --- a/core/command/app/listapps.php +++ b/core/command/app/listapps.php @@ -3,8 +3,9 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/base.php b/core/command/base.php index 0a4b002c1ca..bc5ae2e429b 100644 --- a/core/command/base.php +++ b/core/command/base.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/check.php b/core/command/check.php index cd7f8ee8e4c..c2e92f7a8da 100644 --- a/core/command/check.php +++ b/core/command/check.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/app/deleteconfig.php b/core/command/config/app/deleteconfig.php index bc031b0d589..cccd92ea3d6 100644 --- a/core/command/config/app/deleteconfig.php +++ b/core/command/config/app/deleteconfig.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/app/getconfig.php b/core/command/config/app/getconfig.php index 186ed46999f..abe71e57d8c 100644 --- a/core/command/config/app/getconfig.php +++ b/core/command/config/app/getconfig.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/app/setconfig.php b/core/command/config/app/setconfig.php index eea58a63c5e..097fde6ba95 100644 --- a/core/command/config/app/setconfig.php +++ b/core/command/config/app/setconfig.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/import.php b/core/command/config/import.php index c53fd7255f9..7f1e09d2c95 100644 --- a/core/command/config/import.php +++ b/core/command/config/import.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/listconfigs.php b/core/command/config/listconfigs.php index 37aeb53c6f5..afebe4c4c07 100644 --- a/core/command/config/listconfigs.php +++ b/core/command/config/listconfigs.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/system/deleteconfig.php b/core/command/config/system/deleteconfig.php index 4d193647c85..e64ff32ac71 100644 --- a/core/command/config/system/deleteconfig.php +++ b/core/command/config/system/deleteconfig.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/system/getconfig.php b/core/command/config/system/getconfig.php index d53de18a0bb..80b41a68526 100644 --- a/core/command/config/system/getconfig.php +++ b/core/command/config/system/getconfig.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/config/system/setconfig.php b/core/command/config/system/setconfig.php index 82b36cca164..0100ad2dfb0 100644 --- a/core/command/config/system/setconfig.php +++ b/core/command/config/system/setconfig.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php index 77e614a5853..864499dcce0 100644 --- a/core/command/db/converttype.php +++ b/core/command/db/converttype.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author unclejamal3000 <andreas.pramhaas@posteo.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/db/generatechangescript.php b/core/command/db/generatechangescript.php index c94a6a9b0e4..85436b02d65 100644 --- a/core/command/db/generatechangescript.php +++ b/core/command/db/generatechangescript.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/changekeystorageroot.php b/core/command/encryption/changekeystorageroot.php index 662e0a3161a..801a08b42a8 100644 --- a/core/command/encryption/changekeystorageroot.php +++ b/core/command/encryption/changekeystorageroot.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php index 4755a9dc7ba..0a126db5b17 100644 --- a/core/command/encryption/decryptall.php +++ b/core/command/encryption/decryptall.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/disable.php b/core/command/encryption/disable.php index e3c0b8d7489..0e08a314473 100644 --- a/core/command/encryption/disable.php +++ b/core/command/encryption/disable.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/enable.php b/core/command/encryption/enable.php index b615a7f4f85..273320e6155 100644 --- a/core/command/encryption/enable.php +++ b/core/command/encryption/enable.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php index 572991039ef..02f74a9dea4 100644 --- a/core/command/encryption/encryptall.php +++ b/core/command/encryption/encryptall.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/listmodules.php b/core/command/encryption/listmodules.php index cc436ea5629..9c061b6e764 100644 --- a/core/command/encryption/listmodules.php +++ b/core/command/encryption/listmodules.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/setdefaultmodule.php b/core/command/encryption/setdefaultmodule.php index a605b470d43..e9978536201 100644 --- a/core/command/encryption/setdefaultmodule.php +++ b/core/command/encryption/setdefaultmodule.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/showkeystorageroot.php b/core/command/encryption/showkeystorageroot.php index acb2e75a6ae..402352c4bcf 100644 --- a/core/command/encryption/showkeystorageroot.php +++ b/core/command/encryption/showkeystorageroot.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/encryption/status.php b/core/command/encryption/status.php index 1a52500cf29..b97ea8833fa 100644 --- a/core/command/encryption/status.php +++ b/core/command/encryption/status.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/integrity/signapp.php b/core/command/integrity/signapp.php index 83a7972068f..a203b9ad1da 100644 --- a/core/command/integrity/signapp.php +++ b/core/command/integrity/signapp.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/integrity/signcore.php b/core/command/integrity/signcore.php index 4d097ad4f96..531a4d33aa3 100644 --- a/core/command/integrity/signcore.php +++ b/core/command/integrity/signcore.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/l10n/createjs.php b/core/command/l10n/createjs.php index 78f3229b179..c2cfc5d0934 100644 --- a/core/command/l10n/createjs.php +++ b/core/command/l10n/createjs.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/log/manage.php b/core/command/log/manage.php index 1a5cd142413..1d65d7ed0d8 100644 --- a/core/command/log/manage.php +++ b/core/command/log/manage.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/log/owncloud.php b/core/command/log/owncloud.php index 6200a8b6a53..7213f6726a2 100644 --- a/core/command/log/owncloud.php +++ b/core/command/log/owncloud.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php index d4ef72c9fc8..b1b63b9b3bd 100644 --- a/core/command/maintenance/install.php +++ b/core/command/maintenance/install.php @@ -2,9 +2,10 @@ /** * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Christian Kampka <christian@kampka.net> + * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/maintenance/mimetype/updatedb.php b/core/command/maintenance/mimetype/updatedb.php index 42d6af49baf..9532f9e1cd9 100644 --- a/core/command/maintenance/mimetype/updatedb.php +++ b/core/command/maintenance/mimetype/updatedb.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/maintenance/mimetype/updatejs.php b/core/command/maintenance/mimetype/updatejs.php index b2c57556cb4..e93b563d5fb 100644 --- a/core/command/maintenance/mimetype/updatejs.php +++ b/core/command/maintenance/mimetype/updatejs.php @@ -1,9 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/maintenance/mode.php b/core/command/maintenance/mode.php index e9d36510def..28f4fb2f7f1 100644 --- a/core/command/maintenance/mode.php +++ b/core/command/maintenance/mode.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author scolebrook <scolebrook@mac.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php index f7c0cc46048..95e2b872227 100644 --- a/core/command/maintenance/repair.php +++ b/core/command/maintenance/repair.php @@ -1,11 +1,11 @@ <?php /** + * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/maintenance/singleuser.php b/core/command/maintenance/singleuser.php index 44e124e9d3b..2e6f1f136e7 100644 --- a/core/command/maintenance/singleuser.php +++ b/core/command/maintenance/singleuser.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/status.php b/core/command/status.php index c2a28ff822f..6bc9c28d4d1 100644 --- a/core/command/status.php +++ b/core/command/status.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 7675c168f35..a16069c0a6b 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -1,14 +1,16 @@ <?php /** * @author Andreas Fischer <bantu@owncloud.com> + * @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 Owen Winkler <a_github@midnightcircus.com> * @author Steffen Lindner <mail@steffen-lindner.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/user/add.php b/core/command/user/add.php index 426b8489ccf..cb0ab319bc0 100644 --- a/core/command/user/add.php +++ b/core/command/user/add.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Laurens Post <lkpost@scept.re> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/user/delete.php b/core/command/user/delete.php index e80c63bc732..b9a0a0e3950 100644 --- a/core/command/user/delete.php +++ b/core/command/user/delete.php @@ -5,7 +5,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/user/lastseen.php b/core/command/user/lastseen.php index 931165ef9f6..1d2c17e3d3f 100644 --- a/core/command/user/lastseen.php +++ b/core/command/user/lastseen.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/user/report.php b/core/command/user/report.php index 7a830f64c07..df9f7e41620 100644 --- a/core/command/user/report.php +++ b/core/command/user/report.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php index 6c5846bcef3..f3f2d5b0630 100644 --- a/core/command/user/resetpassword.php +++ b/core/command/user/resetpassword.php @@ -7,7 +7,7 @@ * @author Laurens Post <lkpost@scept.re> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css index bada0b73a5e..b241dcfea6f 100644 --- a/core/css/jquery.ocdialog.css +++ b/core/css/jquery.ocdialog.css @@ -26,7 +26,7 @@ background: white; float: right; position: relative; - bottom: 0; + bottom: 5px; display: block; margin-top: 10px; width: 100%; diff --git a/core/css/styles.css b/core/css/styles.css index 76c6dda2728..e78db6fde01 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -382,12 +382,13 @@ body { .groupbottom input { margin-top: 0; border-top: 0; -} -#body-login .groupbottom #password { border-top-right-radius: 0; border-top-left-radius: 0; box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important; } +#body-login .groupbottom input[type=submit] { + box-shadow: none !important; +} /* keep the labels for screen readers but hide them since we use placeholders */ label.infield { diff --git a/core/js/config.php b/core/js/config.php index 7216c50afa9..0670df60abd 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -2,12 +2,12 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Guillaume AMAT <guillaume.amat@informatique-libre.com> * @author Hasso Tepper <hasso@zone.ee> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> - * @author Matthias Rieber <matthias@zu-con.org> * @author Morris Jobke <hey@morrisjobke.de> * @author Owen Winkler <a_github@midnightcircus.com> * @author Robin Appelman <icewind@owncloud.com> @@ -15,7 +15,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index b1b8dd358d2..2fa119334db 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -51,17 +51,23 @@ * * @param url the URL to test * @param placeholderUrl the placeholder URL - can be found at oc_defaults.docPlaceholderUrl + * @param {boolean} runCheck if this is set to false the check is skipped and no error is returned * @return $.Deferred object resolved with an array of error messages */ - checkWellKnownUrl: function(url, placeholderUrl) { + checkWellKnownUrl: function(url, placeholderUrl, runCheck) { var deferred = $.Deferred(); + + if(runCheck === false) { + deferred.resolve([]); + return deferred.promise(); + } var afterCall = function(xhr) { var messages = []; if (xhr.status !== 207) { var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-setup-well-known-URL'); messages.push({ msg: t('core', 'Your web server is not set up properly to resolve "{url}". Further information can be found in our <a target="_blank" href="{docLink}">documentation</a>.', { docLink: docUrl, url: url }), - type: OC.SetupChecks.MESSAGE_TYPE_ERROR + type: OC.SetupChecks.MESSAGE_TYPE_INFO }); } deferred.resolve(messages); @@ -202,7 +208,9 @@ 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', }; for (var header in securityHeaders) { diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 18ba44ac61b..fff169ec098 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -62,21 +62,21 @@ describe('OC.SetupChecks tests', function() { describe('checkWellKnownUrl', function() { it('should fail with another response status code than 207', function(done) { - var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', 'http://example.org/PLACEHOLDER'); + var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', 'http://example.org/PLACEHOLDER', true); suite.server.requests[0].respond(200); async.done(function( data, s, x ){ expect(data).toEqual([{ msg: 'Your web server is not set up properly to resolve "/.well-known/caldav/". Further information can be found in our <a target="_blank" href="http://example.org/admin-setup-well-known-URL">documentation</a>.', - type: OC.SetupChecks.MESSAGE_TYPE_ERROR + type: OC.SetupChecks.MESSAGE_TYPE_INFO }]); done(); }); }); it('should return no error with a response status code of 207', function(done) { - var async = OC.SetupChecks.checkWebDAV('/.well-known/caldav/', 'http://example.org/PLACEHOLDER'); + var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', 'http://example.org/PLACEHOLDER', true); suite.server.requests[0].respond(207); @@ -85,6 +85,15 @@ describe('OC.SetupChecks tests', function() { done(); }); }); + + it('should return no error when no check should be run', function(done) { + var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', 'http://example.org/PLACEHOLDER', false); + + async.done(function( data, s, x ){ + expect(data).toEqual([]); + done(); + }); + }); }); describe('checkSetup', function() { @@ -380,7 +389,14 @@ describe('OC.SetupChecks tests', function() { }, { msg: 'The "X-Frame-Options" HTTP header is not configured to equal to "SAMEORIGIN". This is a potential security or privacy risk and we recommend adjusting this setting.', type: OC.SetupChecks.MESSAGE_TYPE_WARNING - }]); + }, { + msg: 'The "X-Download-Options" HTTP header is not configured to equal to "noopen". This is a potential security or privacy risk and we recommend adjusting this setting.', + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }, { + msg: 'The "X-Permitted-Cross-Domain-Policies" HTTP header is not configured to equal to "none". This is a potential security or privacy risk and we recommend adjusting this setting.', + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }, + ]); done(); }); }); @@ -394,7 +410,9 @@ describe('OC.SetupChecks tests', function() { { 'X-Robots-Tag': 'none', 'X-Frame-Options': 'SAMEORIGIN', - 'Strict-Transport-Security': 'max-age=15768000;preload' + 'Strict-Transport-Security': 'max-age=15768000;preload', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', } ); @@ -421,7 +439,9 @@ describe('OC.SetupChecks tests', function() { 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', 'X-Frame-Options': 'SAMEORIGIN', - 'Strict-Transport-Security': 'max-age=15768000' + 'Strict-Transport-Security': 'max-age=15768000', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', } ); @@ -441,7 +461,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', } ); @@ -485,7 +507,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', } ); @@ -508,7 +532,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', } ); @@ -531,7 +557,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', } ); @@ -553,7 +581,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', }); async.done(function( data, s, x ){ @@ -571,7 +601,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', }); async.done(function( data, s, x ){ @@ -589,7 +621,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', }); async.done(function( data, s, x ){ @@ -607,7 +641,9 @@ describe('OC.SetupChecks tests', function() { 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'X-Robots-Tag': 'none', - 'X-Frame-Options': 'SAMEORIGIN' + 'X-Frame-Options': 'SAMEORIGIN', + 'X-Download-Options': 'noopen', + 'X-Permitted-Cross-Domain-Policies': 'none', }); async.done(function( data, s, x ){ diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 04fe3617a3b..41b302a569a 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -113,6 +113,7 @@ OC.L10N.register( "Good password" : "Mot de passe de sécurité suffisante", "Strong password" : "Mot de passe fort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour la synchronisation de fichiers : l'interface WebDAV semble ne pas fonctionner.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Votre navigateur internet n'est pas configuré correctement pour résoudre \"{url}\". Plus d'information peuvent être trouvé dans notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a target=\"_blank\" href=\"{docLink}\">documentation</a>.", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 281f5e5211a..6e54ce49f5e 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -111,6 +111,7 @@ "Good password" : "Mot de passe de sécurité suffisante", "Strong password" : "Mot de passe fort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour la synchronisation de fichiers : l'interface WebDAV semble ne pas fonctionner.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Votre navigateur internet n'est pas configuré correctement pour résoudre \"{url}\". Plus d'information peuvent être trouvé dans notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a target=\"_blank\" href=\"{docLink}\">documentation</a>.", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index 51af8e57c71..07f3ac3aadf 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -24,6 +24,7 @@ OC.L10N.register( "%s (incompatible)" : "%s (非互換)", "Following apps have been disabled: %s" : "以下のアプリが無効にされています: %s", "Already up to date" : "すべて更新済", + "Please select a file." : "ファイルを選択してください。", "File is too big" : "ファイルが大きすぎます", "Invalid file provided" : "無効なファイルが提供されました", "No image or file provided" : "画像もしくはファイルが提供されていません", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index f6c7086783d..769e2d53ea0 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -22,6 +22,7 @@ "%s (incompatible)" : "%s (非互換)", "Following apps have been disabled: %s" : "以下のアプリが無効にされています: %s", "Already up to date" : "すべて更新済", + "Please select a file." : "ファイルを選択してください。", "File is too big" : "ファイルが大きすぎます", "Invalid file provided" : "無効なファイルが提供されました", "No image or file provided" : "画像もしくはファイルが提供されていません", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 6548a0326fd..f6738a524a9 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -16,12 +16,15 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s", "Repair warning: " : "Reparatiewaarschuwing:", "Repair error: " : "Reparatiefout:", + "Set log level to debug" : "Logniveau instellen op debug", + "Reset log level" : "Terugzetten logniveau", "Starting code integrity check" : "Starten code betrouwbaarheidscontrole", "Finished code integrity check" : "Gereed met code betrouwbaarheidscontrole", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (incompatibel)", "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s", "Already up to date" : "Al bijgewerkt", + "Please select a file." : "Selecteer een bestand.", "File is too big" : "Bestand te groot", "Invalid file provided" : "Ongeldig bestand opgegeven", "No image or file provided" : "Geen afbeelding of bestand opgegeven", @@ -110,6 +113,7 @@ OC.L10N.register( "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verstoord lijkt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uw webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 6c240045b35..d21f42b89b7 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -14,12 +14,15 @@ "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s", "Repair warning: " : "Reparatiewaarschuwing:", "Repair error: " : "Reparatiefout:", + "Set log level to debug" : "Logniveau instellen op debug", + "Reset log level" : "Terugzetten logniveau", "Starting code integrity check" : "Starten code betrouwbaarheidscontrole", "Finished code integrity check" : "Gereed met code betrouwbaarheidscontrole", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (incompatibel)", "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s", "Already up to date" : "Al bijgewerkt", + "Please select a file." : "Selecteer een bestand.", "File is too big" : "Bestand te groot", "Invalid file provided" : "Ongeldig bestand opgegeven", "No image or file provided" : "Geen afbeelding of bestand opgegeven", @@ -108,6 +111,7 @@ "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verstoord lijkt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uw webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index ae0e816d4f9..590dfd3ea2b 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -16,15 +16,16 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s", "Repair warning: " : "Предупреждение восстановления:", "Repair error: " : "Ошибка восстановления:", - "Set log level to debug" : "Установить уровень журнала отладки", + "Set log level to debug" : "Установить журнал в режим отладки", "Reset log level" : "Сбросить уровень журнала", "Starting code integrity check" : "Начинается проверка целостности кода", "Finished code integrity check" : "Проверка целостности кода завершина", - "%s (3rdparty)" : "%s (3rdparty)", + "%s (3rdparty)" : "%s (стороннее)", "%s (incompatible)" : "%s (несовместим)", "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s", "Already up to date" : "Не нуждается в обновлении", - "File is too big" : "Файл слишком большой", + "Please select a file." : "Пожалуйста выберите файл.", + "File is too big" : "Файл слишком велик", "Invalid file provided" : "Указан неправильный файл", "No image or file provided" : "Не указано изображение или файл", "Unknown filetype" : "Неизвестный тип файла", @@ -84,7 +85,7 @@ OC.L10N.register( "Saving..." : "Сохранение...", "seconds ago" : "несколько секунд назад", "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.", - "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку спама.<br>Если его там нет, то обратитесь к вашему администратору.", + "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку со спамом.<br>Если его там нет, то обратитесь к вашему администратору.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?", "I know what I'm doing" : "Я понимаю, что делаю", "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.", @@ -111,15 +112,19 @@ OC.L10N.register( "So-so password" : "Так себе пароль", "Good password" : "Хороший пароль", "Strong password" : "Устойчивый к взлому пароль", - "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш веб-сервер еще не настроен должным образом, чтобы позволить синхронизацию файлов, потому что интерфейс WebDAV, кажется, испорчен.", - "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установки сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Мы предлагаем включить подключение к Интернету для этого сервера, если вы хотите, чтобы все функции работали.", - "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из интернете. .htaccess файл не работает. Мы настоятельно рекомендуем вам настроить ваш веб сервер таким образом, что-бы каталог данных не был больше доступен или переместите каталог данных за пределы корня веб сервера.", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш веб-сервер еще не настроен должным образом чтобы позволить синхронизацию файлов, потому что интерфейс WebDAV, кажется, испорчен.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ваш сервер не настроен для правильного разрешения \"{url}\". За дополнительной информацией обратитесь к нашей <a target=\"_blank\" href=\"{docLink}\">документации</a>.", + "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установка сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Рекомендуется разрешить данному серверу доступ в Интернет если хотите, чтобы все функции работали.", + "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из Интернета. Файл .htaccess не работает. Мы настоятельно рекомендуем Вам настроить веб сервер таким образом, чтобы каталог данных не был больше доступен или переместить каталог данных за пределы корня веб сервера.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Кэш-памяти не настроено. Для повышения производительности, пожалуйста, настройте кэш-памяти (memcache) если есть такая возможность. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", - "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/DEV/urandom не доступно для PHP, это крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", - "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версия PHP ({version}) больше не <a target=\"_blank\" href=\"{phpLink}\"> поддерживается PHP разработчиками</a>. Мы рекомендуем Вам обновить версию PHP, чтобы воспользоваться производительностью и безопасностью, предусмотренных в обновленной версии PHP.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom не доступно чтение для PHP, что крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версия PHP ({version}) больше не <a target=\"_blank\" href=\"{phpLink}\"> поддерживается разработчиками PHP</a>. Мы рекомендуем Вам обновить версию PHP, чтобы воспользоваться производительностью и безопасностью, предусмотренных в обновленной версии PHP.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси не верна, либо доступ к ownCloud осуществлён через доверенный прокси. Если ownCloud открыт не через доверенный прокси то это проблема безопасности, которая может позволить атакующему подделать IP адрес, который видит ownCloud. Дополнительная информация доступна в нашей <a target=\"_blank\" href=\"{docLink}\">документации</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "В качестве распределённого кеша настроен memcached, но установлен неверный модуль PHP \"memcache\". \\OC\\Memcache\\Memcached поддерживает только \"memcached\", но не \"memcache\". Изучите <a target=\"_blank\" href=\"{wikiLink}\">оба модуля в memcached wiki</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Некоторые файлы не прошли проверку целостности. Дополнительная информация о том, как устранить данную проблему доступна в нашей <a target=\"_blank\" href=\"{docLink}\">документации</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Список проблемных файлов…</a> / <a href=\"{rescanEndpoint}\">Сканировать ещё раз…</a>)", "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера", - "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на ожидаемый \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.", - "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен хотя бы на \"{seconds}\" секунд. Для улучшения безопасности мы рекомендуем включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на значение \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" не настроен хотя бы на \"{seconds}\" секунд. Для улучшения безопасности мы рекомендуем включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Вы зашли на этот сайт через HTTP. Мы настоятельно рекомендуем настроить ваш сервер на использование HTTPS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "Shared" : "Общий доступ", "Shared with {recipients}" : "Вы поделились с {recipients}", @@ -156,14 +161,14 @@ OC.L10N.register( "change" : "изменить", "delete" : "удалить", "access control" : "контроль доступа", - "Share details could not be loaded for this item." : "Информация об общем доступе для этого элемента не может быть загружена.", + "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "Share" : "Поделиться", - "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя формат username@example.com/owncloud", "Share with users or groups …" : "Поделиться с пользователями или группами ...", "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...", "Warning" : "Предупреждение", - "Error while sending notification" : "Ошибка отправки уведомления", + "Error while sending notification" : "Ошибка при отправке уведомления", "The object type is not specified." : "Тип объекта не указан", "Enter new" : "Ввести новое", "Delete" : "Удалить", @@ -179,24 +184,24 @@ OC.L10N.register( "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов","скачать %n файлов"], "{version} is available. Get more information on how to update." : "Доступна версия {version}. Получить дополнительную информацию о порядке обновления.", "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Идет обновление. Покидая эту страницу, вы можете прервать процесс обновления.", - "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, пожалуйста, подождите.", + "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, это может занять некоторое время.", "An error occurred." : "Произошла ошибка.", - "Please reload the page." : "Обновите страницу.", - "The update was unsuccessful. " : "Обновление не удалось.", + "Please reload the page." : "Пожалуйста, обновите страницу.", + "The update was unsuccessful. " : "Обновление окончилось неудачей.", "The update was successful. There were warnings." : "Обновление прошло успешно. Были предупреждения.", "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.", - "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль из-за неверного токена", - "Couldn't reset password because the token is expired" : "Не удается сбросить пароль, так как токен истек.", + "Couldn't reset password because the token is invalid" : "Не удалось сбросить пароль из-за неверного токена", + "Couldn't reset password because the token is expired" : "Не удалось сбросить пароль, так как срок действия токена истек.", "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Убедитесь, что имя пользователя указано верно.", - "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Не удалось отправить письмо сброса из-за отсутствия адреса электронной почты для этого пользователя. Пожалуйста, обратитесь к администратору.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Не удалось отправить письмо сброса так как у данного пользователя не задан адрес электронной почты. Пожалуйста, обратитесь к администратору.", "%s password reset" : "Сброс пароля %s", "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}", "New password" : "Новый пароль", "New Password" : "Новый пароль", "Reset password" : "Сбросить пароль", "Searching other places" : "Идет поиск в других местах", - "No search results in other folders" : "Нет результатов поиска в других папках", - "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат в другой папке","{count} результата в другой папке","{count} результатов в другой папке","{count} результатов в другой папке"], + "No search results in other folders" : "В других папках ничего не найдено", + "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат в другой папке","{count} результата в другой папке","{count} результатов в другой папке","{count} результатов в других папках"], "Personal" : "Личное", "Users" : "Пользователи", "Apps" : "Приложения", @@ -218,7 +223,7 @@ OC.L10N.register( "Cheers!" : "Всего наилучшего!", "Internal Server Error" : "Внутренняя ошибка сервера", "The server encountered an internal error and was unable to complete your request." : "Запрос не выполнен, на сервере произошла ошибка.", - "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет повторяться, прикрепите технические детали к своему сообщению.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера если эта ошибка будет повторяться. Прикрепите указанную ниже информацию к своему сообщению.", "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.", "Technical details" : "Технические детали", "Remote Address: %s" : "Удаленный адрес: %s", @@ -228,10 +233,10 @@ OC.L10N.register( "Message: %s" : "Сообщение: %s", "File: %s" : "Файл: %s", "Line: %s" : "Линия: %s", - "Trace" : "След", + "Trace" : "Трассировка", "Security warning" : "Предупреждение безопасности", - "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются, возможно, каталог данных и файлы свободно доступны из интернета.", - "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, руководствуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.", + "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются. Возможно, каталог данных и файлы свободно доступны из интернета.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, воспользуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.", "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>", "Username" : "Имя пользователя", "Storage & database" : "Хранилище и база данных", @@ -247,19 +252,19 @@ OC.L10N.register( "Database host" : "Хост базы данных", "Performance warning" : "Предупреждение о производительности", "SQLite will be used as database." : "В качестве базы данных будет использована SQLite.", - "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другую базу данных.", - "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.", + "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другой тип базы данных.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "В частности не рекомендуется использовать SQLite при синхронизации файлов с использованием клиента для ПК.", "Finish setup" : "Завершить установку", "Finishing …" : "Завершение...", "Need help?" : "Нужна помощь?", "See the documentation" : "Посмотреть документацию", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s поделился с вами <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы посмотреть<br><br>", - "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Это приложение требует включённый JavaScript для корректной работы. Пожалуйста, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включите JavaScript</a> и перезагрузите интерфейс.", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Для корректной работы приложения требуется JavaScript. Пожалуйста, {linkstart}включите JavaScript{linkend} и обновите страницу.", "Log out" : "Выйти", "Search" : "Найти", - "Server side authentication failed!" : "Неудачная аутентификация с сервером!", - "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.", - "An internal error occured." : "Произошла внутренняя ошибка", + "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!", + "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", + "An internal error occured." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", @@ -270,9 +275,9 @@ OC.L10N.register( "This means only administrators can use the instance." : "Это значит, что только администраторы могут использовать сервер.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.", "Thank you for your patience." : "Спасибо за терпение.", - "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.", - "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, обратитесь к администратору. Если вы являетесь администратором этого экземпляра, настроить параметры \"trusted_domains\" можно в config/config.php. Пример настройки можно найти в config/config.sample.php.", - "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.", + "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с недоверенного домена.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, обратитесь к администратору. Если вы являетесь администратором этого сервера, настройте параметры \"trusted_domains\" в файле config/config.php. Пример настройки можно найти в config/config.sample.php.", + "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки, расположенной ниже.", "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен", "App update required" : "Требуется обновление приложения", "%s will be updated to version %s" : "%s будет обновлен до версии %s", @@ -281,8 +286,8 @@ OC.L10N.register( "The theme %s has been disabled." : "Тема %s была отключена.", "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.", "Start update" : "Запустить обновление", - "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек в крупных установках, вы можете выполнить следующую команду в каталоге установки:", - "This %s instance is currently in maintenance mode, which may take a while." : "Это %s находится в режиме технического обслуживания, которое может занять некоторое время.", - "This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s снова станет доступен." + "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать тайм-аутов в крупных установках, вместо этого можно выполнить следующую команду в каталоге установки:", + "This %s instance is currently in maintenance mode, which may take a while." : "Этот сервер %s находится в режиме технического обслуживания, которое может занять некоторое время.", + "This page will refresh itself when the %s instance is available again." : "Эта страница автоматически обновится, когда сервер %s снова станет доступен." }, "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/core/l10n/ru.json b/core/l10n/ru.json index 28fbcd1a491..f98955b663b 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -14,15 +14,16 @@ "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s", "Repair warning: " : "Предупреждение восстановления:", "Repair error: " : "Ошибка восстановления:", - "Set log level to debug" : "Установить уровень журнала отладки", + "Set log level to debug" : "Установить журнал в режим отладки", "Reset log level" : "Сбросить уровень журнала", "Starting code integrity check" : "Начинается проверка целостности кода", "Finished code integrity check" : "Проверка целостности кода завершина", - "%s (3rdparty)" : "%s (3rdparty)", + "%s (3rdparty)" : "%s (стороннее)", "%s (incompatible)" : "%s (несовместим)", "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s", "Already up to date" : "Не нуждается в обновлении", - "File is too big" : "Файл слишком большой", + "Please select a file." : "Пожалуйста выберите файл.", + "File is too big" : "Файл слишком велик", "Invalid file provided" : "Указан неправильный файл", "No image or file provided" : "Не указано изображение или файл", "Unknown filetype" : "Неизвестный тип файла", @@ -82,7 +83,7 @@ "Saving..." : "Сохранение...", "seconds ago" : "несколько секунд назад", "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.", - "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку спама.<br>Если его там нет, то обратитесь к вашему администратору.", + "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку со спамом.<br>Если его там нет, то обратитесь к вашему администратору.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?", "I know what I'm doing" : "Я понимаю, что делаю", "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.", @@ -109,15 +110,19 @@ "So-so password" : "Так себе пароль", "Good password" : "Хороший пароль", "Strong password" : "Устойчивый к взлому пароль", - "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш веб-сервер еще не настроен должным образом, чтобы позволить синхронизацию файлов, потому что интерфейс WebDAV, кажется, испорчен.", - "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установки сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Мы предлагаем включить подключение к Интернету для этого сервера, если вы хотите, чтобы все функции работали.", - "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из интернете. .htaccess файл не работает. Мы настоятельно рекомендуем вам настроить ваш веб сервер таким образом, что-бы каталог данных не был больше доступен или переместите каталог данных за пределы корня веб сервера.", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш веб-сервер еще не настроен должным образом чтобы позволить синхронизацию файлов, потому что интерфейс WebDAV, кажется, испорчен.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ваш сервер не настроен для правильного разрешения \"{url}\". За дополнительной информацией обратитесь к нашей <a target=\"_blank\" href=\"{docLink}\">документации</a>.", + "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установка сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Рекомендуется разрешить данному серверу доступ в Интернет если хотите, чтобы все функции работали.", + "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из Интернета. Файл .htaccess не работает. Мы настоятельно рекомендуем Вам настроить веб сервер таким образом, чтобы каталог данных не был больше доступен или переместить каталог данных за пределы корня веб сервера.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Кэш-памяти не настроено. Для повышения производительности, пожалуйста, настройте кэш-памяти (memcache) если есть такая возможность. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", - "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/DEV/urandom не доступно для PHP, это крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", - "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версия PHP ({version}) больше не <a target=\"_blank\" href=\"{phpLink}\"> поддерживается PHP разработчиками</a>. Мы рекомендуем Вам обновить версию PHP, чтобы воспользоваться производительностью и безопасностью, предусмотренных в обновленной версии PHP.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom не доступно чтение для PHP, что крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версия PHP ({version}) больше не <a target=\"_blank\" href=\"{phpLink}\"> поддерживается разработчиками PHP</a>. Мы рекомендуем Вам обновить версию PHP, чтобы воспользоваться производительностью и безопасностью, предусмотренных в обновленной версии PHP.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси не верна, либо доступ к ownCloud осуществлён через доверенный прокси. Если ownCloud открыт не через доверенный прокси то это проблема безопасности, которая может позволить атакующему подделать IP адрес, который видит ownCloud. Дополнительная информация доступна в нашей <a target=\"_blank\" href=\"{docLink}\">документации</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "В качестве распределённого кеша настроен memcached, но установлен неверный модуль PHP \"memcache\". \\OC\\Memcache\\Memcached поддерживает только \"memcached\", но не \"memcache\". Изучите <a target=\"_blank\" href=\"{wikiLink}\">оба модуля в memcached wiki</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Некоторые файлы не прошли проверку целостности. Дополнительная информация о том, как устранить данную проблему доступна в нашей <a target=\"_blank\" href=\"{docLink}\">документации</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Список проблемных файлов…</a> / <a href=\"{rescanEndpoint}\">Сканировать ещё раз…</a>)", "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера", - "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на ожидаемый \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.", - "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен хотя бы на \"{seconds}\" секунд. Для улучшения безопасности мы рекомендуем включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на значение \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" не настроен хотя бы на \"{seconds}\" секунд. Для улучшения безопасности мы рекомендуем включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Вы зашли на этот сайт через HTTP. Мы настоятельно рекомендуем настроить ваш сервер на использование HTTPS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "Shared" : "Общий доступ", "Shared with {recipients}" : "Вы поделились с {recipients}", @@ -154,14 +159,14 @@ "change" : "изменить", "delete" : "удалить", "access control" : "контроль доступа", - "Share details could not be loaded for this item." : "Информация об общем доступе для этого элемента не может быть загружена.", + "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "Share" : "Поделиться", - "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя формат username@example.com/owncloud", "Share with users or groups …" : "Поделиться с пользователями или группами ...", "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...", "Warning" : "Предупреждение", - "Error while sending notification" : "Ошибка отправки уведомления", + "Error while sending notification" : "Ошибка при отправке уведомления", "The object type is not specified." : "Тип объекта не указан", "Enter new" : "Ввести новое", "Delete" : "Удалить", @@ -177,24 +182,24 @@ "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов","скачать %n файлов"], "{version} is available. Get more information on how to update." : "Доступна версия {version}. Получить дополнительную информацию о порядке обновления.", "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Идет обновление. Покидая эту страницу, вы можете прервать процесс обновления.", - "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, пожалуйста, подождите.", + "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, это может занять некоторое время.", "An error occurred." : "Произошла ошибка.", - "Please reload the page." : "Обновите страницу.", - "The update was unsuccessful. " : "Обновление не удалось.", + "Please reload the page." : "Пожалуйста, обновите страницу.", + "The update was unsuccessful. " : "Обновление окончилось неудачей.", "The update was successful. There were warnings." : "Обновление прошло успешно. Были предупреждения.", "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.", - "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль из-за неверного токена", - "Couldn't reset password because the token is expired" : "Не удается сбросить пароль, так как токен истек.", + "Couldn't reset password because the token is invalid" : "Не удалось сбросить пароль из-за неверного токена", + "Couldn't reset password because the token is expired" : "Не удалось сбросить пароль, так как срок действия токена истек.", "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Убедитесь, что имя пользователя указано верно.", - "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Не удалось отправить письмо сброса из-за отсутствия адреса электронной почты для этого пользователя. Пожалуйста, обратитесь к администратору.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Не удалось отправить письмо сброса так как у данного пользователя не задан адрес электронной почты. Пожалуйста, обратитесь к администратору.", "%s password reset" : "Сброс пароля %s", "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}", "New password" : "Новый пароль", "New Password" : "Новый пароль", "Reset password" : "Сбросить пароль", "Searching other places" : "Идет поиск в других местах", - "No search results in other folders" : "Нет результатов поиска в других папках", - "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат в другой папке","{count} результата в другой папке","{count} результатов в другой папке","{count} результатов в другой папке"], + "No search results in other folders" : "В других папках ничего не найдено", + "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат в другой папке","{count} результата в другой папке","{count} результатов в другой папке","{count} результатов в других папках"], "Personal" : "Личное", "Users" : "Пользователи", "Apps" : "Приложения", @@ -216,7 +221,7 @@ "Cheers!" : "Всего наилучшего!", "Internal Server Error" : "Внутренняя ошибка сервера", "The server encountered an internal error and was unable to complete your request." : "Запрос не выполнен, на сервере произошла ошибка.", - "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет повторяться, прикрепите технические детали к своему сообщению.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера если эта ошибка будет повторяться. Прикрепите указанную ниже информацию к своему сообщению.", "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.", "Technical details" : "Технические детали", "Remote Address: %s" : "Удаленный адрес: %s", @@ -226,10 +231,10 @@ "Message: %s" : "Сообщение: %s", "File: %s" : "Файл: %s", "Line: %s" : "Линия: %s", - "Trace" : "След", + "Trace" : "Трассировка", "Security warning" : "Предупреждение безопасности", - "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются, возможно, каталог данных и файлы свободно доступны из интернета.", - "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, руководствуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.", + "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются. Возможно, каталог данных и файлы свободно доступны из интернета.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, воспользуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.", "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>", "Username" : "Имя пользователя", "Storage & database" : "Хранилище и база данных", @@ -245,19 +250,19 @@ "Database host" : "Хост базы данных", "Performance warning" : "Предупреждение о производительности", "SQLite will be used as database." : "В качестве базы данных будет использована SQLite.", - "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другую базу данных.", - "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.", + "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другой тип базы данных.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "В частности не рекомендуется использовать SQLite при синхронизации файлов с использованием клиента для ПК.", "Finish setup" : "Завершить установку", "Finishing …" : "Завершение...", "Need help?" : "Нужна помощь?", "See the documentation" : "Посмотреть документацию", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s поделился с вами <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы посмотреть<br><br>", - "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Это приложение требует включённый JavaScript для корректной работы. Пожалуйста, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включите JavaScript</a> и перезагрузите интерфейс.", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Для корректной работы приложения требуется JavaScript. Пожалуйста, {linkstart}включите JavaScript{linkend} и обновите страницу.", "Log out" : "Выйти", "Search" : "Найти", - "Server side authentication failed!" : "Неудачная аутентификация с сервером!", - "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.", - "An internal error occured." : "Произошла внутренняя ошибка", + "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!", + "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", + "An internal error occured." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", @@ -268,9 +273,9 @@ "This means only administrators can use the instance." : "Это значит, что только администраторы могут использовать сервер.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.", "Thank you for your patience." : "Спасибо за терпение.", - "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.", - "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, обратитесь к администратору. Если вы являетесь администратором этого экземпляра, настроить параметры \"trusted_domains\" можно в config/config.php. Пример настройки можно найти в config/config.sample.php.", - "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.", + "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с недоверенного домена.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, обратитесь к администратору. Если вы являетесь администратором этого сервера, настройте параметры \"trusted_domains\" в файле config/config.php. Пример настройки можно найти в config/config.sample.php.", + "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки, расположенной ниже.", "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен", "App update required" : "Требуется обновление приложения", "%s will be updated to version %s" : "%s будет обновлен до версии %s", @@ -279,8 +284,8 @@ "The theme %s has been disabled." : "Тема %s была отключена.", "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.", "Start update" : "Запустить обновление", - "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек в крупных установках, вы можете выполнить следующую команду в каталоге установки:", - "This %s instance is currently in maintenance mode, which may take a while." : "Это %s находится в режиме технического обслуживания, которое может занять некоторое время.", - "This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s снова станет доступен." + "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать тайм-аутов в крупных установках, вместо этого можно выполнить следующую команду в каталоге установки:", + "This %s instance is currently in maintenance mode, which may take a while." : "Этот сервер %s находится в режиме технического обслуживания, которое может занять некоторое время.", + "This page will refresh itself when the %s instance is available again." : "Эта страница автоматически обновится, когда сервер %s снова станет доступен." },"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/core/l10n/th_TH.js b/core/l10n/th_TH.js index c08a74cd8d5..73f86452346 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -16,12 +16,15 @@ OC.L10N.register( "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s", "Repair warning: " : "เตือนการซ่อมแซม:", "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:", + "Set log level to debug" : "ตั้งค่าระดับบันทึกเพื่อแก้ปัญหา", + "Reset log level" : "ตั้งค่าระดับบันทึกใหม่", "Starting code integrity check" : "กำลังเริ่มต้นรหัสตรวจสอบความสมบูรณ์", "Finished code integrity check" : "ตรวจสอบความสมบูรณ์ของรหัสเสร็จสิ้น", "%s (3rdparty)" : "%s (บุคคลที่ 3)", "%s (incompatible)" : "%s (เข้ากันไม่ได้)", "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s", "Already up to date" : "มีอยู่แล้วถึงวันที่", + "Please select a file." : "กรุณาเลือกแฟ้ม", "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป", "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง", "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ", @@ -258,6 +261,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", + "Wrong password." : "รหัสผ่านผิดพลาด", "Stay logged in" : "กำลังอยู่ในระบบ", "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ", "This ownCloud instance is currently in single user mode." : "ขณะนี้ ownCloud อยู่ในโหมดผู้ใช้คนเดียว", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index fd2205fac5c..7efa46c6ba9 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -14,12 +14,15 @@ "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s", "Repair warning: " : "เตือนการซ่อมแซม:", "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:", + "Set log level to debug" : "ตั้งค่าระดับบันทึกเพื่อแก้ปัญหา", + "Reset log level" : "ตั้งค่าระดับบันทึกใหม่", "Starting code integrity check" : "กำลังเริ่มต้นรหัสตรวจสอบความสมบูรณ์", "Finished code integrity check" : "ตรวจสอบความสมบูรณ์ของรหัสเสร็จสิ้น", "%s (3rdparty)" : "%s (บุคคลที่ 3)", "%s (incompatible)" : "%s (เข้ากันไม่ได้)", "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s", "Already up to date" : "มีอยู่แล้วถึงวันที่", + "Please select a file." : "กรุณาเลือกแฟ้ม", "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป", "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง", "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ", @@ -256,6 +259,7 @@ "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", + "Wrong password." : "รหัสผ่านผิดพลาด", "Stay logged in" : "กำลังอยู่ในระบบ", "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ", "This ownCloud instance is currently in single user mode." : "ขณะนี้ ownCloud อยู่ในโหมดผู้ใช้คนเดียว", diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js index f2ba5bac15c..cda5c1031df 100644 --- a/core/l10n/zh_TW.js +++ b/core/l10n/zh_TW.js @@ -16,6 +16,10 @@ OC.L10N.register( "Updated \"%s\" to %s" : "已更新 %s 到 %s", "Repair warning: " : "修復警告：", "Repair error: " : "修復錯誤", + "Set log level to debug" : "設定紀錄變成除錯層級", + "Reset log level" : "重設記錄層級", + "Starting code integrity check" : "開始檢查程式碼完整性", + "Finished code integrity check" : "完成程式碼完整性檢查", "%s (3rdparty)" : "%s (第3方)", "%s (incompatible)" : "%s (不相容的)", "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s", @@ -76,6 +80,7 @@ OC.L10N.register( "Oct." : "十月", "Nov." : "十一月", "Dec." : "十二月", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">執行程式碼完整性檢查時發生問題。更多資訊…</a>", "Settings" : "設定", "Saving..." : "儲存中...", "seconds ago" : "幾秒前", @@ -108,10 +113,15 @@ OC.L10N.register( "Good password" : "密碼強度佳", "Strong password" : "密碼強度極佳", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面有問題", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "您的網路伺服器尚未妥善的設定\"{url}\"。更多資訊請參閱我們的 <a target=\"_blank\" href=\"{docLink}\">文件</a>。", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "伺服器沒有網際網路連線，有些功能，像是外部儲存、更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "您的資料目錄和您的檔案可能從網路網路被存取，使.htaccess 檔案無法發揮效果，我們強烈建議您配置您的網頁伺服器讓資料目錄不再被訪問存取或者將您的資料目錄移出網頁伺服器根目錄。", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "沒有設定 memory cache，為了增加效能，可以設定一個 memory cache ，請到<a target=\"_blank\" href=\"{docLink}\">我們的文件</a>取得更多資訊", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom 無法被 PHP 讀取，將造成安全性風險，請到<a target=\"_blank\" href=\"{docLink}\">我們的文件</a>取得更多資訊", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "您的PHP版本 ({version}) 不再被<a href=\"{phpLink}\">PHP</a>支援，我們建議您升級您的PHP版本來提升效能以及安全性。", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "反向代理伺服器標頭配置不正確或者您正從一個受信任的代理伺服器訪問ownCloud，如果您不是從受信任的代理伺服器訪問ownCloud，表示這是一個安全性問題，攻擊者可利用IP詐騙存取ownCloud，更多訊息查看 <a href=\"{docLink}\">文件</a>。", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 被設置成分散式緩存模式，但已經安裝了錯誤的PHP模組 \"memcache\"。\\OC\\Memcache\\Memcached 只支援 \"memcached\"，並未支援\"memcache\"。請參閱<a target=\"_blank\" href=\"{wikiLink}\">關於這兩個模組的wiki</a>。", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "有些檔案並未通過程式碼完整性的檢查，更多有關如何解決上述問題的資訊請參閱我們的 <a target=\"_blank\" href=\"{docLink}\">文件</a>。(<a href=\"{codeIntegrityDownloadEndpoint}\">列出所有無效的檔案…</a> / <a href=\"{rescanEndpoint}\">重新掃描…</a>)", "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 標頭配置與 \"{expected}\"不一樣，這是一個潛在安全性或者隱私上的風險，因此我們建議您調整此設定", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP 標頭 (HSTS) 並非設定為至少 {seconds} 秒，如我們的<a href=\"{docUrl}\">安全性提示</a>所述，為了加強安全性，我們建議啟動 HSTS （HTTP 強制安全傳輸）", @@ -183,6 +193,7 @@ OC.L10N.register( "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效", "Couldn't reset password because the token is expired" : "無法重設密碼，因為 token 過期", "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員。", "%s password reset" : "%s 密碼重設", "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}", "New password" : "新密碼", @@ -265,6 +276,7 @@ OC.L10N.register( "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員", "Thank you for your patience." : "感謝您的耐心", "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php。", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域", "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域", "App update required" : "需要更新應用程式", diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json index 7410c1ceab5..0af10c399f2 100644 --- a/core/l10n/zh_TW.json +++ b/core/l10n/zh_TW.json @@ -14,6 +14,10 @@ "Updated \"%s\" to %s" : "已更新 %s 到 %s", "Repair warning: " : "修復警告：", "Repair error: " : "修復錯誤", + "Set log level to debug" : "設定紀錄變成除錯層級", + "Reset log level" : "重設記錄層級", + "Starting code integrity check" : "開始檢查程式碼完整性", + "Finished code integrity check" : "完成程式碼完整性檢查", "%s (3rdparty)" : "%s (第3方)", "%s (incompatible)" : "%s (不相容的)", "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s", @@ -74,6 +78,7 @@ "Oct." : "十月", "Nov." : "十一月", "Dec." : "十二月", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">執行程式碼完整性檢查時發生問題。更多資訊…</a>", "Settings" : "設定", "Saving..." : "儲存中...", "seconds ago" : "幾秒前", @@ -106,10 +111,15 @@ "Good password" : "密碼強度佳", "Strong password" : "密碼強度極佳", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面有問題", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "您的網路伺服器尚未妥善的設定\"{url}\"。更多資訊請參閱我們的 <a target=\"_blank\" href=\"{docLink}\">文件</a>。", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "伺服器沒有網際網路連線，有些功能，像是外部儲存、更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "您的資料目錄和您的檔案可能從網路網路被存取，使.htaccess 檔案無法發揮效果，我們強烈建議您配置您的網頁伺服器讓資料目錄不再被訪問存取或者將您的資料目錄移出網頁伺服器根目錄。", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "沒有設定 memory cache，為了增加效能，可以設定一個 memory cache ，請到<a target=\"_blank\" href=\"{docLink}\">我們的文件</a>取得更多資訊", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom 無法被 PHP 讀取，將造成安全性風險，請到<a target=\"_blank\" href=\"{docLink}\">我們的文件</a>取得更多資訊", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "您的PHP版本 ({version}) 不再被<a href=\"{phpLink}\">PHP</a>支援，我們建議您升級您的PHP版本來提升效能以及安全性。", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "反向代理伺服器標頭配置不正確或者您正從一個受信任的代理伺服器訪問ownCloud，如果您不是從受信任的代理伺服器訪問ownCloud，表示這是一個安全性問題，攻擊者可利用IP詐騙存取ownCloud，更多訊息查看 <a href=\"{docLink}\">文件</a>。", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 被設置成分散式緩存模式，但已經安裝了錯誤的PHP模組 \"memcache\"。\\OC\\Memcache\\Memcached 只支援 \"memcached\"，並未支援\"memcache\"。請參閱<a target=\"_blank\" href=\"{wikiLink}\">關於這兩個模組的wiki</a>。", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "有些檔案並未通過程式碼完整性的檢查，更多有關如何解決上述問題的資訊請參閱我們的 <a target=\"_blank\" href=\"{docLink}\">文件</a>。(<a href=\"{codeIntegrityDownloadEndpoint}\">列出所有無效的檔案…</a> / <a href=\"{rescanEndpoint}\">重新掃描…</a>)", "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 標頭配置與 \"{expected}\"不一樣，這是一個潛在安全性或者隱私上的風險，因此我們建議您調整此設定", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP 標頭 (HSTS) 並非設定為至少 {seconds} 秒，如我們的<a href=\"{docUrl}\">安全性提示</a>所述，為了加強安全性，我們建議啟動 HSTS （HTTP 強制安全傳輸）", @@ -181,6 +191,7 @@ "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效", "Couldn't reset password because the token is expired" : "無法重設密碼，因為 token 過期", "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員。", "%s password reset" : "%s 密碼重設", "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}", "New password" : "新密碼", @@ -263,6 +274,7 @@ "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員", "Thank you for your patience." : "感謝您的耐心", "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php。", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域", "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域", "App update required" : "需要更新應用程式", diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php index 0cd6fcd30a4..c9ee8ed2ff5 100644 --- a/core/lostpassword/controller/lostcontroller.php +++ b/core/lostpassword/controller/lostcontroller.php @@ -4,10 +4,11 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -227,7 +228,7 @@ class LostController extends Controller { ); } - $token = $this->secureRandom->getMediumStrengthGenerator()->generate(21, + $token = $this->secureRandom->generate(21, ISecureRandom::CHAR_DIGITS. ISecureRandom::CHAR_LOWER. ISecureRandom::CHAR_UPPER); diff --git a/core/lostpassword/templates/email.php b/core/lostpassword/templates/email.php index 618ac5dcd5c..3ca424d5294 100644 --- a/core/lostpassword/templates/email.php +++ b/core/lostpassword/templates/email.php @@ -2,7 +2,7 @@ /** * @author Christopher Schäpers <kondou@ts.unde.re> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php index c17ec652473..22dd2fc13b7 100644 --- a/core/lostpassword/templates/resetpassword.php +++ b/core/lostpassword/templates/resetpassword.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/register_command.php b/core/register_command.php index 83e92a7e216..2875af15caf 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -4,12 +4,14 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Christian Kampka <christian@kampka.net> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/routes.php b/core/routes.php index 0eb013aae85..8981eb618f3 100644 --- a/core/routes.php +++ b/core/routes.php @@ -11,7 +11,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/search/ajax/search.php b/core/search/ajax/search.php index 1b025088f08..6c5e0237362 100644 --- a/core/search/ajax/search.php +++ b/core/search/ajax/search.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/setup/controller.php b/core/setup/controller.php index 36ba33f2a42..a64e6f08a36 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -5,10 +5,10 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/strings.php b/core/strings.php index e89228844d8..4936866377a 100644 --- a/core/strings.php +++ b/core/strings.php @@ -3,7 +3,7 @@ * @author Jan-Christoph Borchardt <hey@jancborchardt.net> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/tags/controller.php b/core/tags/controller.php index e06a343f2b3..9798a59d56f 100644 --- a/core/tags/controller.php +++ b/core/tags/controller.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/user/usercontroller.php b/core/user/usercontroller.php index 5664ca55603..38ecd86b459 100644 --- a/core/user/usercontroller.php +++ b/core/user/usercontroller.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/index.php b/index.php index 5c376dcf285..f3bf699f3c1 100644 --- a/index.php +++ b/index.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/autoloader.php b/lib/autoloader.php index 10cd5a8016a..e7262af0ca9 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -6,11 +6,12 @@ * @author Markus Goetz <markus@woboq.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Victor Dubiniuk <dubiniuk@owncloud.com> + * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/base.php b/lib/base.php index 80b1a2bafcd..b7118e02458 100644 --- a/lib/base.php +++ b/lib/base.php @@ -26,16 +26,16 @@ * @author Phil Davis <phil.davis@inf.org> * @author Ramiro Aparicio <rapariciog@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author scolebrook <scolebrook@mac.com> - * @author Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -1076,7 +1076,7 @@ class OC { if ($config->getSystemValue('debug', false)) { self::$server->getLogger()->debug('Setting remember login to cookie', array('app' => 'core')); } - $token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32); + $token = \OC::$server->getSecureRandom()->generate(32); $config->setUserValue($userId, 'login_token', $token, time()); OC_User::setMagicInCookie($userId, $token); } else { diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index d2ad6e66a31..1465d9efd4a 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -113,6 +113,7 @@ OC.L10N.register( "Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.", "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s", "Expiration date is in the past" : "La date d'expiration est dans le passé", + "Cannot set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration plus que %s jours dans le futur", "Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"", "Apps" : "Applications", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\"", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index 9749604a137..217d9f54724 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -111,6 +111,7 @@ "Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.", "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s", "Expiration date is in the past" : "La date d'expiration est dans le passé", + "Cannot set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration plus que %s jours dans le futur", "Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"", "Apps" : "Applications", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\"", diff --git a/lib/l10n/he.js b/lib/l10n/he.js index ce99a984cac..3c150ca5120 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -22,6 +22,7 @@ OC.L10N.register( "Apps" : "יישומים", "A valid username must be provided" : "יש לספק שם משתמש תקני", "A valid password must be provided" : "יש לספק ססמה תקנית", + "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", "Storage not available" : "אחסון לא זמין" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/he.json b/lib/l10n/he.json index 2b39879cf82..587ae1549d0 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -20,6 +20,7 @@ "Apps" : "יישומים", "A valid username must be provided" : "יש לספק שם משתמש תקני", "A valid password must be provided" : "יש לספק ססמה תקנית", + "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", "Storage not available" : "אחסון לא זמין" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index bb3bd551841..fce4ae0d142 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -112,6 +112,9 @@ OC.L10N.register( "Sharing %s failed, because resharing is not allowed" : "Delen van %s is mislukt, omdat her-delen niet is toegestaan", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden", "Sharing %s failed, because the file could not be found in the file cache" : "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden", + "Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen", + "Expiration date is in the past" : "De vervaldatum ligt in het verleden", + "Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen", "Could not find category \"%s\"" : "Kon categorie \"%s\" niet vinden", "Apps" : "Apps", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index 8388c0a502e..ec63a8252d3 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -110,6 +110,9 @@ "Sharing %s failed, because resharing is not allowed" : "Delen van %s is mislukt, omdat her-delen niet is toegestaan", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden", "Sharing %s failed, because the file could not be found in the file cache" : "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden", + "Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen", + "Expiration date is in the past" : "De vervaldatum ligt in het verleden", + "Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen", "Could not find category \"%s\"" : "Kon categorie \"%s\" niet vinden", "Apps" : "Apps", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js index da84e9758c3..86737da8322 100644 --- a/lib/l10n/th_TH.js +++ b/lib/l10n/th_TH.js @@ -96,6 +96,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "การแชร์ %s ล้มเหลวเพราะ %s ไม่ได้เป็นสมาชิกของกลุ่ม %s", "You need to provide a password to create a public link, only protected links are allowed" : "คุณจำเป็นต้องระบุรหัสผ่านเพื่อสร้างลิงค์สาธารณะ, ลิงค์ที่มีการป้องกันเท่านั้นที่ได้รับอนุญาต", "Sharing %s failed, because sharing with links is not allowed" : "การแชร์ %s ล้มเหลวเพราะมีการแชร์ลิงค์ไม่ได้รับอนุญาต", + "Not allowed to create a federated share with the same user" : "ไม่อนุญาตให้สร้างแชร์สหพันธ์กับผู้ใช้เดียวกัน", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "การแชร์ %s ล้มเหลวไม่สามารถหา %s, บางทีอาจจะยังไม่สามารถเข้าถึงเซิร์ฟเวอร์ปัจจุบัน", "Share type %s is not valid for %s" : "ประเภท %s ที่แชร์ไม่ถูกต้องสำหรับ %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "การตั้งค่าสิทธิ์สำหรับ %s ล้มเหลวเพราะเกินสิทธิ์ที่ได้อนุญาตให้ %s", @@ -111,6 +112,8 @@ OC.L10N.register( "Sharing %s failed, because resharing is not allowed" : "การแชร์ %s ล้มเหลวเพราะการแชร์ต่อไม่ได้รับอนุญาต", "Sharing %s failed, because the sharing backend for %s could not find its source" : "การแชร์ %s ล้มเหลวเพราะการแชร์แบ็กเอนด์สำหรับ %s ไม่สามารถหาแหล่งที่มา", "Sharing %s failed, because the file could not be found in the file cache" : "การแชร์ %s ล้มเหลวเพราะไม่พบไฟล์ในแคชไฟล์", + "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s", + "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีตที่ผ่านมา", "Could not find category \"%s\"" : "ไม่พบหมวดหมู่ \"%s\"", "Apps" : "แอปฯ", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "ตัวอักษรที่อนุญาตให้ใช้ในชื่อผู้ใช้: \"a-z\", \"A-Z\", \"0-9\" และ \"_.@-\"", diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json index 8a951a1468d..f58933847d8 100644 --- a/lib/l10n/th_TH.json +++ b/lib/l10n/th_TH.json @@ -94,6 +94,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "การแชร์ %s ล้มเหลวเพราะ %s ไม่ได้เป็นสมาชิกของกลุ่ม %s", "You need to provide a password to create a public link, only protected links are allowed" : "คุณจำเป็นต้องระบุรหัสผ่านเพื่อสร้างลิงค์สาธารณะ, ลิงค์ที่มีการป้องกันเท่านั้นที่ได้รับอนุญาต", "Sharing %s failed, because sharing with links is not allowed" : "การแชร์ %s ล้มเหลวเพราะมีการแชร์ลิงค์ไม่ได้รับอนุญาต", + "Not allowed to create a federated share with the same user" : "ไม่อนุญาตให้สร้างแชร์สหพันธ์กับผู้ใช้เดียวกัน", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "การแชร์ %s ล้มเหลวไม่สามารถหา %s, บางทีอาจจะยังไม่สามารถเข้าถึงเซิร์ฟเวอร์ปัจจุบัน", "Share type %s is not valid for %s" : "ประเภท %s ที่แชร์ไม่ถูกต้องสำหรับ %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "การตั้งค่าสิทธิ์สำหรับ %s ล้มเหลวเพราะเกินสิทธิ์ที่ได้อนุญาตให้ %s", @@ -109,6 +110,8 @@ "Sharing %s failed, because resharing is not allowed" : "การแชร์ %s ล้มเหลวเพราะการแชร์ต่อไม่ได้รับอนุญาต", "Sharing %s failed, because the sharing backend for %s could not find its source" : "การแชร์ %s ล้มเหลวเพราะการแชร์แบ็กเอนด์สำหรับ %s ไม่สามารถหาแหล่งที่มา", "Sharing %s failed, because the file could not be found in the file cache" : "การแชร์ %s ล้มเหลวเพราะไม่พบไฟล์ในแคชไฟล์", + "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s", + "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีตที่ผ่านมา", "Could not find category \"%s\"" : "ไม่พบหมวดหมู่ \"%s\"", "Apps" : "แอปฯ", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "ตัวอักษรที่อนุญาตให้ใช้ในชื่อผู้ใช้: \"a-z\", \"A-Z\", \"0-9\" และ \"_.@-\"", diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js index b8afe4578f3..dec4c59dfcd 100644 --- a/lib/l10n/zh_TW.js +++ b/lib/l10n/zh_TW.js @@ -81,6 +81,7 @@ OC.L10N.register( "Can't create or write into the data directory %s" : "無法建立或寫入資料目錄 %s", "Invalid Federated Cloud ID" : "無效的雲端聯盟ID:", "%s shared »%s« with you" : "%s 與您分享了 %s", + "%s via %s" : "%s 經由 %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "分享 %s失敗，不允許分享這樣的 %i 類別", "Sharing %s failed, because the file does not exist" : "分享 %s 失敗，因為檔案不存在", "You are not allowed to share %s" : "你不被允許分享 %s", diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json index 11cd97a43c6..e16c36e2212 100644 --- a/lib/l10n/zh_TW.json +++ b/lib/l10n/zh_TW.json @@ -79,6 +79,7 @@ "Can't create or write into the data directory %s" : "無法建立或寫入資料目錄 %s", "Invalid Federated Cloud ID" : "無效的雲端聯盟ID:", "%s shared »%s« with you" : "%s 與您分享了 %s", + "%s via %s" : "%s 經由 %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "分享 %s失敗，不允許分享這樣的 %i 類別", "Sharing %s failed, because the file does not exist" : "分享 %s 失敗，因為檔案不存在", "You are not allowed to share %s" : "你不被允許分享 %s", diff --git a/lib/private/activity/event.php b/lib/private/activity/event.php index 413ff613186..b7e271b2104 100644 --- a/lib/private/activity/event.php +++ b/lib/private/activity/event.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Phil Davis <phil.davis@inf.org> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php index fadfedf277f..e5235cb9bfe 100644 --- a/lib/private/activitymanager.php +++ b/lib/private/activitymanager.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php index 7c2037e8048..af7ffa4168e 100644 --- a/lib/private/allconfig.php +++ b/lib/private/allconfig.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/api.php b/lib/private/api.php index edee30dfc96..1fbe3201f85 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -13,7 +13,7 @@ * @author Tom Needham <tom@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app.php b/lib/private/app.php index 705d60cf8d6..b4856f11860 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -20,7 +20,8 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author RealRancor <Fisch.666@gmx.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Sam Tuke <mail@samtuke.com> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> @@ -28,7 +29,7 @@ * @author Tom Needham <tom@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -312,14 +313,14 @@ class OC_App { * @param string $app * @return int */ - public static function downloadApp($app) { + private static function downloadApp($app) { $ocsClient = new OCSClient( \OC::$server->getHTTPClientService(), \OC::$server->getConfig(), \OC::$server->getLogger() ); $appData = $ocsClient->getApplication($app, \OCP\Util::getVersion()); - $download= $ocsClient->getApplicationDownload($app, \OCP\Util::getVersion()); + $download = $ocsClient->getApplicationDownload($app, \OCP\Util::getVersion()); if(isset($download['downloadlink']) and $download['downloadlink']!='') { // Replace spaces in download link without encoding entire URL $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']); @@ -855,7 +856,7 @@ class OC_App { * @param string $ocsID * @return string|false */ - protected static function getInternalAppIdByOcs($ocsID) { + public static function getInternalAppIdByOcs($ocsID) { if(is_numeric($ocsID)) { $idArray = \OC::$server->getAppConfig()->getValues(false, 'ocsid'); if(array_search($ocsID, $idArray)) { @@ -1041,7 +1042,7 @@ class OC_App { /** - * @param mixed $app + * @param string $app * @return bool * @throws Exception if app is not compatible with this version of ownCloud * @throws Exception if no app-name was specified diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php index 8ae93f98832..7cb945784bc 100644 --- a/lib/private/app/appmanager.php +++ b/lib/private/app/appmanager.php @@ -4,9 +4,10 @@ * @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> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -147,6 +148,10 @@ class AppManager implements IAppManager { } elseif (is_null($user)) { return false; } else { + if(empty($enabled)){ + return false; + } + $groupIds = json_decode($enabled); if (!is_array($groupIds)) { diff --git a/lib/private/app/codechecker/abstractcheck.php b/lib/private/app/codechecker/abstractcheck.php index c1c6524e42f..ca91d366482 100644 --- a/lib/private/app/codechecker/abstractcheck.php +++ b/lib/private/app/codechecker/abstractcheck.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/codechecker.php b/lib/private/app/codechecker/codechecker.php index ef7dc7f3e4d..0ca597ccb4e 100644 --- a/lib/private/app/codechecker/codechecker.php +++ b/lib/private/app/codechecker/codechecker.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/deprecationcheck.php b/lib/private/app/codechecker/deprecationcheck.php index 1d287edc858..fa5eae8ab1d 100644 --- a/lib/private/app/codechecker/deprecationcheck.php +++ b/lib/private/app/codechecker/deprecationcheck.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/emptycheck.php b/lib/private/app/codechecker/emptycheck.php index 0e5df55d090..b779926d5e4 100644 --- a/lib/private/app/codechecker/emptycheck.php +++ b/lib/private/app/codechecker/emptycheck.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/icheck.php b/lib/private/app/codechecker/icheck.php index a00e0d8fa13..97e0bc9b8a0 100644 --- a/lib/private/app/codechecker/icheck.php +++ b/lib/private/app/codechecker/icheck.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php index 2589277118b..ac92ee2661c 100644 --- a/lib/private/app/codechecker/infochecker.php +++ b/lib/private/app/codechecker/infochecker.php @@ -1,8 +1,9 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/nodevisitor.php b/lib/private/app/codechecker/nodevisitor.php index cf850147fd8..f9386caeeae 100644 --- a/lib/private/app/codechecker/nodevisitor.php +++ b/lib/private/app/codechecker/nodevisitor.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/privatecheck.php b/lib/private/app/codechecker/privatecheck.php index bafcfd1d03e..32248ab21e2 100644 --- a/lib/private/app/codechecker/privatecheck.php +++ b/lib/private/app/codechecker/privatecheck.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/codechecker/strongcomparisoncheck.php b/lib/private/app/codechecker/strongcomparisoncheck.php index 3072027b258..919647a6a54 100644 --- a/lib/private/app/codechecker/strongcomparisoncheck.php +++ b/lib/private/app/codechecker/strongcomparisoncheck.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/dependencyanalyzer.php b/lib/private/app/dependencyanalyzer.php index 5d86368ea83..ba2479ae7aa 100644 --- a/lib/private/app/dependencyanalyzer.php +++ b/lib/private/app/dependencyanalyzer.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/infoparser.php b/lib/private/app/infoparser.php index a84163612e8..c33e5349f3b 100644 --- a/lib/private/app/infoparser.php +++ b/lib/private/app/infoparser.php @@ -1,10 +1,11 @@ <?php /** * @author Andreas Fischer <bantu@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/platform.php b/lib/private/app/platform.php index c16f050e13c..1d4c3767121 100644 --- a/lib/private/app/platform.php +++ b/lib/private/app/platform.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/app/platformrepository.php b/lib/private/app/platformrepository.php index fa71bd7d91a..730c67f45ee 100644 --- a/lib/private/app/platformrepository.php +++ b/lib/private/app/platformrepository.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index d1c1e4bfc45..cd3362e0091 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -7,10 +7,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php index 5cad32bbd09..376a8559454 100644 --- a/lib/private/appframework/app.php +++ b/lib/private/appframework/app.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php index 28c846b8d40..67b696948f0 100644 --- a/lib/private/appframework/core/api.php +++ b/lib/private/appframework/core/api.php @@ -4,10 +4,10 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php index 9f912f9c0a4..812649daa78 100644 --- a/lib/private/appframework/db/db.php +++ b/lib/private/appframework/db/db.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index 69476d84c9b..8fc52141d5b 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -1,15 +1,16 @@ <?php /** * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php index e64759fa924..a99f7ea437f 100644 --- a/lib/private/appframework/http.php +++ b/lib/private/appframework/http.php @@ -1,13 +1,14 @@ <?php /** * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php index 5fabdad75b9..641339c0d94 100644 --- a/lib/private/appframework/http/dispatcher.php +++ b/lib/private/appframework/http/dispatcher.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/http/output.php b/lib/private/appframework/http/output.php index f4773ab1063..dfb03e6a516 100644 --- a/lib/private/appframework/http/output.php +++ b/lib/private/appframework/http/output.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 6ba1d8f644d..2b944c116eb 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -5,13 +5,16 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> + * @author Mitar <mitar.git@tnode.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -465,7 +468,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { } if(empty($this->requestId)) { - $this->requestId = $this->secureRandom->getLowStrengthGenerator()->generate(20); + $this->requestId = $this->secureRandom->generate(20); } return $this->requestId; diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php index 5d4cf3786f1..e2b2eff42ab 100644 --- a/lib/private/appframework/middleware/middlewaredispatcher.php +++ b/lib/private/appframework/middleware/middlewaredispatcher.php @@ -6,7 +6,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/appframework/middleware/security/corsmiddleware.php index 0e37e81c5be..e42513b44a2 100644 --- a/lib/private/appframework/middleware/security/corsmiddleware.php +++ b/lib/private/appframework/middleware/security/corsmiddleware.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php b/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php index 54cb08f4385..59e247f3307 100644 --- a/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php +++ b/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php @@ -1,8 +1,10 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php b/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php index c59c921f5eb..0eeb81730d4 100644 --- a/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php +++ b/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php @@ -1,8 +1,10 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/security/exceptions/notadminexception.php b/lib/private/appframework/middleware/security/exceptions/notadminexception.php index 3fa03cae896..be0f2f9d2a9 100644 --- a/lib/private/appframework/middleware/security/exceptions/notadminexception.php +++ b/lib/private/appframework/middleware/security/exceptions/notadminexception.php @@ -1,8 +1,10 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php b/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php index 5f27625aa52..f5b2e032032 100644 --- a/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php +++ b/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php @@ -1,8 +1,10 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/security/exceptions/securityexception.php b/lib/private/appframework/middleware/security/exceptions/securityexception.php index 9b99282ce86..c86614ec477 100644 --- a/lib/private/appframework/middleware/security/exceptions/securityexception.php +++ b/lib/private/appframework/middleware/security/exceptions/securityexception.php @@ -1,8 +1,10 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php index 725ce689b48..4ef043ad50f 100644 --- a/lib/private/appframework/middleware/security/securitymiddleware.php +++ b/lib/private/appframework/middleware/security/securitymiddleware.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/middleware/sessionmiddleware.php b/lib/private/appframework/middleware/sessionmiddleware.php index 64f0b5e5c51..b218b48ea11 100644 --- a/lib/private/appframework/middleware/sessionmiddleware.php +++ b/lib/private/appframework/middleware/sessionmiddleware.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/routing/routeactionhandler.php b/lib/private/appframework/routing/routeactionhandler.php index 1dfa9425814..b282fc1b452 100644 --- a/lib/private/appframework/routing/routeactionhandler.php +++ b/lib/private/appframework/routing/routeactionhandler.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php index 7cef3f700b4..dd029ba9a00 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/appframework/routing/routeconfig.php @@ -4,10 +4,10 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Patrick Paysant <ppaysant@linagora.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php index 1118332f930..de83749fbaf 100644 --- a/lib/private/appframework/utility/controllermethodreflector.php +++ b/lib/private/appframework/utility/controllermethodreflector.php @@ -3,11 +3,10 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php index e55d4e20a81..78ded39735e 100644 --- a/lib/private/appframework/utility/simplecontainer.php +++ b/lib/private/appframework/utility/simplecontainer.php @@ -4,10 +4,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/appframework/utility/timefactory.php index 011413db6bb..5241b367069 100644 --- a/lib/private/appframework/utility/timefactory.php +++ b/lib/private/appframework/utility/timefactory.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/apphelper.php b/lib/private/apphelper.php index 478787b21d8..c19ed2f5b67 100644 --- a/lib/private/apphelper.php +++ b/lib/private/apphelper.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/archive.php b/lib/private/archive.php index 54c5a71f715..62512d1448a 100644 --- a/lib/private/archive.php +++ b/lib/private/archive.php @@ -8,11 +8,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Remco Brenninkmeijer <requist1@starmail.nl> * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php index 4066e1d86c1..905d99f116b 100644 --- a/lib/private/archive/tar.php +++ b/lib/private/archive/tar.php @@ -1,6 +1,7 @@ <?php /** * @author Bart Visscher <bartv@thisnet.nl> + * @author Christian Weiske <cweiske@cweiske.de> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Felix Moeller <mail@felixmoeller.de> * @author Frank Karlitschek <frank@owncloud.org> @@ -9,11 +10,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Remco Brenninkmeijer <requist1@starmail.nl> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/archive/zip.php b/lib/private/archive/zip.php index 430dccc49b7..2c617a8e633 100644 --- a/lib/private/archive/zip.php +++ b/lib/private/archive/zip.php @@ -11,7 +11,7 @@ * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/avatar.php b/lib/private/avatar.php index 966e4903649..d4e5f5225dc 100644 --- a/lib/private/avatar.php +++ b/lib/private/avatar.php @@ -6,11 +6,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php index 6969b386e15..b14f8133e63 100644 --- a/lib/private/avatarmanager.php +++ b/lib/private/avatarmanager.php @@ -4,10 +4,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/backgroundjob/job.php b/lib/private/backgroundjob/job.php index 40a27491fe6..677b37e9297 100644 --- a/lib/private/backgroundjob/job.php +++ b/lib/private/backgroundjob/job.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php index 446de2fa1a4..cc9be574807 100644 --- a/lib/private/backgroundjob/joblist.php +++ b/lib/private/backgroundjob/joblist.php @@ -1,11 +1,11 @@ <?php /** - * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/backgroundjob/legacy/queuedjob.php b/lib/private/backgroundjob/legacy/queuedjob.php index e9d5825ca9a..983c06fe551 100644 --- a/lib/private/backgroundjob/legacy/queuedjob.php +++ b/lib/private/backgroundjob/legacy/queuedjob.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/backgroundjob/legacy/regularjob.php b/lib/private/backgroundjob/legacy/regularjob.php index 49a777a1e27..8e8b6634c11 100644 --- a/lib/private/backgroundjob/legacy/regularjob.php +++ b/lib/private/backgroundjob/legacy/regularjob.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/backgroundjob/queuedjob.php b/lib/private/backgroundjob/queuedjob.php index c4cf8b0e5e0..bf34db7cc02 100644 --- a/lib/private/backgroundjob/queuedjob.php +++ b/lib/private/backgroundjob/queuedjob.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/backgroundjob/timedjob.php b/lib/private/backgroundjob/timedjob.php index 63db1fed61c..abf487a89e1 100644 --- a/lib/private/backgroundjob/timedjob.php +++ b/lib/private/backgroundjob/timedjob.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/cache/cappedmemorycache.php b/lib/private/cache/cappedmemorycache.php new file mode 100644 index 00000000000..cfaf78c51df --- /dev/null +++ b/lib/private/cache/cappedmemorycache.php @@ -0,0 +1,87 @@ +<?php +/** + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OC\Cache; + +use OCP\ICache; + +/** + * In-memory cache with a capacity limit to keep memory usage in check + * + * Uses a simple FIFO expiry mechanism + */ +class CappedMemoryCache implements ICache, \ArrayAccess { + + private $capacity; + private $cache = []; + + public function __construct($capacity = 512) { + $this->capacity = $capacity; + } + + public function hasKey($key) { + return isset($this->cache[$key]); + } + + public function get($key) { + return isset($this->cache[$key]) ? $this->cache[$key] : null; + } + + public function set($key, $value, $ttl = 0) { + $this->cache[$key] = $value; + $this->garbageCollect(); + } + + public function remove($key) { + unset($this->cache[$key]); + return true; + } + + public function clear($prefix = '') { + $this->cache = []; + return true; + } + + public function offsetExists($offset) { + return $this->hasKey($offset); + } + + public function offsetGet($offset) { + return $this->get($offset); + } + + public function offsetSet($offset, $value) { + $this->set($offset, $value); + } + + public function offsetUnset($offset) { + $this->remove($offset); + } + + + private function garbageCollect() { + while (count($this->cache) > $this->capacity) { + reset($this->cache); + $key = key($this->cache); + $this->remove($key); + } + } +} diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php index 31d4718d18a..989e05275b7 100644 --- a/lib/private/cache/file.php +++ b/lib/private/cache/file.php @@ -1,10 +1,12 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -99,7 +101,7 @@ class File implements ICache { $storage = $this->getStorage(); $result = false; // unique id to avoid chunk collision, just in case - $uniqueId = \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate( + $uniqueId = \OC::$server->getSecureRandom()->generate( 16, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER ); diff --git a/lib/private/capabilitiesmanager.php b/lib/private/capabilitiesmanager.php index c36a96af68b..8b89692faa9 100644 --- a/lib/private/capabilitiesmanager.php +++ b/lib/private/capabilitiesmanager.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/command/asyncbus.php b/lib/private/command/asyncbus.php index c007affc7f4..eb692f9a8fb 100644 --- a/lib/private/command/asyncbus.php +++ b/lib/private/command/asyncbus.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/command/callablejob.php b/lib/private/command/callablejob.php index b61721863f0..acfeb83d606 100644 --- a/lib/private/command/callablejob.php +++ b/lib/private/command/callablejob.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/command/closurejob.php b/lib/private/command/closurejob.php index bae98db51cf..be2b5f0a4ba 100644 --- a/lib/private/command/closurejob.php +++ b/lib/private/command/closurejob.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/command/commandjob.php b/lib/private/command/commandjob.php index 9f0292fc38b..5d613c0305b 100644 --- a/lib/private/command/commandjob.php +++ b/lib/private/command/commandjob.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/command/fileaccess.php b/lib/private/command/fileaccess.php index b4af557153e..6fe3e111aef 100644 --- a/lib/private/command/fileaccess.php +++ b/lib/private/command/fileaccess.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/command/queuebus.php b/lib/private/command/queuebus.php index 76caf76a575..be4ee589e6f 100644 --- a/lib/private/command/queuebus.php +++ b/lib/private/command/queuebus.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/comments/comment.php b/lib/private/comments/comment.php index 219e7ec8e4b..1e1514a5872 100644 --- a/lib/private/comments/comment.php +++ b/lib/private/comments/comment.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OC\Comments; use OCP\Comments\IComment; diff --git a/lib/private/comments/manager.php b/lib/private/comments/manager.php index 09e59f28370..64013a9e11f 100644 --- a/lib/private/comments/manager.php +++ b/lib/private/comments/manager.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OC\Comments; use Doctrine\DBAL\Exception\DriverException; diff --git a/lib/private/comments/managerfactory.php b/lib/private/comments/managerfactory.php index 41978d0cf4b..c2a2e0b4891 100644 --- a/lib/private/comments/managerfactory.php +++ b/lib/private/comments/managerfactory.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OC\Comments; use OCP\Comments\ICommentsManager; diff --git a/lib/private/config.php b/lib/private/config.php index 94b4fd56daa..30baa3fe0e6 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -12,10 +12,9 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> - * @author Volkan Gezer <volkangezer@gmail.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/console/application.php b/lib/private/console/application.php index e6d8677b72e..c7d9c24d7cb 100644 --- a/lib/private/console/application.php +++ b/lib/private/console/application.php @@ -1,11 +1,11 @@ <?php /** - * @author Martin Mattel <martin.mattel@diemattels.at> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/console/timestampformatter.php b/lib/private/console/timestampformatter.php index f0c0f4c4520..3beac5e2f9f 100644 --- a/lib/private/console/timestampformatter.php +++ b/lib/private/console/timestampformatter.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/contacts/localaddressbook.php b/lib/private/contacts/localaddressbook.php index 7f10c6d3338..6fba63ae327 100644 --- a/lib/private/contacts/localaddressbook.php +++ b/lib/private/contacts/localaddressbook.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php index 28285412377..a2640d36945 100644 --- a/lib/private/contactsmanager.php +++ b/lib/private/contactsmanager.php @@ -3,11 +3,11 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tobia De Koninck <tobia@ledfan.be> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/databaseexception.php b/lib/private/databaseexception.php index a382a4ac60b..4d50fe82b0f 100644 --- a/lib/private/databaseexception.php +++ b/lib/private/databaseexception.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/databasesetupexception.php b/lib/private/databasesetupexception.php index 395b85d5349..30bd00de2d6 100644 --- a/lib/private/databasesetupexception.php +++ b/lib/private/databasesetupexception.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/datetimeformatter.php b/lib/private/datetimeformatter.php index 912a5faa2e3..5639ab1cace 100644 --- a/lib/private/datetimeformatter.php +++ b/lib/private/datetimeformatter.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/datetimezone.php b/lib/private/datetimezone.php index 512c39be3ea..5359cd6b391 100644 --- a/lib/private/datetimezone.php +++ b/lib/private/datetimezone.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db.php b/lib/private/db.php index d47b7d4f31a..6535bb70d6d 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -2,17 +2,15 @@ /** * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> - * @author Dan Bartram <daneybartram@gmail.com> * @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 Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Tom Needham <tom@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php index f104a62d2d5..9522f768c88 100644 --- a/lib/private/db/adapter.php +++ b/lib/private/db/adapter.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/adaptermysql.php b/lib/private/db/adaptermysql.php index fda8554e1c4..ab87c589747 100644 --- a/lib/private/db/adaptermysql.php +++ b/lib/private/db/adaptermysql.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/adapteroci8.php b/lib/private/db/adapteroci8.php index 76c265bc178..970d3eefa4d 100644 --- a/lib/private/db/adapteroci8.php +++ b/lib/private/db/adapteroci8.php @@ -3,8 +3,9 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/adapterpgsql.php b/lib/private/db/adapterpgsql.php index 1f2119e92a5..a7d9377a0bf 100644 --- a/lib/private/db/adapterpgsql.php +++ b/lib/private/db/adapterpgsql.php @@ -3,7 +3,7 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php index e133a20f543..d7769238abc 100644 --- a/lib/private/db/adaptersqlite.php +++ b/lib/private/db/adaptersqlite.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/adaptersqlsrv.php b/lib/private/db/adaptersqlsrv.php index 7e181c37cc5..f208b2ba787 100644 --- a/lib/private/db/adaptersqlsrv.php +++ b/lib/private/db/adaptersqlsrv.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php index d32d1c5fa46..28bf3b6e05b 100644 --- a/lib/private/db/connection.php +++ b/lib/private/db/connection.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php index b6c3396e147..0856d8d19c0 100644 --- a/lib/private/db/connectionfactory.php +++ b/lib/private/db/connectionfactory.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php index 6fa9a63ec00..495ccb902d6 100644 --- a/lib/private/db/mdb2schemamanager.php +++ b/lib/private/db/mdb2schemamanager.php @@ -5,11 +5,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author tbelau666 <thomas.belau@gmx.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -75,7 +75,7 @@ class MDB2SchemaManager { * @return \OC\DB\Migrator */ public function getMigrator() { - $random = \OC::$server->getSecureRandom()->getMediumStrengthGenerator(); + $random = \OC::$server->getSecureRandom(); $platform = $this->conn->getDatabasePlatform(); $config = \OC::$server->getConfig(); if ($platform instanceof SqlitePlatform) { diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index 946ef1c621d..6f99206e5c8 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -5,12 +5,12 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Oliver Gasser <oliver.gasser@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/mdb2schemawriter.php b/lib/private/db/mdb2schemawriter.php index 0ff04008b61..803e7cda0b4 100644 --- a/lib/private/db/mdb2schemawriter.php +++ b/lib/private/db/mdb2schemawriter.php @@ -7,7 +7,7 @@ * @author tbelau666 <thomas.belau@gmx.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/migrationexception.php b/lib/private/db/migrationexception.php index e79644f2268..57e4c5b8334 100644 --- a/lib/private/db/migrationexception.php +++ b/lib/private/db/migrationexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php index 6a587ede631..cd310bb75a5 100644 --- a/lib/private/db/migrator.php +++ b/lib/private/db/migrator.php @@ -8,7 +8,7 @@ * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/mysqlmigrator.php b/lib/private/db/mysqlmigrator.php index 41f179db000..1b3f70a817d 100644 --- a/lib/private/db/mysqlmigrator.php +++ b/lib/private/db/mysqlmigrator.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/nocheckmigrator.php b/lib/private/db/nocheckmigrator.php index 3ecbe6b721c..23afae11816 100644 --- a/lib/private/db/nocheckmigrator.php +++ b/lib/private/db/nocheckmigrator.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/ocsqliteplatform.php b/lib/private/db/ocsqliteplatform.php index 2456d262fe3..fe68bc3cc91 100644 --- a/lib/private/db/ocsqliteplatform.php +++ b/lib/private/db/ocsqliteplatform.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/oracleconnection.php b/lib/private/db/oracleconnection.php index 15cd1231b77..a95f37a8e6c 100644 --- a/lib/private/db/oracleconnection.php +++ b/lib/private/db/oracleconnection.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/oraclemigrator.php b/lib/private/db/oraclemigrator.php index fa30a9989aa..ceb89cf64d4 100644 --- a/lib/private/db/oraclemigrator.php +++ b/lib/private/db/oraclemigrator.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/pgsqltools.php b/lib/private/db/pgsqltools.php index 9a95d0e81d2..e9e507551e6 100644 --- a/lib/private/db/pgsqltools.php +++ b/lib/private/db/pgsqltools.php @@ -5,7 +5,7 @@ * @author tbelau666 <thomas.belau@gmx.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/querybuilder/compositeexpression.php b/lib/private/db/querybuilder/compositeexpression.php index 523f397e235..927dfe38378 100644 --- a/lib/private/db/querybuilder/compositeexpression.php +++ b/lib/private/db/querybuilder/compositeexpression.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/querybuilder/expressionbuilder.php b/lib/private/db/querybuilder/expressionbuilder.php index cd5b7fbfc54..de10f69b361 100644 --- a/lib/private/db/querybuilder/expressionbuilder.php +++ b/lib/private/db/querybuilder/expressionbuilder.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/querybuilder/literal.php b/lib/private/db/querybuilder/literal.php index 361b5ccf3b8..0cc96ab48b4 100644 --- a/lib/private/db/querybuilder/literal.php +++ b/lib/private/db/querybuilder/literal.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/querybuilder/parameter.php b/lib/private/db/querybuilder/parameter.php index c14b4e21925..1c233c83f1d 100644 --- a/lib/private/db/querybuilder/parameter.php +++ b/lib/private/db/querybuilder/parameter.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/querybuilder/querybuilder.php b/lib/private/db/querybuilder/querybuilder.php index a4cbb5abd76..492e9bc9abf 100644 --- a/lib/private/db/querybuilder/querybuilder.php +++ b/lib/private/db/querybuilder/querybuilder.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/querybuilder/queryfunction.php b/lib/private/db/querybuilder/queryfunction.php index 2a47d83b917..ac6d73f3cbf 100644 --- a/lib/private/db/querybuilder/queryfunction.php +++ b/lib/private/db/querybuilder/queryfunction.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/querybuilder/quotehelper.php b/lib/private/db/querybuilder/quotehelper.php index 5ceb76bbf93..fda243a3786 100644 --- a/lib/private/db/querybuilder/quotehelper.php +++ b/lib/private/db/querybuilder/quotehelper.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/sqlitemigrator.php b/lib/private/db/sqlitemigrator.php index 063ccd87841..8ea32581011 100644 --- a/lib/private/db/sqlitemigrator.php +++ b/lib/private/db/sqlitemigrator.php @@ -5,7 +5,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/sqlitesessioninit.php b/lib/private/db/sqlitesessioninit.php index c8d2a3940d1..0683c47d08e 100644 --- a/lib/private/db/sqlitesessioninit.php +++ b/lib/private/db/sqlitesessioninit.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php index c888fab0774..6422d8d5f1b 100644 --- a/lib/private/db/statementwrapper.php +++ b/lib/private/db/statementwrapper.php @@ -5,10 +5,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/defaults.php b/lib/private/defaults.php index 23f0baad96e..1fa8352edc1 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -7,12 +7,12 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Pascal de Bruijn <pmjdebruijn@pcode.nl> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author scolebrook <scolebrook@mac.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/diagnostics/event.php b/lib/private/diagnostics/event.php index 541a84ffa10..8b5bb7e3bd8 100644 --- a/lib/private/diagnostics/event.php +++ b/lib/private/diagnostics/event.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/diagnostics/eventlogger.php b/lib/private/diagnostics/eventlogger.php index 2345abb3fff..3d909ce79cd 100644 --- a/lib/private/diagnostics/eventlogger.php +++ b/lib/private/diagnostics/eventlogger.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/diagnostics/nulleventlogger.php b/lib/private/diagnostics/nulleventlogger.php index 0a8d656a5fc..1b5e7af3ac9 100644 --- a/lib/private/diagnostics/nulleventlogger.php +++ b/lib/private/diagnostics/nulleventlogger.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/diagnostics/nullquerylogger.php b/lib/private/diagnostics/nullquerylogger.php index e35d28118d6..98ddef2e783 100644 --- a/lib/private/diagnostics/nullquerylogger.php +++ b/lib/private/diagnostics/nullquerylogger.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/diagnostics/query.php b/lib/private/diagnostics/query.php index 203ef15d677..567bc83ed4b 100644 --- a/lib/private/diagnostics/query.php +++ b/lib/private/diagnostics/query.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/diagnostics/querylogger.php b/lib/private/diagnostics/querylogger.php index 289005a1c41..794e7a5e263 100644 --- a/lib/private/diagnostics/querylogger.php +++ b/lib/private/diagnostics/querylogger.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php index e19ee6b745f..7a965a5f227 100644 --- a/lib/private/encryption/decryptall.php +++ b/lib/private/encryption/decryptall.php @@ -2,7 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/decryptionfailedexception.php b/lib/private/encryption/exceptions/decryptionfailedexception.php index 406ae12968e..a0cbbc5cce0 100644 --- a/lib/private/encryption/exceptions/decryptionfailedexception.php +++ b/lib/private/encryption/exceptions/decryptionfailedexception.php @@ -3,7 +3,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/emptyencryptiondataexception.php b/lib/private/encryption/exceptions/emptyencryptiondataexception.php index 739614b3ec2..2c90c2db7df 100644 --- a/lib/private/encryption/exceptions/emptyencryptiondataexception.php +++ b/lib/private/encryption/exceptions/emptyencryptiondataexception.php @@ -3,7 +3,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/encryptionfailedexception.php b/lib/private/encryption/exceptions/encryptionfailedexception.php index 4195ca0a5a8..98e92eb199c 100644 --- a/lib/private/encryption/exceptions/encryptionfailedexception.php +++ b/lib/private/encryption/exceptions/encryptionfailedexception.php @@ -3,7 +3,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php b/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php index d927939484f..ab1a166018c 100644 --- a/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php +++ b/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/encryptionheadertolargeexception.php b/lib/private/encryption/exceptions/encryptionheadertolargeexception.php index 40c51782a32..7b706e621de 100644 --- a/lib/private/encryption/exceptions/encryptionheadertolargeexception.php +++ b/lib/private/encryption/exceptions/encryptionheadertolargeexception.php @@ -3,7 +3,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/modulealreadyexistsexception.php b/lib/private/encryption/exceptions/modulealreadyexistsexception.php index c72ad7b7ab2..fcd08679acc 100644 --- a/lib/private/encryption/exceptions/modulealreadyexistsexception.php +++ b/lib/private/encryption/exceptions/modulealreadyexistsexception.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/moduledoesnotexistsexception.php b/lib/private/encryption/exceptions/moduledoesnotexistsexception.php index d6fbb2b6e51..282c9ec080b 100644 --- a/lib/private/encryption/exceptions/moduledoesnotexistsexception.php +++ b/lib/private/encryption/exceptions/moduledoesnotexistsexception.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/exceptions/unknowncipherexception.php b/lib/private/encryption/exceptions/unknowncipherexception.php index 91535183169..beb4cb7f2e5 100644 --- a/lib/private/encryption/exceptions/unknowncipherexception.php +++ b/lib/private/encryption/exceptions/unknowncipherexception.php @@ -3,7 +3,7 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/file.php b/lib/private/encryption/file.php index 6d261f46d0f..ec55c2cea00 100644 --- a/lib/private/encryption/file.php +++ b/lib/private/encryption/file.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/hookmanager.php b/lib/private/encryption/hookmanager.php index 8969379c957..0bc42ec8159 100644 --- a/lib/private/encryption/hookmanager.php +++ b/lib/private/encryption/hookmanager.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php index e21fd62e366..47360f45aa5 100644 --- a/lib/private/encryption/keys/storage.php +++ b/lib/private/encryption/keys/storage.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index d38ec6684a6..d1d17a92887 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -5,7 +5,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/update.php b/lib/private/encryption/update.php index 64cccc16ed8..62c23c1fe0c 100644 --- a/lib/private/encryption/update.php +++ b/lib/private/encryption/update.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php index ef500883865..860c541934a 100644 --- a/lib/private/encryption/util.php +++ b/lib/private/encryption/util.php @@ -5,7 +5,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/eventsource.php b/lib/private/eventsource.php index 0e98bdc2628..f567d1e6ca5 100644 --- a/lib/private/eventsource.php +++ b/lib/private/eventsource.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php index 64399ad4366..8c341df4a8b 100644 --- a/lib/private/filechunking.php +++ b/lib/private/filechunking.php @@ -10,7 +10,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files.php b/lib/private/files.php index 1cda28496cb..7b451ac19be 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -3,6 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Frank Karlitschek <frank@owncloud.org> * @author Jakob Sack <mail@jakobsack.de> * @author Joas Schilling <nickvergessen@owncloud.com> @@ -10,14 +11,14 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Nicolai Ehemann <en@enlightened.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thibaut GRIDEL <tgridel@free.fr> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index e6110c1925d..7a976e18888 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -1,7 +1,6 @@ <?php /** * @author Andreas Fischer <bantu@owncloud.com> - * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Florin Peter <github@florin-peter.de> * @author Jens-Christian Fischer <jens-christian.fischer@switch.ch> @@ -10,12 +9,12 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author TheSFReader <TheSFReader@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php index 1b85462d615..693896fccfb 100644 --- a/lib/private/files/cache/homecache.php +++ b/lib/private/files/cache/homecache.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/propagator.php b/lib/private/files/cache/propagator.php index bd11cef5990..56abcdadee2 100644 --- a/lib/private/files/cache/propagator.php +++ b/lib/private/files/cache/propagator.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 88bb57d2b5c..79f749394f1 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -2,6 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * @author Björn Schießle <schiessle@owncloud.com> + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Martin Mattel <martin.mattel@diemattels.at> @@ -10,11 +11,11 @@ * @author Olivier Paroz <github@oparoz.com> * @author Owen Winkler <a_github@midnightcircus.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php index 4998c622e84..90c451ecc21 100644 --- a/lib/private/files/cache/storage.php +++ b/lib/private/files/cache/storage.php @@ -4,11 +4,11 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php index 4d11fa3a251..c5b1e7de32e 100644 --- a/lib/private/files/cache/updater.php +++ b/lib/private/files/cache/updater.php @@ -1,13 +1,12 @@ <?php /** * @author Björn Schießle <schiessle@owncloud.com> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Michael Gapczynski <GapczynskiM@gmail.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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php index e660e56bfee..bb80dcbd80c 100644 --- a/lib/private/files/cache/watcher.php +++ b/lib/private/files/cache/watcher.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/files/cache/wrapper/cachejail.php index 9a673b07737..4d708c2d191 100644 --- a/lib/private/files/cache/wrapper/cachejail.php +++ b/lib/private/files/cache/wrapper/cachejail.php @@ -2,10 +2,10 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/wrapper/cachepermissionsmask.php b/lib/private/files/cache/wrapper/cachepermissionsmask.php index 15307a4d7e8..1eeb3c4783d 100644 --- a/lib/private/files/cache/wrapper/cachepermissionsmask.php +++ b/lib/private/files/cache/wrapper/cachepermissionsmask.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/cache/wrapper/cachewrapper.php b/lib/private/files/cache/wrapper/cachewrapper.php index bb136456762..f401b7482eb 100644 --- a/lib/private/files/cache/wrapper/cachewrapper.php +++ b/lib/private/files/cache/wrapper/cachewrapper.php @@ -2,10 +2,10 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/config/mountprovidercollection.php b/lib/private/files/config/mountprovidercollection.php index c75c64ae445..eb61ec3f5d5 100644 --- a/lib/private/files/config/mountprovidercollection.php +++ b/lib/private/files/config/mountprovidercollection.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index 5ed65cd3795..3e5e894eed4 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -4,12 +4,13 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author tbartenstein <tbartenstein@users.noreply.github.com> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 9d1b7150687..ffe3a594ba8 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -11,13 +11,13 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Sam Tuke <mail@samtuke.com> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Stephan Peijnik <speijnik@anexia-it.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php index d5bd4d7ddf4..ba4a7f8d910 100644 --- a/lib/private/files/mount/manager.php +++ b/lib/private/files/mount/manager.php @@ -3,9 +3,9 @@ * @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 Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php index fad8678aae1..b606c625cb1 100644 --- a/lib/private/files/mount/mountpoint.php +++ b/lib/private/files/mount/mountpoint.php @@ -4,11 +4,11 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/mount/moveablemount.php b/lib/private/files/mount/moveablemount.php index d0f7703d80a..8a1bd7dd9c5 100644 --- a/lib/private/files/mount/moveablemount.php +++ b/lib/private/files/mount/moveablemount.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/node/file.php b/lib/private/files/node/file.php index 735bee3fd59..c3d18cdb358 100644 --- a/lib/private/files/node/file.php +++ b/lib/private/files/node/file.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php index be76b70b2ce..e8c49cd2c0b 100644 --- a/lib/private/files/node/folder.php +++ b/lib/private/files/node/folder.php @@ -3,10 +3,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/node/hookconnector.php b/lib/private/files/node/hookconnector.php index 360aaafdd71..5c36ca3848e 100644 --- a/lib/private/files/node/hookconnector.php +++ b/lib/private/files/node/hookconnector.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php index 1b52243fcb4..7769f15ee59 100644 --- a/lib/private/files/node/node.php +++ b/lib/private/files/node/node.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/node/nonexistingfile.php b/lib/private/files/node/nonexistingfile.php index 68fb7d1b6f9..c1d09bcc491 100644 --- a/lib/private/files/node/nonexistingfile.php +++ b/lib/private/files/node/nonexistingfile.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/node/nonexistingfolder.php b/lib/private/files/node/nonexistingfolder.php index 5044eb524f5..7d6576f1bd6 100644 --- a/lib/private/files/node/nonexistingfolder.php +++ b/lib/private/files/node/nonexistingfolder.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php index 4df926748de..35163be0a0d 100644 --- a/lib/private/files/node/root.php +++ b/lib/private/files/node/root.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/objectstore/homeobjectstorestorage.php b/lib/private/files/objectstore/homeobjectstorestorage.php index 77b5437c24d..6a330e2dab3 100644 --- a/lib/private/files/objectstore/homeobjectstorestorage.php +++ b/lib/private/files/objectstore/homeobjectstorestorage.php @@ -4,7 +4,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/objectstore/noopscanner.php b/lib/private/files/objectstore/noopscanner.php index cdcc0149ab3..f5316175ecf 100644 --- a/lib/private/files/objectstore/noopscanner.php +++ b/lib/private/files/objectstore/noopscanner.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php index b34a6bdfb84..9cea07b7f69 100644 --- a/lib/private/files/objectstore/objectstorestorage.php +++ b/lib/private/files/objectstore/objectstorestorage.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/objectstore/swift.php b/lib/private/files/objectstore/swift.php index 50bb0d9adf5..4af09dca254 100644 --- a/lib/private/files/objectstore/swift.php +++ b/lib/private/files/objectstore/swift.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 1e30d48f613..c27f9d759f1 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -11,13 +11,13 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Sam Tuke <mail@samtuke.com> * @author scambra <sergio@entrecables.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/commontest.php b/lib/private/files/storage/commontest.php index d4dbeecbbd6..0047a51169c 100644 --- a/lib/private/files/storage/commontest.php +++ b/lib/private/files/storage/commontest.php @@ -8,7 +8,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 9afebab1dd7..a6e77e1b232 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -14,7 +14,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/flysystem.php b/lib/private/files/storage/flysystem.php index 3ad2b8adc4c..608639b71a6 100644 --- a/lib/private/files/storage/flysystem.php +++ b/lib/private/files/storage/flysystem.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/home.php b/lib/private/files/storage/home.php index 1b4297ddd76..35a7e8360f3 100644 --- a/lib/private/files/storage/home.php +++ b/lib/private/files/storage/home.php @@ -6,7 +6,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index 2b2a433c013..aa2b4628283 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -14,7 +14,7 @@ * @author Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/localtempfiletrait.php b/lib/private/files/storage/localtempfiletrait.php index 8875c2c4493..88f11e4e752 100644 --- a/lib/private/files/storage/localtempfiletrait.php +++ b/lib/private/files/storage/localtempfiletrait.php @@ -1,9 +1,10 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/polyfill/copydirectory.php b/lib/private/files/storage/polyfill/copydirectory.php index df4f5c27dcf..22bfe369738 100644 --- a/lib/private/files/storage/polyfill/copydirectory.php +++ b/lib/private/files/storage/polyfill/copydirectory.php @@ -3,7 +3,7 @@ * @author Martin Mattel <martin.mattel@diemattels.at> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/storage.php b/lib/private/files/storage/storage.php index fb59752ede1..c066336d4b8 100644 --- a/lib/private/files/storage/storage.php +++ b/lib/private/files/storage/storage.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php index e8df5090f09..5df91fd1eb4 100644 --- a/lib/private/files/storage/storagefactory.php +++ b/lib/private/files/storage/storagefactory.php @@ -6,7 +6,7 @@ * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/temporary.php b/lib/private/files/storage/temporary.php index 8abc19929b0..2d8e84c2d52 100644 --- a/lib/private/files/storage/temporary.php +++ b/lib/private/files/storage/temporary.php @@ -5,7 +5,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/wrapper/availability.php b/lib/private/files/storage/wrapper/availability.php index d2fbbbacf75..1550c318ce3 100644 --- a/lib/private/files/storage/wrapper/availability.php +++ b/lib/private/files/storage/wrapper/availability.php @@ -1,8 +1,9 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 8f5a7a05f01..fda28079d0f 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/wrapper/jail.php b/lib/private/files/storage/wrapper/jail.php index 2857e74de46..40738befd93 100644 --- a/lib/private/files/storage/wrapper/jail.php +++ b/lib/private/files/storage/wrapper/jail.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php index e1822905692..7fa64f82ba6 100644 --- a/lib/private/files/storage/wrapper/permissionsmask.php +++ b/lib/private/files/storage/wrapper/permissionsmask.php @@ -3,9 +3,9 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index 98664e27e2d..55c826092c1 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/files/storage/wrapper/quota.php @@ -3,10 +3,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php index 81284c7aa69..472c60b5faa 100644 --- a/lib/private/files/storage/wrapper/wrapper.php +++ b/lib/private/files/storage/wrapper/wrapper.php @@ -2,11 +2,11 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/stream/close.php b/lib/private/files/stream/close.php index f704c875a14..1c9b30705dd 100644 --- a/lib/private/files/stream/close.php +++ b/lib/private/files/stream/close.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/stream/dir.php b/lib/private/files/stream/dir.php index 94f1cf81a2f..fabadb0d596 100644 --- a/lib/private/files/stream/dir.php +++ b/lib/private/files/stream/dir.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php index 585a697c5d1..c884cd8fa07 100644 --- a/lib/private/files/stream/encryption.php +++ b/lib/private/files/stream/encryption.php @@ -2,10 +2,11 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author jknockaert <jasper@knockaert.nl> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/stream/oc.php b/lib/private/files/stream/oc.php index 9087b812b2a..8439770e8fa 100644 --- a/lib/private/files/stream/oc.php +++ b/lib/private/files/stream/oc.php @@ -3,9 +3,9 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/stream/quota.php b/lib/private/files/stream/quota.php index 5db58817a2b..8d27575c568 100644 --- a/lib/private/files/stream/quota.php +++ b/lib/private/files/stream/quota.php @@ -5,7 +5,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/stream/staticstream.php b/lib/private/files/stream/staticstream.php index 74f921ceb96..7aacf7a9fe4 100644 --- a/lib/private/files/stream/staticstream.php +++ b/lib/private/files/stream/staticstream.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php index 0e2bab39e5b..9cc2e97c3cc 100644 --- a/lib/private/files/type/detection.php +++ b/lib/private/files/type/detection.php @@ -5,11 +5,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/type/loader.php b/lib/private/files/type/loader.php index 55dc09ab9b8..95ba7597257 100644 --- a/lib/private/files/type/loader.php +++ b/lib/private/files/type/loader.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php index 33d3f7bfc76..363fb7a2a6c 100644 --- a/lib/private/files/type/templatemanager.php +++ b/lib/private/files/type/templatemanager.php @@ -2,9 +2,9 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php index 5621bf13910..59673a306cb 100644 --- a/lib/private/files/utils/scanner.php +++ b/lib/private/files/utils/scanner.php @@ -7,7 +7,7 @@ * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 357f854e5e2..7b0f1d37255 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -15,15 +15,14 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> - * @author Roman Geber <rgeber@owncloudapps.com> * @author Sam Tuke <mail@samtuke.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/forbiddenexception.php b/lib/private/forbiddenexception.php index e40cb33f4cf..48be35ba316 100644 --- a/lib/private/forbiddenexception.php +++ b/lib/private/forbiddenexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group.php b/lib/private/group.php index fdf8086f1e8..48fbe51007a 100644 --- a/lib/private/group.php +++ b/lib/private/group.php @@ -12,11 +12,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Qingping Hou <dave2008713@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php index 52afb8fdcf0..29f24fb3070 100644 --- a/lib/private/group/backend.php +++ b/lib/private/group/backend.php @@ -8,10 +8,10 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/database.php b/lib/private/group/database.php index 1aa821db087..b769e69b4ba 100644 --- a/lib/private/group/database.php +++ b/lib/private/group/database.php @@ -9,10 +9,10 @@ * @author michag86 <micha_g@arcor.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php index 330b086ab3f..c0d206a34e1 100644 --- a/lib/private/group/dummy.php +++ b/lib/private/group/dummy.php @@ -6,11 +6,11 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/example.php b/lib/private/group/example.php index fa2ed06129b..17fae90f2e0 100644 --- a/lib/private/group/example.php +++ b/lib/private/group/example.php @@ -6,9 +6,9 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/group.php b/lib/private/group/group.php index f76ea1f36a7..064b9f899e6 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -6,9 +6,9 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/interface.php b/lib/private/group/interface.php index c3a3cc052d6..5c7d4cf0b39 100644 --- a/lib/private/group/interface.php +++ b/lib/private/group/interface.php @@ -5,9 +5,9 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 7387b423643..8a21c77b58b 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -8,12 +8,12 @@ * @author macjohnny <estebanmarin@gmx.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author voxsim <Simon Vocella> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/group/metadata.php b/lib/private/group/metadata.php index 63ac0928563..8e0866479c1 100644 --- a/lib/private/group/metadata.php +++ b/lib/private/group/metadata.php @@ -7,7 +7,7 @@ * @author Stephan Peijnik <speijnik@anexia-it.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/helper.php b/lib/private/helper.php index 64952903712..3590eaee612 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -4,10 +4,10 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Christopher Schäpers <kondou@ts.unde.re> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Fabian Henze <flyser42@gmx.de> * @author Felix Moeller <mail@felixmoeller.de> * @author Frank Karlitschek <frank@owncloud.org> - * @author François Kubler <francois@kubler.org> * @author Georg Ehrke <georg@owncloud.com> * @author Jakob Sack <mail@jakobsack.de> * @author Jan-Christoph Borchardt <hey@jancborchardt.net> @@ -16,20 +16,18 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Nicolas Grekas <nicolas.grekas@gmail.com> * @author Olivier Paroz <github@oparoz.com> * @author Owen Winkler <a_github@midnightcircus.com> * @author Pellaeon Lin <nfsmwlin@gmail.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Simon Könnecke <simonkoennecke@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> - * @author Valerio Ponte <valerio.ponte@gmail.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hintexception.php b/lib/private/hintexception.php index 3afc029f322..f673ac82ace 100644 --- a/lib/private/hintexception.php +++ b/lib/private/hintexception.php @@ -5,7 +5,7 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hook.php b/lib/private/hook.php index 2ff045c8a66..7bd1e991923 100644 --- a/lib/private/hook.php +++ b/lib/private/hook.php @@ -5,12 +5,12 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Sam Tuke <mail@samtuke.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hooks/basicemitter.php b/lib/private/hooks/basicemitter.php index ae0f96fbc8c..067962ec081 100644 --- a/lib/private/hooks/basicemitter.php +++ b/lib/private/hooks/basicemitter.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hooks/emitter.php b/lib/private/hooks/emitter.php index bea3f289b8d..d639e5ef892 100644 --- a/lib/private/hooks/emitter.php +++ b/lib/private/hooks/emitter.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hooks/emittertrait.php b/lib/private/hooks/emittertrait.php index 256bf468c4f..775f46f838c 100644 --- a/lib/private/hooks/emittertrait.php +++ b/lib/private/hooks/emittertrait.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hooks/forwardingemitter.php b/lib/private/hooks/forwardingemitter.php index 90c1970f480..6a1fc571cea 100644 --- a/lib/private/hooks/forwardingemitter.php +++ b/lib/private/hooks/forwardingemitter.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hooks/legacyemitter.php b/lib/private/hooks/legacyemitter.php index b28854f4638..ac83477a144 100644 --- a/lib/private/hooks/legacyemitter.php +++ b/lib/private/hooks/legacyemitter.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/hooks/publicemitter.php b/lib/private/hooks/publicemitter.php index 12de07b27c7..4fe71073a1e 100644 --- a/lib/private/hooks/publicemitter.php +++ b/lib/private/hooks/publicemitter.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/http/client/client.php b/lib/private/http/client/client.php index 5f298e1acd7..bd9e82ddae7 100644 --- a/lib/private/http/client/client.php +++ b/lib/private/http/client/client.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -58,12 +58,18 @@ class Client implements IClient { * Sets the default options to the client */ private function setDefaultOptions() { - // Either use default bundle or the user bundle if nothing is specified - if($this->certificateManager->listCertificates() !== []) { - $dataDir = $this->config->getSystemValue('datadirectory'); - $this->client->setDefaultOption('verify', $dataDir.'/'.$this->certificateManager->getCertificateBundle()); + // Either use user bundle or the system bundle if nothing is specified + if ($this->certificateManager->listCertificates() !== []) { + $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath()); } else { - $this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); + // If the instance is not yet setup we need to use the static path as + // $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate + // a view + if($this->config->getSystemValue('installed', false)) { + $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null)); + } else { + $this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); + } } $this->client->setDefaultOption('headers/User-Agent', 'ownCloud Server Crawler'); diff --git a/lib/private/http/client/clientservice.php b/lib/private/http/client/clientservice.php index c9b415a7429..7e280dbf3ca 100644 --- a/lib/private/http/client/clientservice.php +++ b/lib/private/http/client/clientservice.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/http/client/response.php b/lib/private/http/client/response.php index b3429f36d04..7a879eab111 100644 --- a/lib/private/http/client/response.php +++ b/lib/private/http/client/response.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/httphelper.php b/lib/private/httphelper.php index 9d9edb6a351..f33d4a51745 100644 --- a/lib/private/httphelper.php +++ b/lib/private/httphelper.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/image.php b/lib/private/image.php index a5de7e86b94..dc01f989d79 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -1,8 +1,8 @@ <?php /** * @author Andreas Fischer <bantu@owncloud.com> - * @author Bart Visscher <bartv@thisnet.nl> * @author Bartek Przybylski <bart.p.pl@gmail.com> + * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Byron Marohn <combustible@live.com> * @author Christopher Schäpers <kondou@ts.unde.re> @@ -11,6 +11,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Johannes Willnecker <johannes@willnecker.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> * @author Robin Appelman <icewind@owncloud.com> @@ -18,7 +19,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/installer.php b/lib/private/installer.php index ed50503b3dc..ef5efb09b46 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -3,6 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Brice Maron <brice@bmaron.net> + * @author Christian Weiske <cweiske@cweiske.de> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Felix Moeller <mail@felixmoeller.de> * @author Frank Karlitschek <frank@owncloud.org> @@ -15,13 +16,12 @@ * @author michag86 <micha_g@arcor.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author root <root@oc.(none)> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> - * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -82,9 +82,10 @@ class OC_Installer{ $l = \OC::$server->getL10N('lib'); list($extractDir, $path) = self::downloadApp($data); - $info = self::checkAppsIntegrity($data, $extractDir, $path); - $basedir=OC_App::getInstallPath().'/'.$info['id']; + $info = self::checkAppsIntegrity($data, $extractDir, $path); + $appId = OC_App::cleanAppId($info['id']); + $basedir = OC_App::getInstallPath().'/'.$appId; //check if the destination directory already exists if(is_dir($basedir)) { OC_Helper::rmdirr($extractDir); @@ -163,6 +164,8 @@ class OC_Installer{ * @brief Update an application * @param array $info * @param bool $isShipped + * @throws Exception + * @return bool * * This function could work like described below, but currently it disables and then * enables the app again. This does result in an updated app. @@ -191,7 +194,7 @@ class OC_Installer{ * upgrade.php can determine the current installed version of the app using * "\OC::$server->getAppConfig()->getValue($appid, 'installed_version')" */ - public static function updateApp( $info=array(), $isShipped=false) { + public static function updateApp($info=array(), $isShipped=false) { list($extractDir, $path) = self::downloadApp($info); $info = self::checkAppsIntegrity($info, $extractDir, $path, $isShipped); @@ -307,11 +310,12 @@ class OC_Installer{ * check an app's integrity * @param array $data * @param string $extractDir + * @param string $path * @param bool $isShipped * @return array * @throws \Exception */ - public static function checkAppsIntegrity($data, $extractDir, $path, $isShipped=false) { + public static function checkAppsIntegrity($data, $extractDir, $path, $isShipped = false) { $l = \OC::$server->getL10N('lib'); //load the info.xml file of the app if(!is_file($extractDir.'/appinfo/info.xml')) { @@ -329,12 +333,41 @@ class OC_Installer{ } if(!is_file($extractDir.'/appinfo/info.xml')) { OC_Helper::rmdirr($extractDir); - if($data['source']=='http') { + if($data['source'] === 'http') { unlink($path); } throw new \Exception($l->t("App does not provide an info.xml file")); } - $info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml', true); + + $info = OC_App::getAppInfo($extractDir.'/appinfo/info.xml', true); + + // We can't trust the parsed info.xml file as it may have been tampered + // with by an attacker and thus we need to use the local data to check + // whether the application needs to be signed. + $appId = OC_App::cleanAppId($data['appdata']['id']); + $appBelongingToId = OC_App::getInternalAppIdByOcs($appId); + if(is_string($appBelongingToId)) { + $previouslySigned = \OC::$server->getConfig()->getAppValue($appBelongingToId, 'signed', 'false'); + } else { + $appBelongingToId = $info['id']; + $previouslySigned = 'false'; + } + if($data['appdata']['level'] === OC_App::officialApp || $previouslySigned === 'true') { + \OC::$server->getConfig()->setAppValue($appBelongingToId, 'signed', 'true'); + $integrityResult = \OC::$server->getIntegrityCodeChecker()->verifyAppSignature( + $appBelongingToId, + $extractDir + ); + if($integrityResult !== []) { + $e = new \Exception( + $l->t( + 'Signature could not get checked. Please contact the app developer and check your admin screen.' + ) + ); + throw $e; + } + } + // check the code for not allowed calls if(!$isShipped && !OC_Installer::checkCode($extractDir)) { OC_Helper::rmdirr($extractDir); diff --git a/lib/private/integritycheck/checker.php b/lib/private/integritycheck/checker.php index edfe6b082e7..0cd01df7fe1 100644 --- a/lib/private/integritycheck/checker.php +++ b/lib/private/integritycheck/checker.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -82,6 +82,34 @@ class Checker { } /** + * Whether code signing is enforced or not. + * + * @return bool + */ + public function isCodeCheckEnforced() { + // FIXME: Once the signing server is instructed to sign daily, beta and + // RCs as well these need to be included also. + $signedChannels = [ + 'stable', + ]; + if(!in_array($this->environmentHelper->getChannel(), $signedChannels, true)) { + return false; + } + + /** + * This config option is undocumented and supposed to be so, it's only + * applicable for very specific scenarios and we should not advertise it + * too prominent. So please do not add it to config.sample.php. + */ + $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false); + if($isIntegrityCheckDisabled === true) { + return false; + } + + return true; + } + + /** * Enumerates all files belonging to the folder. Sensible defaults are excluded. * * @param string $folderToIterate @@ -209,6 +237,10 @@ class Checker { * @throws \Exception */ private function verify($signaturePath, $basePath, $certificateCN) { + if(!$this->isCodeCheckEnforced()) { + return []; + } + $signatureData = json_decode($this->fileAccessHelper->file_get_contents($signaturePath), true); if(!is_array($signatureData)) { throw new InvalidSignatureException('Signature data not found.'); @@ -320,6 +352,14 @@ class Checker { $this->cache->set(self::CACHE_KEY, json_encode($resultArray)); } + /** + * + * Clean previous results for a proper rescanning. Otherwise + */ + private function cleanResults() { + $this->config->deleteAppValue('core', self::CACHE_KEY); + $this->cache->remove(self::CACHE_KEY); + } /** * Verify the signature of $appId. Returns an array with the following content: @@ -350,11 +390,14 @@ class Checker { * Array may be empty in case no problems have been found. * * @param string $appId + * @param string $path Optional path. If none is given it will be guessed. * @return array */ - public function verifyAppSignature($appId) { + public function verifyAppSignature($appId, $path = '') { try { - $path = $this->appLocator->getAppPath($appId); + if($path === '') { + $path = $this->appLocator->getAppPath($appId); + } $result = $this->verify( $path . '/appinfo/signature.json', $path, @@ -428,6 +471,7 @@ class Checker { * and store the results. */ public function runInstanceVerification() { + $this->cleanResults(); $this->verifyCoreSignature(); $appIds = $this->appLocator->getAllApps(); foreach($appIds as $appId) { diff --git a/lib/private/integritycheck/exceptions/invalidsignatureexception.php b/lib/private/integritycheck/exceptions/invalidsignatureexception.php index 9e05e5884f5..521171642b2 100644 --- a/lib/private/integritycheck/exceptions/invalidsignatureexception.php +++ b/lib/private/integritycheck/exceptions/invalidsignatureexception.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/integritycheck/helpers/applocator.php b/lib/private/integritycheck/helpers/applocator.php index b732cb80893..af22fca1fe4 100644 --- a/lib/private/integritycheck/helpers/applocator.php +++ b/lib/private/integritycheck/helpers/applocator.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/integritycheck/helpers/environmenthelper.php b/lib/private/integritycheck/helpers/environmenthelper.php index d7747dbb966..8bddcb3d794 100644 --- a/lib/private/integritycheck/helpers/environmenthelper.php +++ b/lib/private/integritycheck/helpers/environmenthelper.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -36,4 +36,13 @@ class EnvironmentHelper { public function getServerRoot() { return \OC::$SERVERROOT; } + + /** + * Provides \OC_Util::getChannel() + * + * @return string + */ + public function getChannel() { + return \OC_Util::getChannel(); + } } diff --git a/lib/private/integritycheck/helpers/fileaccesshelper.php b/lib/private/integritycheck/helpers/fileaccesshelper.php index 23f592122dc..f0bf6576d35 100644 --- a/lib/private/integritycheck/helpers/fileaccesshelper.php +++ b/lib/private/integritycheck/helpers/fileaccesshelper.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/integritycheck/iterator/excludefilebynamefilteriterator.php b/lib/private/integritycheck/iterator/excludefilebynamefilteriterator.php index c75554a7cc9..51850852cbd 100644 --- a/lib/private/integritycheck/iterator/excludefilebynamefilteriterator.php +++ b/lib/private/integritycheck/iterator/excludefilebynamefilteriterator.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php index 43f19475862..efe7c114d9e 100644 --- a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php +++ b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/json.php b/lib/private/json.php index 0bf4e8bcd01..adee28a1593 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -11,7 +11,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/l10n.php b/lib/private/l10n.php index 7835285bd49..b53fadc2bdd 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -4,7 +4,6 @@ * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @author Felix Moeller <mail@felixmoeller.de> * @author Jakob Sack <mail@jakobsack.de> * @author Jan-Christoph Borchardt <hey@jancborchardt.net> * @author Joas Schilling <nickvergessen@owncloud.com> @@ -13,13 +12,13 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -77,17 +76,6 @@ class OC_L10N implements \OCP\IL10N { private $pluralFormFunction = null; /** - * get an L10N instance - * @param string $app - * @param string|null $lang - * @return \OCP\IL10N - * @deprecated Use \OC::$server->getL10NFactory()->get() instead - */ - public static function get($app, $lang=null) { - return \OC::$server->getL10NFactory()->get($app, $lang); - } - - /** * The constructor * @param string $app app requesting l10n * @param string $lang default: null Language diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php index b92c21b2d5d..c3c7cc21bba 100644 --- a/lib/private/l10n/factory.php +++ b/lib/private/l10n/factory.php @@ -4,9 +4,9 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/l10n/string.php b/lib/private/l10n/string.php index 77469f88d19..84d1603871f 100644 --- a/lib/private/l10n/string.php +++ b/lib/private/l10n/string.php @@ -8,7 +8,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php index 3e841850456..f5252ee01e7 100644 --- a/lib/private/largefilehelper.php +++ b/lib/private/largefilehelper.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/lock/abstractlockingprovider.php b/lib/private/lock/abstractlockingprovider.php index db5f1c72dd7..7dee8c709a0 100644 --- a/lib/private/lock/abstractlockingprovider.php +++ b/lib/private/lock/abstractlockingprovider.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php index 1b5142a90d2..647250cdb6f 100644 --- a/lib/private/lock/dblockingprovider.php +++ b/lib/private/lock/dblockingprovider.php @@ -5,7 +5,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php index af95200d159..08c92950e49 100644 --- a/lib/private/lock/memcachelockingprovider.php +++ b/lib/private/lock/memcachelockingprovider.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/lock/nooplockingprovider.php b/lib/private/lock/nooplockingprovider.php index 9f88e6148f8..dc58230f77e 100644 --- a/lib/private/lock/nooplockingprovider.php +++ b/lib/private/lock/nooplockingprovider.php @@ -3,7 +3,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/log.php b/lib/private/log.php index a722243dc69..fca3ee0882a 100644 --- a/lib/private/log.php +++ b/lib/private/log.php @@ -2,13 +2,14 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php index d10c44cc0cd..27cde4aa242 100644 --- a/lib/private/log/errorhandler.php +++ b/lib/private/log/errorhandler.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php index e455824a8dd..f9ce671aa93 100644 --- a/lib/private/log/owncloud.php +++ b/lib/private/log/owncloud.php @@ -2,13 +2,14 @@ /** * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> + * @author Christian Schnidrig <christian.schnidrig@switch.ch> * @author Georg Ehrke <georg@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/log/rotate.php b/lib/private/log/rotate.php index 98ebef25988..458661c82d0 100644 --- a/lib/private/log/rotate.php +++ b/lib/private/log/rotate.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/log/syslog.php b/lib/private/log/syslog.php index 7a638c36a77..96cf463d042 100644 --- a/lib/private/log/syslog.php +++ b/lib/private/log/syslog.php @@ -3,9 +3,8 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Volker Fröhlich <volker27@gmx.at> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/mail/mailer.php b/lib/private/mail/mailer.php index bd93f3e3d58..742ff554892 100644 --- a/lib/private/mail/mailer.php +++ b/lib/private/mail/mailer.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/mail/message.php b/lib/private/mail/message.php index 98a95e4e583..0e33e6383f7 100644 --- a/lib/private/mail/message.php +++ b/lib/private/mail/message.php @@ -1,8 +1,9 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/apc.php b/lib/private/memcache/apc.php index e38b4bd3a39..2354ad07749 100644 --- a/lib/private/memcache/apc.php +++ b/lib/private/memcache/apc.php @@ -1,11 +1,12 @@ <?php /** * @author Andreas Fischer <bantu@owncloud.com> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Otto Sabart <ottosabart@seberm.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/apcu.php b/lib/private/memcache/apcu.php index 778e27d4567..9000df65dcd 100644 --- a/lib/private/memcache/apcu.php +++ b/lib/private/memcache/apcu.php @@ -2,10 +2,11 @@ /** * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/arraycache.php b/lib/private/memcache/arraycache.php index 33c8bea8746..837f888a307 100644 --- a/lib/private/memcache/arraycache.php +++ b/lib/private/memcache/arraycache.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/cache.php b/lib/private/memcache/cache.php index 30fae30aaea..63d20721aac 100644 --- a/lib/private/memcache/cache.php +++ b/lib/private/memcache/cache.php @@ -3,9 +3,9 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/cadtrait.php b/lib/private/memcache/cadtrait.php index e9836e24040..d44d98cba0b 100644 --- a/lib/private/memcache/cadtrait.php +++ b/lib/private/memcache/cadtrait.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/castrait.php b/lib/private/memcache/castrait.php index c52538023fb..43253fc966b 100644 --- a/lib/private/memcache/castrait.php +++ b/lib/private/memcache/castrait.php @@ -2,7 +2,7 @@ /** * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php index fe82558e731..21149d8b6bf 100644 --- a/lib/private/memcache/factory.php +++ b/lib/private/memcache/factory.php @@ -5,11 +5,11 @@ * @author Markus Goetz <markus@woboq.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php index 22b54f7bc95..c13be68b47f 100644 --- a/lib/private/memcache/memcached.php +++ b/lib/private/memcache/memcached.php @@ -4,9 +4,10 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/nullcache.php b/lib/private/memcache/nullcache.php index de27b03e71d..c490ca7e03c 100644 --- a/lib/private/memcache/nullcache.php +++ b/lib/private/memcache/nullcache.php @@ -2,11 +2,11 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/redis.php b/lib/private/memcache/redis.php index 68b62e7534a..db5461db669 100644 --- a/lib/private/memcache/redis.php +++ b/lib/private/memcache/redis.php @@ -2,11 +2,12 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Telatynski <7t3chguy@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/memcache/xcache.php b/lib/private/memcache/xcache.php index 0d2e43a1c18..eea55fefc4d 100644 --- a/lib/private/memcache/xcache.php +++ b/lib/private/memcache/xcache.php @@ -2,11 +2,12 @@ /** * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> + * @author Clark Tomlinson <fallen013@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/naturalsort.php b/lib/private/naturalsort.php index 2071ede43e0..f44e8032d36 100644 --- a/lib/private/naturalsort.php +++ b/lib/private/naturalsort.php @@ -3,11 +3,11 @@ * @author AW-UC <git@a-wesemann.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/naturalsort_defaultcollator.php b/lib/private/naturalsort_defaultcollator.php index ba408121088..7b8400fa8e1 100644 --- a/lib/private/naturalsort_defaultcollator.php +++ b/lib/private/naturalsort_defaultcollator.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/navigationmanager.php b/lib/private/navigationmanager.php index f724963aa1b..6dbb9c925e0 100644 --- a/lib/private/navigationmanager.php +++ b/lib/private/navigationmanager.php @@ -3,10 +3,10 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/needsupdateexception.php b/lib/private/needsupdateexception.php index 5024d8ce924..90c642780d8 100644 --- a/lib/private/needsupdateexception.php +++ b/lib/private/needsupdateexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php index 8eade697025..1730756c1de 100644 --- a/lib/private/notification/action.php +++ b/lib/private/notification/action.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/iaction.php b/lib/private/notification/iaction.php index f7366dd4388..79e28ecef89 100644 --- a/lib/private/notification/iaction.php +++ b/lib/private/notification/iaction.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/iapp.php b/lib/private/notification/iapp.php index eda66423f3a..8ae4f6a5437 100644 --- a/lib/private/notification/iapp.php +++ b/lib/private/notification/iapp.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/imanager.php b/lib/private/notification/imanager.php index f4a5fb14e31..0e9504a1f6e 100644 --- a/lib/private/notification/imanager.php +++ b/lib/private/notification/imanager.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/inotification.php b/lib/private/notification/inotification.php index 0187abab152..0a47b57aa11 100644 --- a/lib/private/notification/inotification.php +++ b/lib/private/notification/inotification.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/inotifier.php b/lib/private/notification/inotifier.php index 22531229e3f..c4312308fc0 100644 --- a/lib/private/notification/inotifier.php +++ b/lib/private/notification/inotifier.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php index 0d5bb9be514..a8f1ec349ce 100644 --- a/lib/private/notification/manager.php +++ b/lib/private/notification/manager.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php index 70964fc0366..70b854e6d56 100644 --- a/lib/private/notification/notification.php +++ b/lib/private/notification/notification.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/notsquareexception.php b/lib/private/notsquareexception.php index 23d6ebca2c0..e3494463850 100644 --- a/lib/private/notsquareexception.php +++ b/lib/private/notsquareexception.php @@ -3,7 +3,7 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs.php b/lib/private/ocs.php index 7b474fa439f..f48879a98b1 100644 --- a/lib/private/ocs.php +++ b/lib/private/ocs.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php index 1b04f43d477..1d47fb208a7 100644 --- a/lib/private/ocs/cloud.php +++ b/lib/private/ocs/cloud.php @@ -5,7 +5,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs/config.php b/lib/private/ocs/config.php index fc9640b6cc4..db04dcbd400 100644 --- a/lib/private/ocs/config.php +++ b/lib/private/ocs/config.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs/corecapabilities.php b/lib/private/ocs/corecapabilities.php index f2d530a8419..388a58791b4 100644 --- a/lib/private/ocs/corecapabilities.php +++ b/lib/private/ocs/corecapabilities.php @@ -1,8 +1,9 @@ <?php /** * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs/exception.php b/lib/private/ocs/exception.php index 93bee773771..ca67ac5e841 100644 --- a/lib/private/ocs/exception.php +++ b/lib/private/ocs/exception.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs/person.php b/lib/private/ocs/person.php index 0059982c55e..7162fa5e4fb 100644 --- a/lib/private/ocs/person.php +++ b/lib/private/ocs/person.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index 92f029aa12a..e514c05a3dd 100644 --- a/lib/private/ocs/privatedata.php +++ b/lib/private/ocs/privatedata.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php index 2c3f676510c..c342bc582fe 100644 --- a/lib/private/ocs/result.php +++ b/lib/private/ocs/result.php @@ -5,11 +5,11 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index 81c9abee058..a783a1f8425 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -9,11 +9,11 @@ * @author Kamil Domanski <kdomanski@kdemail.net> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Sam Tuke <mail@samtuke.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -284,7 +284,7 @@ class OCSClient { } $app = []; - $app['id'] = (int)$tmp->id; + $app['id'] = (int)$id; $app['name'] = (string)$tmp->name; $app['version'] = (string)$tmp->version; $app['type'] = (string)$tmp->typeid; diff --git a/lib/private/preview.php b/lib/private/preview.php index 44d38b354a9..df6eeceddcb 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -9,10 +9,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tobias Kaminsky <tobias@kaminsky.me> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php index ad0ef000510..34bc2f93fc7 100644 --- a/lib/private/preview/bitmap.php +++ b/lib/private/preview/bitmap.php @@ -5,7 +5,7 @@ * @author Olivier Paroz <github@oparoz.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/bmp.php b/lib/private/preview/bmp.php index 36439626f08..da13cd9e5b8 100644 --- a/lib/private/preview/bmp.php +++ b/lib/private/preview/bmp.php @@ -2,7 +2,7 @@ /** * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/font.php b/lib/private/preview/font.php index 197297a6df6..caac2923789 100644 --- a/lib/private/preview/font.php +++ b/lib/private/preview/font.php @@ -2,7 +2,7 @@ /** * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/gif.php b/lib/private/preview/gif.php index a3b57484999..0716a6f4406 100644 --- a/lib/private/preview/gif.php +++ b/lib/private/preview/gif.php @@ -2,7 +2,7 @@ /** * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/illustrator.php b/lib/private/preview/illustrator.php index ac9dcb5ffbf..ef8448d7b53 100644 --- a/lib/private/preview/illustrator.php +++ b/lib/private/preview/illustrator.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php index 9287d9c888b..b377f0e855d 100644 --- a/lib/private/preview/image.php +++ b/lib/private/preview/image.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/jpeg.php b/lib/private/preview/jpeg.php index 96f89f4d57e..2ee5dd24419 100644 --- a/lib/private/preview/jpeg.php +++ b/lib/private/preview/jpeg.php @@ -2,7 +2,7 @@ /** * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/markdown.php b/lib/private/preview/markdown.php index f5e74697621..394af6576c7 100644 --- a/lib/private/preview/markdown.php +++ b/lib/private/preview/markdown.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/movie.php b/lib/private/preview/movie.php index 2c2e6d09399..ee56f017229 100644 --- a/lib/private/preview/movie.php +++ b/lib/private/preview/movie.php @@ -2,10 +2,11 @@ /** * @author Georg Ehrke <georg@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php index ffe596db71b..b984cb4e10d 100644 --- a/lib/private/preview/mp3.php +++ b/lib/private/preview/mp3.php @@ -5,7 +5,7 @@ * @author Olivier Paroz <github@oparoz.com> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/msoffice2003.php b/lib/private/preview/msoffice2003.php index dd00cacedf3..20dbe13543a 100644 --- a/lib/private/preview/msoffice2003.php +++ b/lib/private/preview/msoffice2003.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/msoffice2007.php b/lib/private/preview/msoffice2007.php index 8fcdabc0484..ef6758843f1 100644 --- a/lib/private/preview/msoffice2007.php +++ b/lib/private/preview/msoffice2007.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/msofficedoc.php b/lib/private/preview/msofficedoc.php index 6ce003387fb..05d839d508f 100644 --- a/lib/private/preview/msofficedoc.php +++ b/lib/private/preview/msofficedoc.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php index acf3683def0..6496e091b1d 100644 --- a/lib/private/preview/office.php +++ b/lib/private/preview/office.php @@ -1,11 +1,12 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/opendocument.php b/lib/private/preview/opendocument.php index 21df2b5909a..0da1e88cafa 100644 --- a/lib/private/preview/opendocument.php +++ b/lib/private/preview/opendocument.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/pdf.php b/lib/private/preview/pdf.php index 220cbf14faf..6ddf33cdea2 100644 --- a/lib/private/preview/pdf.php +++ b/lib/private/preview/pdf.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/photoshop.php b/lib/private/preview/photoshop.php index 73c2e82d096..df91247f072 100644 --- a/lib/private/preview/photoshop.php +++ b/lib/private/preview/photoshop.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/png.php b/lib/private/preview/png.php index bab63c16ada..5dd9ae484a5 100644 --- a/lib/private/preview/png.php +++ b/lib/private/preview/png.php @@ -2,7 +2,7 @@ /** * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/postscript.php b/lib/private/preview/postscript.php index d69e86edc7f..edfd43968c2 100644 --- a/lib/private/preview/postscript.php +++ b/lib/private/preview/postscript.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php index 8f4a9f9fc3f..738d13d7fc8 100644 --- a/lib/private/preview/provider.php +++ b/lib/private/preview/provider.php @@ -6,7 +6,7 @@ * @author Olivier Paroz <github@oparoz.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/staroffice.php b/lib/private/preview/staroffice.php index b06de79f707..6ea4efa5144 100644 --- a/lib/private/preview/staroffice.php +++ b/lib/private/preview/staroffice.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php index 26ce0fa9411..6618c1fbf82 100644 --- a/lib/private/preview/svg.php +++ b/lib/private/preview/svg.php @@ -5,7 +5,7 @@ * @author Olivier Paroz <github@oparoz.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/tiff.php b/lib/private/preview/tiff.php index 624eb5ddff2..006ced6aec0 100644 --- a/lib/private/preview/tiff.php +++ b/lib/private/preview/tiff.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php index b6c21b7c1b1..a27517c9f39 100644 --- a/lib/private/preview/txt.php +++ b/lib/private/preview/txt.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/preview/xbitmap.php b/lib/private/preview/xbitmap.php index 7887f2b73f5..604a51a6a83 100644 --- a/lib/private/preview/xbitmap.php +++ b/lib/private/preview/xbitmap.php @@ -2,7 +2,7 @@ /** * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/previewmanager.php b/lib/private/previewmanager.php index e351c010c85..f3c7a4de0d0 100644 --- a/lib/private/previewmanager.php +++ b/lib/private/previewmanager.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair.php b/lib/private/repair.php index 269fe4c5f09..d40c6464e14 100644 --- a/lib/private/repair.php +++ b/lib/private/repair.php @@ -9,7 +9,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/assetcache.php b/lib/private/repair/assetcache.php index c46aa63a3e4..72fe99bbe1a 100644 --- a/lib/private/repair/assetcache.php +++ b/lib/private/repair/assetcache.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/cleantags.php b/lib/private/repair/cleantags.php index d16a49fbca7..7421242eb48 100644 --- a/lib/private/repair/cleantags.php +++ b/lib/private/repair/cleantags.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/collation.php b/lib/private/repair/collation.php index 7eb14f0ded2..48035f8d331 100644 --- a/lib/private/repair/collation.php +++ b/lib/private/repair/collation.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/dropoldjobs.php b/lib/private/repair/dropoldjobs.php index 89d7f96a144..2d6172047c2 100644 --- a/lib/private/repair/dropoldjobs.php +++ b/lib/private/repair/dropoldjobs.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/dropoldtables.php b/lib/private/repair/dropoldtables.php index 2d7fc8376b3..abd3bd49b0a 100644 --- a/lib/private/repair/dropoldtables.php +++ b/lib/private/repair/dropoldtables.php @@ -1,8 +1,9 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/filletags.php b/lib/private/repair/filletags.php index 8cfc4a7c258..dc2ffdcbc36 100644 --- a/lib/private/repair/filletags.php +++ b/lib/private/repair/filletags.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/innodb.php b/lib/private/repair/innodb.php index 4bbfdcea20a..4e157e66045 100644 --- a/lib/private/repair/innodb.php +++ b/lib/private/repair/innodb.php @@ -5,7 +5,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/oldgroupmembershipshares.php b/lib/private/repair/oldgroupmembershipshares.php index 2d701ac9fb7..bae1bf61a7f 100644 --- a/lib/private/repair/oldgroupmembershipshares.php +++ b/lib/private/repair/oldgroupmembershipshares.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/preview.php b/lib/private/repair/preview.php index 2284da93734..481e98b42d1 100644 --- a/lib/private/repair/preview.php +++ b/lib/private/repair/preview.php @@ -2,7 +2,7 @@ /** * @author Georg Ehrke <georg@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/removegetetagentries.php b/lib/private/repair/removegetetagentries.php index 40040763654..e118da7973a 100644 --- a/lib/private/repair/removegetetagentries.php +++ b/lib/private/repair/removegetetagentries.php @@ -2,7 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/repairinvalidshares.php b/lib/private/repair/repairinvalidshares.php index 5a4cb445ce9..ee8b23906e5 100644 --- a/lib/private/repair/repairinvalidshares.php +++ b/lib/private/repair/repairinvalidshares.php @@ -1,9 +1,10 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/repairlegacystorages.php b/lib/private/repair/repairlegacystorages.php index 5ba452cbbc6..ee189110a87 100644 --- a/lib/private/repair/repairlegacystorages.php +++ b/lib/private/repair/repairlegacystorages.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/repairmimetypes.php b/lib/private/repair/repairmimetypes.php index e687dbde688..692a7120a63 100644 --- a/lib/private/repair/repairmimetypes.php +++ b/lib/private/repair/repairmimetypes.php @@ -8,7 +8,7 @@ * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/searchlucenetables.php b/lib/private/repair/searchlucenetables.php index 52d41083c45..9f3601eeb03 100644 --- a/lib/private/repair/searchlucenetables.php +++ b/lib/private/repair/searchlucenetables.php @@ -3,7 +3,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/sqliteautoincrement.php b/lib/private/repair/sqliteautoincrement.php index 70d0adae5d7..d7cac57229d 100644 --- a/lib/private/repair/sqliteautoincrement.php +++ b/lib/private/repair/sqliteautoincrement.php @@ -2,7 +2,7 @@ /** * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/updatecertificatestore.php b/lib/private/repair/updatecertificatestore.php index 5fad309a959..ae7585f07f6 100644 --- a/lib/private/repair/updatecertificatestore.php +++ b/lib/private/repair/updatecertificatestore.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repair/updateoutdatedocsids.php b/lib/private/repair/updateoutdatedocsids.php index 5f6ee029536..60024b3055c 100644 --- a/lib/private/repair/updateoutdatedocsids.php +++ b/lib/private/repair/updateoutdatedocsids.php @@ -2,7 +2,7 @@ /** * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repairexception.php b/lib/private/repairexception.php index 8add3958c9b..e244f2bb820 100644 --- a/lib/private/repairexception.php +++ b/lib/private/repairexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/repairstep.php b/lib/private/repairstep.php index 25cb91da68e..e1b8442fb8a 100644 --- a/lib/private/repairstep.php +++ b/lib/private/repairstep.php @@ -2,7 +2,7 @@ /** * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/response.php b/lib/private/response.php index b0eb8adc4d5..5c7eb9b52d5 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -5,11 +5,11 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -260,6 +260,8 @@ class OC_Response { header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains header('X-Robots-Tag: none'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag + header('X-Download-Options: noopen'); // https://msdn.microsoft.com/en-us/library/jj542450(v=vs.85).aspx + header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html } } diff --git a/lib/private/route/cachingrouter.php b/lib/private/route/cachingrouter.php index 2d10b8ab691..4c702bb8e04 100644 --- a/lib/private/route/cachingrouter.php +++ b/lib/private/route/cachingrouter.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/route/route.php b/lib/private/route/route.php index 86f05b85e5b..966790a63c0 100644 --- a/lib/private/route/route.php +++ b/lib/private/route/route.php @@ -5,10 +5,10 @@ * @author Felix Moeller <mail@felixmoeller.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/route/router.php b/lib/private/route/router.php index 5cfddca966a..13f7a7a1cfb 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -7,11 +7,12 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/search.php b/lib/private/search.php index ea77fa4f151..7d1e2734195 100644 --- a/lib/private/search.php +++ b/lib/private/search.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/search/provider/file.php b/lib/private/search/provider/file.php index 73d57def644..69ffbd3ae6b 100644 --- a/lib/private/search/provider/file.php +++ b/lib/private/search/provider/file.php @@ -6,7 +6,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/search/result/audio.php b/lib/private/search/result/audio.php index 8e135ea5d29..3f9b3dc640c 100644 --- a/lib/private/search/result/audio.php +++ b/lib/private/search/result/audio.php @@ -4,7 +4,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/search/result/file.php b/lib/private/search/result/file.php index 4329f504a7d..d987d6c8e73 100644 --- a/lib/private/search/result/file.php +++ b/lib/private/search/result/file.php @@ -5,7 +5,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/search/result/folder.php b/lib/private/search/result/folder.php index 18f7de2e481..6f0c0a7b2a5 100644 --- a/lib/private/search/result/folder.php +++ b/lib/private/search/result/folder.php @@ -4,7 +4,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/search/result/image.php b/lib/private/search/result/image.php index bf4425a55f9..87b36fc9f73 100644 --- a/lib/private/search/result/image.php +++ b/lib/private/search/result/image.php @@ -4,7 +4,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/security/certificate.php b/lib/private/security/certificate.php index 0d7fcc4148d..54486ff51fe 100644 --- a/lib/private/security/certificate.php +++ b/lib/private/security/certificate.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php index ded81863a73..f4932ca568e 100644 --- a/lib/private/security/certificatemanager.php +++ b/lib/private/security/certificatemanager.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -50,7 +50,7 @@ class CertificateManager implements ICertificateManager { /** * @param string $uid - * @param \OC\Files\View $view relative zu data/ + * @param \OC\Files\View $view relative to data/ * @param IConfig $config */ public function __construct($uid, \OC\Files\View $view, IConfig $config) { @@ -83,7 +83,8 @@ class CertificateManager implements ICertificateManager { if ($file != '.' && $file != '..') { try { $result[] = new Certificate($this->view->file_get_contents($path . $file), $file); - } catch(\Exception $e) {} + } catch (\Exception $e) { + } } } closedir($handle); @@ -97,22 +98,34 @@ class CertificateManager implements ICertificateManager { $path = $this->getPathToCertificates(); $certs = $this->listCertificates(); - $fh_certs = $this->view->fopen($path . '/rootcerts.crt', 'w'); + if (!$this->view->file_exists($path)) { + $this->view->mkdir($path); + } + + $fhCerts = $this->view->fopen($path . '/rootcerts.crt', 'w'); // Write user certificates foreach ($certs as $cert) { $file = $path . '/uploads/' . $cert->getName(); $data = $this->view->file_get_contents($file); if (strpos($data, 'BEGIN CERTIFICATE')) { - fwrite($fh_certs, $data); - fwrite($fh_certs, "\r\n"); + fwrite($fhCerts, $data); + fwrite($fhCerts, "\r\n"); } } // Append the default certificates $defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); - fwrite($fh_certs, $defaultCertificates); - fclose($fh_certs); + fwrite($fhCerts, $defaultCertificates); + + // Append the system certificate bundle + $systemBundle = $this->getCertificateBundle(null); + if ($this->view->file_exists($systemBundle)) { + $systemCertificates = $this->view->file_get_contents($systemBundle); + fwrite($fhCerts, $systemCertificates); + } + + fclose($fhCerts); } /** @@ -166,18 +179,72 @@ class CertificateManager implements ICertificateManager { /** * Get the path to the certificate bundle for this user * + * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle * @return string */ - public function getCertificateBundle() { - return $this->getPathToCertificates() . 'rootcerts.crt'; + public function getCertificateBundle($uid = '') { + if ($uid === '') { + $uid = $this->uid; + } + return $this->getPathToCertificates($uid) . 'rootcerts.crt'; + } + + /** + * Get the full local path to the certificate bundle for this user + * + * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle + * @return string + */ + public function getAbsoluteBundlePath($uid = '') { + if ($uid === '') { + $uid = $this->uid; + } + if ($this->needsRebundling($uid)) { + if (is_null($uid)) { + $manager = new CertificateManager(null, $this->view, $this->config); + $manager->createCertificateBundle(); + } else { + $this->createCertificateBundle(); + } + } + return $this->view->getLocalFile($this->getCertificateBundle($uid)); } /** + * @param string $uid (optional) user to get the certificate path for, use `null` to get the system path * @return string */ - private function getPathToCertificates() { - $path = is_null($this->uid) ? '/files_external/' : '/' . $this->uid . '/files_external/'; + private function getPathToCertificates($uid = '') { + if ($uid === '') { + $uid = $this->uid; + } + $path = is_null($uid) ? '/files_external/' : '/' . $uid . '/files_external/'; return $path; } + + /** + * Check if we need to re-bundle the certificates because one of the sources has updated + * + * @param string $uid (optional) user to get the certificate path for, use `null` to get the system path + * @return bool + */ + private function needsRebundling($uid = '') { + if ($uid === '') { + $uid = $this->uid; + } + $sourceMTimes = [filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt')]; + $targetBundle = $this->getCertificateBundle($uid); + if (!$this->view->file_exists($targetBundle)) { + return true; + } + if (!is_null($uid)) { // also depend on the system bundle + $sourceBundles[] = $this->view->filemtime($this->getCertificateBundle(null)); + } + + $sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) { + return max($max, $mtime); + }, 0); + return $sourceMTime > $this->view->filemtime($targetBundle); + } } diff --git a/lib/private/security/crypto.php b/lib/private/security/crypto.php index 46d0c750b2f..3c3ffb47398 100644 --- a/lib/private/security/crypto.php +++ b/lib/private/security/crypto.php @@ -3,8 +3,9 @@ * @author Andreas Fischer <bantu@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -90,7 +91,7 @@ class Crypto implements ICrypto { } $this->cipher->setPassword($password); - $iv = $this->random->getLowStrengthGenerator()->generate($this->ivLength); + $iv = $this->random->generate($this->ivLength); $this->cipher->setIV($iv); $ciphertext = bin2hex($this->cipher->encrypt($plaintext)); diff --git a/lib/private/security/hasher.php b/lib/private/security/hasher.php index 318141b6852..a8b81aa60eb 100644 --- a/lib/private/security/hasher.php +++ b/lib/private/security/hasher.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/security/securerandom.php b/lib/private/security/securerandom.php index 24affbe8988..5cc69b92156 100644 --- a/lib/private/security/securerandom.php +++ b/lib/private/security/securerandom.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/security/trusteddomainhelper.php b/lib/private/security/trusteddomainhelper.php index c1a397dd52d..885ceee23c3 100644 --- a/lib/private/security/trusteddomainhelper.php +++ b/lib/private/security/trusteddomainhelper.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/server.php b/lib/private/server.php index ead9fa95db8..fe71b748e08 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -12,14 +12,14 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Sander <brantje@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -921,11 +921,11 @@ class Server extends ServerContainer implements IServerContainer { /** * Get the certificate manager for the user * - * @param string $userId (optional) if not specified the current loggedin user is used + * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in */ - public function getCertificateManager($userId = null) { - if (is_null($userId)) { + public function getCertificateManager($userId = '') { + if ($userId === '') { $userSession = $this->getUserSession(); $user = $userSession->getUser(); if (is_null($user)) { diff --git a/lib/private/servercontainer.php b/lib/private/servercontainer.php index 385700957a1..d297c9fd39c 100644 --- a/lib/private/servercontainer.php +++ b/lib/private/servercontainer.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/servernotavailableexception.php b/lib/private/servernotavailableexception.php index b273f50be98..f4b5f4f8cf3 100644 --- a/lib/private/servernotavailableexception.php +++ b/lib/private/servernotavailableexception.php @@ -2,7 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/serviceunavailableexception.php b/lib/private/serviceunavailableexception.php index 2c08f37897c..fb4920b3607 100644 --- a/lib/private/serviceunavailableexception.php +++ b/lib/private/serviceunavailableexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/session/cryptosessiondata.php b/lib/private/session/cryptosessiondata.php index b600874412b..f6c585c1611 100644 --- a/lib/private/session/cryptosessiondata.php +++ b/lib/private/session/cryptosessiondata.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/session/cryptowrapper.php b/lib/private/session/cryptowrapper.php index 177f11ffb70..f1819b31b89 100644 --- a/lib/private/session/cryptowrapper.php +++ b/lib/private/session/cryptowrapper.php @@ -3,8 +3,9 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Phil Davis <phil.davis@inf.org> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -74,7 +75,7 @@ class CryptoWrapper { if (!is_null($request->getCookie(self::COOKIE_NAME))) { $this->passphrase = $request->getCookie(self::COOKIE_NAME); } else { - $this->passphrase = $this->random->getMediumStrengthGenerator()->generate(128); + $this->passphrase = $this->random->generate(128); $secureCookie = $request->getServerProtocol() === 'https'; // FIXME: Required for CI if (!defined('PHPUNIT_RUN')) { diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php index 8be3356c6db..09175bf1f2f 100644 --- a/lib/private/session/internal.php +++ b/lib/private/session/internal.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php index c6090087457..777458a9aa5 100644 --- a/lib/private/session/memory.php +++ b/lib/private/session/memory.php @@ -1,12 +1,13 @@ <?php /** * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Phil Davis <phil.davis@inf.org> * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/session/session.php b/lib/private/session/session.php index f9a1b5afa0f..198d0049956 100644 --- a/lib/private/session/session.php +++ b/lib/private/session/session.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/setup.php b/lib/private/setup.php index 770f5cdab52..7903b94ccde 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -10,13 +10,15 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Martin Mattel <martin.mattel@diemattels.at> + * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Sean Comeau <sean@ftlnetworks.ca> * @author Serge Martin <edb@sigluy.net> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -310,9 +312,9 @@ class Setup { } //generate a random salt that is used to salt the local user passwords - $salt = $this->random->getLowStrengthGenerator()->generate(30); + $salt = $this->random->generate(30); // generate a secret - $secret = $this->random->getMediumStrengthGenerator()->generate(48); + $secret = $this->random->generate(48); //write the config file $this->config->setSystemValues([ diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php index 1ec853c3b02..c97302ab252 100644 --- a/lib/private/setup/abstractdatabase.php +++ b/lib/private/setup/abstractdatabase.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php index e8b88eb3489..e6afad6033a 100644 --- a/lib/private/setup/mysql.php +++ b/lib/private/setup/mysql.php @@ -3,9 +3,10 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Michael Göhler <somebody.here@gmx.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -143,7 +144,7 @@ class MySQL extends AbstractDatabase { $this->dbUser = $adminUser; //create a random password so we don't need to store the admin password in the config file - $this->dbPassword = $this->random->getMediumStrengthGenerator()->generate(30); + $this->dbPassword = $this->random->generate(30); $this->createDBUser($connection); diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php index d335df850cf..3d5aca96c1f 100644 --- a/lib/private/setup/oci.php +++ b/lib/private/setup/oci.php @@ -5,10 +5,11 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php index 850551e794f..4c17de4b84d 100644 --- a/lib/private/setup/postgresql.php +++ b/lib/private/setup/postgresql.php @@ -3,9 +3,11 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author eduardo <eduardo@vnexu.net> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/setup/sqlite.php b/lib/private/setup/sqlite.php index ce6005620eb..61bc501fd75 100644 --- a/lib/private/setup/sqlite.php +++ b/lib/private/setup/sqlite.php @@ -1,8 +1,9 @@ <?php /** * @author Bart Visscher <bartv@thisnet.nl> + * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share/constants.php b/lib/private/share/constants.php index 695d0c6714c..e2b87d72476 100644 --- a/lib/private/share/constants.php +++ b/lib/private/share/constants.php @@ -4,7 +4,7 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php index 0441647df83..1645e4451ab 100644 --- a/lib/private/share/helper.php +++ b/lib/private/share/helper.php @@ -5,11 +5,11 @@ * @author Miguel Prokop <miguel.prokop@vtu.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php index 98143124e82..1fa233916d1 100644 --- a/lib/private/share/hooks.php +++ b/lib/private/share/hooks.php @@ -2,9 +2,9 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php index f071c7f3a3c..5d24b30cbe2 100644 --- a/lib/private/share/mailnotifications.php +++ b/lib/private/share/mailnotifications.php @@ -4,11 +4,13 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author scolebrook <scolebrook@mac.com> + * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php index bde2fd05073..c220699103a 100644 --- a/lib/private/share/searchresultsorter.php +++ b/lib/private/share/searchresultsorter.php @@ -2,10 +2,10 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 63639461f0a..c695e9a156b 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -11,14 +11,14 @@ * @author Michael Kuhn <suraia@ikkoku.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Sebastian Döll <sebastian.doell@libasys.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -819,7 +819,7 @@ class Share extends Constants { if (isset($oldToken)) { $token = $oldToken; } else { - $token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(self::TOKEN_LENGTH, + $token = \OC::$server->getSecureRandom()->generate(self::TOKEN_LENGTH, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_UPPER. \OCP\Security\ISecureRandom::CHAR_DIGITS ); @@ -860,7 +860,7 @@ class Share extends Constants { throw new \Exception($message_t); } - $token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(self::TOKEN_LENGTH, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_UPPER . + $token = \OC::$server->getSecureRandom()->generate(self::TOKEN_LENGTH, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_UPPER . \OCP\Security\ISecureRandom::CHAR_DIGITS); $shareWith = $user . '@' . $remote; diff --git a/lib/private/share20/defaultshareprovider.php b/lib/private/share20/defaultshareprovider.php index a7155644920..adeaf2c44c9 100644 --- a/lib/private/share20/defaultshareprovider.php +++ b/lib/private/share20/defaultshareprovider.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share20/exception/backenderror.php b/lib/private/share20/exception/backenderror.php index 2d661533171..f15dea4a243 100644 --- a/lib/private/share20/exception/backenderror.php +++ b/lib/private/share20/exception/backenderror.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share20/exception/sharenotfound.php b/lib/private/share20/exception/sharenotfound.php index 0e18a96be68..b59f185939a 100644 --- a/lib/private/share20/exception/sharenotfound.php +++ b/lib/private/share20/exception/sharenotfound.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share20/ishare.php b/lib/private/share20/ishare.php index a149c578fb2..53cfe76916d 100644 --- a/lib/private/share20/ishare.php +++ b/lib/private/share20/ishare.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share20/ishareprovider.php b/lib/private/share20/ishareprovider.php index 97a2b728d5f..ad3c22f43e3 100644 --- a/lib/private/share20/ishareprovider.php +++ b/lib/private/share20/ishareprovider.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php index 8d753061c0c..11faf017f39 100644 --- a/lib/private/share20/manager.php +++ b/lib/private/share20/manager.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/share20/share.php b/lib/private/share20/share.php index 4827000eefa..2cd685b7963 100644 --- a/lib/private/share20/share.php +++ b/lib/private/share20/share.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/streamer.php b/lib/private/streamer.php index aa819c560a1..5fffa7ac368 100644 --- a/lib/private/streamer.php +++ b/lib/private/streamer.php @@ -4,7 +4,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/subadmin.php b/lib/private/subadmin.php index c96275e3b87..34dd40c22ff 100644 --- a/lib/private/subadmin.php +++ b/lib/private/subadmin.php @@ -1,13 +1,13 @@ <?php /** + * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Georg Ehrke <georg@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/systemconfig.php b/lib/private/systemconfig.php index fb8c18123d7..9f99216fa4e 100644 --- a/lib/private/systemconfig.php +++ b/lib/private/systemconfig.php @@ -2,8 +2,9 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/systemtag/systemtag.php b/lib/private/systemtag/systemtag.php index 8f4f7090b21..559b6fdefa8 100644 --- a/lib/private/systemtag/systemtag.php +++ b/lib/private/systemtag/systemtag.php @@ -1,8 +1,9 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/systemtag/systemtagmanager.php b/lib/private/systemtag/systemtagmanager.php index 7f239dc84cf..733336f4de9 100644 --- a/lib/private/systemtag/systemtagmanager.php +++ b/lib/private/systemtag/systemtagmanager.php @@ -1,8 +1,9 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/systemtag/systemtagobjectmapper.php b/lib/private/systemtag/systemtagobjectmapper.php index 988fa66d77e..4b50539f155 100644 --- a/lib/private/systemtag/systemtagobjectmapper.php +++ b/lib/private/systemtag/systemtagobjectmapper.php @@ -1,8 +1,9 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/tagging/tag.php b/lib/private/tagging/tag.php index 4531cae53a7..e35ac433e00 100644 --- a/lib/private/tagging/tag.php +++ b/lib/private/tagging/tag.php @@ -3,7 +3,7 @@ * @author Bernhard Reiter <ockham@raz.or.at> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/tagging/tagmapper.php b/lib/private/tagging/tagmapper.php index 38ea735b102..364dbc99b4d 100644 --- a/lib/private/tagging/tagmapper.php +++ b/lib/private/tagging/tagmapper.php @@ -4,7 +4,7 @@ * @author Bernhard Reiter <ockham@raz.or.at> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/tagmanager.php b/lib/private/tagmanager.php index 5e72eb41d16..a9e1cdfe076 100644 --- a/lib/private/tagmanager.php +++ b/lib/private/tagmanager.php @@ -5,7 +5,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/tags.php b/lib/private/tags.php index c621aa3cf8f..ea5e2ca2f2b 100644 --- a/lib/private/tags.php +++ b/lib/private/tags.php @@ -6,12 +6,12 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template.php b/lib/private/template.php index b1655061a28..717f91a7034 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -4,19 +4,20 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Brice Maron <brice@bmaron.net> - * @author drarko <drarko@users.noreply.github.com> * @author Frank Karlitschek <frank@owncloud.org> + * @author Hendrik Leppelsack <hendrik@leppelsack.de> * @author Individual IT Services <info@individual-it.net> * @author Jakob Sack <mail@jakobsack.de> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Raghu Nayyar <hey@raghunayyar.com> * @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. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template/base.php b/lib/private/template/base.php index a18c43bb2ca..944747197b7 100644 --- a/lib/private/template/base.php +++ b/lib/private/template/base.php @@ -7,7 +7,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/template/cssresourcelocator.php index a78b0223389..6a547931ee3 100644 --- a/lib/private/template/cssresourcelocator.php +++ b/lib/private/template/cssresourcelocator.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index 982ecde5850..5c8cb72c126 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -7,11 +7,12 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/template/jsresourcelocator.php index c0127a0f278..4df1ac8c7f0 100644 --- a/lib/private/template/jsresourcelocator.php +++ b/lib/private/template/jsresourcelocator.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template/resourcelocator.php b/lib/private/template/resourcelocator.php index 136a40e4def..e64fce81afc 100644 --- a/lib/private/template/resourcelocator.php +++ b/lib/private/template/resourcelocator.php @@ -4,9 +4,9 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template/resourcenotfoundexception.php b/lib/private/template/resourcenotfoundexception.php index 22f8bcea059..8c7f1f14175 100644 --- a/lib/private/template/resourcenotfoundexception.php +++ b/lib/private/template/resourcenotfoundexception.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php index 1fa13aed188..f8553156914 100644 --- a/lib/private/template/templatefilelocator.php +++ b/lib/private/template/templatefilelocator.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index c29e712cccf..e14b070a7b4 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -2,7 +2,6 @@ /** * @author Adam Williamson <awilliam@redhat.com> * @author Bart Visscher <bartv@thisnet.nl> - * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Clark Tomlinson <fallen013@gmail.com> * @author Joas Schilling <nickvergessen@owncloud.com> @@ -12,11 +11,12 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Remco Brenninkmeijer <requist1@starmail.nl> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php index c4fa9231eb6..378da91e226 100644 --- a/lib/private/tempmanager.php +++ b/lib/private/tempmanager.php @@ -5,9 +5,9 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/updater.php b/lib/private/updater.php index 9ec72bab2f9..32264484ee3 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -8,13 +8,13 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Steffen Lindner <mail@steffen-lindner.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -345,8 +345,8 @@ class Updater extends BasicEmitter { //Invalidate update feed $this->config->setAppValue('core', 'lastupdatedat', 0); - // Check for code integrity on the stable channel - if(\OC_Util::getChannel() === 'stable') { + // Check for code integrity if not disabled + if(\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) { $this->emit('\OC\Updater', 'startCheckCodeIntegrity'); $this->checker->runInstanceVerification(); $this->emit('\OC\Updater', 'finishedCheckCodeIntegrity'); diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 94de8ed8f6e..327c0c32dfe 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -6,11 +6,11 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/user.php b/lib/private/user.php index fa1cea9072f..7f42374e2e3 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -3,26 +3,24 @@ * @author Aldo "xoen" Giambelluca <xoen@xoen.org> * @author Andreas Fischer <bantu@owncloud.com> * @author Arthur Schiwon <blizzz@owncloud.com> - * @author Bart Visscher <bartv@thisnet.nl> * @author Bartek Przybylski <bart.p.pl@gmail.com> + * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> - * @author Dominik Schmidt <dev@dominik-schmidt.de> * @author Florian Preinstorfer <nblock@archlinux.us> * @author Georg Ehrke <georg@owncloud.com> * @author Jakob Sack <mail@jakobsack.de> - * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author shkdee <louis.traynard@m4x.org> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> - * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -393,7 +391,7 @@ class OC_User { * generates a password */ public static function generatePassword() { - return \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(30); + return \OC::$server->getSecureRandom()->generate(30); } /** diff --git a/lib/private/user/backend.php b/lib/private/user/backend.php index cda91398a84..075ff9e6e24 100644 --- a/lib/private/user/backend.php +++ b/lib/private/user/backend.php @@ -16,7 +16,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 5bee509e8bd..22a05090b96 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -15,11 +15,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author nishiki <nishiki@yaegashi.fr> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php index 0b36340c4f9..c935a92820b 100644 --- a/lib/private/user/interface.php +++ b/lib/private/user/interface.php @@ -5,10 +5,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/user/loginexception.php b/lib/private/user/loginexception.php index fcaa4d797a8..84426f7f5da 100644 --- a/lib/private/user/loginexception.php +++ b/lib/private/user/loginexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 2cb866d0056..2aafe98cef2 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -7,10 +7,11 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author RealRancor <Fisch.666@gmx.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/user/nouserexception.php b/lib/private/user/nouserexception.php index 09874887469..afd5c729fcf 100644 --- a/lib/private/user/nouserexception.php +++ b/lib/private/user/nouserexception.php @@ -2,7 +2,7 @@ /** * @author Jörn Friedrich Dreyer <jfd@butonic.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/user/session.php b/lib/private/user/session.php index be38b1b1d8e..5402c5cf74f 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -7,11 +7,12 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -260,7 +261,7 @@ class Session implements IUserSession, Emitter { } // replace successfully used token with a new one \OC::$server->getConfig()->deleteUserValue($uid, 'login_token', $currentToken); - $newToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32); + $newToken = \OC::$server->getSecureRandom()->generate(32); \OC::$server->getConfig()->setUserValue($uid, 'login_token', $newToken, time()); $this->setMagicInCookie($user->getUID(), $newToken); diff --git a/lib/private/user/user.php b/lib/private/user/user.php index 6c89dd06f77..c6c608703eb 100644 --- a/lib/private/user/user.php +++ b/lib/private/user/user.php @@ -7,10 +7,10 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/util.php b/lib/private/util.php index 4bcde68c355..5ae5c452d6b 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -1,6 +1,7 @@ <?php /** * @author Adam Williamson <awilliam@redhat.com> + * @author Andreas Böhler <dev@aboehler.at> * @author Andreas Fischer <bantu@owncloud.com> * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> @@ -28,7 +29,8 @@ * @author Michael Göhler <somebody.here@gmx.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Stefan Rado <owncloud@sradonia.net> * @author Thomas Müller <thomas.mueller@tmit.eu> @@ -38,7 +40,7 @@ * @author Vincent Petry <pvince81@owncloud.com> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -1097,7 +1099,7 @@ class OC_Util { $id = \OC::$server->getSystemConfig()->getValue('instanceid', null); if (is_null($id)) { // We need to guarantee at least one letter in instanceid so it can be used as the session_name - $id = 'oc' . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); + $id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); \OC::$server->getSystemConfig()->setValue('instanceid', $id); } return $id; @@ -1125,7 +1127,7 @@ class OC_Util { // Check if a token exists if (!\OC::$server->getSession()->exists('requesttoken')) { // No valid token found, generate a new one. - $requestToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($tokenLength); + $requestToken = \OC::$server->getSecureRandom()->generate($tokenLength); \OC::$server->getSession()->set('requesttoken', $requestToken); } else { // Valid token already exists, send it @@ -1133,7 +1135,7 @@ class OC_Util { } // XOR the token to mitigate breach-like attacks - $sharedSecret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($tokenLength); + $sharedSecret = \OC::$server->getSecureRandom()->generate($tokenLength); self::$obfuscatedToken = base64_encode($requestToken ^ $sharedSecret) .':'.$sharedSecret; return self::$obfuscatedToken; diff --git a/lib/public/activity/iconsumer.php b/lib/public/activity/iconsumer.php index 796bf1d8884..fc536fd0a56 100644 --- a/lib/public/activity/iconsumer.php +++ b/lib/public/activity/iconsumer.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/activity/ievent.php b/lib/public/activity/ievent.php index 184c7ae503f..9b6df9126b2 100644 --- a/lib/public/activity/ievent.php +++ b/lib/public/activity/ievent.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/activity/iextension.php b/lib/public/activity/iextension.php index 5d9fe3329ef..b76cdc7af29 100644 --- a/lib/public/activity/iextension.php +++ b/lib/public/activity/iextension.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/activity/imanager.php b/lib/public/activity/imanager.php index 280babb7fa9..b79ec115450 100644 --- a/lib/public/activity/imanager.php +++ b/lib/public/activity/imanager.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/api.php b/lib/public/api.php index a99a3af1c1d..4d68bef6f29 100644 --- a/lib/public/api.php +++ b/lib/public/api.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/app.php b/lib/public/app.php index c75a69f0c3d..e25f025d12d 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -6,10 +6,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/app/iappmanager.php b/lib/public/app/iappmanager.php index 09b6bd3f2b9..0e1e0dfbebd 100644 --- a/lib/public/app/iappmanager.php +++ b/lib/public/app/iappmanager.php @@ -3,8 +3,9 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/apicontroller.php b/lib/public/appframework/apicontroller.php index 90eea47d730..64e07539de4 100644 --- a/lib/public/appframework/apicontroller.php +++ b/lib/public/appframework/apicontroller.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/app.php b/lib/public/appframework/app.php index bf4e14961f5..09297d91ee8 100644 --- a/lib/public/appframework/app.php +++ b/lib/public/appframework/app.php @@ -6,7 +6,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php index 6e2ceff93e8..973c9044684 100644 --- a/lib/public/appframework/controller.php +++ b/lib/public/appframework/controller.php @@ -8,7 +8,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/db/doesnotexistexception.php b/lib/public/appframework/db/doesnotexistexception.php index 2cefa0fe827..9682a08d3cf 100644 --- a/lib/public/appframework/db/doesnotexistexception.php +++ b/lib/public/appframework/db/doesnotexistexception.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/db/entity.php b/lib/public/appframework/db/entity.php index f7beebef154..d7db4d3c5a7 100644 --- a/lib/public/appframework/db/entity.php +++ b/lib/public/appframework/db/entity.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/db/mapper.php b/lib/public/appframework/db/mapper.php index 2b99c99b71e..065a9f01ea1 100644 --- a/lib/public/appframework/db/mapper.php +++ b/lib/public/appframework/db/mapper.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/db/multipleobjectsreturnedexception.php b/lib/public/appframework/db/multipleobjectsreturnedexception.php index 988bf6bb033..b9207051826 100644 --- a/lib/public/appframework/db/multipleobjectsreturnedexception.php +++ b/lib/public/appframework/db/multipleobjectsreturnedexception.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http.php b/lib/public/appframework/http.php index 65b62ffd15a..e0108146db7 100644 --- a/lib/public/appframework/http.php +++ b/lib/public/appframework/http.php @@ -4,7 +4,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/contentsecuritypolicy.php b/lib/public/appframework/http/contentsecuritypolicy.php index 5371d76ff22..35da4f05e80 100644 --- a/lib/public/appframework/http/contentsecuritypolicy.php +++ b/lib/public/appframework/http/contentsecuritypolicy.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author sualko <klaus@jsxc.org> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/datadisplayresponse.php b/lib/public/appframework/http/datadisplayresponse.php index 2691091347a..4209c86a059 100644 --- a/lib/public/appframework/http/datadisplayresponse.php +++ b/lib/public/appframework/http/datadisplayresponse.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/datadownloadresponse.php b/lib/public/appframework/http/datadownloadresponse.php index 612386f9801..55ef4e6c82c 100644 --- a/lib/public/appframework/http/datadownloadresponse.php +++ b/lib/public/appframework/http/datadownloadresponse.php @@ -3,7 +3,7 @@ * @author Georg Ehrke <georg@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/dataresponse.php b/lib/public/appframework/http/dataresponse.php index 555faa6ea1a..3ec4e2bdc32 100644 --- a/lib/public/appframework/http/dataresponse.php +++ b/lib/public/appframework/http/dataresponse.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/downloadresponse.php b/lib/public/appframework/http/downloadresponse.php index 0b9a8bcc6d8..af0d76951ca 100644 --- a/lib/public/appframework/http/downloadresponse.php +++ b/lib/public/appframework/http/downloadresponse.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/icallbackresponse.php b/lib/public/appframework/http/icallbackresponse.php index aa238cbcac9..97de484e917 100644 --- a/lib/public/appframework/http/icallbackresponse.php +++ b/lib/public/appframework/http/icallbackresponse.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/ioutput.php b/lib/public/appframework/http/ioutput.php index 9a4047fe30c..f4ebc304bde 100644 --- a/lib/public/appframework/http/ioutput.php +++ b/lib/public/appframework/http/ioutput.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php index 306c70327b1..89433fd23e5 100644 --- a/lib/public/appframework/http/jsonresponse.php +++ b/lib/public/appframework/http/jsonresponse.php @@ -6,7 +6,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/notfoundresponse.php b/lib/public/appframework/http/notfoundresponse.php index 968df6c310c..8dcebd7cceb 100644 --- a/lib/public/appframework/http/notfoundresponse.php +++ b/lib/public/appframework/http/notfoundresponse.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/ocsresponse.php b/lib/public/appframework/http/ocsresponse.php index f26d219e581..da9de712c0a 100644 --- a/lib/public/appframework/http/ocsresponse.php +++ b/lib/public/appframework/http/ocsresponse.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/redirectresponse.php b/lib/public/appframework/http/redirectresponse.php index 41a2e48035e..7208012295f 100644 --- a/lib/public/appframework/http/redirectresponse.php +++ b/lib/public/appframework/http/redirectresponse.php @@ -5,7 +5,7 @@ * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php index f6c9460ff15..253d58b86ff 100644 --- a/lib/public/appframework/http/response.php +++ b/lib/public/appframework/http/response.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/streamresponse.php b/lib/public/appframework/http/streamresponse.php index b2e0df3a75f..e9157f9ddb2 100644 --- a/lib/public/appframework/http/streamresponse.php +++ b/lib/public/appframework/http/streamresponse.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php index 961903a8eab..7774d881e4d 100644 --- a/lib/public/appframework/http/templateresponse.php +++ b/lib/public/appframework/http/templateresponse.php @@ -5,7 +5,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php index 7d1d230a77f..66614328873 100644 --- a/lib/public/appframework/iapi.php +++ b/lib/public/appframework/iapi.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php index 1cc0daf68ad..905539e735e 100644 --- a/lib/public/appframework/iappcontainer.php +++ b/lib/public/appframework/iappcontainer.php @@ -6,7 +6,7 @@ * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php index 6c75a2dfc74..a39e26a2aa0 100644 --- a/lib/public/appframework/middleware.php +++ b/lib/public/appframework/middleware.php @@ -4,7 +4,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/ocscontroller.php b/lib/public/appframework/ocscontroller.php index 8b04d65d8c3..b0e77c5d1ec 100644 --- a/lib/public/appframework/ocscontroller.php +++ b/lib/public/appframework/ocscontroller.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/queryexception.php b/lib/public/appframework/queryexception.php index c8cd0cfe9fb..62ab77dd839 100644 --- a/lib/public/appframework/queryexception.php +++ b/lib/public/appframework/queryexception.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/utility/icontrollermethodreflector.php b/lib/public/appframework/utility/icontrollermethodreflector.php index a3b57cf6936..b2f91fdb170 100644 --- a/lib/public/appframework/utility/icontrollermethodreflector.php +++ b/lib/public/appframework/utility/icontrollermethodreflector.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/appframework/utility/itimefactory.php b/lib/public/appframework/utility/itimefactory.php index 6fe2fab2557..a3333dd1949 100644 --- a/lib/public/appframework/utility/itimefactory.php +++ b/lib/public/appframework/utility/itimefactory.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/authentication/iapachebackend.php b/lib/public/authentication/iapachebackend.php index 51ca57788f3..f1f408cfa6d 100644 --- a/lib/public/authentication/iapachebackend.php +++ b/lib/public/authentication/iapachebackend.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/autoloadnotallowedexception.php b/lib/public/autoloadnotallowedexception.php index 2e6556c4a7b..f0028b7d49d 100644 --- a/lib/public/autoloadnotallowedexception.php +++ b/lib/public/autoloadnotallowedexception.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php index 42fcf76b876..c8acb7e538b 100644 --- a/lib/public/backgroundjob.php +++ b/lib/public/backgroundjob.php @@ -6,10 +6,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/backgroundjob/ijob.php b/lib/public/backgroundjob/ijob.php index 8d970dbe781..71cdee65636 100644 --- a/lib/public/backgroundjob/ijob.php +++ b/lib/public/backgroundjob/ijob.php @@ -1,10 +1,10 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/backgroundjob/ijoblist.php b/lib/public/backgroundjob/ijoblist.php index 51431c42a67..13775457edd 100644 --- a/lib/public/backgroundjob/ijoblist.php +++ b/lib/public/backgroundjob/ijoblist.php @@ -1,11 +1,11 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/capabilities/icapability.php b/lib/public/capabilities/icapability.php index b43387aad7e..0facab6f255 100644 --- a/lib/public/capabilities/icapability.php +++ b/lib/public/capabilities/icapability.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/command/ibus.php b/lib/public/command/ibus.php index 796862fbcac..62b6edef4d4 100644 --- a/lib/public/command/ibus.php +++ b/lib/public/command/ibus.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/command/icommand.php b/lib/public/command/icommand.php index ed152f4c6c3..e53d52d2fa3 100644 --- a/lib/public/command/icommand.php +++ b/lib/public/command/icommand.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/comments/icomment.php b/lib/public/comments/icomment.php index 7924ec8d5f6..d97cfe3f1cc 100644 --- a/lib/public/comments/icomment.php +++ b/lib/public/comments/icomment.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OCP\Comments; /** diff --git a/lib/public/comments/icommentsmanager.php b/lib/public/comments/icommentsmanager.php index 7626ffd6351..b8fb3ca7f5d 100644 --- a/lib/public/comments/icommentsmanager.php +++ b/lib/public/comments/icommentsmanager.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OCP\Comments; /** diff --git a/lib/public/comments/icommentsmanagerfactory.php b/lib/public/comments/icommentsmanagerfactory.php index 6718dd39ba0..03a2b16b310 100644 --- a/lib/public/comments/icommentsmanagerfactory.php +++ b/lib/public/comments/icommentsmanagerfactory.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OCP\Comments; /** diff --git a/lib/public/comments/illegalidchangeexception.php b/lib/public/comments/illegalidchangeexception.php index 4e13ef6e444..df7a8e41cd9 100644 --- a/lib/public/comments/illegalidchangeexception.php +++ b/lib/public/comments/illegalidchangeexception.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OCP\Comments; /** diff --git a/lib/public/comments/notfoundexception.php b/lib/public/comments/notfoundexception.php index a82e703b79e..51f6927346c 100644 --- a/lib/public/comments/notfoundexception.php +++ b/lib/public/comments/notfoundexception.php @@ -1,5 +1,23 @@ <?php - +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2016, 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 OCP\Comments; /** diff --git a/lib/public/config.php b/lib/public/config.php index 86e18de78e1..5b5dcb0e78e 100644 --- a/lib/public/config.php +++ b/lib/public/config.php @@ -9,7 +9,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/constants.php b/lib/public/constants.php index 4d44bf24928..518fbcf7ebe 100644 --- a/lib/public/constants.php +++ b/lib/public/constants.php @@ -5,7 +5,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/contacts.php b/lib/public/contacts.php index c66d1ba2ccf..590fd9af1bd 100644 --- a/lib/public/contacts.php +++ b/lib/public/contacts.php @@ -2,10 +2,10 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php index 4b7d0f7d40a..c6d557eaba7 100644 --- a/lib/public/contacts/imanager.php +++ b/lib/public/contacts/imanager.php @@ -3,10 +3,10 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/db.php b/lib/public/db.php index 9c5f9424dcb..4706c5e95ee 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -11,7 +11,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/db/querybuilder/icompositeexpression.php b/lib/public/db/querybuilder/icompositeexpression.php index 439c0ab20a8..c47ba1deb1e 100644 --- a/lib/public/db/querybuilder/icompositeexpression.php +++ b/lib/public/db/querybuilder/icompositeexpression.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/db/querybuilder/iexpressionbuilder.php b/lib/public/db/querybuilder/iexpressionbuilder.php index d719f07ebd4..ae62694fcaf 100644 --- a/lib/public/db/querybuilder/iexpressionbuilder.php +++ b/lib/public/db/querybuilder/iexpressionbuilder.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/db/querybuilder/iliteral.php b/lib/public/db/querybuilder/iliteral.php index a2665e47a7d..ab1cc59229a 100644 --- a/lib/public/db/querybuilder/iliteral.php +++ b/lib/public/db/querybuilder/iliteral.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/db/querybuilder/iparameter.php b/lib/public/db/querybuilder/iparameter.php index ef822a9c97f..be141cea9a7 100644 --- a/lib/public/db/querybuilder/iparameter.php +++ b/lib/public/db/querybuilder/iparameter.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/db/querybuilder/iquerybuilder.php b/lib/public/db/querybuilder/iquerybuilder.php index dd3ee7da5f5..c803f08a888 100644 --- a/lib/public/db/querybuilder/iquerybuilder.php +++ b/lib/public/db/querybuilder/iquerybuilder.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/db/querybuilder/iqueryfunction.php b/lib/public/db/querybuilder/iqueryfunction.php index 7051f2f38a3..8050bd295e4 100644 --- a/lib/public/db/querybuilder/iqueryfunction.php +++ b/lib/public/db/querybuilder/iqueryfunction.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/defaults.php b/lib/public/defaults.php index 723c6ecbb78..58b25d5914a 100644 --- a/lib/public/defaults.php +++ b/lib/public/defaults.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author scolebrook <scolebrook@mac.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/diagnostics/ievent.php b/lib/public/diagnostics/ievent.php index 733d5e4832c..a3e42ee137f 100644 --- a/lib/public/diagnostics/ievent.php +++ b/lib/public/diagnostics/ievent.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/diagnostics/ieventlogger.php b/lib/public/diagnostics/ieventlogger.php index c9b4653393b..34e521db10c 100644 --- a/lib/public/diagnostics/ieventlogger.php +++ b/lib/public/diagnostics/ieventlogger.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/diagnostics/iquery.php b/lib/public/diagnostics/iquery.php index 54853f733c9..3b4d1b4c965 100644 --- a/lib/public/diagnostics/iquery.php +++ b/lib/public/diagnostics/iquery.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/diagnostics/iquerylogger.php b/lib/public/diagnostics/iquerylogger.php index 4a6a0d0704b..285a85efde1 100644 --- a/lib/public/diagnostics/iquerylogger.php +++ b/lib/public/diagnostics/iquerylogger.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/encryption/exceptions/genericencryptionexception.php b/lib/public/encryption/exceptions/genericencryptionexception.php index c1041e81642..c1331689c7f 100644 --- a/lib/public/encryption/exceptions/genericencryptionexception.php +++ b/lib/public/encryption/exceptions/genericencryptionexception.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php index bb4dfdcdda8..426e4ddecce 100644 --- a/lib/public/encryption/iencryptionmodule.php +++ b/lib/public/encryption/iencryptionmodule.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/encryption/ifile.php b/lib/public/encryption/ifile.php index 0d1381238f0..9933cb0164e 100644 --- a/lib/public/encryption/ifile.php +++ b/lib/public/encryption/ifile.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/encryption/imanager.php b/lib/public/encryption/imanager.php index c963c19e660..b07de0cbb4f 100644 --- a/lib/public/encryption/imanager.php +++ b/lib/public/encryption/imanager.php @@ -4,7 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/encryption/keys/istorage.php b/lib/public/encryption/keys/istorage.php index e206373c46a..cfac4ba58f7 100644 --- a/lib/public/encryption/keys/istorage.php +++ b/lib/public/encryption/keys/istorage.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files.php b/lib/public/files.php index e3582375f38..f1b8a855194 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -10,7 +10,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/alreadyexistsexception.php b/lib/public/files/alreadyexistsexception.php index 2ff231c56f4..243129cb1db 100644 --- a/lib/public/files/alreadyexistsexception.php +++ b/lib/public/files/alreadyexistsexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/config/imountprovider.php b/lib/public/files/config/imountprovider.php index 8e21e4c8650..d1498fd5f61 100644 --- a/lib/public/files/config/imountprovider.php +++ b/lib/public/files/config/imountprovider.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/config/imountprovidercollection.php b/lib/public/files/config/imountprovidercollection.php index a458cbf3ce7..43b4bd0ce00 100644 --- a/lib/public/files/config/imountprovidercollection.php +++ b/lib/public/files/config/imountprovidercollection.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/entitytoolargeexception.php b/lib/public/files/entitytoolargeexception.php index 4dcfa77728b..8dabc08f8bb 100644 --- a/lib/public/files/entitytoolargeexception.php +++ b/lib/public/files/entitytoolargeexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/file.php b/lib/public/files/file.php index 839d646edb1..3acf24b9277 100644 --- a/lib/public/files/file.php +++ b/lib/public/files/file.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php index 1af13302af0..77e37d53ab9 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -3,10 +3,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/filenametoolongexception.php b/lib/public/files/filenametoolongexception.php index 61cb8a21fb6..68fba4ad516 100644 --- a/lib/public/files/filenametoolongexception.php +++ b/lib/public/files/filenametoolongexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/folder.php b/lib/public/files/folder.php index 533e490634f..0644ab62034 100644 --- a/lib/public/files/folder.php +++ b/lib/public/files/folder.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/forbiddenexception.php b/lib/public/files/forbiddenexception.php index 13490c6eae3..5a4f03d176d 100644 --- a/lib/public/files/forbiddenexception.php +++ b/lib/public/files/forbiddenexception.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/ihomestorage.php b/lib/public/files/ihomestorage.php index fc9b0357578..4101545aafe 100644 --- a/lib/public/files/ihomestorage.php +++ b/lib/public/files/ihomestorage.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/imimetypedetector.php b/lib/public/files/imimetypedetector.php index b2b80d4570c..7d9cd606e69 100644 --- a/lib/public/files/imimetypedetector.php +++ b/lib/public/files/imimetypedetector.php @@ -2,7 +2,7 @@ /** * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/imimetypeloader.php b/lib/public/files/imimetypeloader.php index 1ff8bc1b6c1..57a6d7ba309 100644 --- a/lib/public/files/imimetypeloader.php +++ b/lib/public/files/imimetypeloader.php @@ -1,8 +1,8 @@ <?php /** - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/invalidcharacterinpathexception.php b/lib/public/files/invalidcharacterinpathexception.php index 52e20dfcb46..8e649b5bb62 100644 --- a/lib/public/files/invalidcharacterinpathexception.php +++ b/lib/public/files/invalidcharacterinpathexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/invalidcontentexception.php b/lib/public/files/invalidcontentexception.php index 6aebf367241..f25b7fef87f 100644 --- a/lib/public/files/invalidcontentexception.php +++ b/lib/public/files/invalidcontentexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/invalidpathexception.php b/lib/public/files/invalidpathexception.php index e86d58bde7a..ee21d7432be 100644 --- a/lib/public/files/invalidpathexception.php +++ b/lib/public/files/invalidpathexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/irootfolder.php b/lib/public/files/irootfolder.php index 97dc5a31e74..3b6243f7638 100644 --- a/lib/public/files/irootfolder.php +++ b/lib/public/files/irootfolder.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/locknotacquiredexception.php b/lib/public/files/locknotacquiredexception.php index d078ff34818..247c9f5f5cb 100644 --- a/lib/public/files/locknotacquiredexception.php +++ b/lib/public/files/locknotacquiredexception.php @@ -4,7 +4,7 @@ * @author Owen Winkler <a_github@midnightcircus.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/mount/imountmanager.php b/lib/public/files/mount/imountmanager.php index 9a0362b12fb..9e3002a26d1 100644 --- a/lib/public/files/mount/imountmanager.php +++ b/lib/public/files/mount/imountmanager.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/mount/imountpoint.php b/lib/public/files/mount/imountpoint.php index 5452bcdb03a..9ce1396c1d1 100644 --- a/lib/public/files/mount/imountpoint.php +++ b/lib/public/files/mount/imountpoint.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/node.php b/lib/public/files/node.php index aa1115f8c28..ee3f0cb0413 100644 --- a/lib/public/files/node.php +++ b/lib/public/files/node.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/notenoughspaceexception.php b/lib/public/files/notenoughspaceexception.php index a2cc0d6956b..4e67ac26700 100644 --- a/lib/public/files/notenoughspaceexception.php +++ b/lib/public/files/notenoughspaceexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/notfoundexception.php b/lib/public/files/notfoundexception.php index ae93e8d1e6d..10a3dacda44 100644 --- a/lib/public/files/notfoundexception.php +++ b/lib/public/files/notfoundexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/notpermittedexception.php b/lib/public/files/notpermittedexception.php index ee82ae56e51..3dcbd9e499b 100644 --- a/lib/public/files/notpermittedexception.php +++ b/lib/public/files/notpermittedexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/objectstore/iobjectstore.php b/lib/public/files/objectstore/iobjectstore.php index 5943731849e..78be18fb2e9 100644 --- a/lib/public/files/objectstore/iobjectstore.php +++ b/lib/public/files/objectstore/iobjectstore.php @@ -3,7 +3,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/reservedwordexception.php b/lib/public/files/reservedwordexception.php index fc70c607185..6a560a563fe 100644 --- a/lib/public/files/reservedwordexception.php +++ b/lib/public/files/reservedwordexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php index c42a2d05bc3..f6f5081abaa 100644 --- a/lib/public/files/storage.php +++ b/lib/public/files/storage.php @@ -4,11 +4,11 @@ * @author Michael Roth <michael.roth@rz.uni-augsburg.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storage/istoragefactory.php b/lib/public/files/storage/istoragefactory.php index bd9651299cf..01a05eeff12 100644 --- a/lib/public/files/storage/istoragefactory.php +++ b/lib/public/files/storage/istoragefactory.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storageauthexception.php b/lib/public/files/storageauthexception.php index 6b49065038b..35a2907b856 100644 --- a/lib/public/files/storageauthexception.php +++ b/lib/public/files/storageauthexception.php @@ -1,8 +1,8 @@ <?php /** - * @author Jesus Macias <jesus@owncloud.com> + * @author Jesús Macias <jmacias@solidgear.es> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storagebadconfigexception.php b/lib/public/files/storagebadconfigexception.php index d72ad3358e5..1c340b18b7c 100644 --- a/lib/public/files/storagebadconfigexception.php +++ b/lib/public/files/storagebadconfigexception.php @@ -1,8 +1,8 @@ <?php /** - * @author Jesus Macias <jesus@owncloud.com> + * @author Jesús Macias <jmacias@solidgear.es> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storageconnectionexception.php b/lib/public/files/storageconnectionexception.php index c17367046e0..8938a60265c 100644 --- a/lib/public/files/storageconnectionexception.php +++ b/lib/public/files/storageconnectionexception.php @@ -1,8 +1,8 @@ <?php /** - * @author Jesus Macias <jesus@owncloud.com> + * @author Jesús Macias <jmacias@solidgear.es> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storageinvalidexception.php b/lib/public/files/storageinvalidexception.php index 11099c2fe03..a34ee7ae49a 100644 --- a/lib/public/files/storageinvalidexception.php +++ b/lib/public/files/storageinvalidexception.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storagenotavailableexception.php b/lib/public/files/storagenotavailableexception.php index 323f5d9b7f8..cb674cd663a 100644 --- a/lib/public/files/storagenotavailableexception.php +++ b/lib/public/files/storagenotavailableexception.php @@ -1,9 +1,11 @@ <?php /** + * @author Björn Schießle <schiessle@owncloud.com> + * @author Jesús Macias <jmacias@solidgear.es> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/files/storagetimeoutexception.php b/lib/public/files/storagetimeoutexception.php index c6682604b6d..ed4d98af89b 100644 --- a/lib/public/files/storagetimeoutexception.php +++ b/lib/public/files/storagetimeoutexception.php @@ -1,8 +1,8 @@ <?php /** - * @author Jesus Macias <jesus@owncloud.com> + * @author Jesús Macias <jmacias@solidgear.es> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/groupinterface.php b/lib/public/groupinterface.php index 16de6bc8663..dbadbfb0dcb 100644 --- a/lib/public/groupinterface.php +++ b/lib/public/groupinterface.php @@ -4,7 +4,7 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/http/client/iclient.php b/lib/public/http/client/iclient.php index 494ca7d419e..85db2a9ad02 100644 --- a/lib/public/http/client/iclient.php +++ b/lib/public/http/client/iclient.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/http/client/iclientservice.php b/lib/public/http/client/iclientservice.php index 14dfcc071b8..907aa42fd3b 100644 --- a/lib/public/http/client/iclientservice.php +++ b/lib/public/http/client/iclientservice.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/http/client/iresponse.php b/lib/public/http/client/iresponse.php index 18371ddbbe6..09189d77014 100644 --- a/lib/public/http/client/iresponse.php +++ b/lib/public/http/client/iresponse.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iaddressbook.php b/lib/public/iaddressbook.php index f3f60ab22d7..63e7e061448 100644 --- a/lib/public/iaddressbook.php +++ b/lib/public/iaddressbook.php @@ -2,10 +2,10 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php index d89ffd9194a..a4bcc970188 100644 --- a/lib/public/iappconfig.php +++ b/lib/public/iappconfig.php @@ -3,10 +3,10 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iavatar.php b/lib/public/iavatar.php index 3d92d00b83d..fc4058ab4f2 100644 --- a/lib/public/iavatar.php +++ b/lib/public/iavatar.php @@ -4,9 +4,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iavatarmanager.php b/lib/public/iavatarmanager.php index 5ad5bf6a364..264c4fcf051 100644 --- a/lib/public/iavatarmanager.php +++ b/lib/public/iavatarmanager.php @@ -3,9 +3,9 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/icache.php b/lib/public/icache.php index d7593a263c8..3319013ddfa 100644 --- a/lib/public/icache.php +++ b/lib/public/icache.php @@ -4,7 +4,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/icachefactory.php b/lib/public/icachefactory.php index a030b7fc5bc..233a4f5525d 100644 --- a/lib/public/icachefactory.php +++ b/lib/public/icachefactory.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/icertificate.php b/lib/public/icertificate.php index 73abc030934..c3a003fbf0a 100644 --- a/lib/public/icertificate.php +++ b/lib/public/icertificate.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/icertificatemanager.php b/lib/public/icertificatemanager.php index b1a16d8b5ee..27eebcf0491 100644 --- a/lib/public/icertificatemanager.php +++ b/lib/public/icertificatemanager.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -54,8 +54,18 @@ interface ICertificateManager { /** * Get the path to the certificate bundle for this user * + * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle (since 9.0.0) * @return string * @since 8.0.0 */ - public function getCertificateBundle(); + public function getCertificateBundle($uid = ''); + + /** + * Get the full local path to the certificate bundle for this user + * + * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle + * @return string + * @since 9.0.0 + */ + public function getAbsoluteBundlePath($uid = ''); } diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php index 933eef97ae1..8dac390a99c 100644 --- a/lib/public/iconfig.php +++ b/lib/public/iconfig.php @@ -8,7 +8,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php index 23c75aeaaf8..d23ee5ea3b5 100644 --- a/lib/public/icontainer.php +++ b/lib/public/icontainer.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/idatetimeformatter.php b/lib/public/idatetimeformatter.php index 77afd6930ce..e8d357ae50f 100644 --- a/lib/public/idatetimeformatter.php +++ b/lib/public/idatetimeformatter.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/idatetimezone.php b/lib/public/idatetimezone.php index 2334f1314b5..3df705a2413 100644 --- a/lib/public/idatetimezone.php +++ b/lib/public/idatetimezone.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/idb.php b/lib/public/idb.php index f3e7915d9f7..f21fedd1f54 100644 --- a/lib/public/idb.php +++ b/lib/public/idb.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php index 945ca142163..49856fb78a5 100644 --- a/lib/public/idbconnection.php +++ b/lib/public/idbconnection.php @@ -6,7 +6,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/ieventsource.php b/lib/public/ieventsource.php index 176d5677f0a..b643d1c9da7 100644 --- a/lib/public/ieventsource.php +++ b/lib/public/ieventsource.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/igroup.php b/lib/public/igroup.php index b16bb94d43f..02f2ef201fd 100644 --- a/lib/public/igroup.php +++ b/lib/public/igroup.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/igroupmanager.php b/lib/public/igroupmanager.php index da80cfdd374..5ec780e4471 100644 --- a/lib/public/igroupmanager.php +++ b/lib/public/igroupmanager.php @@ -5,8 +5,9 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/ihelper.php b/lib/public/ihelper.php index 45a078b6cbc..4ad1d5704fd 100644 --- a/lib/public/ihelper.php +++ b/lib/public/ihelper.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iimage.php b/lib/public/iimage.php index 38db14db77c..db0ca0f93be 100644 --- a/lib/public/iimage.php +++ b/lib/public/iimage.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Olivier Paroz <github@oparoz.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/il10n.php b/lib/public/il10n.php index 67a6c2162de..f1954eeb4b9 100644 --- a/lib/public/il10n.php +++ b/lib/public/il10n.php @@ -5,9 +5,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php index 27a5d63dfdb..368b25ab693 100644 --- a/lib/public/ilogger.php +++ b/lib/public/ilogger.php @@ -3,7 +3,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/image.php b/lib/public/image.php index ebcae80f8e8..4a7ffe8bc9a 100644 --- a/lib/public/image.php +++ b/lib/public/image.php @@ -4,7 +4,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/imemcache.php b/lib/public/imemcache.php index 01c29903039..b5c0cef923d 100644 --- a/lib/public/imemcache.php +++ b/lib/public/imemcache.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/imemcachettl.php b/lib/public/imemcachettl.php index 3c2bfe8ad27..f2d03dcdf40 100644 --- a/lib/public/imemcachettl.php +++ b/lib/public/imemcachettl.php @@ -1,8 +1,9 @@ <?php /** + * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/inavigationmanager.php b/lib/public/inavigationmanager.php index fe2a4cfee27..243f6ea3eea 100644 --- a/lib/public/inavigationmanager.php +++ b/lib/public/inavigationmanager.php @@ -6,7 +6,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/ipreview.php b/lib/public/ipreview.php index fc81da976b9..cfcbebd8639 100644 --- a/lib/public/ipreview.php +++ b/lib/public/ipreview.php @@ -5,7 +5,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/irequest.php b/lib/public/irequest.php index acfc4f3f1d0..a0040aa464d 100644 --- a/lib/public/irequest.php +++ b/lib/public/irequest.php @@ -7,7 +7,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -91,6 +91,7 @@ interface IRequest { * Returns all params that were received, be it from the request * * (as GET or POST) or through the URL by the route + * * @return array the array with all parameters * @since 6.0.0 */ @@ -136,6 +137,7 @@ interface IRequest { /** * Checks if the CSRF check was correct + * * @return bool true if CSRF check passed * @since 6.0.0 */ @@ -144,6 +146,7 @@ interface IRequest { /** * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging * If `mod_unique_id` is installed this value will be taken. + * * @return string * @since 8.1.0 */ @@ -154,6 +157,7 @@ interface IRequest { * and `forwarded_for_headers` has been configured then the IP address * specified in this header will be returned instead. * Do always use this instead of $_SERVER['REMOTE_ADDR'] + * * @return string IP address * @since 8.1.0 */ @@ -162,6 +166,7 @@ interface IRequest { /** * Returns the server protocol. It respects reverse proxy servers and load * balancers. + * * @return string Server protocol (http or https) * @since 8.1.0 */ @@ -176,15 +181,17 @@ interface IRequest { public function getHttpProtocol(); /** - * Returns the request uri, even if the website uses one or more - * reverse proxies - * @return string + * Returns the request uri, even if the website uses one or more + * reverse proxies + * + * @return string * @since 8.1.0 - */ + */ public function getRequestUri(); /** * Get raw PathInfo from request (not urldecoded) + * * @throws \Exception * @return string Path info * @since 8.1.0 @@ -193,6 +200,7 @@ interface IRequest { /** * Get PathInfo from request + * * @throws \Exception * @return string|false Path info or false when not found * @since 8.1.0 @@ -202,6 +210,7 @@ interface IRequest { /** * Returns the script name, even if the website uses one or more * reverse proxies + * * @return string the script name * @since 8.1.0 */ @@ -209,6 +218,7 @@ interface IRequest { /** * Checks whether the user agent matches a given regex + * * @param array $agent array of agent names * @return bool true if at least one of the given agent matches, false otherwise * @since 8.1.0 @@ -218,6 +228,7 @@ interface IRequest { /** * Returns the unverified server host from the headers without checking * whether it is a trusted domain + * * @return string Server host * @since 8.1.0 */ @@ -226,6 +237,7 @@ interface IRequest { /** * Returns the server host from the headers, or the first configured * trusted domain if the host isn't in the trusted list + * * @return string Server host * @since 8.1.0 */ diff --git a/lib/public/isearch.php b/lib/public/isearch.php index f7a9b5fb55c..ec6673dabbd 100644 --- a/lib/public/isearch.php +++ b/lib/public/isearch.php @@ -6,7 +6,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 267e5dc4d31..1976f59f613 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -1,5 +1,6 @@ <?php /** + * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Björn Schießle <schiessle@owncloud.com> @@ -9,12 +10,13 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> + * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -326,7 +328,7 @@ interface IServerContainer { /** * Get the certificate manager for the user * - * @param string $userId (optional) if not specified the current loggedin user is used + * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager * @return \OCP\ICertificateManager | null if $userId is null and no user is logged in * @since 8.0.0 */ diff --git a/lib/public/isession.php b/lib/public/isession.php index 89a181ad0fd..25c76906d63 100644 --- a/lib/public/isession.php +++ b/lib/public/isession.php @@ -1,10 +1,11 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/itagmanager.php b/lib/public/itagmanager.php index 5ed005548d3..e6d67ddd02c 100644 --- a/lib/public/itagmanager.php +++ b/lib/public/itagmanager.php @@ -5,7 +5,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/itags.php b/lib/public/itags.php index 12dbdc1522a..cbc178c37bf 100644 --- a/lib/public/itags.php +++ b/lib/public/itags.php @@ -5,7 +5,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/itempmanager.php b/lib/public/itempmanager.php index 73e21dd0aeb..025e43d8563 100644 --- a/lib/public/itempmanager.php +++ b/lib/public/itempmanager.php @@ -2,9 +2,9 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iurlgenerator.php b/lib/public/iurlgenerator.php index 3be27d87fa1..a702ca47bfc 100644 --- a/lib/public/iurlgenerator.php +++ b/lib/public/iurlgenerator.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iuser.php b/lib/public/iuser.php index 67e2b107e0b..06921a1ee23 100644 --- a/lib/public/iuser.php +++ b/lib/public/iuser.php @@ -5,7 +5,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iuserbackend.php b/lib/public/iuserbackend.php index 2c472596b77..5cd7945dd7a 100644 --- a/lib/public/iuserbackend.php +++ b/lib/public/iuserbackend.php @@ -2,7 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iusermanager.php b/lib/public/iusermanager.php index 3a0abaca7b7..057bd8e89fb 100644 --- a/lib/public/iusermanager.php +++ b/lib/public/iusermanager.php @@ -3,8 +3,9 @@ * @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> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/iusersession.php b/lib/public/iusersession.php index 2dde25634d6..2196f2c8ce0 100644 --- a/lib/public/iusersession.php +++ b/lib/public/iusersession.php @@ -7,7 +7,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/json.php b/lib/public/json.php index ddb94dffdbe..fceffa0001e 100644 --- a/lib/public/json.php +++ b/lib/public/json.php @@ -8,7 +8,7 @@ * @author Thomas Tanghus <thomas@tanghus.net> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/l10n/ifactory.php b/lib/public/l10n/ifactory.php index b784505a68b..fa3f84fa2fd 100644 --- a/lib/public/l10n/ifactory.php +++ b/lib/public/l10n/ifactory.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/lock/ilockingprovider.php b/lib/public/lock/ilockingprovider.php index f1aa7956033..b4b579bbc7a 100644 --- a/lib/public/lock/ilockingprovider.php +++ b/lib/public/lock/ilockingprovider.php @@ -3,7 +3,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/lock/lockedexception.php b/lib/public/lock/lockedexception.php index e7071339618..d084046046e 100644 --- a/lib/public/lock/lockedexception.php +++ b/lib/public/lock/lockedexception.php @@ -4,7 +4,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/mail/imailer.php b/lib/public/mail/imailer.php index ac3fe9b0e49..61eb895752b 100644 --- a/lib/public/mail/imailer.php +++ b/lib/public/mail/imailer.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/preconditionnotmetexception.php b/lib/public/preconditionnotmetexception.php index 6f1b683526d..212efc08ded 100644 --- a/lib/public/preconditionnotmetexception.php +++ b/lib/public/preconditionnotmetexception.php @@ -2,7 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/preview/iprovider.php b/lib/public/preview/iprovider.php index 821cdb32fa3..8231e90f000 100644 --- a/lib/public/preview/iprovider.php +++ b/lib/public/preview/iprovider.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/response.php b/lib/public/response.php index 953c797824c..ff0b4d8463a 100644 --- a/lib/public/response.php +++ b/lib/public/response.php @@ -9,7 +9,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/route/iroute.php b/lib/public/route/iroute.php index 4c9b4ca9b47..904cb81b0bd 100644 --- a/lib/public/route/iroute.php +++ b/lib/public/route/iroute.php @@ -3,9 +3,9 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/route/irouter.php b/lib/public/route/irouter.php index 63e7b9b6202..b4573fb39f2 100644 --- a/lib/public/route/irouter.php +++ b/lib/public/route/irouter.php @@ -2,10 +2,12 @@ /** * @author Bart Visscher <bartv@thisnet.nl> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/sabrepluginevent.php b/lib/public/sabrepluginevent.php index fed3237166d..b0c8257a4fb 100644 --- a/lib/public/sabrepluginevent.php +++ b/lib/public/sabrepluginevent.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -23,6 +23,7 @@ namespace OCP; use OCP\AppFramework\Http; +use Sabre\DAV\Server; use Symfony\Component\EventDispatcher\Event; /** @@ -36,12 +37,16 @@ class SabrePluginEvent extends Event { /** @var string */ protected $message; + /** @var Server */ + protected $server; + /** * @since 8.2.0 */ - public function __construct() { + public function __construct($server = null) { $this->message = ''; $this->statusCode = Http::STATUS_OK; + $this->server = $server; } /** @@ -79,4 +84,12 @@ class SabrePluginEvent extends Event { public function getMessage() { return $this->message; } + + /** + * @return null|Server + * @since 9.0.0 + */ + public function getServer() { + return $this->server; + } } diff --git a/lib/public/sabrepluginexception.php b/lib/public/sabrepluginexception.php index 5dba3b90a02..2c5a799c4f7 100644 --- a/lib/public/sabrepluginexception.php +++ b/lib/public/sabrepluginexception.php @@ -2,7 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/search/pagedprovider.php b/lib/public/search/pagedprovider.php index 7452bbd47bb..93289a1bde4 100644 --- a/lib/public/search/pagedprovider.php +++ b/lib/public/search/pagedprovider.php @@ -3,7 +3,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/search/provider.php b/lib/public/search/provider.php index 2f2cd03eb6a..9bcbe36ef7a 100644 --- a/lib/public/search/provider.php +++ b/lib/public/search/provider.php @@ -6,7 +6,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/search/result.php b/lib/public/search/result.php index 71c8b021a8e..e90c2619032 100644 --- a/lib/public/search/result.php +++ b/lib/public/search/result.php @@ -5,7 +5,7 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/security/icrypto.php b/lib/public/security/icrypto.php index 167baab8233..62f27017ab7 100644 --- a/lib/public/security/icrypto.php +++ b/lib/public/security/icrypto.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/security/ihasher.php b/lib/public/security/ihasher.php index 14229ba99c1..39ba5094b12 100644 --- a/lib/public/security/ihasher.php +++ b/lib/public/security/ihasher.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/security/isecurerandom.php b/lib/public/security/isecurerandom.php index 8315d0f971a..9b346afe680 100644 --- a/lib/public/security/isecurerandom.php +++ b/lib/public/security/isecurerandom.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/security/stringutils.php b/lib/public/security/stringutils.php index 7cf12ea2702..ff1e290315a 100644 --- a/lib/public/security/stringutils.php +++ b/lib/public/security/stringutils.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/share.php b/lib/public/share.php index 86d1ffc9be2..e21d82bf62c 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -8,12 +8,12 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Michael Kuhn <suraia@ikkoku.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Sam Tuke <mail@samtuke.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/share_backend.php b/lib/public/share_backend.php index 35ed650b173..110403c1f49 100644 --- a/lib/public/share_backend.php +++ b/lib/public/share_backend.php @@ -3,9 +3,9 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/share_backend_collection.php b/lib/public/share_backend_collection.php index 7378fd2a46d..185cf32ce3e 100644 --- a/lib/public/share_backend_collection.php +++ b/lib/public/share_backend_collection.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/share_backend_file_dependent.php b/lib/public/share_backend_file_dependent.php index b95e0bd84d2..64b3bf43319 100644 --- a/lib/public/share_backend_file_dependent.php +++ b/lib/public/share_backend_file_dependent.php @@ -3,7 +3,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/systemtag/isystemtag.php b/lib/public/systemtag/isystemtag.php index 26609fd8af7..02d02037293 100644 --- a/lib/public/systemtag/isystemtag.php +++ b/lib/public/systemtag/isystemtag.php @@ -2,7 +2,7 @@ /** * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/systemtag/isystemtagmanager.php b/lib/public/systemtag/isystemtagmanager.php index 6e8fed36dce..983bfd636ce 100644 --- a/lib/public/systemtag/isystemtagmanager.php +++ b/lib/public/systemtag/isystemtagmanager.php @@ -1,8 +1,9 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/systemtag/isystemtagobjectmapper.php b/lib/public/systemtag/isystemtagobjectmapper.php index e2ac1fab124..8db5cdd31aa 100644 --- a/lib/public/systemtag/isystemtagobjectmapper.php +++ b/lib/public/systemtag/isystemtagobjectmapper.php @@ -1,8 +1,9 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/systemtag/tagalreadyexistsexception.php b/lib/public/systemtag/tagalreadyexistsexception.php index d192b38e7bc..5c3d86ad642 100644 --- a/lib/public/systemtag/tagalreadyexistsexception.php +++ b/lib/public/systemtag/tagalreadyexistsexception.php @@ -2,7 +2,7 @@ /** * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/systemtag/tagnotfoundexception.php b/lib/public/systemtag/tagnotfoundexception.php index d0a35eb59e9..12feda8f58a 100644 --- a/lib/public/systemtag/tagnotfoundexception.php +++ b/lib/public/systemtag/tagnotfoundexception.php @@ -1,8 +1,9 @@ <?php /** + * @author Joas Schilling <nickvergessen@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/template.php b/lib/public/template.php index b308240306d..35b2c26b3a0 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -7,11 +7,11 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/user.php b/lib/public/user.php index 23f77c0a35f..825e77aef6d 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -8,10 +8,10 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/userinterface.php b/lib/public/userinterface.php index cf91e519813..22f8d02c4f1 100644 --- a/lib/public/userinterface.php +++ b/lib/public/userinterface.php @@ -4,7 +4,7 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/util.php b/lib/public/util.php index 55bbd01eeaf..4762f595c2d 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -6,7 +6,6 @@ * @author Frank Karlitschek <frank@owncloud.org> * @author Georg Ehrke <georg@owncloud.com> * @author Individual IT Services <info@individual-it.net> - * @author itheiss <ingo.theiss@i-matrixx.de> * @author Jens-Christian Fischer <jens-christian.fischer@switch.ch> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> @@ -16,14 +15,15 @@ * @author Pellaeon Lin <nfsmwlin@gmail.com> * @author Randolph Carter <RandolphCarter@fantasymail.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Tanghus <thomas@tanghus.net> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/ocs/providers.php b/ocs/providers.php index f82c20eba63..7a94f65975a 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -3,10 +3,9 @@ * @author Frank Karlitschek <frank@owncloud.org> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/ocs/routes.php b/ocs/routes.php index 4aaa1434b8b..b99aa5c7597 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -4,11 +4,11 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/ocs/v1.php b/ocs/v1.php index 0aaa5d228da..4371b0b604a 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -8,7 +8,7 @@ * @author Tom Needham <tom@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/ocs/v2.php b/ocs/v2.php index b2e3b259727..a9fffe529b0 100644 --- a/ocs/v2.php +++ b/ocs/v2.php @@ -2,7 +2,7 @@ /** * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/public.php b/public.php index aac3c3e517b..65257f1a46e 100644 --- a/public.php +++ b/public.php @@ -8,7 +8,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/remote.php b/remote.php index 0282877ca2a..a145fc4bd84 100644 --- a/remote.php +++ b/remote.php @@ -5,11 +5,11 @@ * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/admin.php b/settings/admin.php index d484d6a1e48..2364fb3aae0 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -1,6 +1,5 @@ <?php /** - * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Frank Karlitschek <frank@owncloud.org> @@ -13,7 +12,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -38,6 +37,10 @@ OC_Util::checkAdminUser(); $template = new OC_Template('settings', 'admin', 'user'); $l = \OC::$server->getL10N('settings'); +OC_Util::addScript('settings', 'certificates'); +OC_Util::addScript('files', 'jquery.iframe-transport'); +OC_Util::addScript('files', 'jquery.fileupload'); + $showLog = (\OC::$server->getConfig()->getSystemValue('log_type', 'owncloud') === 'owncloud'); $numEntriesToLoad = 3; $entries = OC_Log_Owncloud::getEntries($numEntriesToLoad + 1); @@ -52,6 +55,8 @@ if($doesLogFileExist) { $config = \OC::$server->getConfig(); $appConfig = \OC::$server->getAppConfig(); $request = \OC::$server->getRequest(); +$certificateManager = \OC::$server->getCertificateManager(null); +$urlGenerator = \OC::$server->getURLGenerator(); // Should we display sendmail as an option? $template->assign('sendmail_is_available', (bool) \OC_Helper::findBinaryPath('sendmail')); @@ -75,6 +80,7 @@ $template->assign('showLog', $showLog); $template->assign('readOnlyConfigEnabled', OC_Helper::isReadOnlyConfigEnabled()); $template->assign('isLocaleWorking', OC_Util::isSetLocaleWorking()); $template->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking()); +$template->assign('checkForWorkingWellKnownSetup', $config->getSystemValue('check_for_working_wellknown_setup', true)); $template->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $template->assign('backgroundjobs_mode', $appConfig->getValue('core', 'backgroundjobs_mode', 'ajax')); $template->assign('cron_log', $config->getSystemValue('cron_log', true)); @@ -151,6 +157,16 @@ $template->assign('OutdatedCacheWarning', $outdatedCaches); // add hardcoded forms from the template $forms = OC_App::getForms('admin'); + +if ($config->getSystemValue('enable_certificate_management', false)) { + $certificatesTemplate = new OC_Template('settings', 'certificates'); + $certificatesTemplate->assign('type', 'admin'); + $certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addSystemRootCertificate'); + $certificatesTemplate->assign('certs', $certificateManager->listCertificates()); + $certificatesTemplate->assign('urlGenerator', $urlGenerator); + $forms[] = $certificatesTemplate->fetchPage(); +} + $formsAndMore = array(); if ($request->getServerProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() || $suggestedOverwriteCliUrl || !OC_Util::isSetLocaleWorking() || diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php index f99969d91a4..5d86168287b 100644 --- a/settings/ajax/disableapp.php +++ b/settings/ajax/disableapp.php @@ -4,7 +4,7 @@ * @author Kamil Domanski <kdomanski@kdemail.net> * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php index 581a205d6ff..57b6e919995 100644 --- a/settings/ajax/enableapp.php +++ b/settings/ajax/enableapp.php @@ -8,7 +8,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/installapp.php b/settings/ajax/installapp.php index d5b1b85ecf4..96f5ad9d91c 100644 --- a/settings/ajax/installapp.php +++ b/settings/ajax/installapp.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php index be410b874ee..61ec93a79b5 100644 --- a/settings/ajax/navigationdetect.php +++ b/settings/ajax/navigationdetect.php @@ -1,9 +1,9 @@ <?php /** * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php index 158f73c230a..760d2ca5d7d 100644 --- a/settings/ajax/setlanguage.php +++ b/settings/ajax/setlanguage.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index 8e6d44c2d8d..dbdfb98bc8c 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -10,7 +10,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index f46fa356549..8cf51ab707f 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -8,7 +8,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php index 6d6bf6d6724..afeaa1acfa0 100644 --- a/settings/ajax/togglesubadmins.php +++ b/settings/ajax/togglesubadmins.php @@ -3,9 +3,8 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Georg Ehrke <georg@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php index 82e176abc17..7ff20a1c999 100644 --- a/settings/ajax/uninstallapp.php +++ b/settings/ajax/uninstallapp.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index 5fc88290c91..8521914884f 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/application.php b/settings/application.php index 729e61b5925..6b581cdc06e 100644 --- a/settings/application.php +++ b/settings/application.php @@ -5,9 +5,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -107,6 +108,7 @@ class Application extends App { $c->query('AppName'), $c->query('Request'), $c->query('CertificateManager'), + $c->query('SystemCertificateManager'), $c->query('L10N'), $c->query('IAppManager') ); @@ -243,6 +245,9 @@ class Application extends App { $container->registerService('CertificateManager', function(IContainer $c){ return $c->query('ServerContainer')->getCertificateManager(); }); + $container->registerService('SystemCertificateManager', function (IContainer $c) { + return $c->query('ServerContainer')->getCertificateManager(null); + }); $container->registerService('Checker', function(IContainer $c) { /** @var Server $server */ $server = $c->query('ServerContainer'); diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php index f5b9bd58b59..bfa599c1d04 100644 --- a/settings/changepassword/controller.php +++ b/settings/changepassword/controller.php @@ -1,16 +1,18 @@ <?php /** + * @author Arthur Schiwon <blizzz@owncloud.com> * @author Björn Schießle <schiessle@owncloud.com> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Clark Tomlinson <fallen013@gmail.com> * @author cmeh <cmeh@users.noreply.github.com> * @author Florin Peter <github@florin-peter.de> * @author Jakob Sack <mail@jakobsack.de> + * @author Lukas Reschke <lukas@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * @author Sam Tuke <mail@samtuke.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index 79b7589027b..cc69d3130d9 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -5,7 +5,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php index e360a1053c3..6f24a69b19b 100644 --- a/settings/controller/certificatecontroller.php +++ b/settings/controller/certificatecontroller.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -36,7 +36,9 @@ use OCP\IRequest; */ class CertificateController extends Controller { /** @var ICertificateManager */ - private $certificateManager; + private $userCertificateManager; + /** @var ICertificateManager */ + private $systemCertificateManager; /** @var IL10N */ private $l10n; /** @var IAppManager */ @@ -45,17 +47,20 @@ class CertificateController extends Controller { /** * @param string $appName * @param IRequest $request - * @param ICertificateManager $certificateManager + * @param ICertificateManager $userCertificateManager + * @param ICertificateManager $systemCertificateManager * @param IL10N $l10n * @param IAppManager $appManager */ public function __construct($appName, IRequest $request, - ICertificateManager $certificateManager, + ICertificateManager $userCertificateManager, + ICertificateManager $systemCertificateManager, IL10N $l10n, IAppManager $appManager) { parent::__construct($appName, $request); - $this->certificateManager = $certificateManager; + $this->userCertificateManager = $userCertificateManager; + $this->systemCertificateManager = $systemCertificateManager; $this->l10n = $l10n; $this->appManager = $appManager; } @@ -68,6 +73,16 @@ class CertificateController extends Controller { * @return array */ public function addPersonalRootCertificate() { + return $this->addCertificate($this->userCertificateManager); + } + + /** + * Add a new root certificate to a trust store + * + * @param ICertificateManager $certificateManager + * @return array + */ + private function addCertificate(ICertificateManager $certificateManager) { $headers = []; if ($this->request->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE_8])) { // due to upload iframe workaround, need to set content-type to text/plain @@ -79,23 +94,23 @@ class CertificateController extends Controller { } $file = $this->request->getUploadedFile('rootcert_import'); - if(empty($file)) { + if (empty($file)) { return new DataResponse(['message' => 'No file uploaded'], Http::STATUS_UNPROCESSABLE_ENTITY, $headers); } try { - $certificate = $this->certificateManager->addCertificate(file_get_contents($file['tmp_name']), $file['name']); + $certificate = $certificateManager->addCertificate(file_get_contents($file['tmp_name']), $file['name']); return new DataResponse( [ - 'name' => $certificate->getName(), - 'commonName' => $certificate->getCommonName(), - 'organization' => $certificate->getOrganization(), - 'validFrom' => $certificate->getIssueDate()->getTimestamp(), - 'validTill' => $certificate->getExpireDate()->getTimestamp(), - 'validFromString' => $this->l10n->l('date', $certificate->getIssueDate()), - 'validTillString' => $this->l10n->l('date', $certificate->getExpireDate()), - 'issuer' => $certificate->getIssuerName(), - 'issuerOrganization' => $certificate->getIssuerOrganization(), + 'name' => $certificate->getName(), + 'commonName' => $certificate->getCommonName(), + 'organization' => $certificate->getOrganization(), + 'validFrom' => $certificate->getIssueDate()->getTimestamp(), + 'validTill' => $certificate->getExpireDate()->getTimestamp(), + 'validFromString' => $this->l10n->l('date', $certificate->getIssueDate()), + 'validTillString' => $this->l10n->l('date', $certificate->getExpireDate()), + 'issuer' => $certificate->getIssuerName(), + 'issuerOrganization' => $certificate->getIssuerOrganization(), ], Http::STATUS_OK, $headers @@ -119,7 +134,7 @@ class CertificateController extends Controller { return new DataResponse('Individual certificate management disabled', Http::STATUS_FORBIDDEN); } - $this->certificateManager->removeCertificate($certificateIdentifier); + $this->userCertificateManager->removeCertificate($certificateIdentifier); return new DataResponse(); } @@ -140,4 +155,28 @@ class CertificateController extends Controller { return false; } + /** + * Add a new personal root certificate to the system's trust store + * + * @return array + */ + public function addSystemRootCertificate() { + return $this->addCertificate($this->systemCertificateManager); + } + + /** + * Removes a personal root certificate from the users' trust store + * + * @param string $certificateIdentifier + * @return DataResponse + */ + public function removeSystemRootCertificate($certificateIdentifier) { + + if ($this->isCertificateImportAllowed() === false) { + return new DataResponse('Individual certificate management disabled', Http::STATUS_FORBIDDEN); + } + + $this->systemCertificateManager->removeCertificate($certificateIdentifier); + return new DataResponse(); + } } diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php index 5a77049479d..7b995bf2c1b 100644 --- a/settings/controller/checksetupcontroller.php +++ b/settings/controller/checksetupcontroller.php @@ -3,10 +3,10 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/encryptioncontroller.php b/settings/controller/encryptioncontroller.php index b3515f962f4..504448a5a2c 100644 --- a/settings/controller/encryptioncontroller.php +++ b/settings/controller/encryptioncontroller.php @@ -3,7 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/groupscontroller.php b/settings/controller/groupscontroller.php index 93dcc7358a9..bb8e6755d41 100644 --- a/settings/controller/groupscontroller.php +++ b/settings/controller/groupscontroller.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/logsettingscontroller.php b/settings/controller/logsettingscontroller.php index cae0d419e2b..c0c9ee04ca3 100644 --- a/settings/controller/logsettingscontroller.php +++ b/settings/controller/logsettingscontroller.php @@ -4,7 +4,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/mailsettingscontroller.php b/settings/controller/mailsettingscontroller.php index 885c19a919b..dbba4bd9bc0 100644 --- a/settings/controller/mailsettingscontroller.php +++ b/settings/controller/mailsettingscontroller.php @@ -4,7 +4,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/securitysettingscontroller.php b/settings/controller/securitysettingscontroller.php index dbc81c2dffb..d7274d6bcb2 100644 --- a/settings/controller/securitysettingscontroller.php +++ b/settings/controller/securitysettingscontroller.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php index 8ad975fd664..695d72cfb5a 100644 --- a/settings/controller/userscontroller.php +++ b/settings/controller/userscontroller.php @@ -6,8 +6,9 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/help.php b/settings/help.php index 848ce06cf49..ce942d6ae80 100644 --- a/settings/help.php +++ b/settings/help.php @@ -8,8 +8,9 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/js/admin.js b/settings/js/admin.js index 48dfdc88246..6660bfe9b48 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -168,8 +168,8 @@ $(document).ready(function(){ // run setup checks then gather error messages $.when( OC.SetupChecks.checkWebDAV(), - OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl), - OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl), + OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), + OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), OC.SetupChecks.checkSetup(), OC.SetupChecks.checkGeneric() ).then(function(check1, check2, check3, check4, check5) { diff --git a/settings/js/certificates.js b/settings/js/certificates.js new file mode 100644 index 00000000000..9ce9f9aa8d8 --- /dev/null +++ b/settings/js/certificates.js @@ -0,0 +1,69 @@ +$(document).ready(function () { + var type = $('#sslCertificate').data('type'); + $('#sslCertificate').on('click', 'td.remove', function () { + var row = $(this).parent(); + $.ajax(OC.generateUrl('settings/' + type + '/certificate/{certificate}', {certificate: row.data('name')}), { + type: 'DELETE' + }); + row.remove(); + + if ($('#sslCertificate > tbody > tr').length === 0) { + $('#sslCertificate').hide(); + } + return true; + }); + + $('#sslCertificate tr > td').tipsy({gravity: 'n', live: true}); + + $('#rootcert_import').fileupload({ + submit: function (e, data) { + data.formData = _.extend(data.formData || {}, { + requesttoken: OC.requestToken + }); + }, + success: function (data) { + if (typeof data === 'string') { + data = $.parseJSON(data); + } else if (data && data.length) { + // fetch response from iframe + data = $.parseJSON(data[0].body.innerText); + } + if (!data || typeof(data) === 'string') { + // IE8 iframe workaround comes here instead of fail() + OC.Notification.showTemporary( + t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.')); + return; + } + var issueDate = new Date(data.validFrom * 1000); + var expireDate = new Date(data.validTill * 1000); + var now = new Date(); + var isExpired = !(issueDate <= now && now <= expireDate); + + var row = $('<tr/>'); + row.data('name', data.name); + row.addClass(isExpired ? 'expired' : 'valid'); + row.append($('<td/>').attr('title', data.organization).text(data.commonName)); + row.append($('<td/>').attr('title', t('core,', 'Valid until {date}', {date: data.validTillString})) + .text(data.validTillString)); + row.append($('<td/>').attr('title', data.issuerOrganization).text(data.issuer)); + row.append($('<td/>').addClass('remove').append( + $('<img/>').attr({ + alt: t('core', 'Delete'), + title: t('core', 'Delete'), + src: OC.imagePath('core', 'actions/delete.svg') + }).addClass('action') + )); + + $('#sslCertificate tbody').append(row); + $('#sslCertificate').show(); + }, + fail: function () { + OC.Notification.showTemporary( + t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.')); + } + }); + + if ($('#sslCertificate > tbody > tr').length === 0) { + $('#sslCertificate').hide(); + } +}); diff --git a/settings/js/personal.js b/settings/js/personal.js index da74f28d70c..3e1a0d7497b 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -339,73 +339,6 @@ $(document).ready(function () { } }); - $('#sslCertificate').on('click', 'td.remove > img', function () { - var row = $(this).parent().parent(); - $.ajax(OC.generateUrl('settings/personal/certificate/{certificate}', {certificate: row.data('name')}), { - type: 'DELETE' - }); - row.remove(); - - if ($('#sslCertificate > tbody > tr').length === 0) { - $('#sslCertificate').hide(); - } - return true; - }); - - $('#sslCertificate tr > td').tipsy({gravity: 'n', live: true}); - - $('#rootcert_import').fileupload({ - submit: function(e, data) { - data.formData = _.extend(data.formData || {}, { - requesttoken: OC.requestToken - }); - }, - success: function (data) { - if (typeof data === 'string') { - data = $.parseJSON(data); - } else if (data && data.length) { - // fetch response from iframe - data = $.parseJSON(data[0].body.innerText); - } - if (!data || typeof(data) === 'string') { - // IE8 iframe workaround comes here instead of fail() - OC.Notification.showTemporary( - t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.')); - return; - } - var issueDate = new Date(data.validFrom * 1000); - var expireDate = new Date(data.validTill * 1000); - var now = new Date(); - var isExpired = !(issueDate <= now && now <= expireDate); - - var row = $('<tr/>'); - row.data('name', data.name); - row.addClass(isExpired? 'expired': 'valid'); - row.append($('<td/>').attr('title', data.organization).text(data.commonName)); - row.append($('<td/>').attr('title', t('core,', 'Valid until {date}', {date: data.validTillString})) - .text(data.validTillString)); - row.append($('<td/>').attr('title', data.issuerOrganization).text(data.issuer)); - row.append($('<td/>').addClass('remove').append( - $('<img/>').attr({ - alt: t('core', 'Delete'), - title: t('core', 'Delete'), - src: OC.imagePath('core', 'actions/delete.svg') - }).addClass('action') - )); - - $('#sslCertificate tbody').append(row); - $('#sslCertificate').show(); - }, - fail: function () { - OC.Notification.showTemporary( - t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.')); - } - }); - - if ($('#sslCertificate > tbody > tr').length === 0) { - $('#sslCertificate').hide(); - } - // Load the big avatar if (oc_config.enable_avatars) { $('#avatar .avatardiv').avatar(OC.currentUser, 145); diff --git a/settings/js/users/users.js b/settings/js/users/users.js index aea94053572..151ab6cdecc 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -259,6 +259,10 @@ var UserList = { } }, doSort: function() { + // some browsers like Chrome lose the scrolling information + // when messing with the list elements + var lastScrollTop = this.scrollArea.scrollTop(); + var lastScrollLeft = this.scrollArea.scrollLeft(); var rows = $userListBody.find('tr').get(); rows.sort(function(a, b) { @@ -284,6 +288,8 @@ var UserList = { if(items.length > 0) { $userListBody.append(items); } + this.scrollArea.scrollTop(lastScrollTop); + this.scrollArea.scrollLeft(lastScrollLeft); }, checkUsersToLoad: function() { //30 shall be loaded initially, from then on always 10 upon scrolling @@ -605,10 +611,11 @@ $(document).ready(function () { // Implements User Search OCA.Search.users= new UserManagementFilter(UserList, GroupList); + UserList.scrollArea = $('#app-content'); + UserList.doSort(); UserList.availableGroups = $userList.data('groups'); - UserList.scrollArea = $('#app-content'); UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);}); $userList.after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>')); diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js index 365d7071ac0..75de904bfba 100644 --- a/settings/l10n/ar.js +++ b/settings/l10n/ar.js @@ -36,12 +36,12 @@ OC.L10N.register( "Updated" : "تم التحديث بنجاح", "Uninstalling ...." : "جاري إلغاء التثبيت ...", "Uninstall" : "ألغاء التثبيت", + "Delete" : "إلغاء", "Select a profile picture" : "اختر صورة الملف الشخصي ", "Very weak password" : "كلمة السر ضعيفة جدا", "Weak password" : "كلمة السر ضعيفة", "Good password" : "كلمة السر جيدة", "Strong password" : "كلمة السر قوية", - "Delete" : "إلغاء", "Groups" : "مجموعات", "undo" : "تراجع", "never" : "بتاتا", @@ -79,6 +79,7 @@ OC.L10N.register( "by" : "من قبل", "Documentation:" : "التوثيق", "Uninstall App" : "أزالة تطبيق", + "Valid until" : "صالح حتى", "Forum" : "منتدى", "Profile picture" : "صورة الملف الشخصي", "Upload new" : "رفع الان", @@ -95,7 +96,6 @@ OC.L10N.register( "Help translate" : "ساعد في الترجمه", "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك", "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد", - "Valid until" : "صالح حتى", "Username" : "إسم المستخدم", "Create" : "انشئ", "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول", diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json index 4b6cb8de18e..b3fc82affe1 100644 --- a/settings/l10n/ar.json +++ b/settings/l10n/ar.json @@ -34,12 +34,12 @@ "Updated" : "تم التحديث بنجاح", "Uninstalling ...." : "جاري إلغاء التثبيت ...", "Uninstall" : "ألغاء التثبيت", + "Delete" : "إلغاء", "Select a profile picture" : "اختر صورة الملف الشخصي ", "Very weak password" : "كلمة السر ضعيفة جدا", "Weak password" : "كلمة السر ضعيفة", "Good password" : "كلمة السر جيدة", "Strong password" : "كلمة السر قوية", - "Delete" : "إلغاء", "Groups" : "مجموعات", "undo" : "تراجع", "never" : "بتاتا", @@ -77,6 +77,7 @@ "by" : "من قبل", "Documentation:" : "التوثيق", "Uninstall App" : "أزالة تطبيق", + "Valid until" : "صالح حتى", "Forum" : "منتدى", "Profile picture" : "صورة الملف الشخصي", "Upload new" : "رفع الان", @@ -93,7 +94,6 @@ "Help translate" : "ساعد في الترجمه", "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك", "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد", - "Valid until" : "صالح حتى", "Username" : "إسم المستخدم", "Create" : "انشئ", "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول", diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js index c6e12686813..e9fc42e346a 100644 --- a/settings/l10n/ast.js +++ b/settings/l10n/ast.js @@ -43,14 +43,14 @@ OC.L10N.register( "Uninstalling ...." : "Desinstalando ...", "Error while uninstalling app" : "Fallu mientres se desinstalaba l'aplicación", "Uninstall" : "Desinstalar", + "Valid until {date}" : "Válidu fasta {date}", + "Delete" : "Desaniciar", "Select a profile picture" : "Esbillar una imaxe de perfil", "Very weak password" : "Contraseña mui feble", "Weak password" : "Contraseña feble", "So-so password" : "Contraseña pasable", "Good password" : "Contraseña bona", "Strong password" : "Contraseña mui bona", - "Valid until {date}" : "Válidu fasta {date}", - "Delete" : "Desaniciar", "Groups" : "Grupos", "Unable to delete {objName}" : "Nun pue desaniciase {objName}", "Error creating group" : "Fallu creando grupu", @@ -65,7 +65,6 @@ OC.L10N.register( "Error creating user" : "Fallu al crear usuariu", "A valid password must be provided" : "Tien d'apurrise una contraseña válida", "__language_name__" : "Asturianu", - "SSL root certificates" : "Certificaos raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)", "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales", "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales", diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json index 45e4164dc31..b04562fd71c 100644 --- a/settings/l10n/ast.json +++ b/settings/l10n/ast.json @@ -41,14 +41,14 @@ "Uninstalling ...." : "Desinstalando ...", "Error while uninstalling app" : "Fallu mientres se desinstalaba l'aplicación", "Uninstall" : "Desinstalar", + "Valid until {date}" : "Válidu fasta {date}", + "Delete" : "Desaniciar", "Select a profile picture" : "Esbillar una imaxe de perfil", "Very weak password" : "Contraseña mui feble", "Weak password" : "Contraseña feble", "So-so password" : "Contraseña pasable", "Good password" : "Contraseña bona", "Strong password" : "Contraseña mui bona", - "Valid until {date}" : "Válidu fasta {date}", - "Delete" : "Desaniciar", "Groups" : "Grupos", "Unable to delete {objName}" : "Nun pue desaniciase {objName}", "Error creating group" : "Fallu creando grupu", @@ -63,7 +63,6 @@ "Error creating user" : "Fallu al crear usuariu", "A valid password must be provided" : "Tien d'apurrise una contraseña válida", "__language_name__" : "Asturianu", - "SSL root certificates" : "Certificaos raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)", "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales", "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales", diff --git a/settings/l10n/az.js b/settings/l10n/az.js index c869ea9d212..bd504caca9e 100644 --- a/settings/l10n/az.js +++ b/settings/l10n/az.js @@ -61,14 +61,14 @@ OC.L10N.register( "Uninstalling ...." : "Silinir...", "Error while uninstalling app" : "Proqram təminatını sildikdə səhv baş verdi", "Uninstall" : "Sil", + "Valid until {date}" : "Müddətədək keçərlidir {date}", + "Delete" : "Sil", "Select a profile picture" : "Profil üçün şəkli seç", "Very weak password" : "Çox asan şifrə", "Weak password" : "Asan şifrə", "So-so password" : "Elə-belə şifrə", "Good password" : "Yaxşı şifrə", "Strong password" : "Çətin şifrə", - "Valid until {date}" : "Müddətədək keçərlidir {date}", - "Delete" : "Sil", "Groups" : "Qruplar", "Unable to delete {objName}" : "{objName} silmək olmur", "Error creating group" : "Qrup yaranmasında səhv baş verdi", @@ -87,7 +87,6 @@ OC.L10N.register( "__language_name__" : "__AZ_Azerbaijan__", "Personal info" : "Şəxsi məlumat", "Sync clients" : "Müştəriləri sinxronizasiya et", - "SSL root certificates" : "SSL root sertifikatları", "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)", "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr", "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr", @@ -163,6 +162,11 @@ OC.L10N.register( "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu proqram yüklənə bilməz ona görə ki, göstərilən asılılıqlar yerinə yetirilməyib:", "Enable only for specific groups" : "Yalnız spesifik qruplara izin ver", "Uninstall App" : "Proqram təminatını sil", + "Common Name" : "Ümumi ad", + "Valid until" : "Vaxtadək keçərlidir", + "Issued By" : "Tərəfindən yaradılıb", + "Valid until %s" : "Keçərlidir vaxtadək %s", + "Import root certificate" : "root sertifikatı import et", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ey ora,<br><br>ancaq deyirik ki, sizin artiq %s hesabınız var.<br><br>Sizin istifadəçi adınız: %s<br>Yetkilidir: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Şərəfə!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ey ora,\n\nancaq deyirik ki, sizin artiq %s hesabınız var.\n\nizin istifadəçi adınız: %s\nYetkilidir: %s\n\n", @@ -190,11 +194,6 @@ OC.L10N.register( "iOS app" : "iOS proqramı", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Əgər siz proektə dəstək vermək istəyirsinizsə\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">Təkmilləşdirməyə üzv</a>\n\t\tyada\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">söz yaymaq</a>!", "Show First Run Wizard again" : "İlk işəsalma sehirbazını yenidən göstər", - "Common Name" : "Ümumi ad", - "Valid until" : "Vaxtadək keçərlidir", - "Issued By" : "Tərəfindən yaradılıb", - "Valid until %s" : "Keçərlidir vaxtadək %s", - "Import root certificate" : "root sertifikatı import et", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Tərəfindən yaradılıb{communityopen}ownCloud cəmiyyəti{linkclose}, {githubopen}mənbə kodları{linkclose} altında lisenziya edilib {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Depo ünvanını göstər", "Show last log in" : "Son girişi göstər", diff --git a/settings/l10n/az.json b/settings/l10n/az.json index 5f59737c1f7..b1074fced70 100644 --- a/settings/l10n/az.json +++ b/settings/l10n/az.json @@ -59,14 +59,14 @@ "Uninstalling ...." : "Silinir...", "Error while uninstalling app" : "Proqram təminatını sildikdə səhv baş verdi", "Uninstall" : "Sil", + "Valid until {date}" : "Müddətədək keçərlidir {date}", + "Delete" : "Sil", "Select a profile picture" : "Profil üçün şəkli seç", "Very weak password" : "Çox asan şifrə", "Weak password" : "Asan şifrə", "So-so password" : "Elə-belə şifrə", "Good password" : "Yaxşı şifrə", "Strong password" : "Çətin şifrə", - "Valid until {date}" : "Müddətədək keçərlidir {date}", - "Delete" : "Sil", "Groups" : "Qruplar", "Unable to delete {objName}" : "{objName} silmək olmur", "Error creating group" : "Qrup yaranmasında səhv baş verdi", @@ -85,7 +85,6 @@ "__language_name__" : "__AZ_Azerbaijan__", "Personal info" : "Şəxsi məlumat", "Sync clients" : "Müştəriləri sinxronizasiya et", - "SSL root certificates" : "SSL root sertifikatları", "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)", "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr", "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr", @@ -161,6 +160,11 @@ "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu proqram yüklənə bilməz ona görə ki, göstərilən asılılıqlar yerinə yetirilməyib:", "Enable only for specific groups" : "Yalnız spesifik qruplara izin ver", "Uninstall App" : "Proqram təminatını sil", + "Common Name" : "Ümumi ad", + "Valid until" : "Vaxtadək keçərlidir", + "Issued By" : "Tərəfindən yaradılıb", + "Valid until %s" : "Keçərlidir vaxtadək %s", + "Import root certificate" : "root sertifikatı import et", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ey ora,<br><br>ancaq deyirik ki, sizin artiq %s hesabınız var.<br><br>Sizin istifadəçi adınız: %s<br>Yetkilidir: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Şərəfə!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ey ora,\n\nancaq deyirik ki, sizin artiq %s hesabınız var.\n\nizin istifadəçi adınız: %s\nYetkilidir: %s\n\n", @@ -188,11 +192,6 @@ "iOS app" : "iOS proqramı", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Əgər siz proektə dəstək vermək istəyirsinizsə\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">Təkmilləşdirməyə üzv</a>\n\t\tyada\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">söz yaymaq</a>!", "Show First Run Wizard again" : "İlk işəsalma sehirbazını yenidən göstər", - "Common Name" : "Ümumi ad", - "Valid until" : "Vaxtadək keçərlidir", - "Issued By" : "Tərəfindən yaradılıb", - "Valid until %s" : "Keçərlidir vaxtadək %s", - "Import root certificate" : "root sertifikatı import et", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Tərəfindən yaradılıb{communityopen}ownCloud cəmiyyəti{linkclose}, {githubopen}mənbə kodları{linkclose} altında lisenziya edilib {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Depo ünvanını göstər", "Show last log in" : "Son girişi göstər", diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js index 3a4a176e8c6..a33268a959d 100644 --- a/settings/l10n/bg_BG.js +++ b/settings/l10n/bg_BG.js @@ -60,14 +60,14 @@ OC.L10N.register( "Uninstalling ...." : "Премахване ...", "Error while uninstalling app" : "Грешка при премахването на приложението", "Uninstall" : "Премахване", + "Valid until {date}" : "Далидна до {date}", + "Delete" : "Изтриване", "Select a profile picture" : "Избиране на профилна снимка", "Very weak password" : "Много слаба парола", "Weak password" : "Слаба парола", "So-so password" : "Не особено добра парола", "Good password" : "Добра парола", "Strong password" : "Сигурна парола", - "Valid until {date}" : "Далидна до {date}", - "Delete" : "Изтриване", "Groups" : "Групи", "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.", "Error creating group" : "Грешка при създаване на група", @@ -86,7 +86,6 @@ OC.L10N.register( "__language_name__" : "Български", "Personal info" : "Лична информация", "Sync clients" : "Синхронизиращи клиенти", - "SSL root certificates" : "SSL root сертификати", "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)", "Info, warnings, errors and fatal issues" : "информация, предупреждения, грешки и фатални проблеми", "Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми", @@ -163,6 +162,11 @@ OC.L10N.register( "This app cannot be installed because the following dependencies are not fulfilled:" : "Това приложение не може да бъде инсталирано, защото следните зависимости не са удовлетворени:", "Enable only for specific groups" : "Включи само за определени групи", "Uninstall App" : "Премахни Приложението", + "Common Name" : "Познато Име", + "Valid until" : "Валиден до", + "Issued By" : "Издаден От", + "Valid until %s" : "Валиден до %s", + "Import root certificate" : "Импортиране на основен сертификат", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здрасти,<br><br>Само да ти кажа, че имаш %s профил<br><br> Потребителя ти е: %s<br>Достъпи го: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Поздрави!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здрасти,\n\nСамо да ти кажа, че имаш %s профил.\n\nПотребителя ти е: %s\nДостъпи го: %s\n", @@ -190,11 +194,6 @@ OC.L10N.register( "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разпространи мълвата</a>!", "Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново", - "Common Name" : "Познато Име", - "Valid until" : "Валиден до", - "Issued By" : "Издаден От", - "Valid until %s" : "Валиден до %s", - "Import root certificate" : "Импортиране на основен сертификат", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработен от {communityopen}ownCloud общността {linkclose}, {githubopen}изходящия код{linkclose} е лицензиран под {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Покажи място за запис", "Show last log in" : "Покажи последно вписване", diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json index 6bb767b6b50..a773da13bdf 100644 --- a/settings/l10n/bg_BG.json +++ b/settings/l10n/bg_BG.json @@ -58,14 +58,14 @@ "Uninstalling ...." : "Премахване ...", "Error while uninstalling app" : "Грешка при премахването на приложението", "Uninstall" : "Премахване", + "Valid until {date}" : "Далидна до {date}", + "Delete" : "Изтриване", "Select a profile picture" : "Избиране на профилна снимка", "Very weak password" : "Много слаба парола", "Weak password" : "Слаба парола", "So-so password" : "Не особено добра парола", "Good password" : "Добра парола", "Strong password" : "Сигурна парола", - "Valid until {date}" : "Далидна до {date}", - "Delete" : "Изтриване", "Groups" : "Групи", "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.", "Error creating group" : "Грешка при създаване на група", @@ -84,7 +84,6 @@ "__language_name__" : "Български", "Personal info" : "Лична информация", "Sync clients" : "Синхронизиращи клиенти", - "SSL root certificates" : "SSL root сертификати", "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)", "Info, warnings, errors and fatal issues" : "информация, предупреждения, грешки и фатални проблеми", "Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми", @@ -161,6 +160,11 @@ "This app cannot be installed because the following dependencies are not fulfilled:" : "Това приложение не може да бъде инсталирано, защото следните зависимости не са удовлетворени:", "Enable only for specific groups" : "Включи само за определени групи", "Uninstall App" : "Премахни Приложението", + "Common Name" : "Познато Име", + "Valid until" : "Валиден до", + "Issued By" : "Издаден От", + "Valid until %s" : "Валиден до %s", + "Import root certificate" : "Импортиране на основен сертификат", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здрасти,<br><br>Само да ти кажа, че имаш %s профил<br><br> Потребителя ти е: %s<br>Достъпи го: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Поздрави!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здрасти,\n\nСамо да ти кажа, че имаш %s профил.\n\nПотребителя ти е: %s\nДостъпи го: %s\n", @@ -188,11 +192,6 @@ "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разпространи мълвата</a>!", "Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново", - "Common Name" : "Познато Име", - "Valid until" : "Валиден до", - "Issued By" : "Издаден От", - "Valid until %s" : "Валиден до %s", - "Import root certificate" : "Импортиране на основен сертификат", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработен от {communityopen}ownCloud общността {linkclose}, {githubopen}изходящия код{linkclose} е лицензиран под {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Покажи място за запис", "Show last log in" : "Покажи последно вписване", diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js index e8db791037e..8493791e040 100644 --- a/settings/l10n/bn_BD.js +++ b/settings/l10n/bn_BD.js @@ -27,14 +27,13 @@ OC.L10N.register( "Updating...." : "নবায়ন করা হচ্ছে....", "Error while updating app" : "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে ", "Updated" : "নবায়নকৃত", - "Strong password" : "শক্তিশালী কুটশব্দ", "Valid until {date}" : "বৈধতা বলবৎ আছে {তারিখ} অবধি ", "Delete" : "মুছে", + "Strong password" : "শক্তিশালী কুটশব্দ", "Groups" : "গোষ্ঠীসমূহ", "undo" : "ক্রিয়া প্রত্যাহার", "never" : "কখনোই নয়", "__language_name__" : "__language_name__", - "SSL root certificates" : "SSL রুট সনদপত্র", "None" : "কোনটিই নয়", "Login" : "প্রবেশ", "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও", diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json index bf6b37cf7db..66ce6d02bbe 100644 --- a/settings/l10n/bn_BD.json +++ b/settings/l10n/bn_BD.json @@ -25,14 +25,13 @@ "Updating...." : "নবায়ন করা হচ্ছে....", "Error while updating app" : "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে ", "Updated" : "নবায়নকৃত", - "Strong password" : "শক্তিশালী কুটশব্দ", "Valid until {date}" : "বৈধতা বলবৎ আছে {তারিখ} অবধি ", "Delete" : "মুছে", + "Strong password" : "শক্তিশালী কুটশব্দ", "Groups" : "গোষ্ঠীসমূহ", "undo" : "ক্রিয়া প্রত্যাহার", "never" : "কখনোই নয়", "__language_name__" : "__language_name__", - "SSL root certificates" : "SSL রুট সনদপত্র", "None" : "কোনটিই নয়", "Login" : "প্রবেশ", "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও", diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js index 92da382f008..33bda184f78 100644 --- a/settings/l10n/bs.js +++ b/settings/l10n/bs.js @@ -53,14 +53,14 @@ OC.L10N.register( "Uninstalling ...." : "Deinstaliranje....", "Error while uninstalling app" : "Greška pri deinstaliranju aplikacije", "Uninstall" : "Deinstaliraj", + "Valid until {date}" : "Validno do {date}", + "Delete" : "Izbriši", "Select a profile picture" : "Odaberi sliku profila", "Very weak password" : "Veoma slaba lozinka", "Weak password" : "Slaba lozinka", "So-so password" : "Tu-i-tamo lozinka", "Good password" : "Dobra lozinka", "Strong password" : "Jaka lozinka", - "Valid until {date}" : "Validno do {date}", - "Delete" : "Izbriši", "Groups" : "Grupe", "Unable to delete {objName}" : "Nije moguće izbrisati {objName}", "Error creating group" : "Greška pri kreiranju grupe", @@ -76,7 +76,6 @@ OC.L10N.register( "A valid password must be provided" : "Nužno je navesti valjanu lozinku", "A valid email must be provided" : "Nužno je navesti valjanu adresu e-pošte", "__language_name__" : "__naziv_jezika___", - "SSL root certificates" : "SSL root certifikati", "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (fatalni problemi, greške, upozorenja, info, ispravljanje pogrešaka)", "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, greške i fatalni problemi", "Warnings, errors and fatal issues" : "Upozorenja, greške i fatalni problemi", @@ -137,6 +136,10 @@ OC.L10N.register( "This app cannot be installed because the following dependencies are not fulfilled:" : "Ova aplikacija se ne može instalirati zbog slijedećih neispunjenih ovisnosti:", "Enable only for specific groups" : "Omogućite samo za specifične grupe", "Uninstall App" : "Deinstaliraj aplikaciju", + "Common Name" : "Opće Ime", + "Valid until" : "Validno do", + "Issued By" : "Izdano od", + "Valid until %s" : "Validno do %s", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej,<br><br>samo da javim da sad imate %s račum.<br><br>Vaše korisničko ime: %s<br>Pristupite mu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Cheers!", "Forum" : "Forum", @@ -158,10 +161,6 @@ OC.L10N.register( "Android app" : "Android aplikacija", "iOS app" : "iOS aplikacija", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "Common Name" : "Opće Ime", - "Valid until" : "Validno do", - "Issued By" : "Izdano od", - "Valid until %s" : "Validno do %s", "Show storage location" : "Prikaži mjesto pohrane", "Show last log in" : "Prikaži zadnju prijavu", "Show user backend" : "Prikaži korisničku pozadinu (backend)", diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json index d1857a3a6f3..55038c2503e 100644 --- a/settings/l10n/bs.json +++ b/settings/l10n/bs.json @@ -51,14 +51,14 @@ "Uninstalling ...." : "Deinstaliranje....", "Error while uninstalling app" : "Greška pri deinstaliranju aplikacije", "Uninstall" : "Deinstaliraj", + "Valid until {date}" : "Validno do {date}", + "Delete" : "Izbriši", "Select a profile picture" : "Odaberi sliku profila", "Very weak password" : "Veoma slaba lozinka", "Weak password" : "Slaba lozinka", "So-so password" : "Tu-i-tamo lozinka", "Good password" : "Dobra lozinka", "Strong password" : "Jaka lozinka", - "Valid until {date}" : "Validno do {date}", - "Delete" : "Izbriši", "Groups" : "Grupe", "Unable to delete {objName}" : "Nije moguće izbrisati {objName}", "Error creating group" : "Greška pri kreiranju grupe", @@ -74,7 +74,6 @@ "A valid password must be provided" : "Nužno je navesti valjanu lozinku", "A valid email must be provided" : "Nužno je navesti valjanu adresu e-pošte", "__language_name__" : "__naziv_jezika___", - "SSL root certificates" : "SSL root certifikati", "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (fatalni problemi, greške, upozorenja, info, ispravljanje pogrešaka)", "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, greške i fatalni problemi", "Warnings, errors and fatal issues" : "Upozorenja, greške i fatalni problemi", @@ -135,6 +134,10 @@ "This app cannot be installed because the following dependencies are not fulfilled:" : "Ova aplikacija se ne može instalirati zbog slijedećih neispunjenih ovisnosti:", "Enable only for specific groups" : "Omogućite samo za specifične grupe", "Uninstall App" : "Deinstaliraj aplikaciju", + "Common Name" : "Opće Ime", + "Valid until" : "Validno do", + "Issued By" : "Izdano od", + "Valid until %s" : "Validno do %s", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej,<br><br>samo da javim da sad imate %s račum.<br><br>Vaše korisničko ime: %s<br>Pristupite mu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Cheers!", "Forum" : "Forum", @@ -156,10 +159,6 @@ "Android app" : "Android aplikacija", "iOS app" : "iOS aplikacija", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "Common Name" : "Opće Ime", - "Valid until" : "Validno do", - "Issued By" : "Izdano od", - "Valid until %s" : "Validno do %s", "Show storage location" : "Prikaži mjesto pohrane", "Show last log in" : "Prikaži zadnju prijavu", "Show user backend" : "Prikaži korisničku pozadinu (backend)", diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js index fb0c133823f..a2c4567caa3 100644 --- a/settings/l10n/ca.js +++ b/settings/l10n/ca.js @@ -72,6 +72,8 @@ OC.L10N.register( "Uninstalling ...." : "Desintal·lant ...", "Error while uninstalling app" : "Error en desinstal·lar l'aplicació", "Uninstall" : "Desinstal·la", + "Valid until {date}" : "Vàlid fins {date}", + "Delete" : "Esborra", "An error occurred: {message}" : "S'ha produït un error: {message}", "Select a profile picture" : "Seleccioneu una imatge de perfil", "Very weak password" : "Contrasenya massa feble", @@ -79,8 +81,6 @@ OC.L10N.register( "So-so password" : "Contrasenya passable", "Good password" : "Contrasenya bona", "Strong password" : "Contrasenya forta", - "Valid until {date}" : "Vàlid fins {date}", - "Delete" : "Esborra", "Groups" : "Grups", "Unable to delete {objName}" : "No es pot eliminar {objName}", "Error creating group" : "Error en crear el grup", @@ -99,7 +99,6 @@ OC.L10N.register( "__language_name__" : "Català", "Personal info" : "Informació personal", "Sync clients" : "Sincronitzar clients", - "SSL root certificates" : "Certificats SSL root", "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)", "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals", "Warnings, errors and fatal issues" : "Avisos, errors i problemes fatals", @@ -186,6 +185,11 @@ OC.L10N.register( "This app cannot be installed because the following dependencies are not fulfilled:" : "Aquesta aplicació no es pot instal·lar perquè les següents dependències no es compleixen:", "Enable only for specific groups" : "Activa només per grups específics", "Uninstall App" : "Desinstal·la l'aplicació", + "Common Name" : "Nom comú", + "Valid until" : "Valid fins", + "Issued By" : "Emès Per", + "Valid until %s" : "Vàlid fins %s", + "Import root certificate" : "Importa certificat root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Què tal?,<br><br>aquest missatge és per fer-li saber que ara té uncompte %s.<br><br>El seu nom d'usuari: %s<br>Accedeixi en: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Salut!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, què tal?,\n\nAquest missatge és per fer-li saber que ara té un compte %s.\n\n El seu nom d'usuari: %s\nAccedeixi en: %s\n\n", @@ -216,11 +220,6 @@ OC.L10N.register( "iOS app" : "aplicació para iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vol recolzar el projecte\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> unir-se al desenvolupament</a>\n⇥⇥o\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> difondre'l !</a>!", "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució", - "Common Name" : "Nom comú", - "Valid until" : "Valid fins", - "Issued By" : "Emès Per", - "Valid until %s" : "Vàlid fins %s", - "Import root certificate" : "Importa certificat root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolupat per la {communityopen} comunitat ownCloud comunitat{linkclose} , el {githubopen} codi font {linkclose} està llicenciat sota la {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostra la ubicació del magatzem", "Show last log in" : "Mostrar l'últim accés", diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json index 4fe2dfdcc1b..7a57d73f22c 100644 --- a/settings/l10n/ca.json +++ b/settings/l10n/ca.json @@ -70,6 +70,8 @@ "Uninstalling ...." : "Desintal·lant ...", "Error while uninstalling app" : "Error en desinstal·lar l'aplicació", "Uninstall" : "Desinstal·la", + "Valid until {date}" : "Vàlid fins {date}", + "Delete" : "Esborra", "An error occurred: {message}" : "S'ha produït un error: {message}", "Select a profile picture" : "Seleccioneu una imatge de perfil", "Very weak password" : "Contrasenya massa feble", @@ -77,8 +79,6 @@ "So-so password" : "Contrasenya passable", "Good password" : "Contrasenya bona", "Strong password" : "Contrasenya forta", - "Valid until {date}" : "Vàlid fins {date}", - "Delete" : "Esborra", "Groups" : "Grups", "Unable to delete {objName}" : "No es pot eliminar {objName}", "Error creating group" : "Error en crear el grup", @@ -97,7 +97,6 @@ "__language_name__" : "Català", "Personal info" : "Informació personal", "Sync clients" : "Sincronitzar clients", - "SSL root certificates" : "Certificats SSL root", "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)", "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals", "Warnings, errors and fatal issues" : "Avisos, errors i problemes fatals", @@ -184,6 +183,11 @@ "This app cannot be installed because the following dependencies are not fulfilled:" : "Aquesta aplicació no es pot instal·lar perquè les següents dependències no es compleixen:", "Enable only for specific groups" : "Activa només per grups específics", "Uninstall App" : "Desinstal·la l'aplicació", + "Common Name" : "Nom comú", + "Valid until" : "Valid fins", + "Issued By" : "Emès Per", + "Valid until %s" : "Vàlid fins %s", + "Import root certificate" : "Importa certificat root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Què tal?,<br><br>aquest missatge és per fer-li saber que ara té uncompte %s.<br><br>El seu nom d'usuari: %s<br>Accedeixi en: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Salut!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, què tal?,\n\nAquest missatge és per fer-li saber que ara té un compte %s.\n\n El seu nom d'usuari: %s\nAccedeixi en: %s\n\n", @@ -214,11 +218,6 @@ "iOS app" : "aplicació para iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vol recolzar el projecte\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> unir-se al desenvolupament</a>\n⇥⇥o\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> difondre'l !</a>!", "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució", - "Common Name" : "Nom comú", - "Valid until" : "Valid fins", - "Issued By" : "Emès Per", - "Valid until %s" : "Vàlid fins %s", - "Import root certificate" : "Importa certificat root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolupat per la {communityopen} comunitat ownCloud comunitat{linkclose} , el {githubopen} codi font {linkclose} està llicenciat sota la {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostra la ubicació del magatzem", "Show last log in" : "Mostrar l'últim accés", diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 1440bcfc89f..ef59d715b44 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikace byla povolena ale je třeba ji aktualizovat. Za 5 sekund budete přesměrování na stránku pro aktualizaci.", "App update" : "Aktualizace aplikace", "No apps found for \"{query}\"" : "Nebyly nalezeny žádné aplikace pro \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.", + "Valid until {date}" : "Platný do {date}", + "Delete" : "Smazat", "An error occurred: {message}" : "Nastala chyba: {message}", "Select a profile picture" : "Vyberte profilový obrázek", "Very weak password" : "Velmi slabé heslo", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Středně silné heslo", "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.", - "Valid until {date}" : "Platný do {date}", - "Delete" : "Smazat", "Groups" : "Skupiny", "Unable to delete {objName}" : "Nelze smazat {objName}", "Error creating group" : "Chyba při vytváření skupiny", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Česky", "Personal info" : "Osobní informace", "Sync clients" : "Synchronizační klienti", - "SSL root certificates" : "Kořenové certifikáty SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)", "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy", "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy", @@ -218,6 +217,11 @@ OC.L10N.register( "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny", "Uninstall App" : "Odinstalovat aplikaci", "Enable experimental apps" : "Povolit experimentální aplikace", + "Common Name" : "Common Name", + "Valid until" : "Platný do", + "Issued By" : "Vydal", + "Valid until %s" : "Platný do %s", + "Import root certificate" : "Import kořenového certifikátu", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ahoj,<br><br>toto je oznámení o nově vytvořeném %s účtu.<br><br>Uživatelské jméno: %s<br>Přihlásit se dá zde: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ať slouží!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámení o nově vytvořeném %s účtu.\n\nUživatelské jméno: %s\nPřihlásit se dá zde: %s\n", @@ -255,11 +259,6 @@ OC.L10N.register( "iOS app" : "iOS aplikace", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">přidejte se k jeho vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte osvětu</a>!", "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním", - "Common Name" : "Common Name", - "Valid until" : "Platný do", - "Issued By" : "Vydal", - "Valid until %s" : "Platný do %s", - "Import root certificate" : "Import kořenového certifikátu", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou ownCloud{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Cesta k datům", "Show last log in" : "Poslední přihlášení", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 75396b0b105..1ee0938cba9 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikace byla povolena ale je třeba ji aktualizovat. Za 5 sekund budete přesměrování na stránku pro aktualizaci.", "App update" : "Aktualizace aplikace", "No apps found for \"{query}\"" : "Nebyly nalezeny žádné aplikace pro \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.", + "Valid until {date}" : "Platný do {date}", + "Delete" : "Smazat", "An error occurred: {message}" : "Nastala chyba: {message}", "Select a profile picture" : "Vyberte profilový obrázek", "Very weak password" : "Velmi slabé heslo", @@ -86,9 +89,6 @@ "So-so password" : "Středně silné heslo", "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.", - "Valid until {date}" : "Platný do {date}", - "Delete" : "Smazat", "Groups" : "Skupiny", "Unable to delete {objName}" : "Nelze smazat {objName}", "Error creating group" : "Chyba při vytváření skupiny", @@ -107,7 +107,6 @@ "__language_name__" : "Česky", "Personal info" : "Osobní informace", "Sync clients" : "Synchronizační klienti", - "SSL root certificates" : "Kořenové certifikáty SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)", "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy", "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy", @@ -216,6 +215,11 @@ "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny", "Uninstall App" : "Odinstalovat aplikaci", "Enable experimental apps" : "Povolit experimentální aplikace", + "Common Name" : "Common Name", + "Valid until" : "Platný do", + "Issued By" : "Vydal", + "Valid until %s" : "Platný do %s", + "Import root certificate" : "Import kořenového certifikátu", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ahoj,<br><br>toto je oznámení o nově vytvořeném %s účtu.<br><br>Uživatelské jméno: %s<br>Přihlásit se dá zde: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ať slouží!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámení o nově vytvořeném %s účtu.\n\nUživatelské jméno: %s\nPřihlásit se dá zde: %s\n", @@ -253,11 +257,6 @@ "iOS app" : "iOS aplikace", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">přidejte se k jeho vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte osvětu</a>!", "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním", - "Common Name" : "Common Name", - "Valid until" : "Platný do", - "Issued By" : "Vydal", - "Valid until %s" : "Platný do %s", - "Import root certificate" : "Import kořenového certifikátu", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou ownCloud{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Cesta k datům", "Show last log in" : "Poslední přihlášení", diff --git a/settings/l10n/da.js b/settings/l10n/da.js index f5d7fd9e2f1..ba97606b176 100644 --- a/settings/l10n/da.js +++ b/settings/l10n/da.js @@ -78,6 +78,9 @@ OC.L10N.register( "Uninstalling ...." : "Afinstallerer...", "Error while uninstalling app" : "Fejl under afinstallering af app", "Uninstall" : "Afinstallér", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.", + "Valid until {date}" : "Gyldig indtil {date}", + "Delete" : "Slet", "An error occurred: {message}" : "Der opstod en fejl:{message}", "Select a profile picture" : "Vælg et profilbillede", "Very weak password" : "Meget svagt kodeord", @@ -85,9 +88,6 @@ OC.L10N.register( "So-so password" : "Jævnt kodeord", "Good password" : "Godt kodeord", "Strong password" : "Stærkt kodeord", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.", - "Valid until {date}" : "Gyldig indtil {date}", - "Delete" : "Slet", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunne ikke slette {objName}", "Error creating group" : "Fejl ved oprettelse af gruppe", @@ -106,7 +106,6 @@ OC.L10N.register( "__language_name__" : "Dansk", "Personal info" : "Personlige oplysninger", "Sync clients" : "Synkroniserings klienter", - "SSL root certificates" : "SSL-rodcertifikater", "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)", "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl", "Warnings, errors and fatal issues" : "Advarsler, fejl og alvorlige fejl", @@ -208,6 +207,11 @@ OC.L10N.register( "Enable only for specific groups" : "Aktivér kun for udvalgte grupper", "Uninstall App" : "Afinstallér app", "Enable experimental apps" : "Aktiver eksperimentale programmer", + "Common Name" : "Almindeligt navn", + "Valid until" : "Gyldig indtil", + "Issued By" : "Udstedt af", + "Valid until %s" : "Gyldig indtil %s", + "Import root certificate" : "Importer rodcertifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hejsa,<br><br>dette er blot en besked om, at du nu har en %s-konto.<br><br>Dit brugernavn: %s<br>Tilgå den: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hej!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hejsa,\n\ndette er blot en besked om, at du nu har en %s-konto.\n\nDit brugernavn: %s\nTilgå den: %s\n\n", @@ -239,11 +243,6 @@ OC.L10N.register( "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte projektet, så\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spred budskabet</a>!", "Show First Run Wizard again" : "Vis guiden for første kørsel igen.", - "Common Name" : "Almindeligt navn", - "Valid until" : "Gyldig indtil", - "Issued By" : "Udstedt af", - "Valid until %s" : "Gyldig indtil %s", - "Import root certificate" : "Importer rodcertifikat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Udviklet af {communityopen}ownCloud-fællesskabet{linkclose}, {githubopen}kildekoden{linkclose} er udgivet under licensen {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Vis placering af lageret", "Show last log in" : "Vis seneste login", diff --git a/settings/l10n/da.json b/settings/l10n/da.json index 8f75704f975..3d6e2a3082d 100644 --- a/settings/l10n/da.json +++ b/settings/l10n/da.json @@ -76,6 +76,9 @@ "Uninstalling ...." : "Afinstallerer...", "Error while uninstalling app" : "Fejl under afinstallering af app", "Uninstall" : "Afinstallér", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.", + "Valid until {date}" : "Gyldig indtil {date}", + "Delete" : "Slet", "An error occurred: {message}" : "Der opstod en fejl:{message}", "Select a profile picture" : "Vælg et profilbillede", "Very weak password" : "Meget svagt kodeord", @@ -83,9 +86,6 @@ "So-so password" : "Jævnt kodeord", "Good password" : "Godt kodeord", "Strong password" : "Stærkt kodeord", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.", - "Valid until {date}" : "Gyldig indtil {date}", - "Delete" : "Slet", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunne ikke slette {objName}", "Error creating group" : "Fejl ved oprettelse af gruppe", @@ -104,7 +104,6 @@ "__language_name__" : "Dansk", "Personal info" : "Personlige oplysninger", "Sync clients" : "Synkroniserings klienter", - "SSL root certificates" : "SSL-rodcertifikater", "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)", "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl", "Warnings, errors and fatal issues" : "Advarsler, fejl og alvorlige fejl", @@ -206,6 +205,11 @@ "Enable only for specific groups" : "Aktivér kun for udvalgte grupper", "Uninstall App" : "Afinstallér app", "Enable experimental apps" : "Aktiver eksperimentale programmer", + "Common Name" : "Almindeligt navn", + "Valid until" : "Gyldig indtil", + "Issued By" : "Udstedt af", + "Valid until %s" : "Gyldig indtil %s", + "Import root certificate" : "Importer rodcertifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hejsa,<br><br>dette er blot en besked om, at du nu har en %s-konto.<br><br>Dit brugernavn: %s<br>Tilgå den: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hej!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hejsa,\n\ndette er blot en besked om, at du nu har en %s-konto.\n\nDit brugernavn: %s\nTilgå den: %s\n\n", @@ -237,11 +241,6 @@ "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte projektet, så\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spred budskabet</a>!", "Show First Run Wizard again" : "Vis guiden for første kørsel igen.", - "Common Name" : "Almindeligt navn", - "Valid until" : "Gyldig indtil", - "Issued By" : "Udstedt af", - "Valid until %s" : "Gyldig indtil %s", - "Import root certificate" : "Importer rodcertifikat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Udviklet af {communityopen}ownCloud-fællesskabet{linkclose}, {githubopen}kildekoden{linkclose} er udgivet under licensen {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Vis placering af lageret", "Show last log in" : "Vis seneste login", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 441100bad47..7349359c992 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, muss aber aktualisiert werden. Du wirst in 5 Sekunden zu Aktualisierungsseite weitergeleitet", "App update" : "App aktualisiert", "No apps found for \"{query}\"" : "Es wurden keine Apps für \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.", + "Valid until {date}" : "Gültig bis {date}", + "Delete" : "Löschen", "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}", "Select a profile picture" : "Wähle ein Profilbild", "Very weak password" : "Sehr schwaches Passwort", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Durchschnittliches Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.", - "Valid until {date}" : "Gültig bis {date}", - "Delete" : "Löschen", "Groups" : "Gruppen", "Unable to delete {objName}" : "Löschen von {objName} nicht möglich", "Error creating group" : "Fehler beim Erstellen der Gruppe", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Deutsch (Persönlich)", "Personal info" : "Persönliche Informationen", "Sync clients" : "Sync-Clients", - "SSL root certificates" : "SSL-Root-Zertifikate", "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)", "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme", "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme", @@ -211,6 +210,11 @@ OC.L10N.register( "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", "Enable experimental apps" : "Experimentelle Apps aktivieren", + "Common Name" : "Common Name", + "Valid until" : "Gültig bis", + "Issued By" : "Ausgestellt von:", + "Valid until %s" : "Gültig bis %s", + "Import root certificate" : "Root-Zertifikat importieren", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Noch einen schönen Tag!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n", @@ -242,11 +246,6 @@ OC.L10N.register( "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Common Name" : "Common Name", - "Valid until" : "Gültig bis", - "Issued By" : "Ausgestellt von:", - "Valid until %s" : "Gültig bis %s", - "Import root certificate" : "Root-Zertifikat importieren", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 5dcd2d731ab..57160cab9b4 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, muss aber aktualisiert werden. Du wirst in 5 Sekunden zu Aktualisierungsseite weitergeleitet", "App update" : "App aktualisiert", "No apps found for \"{query}\"" : "Es wurden keine Apps für \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.", + "Valid until {date}" : "Gültig bis {date}", + "Delete" : "Löschen", "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}", "Select a profile picture" : "Wähle ein Profilbild", "Very weak password" : "Sehr schwaches Passwort", @@ -86,9 +89,6 @@ "So-so password" : "Durchschnittliches Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.", - "Valid until {date}" : "Gültig bis {date}", - "Delete" : "Löschen", "Groups" : "Gruppen", "Unable to delete {objName}" : "Löschen von {objName} nicht möglich", "Error creating group" : "Fehler beim Erstellen der Gruppe", @@ -107,7 +107,6 @@ "__language_name__" : "Deutsch (Persönlich)", "Personal info" : "Persönliche Informationen", "Sync clients" : "Sync-Clients", - "SSL root certificates" : "SSL-Root-Zertifikate", "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)", "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme", "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme", @@ -209,6 +208,11 @@ "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", "Enable experimental apps" : "Experimentelle Apps aktivieren", + "Common Name" : "Common Name", + "Valid until" : "Gültig bis", + "Issued By" : "Ausgestellt von:", + "Valid until %s" : "Gültig bis %s", + "Import root certificate" : "Root-Zertifikat importieren", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Noch einen schönen Tag!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n", @@ -240,11 +244,6 @@ "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Common Name" : "Common Name", - "Valid until" : "Gültig bis", - "Issued By" : "Ausgestellt von:", - "Valid until %s" : "Gültig bis %s", - "Import root certificate" : "Root-Zertifikat importieren", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index 1593e7cb5f3..8e6815df8a7 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -79,6 +79,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, aber sie benötigt ein Update. Sie werden zur Update Seite in 5 Sekunden weitergeleitet.", "App update" : "App aktualisieren", "No apps found for \"{query}\"" : "Es wurden keine Apps gefunden für \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.", + "Valid until {date}" : "Gültig bis {date}", + "Delete" : "Löschen", "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}", "Select a profile picture" : "Wählen Sie ein Profilbild", "Very weak password" : "Sehr schwaches Passwort", @@ -86,9 +89,6 @@ OC.L10N.register( "So-so password" : "Passables Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.", - "Valid until {date}" : "Gültig bis {date}", - "Delete" : "Löschen", "Groups" : "Gruppen", "Unable to delete {objName}" : "Löschen von {objName} nicht möglich", "Error creating group" : "Fehler beim Erstellen der Gruppe", @@ -107,7 +107,6 @@ OC.L10N.register( "__language_name__" : "Deutsch (Förmlich: Sie)", "Personal info" : "Persönliche Informationen", "Sync clients" : "Sync-Clients", - "SSL root certificates" : "SSL-Root-Zertifikate", "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)", "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme", "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme", @@ -205,6 +204,11 @@ OC.L10N.register( "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", "Enable experimental apps" : "Experimentelle Apps aktivieren", + "Common Name" : "Common Name", + "Valid until" : "Gültig bis", + "Issued By" : "Ausgestellt von:", + "Valid until %s" : "Gültig bis %s", + "Import root certificate" : "Root-Zertifikat importieren", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.<br><br>Ihr Benutzername: %s<br>Greifen Sie darauf zu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Noch einen schönen Tag!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.\n\nIhr Benutzername: %s\nGreifen Sie darauf zu: %s\n\n", @@ -236,11 +240,6 @@ OC.L10N.register( "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Common Name" : "Common Name", - "Valid until" : "Gültig bis", - "Issued By" : "Ausgestellt von:", - "Valid until %s" : "Gültig bis %s", - "Import root certificate" : "Root-Zertifikat importieren", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index da00ef81627..761d1a968e8 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -77,6 +77,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, aber sie benötigt ein Update. Sie werden zur Update Seite in 5 Sekunden weitergeleitet.", "App update" : "App aktualisieren", "No apps found for \"{query}\"" : "Es wurden keine Apps gefunden für \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.", + "Valid until {date}" : "Gültig bis {date}", + "Delete" : "Löschen", "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}", "Select a profile picture" : "Wählen Sie ein Profilbild", "Very weak password" : "Sehr schwaches Passwort", @@ -84,9 +87,6 @@ "So-so password" : "Passables Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.", - "Valid until {date}" : "Gültig bis {date}", - "Delete" : "Löschen", "Groups" : "Gruppen", "Unable to delete {objName}" : "Löschen von {objName} nicht möglich", "Error creating group" : "Fehler beim Erstellen der Gruppe", @@ -105,7 +105,6 @@ "__language_name__" : "Deutsch (Förmlich: Sie)", "Personal info" : "Persönliche Informationen", "Sync clients" : "Sync-Clients", - "SSL root certificates" : "SSL-Root-Zertifikate", "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)", "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme", "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme", @@ -203,6 +202,11 @@ "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", "Enable experimental apps" : "Experimentelle Apps aktivieren", + "Common Name" : "Common Name", + "Valid until" : "Gültig bis", + "Issued By" : "Ausgestellt von:", + "Valid until %s" : "Gültig bis %s", + "Import root certificate" : "Root-Zertifikat importieren", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.<br><br>Ihr Benutzername: %s<br>Greifen Sie darauf zu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Noch einen schönen Tag!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.\n\nIhr Benutzername: %s\nGreifen Sie darauf zu: %s\n\n", @@ -234,11 +238,6 @@ "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Common Name" : "Common Name", - "Valid until" : "Gültig bis", - "Issued By" : "Ausgestellt von:", - "Valid until %s" : "Gültig bis %s", - "Import root certificate" : "Root-Zertifikat importieren", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index 663fabeba11..efec899ae5f 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Η εφαρμογή έχει ενεργοποιηθεί αλλά χρειάζεται ενημέρωση. Θα μεταφερθείτε στη σελίδα ενημέρωσης σε 5 δευτερόλεπτα.", "App update" : "Ενημέρωση εφαρμογής", "No apps found for \"{query}\"" : "Δεν βρέθηκαν εφαρμογές για \"{query\"}", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.", + "Valid until {date}" : "Έγκυρο έως {date}", + "Delete" : "Διαγραφή", "An error occurred: {message}" : "Παρουσιάστηκε σφάλμα: {message}", "Select a profile picture" : "Επιλογή εικόνας προφίλ", "Very weak password" : "Πολύ αδύναμο συνθηματικό", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Μέτριο συνθηματικό", "Good password" : "Καλό συνθηματικό", "Strong password" : "Δυνατό συνθηματικό", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.", - "Valid until {date}" : "Έγκυρο έως {date}", - "Delete" : "Διαγραφή", "Groups" : "Ομάδες", "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}", "Error creating group" : "Σφάλμα δημιουργίας ομάδας", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "__όνομα_γλώσσας__", "Personal info" : "Προσωπικές Πληροφορίες", "Sync clients" : "Συγχρονισμός πελατών", - "SSL root certificates" : "Πιστοποιητικά SSL root", "Everything (fatal issues, errors, warnings, info, debug)" : "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)", "Info, warnings, errors and fatal issues" : "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα", "Warnings, errors and fatal issues" : "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα", @@ -215,6 +214,11 @@ OC.L10N.register( "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες", "Uninstall App" : "Απεγκατάσταση Εφαρμογής", "Enable experimental apps" : "Ενεργοποίηση πειραματικών εφαρμογών", + "Common Name" : "Κοινό Όνομα", + "Valid until" : "Έγκυρο έως", + "Issued By" : "Έκδόθηκε από", + "Valid until %s" : "Έγκυρο έως %s", + "Import root certificate" : "Εισαγωγή Πιστοποιητικού Root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Χαίρεται,<br><br>απλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.<br><br>Το όνομά σας είναι: %s<br>Έχετε πρόσβαση: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Χαιρετισμούς!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Χαίρεται, \nαπλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.\nΤο όνομά σας είναι: %s\nΈχετε πρόσβαση: %s\n", @@ -246,11 +250,6 @@ OC.L10N.register( "iOS app" : "Εφαρμογή iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Εάν θέλετε να υποστηρίξετε το έργο\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">συμμετέχετε στην ανάπτυξη</a>\n\t\tή\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">διαδόστε το μήνυμα</a>!", "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά", - "Common Name" : "Κοινό Όνομα", - "Valid until" : "Έγκυρο έως", - "Issued By" : "Έκδόθηκε από", - "Valid until %s" : "Έγκυρο έως %s", - "Import root certificate" : "Εισαγωγή Πιστοποιητικού Root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Αναπτύχθηκε από την {communityopen} κοινότητα του ownCloud {linkclose}, ο {githubopen} πηγαίος κώδικας {linkclose} έχει την άδεια της {licenseopen} <abbr title = \"Affero General Public License\"> AGPL </ abbr> {linkclose}.", "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης", "Show last log in" : "Εμφάνιση τελευταίας εισόδου", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index 59c6d96673a..b8f52efc578 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Η εφαρμογή έχει ενεργοποιηθεί αλλά χρειάζεται ενημέρωση. Θα μεταφερθείτε στη σελίδα ενημέρωσης σε 5 δευτερόλεπτα.", "App update" : "Ενημέρωση εφαρμογής", "No apps found for \"{query}\"" : "Δεν βρέθηκαν εφαρμογές για \"{query\"}", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.", + "Valid until {date}" : "Έγκυρο έως {date}", + "Delete" : "Διαγραφή", "An error occurred: {message}" : "Παρουσιάστηκε σφάλμα: {message}", "Select a profile picture" : "Επιλογή εικόνας προφίλ", "Very weak password" : "Πολύ αδύναμο συνθηματικό", @@ -86,9 +89,6 @@ "So-so password" : "Μέτριο συνθηματικό", "Good password" : "Καλό συνθηματικό", "Strong password" : "Δυνατό συνθηματικό", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.", - "Valid until {date}" : "Έγκυρο έως {date}", - "Delete" : "Διαγραφή", "Groups" : "Ομάδες", "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}", "Error creating group" : "Σφάλμα δημιουργίας ομάδας", @@ -107,7 +107,6 @@ "__language_name__" : "__όνομα_γλώσσας__", "Personal info" : "Προσωπικές Πληροφορίες", "Sync clients" : "Συγχρονισμός πελατών", - "SSL root certificates" : "Πιστοποιητικά SSL root", "Everything (fatal issues, errors, warnings, info, debug)" : "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)", "Info, warnings, errors and fatal issues" : "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα", "Warnings, errors and fatal issues" : "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα", @@ -213,6 +212,11 @@ "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες", "Uninstall App" : "Απεγκατάσταση Εφαρμογής", "Enable experimental apps" : "Ενεργοποίηση πειραματικών εφαρμογών", + "Common Name" : "Κοινό Όνομα", + "Valid until" : "Έγκυρο έως", + "Issued By" : "Έκδόθηκε από", + "Valid until %s" : "Έγκυρο έως %s", + "Import root certificate" : "Εισαγωγή Πιστοποιητικού Root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Χαίρεται,<br><br>απλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.<br><br>Το όνομά σας είναι: %s<br>Έχετε πρόσβαση: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Χαιρετισμούς!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Χαίρεται, \nαπλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.\nΤο όνομά σας είναι: %s\nΈχετε πρόσβαση: %s\n", @@ -244,11 +248,6 @@ "iOS app" : "Εφαρμογή iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Εάν θέλετε να υποστηρίξετε το έργο\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">συμμετέχετε στην ανάπτυξη</a>\n\t\tή\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">διαδόστε το μήνυμα</a>!", "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά", - "Common Name" : "Κοινό Όνομα", - "Valid until" : "Έγκυρο έως", - "Issued By" : "Έκδόθηκε από", - "Valid until %s" : "Έγκυρο έως %s", - "Import root certificate" : "Εισαγωγή Πιστοποιητικού Root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Αναπτύχθηκε από την {communityopen} κοινότητα του ownCloud {linkclose}, ο {githubopen} πηγαίος κώδικας {linkclose} έχει την άδεια της {licenseopen} <abbr title = \"Affero General Public License\"> AGPL </ abbr> {linkclose}.", "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης", "Show last log in" : "Εμφάνιση τελευταίας εισόδου", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index 1554a7398ce..ed661b38320 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -73,15 +73,15 @@ OC.L10N.register( "Uninstalling ...." : "Uninstalling...", "Error while uninstalling app" : "Error whilst uninstalling app", "Uninstall" : "Uninstall", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.", + "Valid until {date}" : "Valid until {date}", + "Delete" : "Delete", "Select a profile picture" : "Select a profile picture", "Very weak password" : "Very weak password", "Weak password" : "Weak password", "So-so password" : "So-so password", "Good password" : "Good password", "Strong password" : "Strong password", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.", - "Valid until {date}" : "Valid until {date}", - "Delete" : "Delete", "Groups" : "Groups", "Unable to delete {objName}" : "Unable to delete {objName}", "Error creating group" : "Error creating group", @@ -100,7 +100,6 @@ OC.L10N.register( "__language_name__" : "English (British English)", "Personal info" : "Personal info", "Sync clients" : "Sync clients", - "SSL root certificates" : "SSL root certificates", "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)", "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues", "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues", @@ -194,6 +193,11 @@ OC.L10N.register( "Enable only for specific groups" : "Enable only for specific groups", "Uninstall App" : "Uninstall App", "Enable experimental apps" : "Enable experimental apps", + "Common Name" : "Common Name", + "Valid until" : "Valid until", + "Issued By" : "Issued By", + "Valid until %s" : "Valid until %s", + "Import root certificate" : "Import root certificate", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Cheers!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n", @@ -225,11 +229,6 @@ OC.L10N.register( "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!", "Show First Run Wizard again" : "Show First Run Wizard again", - "Common Name" : "Common Name", - "Valid until" : "Valid until", - "Issued By" : "Issued By", - "Valid until %s" : "Valid until %s", - "Import root certificate" : "Import root certificate", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public Licence\">AGPL</abbr>{linkclose}.", "Show storage location" : "Show storage location", "Show last log in" : "Show last log in", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index 26d181c79a7..f8f795dc9e1 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -71,15 +71,15 @@ "Uninstalling ...." : "Uninstalling...", "Error while uninstalling app" : "Error whilst uninstalling app", "Uninstall" : "Uninstall", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.", + "Valid until {date}" : "Valid until {date}", + "Delete" : "Delete", "Select a profile picture" : "Select a profile picture", "Very weak password" : "Very weak password", "Weak password" : "Weak password", "So-so password" : "So-so password", "Good password" : "Good password", "Strong password" : "Strong password", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.", - "Valid until {date}" : "Valid until {date}", - "Delete" : "Delete", "Groups" : "Groups", "Unable to delete {objName}" : "Unable to delete {objName}", "Error creating group" : "Error creating group", @@ -98,7 +98,6 @@ "__language_name__" : "English (British English)", "Personal info" : "Personal info", "Sync clients" : "Sync clients", - "SSL root certificates" : "SSL root certificates", "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)", "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues", "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues", @@ -192,6 +191,11 @@ "Enable only for specific groups" : "Enable only for specific groups", "Uninstall App" : "Uninstall App", "Enable experimental apps" : "Enable experimental apps", + "Common Name" : "Common Name", + "Valid until" : "Valid until", + "Issued By" : "Issued By", + "Valid until %s" : "Valid until %s", + "Import root certificate" : "Import root certificate", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Cheers!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n", @@ -223,11 +227,6 @@ "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!", "Show First Run Wizard again" : "Show First Run Wizard again", - "Common Name" : "Common Name", - "Valid until" : "Valid until", - "Issued By" : "Issued By", - "Valid until %s" : "Valid until %s", - "Import root certificate" : "Import root certificate", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public Licence\">AGPL</abbr>{linkclose}.", "Show storage location" : "Show storage location", "Show last log in" : "Show last log in", diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js index b20acf08595..eb0c897346a 100644 --- a/settings/l10n/eo.js +++ b/settings/l10n/eo.js @@ -34,13 +34,13 @@ OC.L10N.register( "Uninstalling ...." : "Malinstalante...", "Error while uninstalling app" : "Eraris malinstalo de aplikaĵo", "Uninstall" : "Malinstali", + "Delete" : "Forigi", "Select a profile picture" : "Elekti profilan bildon", "Very weak password" : "Tre malforta pasvorto", "Weak password" : "Malforta pasvorto", "So-so password" : "Mezaĉa pasvorto", "Good password" : "Bona pasvorto", "Strong password" : "Forta pasvorto", - "Delete" : "Forigi", "Groups" : "Grupoj", "deleted {groupName}" : "{groupName} foriĝis", "undo" : "malfari", @@ -51,7 +51,6 @@ OC.L10N.register( "Error creating user" : "Eraris kreo de uzanto", "A valid password must be provided" : "Valida pasvorto devas proviziĝi", "__language_name__" : "Esperanto", - "SSL root certificates" : "Radikaj SSL-atestoj", "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)", "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj", "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj", diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json index b7269be2157..c7433c823fb 100644 --- a/settings/l10n/eo.json +++ b/settings/l10n/eo.json @@ -32,13 +32,13 @@ "Uninstalling ...." : "Malinstalante...", "Error while uninstalling app" : "Eraris malinstalo de aplikaĵo", "Uninstall" : "Malinstali", + "Delete" : "Forigi", "Select a profile picture" : "Elekti profilan bildon", "Very weak password" : "Tre malforta pasvorto", "Weak password" : "Malforta pasvorto", "So-so password" : "Mezaĉa pasvorto", "Good password" : "Bona pasvorto", "Strong password" : "Forta pasvorto", - "Delete" : "Forigi", "Groups" : "Grupoj", "deleted {groupName}" : "{groupName} foriĝis", "undo" : "malfari", @@ -49,7 +49,6 @@ "Error creating user" : "Eraris kreo de uzanto", "A valid password must be provided" : "Valida pasvorto devas proviziĝi", "__language_name__" : "Esperanto", - "SSL root certificates" : "Radikaj SSL-atestoj", "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)", "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj", "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 14b3aae612e..43880e037c1 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La aplicación ha sido activada pero necesita ser actualizada. Seras redirigido a la pagina de actualizariones en 5 segundos.", "App update" : "Actualización de aplicación", "No apps found for \"{query}\"" : "No se han encontrado aplicaciones para \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.", + "Valid until {date}" : "Válido hasta {date}", + "Delete" : "Eliminar", "An error occurred: {message}" : "Ocurrió un error: {message}", "Select a profile picture" : "Seleccionar una imagen de perfil", "Very weak password" : "Contraseña muy débil", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Contraseña pasable", "Good password" : "Contraseña buena", "Strong password" : "Contraseña muy buena", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.", - "Valid until {date}" : "Válido hasta {date}", - "Delete" : "Eliminar", "Groups" : "Grupos", "Unable to delete {objName}" : "No es posible eliminar {objName}", "Error creating group" : "Error al crear un grupo", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Castellano", "Personal info" : "Información personal", "Sync clients" : "Sincronizar clientes", - "SSL root certificates" : "Certificados raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)", "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales", "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales", @@ -212,6 +211,11 @@ OC.L10N.register( "Enable only for specific groups" : "Activar solamente para grupos específicos", "Uninstall App" : "Desinstalar aplicación", "Enable experimental apps" : "Habilitar aplicaciones experimentales", + "Common Name" : "Nombre común", + "Valid until" : "Válido hasta", + "Issued By" : "Emitido por", + "Valid until %s" : "Válido hasta %s", + "Import root certificate" : "Importar certificado raíz", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "¿Qué tal?,<br><br>este mensaje es para hacerle saber que ahora tiene una %s cuenta.<br><br>Su nombre de usuario: %s<br>Acceda en: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "¡Saludos!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n", @@ -243,11 +247,6 @@ OC.L10N.register( "iOS app" : "La aplicación de iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere colaborar con el proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">participe en el desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">difúndalo</a>!", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "Common Name" : "Nombre común", - "Valid until" : "Válido hasta", - "Issued By" : "Emitido por", - "Valid until %s" : "Válido hasta %s", - "Import root certificate" : "Importar certificado raíz", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad Owncloud{linkclose}, el {githubopen}código fuente{linkclose} está licenciado bajo {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 28304f4ca2e..d3d94db46b8 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La aplicación ha sido activada pero necesita ser actualizada. Seras redirigido a la pagina de actualizariones en 5 segundos.", "App update" : "Actualización de aplicación", "No apps found for \"{query}\"" : "No se han encontrado aplicaciones para \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.", + "Valid until {date}" : "Válido hasta {date}", + "Delete" : "Eliminar", "An error occurred: {message}" : "Ocurrió un error: {message}", "Select a profile picture" : "Seleccionar una imagen de perfil", "Very weak password" : "Contraseña muy débil", @@ -86,9 +89,6 @@ "So-so password" : "Contraseña pasable", "Good password" : "Contraseña buena", "Strong password" : "Contraseña muy buena", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.", - "Valid until {date}" : "Válido hasta {date}", - "Delete" : "Eliminar", "Groups" : "Grupos", "Unable to delete {objName}" : "No es posible eliminar {objName}", "Error creating group" : "Error al crear un grupo", @@ -107,7 +107,6 @@ "__language_name__" : "Castellano", "Personal info" : "Información personal", "Sync clients" : "Sincronizar clientes", - "SSL root certificates" : "Certificados raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)", "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales", "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales", @@ -210,6 +209,11 @@ "Enable only for specific groups" : "Activar solamente para grupos específicos", "Uninstall App" : "Desinstalar aplicación", "Enable experimental apps" : "Habilitar aplicaciones experimentales", + "Common Name" : "Nombre común", + "Valid until" : "Válido hasta", + "Issued By" : "Emitido por", + "Valid until %s" : "Válido hasta %s", + "Import root certificate" : "Importar certificado raíz", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "¿Qué tal?,<br><br>este mensaje es para hacerle saber que ahora tiene una %s cuenta.<br><br>Su nombre de usuario: %s<br>Acceda en: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "¡Saludos!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n", @@ -241,11 +245,6 @@ "iOS app" : "La aplicación de iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere colaborar con el proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">participe en el desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">difúndalo</a>!", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "Common Name" : "Nombre común", - "Valid until" : "Válido hasta", - "Issued By" : "Emitido por", - "Valid until %s" : "Válido hasta %s", - "Import root certificate" : "Importar certificado raíz", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad Owncloud{linkclose}, el {githubopen}código fuente{linkclose} está licenciado bajo {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js index 50a1ce3a088..fea90cd2598 100644 --- a/settings/l10n/es_AR.js +++ b/settings/l10n/es_AR.js @@ -37,13 +37,13 @@ OC.L10N.register( "Updating...." : "Actualizando....", "Error while updating app" : "Error al actualizar App", "Updated" : "Actualizado", + "Delete" : "Borrar", "Select a profile picture" : "Seleccionar una imágen de perfil", "Very weak password" : "Contraseña muy débil.", "Weak password" : "Contraseña débil.", "So-so password" : "Contraseña de nivel medio. ", "Good password" : "Buena contraseña. ", "Strong password" : "Contraseña fuerte.", - "Delete" : "Borrar", "Groups" : "Grupos", "undo" : "deshacer", "never" : "nunca", @@ -52,7 +52,6 @@ OC.L10N.register( "Error creating user" : "Error creando usuario", "A valid password must be provided" : "Debe ingresar una contraseña válida", "__language_name__" : "Castellano (Argentina)", - "SSL root certificates" : "certificados SSL raíz", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (notificaciones fatales, errores, advertencias, info, debug)", "Info, warnings, errors and fatal issues" : "Info, advertencias, errores y notificaciones fatales", "Warnings, errors and fatal issues" : "Advertencias, errores y notificaciones fatales", diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json index 27c645a0a28..da5ebdea55a 100644 --- a/settings/l10n/es_AR.json +++ b/settings/l10n/es_AR.json @@ -35,13 +35,13 @@ "Updating...." : "Actualizando....", "Error while updating app" : "Error al actualizar App", "Updated" : "Actualizado", + "Delete" : "Borrar", "Select a profile picture" : "Seleccionar una imágen de perfil", "Very weak password" : "Contraseña muy débil.", "Weak password" : "Contraseña débil.", "So-so password" : "Contraseña de nivel medio. ", "Good password" : "Buena contraseña. ", "Strong password" : "Contraseña fuerte.", - "Delete" : "Borrar", "Groups" : "Grupos", "undo" : "deshacer", "never" : "nunca", @@ -50,7 +50,6 @@ "Error creating user" : "Error creando usuario", "A valid password must be provided" : "Debe ingresar una contraseña válida", "__language_name__" : "Castellano (Argentina)", - "SSL root certificates" : "certificados SSL raíz", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (notificaciones fatales, errores, advertencias, info, debug)", "Info, warnings, errors and fatal issues" : "Info, advertencias, errores y notificaciones fatales", "Warnings, errors and fatal issues" : "Advertencias, errores y notificaciones fatales", diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js index 2707bc09449..cc306f24446 100644 --- a/settings/l10n/es_MX.js +++ b/settings/l10n/es_MX.js @@ -32,8 +32,8 @@ OC.L10N.register( "Updating...." : "Actualizando....", "Error while updating app" : "Error mientras se actualizaba la aplicación", "Updated" : "Actualizado", - "Select a profile picture" : "Seleccionar una imagen de perfil", "Delete" : "Eliminar", + "Select a profile picture" : "Seleccionar una imagen de perfil", "Groups" : "Grupos", "undo" : "deshacer", "never" : "nunca", @@ -42,7 +42,6 @@ OC.L10N.register( "Error creating user" : "Error al crear usuario", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "__language_name__" : "Español (México)", - "SSL root certificates" : "Certificados raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)", "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales", "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales", diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json index a9d2f6bc15d..354e7479f9a 100644 --- a/settings/l10n/es_MX.json +++ b/settings/l10n/es_MX.json @@ -30,8 +30,8 @@ "Updating...." : "Actualizando....", "Error while updating app" : "Error mientras se actualizaba la aplicación", "Updated" : "Actualizado", - "Select a profile picture" : "Seleccionar una imagen de perfil", "Delete" : "Eliminar", + "Select a profile picture" : "Seleccionar una imagen de perfil", "Groups" : "Grupos", "undo" : "deshacer", "never" : "nunca", @@ -40,7 +40,6 @@ "Error creating user" : "Error al crear usuario", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "__language_name__" : "Español (México)", - "SSL root certificates" : "Certificados raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)", "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales", "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales", diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js index 4f6f938fdf7..05e69603838 100644 --- a/settings/l10n/et_EE.js +++ b/settings/l10n/et_EE.js @@ -69,14 +69,14 @@ OC.L10N.register( "Error while uninstalling app" : "Viga rakendi eemaldamisel", "Uninstall" : "Eemalda", "App update" : "Rakenduse uuendus", + "Valid until {date}" : "Kehtib kuni {date}", + "Delete" : "Kustuta", "Select a profile picture" : "Vali profiili pilt", "Very weak password" : "Väga nõrk parool", "Weak password" : "Nõrk parool", "So-so password" : "Enam-vähem sobiv parool", "Good password" : "Hea parool", "Strong password" : "Väga hea parool", - "Valid until {date}" : "Kehtib kuni {date}", - "Delete" : "Kustuta", "Groups" : "Grupid", "Unable to delete {objName}" : "Ei suuda kustutada {objName}", "Error creating group" : "Viga grupi loomisel", @@ -94,7 +94,6 @@ OC.L10N.register( "__language_name__" : "Eesti", "Personal info" : "Isiklik info", "Sync clients" : "Klientide sünkroniseerimine", - "SSL root certificates" : "SSL root sertifikaadid", "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)", "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid", "Warnings, errors and fatal issues" : "Hoiatused, veateated ja tõsised probleemid", @@ -174,6 +173,11 @@ OC.L10N.register( "Enable only for specific groups" : "Luba ainult kindlad grupid", "Uninstall App" : "Eemada rakend", "Enable experimental apps" : "Luba katsetusjärgus rakenduste kasutamine", + "Common Name" : "Üldnimetus", + "Valid until" : "Kehtib kuni", + "Issued By" : "isas", + "Valid until %s" : "Kehtib kuni %s", + "Import root certificate" : "Impordi root sertifikaat", "Cheers!" : "Terekest!", "Administrator documentation" : "Administraatori dokumentatsioon", "Online documentation" : "Võrgus olev dokumentatsioon", @@ -202,11 +206,6 @@ OC.L10N.register( "Android app" : "Androidi rakendus", "iOS app" : "iOS-i rakendus", "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat", - "Common Name" : "Üldnimetus", - "Valid until" : "Kehtib kuni", - "Issued By" : "isas", - "Valid until %s" : "Kehtib kuni %s", - "Import root certificate" : "Impordi root sertifikaat", "Show storage location" : "Näita salvestusruumi asukohta", "Show last log in" : "Viimane sisselogimine", "Send email to new user" : "Saada uuele kasutajale e-kiri", diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json index 88e8f6cf58a..febb2fe5915 100644 --- a/settings/l10n/et_EE.json +++ b/settings/l10n/et_EE.json @@ -67,14 +67,14 @@ "Error while uninstalling app" : "Viga rakendi eemaldamisel", "Uninstall" : "Eemalda", "App update" : "Rakenduse uuendus", + "Valid until {date}" : "Kehtib kuni {date}", + "Delete" : "Kustuta", "Select a profile picture" : "Vali profiili pilt", "Very weak password" : "Väga nõrk parool", "Weak password" : "Nõrk parool", "So-so password" : "Enam-vähem sobiv parool", "Good password" : "Hea parool", "Strong password" : "Väga hea parool", - "Valid until {date}" : "Kehtib kuni {date}", - "Delete" : "Kustuta", "Groups" : "Grupid", "Unable to delete {objName}" : "Ei suuda kustutada {objName}", "Error creating group" : "Viga grupi loomisel", @@ -92,7 +92,6 @@ "__language_name__" : "Eesti", "Personal info" : "Isiklik info", "Sync clients" : "Klientide sünkroniseerimine", - "SSL root certificates" : "SSL root sertifikaadid", "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)", "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid", "Warnings, errors and fatal issues" : "Hoiatused, veateated ja tõsised probleemid", @@ -172,6 +171,11 @@ "Enable only for specific groups" : "Luba ainult kindlad grupid", "Uninstall App" : "Eemada rakend", "Enable experimental apps" : "Luba katsetusjärgus rakenduste kasutamine", + "Common Name" : "Üldnimetus", + "Valid until" : "Kehtib kuni", + "Issued By" : "isas", + "Valid until %s" : "Kehtib kuni %s", + "Import root certificate" : "Impordi root sertifikaat", "Cheers!" : "Terekest!", "Administrator documentation" : "Administraatori dokumentatsioon", "Online documentation" : "Võrgus olev dokumentatsioon", @@ -200,11 +204,6 @@ "Android app" : "Androidi rakendus", "iOS app" : "iOS-i rakendus", "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat", - "Common Name" : "Üldnimetus", - "Valid until" : "Kehtib kuni", - "Issued By" : "isas", - "Valid until %s" : "Kehtib kuni %s", - "Import root certificate" : "Impordi root sertifikaat", "Show storage location" : "Näita salvestusruumi asukohta", "Show last log in" : "Viimane sisselogimine", "Send email to new user" : "Saada uuele kasutajale e-kiri", diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js index 4d77ef9a5c4..4d41948ef76 100644 --- a/settings/l10n/eu.js +++ b/settings/l10n/eu.js @@ -56,14 +56,14 @@ OC.L10N.register( "Uninstalling ...." : "Desinstalatzen ...", "Error while uninstalling app" : "Erroea izan da aplikazioa desinstalatzerakoan", "Uninstall" : "Desinstalatu", + "Valid until {date}" : "{date} arte baliogarria", + "Delete" : "Ezabatu", "Select a profile picture" : "Profilaren irudia aukeratu", "Very weak password" : "Pasahitz oso ahula", "Weak password" : "Pasahitz ahula", "So-so password" : "Halamoduzko pasahitza", "Good password" : "Pasahitz ona", "Strong password" : "Pasahitz sendoa", - "Valid until {date}" : "{date} arte baliogarria", - "Delete" : "Ezabatu", "Groups" : "Taldeak", "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu", "Error creating group" : "Errore bat izan da taldea sortzean", @@ -80,7 +80,6 @@ OC.L10N.register( "A valid password must be provided" : "Baliozko pasahitza eman behar da", "A valid email must be provided" : "Baliozko posta elektronikoa eman behar da", "__language_name__" : "Euskara", - "SSL root certificates" : "SSL erro ziurtagiriak", "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)", "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.", "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak", @@ -144,6 +143,10 @@ OC.L10N.register( "This app cannot be installed because the following dependencies are not fulfilled:" : "Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako:", "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako", "Uninstall App" : "Desinstalatu aplikazioa", + "Common Name" : "Izen arrunta", + "Valid until" : "Data hau arte baliogarria", + "Issued By" : "Honek bidalita", + "Valid until %s" : "%s arte baliogarria", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ongi izan!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Kaixo,\n\norain %s kontu bat duzula esateko besterik ez.\n\nZure erabiltzailea: %s\nSar zaitez: %s\n\n", @@ -168,10 +171,6 @@ OC.L10N.register( "Android app" : "Android aplikazioa", "iOS app" : "iOS aplikazioa", "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia", - "Common Name" : "Izen arrunta", - "Valid until" : "Data hau arte baliogarria", - "Issued By" : "Honek bidalita", - "Valid until %s" : "%s arte baliogarria", "Show storage location" : "Erakutsi biltegiaren kokapena", "Show last log in" : "Erakutsi azkeneko saio hasiera", "Show user backend" : "Bistaratu erabiltzaile motorra", diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json index 9a1048e4734..fee3fe40221 100644 --- a/settings/l10n/eu.json +++ b/settings/l10n/eu.json @@ -54,14 +54,14 @@ "Uninstalling ...." : "Desinstalatzen ...", "Error while uninstalling app" : "Erroea izan da aplikazioa desinstalatzerakoan", "Uninstall" : "Desinstalatu", + "Valid until {date}" : "{date} arte baliogarria", + "Delete" : "Ezabatu", "Select a profile picture" : "Profilaren irudia aukeratu", "Very weak password" : "Pasahitz oso ahula", "Weak password" : "Pasahitz ahula", "So-so password" : "Halamoduzko pasahitza", "Good password" : "Pasahitz ona", "Strong password" : "Pasahitz sendoa", - "Valid until {date}" : "{date} arte baliogarria", - "Delete" : "Ezabatu", "Groups" : "Taldeak", "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu", "Error creating group" : "Errore bat izan da taldea sortzean", @@ -78,7 +78,6 @@ "A valid password must be provided" : "Baliozko pasahitza eman behar da", "A valid email must be provided" : "Baliozko posta elektronikoa eman behar da", "__language_name__" : "Euskara", - "SSL root certificates" : "SSL erro ziurtagiriak", "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)", "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.", "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak", @@ -142,6 +141,10 @@ "This app cannot be installed because the following dependencies are not fulfilled:" : "Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako:", "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako", "Uninstall App" : "Desinstalatu aplikazioa", + "Common Name" : "Izen arrunta", + "Valid until" : "Data hau arte baliogarria", + "Issued By" : "Honek bidalita", + "Valid until %s" : "%s arte baliogarria", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ongi izan!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Kaixo,\n\norain %s kontu bat duzula esateko besterik ez.\n\nZure erabiltzailea: %s\nSar zaitez: %s\n\n", @@ -166,10 +169,6 @@ "Android app" : "Android aplikazioa", "iOS app" : "iOS aplikazioa", "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia", - "Common Name" : "Izen arrunta", - "Valid until" : "Data hau arte baliogarria", - "Issued By" : "Honek bidalita", - "Valid until %s" : "%s arte baliogarria", "Show storage location" : "Erakutsi biltegiaren kokapena", "Show last log in" : "Erakutsi azkeneko saio hasiera", "Show user backend" : "Bistaratu erabiltzaile motorra", diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js index afd972bde7f..f31c2a53cfc 100644 --- a/settings/l10n/fa.js +++ b/settings/l10n/fa.js @@ -66,6 +66,8 @@ OC.L10N.register( "Error while uninstalling app" : "خطا در هنگام حذف برنامه....", "Uninstall" : "حذف", "App update" : "به روز رسانی برنامه", + "Valid until {date}" : "معتبر تا {date}", + "Delete" : "حذف", "An error occurred: {message}" : "یک خطا رخداده است: {message}", "Select a profile picture" : "انتخاب تصویر پروفایل", "Very weak password" : "رمز عبور بسیار ضعیف", @@ -73,8 +75,6 @@ OC.L10N.register( "So-so password" : "رمز عبور متوسط", "Good password" : "رمز عبور خوب", "Strong password" : "رمز عبور قوی", - "Valid until {date}" : "معتبر تا {date}", - "Delete" : "حذف", "Groups" : "گروه ها", "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد", "Error creating group" : "خطا در هنگام ایجاد کروه", @@ -93,7 +93,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "مشخصات شخصی", "Sync clients" : "همگامسازی مشتریان", - "SSL root certificates" : "گواهی های اصلی SSL ", "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)", "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی", "Warnings, errors and fatal issues" : "اخطارها، خطاها، مشکلات مهلک", @@ -165,6 +164,11 @@ OC.L10N.register( "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص", "Uninstall App" : "حذف برنامه", "Enable experimental apps" : "فعالسازی برنامههای آزمایشی", + "Common Name" : "نام مشترک", + "Valid until" : "متعبر تا", + "Issued By" : "صدور توسط", + "Valid until %s" : "متعبر تا %s", + "Import root certificate" : "وارد کردن گواهی اصلی", "Cheers!" : "سلامتی!", "Administrator documentation" : "مستندات مدیر", "Online documentation" : "مستندات آنلاین", @@ -192,11 +196,6 @@ OC.L10N.register( "Android app" : "اپ اندروید", "iOS app" : "اپ iOS", "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده", - "Common Name" : "نام مشترک", - "Valid until" : "متعبر تا", - "Issued By" : "صدور توسط", - "Valid until %s" : "متعبر تا %s", - "Import root certificate" : "وارد کردن گواهی اصلی", "Show storage location" : "نمایش محل ذخیرهسازی", "Show last log in" : "نمایش اخرین ورود", "Send email to new user" : "ارسال ایمیل به کاربر جدید", diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json index a45eed20cd9..c04b740b518 100644 --- a/settings/l10n/fa.json +++ b/settings/l10n/fa.json @@ -64,6 +64,8 @@ "Error while uninstalling app" : "خطا در هنگام حذف برنامه....", "Uninstall" : "حذف", "App update" : "به روز رسانی برنامه", + "Valid until {date}" : "معتبر تا {date}", + "Delete" : "حذف", "An error occurred: {message}" : "یک خطا رخداده است: {message}", "Select a profile picture" : "انتخاب تصویر پروفایل", "Very weak password" : "رمز عبور بسیار ضعیف", @@ -71,8 +73,6 @@ "So-so password" : "رمز عبور متوسط", "Good password" : "رمز عبور خوب", "Strong password" : "رمز عبور قوی", - "Valid until {date}" : "معتبر تا {date}", - "Delete" : "حذف", "Groups" : "گروه ها", "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد", "Error creating group" : "خطا در هنگام ایجاد کروه", @@ -91,7 +91,6 @@ "__language_name__" : "__language_name__", "Personal info" : "مشخصات شخصی", "Sync clients" : "همگامسازی مشتریان", - "SSL root certificates" : "گواهی های اصلی SSL ", "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)", "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی", "Warnings, errors and fatal issues" : "اخطارها، خطاها، مشکلات مهلک", @@ -163,6 +162,11 @@ "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص", "Uninstall App" : "حذف برنامه", "Enable experimental apps" : "فعالسازی برنامههای آزمایشی", + "Common Name" : "نام مشترک", + "Valid until" : "متعبر تا", + "Issued By" : "صدور توسط", + "Valid until %s" : "متعبر تا %s", + "Import root certificate" : "وارد کردن گواهی اصلی", "Cheers!" : "سلامتی!", "Administrator documentation" : "مستندات مدیر", "Online documentation" : "مستندات آنلاین", @@ -190,11 +194,6 @@ "Android app" : "اپ اندروید", "iOS app" : "اپ iOS", "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده", - "Common Name" : "نام مشترک", - "Valid until" : "متعبر تا", - "Issued By" : "صدور توسط", - "Valid until %s" : "متعبر تا %s", - "Import root certificate" : "وارد کردن گواهی اصلی", "Show storage location" : "نمایش محل ذخیرهسازی", "Show last log in" : "نمایش اخرین ورود", "Send email to new user" : "ارسال ایمیل به کاربر جدید", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 5d52363c1c7..467a80f9c92 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -80,6 +80,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Tämä sovellus on otettu käyttöön, mutta se vaatii päivityksen. Sinut ohjataan päivityssivulle viiden sekunnin kuluttua.", "App update" : "Sovelluspäivitys", "No apps found for \"{query}\"" : "Haulla \"{query}\" ei löytynyt sovelluksia", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.", + "Valid until {date}" : "Kelvollinen {date} asti", + "Delete" : "Poista", "An error occurred: {message}" : "Tapahtui virhe: {message}", "Select a profile picture" : "Valitse profiilikuva", "Very weak password" : "Erittäin heikko salasana", @@ -87,9 +90,6 @@ OC.L10N.register( "So-so password" : "Kohtalainen salasana", "Good password" : "Hyvä salasana", "Strong password" : "Vahva salasana", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.", - "Valid until {date}" : "Kelvollinen {date} asti", - "Delete" : "Poista", "Groups" : "Ryhmät", "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui", "Error creating group" : "Virhe ryhmää luotaessa", @@ -108,7 +108,6 @@ OC.L10N.register( "__language_name__" : "_kielen_nimi_", "Personal info" : "Henkilökohtaiset tiedot", "Sync clients" : "Synkronointisovellukset", - "SSL root certificates" : "SSL-juurivarmenteet", "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)", "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat", "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat", @@ -209,6 +208,11 @@ OC.L10N.register( "Enable only for specific groups" : "Salli vain tietyille ryhmille", "Uninstall App" : "Poista sovelluksen asennus", "Enable experimental apps" : "Käytä kokeiluasteella olevia sovelluksia", + "Common Name" : "Yleinen nimi", + "Valid until" : "Kelvollinen", + "Issued By" : " Myöntänyt", + "Valid until %s" : "Kelvollinen %s asti", + "Import root certificate" : "Tuo juurivarmenne", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei<br><br>Sinulla on nyt %s-tili.<br><br>Käyttäjätunnus: %s<br>Aloita käyttö: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Kippis!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei\n\nSinulla on nyt %s-tili.\n\nKäyttäjätunnuksesi: %s\nAloita käyttö: %s\n\n", @@ -246,11 +250,6 @@ OC.L10N.register( "iOS app" : "iOS-sovellus", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jos haluat tukea projektia, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">auta sovelluskehityksessä</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">levitä sanaa</a>!", "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen", - "Common Name" : "Yleinen nimi", - "Valid until" : "Kelvollinen", - "Issued By" : " Myöntänyt", - "Valid until %s" : "Kelvollinen %s asti", - "Import root certificate" : "Tuo juurivarmenne", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Kehityksestä on vastannut {communityopen}ownCloud-yhteisö{linkclose}, {githubopen}lähdekoodi{linkclose} on {licenseopen}<abbr title=\"Affero General Public License\">AGPL-lisensoitu</abbr>{linkclose}.", "Show storage location" : "Näytä tallennustilan sijainti", "Show last log in" : "Näytä viimeisin sisäänkirjautuminen", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index 51460eefe1a..07a702029d4 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -78,6 +78,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Tämä sovellus on otettu käyttöön, mutta se vaatii päivityksen. Sinut ohjataan päivityssivulle viiden sekunnin kuluttua.", "App update" : "Sovelluspäivitys", "No apps found for \"{query}\"" : "Haulla \"{query}\" ei löytynyt sovelluksia", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.", + "Valid until {date}" : "Kelvollinen {date} asti", + "Delete" : "Poista", "An error occurred: {message}" : "Tapahtui virhe: {message}", "Select a profile picture" : "Valitse profiilikuva", "Very weak password" : "Erittäin heikko salasana", @@ -85,9 +88,6 @@ "So-so password" : "Kohtalainen salasana", "Good password" : "Hyvä salasana", "Strong password" : "Vahva salasana", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.", - "Valid until {date}" : "Kelvollinen {date} asti", - "Delete" : "Poista", "Groups" : "Ryhmät", "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui", "Error creating group" : "Virhe ryhmää luotaessa", @@ -106,7 +106,6 @@ "__language_name__" : "_kielen_nimi_", "Personal info" : "Henkilökohtaiset tiedot", "Sync clients" : "Synkronointisovellukset", - "SSL root certificates" : "SSL-juurivarmenteet", "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)", "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat", "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat", @@ -207,6 +206,11 @@ "Enable only for specific groups" : "Salli vain tietyille ryhmille", "Uninstall App" : "Poista sovelluksen asennus", "Enable experimental apps" : "Käytä kokeiluasteella olevia sovelluksia", + "Common Name" : "Yleinen nimi", + "Valid until" : "Kelvollinen", + "Issued By" : " Myöntänyt", + "Valid until %s" : "Kelvollinen %s asti", + "Import root certificate" : "Tuo juurivarmenne", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei<br><br>Sinulla on nyt %s-tili.<br><br>Käyttäjätunnus: %s<br>Aloita käyttö: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Kippis!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei\n\nSinulla on nyt %s-tili.\n\nKäyttäjätunnuksesi: %s\nAloita käyttö: %s\n\n", @@ -244,11 +248,6 @@ "iOS app" : "iOS-sovellus", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jos haluat tukea projektia, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">auta sovelluskehityksessä</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">levitä sanaa</a>!", "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen", - "Common Name" : "Yleinen nimi", - "Valid until" : "Kelvollinen", - "Issued By" : " Myöntänyt", - "Valid until %s" : "Kelvollinen %s asti", - "Import root certificate" : "Tuo juurivarmenne", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Kehityksestä on vastannut {communityopen}ownCloud-yhteisö{linkclose}, {githubopen}lähdekoodi{linkclose} on {licenseopen}<abbr title=\"Affero General Public License\">AGPL-lisensoitu</abbr>{linkclose}.", "Show storage location" : "Näytä tallennustilan sijainti", "Show last log in" : "Näytä viimeisin sisäänkirjautuminen", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index 195855670ca..09ce07fd81b 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'application a été activée mais doit être mise à jour. Vous allez être redirigé vers la page des mises à jour dans 5 secondes.", "App update" : "Mise à jour", "No apps found for \"{query}\"" : "Aucune application trouvée pour \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.", + "Valid until {date}" : "Valide jusqu'au {date}", + "Delete" : "Supprimer", "An error occurred: {message}" : "Une erreur est survenue : {message}", "Select a profile picture" : "Selectionnez une photo de profil ", "Very weak password" : "Mot de passe de très faible sécurité", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Mot de passe de sécurité tout juste acceptable", "Good password" : "Mot de passe de sécurité suffisante", "Strong password" : "Mot de passe de forte sécurité", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.", - "Valid until {date}" : "Valide jusqu'au {date}", - "Delete" : "Supprimer", "Groups" : "Groupes", "Unable to delete {objName}" : "Impossible de supprimer {objName}", "Error creating group" : "Erreur lors de la création du groupe", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Français", "Personal info" : "Informations personnelles", "Sync clients" : "Clients de synchronisation", - "SSL root certificates" : "Certificats racine SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)", "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales", "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales", @@ -212,10 +211,17 @@ OC.L10N.register( "Admin documentation" : "Documentation administrateur", "Show description …" : "Afficher la description...", "Hide description …" : "Masquer la description", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app n'a pas de version ownCloud assigné minimal. Ca sera une erreur dans ownCloud 11 et plus.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app n'a pas de version ownCloud assigné maximum. Ca sera une erreur dans ownCloud 11 et plus.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :", "Enable only for specific groups" : "Activer uniquement pour certains groupes", "Uninstall App" : "Désinstaller l'application", "Enable experimental apps" : "Activer les applications expérimentales", + "Common Name" : "Nom d'usage", + "Valid until" : "Valide jusqu'à", + "Issued By" : "Délivré par", + "Valid until %s" : "Valide jusqu'à %s", + "Import root certificate" : "Importer un certificat racine", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : <a href=\"%s\">%s</a><br><br>", "Cheers!" : "À bientôt !", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : %s<br><br>\n", @@ -230,12 +236,14 @@ OC.L10N.register( "Select from Files" : "Sélectionner depuis les Fichiers", "Remove image" : "Supprimer l'image", "png or jpg, max. 20 MB" : "png ou jpg, max. 20Mo", + "Picture provided by original account" : "Photo fournit par le compte original", "Cancel" : "Annuler", "Choose as profile picture" : "Choisir une image de profil", "Full name" : "Nom complet", "No display name set" : "Aucun nom d'affichage configuré", "Email" : "Adresse e-mail", "Your email address" : "Votre adresse e-mail", + "For password recovery and notifications" : "Pour le rappel de mot de passe et les notifications", "No email address set" : "Aucune adresse e-mail configurée", "You are member of the following groups:" : "Vous êtes membre des groupes suivants :", "Password" : "Mot de passe", @@ -251,11 +259,6 @@ OC.L10N.register( "iOS app" : "Application iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous souhaitez apporter votre support au projet\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejoignez le développement</a>\n ou\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">faites passer le mot</a> !", "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion", - "Common Name" : "Nom d'usage", - "Valid until" : "Valide jusqu'à", - "Issued By" : "Délivré par", - "Valid until %s" : "Valide jusqu'à %s", - "Import root certificate" : "Importer un certificat racine", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la {communityopen}communauté ownCloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Afficher l'emplacement du stockage", "Show last log in" : "Montrer la dernière connexion", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 1acb7f00f8a..753b9cda408 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'application a été activée mais doit être mise à jour. Vous allez être redirigé vers la page des mises à jour dans 5 secondes.", "App update" : "Mise à jour", "No apps found for \"{query}\"" : "Aucune application trouvée pour \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.", + "Valid until {date}" : "Valide jusqu'au {date}", + "Delete" : "Supprimer", "An error occurred: {message}" : "Une erreur est survenue : {message}", "Select a profile picture" : "Selectionnez une photo de profil ", "Very weak password" : "Mot de passe de très faible sécurité", @@ -86,9 +89,6 @@ "So-so password" : "Mot de passe de sécurité tout juste acceptable", "Good password" : "Mot de passe de sécurité suffisante", "Strong password" : "Mot de passe de forte sécurité", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.", - "Valid until {date}" : "Valide jusqu'au {date}", - "Delete" : "Supprimer", "Groups" : "Groupes", "Unable to delete {objName}" : "Impossible de supprimer {objName}", "Error creating group" : "Erreur lors de la création du groupe", @@ -107,7 +107,6 @@ "__language_name__" : "Français", "Personal info" : "Informations personnelles", "Sync clients" : "Clients de synchronisation", - "SSL root certificates" : "Certificats racine SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)", "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales", "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales", @@ -210,10 +209,17 @@ "Admin documentation" : "Documentation administrateur", "Show description …" : "Afficher la description...", "Hide description …" : "Masquer la description", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app n'a pas de version ownCloud assigné minimal. Ca sera une erreur dans ownCloud 11 et plus.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app n'a pas de version ownCloud assigné maximum. Ca sera une erreur dans ownCloud 11 et plus.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :", "Enable only for specific groups" : "Activer uniquement pour certains groupes", "Uninstall App" : "Désinstaller l'application", "Enable experimental apps" : "Activer les applications expérimentales", + "Common Name" : "Nom d'usage", + "Valid until" : "Valide jusqu'à", + "Issued By" : "Délivré par", + "Valid until %s" : "Valide jusqu'à %s", + "Import root certificate" : "Importer un certificat racine", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : <a href=\"%s\">%s</a><br><br>", "Cheers!" : "À bientôt !", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : %s<br><br>\n", @@ -228,12 +234,14 @@ "Select from Files" : "Sélectionner depuis les Fichiers", "Remove image" : "Supprimer l'image", "png or jpg, max. 20 MB" : "png ou jpg, max. 20Mo", + "Picture provided by original account" : "Photo fournit par le compte original", "Cancel" : "Annuler", "Choose as profile picture" : "Choisir une image de profil", "Full name" : "Nom complet", "No display name set" : "Aucun nom d'affichage configuré", "Email" : "Adresse e-mail", "Your email address" : "Votre adresse e-mail", + "For password recovery and notifications" : "Pour le rappel de mot de passe et les notifications", "No email address set" : "Aucune adresse e-mail configurée", "You are member of the following groups:" : "Vous êtes membre des groupes suivants :", "Password" : "Mot de passe", @@ -249,11 +257,6 @@ "iOS app" : "Application iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous souhaitez apporter votre support au projet\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejoignez le développement</a>\n ou\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">faites passer le mot</a> !", "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion", - "Common Name" : "Nom d'usage", - "Valid until" : "Valide jusqu'à", - "Issued By" : "Délivré par", - "Valid until %s" : "Valide jusqu'à %s", - "Import root certificate" : "Importer un certificat racine", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la {communityopen}communauté ownCloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Afficher l'emplacement du stockage", "Show last log in" : "Montrer la dernière connexion", diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js index 01f6d7cde1f..cc6d1fb5472 100644 --- a/settings/l10n/gl.js +++ b/settings/l10n/gl.js @@ -78,6 +78,9 @@ OC.L10N.register( "Uninstalling ...." : "Desinstalando ...", "Error while uninstalling app" : "Produciuse un erro ao desinstalar o aplicatvo", "Uninstall" : "Desinstalar", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.", + "Valid until {date}" : "Válido ata {date}", + "Delete" : "Eliminar", "An error occurred: {message}" : "Produciuse un erro: {message}", "Select a profile picture" : "Seleccione unha imaxe para o perfil", "Very weak password" : "Contrasinal moi feble", @@ -85,9 +88,6 @@ OC.L10N.register( "So-so password" : "Contrasinal non moi aló", "Good password" : "Bo contrasinal", "Strong password" : "Contrasinal forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.", - "Valid until {date}" : "Válido ata {date}", - "Delete" : "Eliminar", "Groups" : "Grupos", "Unable to delete {objName}" : "Non é posíbel eliminar {objName}", "Error creating group" : "Produciuse un erro ao crear o grupo", @@ -106,7 +106,6 @@ OC.L10N.register( "__language_name__" : "Galego", "Personal info" : "Información persoal", "Sync clients" : "Clientes de sincronización", - "SSL root certificates" : "Certificados raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (incidencias críticas, erros, avisos, información, depuración)", "Info, warnings, errors and fatal issues" : "Información, avisos, erros e incidencias críticas", "Warnings, errors and fatal issues" : "Avisos, erros e incidencias críticas", @@ -202,6 +201,11 @@ OC.L10N.register( "Enable only for specific groups" : "Activar só para grupos específicos", "Uninstall App" : "Desinstalar unha aplicación", "Enable experimental apps" : "Activar as aplicacións experimentais", + "Common Name" : "Nome común", + "Valid until" : "Válido ata", + "Issued By" : "Fornecido por", + "Valid until %s" : "Válido ata %s", + "Import root certificate" : "Importar o certificado raíz", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ola,<br><br>Só facerlle saber que dispón da conta %s.<br><br>O seu nome de usuario: %s<br>Para acceder a ela: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Saúdos!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ola,\n\nSó facerlle saber que dispón da conta %s.\n\nO seu nome de usuario: %s\nPara acceder a ela: %s\n", @@ -233,11 +237,6 @@ OC.L10N.register( "iOS app" : "Aplicación iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quere axudar ao proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">únase ao desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalle a nova</a>!", "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez", - "Common Name" : "Nome común", - "Valid until" : "Válido ata", - "Issued By" : "Fornecido por", - "Valid until %s" : "Válido ata %s", - "Import root certificate" : "Importar o certificado raíz", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pola {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado baixo a {licenseopen}<abbr title=\"Licencia Pública Xeral Affero\">AGPL</abbr>{linkclose}.", "Show storage location" : "Amosar a localización do almacenamento", "Show last log in" : "Amosar a última conexión", diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json index 6e05a8c878d..516c5e6285b 100644 --- a/settings/l10n/gl.json +++ b/settings/l10n/gl.json @@ -76,6 +76,9 @@ "Uninstalling ...." : "Desinstalando ...", "Error while uninstalling app" : "Produciuse un erro ao desinstalar o aplicatvo", "Uninstall" : "Desinstalar", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.", + "Valid until {date}" : "Válido ata {date}", + "Delete" : "Eliminar", "An error occurred: {message}" : "Produciuse un erro: {message}", "Select a profile picture" : "Seleccione unha imaxe para o perfil", "Very weak password" : "Contrasinal moi feble", @@ -83,9 +86,6 @@ "So-so password" : "Contrasinal non moi aló", "Good password" : "Bo contrasinal", "Strong password" : "Contrasinal forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.", - "Valid until {date}" : "Válido ata {date}", - "Delete" : "Eliminar", "Groups" : "Grupos", "Unable to delete {objName}" : "Non é posíbel eliminar {objName}", "Error creating group" : "Produciuse un erro ao crear o grupo", @@ -104,7 +104,6 @@ "__language_name__" : "Galego", "Personal info" : "Información persoal", "Sync clients" : "Clientes de sincronización", - "SSL root certificates" : "Certificados raíz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (incidencias críticas, erros, avisos, información, depuración)", "Info, warnings, errors and fatal issues" : "Información, avisos, erros e incidencias críticas", "Warnings, errors and fatal issues" : "Avisos, erros e incidencias críticas", @@ -200,6 +199,11 @@ "Enable only for specific groups" : "Activar só para grupos específicos", "Uninstall App" : "Desinstalar unha aplicación", "Enable experimental apps" : "Activar as aplicacións experimentais", + "Common Name" : "Nome común", + "Valid until" : "Válido ata", + "Issued By" : "Fornecido por", + "Valid until %s" : "Válido ata %s", + "Import root certificate" : "Importar o certificado raíz", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ola,<br><br>Só facerlle saber que dispón da conta %s.<br><br>O seu nome de usuario: %s<br>Para acceder a ela: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Saúdos!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ola,\n\nSó facerlle saber que dispón da conta %s.\n\nO seu nome de usuario: %s\nPara acceder a ela: %s\n", @@ -231,11 +235,6 @@ "iOS app" : "Aplicación iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quere axudar ao proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">únase ao desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalle a nova</a>!", "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez", - "Common Name" : "Nome común", - "Valid until" : "Válido ata", - "Issued By" : "Fornecido por", - "Valid until %s" : "Válido ata %s", - "Import root certificate" : "Importar o certificado raíz", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pola {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado baixo a {licenseopen}<abbr title=\"Licencia Pública Xeral Affero\">AGPL</abbr>{linkclose}.", "Show storage location" : "Amosar a localización do almacenamento", "Show last log in" : "Amosar a última conexión", diff --git a/settings/l10n/he.js b/settings/l10n/he.js index 6d14b1a0904..8352ec614b8 100644 --- a/settings/l10n/he.js +++ b/settings/l10n/he.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "היישום הופעל אך יש לעדכן אותו. בעוד 5 שניות הדף ינותב לעמוד העדכון.", "App update" : "עדכון יישום", "No apps found for \"{query}\"" : "לא נמצא יישום עבור \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "אירעה שגיאה. יש להעלות תעודת ASCII-encoded PEM.", + "Valid until {date}" : "בתוקף עד ל- {date}", + "Delete" : "מחיקה", "An error occurred: {message}" : "אירעה שגיאה: {message}", "Select a profile picture" : "יש לבחור תמונת פרופיל", "Very weak password" : "סיסמא מאוד חלשה", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "סיסמא ככה-ככה", "Good password" : "סיסמא טובה", "Strong password" : "סיסמא חזקה", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "אירעה שגיאה. יש להעלות תעודת ASCII-encoded PEM.", - "Valid until {date}" : "בתוקף עד ל- {date}", - "Delete" : "מחיקה", "Groups" : "קבוצות", "Unable to delete {objName}" : "לא ניתן למחיקה {objName}", "Error creating group" : "שגיאה בעת יצירת קבוצה", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "עברית", "Personal info" : "מידע אישי", "Sync clients" : "סנכרון לקוחות", - "SSL root certificates" : "אישורי אבטחת SSL ", "Everything (fatal issues, errors, warnings, info, debug)" : "הכול (נושאים חמורים, שגיאות, אזהרות, מידע, ניפוי שגיאות)", "Info, warnings, errors and fatal issues" : "מידע, אזהרות, שגיאות ונושאים חמורים", "Warnings, errors and fatal issues" : "אזהרות, שגיאות ונושאים חמורים", @@ -203,6 +202,11 @@ OC.L10N.register( "Enable only for specific groups" : "אפשר רק לקבוצות מסויימות", "Uninstall App" : "הסרת יישום", "Enable experimental apps" : "אפשר יישומים ניסיוניים", + "Common Name" : "שם משותף", + "Valid until" : "בתוקף עד", + "Issued By" : "הוצא על ידי", + "Valid until %s" : "בתוקף עד %s", + "Import root certificate" : "יבוא אישור אבטחה לנתיב יסוד", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "שלום,<br><br>רק רצינו להודיע שעכשיו יש לך %s חשבון.<br><br>Your שם משתמש: %s<br>כניסה: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "לחיים!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "שלום,\n\nרק רצינו להודיע שעכשיו יש לך %s חשבון.\n\nשם המשתמש שלך: %s\nכניסה: %s\n\n", @@ -240,11 +244,6 @@ OC.L10N.register( "iOS app" : "יישום אייפון", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "אם ברצונך לתמוך בפרויקט\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ניתן להצטרך לפיתוח</a>\n\t\tאו\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">להפיץ את הבשורה</a>!", "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב", - "Common Name" : "שם משותף", - "Valid until" : "בתוקף עד", - "Issued By" : "הוצא על ידי", - "Valid until %s" : "בתוקף עד %s", - "Import root certificate" : "יבוא אישור אבטחה לנתיב יסוד", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "פיתוח על ידי {open}קהילת ownCloud community{linkclose}, {githubopen}קוד המקור{linkclose} ברישיון תחת ה- {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "הצגת מיקום אחסון", "Show last log in" : "הצגת כניסה אחרונה", diff --git a/settings/l10n/he.json b/settings/l10n/he.json index a97c9545d0b..098e61e1ffc 100644 --- a/settings/l10n/he.json +++ b/settings/l10n/he.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "היישום הופעל אך יש לעדכן אותו. בעוד 5 שניות הדף ינותב לעמוד העדכון.", "App update" : "עדכון יישום", "No apps found for \"{query}\"" : "לא נמצא יישום עבור \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "אירעה שגיאה. יש להעלות תעודת ASCII-encoded PEM.", + "Valid until {date}" : "בתוקף עד ל- {date}", + "Delete" : "מחיקה", "An error occurred: {message}" : "אירעה שגיאה: {message}", "Select a profile picture" : "יש לבחור תמונת פרופיל", "Very weak password" : "סיסמא מאוד חלשה", @@ -86,9 +89,6 @@ "So-so password" : "סיסמא ככה-ככה", "Good password" : "סיסמא טובה", "Strong password" : "סיסמא חזקה", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "אירעה שגיאה. יש להעלות תעודת ASCII-encoded PEM.", - "Valid until {date}" : "בתוקף עד ל- {date}", - "Delete" : "מחיקה", "Groups" : "קבוצות", "Unable to delete {objName}" : "לא ניתן למחיקה {objName}", "Error creating group" : "שגיאה בעת יצירת קבוצה", @@ -107,7 +107,6 @@ "__language_name__" : "עברית", "Personal info" : "מידע אישי", "Sync clients" : "סנכרון לקוחות", - "SSL root certificates" : "אישורי אבטחת SSL ", "Everything (fatal issues, errors, warnings, info, debug)" : "הכול (נושאים חמורים, שגיאות, אזהרות, מידע, ניפוי שגיאות)", "Info, warnings, errors and fatal issues" : "מידע, אזהרות, שגיאות ונושאים חמורים", "Warnings, errors and fatal issues" : "אזהרות, שגיאות ונושאים חמורים", @@ -201,6 +200,11 @@ "Enable only for specific groups" : "אפשר רק לקבוצות מסויימות", "Uninstall App" : "הסרת יישום", "Enable experimental apps" : "אפשר יישומים ניסיוניים", + "Common Name" : "שם משותף", + "Valid until" : "בתוקף עד", + "Issued By" : "הוצא על ידי", + "Valid until %s" : "בתוקף עד %s", + "Import root certificate" : "יבוא אישור אבטחה לנתיב יסוד", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "שלום,<br><br>רק רצינו להודיע שעכשיו יש לך %s חשבון.<br><br>Your שם משתמש: %s<br>כניסה: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "לחיים!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "שלום,\n\nרק רצינו להודיע שעכשיו יש לך %s חשבון.\n\nשם המשתמש שלך: %s\nכניסה: %s\n\n", @@ -238,11 +242,6 @@ "iOS app" : "יישום אייפון", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "אם ברצונך לתמוך בפרויקט\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ניתן להצטרך לפיתוח</a>\n\t\tאו\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">להפיץ את הבשורה</a>!", "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב", - "Common Name" : "שם משותף", - "Valid until" : "בתוקף עד", - "Issued By" : "הוצא על ידי", - "Valid until %s" : "בתוקף עד %s", - "Import root certificate" : "יבוא אישור אבטחה לנתיב יסוד", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "פיתוח על ידי {open}קהילת ownCloud community{linkclose}, {githubopen}קוד המקור{linkclose} ברישיון תחת ה- {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "הצגת מיקום אחסון", "Show last log in" : "הצגת כניסה אחרונה", diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js index 6b66988b07d..2a255d18788 100644 --- a/settings/l10n/hr.js +++ b/settings/l10n/hr.js @@ -42,14 +42,14 @@ OC.L10N.register( "Uninstalling ...." : "Deinstaliranje....", "Error while uninstalling app" : "Pogreška pri deinstaliranju app", "Uninstall" : "Deinstalirajte", + "Valid until {date}" : "Valid until {date}", + "Delete" : "Izbrišite", "Select a profile picture" : "Odaberite sliku profila", "Very weak password" : "Lozinka vrlo slaba", "Weak password" : "Lozinka slaba", "So-so password" : "Lozinka tako-tako", "Good password" : "Lozinka dobra", "Strong password" : "Lozinka snažna", - "Valid until {date}" : "Valid until {date}", - "Delete" : "Izbrišite", "Groups" : "Grupe", "Unable to delete {objName}" : "Nije moguće izbrisati {objName}", "Error creating group" : "Pogrešno kreiranje grupe", @@ -63,7 +63,6 @@ OC.L10N.register( "Error creating user" : "Pogrešno kreiranje korisnika", "A valid password must be provided" : "Nužno je navesti valjanu lozinku", "__language_name__" : "__jezik_naziv___", - "SSL root certificates" : "SSL Root certifikati", "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)", "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi", "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi", @@ -118,6 +117,10 @@ OC.L10N.register( "Documentation:" : "Dokumentacija:", "Enable only for specific groups" : "Omogućite samo za specifične grupe", "Uninstall App" : "Deinstalirajte app", + "Common Name" : "Common Name", + "Valid until" : "Valid until", + "Issued By" : "Issued By", + "Valid until %s" : "Valid until %s", "Cheers!" : "Cheers!", "Forum" : "Forum", "Profile picture" : "Slika profila", @@ -135,10 +138,6 @@ OC.L10N.register( "Help translate" : "Pomozite prevesti", "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "Common Name" : "Common Name", - "Valid until" : "Valid until", - "Issued By" : "Issued By", - "Valid until %s" : "Valid until %s", "Show storage location" : "Prikaži mjesto pohrane", "Show last log in" : "Prikaži zadnje spajanje", "Username" : "Korisničko ime", diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json index b8e8c035fe9..31a904a0d02 100644 --- a/settings/l10n/hr.json +++ b/settings/l10n/hr.json @@ -40,14 +40,14 @@ "Uninstalling ...." : "Deinstaliranje....", "Error while uninstalling app" : "Pogreška pri deinstaliranju app", "Uninstall" : "Deinstalirajte", + "Valid until {date}" : "Valid until {date}", + "Delete" : "Izbrišite", "Select a profile picture" : "Odaberite sliku profila", "Very weak password" : "Lozinka vrlo slaba", "Weak password" : "Lozinka slaba", "So-so password" : "Lozinka tako-tako", "Good password" : "Lozinka dobra", "Strong password" : "Lozinka snažna", - "Valid until {date}" : "Valid until {date}", - "Delete" : "Izbrišite", "Groups" : "Grupe", "Unable to delete {objName}" : "Nije moguće izbrisati {objName}", "Error creating group" : "Pogrešno kreiranje grupe", @@ -61,7 +61,6 @@ "Error creating user" : "Pogrešno kreiranje korisnika", "A valid password must be provided" : "Nužno je navesti valjanu lozinku", "__language_name__" : "__jezik_naziv___", - "SSL root certificates" : "SSL Root certifikati", "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)", "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi", "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi", @@ -116,6 +115,10 @@ "Documentation:" : "Dokumentacija:", "Enable only for specific groups" : "Omogućite samo za specifične grupe", "Uninstall App" : "Deinstalirajte app", + "Common Name" : "Common Name", + "Valid until" : "Valid until", + "Issued By" : "Issued By", + "Valid until %s" : "Valid until %s", "Cheers!" : "Cheers!", "Forum" : "Forum", "Profile picture" : "Slika profila", @@ -133,10 +136,6 @@ "Help translate" : "Pomozite prevesti", "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "Common Name" : "Common Name", - "Valid until" : "Valid until", - "Issued By" : "Issued By", - "Valid until %s" : "Valid until %s", "Show storage location" : "Prikaži mjesto pohrane", "Show last log in" : "Prikaži zadnje spajanje", "Username" : "Korisničko ime", diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js index 6d1904fe6a6..85a0ecc6334 100644 --- a/settings/l10n/hu_HU.js +++ b/settings/l10n/hu_HU.js @@ -76,6 +76,8 @@ OC.L10N.register( "Uninstall" : "Eltávolítás", "App update" : "Alkalmazás frissítése", "No apps found for \"{query}\"" : "Nem található alkalmazás a „{query}” lekérdezésre.", + "Valid until {date}" : "Érvényes: {date}", + "Delete" : "Törlés", "An error occurred: {message}" : "Hiba történt: {message}", "Select a profile picture" : "Válasszon profilképet!", "Very weak password" : "Nagyon gyenge jelszó", @@ -83,8 +85,6 @@ OC.L10N.register( "So-so password" : "Nem túl jó jelszó", "Good password" : "Jó jelszó", "Strong password" : "Erős jelszó", - "Valid until {date}" : "Érvényes: {date}", - "Delete" : "Törlés", "Groups" : "Csoportok", "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}", "Error creating group" : "Hiba történt a csoport létrehozása közben", @@ -102,7 +102,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "Személyes információk", "Sync clients" : "Szinkronizáló kliensek", - "SSL root certificates" : "SSL tanúsítványok", "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)", "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák", "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák", @@ -199,6 +198,11 @@ OC.L10N.register( "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé", "Uninstall App" : "Alkalmazás eltávolítása", "Enable experimental apps" : "Kísérleti alkalmazások engedélyezése", + "Common Name" : "Általános Név", + "Valid until" : "Érvényes", + "Issued By" : "Kiadta", + "Valid until %s" : "Érvényes: %s", + "Import root certificate" : "Gyökértanúsítvány importálása", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Üdv!<br><br>Értesítünk, hogy van egy %s fiókja.<br><br>Felhasználónév: %s<br>Hozzáférés: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Üdv.", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Üdv!\n\nÉrtesítünk, hogy van egy %s fiókja.\n\nFelhasználónév: %s\nHozzáférés: %s\n\n", @@ -231,11 +235,6 @@ OC.L10N.register( "iOS app" : "IOS applikáció", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!", "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!", - "Common Name" : "Általános Név", - "Valid until" : "Érvényes", - "Issued By" : "Kiadta", - "Valid until %s" : "Érvényes: %s", - "Import root certificate" : "Gyökértanúsítvány importálása", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud közösség{linkclose} fejleszti, a {githubopen}forráskód{linkclose} {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} licenc alatt licencelve.", "Show storage location" : "Háttértároló helyének mutatása", "Show last log in" : "Utolsó bejelentkezés megjelenítése", diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json index b0ee4ae012b..dc99ecde4d1 100644 --- a/settings/l10n/hu_HU.json +++ b/settings/l10n/hu_HU.json @@ -74,6 +74,8 @@ "Uninstall" : "Eltávolítás", "App update" : "Alkalmazás frissítése", "No apps found for \"{query}\"" : "Nem található alkalmazás a „{query}” lekérdezésre.", + "Valid until {date}" : "Érvényes: {date}", + "Delete" : "Törlés", "An error occurred: {message}" : "Hiba történt: {message}", "Select a profile picture" : "Válasszon profilképet!", "Very weak password" : "Nagyon gyenge jelszó", @@ -81,8 +83,6 @@ "So-so password" : "Nem túl jó jelszó", "Good password" : "Jó jelszó", "Strong password" : "Erős jelszó", - "Valid until {date}" : "Érvényes: {date}", - "Delete" : "Törlés", "Groups" : "Csoportok", "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}", "Error creating group" : "Hiba történt a csoport létrehozása közben", @@ -100,7 +100,6 @@ "__language_name__" : "__language_name__", "Personal info" : "Személyes információk", "Sync clients" : "Szinkronizáló kliensek", - "SSL root certificates" : "SSL tanúsítványok", "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)", "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák", "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák", @@ -197,6 +196,11 @@ "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé", "Uninstall App" : "Alkalmazás eltávolítása", "Enable experimental apps" : "Kísérleti alkalmazások engedélyezése", + "Common Name" : "Általános Név", + "Valid until" : "Érvényes", + "Issued By" : "Kiadta", + "Valid until %s" : "Érvényes: %s", + "Import root certificate" : "Gyökértanúsítvány importálása", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Üdv!<br><br>Értesítünk, hogy van egy %s fiókja.<br><br>Felhasználónév: %s<br>Hozzáférés: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Üdv.", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Üdv!\n\nÉrtesítünk, hogy van egy %s fiókja.\n\nFelhasználónév: %s\nHozzáférés: %s\n\n", @@ -229,11 +233,6 @@ "iOS app" : "IOS applikáció", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!", "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!", - "Common Name" : "Általános Név", - "Valid until" : "Érvényes", - "Issued By" : "Kiadta", - "Valid until %s" : "Érvényes: %s", - "Import root certificate" : "Gyökértanúsítvány importálása", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud közösség{linkclose} fejleszti, a {githubopen}forráskód{linkclose} {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} licenc alatt licencelve.", "Show storage location" : "Háttértároló helyének mutatása", "Show last log in" : "Utolsó bejelentkezés megjelenítése", diff --git a/settings/l10n/hy.js b/settings/l10n/hy.js index 15df5e696f1..25c6ad4b587 100644 --- a/settings/l10n/hy.js +++ b/settings/l10n/hy.js @@ -2,10 +2,10 @@ OC.L10N.register( "settings", { "Language changed" : "Լեզուն փոխվեց", + "Delete" : "Ջնջել", "Very weak password" : "Շատ թույլ գաղտնաբառ", "Weak password" : "Թույլ գաղտնաբառ", "Good password" : "Լավ գաղտնաբառ", - "Delete" : "Ջնջել", "Groups" : "Խմբեր", "never" : "երբեք", "add group" : "խումբ ավելացնել", diff --git a/settings/l10n/hy.json b/settings/l10n/hy.json index 5aa20272d3c..7fddfe1a132 100644 --- a/settings/l10n/hy.json +++ b/settings/l10n/hy.json @@ -1,9 +1,9 @@ { "translations": { "Language changed" : "Լեզուն փոխվեց", + "Delete" : "Ջնջել", "Very weak password" : "Շատ թույլ գաղտնաբառ", "Weak password" : "Թույլ գաղտնաբառ", "Good password" : "Լավ գաղտնաբառ", - "Delete" : "Ջնջել", "Groups" : "Խմբեր", "never" : "երբեք", "add group" : "խումբ ավելացնել", diff --git a/settings/l10n/ia.js b/settings/l10n/ia.js index 264659f6b93..94c1b8b3cf8 100644 --- a/settings/l10n/ia.js +++ b/settings/l10n/ia.js @@ -9,12 +9,12 @@ OC.L10N.register( "Saved" : "Salveguardate", "Email sent" : "Message de e-posta inviate", "All" : "Omne", + "Delete" : "Deler", "Very weak password" : "Contrasigno multo debile", "Weak password" : "Contrasigno debile", "So-so password" : "Contrasigno passabile", "Good password" : "Contrasigno bon", "Strong password" : "Contrasigno forte", - "Delete" : "Deler", "Groups" : "Gruppos", "never" : "nunquam", "__language_name__" : "Interlingua", diff --git a/settings/l10n/ia.json b/settings/l10n/ia.json index fc0e1d7430a..fc6e624f8ae 100644 --- a/settings/l10n/ia.json +++ b/settings/l10n/ia.json @@ -7,12 +7,12 @@ "Saved" : "Salveguardate", "Email sent" : "Message de e-posta inviate", "All" : "Omne", + "Delete" : "Deler", "Very weak password" : "Contrasigno multo debile", "Weak password" : "Contrasigno debile", "So-so password" : "Contrasigno passabile", "Good password" : "Contrasigno bon", "Strong password" : "Contrasigno forte", - "Delete" : "Deler", "Groups" : "Gruppos", "never" : "nunquam", "__language_name__" : "Interlingua", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index 68eeb1d6bc8..5610d9d47e7 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikasi sudah diaktifkan tetapi perlu diperbarui. Anda akan dialihkan ke halaman pembaruan dalam 5 detik.", "App update" : "Pembaruan Aplikasi", "No apps found for \"{query}\"" : "Tidak ada aplikasi yang ditemukan untuk \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.", + "Valid until {date}" : "Berlaku sampai {date}", + "Delete" : "Hapus", "An error occurred: {message}" : "Sebuah kesalahan yang muncul: {message}", "Select a profile picture" : "Pilih foto profil", "Very weak password" : "Sandi sangat lemah", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Sandi lumayan", "Good password" : "Sandi baik", "Strong password" : "Sandi kuat", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.", - "Valid until {date}" : "Berlaku sampai {date}", - "Delete" : "Hapus", "Groups" : "Grup", "Unable to delete {objName}" : "Tidak dapat menghapus {objName}", "Error creating group" : "Terjadi kesalahan saat membuat grup", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "Info pribadi", "Sync clients" : "Klien sync", - "SSL root certificates" : "Sertifikat root SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, kesalahan, peringatan, info, debug)", "Info, warnings, errors and fatal issues" : "Info, peringatan, kesalahan dan masalah fatal", "Warnings, errors and fatal issues" : "Peringatan, kesalahan dan masalah fatal", @@ -215,6 +214,11 @@ OC.L10N.register( "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu", "Uninstall App" : "Copot aplikasi", "Enable experimental apps" : "Aktifkan aplikasi percobaan", + "Common Name" : "Nama umum", + "Valid until" : "Berlaku sampai", + "Issued By" : "Diterbitkan oleh", + "Valid until %s" : "Berlaku sampai %s", + "Import root certificate" : "Impor sertifikat root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Horee!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n", @@ -246,11 +250,6 @@ OC.L10N.register( "iOS app" : "Aplikasi iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!", "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal", - "Common Name" : "Nama umum", - "Valid until" : "Berlaku sampai", - "Issued By" : "Diterbitkan oleh", - "Valid until %s" : "Berlaku sampai %s", - "Import root certificate" : "Impor sertifikat root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {communityopen}komunitas ownCloud{linkclose}, {githubopen}kode sumber{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Tampilkan kolasi penyimpanan", "Show last log in" : "Tampilkan masuk terakhir", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index 585104b97aa..39606ef4188 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikasi sudah diaktifkan tetapi perlu diperbarui. Anda akan dialihkan ke halaman pembaruan dalam 5 detik.", "App update" : "Pembaruan Aplikasi", "No apps found for \"{query}\"" : "Tidak ada aplikasi yang ditemukan untuk \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.", + "Valid until {date}" : "Berlaku sampai {date}", + "Delete" : "Hapus", "An error occurred: {message}" : "Sebuah kesalahan yang muncul: {message}", "Select a profile picture" : "Pilih foto profil", "Very weak password" : "Sandi sangat lemah", @@ -86,9 +89,6 @@ "So-so password" : "Sandi lumayan", "Good password" : "Sandi baik", "Strong password" : "Sandi kuat", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.", - "Valid until {date}" : "Berlaku sampai {date}", - "Delete" : "Hapus", "Groups" : "Grup", "Unable to delete {objName}" : "Tidak dapat menghapus {objName}", "Error creating group" : "Terjadi kesalahan saat membuat grup", @@ -107,7 +107,6 @@ "__language_name__" : "__language_name__", "Personal info" : "Info pribadi", "Sync clients" : "Klien sync", - "SSL root certificates" : "Sertifikat root SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, kesalahan, peringatan, info, debug)", "Info, warnings, errors and fatal issues" : "Info, peringatan, kesalahan dan masalah fatal", "Warnings, errors and fatal issues" : "Peringatan, kesalahan dan masalah fatal", @@ -213,6 +212,11 @@ "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu", "Uninstall App" : "Copot aplikasi", "Enable experimental apps" : "Aktifkan aplikasi percobaan", + "Common Name" : "Nama umum", + "Valid until" : "Berlaku sampai", + "Issued By" : "Diterbitkan oleh", + "Valid until %s" : "Berlaku sampai %s", + "Import root certificate" : "Impor sertifikat root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Horee!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n", @@ -244,11 +248,6 @@ "iOS app" : "Aplikasi iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!", "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal", - "Common Name" : "Nama umum", - "Valid until" : "Berlaku sampai", - "Issued By" : "Diterbitkan oleh", - "Valid until %s" : "Berlaku sampai %s", - "Import root certificate" : "Impor sertifikat root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {communityopen}komunitas ownCloud{linkclose}, {githubopen}kode sumber{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Tampilkan kolasi penyimpanan", "Show last log in" : "Tampilkan masuk terakhir", diff --git a/settings/l10n/is.js b/settings/l10n/is.js index ed11afcebe2..4ad6db37cc3 100644 --- a/settings/l10n/is.js +++ b/settings/l10n/is.js @@ -16,17 +16,16 @@ OC.L10N.register( "Enable" : "Virkja", "Updating...." : "Uppfæri...", "Updated" : "Uppfært", + "Delete" : "Eyða", "Very weak password" : "Mjög veikt lykilorð", "Weak password" : "Veikt lykilorð", "So-so password" : "Svo-svo lykilorð", "Good password" : "Gott lykilorð", "Strong password" : "Sterkt lykilorð", - "Delete" : "Eyða", "Groups" : "Hópar", "undo" : "afturkalla", "never" : "aldrei", "__language_name__" : "__nafn_tungumáls__", - "SSL root certificates" : "SSL rótar skilríki", "None" : "Ekkert", "Encryption" : "Dulkóðun", "Server address" : "Host nafn netþjóns", diff --git a/settings/l10n/is.json b/settings/l10n/is.json index d6f83f3e4a9..87603010514 100644 --- a/settings/l10n/is.json +++ b/settings/l10n/is.json @@ -14,17 +14,16 @@ "Enable" : "Virkja", "Updating...." : "Uppfæri...", "Updated" : "Uppfært", + "Delete" : "Eyða", "Very weak password" : "Mjög veikt lykilorð", "Weak password" : "Veikt lykilorð", "So-so password" : "Svo-svo lykilorð", "Good password" : "Gott lykilorð", "Strong password" : "Sterkt lykilorð", - "Delete" : "Eyða", "Groups" : "Hópar", "undo" : "afturkalla", "never" : "aldrei", "__language_name__" : "__nafn_tungumáls__", - "SSL root certificates" : "SSL rótar skilríki", "None" : "Ekkert", "Encryption" : "Dulkóðun", "Server address" : "Host nafn netþjóns", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 329f9dfd4f6..49ccc1b4c07 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'applicazione è stata abilitata, ma deve essere aggiornata. Sarai rediretto alla pagina di aggiornamento in 5 secondi.", "App update" : "Aggiornamento applicazione", "No apps found for \"{query}\"" : "Nessuna applicazione trovata per \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.", + "Valid until {date}" : "Valido fino al {date}", + "Delete" : "Elimina", "An error occurred: {message}" : "Si è verificato un errore: {message}", "Select a profile picture" : "Seleziona un'immagine del profilo", "Very weak password" : "Password molto debole", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Password così-così", "Good password" : "Password buona", "Strong password" : "Password forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.", - "Valid until {date}" : "Valido fino al {date}", - "Delete" : "Elimina", "Groups" : "Gruppi", "Unable to delete {objName}" : "Impossibile eliminare {objName}", "Error creating group" : "Errore durante la creazione del gruppo", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Italiano", "Personal info" : "Informazioni personali", "Sync clients" : "Client di sincronizzazione", - "SSL root certificates" : "Certificati SSL radice", "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)", "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi", "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi", @@ -218,6 +217,11 @@ OC.L10N.register( "Enable only for specific groups" : "Abilita solo per gruppi specifici", "Uninstall App" : "Disinstalla applicazione", "Enable experimental apps" : "Abilita le applicazioni sperimentali", + "Common Name" : "Nome comune", + "Valid until" : "Valido fino al", + "Issued By" : "Emesso da", + "Valid until %s" : "Valido fino al %s", + "Import root certificate" : "Importa certificato radice", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ciao,<br><br>volevo informarti che ora hai un account %s.<br><br>Il tuo nome utente: %s<br>Accedi: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Saluti!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ciao,\n\nvolevo informarti che ora hai un account %s.\n\nIl tuo nome utente: %s\nAccedi: %s\n\n", @@ -255,11 +259,6 @@ OC.L10N.register( "iOS app" : "Applicazione iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!", "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio", - "Common Name" : "Nome comune", - "Valid until" : "Valido fino al", - "Issued By" : "Emesso da", - "Valid until %s" : "Valido fino al %s", - "Import root certificate" : "Importa certificato radice", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostra posizione di archiviazione", "Show last log in" : "Mostra ultimo accesso", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index b20863425a7..b53e64b5540 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'applicazione è stata abilitata, ma deve essere aggiornata. Sarai rediretto alla pagina di aggiornamento in 5 secondi.", "App update" : "Aggiornamento applicazione", "No apps found for \"{query}\"" : "Nessuna applicazione trovata per \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.", + "Valid until {date}" : "Valido fino al {date}", + "Delete" : "Elimina", "An error occurred: {message}" : "Si è verificato un errore: {message}", "Select a profile picture" : "Seleziona un'immagine del profilo", "Very weak password" : "Password molto debole", @@ -86,9 +89,6 @@ "So-so password" : "Password così-così", "Good password" : "Password buona", "Strong password" : "Password forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.", - "Valid until {date}" : "Valido fino al {date}", - "Delete" : "Elimina", "Groups" : "Gruppi", "Unable to delete {objName}" : "Impossibile eliminare {objName}", "Error creating group" : "Errore durante la creazione del gruppo", @@ -107,7 +107,6 @@ "__language_name__" : "Italiano", "Personal info" : "Informazioni personali", "Sync clients" : "Client di sincronizzazione", - "SSL root certificates" : "Certificati SSL radice", "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)", "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi", "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi", @@ -216,6 +215,11 @@ "Enable only for specific groups" : "Abilita solo per gruppi specifici", "Uninstall App" : "Disinstalla applicazione", "Enable experimental apps" : "Abilita le applicazioni sperimentali", + "Common Name" : "Nome comune", + "Valid until" : "Valido fino al", + "Issued By" : "Emesso da", + "Valid until %s" : "Valido fino al %s", + "Import root certificate" : "Importa certificato radice", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ciao,<br><br>volevo informarti che ora hai un account %s.<br><br>Il tuo nome utente: %s<br>Accedi: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Saluti!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ciao,\n\nvolevo informarti che ora hai un account %s.\n\nIl tuo nome utente: %s\nAccedi: %s\n\n", @@ -253,11 +257,6 @@ "iOS app" : "Applicazione iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!", "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio", - "Common Name" : "Nome comune", - "Valid until" : "Valido fino al", - "Issued By" : "Emesso da", - "Valid until %s" : "Valido fino al %s", - "Import root certificate" : "Importa certificato radice", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostra posizione di archiviazione", "Show last log in" : "Mostra ultimo accesso", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index 0e87523179e..d88fb2a800e 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "アプリは有効ですが、更新が必要です。5秒後に更新ページにリダイレクトします。", "App update" : "アプリのアップデート", "No apps found for \"{query}\"" : "\"{query}\" に対応するアプリはありません", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "エラーが発生しました。ASCIIコードのPEM証明書をアップロードしてください。", + "Valid until {date}" : "{date} まで有効", + "Delete" : "削除", "An error occurred: {message}" : "エラーが発生しました: {message}", "Select a profile picture" : "プロファイル画像を選択", "Very weak password" : "非常に弱いパスワード", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "まずまずのパスワード", "Good password" : "良好なパスワード", "Strong password" : "強いパスワード", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "エラーが発生しました。ASCIIコードのPEM証明書をアップロードしてください。", - "Valid until {date}" : "{date} まで有効", - "Delete" : "削除", "Groups" : "グループ", "Unable to delete {objName}" : "{objName} を削除できません", "Error creating group" : "グループの作成エラー", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Japanese (日本語)", "Personal info" : "個人情報", "Sync clients" : "同期用クライアント", - "SSL root certificates" : "SSLルート証明書", "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)", "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題", "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題", @@ -216,6 +215,11 @@ OC.L10N.register( "Enable only for specific groups" : "特定のグループのみ有効に", "Uninstall App" : "アプリをアンインストール", "Enable experimental apps" : "実験的なアプリを有効にする", + "Common Name" : "コモンネーム", + "Valid until" : "有効期限", + "Issued By" : "発行元", + "Valid until %s" : "%s まで有効", + "Import root certificate" : "ルート証明書をインポート", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "それでは！", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "こんにちは、\n\nあなたのアカウント %s が利用可能になったことをお知らせします。\n\nユーザー名: %s\n接続URL: %s\n\n", @@ -227,8 +231,11 @@ OC.L10N.register( "You are using <strong>%s</strong> of <strong>%s</strong>" : "<strong>%s</strong> / <strong>%s</strong> が現在使用中です", "Profile picture" : "プロフィール画像", "Upload new" : "新たにアップロード", + "Select from Files" : "ファイルから選択", "Remove image" : "画像を削除", + "png or jpg, max. 20 MB" : "png もしくは jpg, 最大.20MB", "Cancel" : "キャンセル", + "Choose as profile picture" : "プロファイル画像として選択", "Full name" : "氏名", "No display name set" : "表示名が未設定", "Email" : "メール", @@ -248,11 +255,6 @@ OC.L10N.register( "iOS app" : "iOSアプリ", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！", "Show First Run Wizard again" : "初回ウィザードを再表示する", - "Common Name" : "コモンネーム", - "Valid until" : "有効期限", - "Issued By" : "発行元", - "Valid until %s" : "%s まで有効", - "Import root certificate" : "ルート証明書をインポート", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{linkclose} によって開発されています。{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} によってライセンスされます。", "Show storage location" : "データの保存場所を表示", "Show last log in" : "最終ログインを表示", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index 4a1af2b856a..c06a6d141e1 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "アプリは有効ですが、更新が必要です。5秒後に更新ページにリダイレクトします。", "App update" : "アプリのアップデート", "No apps found for \"{query}\"" : "\"{query}\" に対応するアプリはありません", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "エラーが発生しました。ASCIIコードのPEM証明書をアップロードしてください。", + "Valid until {date}" : "{date} まで有効", + "Delete" : "削除", "An error occurred: {message}" : "エラーが発生しました: {message}", "Select a profile picture" : "プロファイル画像を選択", "Very weak password" : "非常に弱いパスワード", @@ -86,9 +89,6 @@ "So-so password" : "まずまずのパスワード", "Good password" : "良好なパスワード", "Strong password" : "強いパスワード", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "エラーが発生しました。ASCIIコードのPEM証明書をアップロードしてください。", - "Valid until {date}" : "{date} まで有効", - "Delete" : "削除", "Groups" : "グループ", "Unable to delete {objName}" : "{objName} を削除できません", "Error creating group" : "グループの作成エラー", @@ -107,7 +107,6 @@ "__language_name__" : "Japanese (日本語)", "Personal info" : "個人情報", "Sync clients" : "同期用クライアント", - "SSL root certificates" : "SSLルート証明書", "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)", "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題", "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題", @@ -214,6 +213,11 @@ "Enable only for specific groups" : "特定のグループのみ有効に", "Uninstall App" : "アプリをアンインストール", "Enable experimental apps" : "実験的なアプリを有効にする", + "Common Name" : "コモンネーム", + "Valid until" : "有効期限", + "Issued By" : "発行元", + "Valid until %s" : "%s まで有効", + "Import root certificate" : "ルート証明書をインポート", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "それでは！", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "こんにちは、\n\nあなたのアカウント %s が利用可能になったことをお知らせします。\n\nユーザー名: %s\n接続URL: %s\n\n", @@ -225,8 +229,11 @@ "You are using <strong>%s</strong> of <strong>%s</strong>" : "<strong>%s</strong> / <strong>%s</strong> が現在使用中です", "Profile picture" : "プロフィール画像", "Upload new" : "新たにアップロード", + "Select from Files" : "ファイルから選択", "Remove image" : "画像を削除", + "png or jpg, max. 20 MB" : "png もしくは jpg, 最大.20MB", "Cancel" : "キャンセル", + "Choose as profile picture" : "プロファイル画像として選択", "Full name" : "氏名", "No display name set" : "表示名が未設定", "Email" : "メール", @@ -246,11 +253,6 @@ "iOS app" : "iOSアプリ", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！", "Show First Run Wizard again" : "初回ウィザードを再表示する", - "Common Name" : "コモンネーム", - "Valid until" : "有効期限", - "Issued By" : "発行元", - "Valid until %s" : "%s まで有効", - "Import root certificate" : "ルート証明書をインポート", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{linkclose} によって開発されています。{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} によってライセンスされます。", "Show storage location" : "データの保存場所を表示", "Show last log in" : "最終ログインを表示", diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js index c8e03c9189c..3654e8a6d0a 100644 --- a/settings/l10n/ka_GE.js +++ b/settings/l10n/ka_GE.js @@ -30,7 +30,6 @@ OC.L10N.register( "Error creating user" : "შეცდომა მომხმარებლის შექმნისას", "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი", "__language_name__" : "__language_name__", - "SSL root certificates" : "SSL root სერთიფიკატები", "None" : "არა", "Login" : "ლოგინი", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.", diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json index ebbaa612e17..7bccc89534b 100644 --- a/settings/l10n/ka_GE.json +++ b/settings/l10n/ka_GE.json @@ -28,7 +28,6 @@ "Error creating user" : "შეცდომა მომხმარებლის შექმნისას", "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი", "__language_name__" : "__language_name__", - "SSL root certificates" : "SSL root სერთიფიკატები", "None" : "არა", "Login" : "ლოგინი", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.", diff --git a/settings/l10n/km.js b/settings/l10n/km.js index 41efdda51d2..b3f980e41ec 100644 --- a/settings/l10n/km.js +++ b/settings/l10n/km.js @@ -28,13 +28,13 @@ OC.L10N.register( "Updating...." : "កំពុងធ្វើបច្ចុប្បន្នភាព....", "Error while updating app" : "មានកំហុសពេលធ្វើបច្ចុប្បន្នភាពកម្មវិធី", "Updated" : "បានធ្វើបច្ចុប្បន្នភាព", + "Delete" : "លុប", "Select a profile picture" : "ជ្រើសរូបភាពប្រវត្តិរូប", "Very weak password" : "ពាក្យសម្ងាត់ខ្សោយណាស់", "Weak password" : "ពាក្យសម្ងាត់ខ្សោយ", "So-so password" : "ពាក្យសម្ងាត់ធម្មតា", "Good password" : "ពាក្យសម្ងាត់ល្អ", "Strong password" : "ពាក្យសម្ងាត់ខ្លាំង", - "Delete" : "លុប", "Groups" : "ក្រុ", "undo" : "មិនធ្វើវិញ", "never" : "មិនដែរ", diff --git a/settings/l10n/km.json b/settings/l10n/km.json index 09fcff1b509..e7c87be2b06 100644 --- a/settings/l10n/km.json +++ b/settings/l10n/km.json @@ -26,13 +26,13 @@ "Updating...." : "កំពុងធ្វើបច្ចុប្បន្នភាព....", "Error while updating app" : "មានកំហុសពេលធ្វើបច្ចុប្បន្នភាពកម្មវិធី", "Updated" : "បានធ្វើបច្ចុប្បន្នភាព", + "Delete" : "លុប", "Select a profile picture" : "ជ្រើសរូបភាពប្រវត្តិរូប", "Very weak password" : "ពាក្យសម្ងាត់ខ្សោយណាស់", "Weak password" : "ពាក្យសម្ងាត់ខ្សោយ", "So-so password" : "ពាក្យសម្ងាត់ធម្មតា", "Good password" : "ពាក្យសម្ងាត់ល្អ", "Strong password" : "ពាក្យសម្ងាត់ខ្លាំង", - "Delete" : "លុប", "Groups" : "ក្រុ", "undo" : "មិនធ្វើវិញ", "never" : "មិនដែរ", diff --git a/settings/l10n/kn.js b/settings/l10n/kn.js index 1dc05786534..e430be090bb 100644 --- a/settings/l10n/kn.js +++ b/settings/l10n/kn.js @@ -46,14 +46,14 @@ OC.L10N.register( "Uninstalling ...." : "ಅಳಿಸಿಹಾಕುವುದು ...", "Error while uninstalling app" : "ಅಳಿಸುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ", "Uninstall" : "ಅಳಿಸಿ", + "Valid until {date}" : "{date} ವರೆಗೆ ಚಾಲ್ತಿಯಲ್ಲಿರುತ್ತದೆ", + "Delete" : "ಅಳಿಸಿ", "Select a profile picture" : "ಸಂಕ್ಷಿಪ್ತ ವ್ಯಕ್ತಿಚಿತ್ರ ಒಂದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ", "Very weak password" : "ಅತೀ ದುರ್ಬಲ ಗುಪ್ತಪದ", "Weak password" : "ದುರ್ಬಲ ಗುಪ್ತಪದ", "So-so password" : "ಊಹಿಸಬಹುದಾದ ಗುಪ್ತಪದ", "Good password" : "ಉತ್ತಮ ಗುಪ್ತಪದ", "Strong password" : "ಪ್ರಬಲ ಗುಪ್ತಪದ", - "Valid until {date}" : "{date} ವರೆಗೆ ಚಾಲ್ತಿಯಲ್ಲಿರುತ್ತದೆ", - "Delete" : "ಅಳಿಸಿ", "Groups" : "ಗುಂಪುಗಳು", "Unable to delete {objName}" : "{objName} ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ", "Error creating group" : "ಗುಂಪುನ್ನು ರಚಿಸುವಾಗ ದೋಷವಾಗಿದೆ", diff --git a/settings/l10n/kn.json b/settings/l10n/kn.json index 0096c4f741e..890d9cc994d 100644 --- a/settings/l10n/kn.json +++ b/settings/l10n/kn.json @@ -44,14 +44,14 @@ "Uninstalling ...." : "ಅಳಿಸಿಹಾಕುವುದು ...", "Error while uninstalling app" : "ಅಳಿಸುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ", "Uninstall" : "ಅಳಿಸಿ", + "Valid until {date}" : "{date} ವರೆಗೆ ಚಾಲ್ತಿಯಲ್ಲಿರುತ್ತದೆ", + "Delete" : "ಅಳಿಸಿ", "Select a profile picture" : "ಸಂಕ್ಷಿಪ್ತ ವ್ಯಕ್ತಿಚಿತ್ರ ಒಂದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ", "Very weak password" : "ಅತೀ ದುರ್ಬಲ ಗುಪ್ತಪದ", "Weak password" : "ದುರ್ಬಲ ಗುಪ್ತಪದ", "So-so password" : "ಊಹಿಸಬಹುದಾದ ಗುಪ್ತಪದ", "Good password" : "ಉತ್ತಮ ಗುಪ್ತಪದ", "Strong password" : "ಪ್ರಬಲ ಗುಪ್ತಪದ", - "Valid until {date}" : "{date} ವರೆಗೆ ಚಾಲ್ತಿಯಲ್ಲಿರುತ್ತದೆ", - "Delete" : "ಅಳಿಸಿ", "Groups" : "ಗುಂಪುಗಳು", "Unable to delete {objName}" : "{objName} ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ", "Error creating group" : "ಗುಂಪುನ್ನು ರಚಿಸುವಾಗ ದೋಷವಾಗಿದೆ", diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js index 5f7c0f3a61f..b68d4bb4e36 100644 --- a/settings/l10n/ko.js +++ b/settings/l10n/ko.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "앱이 활성화되었지만, 앱을 업데이트해야 합니다. 5초 후 앱 업데이트 페이지로 넘어갑니다.", "App update" : "앱 업데이트", "No apps found for \"{query}\"" : "\"{query}\"에 해당하는 앱을 찾을 수 없음", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생했습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.", + "Valid until {date}" : "{date}까지 유효함", + "Delete" : "삭제", "An error occurred: {message}" : "오류 발생: {message}", "Select a profile picture" : "프로필 사진 선택", "Very weak password" : "매우 약한 암호", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "그저 그런 암호", "Good password" : "좋은 암호", "Strong password" : "강력한 암호", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생했습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.", - "Valid until {date}" : "{date}까지 유효함", - "Delete" : "삭제", "Groups" : "그룹", "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음", "Error creating group" : "그룹을 생성하는 중 오류가 발생했습니다", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "한국어", "Personal info" : "개인 정보", "Sync clients" : "동기화 클라이언트", - "SSL root certificates" : "SSL 루트 인증서", "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)", "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제", "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제", @@ -216,6 +215,11 @@ OC.L10N.register( "Enable only for specific groups" : "특정 그룹에만 허용", "Uninstall App" : "앱 제거", "Enable experimental apps" : "실험적인 앱 사용", + "Common Name" : "공통 이름", + "Valid until" : "만료 기간:", + "Issued By" : "발급자:", + "Valid until %s" : "%s까지 유효함", + "Import root certificate" : "루트 인증서 가져오기", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "안녕하세요.<br><br>%s 계정을 사용할 수 있음을 알려 드립니다.<br><br>사용자 이름: %s<br>접근 링크: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "감사합니다!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "안녕하세요.\n\n%s 계정을 사용할 수 있음을 알려 드립니다.\n\n사용자 이름: %s\n접근 링크: %s\n\n", @@ -248,11 +252,6 @@ OC.L10N.register( "iOS app" : "iOS 앱", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "프로젝트를 지원하려면\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">개발에 참여하거나</a>\n\t\t\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">널리 알려 주십시오</a>!", "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기", - "Common Name" : "공통 이름", - "Valid until" : "만료 기간:", - "Issued By" : "발급자:", - "Valid until %s" : "%s까지 유효함", - "Import root certificate" : "루트 인증서 가져오기", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud 커뮤니티{linkclose}에서 개발함. {githubopen}원본 코드{linkclose}는 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 라이선스로 배포됩니다.", "Show storage location" : "저장소 위치 보이기", "Show last log in" : "마지막 로그인 시간 보이기", diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json index 23fe181a7d3..02db2edbff4 100644 --- a/settings/l10n/ko.json +++ b/settings/l10n/ko.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "앱이 활성화되었지만, 앱을 업데이트해야 합니다. 5초 후 앱 업데이트 페이지로 넘어갑니다.", "App update" : "앱 업데이트", "No apps found for \"{query}\"" : "\"{query}\"에 해당하는 앱을 찾을 수 없음", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생했습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.", + "Valid until {date}" : "{date}까지 유효함", + "Delete" : "삭제", "An error occurred: {message}" : "오류 발생: {message}", "Select a profile picture" : "프로필 사진 선택", "Very weak password" : "매우 약한 암호", @@ -86,9 +89,6 @@ "So-so password" : "그저 그런 암호", "Good password" : "좋은 암호", "Strong password" : "강력한 암호", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생했습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.", - "Valid until {date}" : "{date}까지 유효함", - "Delete" : "삭제", "Groups" : "그룹", "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음", "Error creating group" : "그룹을 생성하는 중 오류가 발생했습니다", @@ -107,7 +107,6 @@ "__language_name__" : "한국어", "Personal info" : "개인 정보", "Sync clients" : "동기화 클라이언트", - "SSL root certificates" : "SSL 루트 인증서", "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)", "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제", "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제", @@ -214,6 +213,11 @@ "Enable only for specific groups" : "특정 그룹에만 허용", "Uninstall App" : "앱 제거", "Enable experimental apps" : "실험적인 앱 사용", + "Common Name" : "공통 이름", + "Valid until" : "만료 기간:", + "Issued By" : "발급자:", + "Valid until %s" : "%s까지 유효함", + "Import root certificate" : "루트 인증서 가져오기", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "안녕하세요.<br><br>%s 계정을 사용할 수 있음을 알려 드립니다.<br><br>사용자 이름: %s<br>접근 링크: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "감사합니다!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "안녕하세요.\n\n%s 계정을 사용할 수 있음을 알려 드립니다.\n\n사용자 이름: %s\n접근 링크: %s\n\n", @@ -246,11 +250,6 @@ "iOS app" : "iOS 앱", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "프로젝트를 지원하려면\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">개발에 참여하거나</a>\n\t\t\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">널리 알려 주십시오</a>!", "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기", - "Common Name" : "공통 이름", - "Valid until" : "만료 기간:", - "Issued By" : "발급자:", - "Valid until %s" : "%s까지 유효함", - "Import root certificate" : "루트 인증서 가져오기", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud 커뮤니티{linkclose}에서 개발함. {githubopen}원본 코드{linkclose}는 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 라이선스로 배포됩니다.", "Show storage location" : "저장소 위치 보이기", "Show last log in" : "마지막 로그인 시간 보이기", diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js index 78ddad66da8..e009e5290e2 100644 --- a/settings/l10n/lt_LT.js +++ b/settings/l10n/lt_LT.js @@ -46,13 +46,13 @@ OC.L10N.register( "Updating...." : "Atnaujinama...", "Error while updating app" : "Įvyko klaida atnaujinant programą", "Updated" : "Atnaujinta", + "Delete" : "Ištrinti", "Select a profile picture" : "Pažymėkite profilio paveikslėlį", "Very weak password" : "Labai silpnas slaptažodis", "Weak password" : "Silpnas slaptažodis", "So-so password" : "Neblogas slaptažodis", "Good password" : "Geras slaptažodis", "Strong password" : "Stiprus slaptažodis", - "Delete" : "Ištrinti", "Groups" : "Grupės", "undo" : "anuliuoti", "never" : "niekada", @@ -61,7 +61,6 @@ OC.L10N.register( "Error creating user" : "Klaida kuriant vartotoją", "A valid password must be provided" : "Slaptažodis turi būti tinkamas", "__language_name__" : "Lietuvių", - "SSL root certificates" : "SSL sertifikatas", "Fatal issues only" : "Tik kritinės problemos", "None" : "Nieko", "Login" : "Prisijungti", diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json index a1f4abf3580..1f844ee5e5c 100644 --- a/settings/l10n/lt_LT.json +++ b/settings/l10n/lt_LT.json @@ -44,13 +44,13 @@ "Updating...." : "Atnaujinama...", "Error while updating app" : "Įvyko klaida atnaujinant programą", "Updated" : "Atnaujinta", + "Delete" : "Ištrinti", "Select a profile picture" : "Pažymėkite profilio paveikslėlį", "Very weak password" : "Labai silpnas slaptažodis", "Weak password" : "Silpnas slaptažodis", "So-so password" : "Neblogas slaptažodis", "Good password" : "Geras slaptažodis", "Strong password" : "Stiprus slaptažodis", - "Delete" : "Ištrinti", "Groups" : "Grupės", "undo" : "anuliuoti", "never" : "niekada", @@ -59,7 +59,6 @@ "Error creating user" : "Klaida kuriant vartotoją", "A valid password must be provided" : "Slaptažodis turi būti tinkamas", "__language_name__" : "Lietuvių", - "SSL root certificates" : "SSL sertifikatas", "Fatal issues only" : "Tik kritinės problemos", "None" : "Nieko", "Login" : "Prisijungti", diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js index cea7028a961..b286f2211cb 100644 --- a/settings/l10n/lv.js +++ b/settings/l10n/lv.js @@ -56,6 +56,8 @@ OC.L10N.register( "Uninstalling ...." : "Atinstalē ....", "Error while uninstalling app" : "Kļūda, atinstalējot lietotni", "Uninstall" : "Atinstalēt", + "Valid until {date}" : "Valīds līdz {date}", + "Delete" : "Dzēst", "An error occurred: {message}" : "Notika kļūda: {message}", "Select a profile picture" : "Izvēlieties profila attēlu", "Very weak password" : "Ļoti vāja parole", @@ -63,8 +65,6 @@ OC.L10N.register( "So-so password" : "Normāla parole", "Good password" : "Laba parole", "Strong password" : "Lieliska parole", - "Valid until {date}" : "Valīds līdz {date}", - "Delete" : "Dzēst", "Groups" : "Grupas", "Unable to delete {objName}" : "Nevar izdzēst {objName}", "Error creating group" : "Kļūda, veidojot grupu", @@ -81,7 +81,6 @@ OC.L10N.register( "A valid email must be provided" : "Jānorāda derīga e-pasta adrese", "__language_name__" : "__valodas_nosaukums__", "Sync clients" : "Sinhronizācijas lietotnes", - "SSL root certificates" : "SSL saknes sertifikāti", "Everything (fatal issues, errors, warnings, info, debug)" : "Viss (letālas problēmas, kļūdas, brīdinājumi, informatīvas ziņas, atkļūdošanas paziņojumi)", "Info, warnings, errors and fatal issues" : "Informatīvas ziņas, brīdinājumi, kļūdas un letālas problēmas", "Warnings, errors and fatal issues" : "Brīdinājumi, kļūdas un letālas problēmas", diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json index 80298766d3b..fea2fe4b472 100644 --- a/settings/l10n/lv.json +++ b/settings/l10n/lv.json @@ -54,6 +54,8 @@ "Uninstalling ...." : "Atinstalē ....", "Error while uninstalling app" : "Kļūda, atinstalējot lietotni", "Uninstall" : "Atinstalēt", + "Valid until {date}" : "Valīds līdz {date}", + "Delete" : "Dzēst", "An error occurred: {message}" : "Notika kļūda: {message}", "Select a profile picture" : "Izvēlieties profila attēlu", "Very weak password" : "Ļoti vāja parole", @@ -61,8 +63,6 @@ "So-so password" : "Normāla parole", "Good password" : "Laba parole", "Strong password" : "Lieliska parole", - "Valid until {date}" : "Valīds līdz {date}", - "Delete" : "Dzēst", "Groups" : "Grupas", "Unable to delete {objName}" : "Nevar izdzēst {objName}", "Error creating group" : "Kļūda, veidojot grupu", @@ -79,7 +79,6 @@ "A valid email must be provided" : "Jānorāda derīga e-pasta adrese", "__language_name__" : "__valodas_nosaukums__", "Sync clients" : "Sinhronizācijas lietotnes", - "SSL root certificates" : "SSL saknes sertifikāti", "Everything (fatal issues, errors, warnings, info, debug)" : "Viss (letālas problēmas, kļūdas, brīdinājumi, informatīvas ziņas, atkļūdošanas paziņojumi)", "Info, warnings, errors and fatal issues" : "Informatīvas ziņas, brīdinājumi, kļūdas un letālas problēmas", "Warnings, errors and fatal issues" : "Brīdinājumi, kļūdas un letālas problēmas", diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js index 3179deedb11..64cc8f7357e 100644 --- a/settings/l10n/mk.js +++ b/settings/l10n/mk.js @@ -67,6 +67,8 @@ OC.L10N.register( "Error while uninstalling app" : "Грешка при деинсталација на апликацијата", "Uninstall" : "Деинсталирај", "App update" : "Надградба на апликацијата", + "Valid until {date}" : "Валидно до {date}", + "Delete" : "Избриши", "An error occurred: {message}" : "Се случи грешка: {message}", "Select a profile picture" : "Одбери фотографија за профилот", "Very weak password" : "Многу слаба лозинка", @@ -74,8 +76,6 @@ OC.L10N.register( "So-so password" : "Така така лозинка", "Good password" : "Добра лозинка", "Strong password" : "Јака лозинка", - "Valid until {date}" : "Валидно до {date}", - "Delete" : "Избриши", "Groups" : "Групи", "Unable to delete {objName}" : "Не можам да избришам {objName}", "Error creating group" : "Грешка при креирање на група", @@ -91,7 +91,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "Лични податоци", "Sync clients" : "Клиенти за синхронизација", - "SSL root certificates" : "SSL root сертификати", "Info, warnings, errors and fatal issues" : "Информации, предупредувања, грешки и фатални работи", "Warnings, errors and fatal issues" : "Предупредувања, грешки и фатални работи", "Errors and fatal issues" : "Грешки и фатални работи", diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json index 867e297ef8d..a67d7bef0cc 100644 --- a/settings/l10n/mk.json +++ b/settings/l10n/mk.json @@ -65,6 +65,8 @@ "Error while uninstalling app" : "Грешка при деинсталација на апликацијата", "Uninstall" : "Деинсталирај", "App update" : "Надградба на апликацијата", + "Valid until {date}" : "Валидно до {date}", + "Delete" : "Избриши", "An error occurred: {message}" : "Се случи грешка: {message}", "Select a profile picture" : "Одбери фотографија за профилот", "Very weak password" : "Многу слаба лозинка", @@ -72,8 +74,6 @@ "So-so password" : "Така така лозинка", "Good password" : "Добра лозинка", "Strong password" : "Јака лозинка", - "Valid until {date}" : "Валидно до {date}", - "Delete" : "Избриши", "Groups" : "Групи", "Unable to delete {objName}" : "Не можам да избришам {objName}", "Error creating group" : "Грешка при креирање на група", @@ -89,7 +89,6 @@ "__language_name__" : "__language_name__", "Personal info" : "Лични податоци", "Sync clients" : "Клиенти за синхронизација", - "SSL root certificates" : "SSL root сертификати", "Info, warnings, errors and fatal issues" : "Информации, предупредувања, грешки и фатални работи", "Warnings, errors and fatal issues" : "Предупредувања, грешки и фатални работи", "Errors and fatal issues" : "Грешки и фатални работи", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index bf8af543285..6bb499e702f 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Appen er aktivert men må oppdateres. Du vil bli omdirigert til oppdateringssiden om 5 sekunder.", "App update" : "Oppdatering av applikasjon", "No apps found for \"{query}\"" : "Ingen apper funnet for \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.", + "Valid until {date}" : "Gyldig til {date}", + "Delete" : "Slett", "An error occurred: {message}" : "Det oppstod en feil: {message}", "Select a profile picture" : "Velg et profilbilde", "Very weak password" : "Veldig svakt passord", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "So-so-passord", "Good password" : "Bra passord", "Strong password" : "Sterkt passord", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.", - "Valid until {date}" : "Gyldig til {date}", - "Delete" : "Slett", "Groups" : "Grupper", "Unable to delete {objName}" : "Kan ikke slette {objName}", "Error creating group" : "Feil ved oppretting av gruppe", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "Personlig informasjon", "Sync clients" : "Synkroniseringsklienter", - "SSL root certificates" : "SSL rotsertifikater", "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)", "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer", "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer", @@ -216,6 +215,11 @@ OC.L10N.register( "Enable only for specific groups" : "Aktiver kun for visse grupper", "Uninstall App" : "Avinstaller app", "Enable experimental apps" : "Aktiver eksperimentelle apper", + "Common Name" : "Vanlig navn", + "Valid until" : "Gyldig til", + "Issued By" : "Utstedt av", + "Valid until %s" : "Gyldig til %s", + "Import root certificate" : "Importer rotsertifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei,<br><br>vil bare informere om at du nå har en %s-konto.<br><br>Brukernavnet ditt: %s<br>Gå dit: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ha det!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei,\n\nVil bare informere om at du nå har en %s-konto.\n\nBrukernavnet ditt: %s\nGå dit: %s\n\n", @@ -248,11 +252,6 @@ OC.L10N.register( "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spre budskapet</a>!", "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt", - "Common Name" : "Vanlig navn", - "Valid until" : "Gyldig til", - "Issued By" : "Utstedt av", - "Valid until %s" : "Gyldig til %s", - "Import root certificate" : "Importer rotsertifikat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utviklet av {communityopen}ownCloud-fellesskapet{linkclose}. {githubopen}Kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Vis lagringssted", "Show last log in" : "Vis site innlogging", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index 0ecfd380555..af421488468 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Appen er aktivert men må oppdateres. Du vil bli omdirigert til oppdateringssiden om 5 sekunder.", "App update" : "Oppdatering av applikasjon", "No apps found for \"{query}\"" : "Ingen apper funnet for \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.", + "Valid until {date}" : "Gyldig til {date}", + "Delete" : "Slett", "An error occurred: {message}" : "Det oppstod en feil: {message}", "Select a profile picture" : "Velg et profilbilde", "Very weak password" : "Veldig svakt passord", @@ -86,9 +89,6 @@ "So-so password" : "So-so-passord", "Good password" : "Bra passord", "Strong password" : "Sterkt passord", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.", - "Valid until {date}" : "Gyldig til {date}", - "Delete" : "Slett", "Groups" : "Grupper", "Unable to delete {objName}" : "Kan ikke slette {objName}", "Error creating group" : "Feil ved oppretting av gruppe", @@ -107,7 +107,6 @@ "__language_name__" : "__language_name__", "Personal info" : "Personlig informasjon", "Sync clients" : "Synkroniseringsklienter", - "SSL root certificates" : "SSL rotsertifikater", "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)", "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer", "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer", @@ -214,6 +213,11 @@ "Enable only for specific groups" : "Aktiver kun for visse grupper", "Uninstall App" : "Avinstaller app", "Enable experimental apps" : "Aktiver eksperimentelle apper", + "Common Name" : "Vanlig navn", + "Valid until" : "Gyldig til", + "Issued By" : "Utstedt av", + "Valid until %s" : "Gyldig til %s", + "Import root certificate" : "Importer rotsertifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei,<br><br>vil bare informere om at du nå har en %s-konto.<br><br>Brukernavnet ditt: %s<br>Gå dit: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ha det!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei,\n\nVil bare informere om at du nå har en %s-konto.\n\nBrukernavnet ditt: %s\nGå dit: %s\n\n", @@ -246,11 +250,6 @@ "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spre budskapet</a>!", "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt", - "Common Name" : "Vanlig navn", - "Valid until" : "Gyldig til", - "Issued By" : "Utstedt av", - "Valid until %s" : "Gyldig til %s", - "Import root certificate" : "Importer rotsertifikat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utviklet av {communityopen}ownCloud-fellesskapet{linkclose}. {githubopen}Kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Vis lagringssted", "Show last log in" : "Vis site innlogging", diff --git a/settings/l10n/nds.js b/settings/l10n/nds.js index 74f4c9834c5..a8c440f6e0b 100644 --- a/settings/l10n/nds.js +++ b/settings/l10n/nds.js @@ -3,12 +3,12 @@ OC.L10N.register( { "External Storage" : "Externer Speicher", "Saved" : "Gespeichert", + "Delete" : "Löschen", "Very weak password" : "Sehr schwaches Passwort", "Weak password" : "Schwaches Passwort", "So-so password" : "Mittelstarkes Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", - "Delete" : "Löschen", "None" : "Keine(r)", "Enable encryption" : "Verschlüsselung aktivieren", "Port" : "Port", diff --git a/settings/l10n/nds.json b/settings/l10n/nds.json index 0abbf7738de..a8b5ae43a75 100644 --- a/settings/l10n/nds.json +++ b/settings/l10n/nds.json @@ -1,12 +1,12 @@ { "translations": { "External Storage" : "Externer Speicher", "Saved" : "Gespeichert", + "Delete" : "Löschen", "Very weak password" : "Sehr schwaches Passwort", "Weak password" : "Schwaches Passwort", "So-so password" : "Mittelstarkes Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", - "Delete" : "Löschen", "None" : "Keine(r)", "Enable encryption" : "Verschlüsselung aktivieren", "Port" : "Port", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index e2f3b08a373..434fc6b2b38 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. U wordt over 5 seconden doorgeleid naar de bijwerkpagina.", "App update" : "App update", "No apps found for \"{query}\"" : "Geen apps gevonden voor \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.", + "Valid until {date}" : "Geldig tot {date}", + "Delete" : "Verwijder", "An error occurred: {message}" : "Er heeft zich een fout voorgedaan: {message}", "Select a profile picture" : "Kies een profielafbeelding", "Very weak password" : "Zeer zwak wachtwoord", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Matig wachtwoord", "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.", - "Valid until {date}" : "Geldig tot {date}", - "Delete" : "Verwijder", "Groups" : "Groepen", "Unable to delete {objName}" : "Kan {objName} niet verwijderen", "Error creating group" : "Fout bij aanmaken groep", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Nederlands", "Personal info" : "Persoonlijke info", "Sync clients" : "Sync clients", - "SSL root certificates" : "SSL root certificaten", "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)", "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen", "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen", @@ -212,10 +211,17 @@ OC.L10N.register( "Admin documentation" : "Beheerdocumentatie", "Show description …" : "Toon beschrijving ...", "Hide description …" : "Verberg beschrijving ...", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren", "Uninstall App" : "De-installeren app", "Enable experimental apps" : "Inschakelen experimentele apps", + "Common Name" : "Common Name", + "Valid until" : "Geldig tot", + "Issued By" : "Uitgegeven door", + "Valid until %s" : "Geldig tot %s", + "Import root certificate" : "Importeren root certificaat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo daar,<br><br>we willen u laten weten dat u nu een %s account hebt.<br><br>Uw gebruikersnaam: %s<br>Ga naar: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Proficiat!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwe willen u laten weten dat u nu een %s account hebt.\n\nUw gebruikersnaam: %s\nGa naar: %s\n\n", @@ -227,12 +233,17 @@ OC.L10N.register( "You are using <strong>%s</strong> of <strong>%s</strong>" : "U gebruikt <strong>%s</strong> van <strong>%s</strong>", "Profile picture" : "Profielafbeelding", "Upload new" : "Upload een nieuwe", + "Select from Files" : "Kies uit bestanden", "Remove image" : "Afbeelding verwijderen", + "png or jpg, max. 20 MB" : "png of jpg, max. 20 MB", + "Picture provided by original account" : "Afbeelding is verstrekt door originele account.", "Cancel" : "Annuleer", + "Choose as profile picture" : "Kies als profielafbeelding", "Full name" : "Volledige naam", "No display name set" : "Nog geen weergavenaam ingesteld", "Email" : "E-mailadres", "Your email address" : "Uw e-mailadres", + "For password recovery and notifications" : "Voor wachtwoordherstel en meldingen", "No email address set" : "Geen e-mailadres opgegeven", "You are member of the following groups:" : "U bent lid van de volgende groepen:", "Password" : "Wachtwoord", @@ -248,11 +259,6 @@ OC.L10N.register( "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het nieuws</a>!", "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw", - "Common Name" : "Common Name", - "Valid until" : "Geldig tot", - "Issued By" : "Uitgegeven door", - "Valid until %s" : "Geldig tot %s", - "Import root certificate" : "Importeren root certificaat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschap{linkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index 477efbb9945..50c68d9fdc5 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. U wordt over 5 seconden doorgeleid naar de bijwerkpagina.", "App update" : "App update", "No apps found for \"{query}\"" : "Geen apps gevonden voor \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.", + "Valid until {date}" : "Geldig tot {date}", + "Delete" : "Verwijder", "An error occurred: {message}" : "Er heeft zich een fout voorgedaan: {message}", "Select a profile picture" : "Kies een profielafbeelding", "Very weak password" : "Zeer zwak wachtwoord", @@ -86,9 +89,6 @@ "So-so password" : "Matig wachtwoord", "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.", - "Valid until {date}" : "Geldig tot {date}", - "Delete" : "Verwijder", "Groups" : "Groepen", "Unable to delete {objName}" : "Kan {objName} niet verwijderen", "Error creating group" : "Fout bij aanmaken groep", @@ -107,7 +107,6 @@ "__language_name__" : "Nederlands", "Personal info" : "Persoonlijke info", "Sync clients" : "Sync clients", - "SSL root certificates" : "SSL root certificaten", "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)", "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen", "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen", @@ -210,10 +209,17 @@ "Admin documentation" : "Beheerdocumentatie", "Show description …" : "Toon beschrijving ...", "Hide description …" : "Verberg beschrijving ...", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren", "Uninstall App" : "De-installeren app", "Enable experimental apps" : "Inschakelen experimentele apps", + "Common Name" : "Common Name", + "Valid until" : "Geldig tot", + "Issued By" : "Uitgegeven door", + "Valid until %s" : "Geldig tot %s", + "Import root certificate" : "Importeren root certificaat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo daar,<br><br>we willen u laten weten dat u nu een %s account hebt.<br><br>Uw gebruikersnaam: %s<br>Ga naar: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Proficiat!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwe willen u laten weten dat u nu een %s account hebt.\n\nUw gebruikersnaam: %s\nGa naar: %s\n\n", @@ -225,12 +231,17 @@ "You are using <strong>%s</strong> of <strong>%s</strong>" : "U gebruikt <strong>%s</strong> van <strong>%s</strong>", "Profile picture" : "Profielafbeelding", "Upload new" : "Upload een nieuwe", + "Select from Files" : "Kies uit bestanden", "Remove image" : "Afbeelding verwijderen", + "png or jpg, max. 20 MB" : "png of jpg, max. 20 MB", + "Picture provided by original account" : "Afbeelding is verstrekt door originele account.", "Cancel" : "Annuleer", + "Choose as profile picture" : "Kies als profielafbeelding", "Full name" : "Volledige naam", "No display name set" : "Nog geen weergavenaam ingesteld", "Email" : "E-mailadres", "Your email address" : "Uw e-mailadres", + "For password recovery and notifications" : "Voor wachtwoordherstel en meldingen", "No email address set" : "Geen e-mailadres opgegeven", "You are member of the following groups:" : "U bent lid van de volgende groepen:", "Password" : "Wachtwoord", @@ -246,11 +257,6 @@ "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het nieuws</a>!", "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw", - "Common Name" : "Common Name", - "Valid until" : "Geldig tot", - "Issued By" : "Uitgegeven door", - "Valid until %s" : "Geldig tot %s", - "Import root certificate" : "Importeren root certificaat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschap{linkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js index 163dda215cf..9f56955aa39 100644 --- a/settings/l10n/nn_NO.js +++ b/settings/l10n/nn_NO.js @@ -27,10 +27,10 @@ OC.L10N.register( "Updating...." : "Oppdaterer …", "Error while updating app" : "Feil ved oppdatering av app", "Updated" : "Oppdatert", + "Delete" : "Slett", "Select a profile picture" : "Vel eit profilbilete", "Very weak password" : "Veldig svakt passord", "Weak password" : "Svakt passord", - "Delete" : "Slett", "Groups" : "Grupper", "undo" : "angra", "never" : "aldri", diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json index ab14d5335fd..cebbd5451f0 100644 --- a/settings/l10n/nn_NO.json +++ b/settings/l10n/nn_NO.json @@ -25,10 +25,10 @@ "Updating...." : "Oppdaterer …", "Error while updating app" : "Feil ved oppdatering av app", "Updated" : "Oppdatert", + "Delete" : "Slett", "Select a profile picture" : "Vel eit profilbilete", "Very weak password" : "Veldig svakt passord", "Weak password" : "Svakt passord", - "Delete" : "Slett", "Groups" : "Grupper", "undo" : "angra", "never" : "aldri", diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js index 221a5421d40..d9c89c820a7 100644 --- a/settings/l10n/oc.js +++ b/settings/l10n/oc.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'aplicacion es estada activada mas deu èsser mesa a jorn. Seretz redirigit cap a la pagina de las mesas a jorn dins 5 segondas.", "App update" : "Mesa a jorn", "No apps found for \"{query}\"" : "Cap d'aplicacion pas trobada per \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.", + "Valid until {date}" : "Valid fins al {date}", + "Delete" : "Suprimir", "An error occurred: {message}" : "Una error s'es produsida : {message}", "Select a profile picture" : "Seleccionar una fòto de perfil ", "Very weak password" : "Senhal de fòrt febla seguretat", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Senhal de seguretat tot bèl juste acceptable", "Good password" : "Senhal de seguretat sufisenta", "Strong password" : "Senhal de fòrta seguretat", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.", - "Valid until {date}" : "Valid fins al {date}", - "Delete" : "Suprimir", "Groups" : "Gropes", "Unable to delete {objName}" : "Impossible de suprimir {objName}", "Error creating group" : "Error al moment de la creacion del grop", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Occitan-lengadocian", "Personal info" : "Informacions personalas", "Sync clients" : "Clients de sincronizacion", - "SSL root certificates" : "Certificats raiç SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (errors fatalas, errors, avertiments, informacions, desbugatge)", "Info, warnings, errors and fatal issues" : "Informacions, avertiments, errors e errors fatalas", "Warnings, errors and fatal issues" : "Avertiments, errors e errors fatalas", @@ -215,6 +214,11 @@ OC.L10N.register( "Enable only for specific groups" : "Activar unicament per certans gropes", "Uninstall App" : "Desinstallar l'aplicacion", "Enable experimental apps" : "Activar las aplicacions experimentalas", + "Common Name" : "Nom d'usatge", + "Valid until" : "Valid fins a", + "Issued By" : "Desliurat per", + "Valid until %s" : "Valid fins a %s", + "Import root certificate" : "Importar un certificat raiç", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjorn,<br><br>Un compte %s es estat creat per vos.<br><br>Vòstre nom d'utilizaire es : %s<br>Visitatz vòstre compte : <a href=\"%s\">%s</a><br><br>", "Cheers!" : "A lèu !", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjorn,<br><br>Un compte %s es estat creat per vos.<br><br>Vòstre nom d'utilizaire es : %s<br>Visitatz vòstre compte : %s<br><br>\n", @@ -246,11 +250,6 @@ OC.L10N.register( "iOS app" : "Aplicacion iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se volètz aportar vòstre supòrt al projècte\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejonhètz lo desvolopament</a>\n o\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">fasètz passar l'informacion</a> !", "Show First Run Wizard again" : "Reveire la fenèstra d'acuèlh afichada al moment de vòstra primièra connexion", - "Common Name" : "Nom d'usatge", - "Valid until" : "Valid fins a", - "Issued By" : "Desliurat per", - "Valid until %s" : "Valid fins a %s", - "Import root certificate" : "Importar un certificat raiç", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desvolopat per la {communityopen}comunautat ownCloud{linkclose}, lo {githubopen}code font{linkclose} es jos licéncia {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Afichar l'emplaçament de l'emmagazinatge", "Show last log in" : "Far veire la darrièra connexion", diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json index 7c941d523c9..28e00148748 100644 --- a/settings/l10n/oc.json +++ b/settings/l10n/oc.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'aplicacion es estada activada mas deu èsser mesa a jorn. Seretz redirigit cap a la pagina de las mesas a jorn dins 5 segondas.", "App update" : "Mesa a jorn", "No apps found for \"{query}\"" : "Cap d'aplicacion pas trobada per \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.", + "Valid until {date}" : "Valid fins al {date}", + "Delete" : "Suprimir", "An error occurred: {message}" : "Una error s'es produsida : {message}", "Select a profile picture" : "Seleccionar una fòto de perfil ", "Very weak password" : "Senhal de fòrt febla seguretat", @@ -86,9 +89,6 @@ "So-so password" : "Senhal de seguretat tot bèl juste acceptable", "Good password" : "Senhal de seguretat sufisenta", "Strong password" : "Senhal de fòrta seguretat", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.", - "Valid until {date}" : "Valid fins al {date}", - "Delete" : "Suprimir", "Groups" : "Gropes", "Unable to delete {objName}" : "Impossible de suprimir {objName}", "Error creating group" : "Error al moment de la creacion del grop", @@ -107,7 +107,6 @@ "__language_name__" : "Occitan-lengadocian", "Personal info" : "Informacions personalas", "Sync clients" : "Clients de sincronizacion", - "SSL root certificates" : "Certificats raiç SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (errors fatalas, errors, avertiments, informacions, desbugatge)", "Info, warnings, errors and fatal issues" : "Informacions, avertiments, errors e errors fatalas", "Warnings, errors and fatal issues" : "Avertiments, errors e errors fatalas", @@ -213,6 +212,11 @@ "Enable only for specific groups" : "Activar unicament per certans gropes", "Uninstall App" : "Desinstallar l'aplicacion", "Enable experimental apps" : "Activar las aplicacions experimentalas", + "Common Name" : "Nom d'usatge", + "Valid until" : "Valid fins a", + "Issued By" : "Desliurat per", + "Valid until %s" : "Valid fins a %s", + "Import root certificate" : "Importar un certificat raiç", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjorn,<br><br>Un compte %s es estat creat per vos.<br><br>Vòstre nom d'utilizaire es : %s<br>Visitatz vòstre compte : <a href=\"%s\">%s</a><br><br>", "Cheers!" : "A lèu !", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjorn,<br><br>Un compte %s es estat creat per vos.<br><br>Vòstre nom d'utilizaire es : %s<br>Visitatz vòstre compte : %s<br><br>\n", @@ -244,11 +248,6 @@ "iOS app" : "Aplicacion iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se volètz aportar vòstre supòrt al projècte\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejonhètz lo desvolopament</a>\n o\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">fasètz passar l'informacion</a> !", "Show First Run Wizard again" : "Reveire la fenèstra d'acuèlh afichada al moment de vòstra primièra connexion", - "Common Name" : "Nom d'usatge", - "Valid until" : "Valid fins a", - "Issued By" : "Desliurat per", - "Valid until %s" : "Valid fins a %s", - "Import root certificate" : "Importar un certificat raiç", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desvolopat per la {communityopen}comunautat ownCloud{linkclose}, lo {githubopen}code font{linkclose} es jos licéncia {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Afichar l'emplaçament de l'emmagazinatge", "Show last log in" : "Far veire la darrièra connexion", diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js index 0c36e110939..23dc9ba79ee 100644 --- a/settings/l10n/pl.js +++ b/settings/l10n/pl.js @@ -57,14 +57,14 @@ OC.L10N.register( "Uninstalling ...." : "Odinstalowywanie....", "Error while uninstalling app" : "Błąd przy odinstalowywaniu aplikacji", "Uninstall" : "Odinstaluj", + "Valid until {date}" : "Ważny do {date}", + "Delete" : "Usuń", "Select a profile picture" : "Wybierz zdjęcie profilu", "Very weak password" : "Bardzo słabe hasło", "Weak password" : "Słabe hasło", "So-so password" : "Mało skomplikowane hasło", "Good password" : "Dobre hasło", "Strong password" : "Mocne hasło", - "Valid until {date}" : "Ważny do {date}", - "Delete" : "Usuń", "Groups" : "Grupy", "Unable to delete {objName}" : "Nie można usunąć {objName}", "Error creating group" : "Błąd podczas tworzenia grupy", @@ -81,7 +81,6 @@ OC.L10N.register( "A valid password must be provided" : "Należy podać prawidłowe hasło", "A valid email must be provided" : "Podaj poprawny adres email", "__language_name__" : "polski", - "SSL root certificates" : "Główny certyfikat SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko (Informacje, ostrzeżenia, błędy i poważne problemy, debug)", "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy", "Warnings, errors and fatal issues" : "Ostrzeżenia, błędy i poważne problemy", @@ -150,6 +149,11 @@ OC.L10N.register( "Enable only for specific groups" : "Włącz tylko dla określonych grup", "Uninstall App" : "Odinstaluj aplikację", "Enable experimental apps" : "Włącz eksperymentalne aplikacje", + "Common Name" : "Nazwa CN", + "Valid until" : "Ważny do", + "Issued By" : "Wydany przez", + "Valid until %s" : "Ważny do %s", + "Import root certificate" : "Importuj główny certyfikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Witaj,<br><br>informujemy, że teraz masz konto na %s .<br><br>Twoja nazwa użytkownika: %s<br>Dostęp pod adresem: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Pozdrawiam!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Witaj,\n\ninformujemy, że teraz masz konto na %s .\n\nTwoja nazwa użytkownika:: %s\nDostęp pod adresem: %s\n\n", @@ -178,11 +182,6 @@ OC.L10N.register( "Android app" : "Aplikacja Android", "iOS app" : "Aplikacja iOS", "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia", - "Common Name" : "Nazwa CN", - "Valid until" : "Ważny do", - "Issued By" : "Wydany przez", - "Valid until %s" : "Ważny do %s", - "Import root certificate" : "Importuj główny certyfikat", "Show storage location" : "Pokaż miejsce przechowywania", "Show last log in" : "Pokaż ostatni login", "Send email to new user" : "Wyślij email do nowego użytkownika", diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json index c747a8c9727..c4885d17a67 100644 --- a/settings/l10n/pl.json +++ b/settings/l10n/pl.json @@ -55,14 +55,14 @@ "Uninstalling ...." : "Odinstalowywanie....", "Error while uninstalling app" : "Błąd przy odinstalowywaniu aplikacji", "Uninstall" : "Odinstaluj", + "Valid until {date}" : "Ważny do {date}", + "Delete" : "Usuń", "Select a profile picture" : "Wybierz zdjęcie profilu", "Very weak password" : "Bardzo słabe hasło", "Weak password" : "Słabe hasło", "So-so password" : "Mało skomplikowane hasło", "Good password" : "Dobre hasło", "Strong password" : "Mocne hasło", - "Valid until {date}" : "Ważny do {date}", - "Delete" : "Usuń", "Groups" : "Grupy", "Unable to delete {objName}" : "Nie można usunąć {objName}", "Error creating group" : "Błąd podczas tworzenia grupy", @@ -79,7 +79,6 @@ "A valid password must be provided" : "Należy podać prawidłowe hasło", "A valid email must be provided" : "Podaj poprawny adres email", "__language_name__" : "polski", - "SSL root certificates" : "Główny certyfikat SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko (Informacje, ostrzeżenia, błędy i poważne problemy, debug)", "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy", "Warnings, errors and fatal issues" : "Ostrzeżenia, błędy i poważne problemy", @@ -148,6 +147,11 @@ "Enable only for specific groups" : "Włącz tylko dla określonych grup", "Uninstall App" : "Odinstaluj aplikację", "Enable experimental apps" : "Włącz eksperymentalne aplikacje", + "Common Name" : "Nazwa CN", + "Valid until" : "Ważny do", + "Issued By" : "Wydany przez", + "Valid until %s" : "Ważny do %s", + "Import root certificate" : "Importuj główny certyfikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Witaj,<br><br>informujemy, że teraz masz konto na %s .<br><br>Twoja nazwa użytkownika: %s<br>Dostęp pod adresem: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Pozdrawiam!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Witaj,\n\ninformujemy, że teraz masz konto na %s .\n\nTwoja nazwa użytkownika:: %s\nDostęp pod adresem: %s\n\n", @@ -176,11 +180,6 @@ "Android app" : "Aplikacja Android", "iOS app" : "Aplikacja iOS", "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia", - "Common Name" : "Nazwa CN", - "Valid until" : "Ważny do", - "Issued By" : "Wydany przez", - "Valid until %s" : "Ważny do %s", - "Import root certificate" : "Importuj główny certyfikat", "Show storage location" : "Pokaż miejsce przechowywania", "Show last log in" : "Pokaż ostatni login", "Send email to new user" : "Wyślij email do nowego użytkownika", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 25352a5a187..207e4f40ff9 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi habilitado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.", "App update" : "Atualização de aplicativo", "No apps found for \"{query}\"" : "Nenhum aplicativo encontrado para \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM", + "Valid until {date}" : "Vádido até {date}", + "Delete" : "Excluir", "An error occurred: {message}" : "Ocorreu um erro: {message}", "Select a profile picture" : "Selecione uma imagem para o perfil", "Very weak password" : "Senha muito fraca", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Senha mais ou menos", "Good password" : "Boa senha", "Strong password" : "Senha forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM", - "Valid until {date}" : "Vádido até {date}", - "Delete" : "Excluir", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível excluir {objName}", "Error creating group" : "Erro ao criar grupo", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "Informação pessoal", "Sync clients" : "Clientes de Sincronização", - "SSL root certificates" : "Certificados SSL raíz", "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)", "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais", "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais", @@ -218,6 +217,11 @@ OC.L10N.register( "Enable only for specific groups" : "Ativar apenas para grupos específicos", "Uninstall App" : "Desinstalar Aplicativo", "Enable experimental apps" : "Habilitar aplicativos experimentais", + "Common Name" : "Nome", + "Valid until" : "Válido até", + "Issued By" : "Emitido Por", + "Valid until %s" : "Válido até %s", + "Import root certificate" : "Importar certificado raiz", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>somente para lembrar que agora você tem uma conta %s.<br><br>Seu nome de usuário é: %s<br>Acesse em: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Saudações!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\nsomente para lembrar que agora você tem uma conta %s.\n\nSeu nome de usuário é: %s\nAcesse em: %s\n\n", @@ -255,11 +259,6 @@ OC.L10N.register( "iOS app" : "App iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você quiser suportar o projeto, \n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude com o desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude a divulgá-lo</a>!", "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente", - "Common Name" : "Nome", - "Valid until" : "Válido até", - "Issued By" : "Emitido Por", - "Valid until %s" : "Válido até %s", - "Import root certificate" : "Importar certificado raiz", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido {communityopen}pela comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar localização de armazenamento", "Show last log in" : "Mostrar o último acesso", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index a201969c3cf..7ce6ed504ad 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi habilitado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.", "App update" : "Atualização de aplicativo", "No apps found for \"{query}\"" : "Nenhum aplicativo encontrado para \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM", + "Valid until {date}" : "Vádido até {date}", + "Delete" : "Excluir", "An error occurred: {message}" : "Ocorreu um erro: {message}", "Select a profile picture" : "Selecione uma imagem para o perfil", "Very weak password" : "Senha muito fraca", @@ -86,9 +89,6 @@ "So-so password" : "Senha mais ou menos", "Good password" : "Boa senha", "Strong password" : "Senha forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM", - "Valid until {date}" : "Vádido até {date}", - "Delete" : "Excluir", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível excluir {objName}", "Error creating group" : "Erro ao criar grupo", @@ -107,7 +107,6 @@ "__language_name__" : "__language_name__", "Personal info" : "Informação pessoal", "Sync clients" : "Clientes de Sincronização", - "SSL root certificates" : "Certificados SSL raíz", "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)", "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais", "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais", @@ -216,6 +215,11 @@ "Enable only for specific groups" : "Ativar apenas para grupos específicos", "Uninstall App" : "Desinstalar Aplicativo", "Enable experimental apps" : "Habilitar aplicativos experimentais", + "Common Name" : "Nome", + "Valid until" : "Válido até", + "Issued By" : "Emitido Por", + "Valid until %s" : "Válido até %s", + "Import root certificate" : "Importar certificado raiz", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>somente para lembrar que agora você tem uma conta %s.<br><br>Seu nome de usuário é: %s<br>Acesse em: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Saudações!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\nsomente para lembrar que agora você tem uma conta %s.\n\nSeu nome de usuário é: %s\nAcesse em: %s\n\n", @@ -253,11 +257,6 @@ "iOS app" : "App iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você quiser suportar o projeto, \n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude com o desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude a divulgá-lo</a>!", "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente", - "Common Name" : "Nome", - "Valid until" : "Válido até", - "Issued By" : "Emitido Por", - "Valid until %s" : "Válido até %s", - "Import root certificate" : "Importar certificado raiz", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido {communityopen}pela comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar localização de armazenamento", "Show last log in" : "Mostrar o último acesso", diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js index 545507c9381..353bba43c10 100644 --- a/settings/l10n/pt_PT.js +++ b/settings/l10n/pt_PT.js @@ -75,6 +75,9 @@ OC.L10N.register( "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app", "Uninstall" : "Desinstalar", "App update" : "Atualizar App", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor, envie um certificado PEM codificado em ASCII.", + "Valid until {date}" : "Válida até {date}", + "Delete" : "Apagar", "An error occurred: {message}" : "Ocorreu um erro: {message}", "Select a profile picture" : "Selecione uma fotografia de perfil", "Very weak password" : "Palavra-passe muito fraca", @@ -82,9 +85,6 @@ OC.L10N.register( "So-so password" : "Palavra-passe aceitável", "Good password" : "Palavra-passe boa", "Strong password" : "Palavra-passe forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor, envie um certificado PEM codificado em ASCII.", - "Valid until {date}" : "Válida até {date}", - "Delete" : "Apagar", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível apagar {objNome}", "Error creating group" : "Ocorreu um erro ao criar o grupo", @@ -103,7 +103,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "Informação pessoal", "Sync clients" : "Clientes de sync", - "SSL root certificates" : "Certificados de raiz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)", "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais", "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais", @@ -193,6 +192,11 @@ OC.L10N.register( "Enable only for specific groups" : "Activar só para grupos específicos", "Uninstall App" : "Desinstalar aplicação", "Enable experimental apps" : "Ativar apps experimentais", + "Common Name" : "Nome Comum", + "Valid until" : "Válido até", + "Issued By" : "Emitido Por", + "Valid until %s" : "Válido até %s", + "Import root certificate" : "Importar certificado root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>apenas para informar que você tem uma conta %s.<br><br>O seu nome de utilizador: %s<br>Acesse à sua conta: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Parabéns!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\napenas para informar que você tem uma conta %s.\n\nO seu nome de utilizador: %s\nAcesse à sua conta: %s\n\n", @@ -224,11 +228,6 @@ OC.L10N.register( "iOS app" : "Aplicação iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quer apoiar o projecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">junte-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalhe a palavra</a>!", "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial", - "Common Name" : "Nome Comum", - "Valid until" : "Válido até", - "Issued By" : "Emitido Por", - "Valid until %s" : "Válido até %s", - "Import root certificate" : "Importar certificado root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código-fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar a localização do armazenamento", "Show last log in" : "Mostrar ultimo acesso de entrada", diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json index e0e4749f872..6fee277cf55 100644 --- a/settings/l10n/pt_PT.json +++ b/settings/l10n/pt_PT.json @@ -73,6 +73,9 @@ "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app", "Uninstall" : "Desinstalar", "App update" : "Atualizar App", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor, envie um certificado PEM codificado em ASCII.", + "Valid until {date}" : "Válida até {date}", + "Delete" : "Apagar", "An error occurred: {message}" : "Ocorreu um erro: {message}", "Select a profile picture" : "Selecione uma fotografia de perfil", "Very weak password" : "Palavra-passe muito fraca", @@ -80,9 +83,6 @@ "So-so password" : "Palavra-passe aceitável", "Good password" : "Palavra-passe boa", "Strong password" : "Palavra-passe forte", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor, envie um certificado PEM codificado em ASCII.", - "Valid until {date}" : "Válida até {date}", - "Delete" : "Apagar", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível apagar {objNome}", "Error creating group" : "Ocorreu um erro ao criar o grupo", @@ -101,7 +101,6 @@ "__language_name__" : "__language_name__", "Personal info" : "Informação pessoal", "Sync clients" : "Clientes de sync", - "SSL root certificates" : "Certificados de raiz SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)", "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais", "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais", @@ -191,6 +190,11 @@ "Enable only for specific groups" : "Activar só para grupos específicos", "Uninstall App" : "Desinstalar aplicação", "Enable experimental apps" : "Ativar apps experimentais", + "Common Name" : "Nome Comum", + "Valid until" : "Válido até", + "Issued By" : "Emitido Por", + "Valid until %s" : "Válido até %s", + "Import root certificate" : "Importar certificado root", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>apenas para informar que você tem uma conta %s.<br><br>O seu nome de utilizador: %s<br>Acesse à sua conta: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Parabéns!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\napenas para informar que você tem uma conta %s.\n\nO seu nome de utilizador: %s\nAcesse à sua conta: %s\n\n", @@ -222,11 +226,6 @@ "iOS app" : "Aplicação iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quer apoiar o projecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">junte-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalhe a palavra</a>!", "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial", - "Common Name" : "Nome Comum", - "Valid until" : "Válido até", - "Issued By" : "Emitido Por", - "Valid until %s" : "Válido até %s", - "Import root certificate" : "Importar certificado root", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código-fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar a localização do armazenamento", "Show last log in" : "Mostrar ultimo acesso de entrada", diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js index bbb8b575331..8ebfd2fa6ef 100644 --- a/settings/l10n/ro.js +++ b/settings/l10n/ro.js @@ -46,12 +46,12 @@ OC.L10N.register( "Updated" : "Actualizat", "Uninstalling ...." : "Dezinstalaza ....", "Uninstall" : "Dezinstalați", + "Delete" : "Șterge", "Select a profile picture" : "Selectează o imagine de profil", "Very weak password" : "Parolă foarte slabă", "Weak password" : "Parolă slabă", "Good password" : "Parolă bună", "Strong password" : "Parolă puternică", - "Delete" : "Șterge", "Groups" : "Grupuri", "undo" : "Anulează ultima acțiune", "never" : "niciodată", @@ -60,7 +60,6 @@ OC.L10N.register( "Error creating user" : "Eroare la crearea utilizatorului", "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă", "__language_name__" : "_language_name_", - "SSL root certificates" : "Certificate SSL root", "None" : "Niciuna", "Login" : "Autentificare", "SSL" : "SSL", diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json index 0b2710ae277..e5ffcc4c69a 100644 --- a/settings/l10n/ro.json +++ b/settings/l10n/ro.json @@ -44,12 +44,12 @@ "Updated" : "Actualizat", "Uninstalling ...." : "Dezinstalaza ....", "Uninstall" : "Dezinstalați", + "Delete" : "Șterge", "Select a profile picture" : "Selectează o imagine de profil", "Very weak password" : "Parolă foarte slabă", "Weak password" : "Parolă slabă", "Good password" : "Parolă bună", "Strong password" : "Parolă puternică", - "Delete" : "Șterge", "Groups" : "Grupuri", "undo" : "Anulează ultima acțiune", "never" : "niciodată", @@ -58,7 +58,6 @@ "Error creating user" : "Eroare la crearea utilizatorului", "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă", "__language_name__" : "_language_name_", - "SSL root certificates" : "Certificate SSL root", "None" : "Niciuna", "Login" : "Autentificare", "SSL" : "SSL", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 4cab17aef57..57ba603a7fe 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Приложение было включено и нуждается в обновлении. Вас перенаправит на страницу обновления через 5 секунд.", "App update" : "Обновить приложения", "No apps found for \"{query}\"" : "Не найдено приложений по вашему \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.", + "Valid until {date}" : "Действительно до {дата}", + "Delete" : "Удалить", "An error occurred: {message}" : "Произошла ошибка: {message}", "Select a profile picture" : "Выберите аватар", "Very weak password" : "Очень слабый пароль", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Так себе пароль", "Good password" : "Хороший пароль", "Strong password" : "Стойкий пароль", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.", - "Valid until {date}" : "Действительно до {дата}", - "Delete" : "Удалить", "Groups" : "Группы", "Unable to delete {objName}" : "Невозможно удалить {objName}", "Error creating group" : "Ошибка создания группы", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Русский", "Personal info" : "Личная информация", "Sync clients" : "Синхронизация клиентов", - "SSL root certificates" : "Корневые сертификаты SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)", "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы", "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы", @@ -218,6 +217,11 @@ OC.L10N.register( "Enable only for specific groups" : "Включить только для этих групп", "Uninstall App" : "Удалить приложение", "Enable experimental apps" : "Включить экспериментальные приложения", + "Common Name" : "Общее Имя", + "Valid until" : "Действительно до", + "Issued By" : "Выдан", + "Valid until %s" : "Действительно до %s", + "Import root certificate" : "Импорт корневого сертификата", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Удачи!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здравствуйте,\n\nПросто хотим сообщить, что теперь у вас есть учетная запись на %s.\n\nИмя пользователя: %s\nЗайти: %s\n", @@ -255,11 +259,6 @@ OC.L10N.register( "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">совместная разработка</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">сообщить</a>!", "Show First Run Wizard again" : "Показать помощник настройки снова", - "Common Name" : "Общее Имя", - "Valid until" : "Действительно до", - "Issued By" : "Выдан", - "Valid until %s" : "Действительно до %s", - "Import root certificate" : "Импорт корневого сертификата", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработано {communityopen}сообществом ownCloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с{licenseopen}<abbr title=\"Публичной лицензией Affero General\">AGPL</abbr>{linkclose}.", "Show storage location" : "Показать местонахождение хранилища", "Show last log in" : "Показать последний вход в систему", diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index 439257ee950..cc89434f06f 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Приложение было включено и нуждается в обновлении. Вас перенаправит на страницу обновления через 5 секунд.", "App update" : "Обновить приложения", "No apps found for \"{query}\"" : "Не найдено приложений по вашему \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.", + "Valid until {date}" : "Действительно до {дата}", + "Delete" : "Удалить", "An error occurred: {message}" : "Произошла ошибка: {message}", "Select a profile picture" : "Выберите аватар", "Very weak password" : "Очень слабый пароль", @@ -86,9 +89,6 @@ "So-so password" : "Так себе пароль", "Good password" : "Хороший пароль", "Strong password" : "Стойкий пароль", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.", - "Valid until {date}" : "Действительно до {дата}", - "Delete" : "Удалить", "Groups" : "Группы", "Unable to delete {objName}" : "Невозможно удалить {objName}", "Error creating group" : "Ошибка создания группы", @@ -107,7 +107,6 @@ "__language_name__" : "Русский", "Personal info" : "Личная информация", "Sync clients" : "Синхронизация клиентов", - "SSL root certificates" : "Корневые сертификаты SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)", "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы", "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы", @@ -216,6 +215,11 @@ "Enable only for specific groups" : "Включить только для этих групп", "Uninstall App" : "Удалить приложение", "Enable experimental apps" : "Включить экспериментальные приложения", + "Common Name" : "Общее Имя", + "Valid until" : "Действительно до", + "Issued By" : "Выдан", + "Valid until %s" : "Действительно до %s", + "Import root certificate" : "Импорт корневого сертификата", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Удачи!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здравствуйте,\n\nПросто хотим сообщить, что теперь у вас есть учетная запись на %s.\n\nИмя пользователя: %s\nЗайти: %s\n", @@ -253,11 +257,6 @@ "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">совместная разработка</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">сообщить</a>!", "Show First Run Wizard again" : "Показать помощник настройки снова", - "Common Name" : "Общее Имя", - "Valid until" : "Действительно до", - "Issued By" : "Выдан", - "Valid until %s" : "Действительно до %s", - "Import root certificate" : "Импорт корневого сертификата", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработано {communityopen}сообществом ownCloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с{licenseopen}<abbr title=\"Публичной лицензией Affero General\">AGPL</abbr>{linkclose}.", "Show storage location" : "Показать местонахождение хранилища", "Show last log in" : "Показать последний вход в систему", diff --git a/settings/l10n/si_LK.js b/settings/l10n/si_LK.js index 21d569a9abb..ce4dd3f2da2 100644 --- a/settings/l10n/si_LK.js +++ b/settings/l10n/si_LK.js @@ -17,7 +17,6 @@ OC.L10N.register( "Groups" : "කණ්ඩායම්", "undo" : "නිෂ්ප්රභ කරන්න", "never" : "කවදාවත්", - "SSL root certificates" : "SSL මූල සහතිකයන්", "None" : "කිසිවක් නැත", "Login" : "ප්රවිශ්ටය", "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි", diff --git a/settings/l10n/si_LK.json b/settings/l10n/si_LK.json index 41699fd92c0..10f3cfa47cb 100644 --- a/settings/l10n/si_LK.json +++ b/settings/l10n/si_LK.json @@ -15,7 +15,6 @@ "Groups" : "කණ්ඩායම්", "undo" : "නිෂ්ප්රභ කරන්න", "never" : "කවදාවත්", - "SSL root certificates" : "SSL මූල සහතිකයන්", "None" : "කිසිවක් නැත", "Login" : "ප්රවිශ්ටය", "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි", diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js index f25eb6ed5c6..5968a1fe253 100644 --- a/settings/l10n/sk_SK.js +++ b/settings/l10n/sk_SK.js @@ -73,14 +73,14 @@ OC.L10N.register( "Uninstalling ...." : "Prebieha odinštalovanie...", "Error while uninstalling app" : "Chyba pri odinštalovaní aplikácie", "Uninstall" : "Odinštalácia", + "Valid until {date}" : "Platný do {date}", + "Delete" : "Zmazať", "Select a profile picture" : "Vybrať avatara", "Very weak password" : "Veľmi slabé heslo", "Weak password" : "Slabé heslo", "So-so password" : "Priemerné heslo", "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", - "Valid until {date}" : "Platný do {date}", - "Delete" : "Zmazať", "Groups" : "Skupiny", "Unable to delete {objName}" : "Nemožno vymazať {objName}", "Error creating group" : "Chyba pri vytváraní skupiny", @@ -99,7 +99,6 @@ OC.L10N.register( "__language_name__" : "Slovensky", "Personal info" : "Osobné informácie", "Sync clients" : "Klienti synchronizácie", - "SSL root certificates" : "Koreňové SSL certifikáty", "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)", "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy", "Warnings, errors and fatal issues" : "Upozornenia, chyby a fatálne problémy", @@ -187,6 +186,11 @@ OC.L10N.register( "Enable only for specific groups" : "Povoliť len pre vybrané skupiny", "Uninstall App" : "Odinštalovanie aplikácie", "Enable experimental apps" : "Povoliť experimentálne aplikácie", + "Common Name" : "Bežný názov", + "Valid until" : "Platný do", + "Issued By" : "Vydal", + "Valid until %s" : "Platný do %s", + "Import root certificate" : "Importovať koreňový certifikát", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Pekný deň!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámenie o novo vytvorenom účte %s.\n\nVaše používateľské meno: %s\nPrihlásiť sa môžete tu: %s\n\n", @@ -218,11 +222,6 @@ OC.L10N.register( "iOS app" : "iOS aplikácia", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ak chcete projekt podporiť,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">zapojte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ho propagujte</a>!", "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením", - "Common Name" : "Bežný názov", - "Valid until" : "Platný do", - "Issued By" : "Vydal", - "Valid until %s" : "Platný do %s", - "Import root certificate" : "Importovať koreňový certifikát", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvinula {communityopen}komunita ownCloud{linkclose}. {githubopen}Zdrojový kód{linkclose} je dostupný za podmienok licencie {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Zobraziť umiestnenie úložiska", "Show last log in" : "Zobraziť posledné prihlásenie", diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json index c04f846e24a..e1594eca7fe 100644 --- a/settings/l10n/sk_SK.json +++ b/settings/l10n/sk_SK.json @@ -71,14 +71,14 @@ "Uninstalling ...." : "Prebieha odinštalovanie...", "Error while uninstalling app" : "Chyba pri odinštalovaní aplikácie", "Uninstall" : "Odinštalácia", + "Valid until {date}" : "Platný do {date}", + "Delete" : "Zmazať", "Select a profile picture" : "Vybrať avatara", "Very weak password" : "Veľmi slabé heslo", "Weak password" : "Slabé heslo", "So-so password" : "Priemerné heslo", "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", - "Valid until {date}" : "Platný do {date}", - "Delete" : "Zmazať", "Groups" : "Skupiny", "Unable to delete {objName}" : "Nemožno vymazať {objName}", "Error creating group" : "Chyba pri vytváraní skupiny", @@ -97,7 +97,6 @@ "__language_name__" : "Slovensky", "Personal info" : "Osobné informácie", "Sync clients" : "Klienti synchronizácie", - "SSL root certificates" : "Koreňové SSL certifikáty", "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)", "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy", "Warnings, errors and fatal issues" : "Upozornenia, chyby a fatálne problémy", @@ -185,6 +184,11 @@ "Enable only for specific groups" : "Povoliť len pre vybrané skupiny", "Uninstall App" : "Odinštalovanie aplikácie", "Enable experimental apps" : "Povoliť experimentálne aplikácie", + "Common Name" : "Bežný názov", + "Valid until" : "Platný do", + "Issued By" : "Vydal", + "Valid until %s" : "Platný do %s", + "Import root certificate" : "Importovať koreňový certifikát", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Pekný deň!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámenie o novo vytvorenom účte %s.\n\nVaše používateľské meno: %s\nPrihlásiť sa môžete tu: %s\n\n", @@ -216,11 +220,6 @@ "iOS app" : "iOS aplikácia", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ak chcete projekt podporiť,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">zapojte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ho propagujte</a>!", "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením", - "Common Name" : "Bežný názov", - "Valid until" : "Platný do", - "Issued By" : "Vydal", - "Valid until %s" : "Platný do %s", - "Import root certificate" : "Importovať koreňový certifikát", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvinula {communityopen}komunita ownCloud{linkclose}. {githubopen}Zdrojový kód{linkclose} je dostupný za podmienok licencie {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Zobraziť umiestnenie úložiska", "Show last log in" : "Zobraziť posledné prihlásenie", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index ab9583e5c29..27e85252e0e 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -75,6 +75,8 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacija je bila vključena in zahteva še posodobitev. Preusmerjeni boste na stran za posodobitev v 5 sekundah.", "App update" : "Posodabljanje aplikacije", "No apps found for \"{query}\"" : "Ne najdem aplikacije za \"{query}\"", + "Valid until {date}" : "Veljavno do {date}", + "Delete" : "Izbriši", "An error occurred: {message}" : "Prišlo je do napake: {message}", "Select a profile picture" : "Izbor slike profila", "Very weak password" : "Zelo šibko geslo", @@ -82,8 +84,6 @@ OC.L10N.register( "So-so password" : "Slabo geslo", "Good password" : "Dobro geslo", "Strong password" : "Odlično geslo", - "Valid until {date}" : "Veljavno do {date}", - "Delete" : "Izbriši", "Groups" : "Skupine", "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}", "Error creating group" : "Napaka ustvarjanja skupine", @@ -102,7 +102,6 @@ OC.L10N.register( "__language_name__" : "Slovenščina", "Personal info" : "Osebni podatki", "Sync clients" : "Uskladi odjemalce", - "SSL root certificates" : "Korenska potrdila SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)", "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke", "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke", @@ -180,6 +179,11 @@ OC.L10N.register( "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", "Enable experimental apps" : "Omogoči testne aplikacije", + "Common Name" : "Splošno ime", + "Valid until" : "Veljavno do", + "Issued By" : "Izdajatelj", + "Valid until %s" : "Veljavno do %s", + "Import root certificate" : "Uvozite korenski certifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Pozdravljeni,<br><br>samo sporočamo, da imate %s račun.<br><br>Vaše uporabniško ime: %s<br>Dostop: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Na zdravje!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Pozdravljeni,\n\nsamo sporočamo, da imate %s račun.\n\nVaše uporabniško ime: %s\nDostop: %s\n", @@ -211,11 +215,6 @@ OC.L10N.register( "iOS app" : "Program za iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če bi radi podprli projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">pristopite razvoju</a>\n\t\tali\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite glas</a>!", "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona", - "Common Name" : "Splošno ime", - "Valid until" : "Veljavno do", - "Issued By" : "Izdajatelj", - "Valid until %s" : "Veljavno do %s", - "Import root certificate" : "Uvozite korenski certifikat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Produkt razvija {communityopen}ownCloud skupnost{linkclose}, {githubopen}izvorna koda{linkclose} je licencirana pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Pokaži mesto shrambe", "Show last log in" : "Pokaži podatke zadnje prijave", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index c4ac64d1e01..b1ca152b15b 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -73,6 +73,8 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacija je bila vključena in zahteva še posodobitev. Preusmerjeni boste na stran za posodobitev v 5 sekundah.", "App update" : "Posodabljanje aplikacije", "No apps found for \"{query}\"" : "Ne najdem aplikacije za \"{query}\"", + "Valid until {date}" : "Veljavno do {date}", + "Delete" : "Izbriši", "An error occurred: {message}" : "Prišlo je do napake: {message}", "Select a profile picture" : "Izbor slike profila", "Very weak password" : "Zelo šibko geslo", @@ -80,8 +82,6 @@ "So-so password" : "Slabo geslo", "Good password" : "Dobro geslo", "Strong password" : "Odlično geslo", - "Valid until {date}" : "Veljavno do {date}", - "Delete" : "Izbriši", "Groups" : "Skupine", "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}", "Error creating group" : "Napaka ustvarjanja skupine", @@ -100,7 +100,6 @@ "__language_name__" : "Slovenščina", "Personal info" : "Osebni podatki", "Sync clients" : "Uskladi odjemalce", - "SSL root certificates" : "Korenska potrdila SSL", "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)", "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke", "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke", @@ -178,6 +177,11 @@ "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", "Enable experimental apps" : "Omogoči testne aplikacije", + "Common Name" : "Splošno ime", + "Valid until" : "Veljavno do", + "Issued By" : "Izdajatelj", + "Valid until %s" : "Veljavno do %s", + "Import root certificate" : "Uvozite korenski certifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Pozdravljeni,<br><br>samo sporočamo, da imate %s račun.<br><br>Vaše uporabniško ime: %s<br>Dostop: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Na zdravje!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Pozdravljeni,\n\nsamo sporočamo, da imate %s račun.\n\nVaše uporabniško ime: %s\nDostop: %s\n", @@ -209,11 +213,6 @@ "iOS app" : "Program za iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če bi radi podprli projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">pristopite razvoju</a>\n\t\tali\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite glas</a>!", "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona", - "Common Name" : "Splošno ime", - "Valid until" : "Veljavno do", - "Issued By" : "Izdajatelj", - "Valid until %s" : "Veljavno do %s", - "Import root certificate" : "Uvozite korenski certifikat", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Produkt razvija {communityopen}ownCloud skupnost{linkclose}, {githubopen}izvorna koda{linkclose} je licencirana pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Pokaži mesto shrambe", "Show last log in" : "Pokaži podatke zadnje prijave", diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js index 318be9137b2..037891b10a5 100644 --- a/settings/l10n/sq.js +++ b/settings/l10n/sq.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacioni është aktivizuar, por lyp të përditësohet. Do të ridrejtoheni te faqja e përditësimeve brenda 5 sekondash.", "App update" : "Përditësim aplikacioni", "No apps found for \"{query}\"" : "S’u gjetën aplikacione për \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ndodhi një gabim. Ju lutemi, ngarkoni një dëshmi PEM të koduar me ASCII.", + "Valid until {date}" : "E vlefshme deri më {date}", + "Delete" : "Fshije", "An error occurred: {message}" : "Ndodhi një gabim: {message}", "Select a profile picture" : "Përzgjidhni një foto profili", "Very weak password" : "Fjalëkalim shumë i dobët", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Fjalëkalim çka", "Good password" : "Fjalëkalim i mirë", "Strong password" : "Fjalëkalim i fortë", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ndodhi një gabim. Ju lutemi, ngarkoni një dëshmi PEM të koduar me ASCII.", - "Valid until {date}" : "E vlefshme deri më {date}", - "Delete" : "Fshije", "Groups" : "Grupe", "Unable to delete {objName}" : "S’arrin të fshijë {objName}", "Error creating group" : "Gabim gjatë krijimit të grupit", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Shqip", "Personal info" : "Të dhëna personale", "Sync clients" : "Klientë njëkohësimi", - "SSL root certificates" : "Dëshmi SSL rrënjë", "Everything (fatal issues, errors, warnings, info, debug)" : "Gjithçka (probleme fatale, gabime, sinjalizime, të dhëna, diagnostikim)", "Info, warnings, errors and fatal issues" : "Të dhëna, sinjalizime, gabime dhe probleme fatale", "Warnings, errors and fatal issues" : "Sinjalizime, gabime dhe probleme fatale", @@ -218,6 +217,11 @@ OC.L10N.register( "Enable only for specific groups" : "Aktivizoje vetëm për grupe të veçantë", "Uninstall App" : "Çinstaloje Aplikacionin", "Enable experimental apps" : "Aktivizo aplikacione eksperimentale", + "Common Name" : "Emër i Rëndomtë", + "Valid until" : "E vlefshme deri më", + "Issued By" : "Lëshuar Nga", + "Valid until %s" : "E vlefshme deri më %s", + "Import root certificate" : "Importoni dëshmi rrënjë", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Njatjeta,<br><br>thjesht po ju bëjmë të ditur që tani keni një llogar %s.<br><br>Emri juaj i përdoruesit: %s<br>Hyni në të te: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Gëzuar!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Njatjeta,\n\nthjesht po ju bëjmë të ditur që tani keni një llogari %s.\n\nEmri juaj i përdoruesit: %s\nHyni në të te: %s\n\n", @@ -255,11 +259,6 @@ OC.L10N.register( "iOS app" : "Aplikacion për iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Nëse doni ta përkrahni projektin\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">merrni pjesë te zhvillimi i tij</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">përhapni fjalën për të</a>!", "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë", - "Common Name" : "Emër i Rëndomtë", - "Valid until" : "E vlefshme deri më", - "Issued By" : "Lëshuar Nga", - "Valid until %s" : "E vlefshme deri më %s", - "Import root certificate" : "Importoni dëshmi rrënjë", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Krijuar nga {communityopen}bashkësia ownCloud{linkclose}, {githubopen}kodi burim{linkclose} mund të përdoret sipas licencës {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Shfaq vendndodhje depozite", "Show last log in" : "Shfaq hyrjen e fundit", diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json index 041d2e27830..d698262b188 100644 --- a/settings/l10n/sq.json +++ b/settings/l10n/sq.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacioni është aktivizuar, por lyp të përditësohet. Do të ridrejtoheni te faqja e përditësimeve brenda 5 sekondash.", "App update" : "Përditësim aplikacioni", "No apps found for \"{query}\"" : "S’u gjetën aplikacione për \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ndodhi një gabim. Ju lutemi, ngarkoni një dëshmi PEM të koduar me ASCII.", + "Valid until {date}" : "E vlefshme deri më {date}", + "Delete" : "Fshije", "An error occurred: {message}" : "Ndodhi një gabim: {message}", "Select a profile picture" : "Përzgjidhni një foto profili", "Very weak password" : "Fjalëkalim shumë i dobët", @@ -86,9 +89,6 @@ "So-so password" : "Fjalëkalim çka", "Good password" : "Fjalëkalim i mirë", "Strong password" : "Fjalëkalim i fortë", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ndodhi një gabim. Ju lutemi, ngarkoni një dëshmi PEM të koduar me ASCII.", - "Valid until {date}" : "E vlefshme deri më {date}", - "Delete" : "Fshije", "Groups" : "Grupe", "Unable to delete {objName}" : "S’arrin të fshijë {objName}", "Error creating group" : "Gabim gjatë krijimit të grupit", @@ -107,7 +107,6 @@ "__language_name__" : "Shqip", "Personal info" : "Të dhëna personale", "Sync clients" : "Klientë njëkohësimi", - "SSL root certificates" : "Dëshmi SSL rrënjë", "Everything (fatal issues, errors, warnings, info, debug)" : "Gjithçka (probleme fatale, gabime, sinjalizime, të dhëna, diagnostikim)", "Info, warnings, errors and fatal issues" : "Të dhëna, sinjalizime, gabime dhe probleme fatale", "Warnings, errors and fatal issues" : "Sinjalizime, gabime dhe probleme fatale", @@ -216,6 +215,11 @@ "Enable only for specific groups" : "Aktivizoje vetëm për grupe të veçantë", "Uninstall App" : "Çinstaloje Aplikacionin", "Enable experimental apps" : "Aktivizo aplikacione eksperimentale", + "Common Name" : "Emër i Rëndomtë", + "Valid until" : "E vlefshme deri më", + "Issued By" : "Lëshuar Nga", + "Valid until %s" : "E vlefshme deri më %s", + "Import root certificate" : "Importoni dëshmi rrënjë", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Njatjeta,<br><br>thjesht po ju bëjmë të ditur që tani keni një llogar %s.<br><br>Emri juaj i përdoruesit: %s<br>Hyni në të te: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Gëzuar!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Njatjeta,\n\nthjesht po ju bëjmë të ditur që tani keni një llogari %s.\n\nEmri juaj i përdoruesit: %s\nHyni në të te: %s\n\n", @@ -253,11 +257,6 @@ "iOS app" : "Aplikacion për iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Nëse doni ta përkrahni projektin\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">merrni pjesë te zhvillimi i tij</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">përhapni fjalën për të</a>!", "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë", - "Common Name" : "Emër i Rëndomtë", - "Valid until" : "E vlefshme deri më", - "Issued By" : "Lëshuar Nga", - "Valid until %s" : "E vlefshme deri më %s", - "Import root certificate" : "Importoni dëshmi rrënjë", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Krijuar nga {communityopen}bashkësia ownCloud{linkclose}, {githubopen}kodi burim{linkclose} mund të përdoret sipas licencës {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Shfaq vendndodhje depozite", "Show last log in" : "Shfaq hyrjen e fundit", diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js index 65630d3bfd3..700e3c19b4a 100644 --- a/settings/l10n/sr.js +++ b/settings/l10n/sr.js @@ -76,15 +76,15 @@ OC.L10N.register( "Uninstalling ...." : "Деинсталирам ...", "Error while uninstalling app" : "Грешка при деинсталацији апликације", "Uninstall" : "Деинсталирај", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.", + "Valid until {date}" : "Важи до {date}", + "Delete" : "Обриши", "Select a profile picture" : "Изаберите слику профила", "Very weak password" : "Веома слаба лозинка", "Weak password" : "Слаба лозинка", "So-so password" : "Осредња лозинка", "Good password" : "Добра лозинка", "Strong password" : "Јака лозинка", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.", - "Valid until {date}" : "Важи до {date}", - "Delete" : "Обриши", "Groups" : "Групе", "Unable to delete {objName}" : "Не могу да обришем {objName}", "Error creating group" : "Грешка при прављењу групе", @@ -103,7 +103,6 @@ OC.L10N.register( "__language_name__" : "Српски", "Personal info" : "Лични подаци", "Sync clients" : "Синхронизовање клијената", - "SSL root certificates" : "ССЛ корени сертификати", "Everything (fatal issues, errors, warnings, info, debug)" : "Све (фаталне проблеме, грешке, упозорења, информације, отклањање грешака)", "Info, warnings, errors and fatal issues" : "Информације, упозорења, грешке и фатални проблеми", "Warnings, errors and fatal issues" : "Упозорења, грешке и фатални проблеми", @@ -199,6 +198,11 @@ OC.L10N.register( "Enable only for specific groups" : "Укључи само за одређене групе", "Uninstall App" : "Деинсталирај апликацију", "Enable experimental apps" : "Укључи експерименталне апликације", + "Common Name" : "Уобичајено име", + "Valid until" : "Важи до", + "Issued By" : "Издавач", + "Valid until %s" : "Важи до %s", + "Import root certificate" : "Увоз кореног сертификата", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да сад имате %s налог.<br><br>Ваше корисничко име: %s<br>Приступите му на: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Здраво!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Поздрав.\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите му на: %s\n", @@ -230,11 +234,6 @@ OC.L10N.register( "iOS app" : "иОС апликација", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако желите да подржите пројект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">придружите се развоју</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разгласите свима</a>!", "Show First Run Wizard again" : "Поново прикажи чаробњака за прво покретање", - "Common Name" : "Уобичајено име", - "Valid until" : "Важи до", - "Issued By" : "Издавач", - "Valid until %s" : "Важи до %s", - "Import root certificate" : "Увоз кореног сертификата", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од стране {communityopen}оунКлауд заједнице{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.", "Show storage location" : "Прикажи локацију складишта", "Show last log in" : "Прикажи последњу пријаву", diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json index d15299b19e9..fec7cbad04a 100644 --- a/settings/l10n/sr.json +++ b/settings/l10n/sr.json @@ -74,15 +74,15 @@ "Uninstalling ...." : "Деинсталирам ...", "Error while uninstalling app" : "Грешка при деинсталацији апликације", "Uninstall" : "Деинсталирај", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.", + "Valid until {date}" : "Важи до {date}", + "Delete" : "Обриши", "Select a profile picture" : "Изаберите слику профила", "Very weak password" : "Веома слаба лозинка", "Weak password" : "Слаба лозинка", "So-so password" : "Осредња лозинка", "Good password" : "Добра лозинка", "Strong password" : "Јака лозинка", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.", - "Valid until {date}" : "Важи до {date}", - "Delete" : "Обриши", "Groups" : "Групе", "Unable to delete {objName}" : "Не могу да обришем {objName}", "Error creating group" : "Грешка при прављењу групе", @@ -101,7 +101,6 @@ "__language_name__" : "Српски", "Personal info" : "Лични подаци", "Sync clients" : "Синхронизовање клијената", - "SSL root certificates" : "ССЛ корени сертификати", "Everything (fatal issues, errors, warnings, info, debug)" : "Све (фаталне проблеме, грешке, упозорења, информације, отклањање грешака)", "Info, warnings, errors and fatal issues" : "Информације, упозорења, грешке и фатални проблеми", "Warnings, errors and fatal issues" : "Упозорења, грешке и фатални проблеми", @@ -197,6 +196,11 @@ "Enable only for specific groups" : "Укључи само за одређене групе", "Uninstall App" : "Деинсталирај апликацију", "Enable experimental apps" : "Укључи експерименталне апликације", + "Common Name" : "Уобичајено име", + "Valid until" : "Важи до", + "Issued By" : "Издавач", + "Valid until %s" : "Важи до %s", + "Import root certificate" : "Увоз кореног сертификата", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да сад имате %s налог.<br><br>Ваше корисничко име: %s<br>Приступите му на: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Здраво!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Поздрав.\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите му на: %s\n", @@ -228,11 +232,6 @@ "iOS app" : "иОС апликација", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако желите да подржите пројект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">придружите се развоју</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разгласите свима</a>!", "Show First Run Wizard again" : "Поново прикажи чаробњака за прво покретање", - "Common Name" : "Уобичајено име", - "Valid until" : "Важи до", - "Issued By" : "Издавач", - "Valid until %s" : "Важи до %s", - "Import root certificate" : "Увоз кореног сертификата", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од стране {communityopen}оунКлауд заједнице{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.", "Show storage location" : "Прикажи локацију складишта", "Show last log in" : "Прикажи последњу пријаву", diff --git a/settings/l10n/sr@latin.js b/settings/l10n/sr@latin.js index 645ea1ee0ec..817211e2b6d 100644 --- a/settings/l10n/sr@latin.js +++ b/settings/l10n/sr@latin.js @@ -8,12 +8,12 @@ OC.L10N.register( "Authentication error" : "Greška pri autentifikaciji", "Saved" : "Sačuvano", "Email sent" : "Email poslat", + "Delete" : "Obriši", "Very weak password" : "Veoma slaba lozinka", "Weak password" : "Slaba lozinka", "So-so password" : "Osrednja lozinka", "Good password" : "Dobra lozinka", "Strong password" : "Jaka lozinka", - "Delete" : "Obriši", "Groups" : "Grupe", "never" : "nikad", "Port" : "Port", diff --git a/settings/l10n/sr@latin.json b/settings/l10n/sr@latin.json index bf0779d4fdc..5ec20ee4168 100644 --- a/settings/l10n/sr@latin.json +++ b/settings/l10n/sr@latin.json @@ -6,12 +6,12 @@ "Authentication error" : "Greška pri autentifikaciji", "Saved" : "Sačuvano", "Email sent" : "Email poslat", + "Delete" : "Obriši", "Very weak password" : "Veoma slaba lozinka", "Weak password" : "Slaba lozinka", "So-so password" : "Osrednja lozinka", "Good password" : "Dobra lozinka", "Strong password" : "Jaka lozinka", - "Delete" : "Obriši", "Groups" : "Grupe", "never" : "nikad", "Port" : "Port", diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js index fd1b96b8502..4a2ed2dcd5f 100644 --- a/settings/l10n/sv.js +++ b/settings/l10n/sv.js @@ -55,14 +55,14 @@ OC.L10N.register( "Uninstalling ...." : "Avinstallerar ...", "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades", "Uninstall" : "Avinstallera", + "Valid until {date}" : "Giltig t.o.m. {date}", + "Delete" : "Radera", "Select a profile picture" : "Välj en profilbild", "Very weak password" : "Väldigt svagt lösenord", "Weak password" : "Svagt lösenord", "So-so password" : "Okej lösenord", "Good password" : "Bra lösenord", "Strong password" : "Starkt lösenord", - "Valid until {date}" : "Giltig t.o.m. {date}", - "Delete" : "Radera", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunde inte radera {objName}", "Error creating group" : "Fel vid skapande av grupp", @@ -78,7 +78,6 @@ OC.L10N.register( "A valid password must be provided" : "Ett giltigt lösenord måste anges", "A valid email must be provided" : "En giltig e-postadress måste anges", "__language_name__" : "__language_name__", - "SSL root certificates" : "SSL rotcertifikat", "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)", "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel", "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel", @@ -142,6 +141,10 @@ OC.L10N.register( "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s", "Enable only for specific groups" : "Aktivera endast för specifika grupper", "Uninstall App" : "Avinstallera applikation", + "Common Name" : "Vanligt namn", + "Valid until" : "Giltigt till", + "Issued By" : "Utfärdat av", + "Valid until %s" : "Giltigt till %s", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ha de fint!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hej där,\n\nvill bara informera dig om att du nu har ett %s konto.\n\nDitt användarnamn: %s\nAccessa det genom: %s\n", @@ -166,10 +169,6 @@ OC.L10N.register( "Android app" : "Android-app", "iOS app" : "iOS-app", "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen", - "Common Name" : "Vanligt namn", - "Valid until" : "Giltigt till", - "Issued By" : "Utfärdat av", - "Valid until %s" : "Giltigt till %s", "Show storage location" : "Visa lagringsplats", "Show last log in" : "Visa senaste inloggning", "Show user backend" : "Visa användar-back-end", diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json index 7e725594f86..1bda820e01e 100644 --- a/settings/l10n/sv.json +++ b/settings/l10n/sv.json @@ -53,14 +53,14 @@ "Uninstalling ...." : "Avinstallerar ...", "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades", "Uninstall" : "Avinstallera", + "Valid until {date}" : "Giltig t.o.m. {date}", + "Delete" : "Radera", "Select a profile picture" : "Välj en profilbild", "Very weak password" : "Väldigt svagt lösenord", "Weak password" : "Svagt lösenord", "So-so password" : "Okej lösenord", "Good password" : "Bra lösenord", "Strong password" : "Starkt lösenord", - "Valid until {date}" : "Giltig t.o.m. {date}", - "Delete" : "Radera", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunde inte radera {objName}", "Error creating group" : "Fel vid skapande av grupp", @@ -76,7 +76,6 @@ "A valid password must be provided" : "Ett giltigt lösenord måste anges", "A valid email must be provided" : "En giltig e-postadress måste anges", "__language_name__" : "__language_name__", - "SSL root certificates" : "SSL rotcertifikat", "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)", "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel", "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel", @@ -140,6 +139,10 @@ "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s", "Enable only for specific groups" : "Aktivera endast för specifika grupper", "Uninstall App" : "Avinstallera applikation", + "Common Name" : "Vanligt namn", + "Valid until" : "Giltigt till", + "Issued By" : "Utfärdat av", + "Valid until %s" : "Giltigt till %s", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ha de fint!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hej där,\n\nvill bara informera dig om att du nu har ett %s konto.\n\nDitt användarnamn: %s\nAccessa det genom: %s\n", @@ -164,10 +167,6 @@ "Android app" : "Android-app", "iOS app" : "iOS-app", "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen", - "Common Name" : "Vanligt namn", - "Valid until" : "Giltigt till", - "Issued By" : "Utfärdat av", - "Valid until %s" : "Giltigt till %s", "Show storage location" : "Visa lagringsplats", "Show last log in" : "Visa senaste inloggning", "Show user backend" : "Visa användar-back-end", diff --git a/settings/l10n/ta_LK.js b/settings/l10n/ta_LK.js index 82eb814908c..3ce6ce4b16b 100644 --- a/settings/l10n/ta_LK.js +++ b/settings/l10n/ta_LK.js @@ -16,7 +16,6 @@ OC.L10N.register( "undo" : "முன் செயல் நீக்கம் ", "never" : "ஒருபோதும்", "__language_name__" : "_மொழி_பெயர்_", - "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்", "None" : "ஒன்றுமில்லை", "Login" : "புகுபதிகை", "Encryption" : "மறைக்குறியீடு", diff --git a/settings/l10n/ta_LK.json b/settings/l10n/ta_LK.json index e7d85248386..689494c0e5d 100644 --- a/settings/l10n/ta_LK.json +++ b/settings/l10n/ta_LK.json @@ -14,7 +14,6 @@ "undo" : "முன் செயல் நீக்கம் ", "never" : "ஒருபோதும்", "__language_name__" : "_மொழி_பெயர்_", - "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்", "None" : "ஒன்றுமில்லை", "Login" : "புகுபதிகை", "Encryption" : "மறைக்குறியீடு", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index c47ff2581cb..b4aebdb2af0 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "แอพฯจะต้องเปิดใช้งานก่อนทำการอัพเดท คุณจะถูกนำไปยังหน้าอัพเดทใน 5 วินาที", "App update" : "อัพเดทแอพฯ", "No apps found for \"{query}\"" : "ไม่พบแอพฯสำหรับ \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", + "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", + "Delete" : "ลบ", "An error occurred: {message}" : "เกิดข้อผิดพลาด: {message}", "Select a profile picture" : "เลือกรูปภาพโปรไฟล์", "Very weak password" : "รหัสผ่านระดับต่ำมาก", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "รหัสผ่านระดับปกติ", "Good password" : "รหัสผ่านระดับดี", "Strong password" : "รหัสผ่านระดับดีมาก", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", - "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", - "Delete" : "ลบ", "Groups" : "กลุ่ม", "Unable to delete {objName}" : "ไม่สามารถลบ {objName}", "Error creating group" : "ข้อผิดพลาดขณะกำลังสร้างกลุ่ม", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "ภาษาไทย - Thai languages", "Personal info" : "ข้อมูลส่วนบุคคล", "Sync clients" : "ประสานข้อมูลไคลเอนต์", - "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root", "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)", "Info, warnings, errors and fatal issues" : "ข้อมูล คำเตือน ข้อผิดพลาดและปัญหาร้ายแรง", "Warnings, errors and fatal issues" : "คำเตือนข้อผิดพลาดและปัญหาที่ร้ายแรง", @@ -216,6 +215,11 @@ OC.L10N.register( "Enable only for specific groups" : "เปิดใช้งานเพียงเฉพาะกลุ่ม", "Uninstall App" : "ถอนการติดตั้งแอพฯ", "Enable experimental apps" : "เปิดใช้งานแอพพลิเคชั่นทดลอง", + "Common Name" : "ชื่อทั่วไป", + "Valid until" : "ใช้ได้จนถึง", + "Issued By" : "ปัญหาโดย", + "Valid until %s" : "ใช้ได้จนถึง %s", + "Import root certificate" : "นำเข้าใบรับรองหลัก", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "นี่คุณ<br><br>อยากจะแจ้งให้คุณทราบว่าขณะนี้คุณมีบัญชี %s<br><br>ชื่อผู้ใช้ของคุณคือ: %s<br>เข้าไปงานได้ที่: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "ไชโย!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "นี่คุณ\n\nอยากให้คุณทราบว่าขณะนี้คุณมี %s บัญชี\n\nชื่อผู้ใช้ของคุณ: %s\nดูได้ที่: %s\n", @@ -224,14 +228,20 @@ OC.L10N.register( "Forum" : "ฟอรั่ม", "Issue tracker" : "ติดตามปัญหา", "Commercial support" : "สนับสนุนเชิงพาณิชย์", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "คุณกำลังใช้ <strong>%s</strong> ของ <strong>%s</strong>", "Profile picture" : "รูปภาพโปรไฟล์", "Upload new" : "อัพโหลดใหม่", + "Select from Files" : "เลือกจากไฟล์", "Remove image" : "ลบรูปภาพ", + "png or jpg, max. 20 MB" : "png หรือ jpg, สูงสุด 20 เมกะไบต์", + "Picture provided by original account" : "ใช้รูปภาพจากบัญชีเดิม", "Cancel" : "ยกเลิก", + "Choose as profile picture" : "เลือกรูปภาพโปรไฟล์", "Full name" : "ชื่อเต็ม", "No display name set" : "ไม่มีชื่อที่แสดง", "Email" : "อีเมล", "Your email address" : "ที่อยู่อีเมล์ของคุณ", + "For password recovery and notifications" : "สำหรับการกู้คืนรหัสผ่านและการแจ้งเตือน", "No email address set" : "ไม่ได้ตั้งค่าที่อยู่อีเมล", "You are member of the following groups:" : "คุณเป็นสมาชิกของกลุ่มต่อไปนี้:", "Password" : "รหัสผ่าน", @@ -247,11 +257,6 @@ OC.L10N.register( "iOS app" : "แอพฯ IOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "หากคุณต้องการที่จะสนับสนุนโครงการ <a href=\"https://owncloud.org/contribute\" target=\"_blank\" rel=\"noreferrer\">เข้าร่วมการพัฒนา</a> หรือ <a href=\"https://owncloud.org/promote\" target=\"_blank\" rel=\"noreferrer\">กระจายข่าวสาร</a>!\n\t\t", "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง", - "Common Name" : "ชื่อทั่วไป", - "Valid until" : "ใช้ได้จนถึง", - "Issued By" : "ปัญหาโดย", - "Valid until %s" : "ใช้ได้จนถึง %s", - "Import root certificate" : "นำเข้าใบรับรองหลัก", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "ที่พัฒนาโดย {communityopen} ชุมชน ownCloud {linkclose} {githubopen}รหัสต้นฉบับ{linkclose} อยู่ภายใต้สัญญา {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}", "Show storage location" : "แสดงสถานที่จัดเก็บข้อมูล", "Show last log in" : "แสดงการเข้าสู่ระบบล่าสุด", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index af0e3de03ae..ffdc2384a60 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "แอพฯจะต้องเปิดใช้งานก่อนทำการอัพเดท คุณจะถูกนำไปยังหน้าอัพเดทใน 5 วินาที", "App update" : "อัพเดทแอพฯ", "No apps found for \"{query}\"" : "ไม่พบแอพฯสำหรับ \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", + "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", + "Delete" : "ลบ", "An error occurred: {message}" : "เกิดข้อผิดพลาด: {message}", "Select a profile picture" : "เลือกรูปภาพโปรไฟล์", "Very weak password" : "รหัสผ่านระดับต่ำมาก", @@ -86,9 +89,6 @@ "So-so password" : "รหัสผ่านระดับปกติ", "Good password" : "รหัสผ่านระดับดี", "Strong password" : "รหัสผ่านระดับดีมาก", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", - "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", - "Delete" : "ลบ", "Groups" : "กลุ่ม", "Unable to delete {objName}" : "ไม่สามารถลบ {objName}", "Error creating group" : "ข้อผิดพลาดขณะกำลังสร้างกลุ่ม", @@ -107,7 +107,6 @@ "__language_name__" : "ภาษาไทย - Thai languages", "Personal info" : "ข้อมูลส่วนบุคคล", "Sync clients" : "ประสานข้อมูลไคลเอนต์", - "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root", "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)", "Info, warnings, errors and fatal issues" : "ข้อมูล คำเตือน ข้อผิดพลาดและปัญหาร้ายแรง", "Warnings, errors and fatal issues" : "คำเตือนข้อผิดพลาดและปัญหาที่ร้ายแรง", @@ -214,6 +213,11 @@ "Enable only for specific groups" : "เปิดใช้งานเพียงเฉพาะกลุ่ม", "Uninstall App" : "ถอนการติดตั้งแอพฯ", "Enable experimental apps" : "เปิดใช้งานแอพพลิเคชั่นทดลอง", + "Common Name" : "ชื่อทั่วไป", + "Valid until" : "ใช้ได้จนถึง", + "Issued By" : "ปัญหาโดย", + "Valid until %s" : "ใช้ได้จนถึง %s", + "Import root certificate" : "นำเข้าใบรับรองหลัก", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "นี่คุณ<br><br>อยากจะแจ้งให้คุณทราบว่าขณะนี้คุณมีบัญชี %s<br><br>ชื่อผู้ใช้ของคุณคือ: %s<br>เข้าไปงานได้ที่: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "ไชโย!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "นี่คุณ\n\nอยากให้คุณทราบว่าขณะนี้คุณมี %s บัญชี\n\nชื่อผู้ใช้ของคุณ: %s\nดูได้ที่: %s\n", @@ -222,14 +226,20 @@ "Forum" : "ฟอรั่ม", "Issue tracker" : "ติดตามปัญหา", "Commercial support" : "สนับสนุนเชิงพาณิชย์", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "คุณกำลังใช้ <strong>%s</strong> ของ <strong>%s</strong>", "Profile picture" : "รูปภาพโปรไฟล์", "Upload new" : "อัพโหลดใหม่", + "Select from Files" : "เลือกจากไฟล์", "Remove image" : "ลบรูปภาพ", + "png or jpg, max. 20 MB" : "png หรือ jpg, สูงสุด 20 เมกะไบต์", + "Picture provided by original account" : "ใช้รูปภาพจากบัญชีเดิม", "Cancel" : "ยกเลิก", + "Choose as profile picture" : "เลือกรูปภาพโปรไฟล์", "Full name" : "ชื่อเต็ม", "No display name set" : "ไม่มีชื่อที่แสดง", "Email" : "อีเมล", "Your email address" : "ที่อยู่อีเมล์ของคุณ", + "For password recovery and notifications" : "สำหรับการกู้คืนรหัสผ่านและการแจ้งเตือน", "No email address set" : "ไม่ได้ตั้งค่าที่อยู่อีเมล", "You are member of the following groups:" : "คุณเป็นสมาชิกของกลุ่มต่อไปนี้:", "Password" : "รหัสผ่าน", @@ -245,11 +255,6 @@ "iOS app" : "แอพฯ IOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "หากคุณต้องการที่จะสนับสนุนโครงการ <a href=\"https://owncloud.org/contribute\" target=\"_blank\" rel=\"noreferrer\">เข้าร่วมการพัฒนา</a> หรือ <a href=\"https://owncloud.org/promote\" target=\"_blank\" rel=\"noreferrer\">กระจายข่าวสาร</a>!\n\t\t", "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง", - "Common Name" : "ชื่อทั่วไป", - "Valid until" : "ใช้ได้จนถึง", - "Issued By" : "ปัญหาโดย", - "Valid until %s" : "ใช้ได้จนถึง %s", - "Import root certificate" : "นำเข้าใบรับรองหลัก", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "ที่พัฒนาโดย {communityopen} ชุมชน ownCloud {linkclose} {githubopen}รหัสต้นฉบับ{linkclose} อยู่ภายใต้สัญญา {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}", "Show storage location" : "แสดงสถานที่จัดเก็บข้อมูล", "Show last log in" : "แสดงการเข้าสู่ระบบล่าสุด", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index 813b8bb3de9..bf3709d3319 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Uygulama etkinleştirildi fakat güncellenmesi gerekiyor. 5 saniye içinde güncelleme sayfasına yönlendirileceksiniz.", "App update" : "Uygulama güncellemesi", "No apps found for \"{query}\"" : "\"{query}\" için uygulama bulunamadı", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", + "Valid until {date}" : "{date} tarihine kadar geçerli", + "Delete" : "Sil", "An error occurred: {message}" : "Bir hata oluştu: {message}", "Select a profile picture" : "Bir profil fotoğrafı seçin", "Very weak password" : "Çok güçsüz parola", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "Normal parola", "Good password" : "İyi parola", "Strong password" : "Güçlü parola", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", - "Valid until {date}" : "{date} tarihine kadar geçerli", - "Delete" : "Sil", "Groups" : "Gruplar", "Unable to delete {objName}" : "{objName} silinemiyor", "Error creating group" : "Grup oluşturulurken hata", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "Türkçe", "Personal info" : "Kişisel bilgi", "Sync clients" : "Eşitleme istemcileri", - "SSL root certificates" : "SSL kök sertifikaları", "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)", "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar", "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar", @@ -216,6 +215,11 @@ OC.L10N.register( "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir", "Uninstall App" : "Uygulamayı Kaldır", "Enable experimental apps" : "Deneysel uygulamaları etkinleştir", + "Common Name" : "Ortak Ad", + "Valid until" : "Geçerlilik", + "Issued By" : "Veren", + "Valid until %s" : "%s tarihine kadar geçerli", + "Import root certificate" : "Kök sertifikalarını içe aktar", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hoşçakalın!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n", @@ -247,11 +251,6 @@ OC.L10N.register( "iOS app" : "iOS uygulaması", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">duyurun</a>!", "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster", - "Common Name" : "Ortak Ad", - "Valid until" : "Geçerlilik", - "Issued By" : "Veren", - "Valid until %s" : "%s tarihine kadar geçerli", - "Import root certificate" : "Kök sertifikalarını içe aktar", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud topluluğu tarafından{linkclose} geliştirildi. {githubopen}Kaynak kodu{linkclose}, {licenseopen}<abbr title=\"Affero Genel Kamu Lisansı\">AGPL</abbr>{linkclose} ile lisanslanmıştır.", "Show storage location" : "Depolama konumunu göster", "Show last log in" : "Son oturum açılma zamanını göster", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index c523b652432..ae0c6ca6732 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Uygulama etkinleştirildi fakat güncellenmesi gerekiyor. 5 saniye içinde güncelleme sayfasına yönlendirileceksiniz.", "App update" : "Uygulama güncellemesi", "No apps found for \"{query}\"" : "\"{query}\" için uygulama bulunamadı", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", + "Valid until {date}" : "{date} tarihine kadar geçerli", + "Delete" : "Sil", "An error occurred: {message}" : "Bir hata oluştu: {message}", "Select a profile picture" : "Bir profil fotoğrafı seçin", "Very weak password" : "Çok güçsüz parola", @@ -86,9 +89,6 @@ "So-so password" : "Normal parola", "Good password" : "İyi parola", "Strong password" : "Güçlü parola", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", - "Valid until {date}" : "{date} tarihine kadar geçerli", - "Delete" : "Sil", "Groups" : "Gruplar", "Unable to delete {objName}" : "{objName} silinemiyor", "Error creating group" : "Grup oluşturulurken hata", @@ -107,7 +107,6 @@ "__language_name__" : "Türkçe", "Personal info" : "Kişisel bilgi", "Sync clients" : "Eşitleme istemcileri", - "SSL root certificates" : "SSL kök sertifikaları", "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)", "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar", "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar", @@ -214,6 +213,11 @@ "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir", "Uninstall App" : "Uygulamayı Kaldır", "Enable experimental apps" : "Deneysel uygulamaları etkinleştir", + "Common Name" : "Ortak Ad", + "Valid until" : "Geçerlilik", + "Issued By" : "Veren", + "Valid until %s" : "%s tarihine kadar geçerli", + "Import root certificate" : "Kök sertifikalarını içe aktar", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hoşçakalın!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n", @@ -245,11 +249,6 @@ "iOS app" : "iOS uygulaması", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">duyurun</a>!", "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster", - "Common Name" : "Ortak Ad", - "Valid until" : "Geçerlilik", - "Issued By" : "Veren", - "Valid until %s" : "%s tarihine kadar geçerli", - "Import root certificate" : "Kök sertifikalarını içe aktar", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud topluluğu tarafından{linkclose} geliştirildi. {githubopen}Kaynak kodu{linkclose}, {licenseopen}<abbr title=\"Affero Genel Kamu Lisansı\">AGPL</abbr>{linkclose} ile lisanslanmıştır.", "Show storage location" : "Depolama konumunu göster", "Show last log in" : "Son oturum açılma zamanını göster", diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js index e701b22e2bf..adfcc626aa4 100644 --- a/settings/l10n/uk.js +++ b/settings/l10n/uk.js @@ -77,6 +77,9 @@ OC.L10N.register( "Uninstalling ...." : "Видалення...", "Error while uninstalling app" : "Помилка видалення додатка", "Uninstall" : "Видалити", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.", + "Valid until {date}" : "Дійсно до {date}", + "Delete" : "Видалити", "An error occurred: {message}" : "Сталася помилка: {message}", "Select a profile picture" : "Обрати зображення облікового запису", "Very weak password" : "Дуже слабкий пароль", @@ -84,9 +87,6 @@ OC.L10N.register( "So-so password" : "Такий собі пароль", "Good password" : "Добрий пароль", "Strong password" : "Надійний пароль", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.", - "Valid until {date}" : "Дійсно до {date}", - "Delete" : "Видалити", "Groups" : "Групи", "Unable to delete {objName}" : "Не вдалося видалити {objName}", "Error creating group" : "Помилка створення групи", @@ -105,7 +105,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "Особиста інформація", "Sync clients" : "Клієнти синхронізації", - "SSL root certificates" : "Кореневі SSL сертифікати", "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)", "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми", "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми", @@ -196,6 +195,11 @@ OC.L10N.register( "Enable only for specific groups" : "Включити тільки для конкретних груп", "Uninstall App" : "Видалити додаток", "Enable experimental apps" : "Увімкнути експериментальні застосунки", + "Common Name" : "Ім'я:", + "Valid until" : "Дійсно до", + "Issued By" : "Виданий", + "Valid until %s" : "Дійсно до %s", + "Import root certificate" : "Імпортувати кореневий сертифікат", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Агов,<br><br>просто щоб ви знали, у вас є аккаунт %s.<br><br>Ваше ім'я користувача: %s<br>Перейдіть сюди: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Будьмо!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Агов,\n\nпросто щоб ви знали, у вас є аккаунт %s.\n\nВаше ім'я користувача: %s\nПерейдіть сюди: %s\n\n", @@ -227,11 +231,6 @@ OC.L10N.register( "iOS app" : "iOS додаток", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Якщо Ви хочете підтримати проект\n⇥⇥ <a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> спільна розробка </a> \n⇥⇥або\n⇥ ⇥ <a href=\"https://owncloud.org/promote\"\n ⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> повідомити у світі </a> !", "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову", - "Common Name" : "Ім'я:", - "Valid until" : "Дійсно до", - "Issued By" : "Виданий", - "Valid until %s" : "Дійсно до %s", - "Import root certificate" : "Імпортувати кореневий сертифікат", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Розроблено {communityopen} спільнотою ownCloud {linkclose}, {githubopen} вихідний код {linkclose} ліцензується відповідно до {licenseopen} <abbr title = \"Публічної ліцензії Affero General\"> AGPL </ abbr> {linkclose}.", "Show storage location" : "Показати місцезнаходження сховища", "Show last log in" : "Показати останній вхід в систему", diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json index b73ae57bded..3920474d909 100644 --- a/settings/l10n/uk.json +++ b/settings/l10n/uk.json @@ -75,6 +75,9 @@ "Uninstalling ...." : "Видалення...", "Error while uninstalling app" : "Помилка видалення додатка", "Uninstall" : "Видалити", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.", + "Valid until {date}" : "Дійсно до {date}", + "Delete" : "Видалити", "An error occurred: {message}" : "Сталася помилка: {message}", "Select a profile picture" : "Обрати зображення облікового запису", "Very weak password" : "Дуже слабкий пароль", @@ -82,9 +85,6 @@ "So-so password" : "Такий собі пароль", "Good password" : "Добрий пароль", "Strong password" : "Надійний пароль", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.", - "Valid until {date}" : "Дійсно до {date}", - "Delete" : "Видалити", "Groups" : "Групи", "Unable to delete {objName}" : "Не вдалося видалити {objName}", "Error creating group" : "Помилка створення групи", @@ -103,7 +103,6 @@ "__language_name__" : "__language_name__", "Personal info" : "Особиста інформація", "Sync clients" : "Клієнти синхронізації", - "SSL root certificates" : "Кореневі SSL сертифікати", "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)", "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми", "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми", @@ -194,6 +193,11 @@ "Enable only for specific groups" : "Включити тільки для конкретних груп", "Uninstall App" : "Видалити додаток", "Enable experimental apps" : "Увімкнути експериментальні застосунки", + "Common Name" : "Ім'я:", + "Valid until" : "Дійсно до", + "Issued By" : "Виданий", + "Valid until %s" : "Дійсно до %s", + "Import root certificate" : "Імпортувати кореневий сертифікат", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Агов,<br><br>просто щоб ви знали, у вас є аккаунт %s.<br><br>Ваше ім'я користувача: %s<br>Перейдіть сюди: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Будьмо!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Агов,\n\nпросто щоб ви знали, у вас є аккаунт %s.\n\nВаше ім'я користувача: %s\nПерейдіть сюди: %s\n\n", @@ -225,11 +229,6 @@ "iOS app" : "iOS додаток", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Якщо Ви хочете підтримати проект\n⇥⇥ <a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> спільна розробка </a> \n⇥⇥або\n⇥ ⇥ <a href=\"https://owncloud.org/promote\"\n ⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> повідомити у світі </a> !", "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову", - "Common Name" : "Ім'я:", - "Valid until" : "Дійсно до", - "Issued By" : "Виданий", - "Valid until %s" : "Дійсно до %s", - "Import root certificate" : "Імпортувати кореневий сертифікат", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Розроблено {communityopen} спільнотою ownCloud {linkclose}, {githubopen} вихідний код {linkclose} ліцензується відповідно до {licenseopen} <abbr title = \"Публічної ліцензії Affero General\"> AGPL </ abbr> {linkclose}.", "Show storage location" : "Показати місцезнаходження сховища", "Show last log in" : "Показати останній вхід в систему", diff --git a/settings/l10n/ur_PK.js b/settings/l10n/ur_PK.js index 682a37fa9c8..a7d7b31f6ab 100644 --- a/settings/l10n/ur_PK.js +++ b/settings/l10n/ur_PK.js @@ -3,12 +3,12 @@ OC.L10N.register( { "Invalid request" : "غلط درخواست", "Email sent" : "ارسال شدہ ای میل ", + "Delete" : "حذف کریں", "Very weak password" : "بہت کمزور پاسورڈ", "Weak password" : "کمزور پاسورڈ", "So-so password" : "نص نص پاسورڈ", "Good password" : "اچھا پاسورڈ", "Strong password" : "مضبوط پاسورڈ", - "Delete" : "حذف کریں", "More" : "مزید", "Less" : "کم", "Cheers!" : "واہ!", diff --git a/settings/l10n/ur_PK.json b/settings/l10n/ur_PK.json index 1ddd73d159d..63c0fe8e803 100644 --- a/settings/l10n/ur_PK.json +++ b/settings/l10n/ur_PK.json @@ -1,12 +1,12 @@ { "translations": { "Invalid request" : "غلط درخواست", "Email sent" : "ارسال شدہ ای میل ", + "Delete" : "حذف کریں", "Very weak password" : "بہت کمزور پاسورڈ", "Weak password" : "کمزور پاسورڈ", "So-so password" : "نص نص پاسورڈ", "Good password" : "اچھا پاسورڈ", "Strong password" : "مضبوط پاسورڈ", - "Delete" : "حذف کریں", "More" : "مزید", "Less" : "کم", "Cheers!" : "واہ!", diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js index f9de635698f..7b60e000927 100644 --- a/settings/l10n/vi.js +++ b/settings/l10n/vi.js @@ -31,7 +31,6 @@ OC.L10N.register( "undo" : "lùi lại", "never" : "không thay đổi", "__language_name__" : "__Ngôn ngữ___", - "SSL root certificates" : "Chứng chỉ SSL root", "None" : "Không gì cả", "Login" : "Đăng nhập", "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API", diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json index 4ca64588e85..b6e62b6113d 100644 --- a/settings/l10n/vi.json +++ b/settings/l10n/vi.json @@ -29,7 +29,6 @@ "undo" : "lùi lại", "never" : "không thay đổi", "__language_name__" : "__Ngôn ngữ___", - "SSL root certificates" : "Chứng chỉ SSL root", "None" : "Không gì cả", "Login" : "Đăng nhập", "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API", diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js index 89bd0a3b4d4..7772673e81a 100644 --- a/settings/l10n/zh_CN.js +++ b/settings/l10n/zh_CN.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "该应用已启用，但是需要更新。5秒后将跳转到更新页面。", "App update" : "应用更新", "No apps found for \"{query}\"" : "未找到应用适合 \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。", + "Valid until {date}" : "有效期至 {date}", + "Delete" : "删除", "An error occurred: {message}" : "发生错误： {message}", "Select a profile picture" : "选择头像", "Very weak password" : "非常弱的密码", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "一般强度的密码", "Good password" : "较强的密码", "Strong password" : "强密码", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。", - "Valid until {date}" : "有效期至 {date}", - "Delete" : "删除", "Groups" : "组", "Unable to delete {objName}" : "无法删除 {objName}", "Error creating group" : "创建组时出错", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "简体中文", "Personal info" : "个人信息", "Sync clients" : "客户端", - "SSL root certificates" : "SSL 根证书", "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）", "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题", "Warnings, errors and fatal issues" : "警告，错误和灾难性问题", @@ -211,6 +210,11 @@ OC.L10N.register( "Enable only for specific groups" : "仅对特定的组开放", "Uninstall App" : "卸载应用", "Enable experimental apps" : "启用实验性应用程序", + "Common Name" : "通用名称", + "Valid until" : "有效期至", + "Issued By" : "授权由", + "Valid until %s" : "有效期至 %s", + "Import root certificate" : "导入根证书", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "亲，<br><br>现在我们为你开通了 %s 私有云帐户。<br><br>你的用户名： %s<br>访问网址： <a href=\\\"%s\\\">%s</a><br><br>", "Cheers!" : "干杯！", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "亲，\\n\\n 现在我们为你开通了 %s 私有去帐户。\\n\\n 你的用户名： %s\\n 访问网址： %s\\n 你的初始密码需要咨询系统管理员。或者你也可以在登录页面输入任意密码登录，\\n登录窗口将出现忘记密码链接，点击通过注册邮箱重设初始密码。\\n\\n", @@ -242,11 +246,6 @@ OC.L10N.register( "iOS app" : "iOS 应用", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！", "Show First Run Wizard again" : "再次显示首次运行向导", - "Common Name" : "通用名称", - "Valid until" : "有效期至", - "Issued By" : "授权由", - "Valid until %s" : "有效期至 %s", - "Import root certificate" : "导入根证书", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}的发布需遵守 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可协议{linkclose}。", "Show storage location" : "显示存储位置", "Show last log in" : "显示最后登录", diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json index 33074e2245d..0eea88628dd 100644 --- a/settings/l10n/zh_CN.json +++ b/settings/l10n/zh_CN.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "该应用已启用，但是需要更新。5秒后将跳转到更新页面。", "App update" : "应用更新", "No apps found for \"{query}\"" : "未找到应用适合 \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。", + "Valid until {date}" : "有效期至 {date}", + "Delete" : "删除", "An error occurred: {message}" : "发生错误： {message}", "Select a profile picture" : "选择头像", "Very weak password" : "非常弱的密码", @@ -86,9 +89,6 @@ "So-so password" : "一般强度的密码", "Good password" : "较强的密码", "Strong password" : "强密码", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。", - "Valid until {date}" : "有效期至 {date}", - "Delete" : "删除", "Groups" : "组", "Unable to delete {objName}" : "无法删除 {objName}", "Error creating group" : "创建组时出错", @@ -107,7 +107,6 @@ "__language_name__" : "简体中文", "Personal info" : "个人信息", "Sync clients" : "客户端", - "SSL root certificates" : "SSL 根证书", "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）", "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题", "Warnings, errors and fatal issues" : "警告，错误和灾难性问题", @@ -209,6 +208,11 @@ "Enable only for specific groups" : "仅对特定的组开放", "Uninstall App" : "卸载应用", "Enable experimental apps" : "启用实验性应用程序", + "Common Name" : "通用名称", + "Valid until" : "有效期至", + "Issued By" : "授权由", + "Valid until %s" : "有效期至 %s", + "Import root certificate" : "导入根证书", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "亲，<br><br>现在我们为你开通了 %s 私有云帐户。<br><br>你的用户名： %s<br>访问网址： <a href=\\\"%s\\\">%s</a><br><br>", "Cheers!" : "干杯！", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "亲，\\n\\n 现在我们为你开通了 %s 私有去帐户。\\n\\n 你的用户名： %s\\n 访问网址： %s\\n 你的初始密码需要咨询系统管理员。或者你也可以在登录页面输入任意密码登录，\\n登录窗口将出现忘记密码链接，点击通过注册邮箱重设初始密码。\\n\\n", @@ -240,11 +244,6 @@ "iOS app" : "iOS 应用", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！", "Show First Run Wizard again" : "再次显示首次运行向导", - "Common Name" : "通用名称", - "Valid until" : "有效期至", - "Issued By" : "授权由", - "Valid until %s" : "有效期至 %s", - "Import root certificate" : "导入根证书", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}的发布需遵守 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可协议{linkclose}。", "Show storage location" : "显示存储位置", "Show last log in" : "显示最后登录", diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js index cffc82ffca6..d2376df1365 100644 --- a/settings/l10n/zh_TW.js +++ b/settings/l10n/zh_TW.js @@ -81,6 +81,9 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "這個應用程式已啟用但是需要更新，您將會在 5 秒後被引導至更新頁面", "App update" : "應用程式更新", "No apps found for \"{query}\"" : "\"{query}\" 並未找到任何應用程式", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "發生錯誤，請您上傳 ASCII 編碼的 PEM 憑證", + "Valid until {date}" : "{date} 前有效", + "Delete" : "刪除", "An error occurred: {message}" : "發生錯誤：{message}", "Select a profile picture" : "選擇大頭貼", "Very weak password" : "密碼強度非常弱", @@ -88,9 +91,6 @@ OC.L10N.register( "So-so password" : "密碼強度普通", "Good password" : "密碼強度佳", "Strong password" : "密碼強度極佳", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "發生錯誤，請您上傳 ASCII 編碼的 PEM 憑證", - "Valid until {date}" : "{date} 前有效", - "Delete" : "刪除", "Groups" : "群組", "Unable to delete {objName}" : "無法刪除 {objName}", "Error creating group" : "建立群組時發生錯誤", @@ -109,7 +109,6 @@ OC.L10N.register( "__language_name__" : "__language_name__", "Personal info" : "個人資訊", "Sync clients" : "同步客戶端", - "SSL root certificates" : "SSL 根憑證", "Everything (fatal issues, errors, warnings, info, debug)" : "全部（嚴重問題、錯誤、警告、資訊、除錯訊息）", "Info, warnings, errors and fatal issues" : "嚴重問題、錯誤、警告、資訊", "Warnings, errors and fatal issues" : "嚴重問題、錯誤、警告", @@ -218,6 +217,11 @@ OC.L10N.register( "Enable only for specific groups" : "僅對特定的群組啟用", "Uninstall App" : "解除安裝 App", "Enable experimental apps" : "啟用實驗性質的應用程式", + "Common Name" : "Common Name", + "Valid until" : "到期日", + "Issued By" : "發行者：", + "Valid until %s" : "有效至 %s", + "Import root certificate" : "匯入根憑證", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "嗨，<br><br>通知您一聲，您現在有了 %s 的帳號。<br><br>您的帳號： %s<br>開通帳號： <a href=\"%s\">%s</a><br><br>", "Cheers!" : "太棒了！", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "嗨，\n\n通知您一聲，您現在有了 %s 的帳號。\n\n您的帳號：%s\n開通帳號：%s\n\n", @@ -255,11 +259,6 @@ OC.L10N.register( "iOS app" : "iOS 應用程式", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!", "Show First Run Wizard again" : "再次顯示首次使用精靈", - "Common Name" : "Common Name", - "Valid until" : "到期日", - "Issued By" : "發行者：", - "Valid until %s" : "有效至 %s", - "Import root certificate" : "匯入根憑證", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社群{linkclose} 開發，{githubopen}原始碼{linkclose}使用 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 授權釋出", "Show storage location" : "顯示儲存位置", "Show last log in" : "顯示最近登入", diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json index 91b7c054b2c..0a60bdc1ccc 100644 --- a/settings/l10n/zh_TW.json +++ b/settings/l10n/zh_TW.json @@ -79,6 +79,9 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "這個應用程式已啟用但是需要更新，您將會在 5 秒後被引導至更新頁面", "App update" : "應用程式更新", "No apps found for \"{query}\"" : "\"{query}\" 並未找到任何應用程式", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "發生錯誤，請您上傳 ASCII 編碼的 PEM 憑證", + "Valid until {date}" : "{date} 前有效", + "Delete" : "刪除", "An error occurred: {message}" : "發生錯誤：{message}", "Select a profile picture" : "選擇大頭貼", "Very weak password" : "密碼強度非常弱", @@ -86,9 +89,6 @@ "So-so password" : "密碼強度普通", "Good password" : "密碼強度佳", "Strong password" : "密碼強度極佳", - "An error occurred. Please upload an ASCII-encoded PEM certificate." : "發生錯誤，請您上傳 ASCII 編碼的 PEM 憑證", - "Valid until {date}" : "{date} 前有效", - "Delete" : "刪除", "Groups" : "群組", "Unable to delete {objName}" : "無法刪除 {objName}", "Error creating group" : "建立群組時發生錯誤", @@ -107,7 +107,6 @@ "__language_name__" : "__language_name__", "Personal info" : "個人資訊", "Sync clients" : "同步客戶端", - "SSL root certificates" : "SSL 根憑證", "Everything (fatal issues, errors, warnings, info, debug)" : "全部（嚴重問題、錯誤、警告、資訊、除錯訊息）", "Info, warnings, errors and fatal issues" : "嚴重問題、錯誤、警告、資訊", "Warnings, errors and fatal issues" : "嚴重問題、錯誤、警告", @@ -216,6 +215,11 @@ "Enable only for specific groups" : "僅對特定的群組啟用", "Uninstall App" : "解除安裝 App", "Enable experimental apps" : "啟用實驗性質的應用程式", + "Common Name" : "Common Name", + "Valid until" : "到期日", + "Issued By" : "發行者：", + "Valid until %s" : "有效至 %s", + "Import root certificate" : "匯入根憑證", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "嗨，<br><br>通知您一聲，您現在有了 %s 的帳號。<br><br>您的帳號： %s<br>開通帳號： <a href=\"%s\">%s</a><br><br>", "Cheers!" : "太棒了！", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "嗨，\n\n通知您一聲，您現在有了 %s 的帳號。\n\n您的帳號：%s\n開通帳號：%s\n\n", @@ -253,11 +257,6 @@ "iOS app" : "iOS 應用程式", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!", "Show First Run Wizard again" : "再次顯示首次使用精靈", - "Common Name" : "Common Name", - "Valid until" : "到期日", - "Issued By" : "發行者：", - "Valid until %s" : "有效至 %s", - "Import root certificate" : "匯入根憑證", "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社群{linkclose} 開發，{githubopen}原始碼{linkclose}使用 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 授權釋出", "Show storage location" : "顯示儲存位置", "Show last log in" : "顯示最近登入", diff --git a/settings/languageCodes.php b/settings/languageCodes.php index 8c58079c2cb..f83123df672 100644 --- a/settings/languageCodes.php +++ b/settings/languageCodes.php @@ -7,7 +7,7 @@ * @author Robin Appelman <icewind@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/middleware/subadminmiddleware.php b/settings/middleware/subadminmiddleware.php index 78dabada3e2..00f221721a6 100644 --- a/settings/middleware/subadminmiddleware.php +++ b/settings/middleware/subadminmiddleware.php @@ -3,7 +3,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/personal.php b/settings/personal.php index c4e1c057bf3..11b4f762a36 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -17,7 +17,7 @@ * @author Vincent Petry <pvince81@owncloud.com> * @author Volkan Gezer <volkangezer@gmail.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -43,6 +43,7 @@ $urlGenerator = \OC::$server->getURLGenerator(); // Highlight navigation entry OC_Util::addScript( 'settings', 'personal' ); +OC_Util::addScript('settings', 'certificates'); OC_Util::addStyle( 'settings', 'settings' ); \OC_Util::addVendorScript('strengthify/jquery.strengthify'); \OC_Util::addVendorStyle('strengthify/strengthify'); @@ -168,6 +169,17 @@ $formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync client $forms=OC_App::getForms('personal'); + +// add bottom hardcoded forms from the template +if ($enableCertImport) { + $certificatesTemplate = new OC_Template('settings', 'certificates'); + $certificatesTemplate->assign('type', 'personal'); + $certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addPersonalRootCertificate'); + $certificatesTemplate->assign('certs', $certificateManager->listCertificates()); + $certificatesTemplate->assign('urlGenerator', $urlGenerator); + $forms[] = $certificatesTemplate->fetchPage(); +} + $formsMap = array_map(function($form){ if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) { $sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]); @@ -188,12 +200,5 @@ $formsMap = array_map(function($form){ $formsAndMore = array_merge($formsAndMore, $formsMap); -// add bottom hardcoded forms from the template -if($enableCertImport) { - $formsAndMore[]= array( 'anchor' => 'ssl-root-certificates', 'section-name' => $l->t('SSL root certificates') ); -} - - - $tmpl->assign('forms', $formsAndMore); $tmpl->printPage(); diff --git a/settings/routes.php b/settings/routes.php index 6b6b0150168..8828e621145 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -3,15 +3,16 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Christopher Schäpers <kondou@ts.unde.re> - * @author Clark Tomlinson <fallen013@gmail.com> * @author Frank Karlitschek <frank@owncloud.org> * @author Georg Ehrke <georg@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Raghu Nayyar <me@iraghu.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify @@ -57,6 +58,8 @@ $application->registerRoutes($this, [ ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'], ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'], ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], + ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'], + ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], ] ]); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a66851743e6..539e4b94b8b 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -177,7 +177,7 @@ if ($_['cronErrors']) { ?> </ul> -<div id="postsetupchecks"> +<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>"> <div class="loading"></div> <ul class="errors hidden"></ul> <ul class="warnings hidden"></ul> diff --git a/settings/templates/certificates.php b/settings/templates/certificates.php new file mode 100644 index 00000000000..c1ccdcaef95 --- /dev/null +++ b/settings/templates/certificates.php @@ -0,0 +1,44 @@ +<div class="section"> + <h2><?php p($l->t('SSL Root Certificates')); ?></h2> + <table id="sslCertificate" class="grid" data-type="<?php p($_['type']); ?>"> + <thead> + <tr> + <th><?php p($l->t('Common Name')); ?></th> + <th><?php p($l->t('Valid until')); ?></th> + <th><?php p($l->t('Issued By')); ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($_['certs'] as $rootCert): /**@var \OCP\ICertificate $rootCert */ ?> + <tr class="<?php echo ($rootCert->isExpired()) ? 'expired' : 'valid' ?>" + data-name="<?php p($rootCert->getName()) ?>"> + <td class="rootCert" + title="<?php p($rootCert->getOrganization()) ?>"> + <?php p($rootCert->getCommonName()) ?> + </td> + <td title="<?php p($l->t('Valid until %s', $l->l('date', $rootCert->getExpireDate()))) ?>"> + <?php echo $l->l('date', $rootCert->getExpireDate()) ?> + </td> + <td title="<?php p($rootCert->getIssuerOrganization()) ?>"> + <?php p($rootCert->getIssuerName()) ?> + </td> + <td <?php if ($rootCert != ''): ?>class="remove" + <?php else: ?>style="visibility:hidden;" + <?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>" + title="<?php p($l->t('Delete')); ?>" + class="svg action" + src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/> + </td> + </tr> + <?php endforeach; ?> + </tbody> + </table> + <form class="uploadButton" method="post" + action="<?php p($_['urlGenerator']->linkToRoute($_['uploadRoute'])); ?>" + target="certUploadFrame"> + <label for="rootcert_import" class="inlineblock button" + id="rootcert_import_button"><?php p($l->t('Import root certificate')); ?></label> + <input type="file" id="rootcert_import" name="rootcert_import" + class="hiddenuploadfield"> + </form> +</div> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index ce179ca8788..5bae01742b6 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -204,48 +204,6 @@ if($_['passwordChangeSupported']) { <?php } };?> -<?php if($_['showCertificates']) : ?> -<div id="ssl-root-certificates" class="section"> - <h2><?php p($l->t('SSL root certificates')); ?></h2> - <table id="sslCertificate" class="grid"> - <thead> - <tr> - <th><?php p($l->t('Common Name')); ?></th> - <th><?php p($l->t('Valid until')); ?></th> - <th><?php p($l->t('Issued By')); ?></th> - <th></th> - </tr> - </thead> - <tbody> - <?php foreach ($_['certs'] as $rootCert): /**@var \OCP\ICertificate $rootCert*/ ?> - <tr class="<?php echo ($rootCert->isExpired()) ? 'expired' : 'valid' ?>" data-name="<?php p($rootCert->getName()) ?>"> - <td class="rootCert" title="<?php p($rootCert->getOrganization())?>"> - <?php p($rootCert->getCommonName()) ?> - </td> - <td title="<?php p($l->t('Valid until %s', $l->l('date', $rootCert->getExpireDate()))) ?>"> - <?php echo $l->l('date', $rootCert->getExpireDate()) ?> - </td> - <td title="<?php p($rootCert->getIssuerOrganization()) ?>"> - <?php p($rootCert->getIssuerName()) ?> - </td> - <td <?php if ($rootCert != ''): ?>class="remove" - <?php else: ?>style="visibility:hidden;" - <?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>" - title="<?php p($l->t('Delete')); ?>" - class="svg action" - src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/> - </td> - </tr> - <?php endforeach; ?> - </tbody> - </table> - <form class="uploadButton" method="post" action="<?php p($_['urlGenerator']->linkToRoute('settings.Certificate.addPersonalRootCertificate')); ?>" target="certUploadFrame"> - <label for="rootcert_import" class="inlineblock button" id="rootcert_import_button"><?php p($l->t('Import root certificate')); ?></label> - <input type="file" id="rootcert_import" name="rootcert_import" class="hiddenuploadfield"> - </form> -</div> -<?php endif; ?> - <div class="section"> <h2><?php p($l->t('Version'));?></h2> <p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p> diff --git a/settings/users.php b/settings/users.php index 0e9823e73e3..81f6ed4335c 100644 --- a/settings/users.php +++ b/settings/users.php @@ -11,12 +11,12 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Stephan Peijnik <speijnik@anexia-it.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/status.php b/status.php index 65418336e26..86f1f68dde1 100644 --- a/status.php +++ b/status.php @@ -8,7 +8,7 @@ * @author Masaki Kawabata Neto <masaki.kawabata@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php index eb0447f278b..0843d82da3f 100644 --- a/tests/core/lostpassword/controller/lostcontrollertest.php +++ b/tests/core/lostpassword/controller/lostcontrollertest.php @@ -167,7 +167,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { } public function testEmailSuccessful() { - $randomToken = $this->secureRandom; $this->secureRandom ->expects($this->once()) ->method('generate') @@ -187,10 +186,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { ->expects($this->once()) ->method('getTime') ->will($this->returnValue(12348)); - $this->secureRandom - ->expects($this->once()) - ->method('getMediumStrengthGenerator') - ->will($this->returnValue($randomToken)); $this->config ->expects($this->once()) ->method('setUserValue') @@ -233,7 +228,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { } public function testEmailCantSendException() { - $randomToken = $this->secureRandom; $this->secureRandom ->expects($this->once()) ->method('generate') @@ -249,10 +243,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { ->method('get') ->with('ExistingUser') ->willReturn($this->existingUser); - $this->secureRandom - ->expects($this->once()) - ->method('getMediumStrengthGenerator') - ->will($this->returnValue($randomToken)); $this->config ->expects($this->once()) ->method('setUserValue') diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php index 32603d0da59..ab79eb498fa 100644 --- a/tests/lib/appframework/http/RequestTest.php +++ b/tests/lib/appframework/http/RequestTest.php @@ -352,18 +352,11 @@ class RequestTest extends \Test\TestCase { } public function testGetIdWithoutModUnique() { - $lowRandomSource = $this->getMockBuilder('\OCP\Security\ISecureRandom') - ->disableOriginalConstructor()->getMock(); - $lowRandomSource->expects($this->once()) + $this->secureRandom->expects($this->once()) ->method('generate') ->with('20') ->will($this->returnValue('GeneratedByOwnCloudItself')); - $this->secureRandom - ->expects($this->once()) - ->method('getLowStrengthGenerator') - ->will($this->returnValue($lowRandomSource)); - $request = new Request( [], $this->secureRandom, diff --git a/tests/lib/cache.php b/tests/lib/cache.php index 894d8c57662..feddcac4693 100644 --- a/tests/lib/cache.php +++ b/tests/lib/cache.php @@ -8,7 +8,7 @@ abstract class Test_Cache extends \Test\TestCase { /** - * @var \OC\Cache cache; + * @var \OCP\ICache cache; */ protected $instance; diff --git a/tests/lib/cache/cappedmemorycache.php b/tests/lib/cache/cappedmemorycache.php new file mode 100644 index 00000000000..5444d928421 --- /dev/null +++ b/tests/lib/cache/cappedmemorycache.php @@ -0,0 +1,67 @@ +<?php +/** + * ownCloud + * + * @author Robin Appelman + * @copyright 2016 Robin Appelman icewind@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/>. + * + */ + +namespace Test\Cache; + +/** + * Class FileCache + * + * @group DB + * + * @package Test\Cache + */ +class CappedMemoryCache extends \Test_Cache { + public function setUp() { + parent::setUp(); + $this->instance = new \OC\Cache\CappedMemoryCache(); + } + + public function testSetOverCap() { + $instance = new \OC\Cache\CappedMemoryCache(3); + + $instance->set('1', 'a'); + $instance->set('2', 'b'); + $instance->set('3', 'c'); + $instance->set('4', 'd'); + $instance->set('5', 'e'); + + $this->assertFalse($instance->hasKey('1')); + $this->assertFalse($instance->hasKey('2')); + $this->assertTrue($instance->hasKey('3')); + $this->assertTrue($instance->hasKey('4')); + $this->assertTrue($instance->hasKey('5')); + } + + function testClear() { + $value = 'ipsum lorum'; + $this->instance->set('1_value1', $value); + $this->instance->set('1_value2', $value); + $this->instance->set('2_value1', $value); + $this->instance->set('3_value1', $value); + + $this->assertTrue($this->instance->clear()); + $this->assertFalse($this->instance->hasKey('1_value1')); + $this->assertFalse($this->instance->hasKey('1_value2')); + $this->assertFalse($this->instance->hasKey('2_value1')); + $this->assertFalse($this->instance->hasKey('3_value1')); + } +} diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index d96f8195770..11eacbf397f 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -26,7 +26,7 @@ class Test_DBSchema extends \Test\TestCase { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml'; - $r = '_' . \OC::$server->getSecureRandom()->getMediumStrengthGenerator()-> + $r = '_' . \OC::$server->getSecureRandom()-> generate(4, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS) . '_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); diff --git a/tests/lib/installer.php b/tests/lib/installer.php index cfad4d7f0de..ca210ba31ef 100644 --- a/tests/lib/installer.php +++ b/tests/lib/installer.php @@ -38,6 +38,10 @@ class Test_Installer extends \Test\TestCase { $data = array( 'path' => $tmp, 'source' => 'path', + 'appdata' => [ + 'id' => 'Bar', + 'level' => 100, + ] ); OC_Installer::installApp($data); @@ -57,6 +61,10 @@ class Test_Installer extends \Test\TestCase { $oldData = array( 'path' => $oldTmp, 'source' => 'path', + 'appdata' => [ + 'id' => 'Bar', + 'level' => 100, + ] ); $pathOfNewTestApp = __DIR__; @@ -69,6 +77,10 @@ class Test_Installer extends \Test\TestCase { $newData = array( 'path' => $newTmp, 'source' => 'path', + 'appdata' => [ + 'id' => 'Bar', + 'level' => 100, + ] ); OC_Installer::installApp($oldData); diff --git a/tests/lib/integritycheck/checkertest.php b/tests/lib/integritycheck/checkertest.php index 17117a4274b..eee9299e6af 100644 --- a/tests/lib/integritycheck/checkertest.php +++ b/tests/lib/integritycheck/checkertest.php @@ -23,6 +23,7 @@ namespace Test\IntegrityCheck; use OC\IntegrityCheck\Checker; use OC\Memcache\NullCache; +use OCP\ICache; use phpseclib\Crypt\RSA; use phpseclib\File\X509; use Test\TestCase; @@ -120,6 +121,16 @@ class CheckerTest extends TestCase { } public function testVerifyAppSignatureWithoutSignatureData() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + $expected = [ 'EXCEPTION' => [ 'class' => 'OC\IntegrityCheck\Exceptions\InvalidSignatureException', @@ -130,6 +141,16 @@ class CheckerTest extends TestCase { } public function testVerifyAppSignatureWithValidSignatureData() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + $this->appLocator ->expects($this->once()) ->method('getAppPath') @@ -162,6 +183,16 @@ class CheckerTest extends TestCase { } public function testVerifyAppSignatureWithTamperedSignatureData() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + $this->appLocator ->expects($this->once()) ->method('getAppPath') @@ -200,6 +231,16 @@ class CheckerTest extends TestCase { } public function testVerifyAppSignatureWithTamperedFiles() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + $this->appLocator ->expects($this->once()) ->method('getAppPath') @@ -253,7 +294,80 @@ class CheckerTest extends TestCase { $this->assertSame($expected, $this->checker->verifyAppSignature('SomeApp')); } + public function testVerifyAppSignatureWithTamperedFilesAndAlternatePath() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->appLocator + ->expects($this->never()) + ->method('getAppPath') + ->with('SomeApp'); + $signatureDataFile = '{ + "hashes": { + "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112", + "subfolder\/file.txt": "410738545fb623c0a5c8a71f561e48ea69e3ada0981a455e920a5ae9bf17c6831ae654df324f9328ff8453de179276ae51931cca0fa71fe8ccde6c083ca0574b" + }, + "signature": "dYoohBaWIFR\/To1FXEbMQB5apUhVYlEauBGSPo12nq84wxWkBx2EM3KDRgkB5Sub2tr0CgmAc2EVjPhKIEzAam26cyUb48bJziz1V6wvW7z4GZAfaJpzLkyHdSfV5117VSf5w1rDcAeZDXfGUaaNEJPWytaF4ZIxVge7f3NGshHy4odFVPADy\/u6c43BWvaOtJ4m3aJQbP6sxCO9dxwcm5yJJJR3n36jfh229sdWBxyl8BhwhH1e1DEv78\/aiL6ckKFPVNzx01R6yDFt3TgEMR97YZ\/R6lWiXG+dsJ305jNFlusLu518zBUvl7g5yjzGN778H29b2C8VLZKmi\/h1CH9jGdD72fCqCYdenD2uZKzb6dsUtXtvBmVcVT6BUGz41W1pkkEEB+YJpMrHILIxAiHRGv1+aZa9\/Oz8LWFd+BEUQjC2LJgojPnpzaG\/msw1nBkX16NNVDWWtJ25Bc\/r\/mG46rwjWB\/cmV6Lwt6KODiqlxgrC4lm9ALOCEWw+23OcYhLwNfQTYevXqHqsFfXOkhUnM8z5vDUb\/HBraB1DjFXN8iLK+1YewD4P495e+SRzrR79Oi3F8SEqRIzRLfN2rnW1BTms\/wYsz0p67cup1Slk1XlNmHwbWX25NVd2PPlLOvZRGoqcKFpIjC5few8THiZfyjiNFwt3RM0AFdZcXY=", + "certificate": "-----BEGIN CERTIFICATE-----\r\nMIIEvjCCAqagAwIBAgIUc\/0FxYrsgSs9rDxp03EJmbjN0NwwDQYJKoZIhvcNAQEF\r\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTEw\r\nMzIxMDMzM1oXDTE2MTEwMzIxMDMzM1owDzENMAsGA1UEAwwEY29yZTCCAiIwDQYJ\r\nKoZIhvcNAQEBBQADggIPADCCAgoCggIBALb6EgHpkAqZbO5vRO8XSh7G7XGWHw5s\r\niOf4RwPXR6SE9bWZEm\/b72SfWk\/\/J6AbrD8WiOzBuT\/ODy6k5T1arEdHO+Pux0W1\r\nMxYJJI4kH74KKgMpC0SB0Rt+8WrMqV1r3hhJ46df6Xr\/xolP3oD+eLbShPcblhdS\r\nVtkZEkoev8Sh6L2wDCeHDyPxzvj1w2dTdGVO9Kztn0xIlyfEBakqvBWtcxyi3Ln0\r\nklnxlMx3tPDUE4kqvpia9qNiB1AN2PV93eNr5\/2riAzIssMFSCarWCx0AKYb54+d\r\nxLpcYFyqPJ0ydBCkF78DD45RCZet6PNYkdzgbqlUWEGGomkuDoJbBg4wzgzO0D77\r\nH87KFhYW8tKFFvF1V3AHl\/sFQ9tDHaxM9Y0pZ2jPp\/ccdiqnmdkBxBDqsiRvHvVB\r\nCn6qpb4vWGFC7vHOBfYspmEL1zLlKXZv3ezMZEZw7O9ZvUP3VO\/wAtd2vUW8UFiq\r\ns2v1QnNLN6jNh51obcwmrBvWhJy9vQIdtIjQbDxqWTHh1zUSrw9wrlklCBZ\/zrM0\r\ni8nfCFwTxWRxp3H9KoECzO\/zS5R5KIS7s3\/wq\/w9T2Ie4rcecgXwDizwnn0C\/aKc\r\nbDIjujpL1s9HO05pcD\/V3wKcPZ1izymBkmMyIbL52iRVN5FTVHeZdXPpFuq+CTQJ\r\nQ238lC+A\/KOVAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAGoKTnh8RfJV4sQItVC2\r\nAvfJagkrIqZ3iiQTUBQGTKBsTnAqE1H7QgUSV9vSd+8rgvHkyZsRjmtyR1e3A6Ji\r\noNCXUbExC\/0iCPUqdHZIVb+Lc\/vWuv4ByFMybGPydgtLoEUX2ZrKFWmcgZFDUSRd\r\n9Uj26vtUhCC4bU4jgu6hIrR9IuxOBLQUxGTRZyAcXvj7obqRAEZwFAKQgFpfpqTb\r\nH+kjcbZSaAlLVSF7vBc1syyI8RGYbqpwvtREqJtl5IEIwe6huEqJ3zPnlP2th\/55\r\ncf3Fovj6JJgbb9XFxrdnsOsDOu\/tpnaRWlvv5ib4+SzG5wWFT5UUEo4Wg2STQiiX\r\nuVSRQxK1LE1yg84bs3NZk9FSQh4B8vZVuRr5FaJsZZkwlFlhRO\/\/+TJtXRbyNgsf\r\noMRZGi8DLGU2SGEAHcRH\/QZHq\/XDUWVzdxrSBYcy7GSpT7UDVzGv1rEJUrn5veP1\r\n0KmauAqtiIaYRm4f6YBsn0INcZxzIPZ0p8qFtVZBPeHhvQtvOt0iXI\/XUxEWOa2F\r\nK2EqhErgMK\/N07U1JJJay5tYZRtvkGq46oP\/5kQG8hYST0MDK6VihJoPpvCmAm4E\r\npEYKQ96x6A4EH9Y9mZlYozH\/eqmxPbTK8n89\/p7Ydun4rI+B2iiLnY8REWWy6+UQ\r\nV204fGUkJqW5CrKy3P3XvY9X\r\n-----END CERTIFICATE-----" +}'; + $this->fileAccessHelper + ->expects($this->at(0)) + ->method('file_get_contents') + ->with( + \OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//appinfo/signature.json' + ) + ->will($this->returnValue($signatureDataFile)); + $this->fileAccessHelper + ->expects($this->at(1)) + ->method('file_get_contents') + ->with( + '/resources/codesigning/root.crt' + ) + ->will($this->returnValue(file_get_contents(__DIR__ .'/../../data/integritycheck/root.crt'))); + + + $expected = [ + 'INVALID_HASH' => [ + 'AnotherFile.txt' => [ + 'expected' => '1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112', + 'current' => '7322348ba269c6d5522efe02f424fa3a0da319a7cd9c33142a5afe32a2d9af2da3a411f086fcfc96ff4301ea566f481dba0960c2abeef3594c4d930462f6584c', + ], + ], + 'FILE_MISSING' => [ + 'subfolder/file.txt' => [ + 'expected' => '410738545fb623c0a5c8a71f561e48ea69e3ada0981a455e920a5ae9bf17c6831ae654df324f9328ff8453de179276ae51931cca0fa71fe8ccde6c083ca0574b', + 'current' => '', + ], + ], + 'EXTRA_FILE' => [ + 'UnecessaryFile' => [ + 'expected' => '', + 'current' => 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e', + ], + ], + + ]; + $this->assertSame($expected, $this->checker->verifyAppSignature('SomeApp', \OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/')); + } + public function testVerifyAppWithDifferentScope() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + $this->appLocator ->expects($this->once()) ->method('getAppPath') @@ -290,6 +404,16 @@ class CheckerTest extends TestCase { } public function testVerifyAppWithDifferentScopeAndAlwaysTrustedCore() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + $this->appLocator ->expects($this->once()) ->method('getAppPath') @@ -350,6 +474,16 @@ class CheckerTest extends TestCase { } public function testVerifyCoreSignatureWithoutSignatureData() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + $expected = [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', @@ -361,6 +495,16 @@ class CheckerTest extends TestCase { public function testVerifyCoreSignatureWithValidSignatureData() { $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->environmentHelper ->expects($this->any()) ->method('getServerRoot') ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/app/')); @@ -392,6 +536,16 @@ class CheckerTest extends TestCase { public function testVerifyCoreSignatureWithValidSignatureDataAndNotAlphabeticOrder() { $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->environmentHelper ->expects($this->any()) ->method('getServerRoot') ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/app/')); @@ -423,6 +577,16 @@ class CheckerTest extends TestCase { public function testVerifyCoreSignatureWithTamperedSignatureData() { $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->environmentHelper ->expects($this->any()) ->method('getServerRoot') ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/')); @@ -460,6 +624,16 @@ class CheckerTest extends TestCase { public function testVerifyCoreSignatureWithTamperedFiles() { $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->environmentHelper ->expects($this->any()) ->method('getServerRoot') ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/')); @@ -512,6 +686,16 @@ class CheckerTest extends TestCase { public function testVerifyCoreWithInvalidCertificate() { $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->environmentHelper ->expects($this->any()) ->method('getServerRoot') ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/app/')); @@ -549,6 +733,16 @@ class CheckerTest extends TestCase { public function testVerifyCoreWithDifferentScope() { $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->environmentHelper ->expects($this->any()) ->method('getServerRoot') ->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/app/')); @@ -664,8 +858,74 @@ class CheckerTest extends TestCase { ->expects($this->at(3)) ->method('verifyAppSignature') ->with('dav'); + $this->config + ->expects($this->once()) + ->method('deleteAppValue') + ->with('core', 'oc.integritycheck.checker'); $this->checker->runInstanceVerification(); } + public function testVerifyAppSignatureWithoutSignatureDataAndCodeCheckerDisabled() { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue('stable')); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(true)); + + $expected = []; + $this->assertSame($expected, $this->checker->verifyAppSignature('SomeApp')); + } + + /** + * @return array + */ + public function channelDataProvider() { + return [ + ['stable', true], + ['git', false], + ]; + } + + /** + * @param string $channel + * @param bool $isCodeSigningEnforced + * @dataProvider channelDataProvider + */ + public function testIsCodeCheckEnforced($channel, $isCodeSigningEnforced) { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue($channel)); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(false)); + + $this->assertSame($isCodeSigningEnforced, $this->checker->isCodeCheckEnforced()); + } + + /** + * @param string $channel + * @dataProvider channelDataProvider + */ + public function testIsCodeCheckEnforcedWithDisabledConfigSwitch($channel) { + $this->environmentHelper + ->expects($this->once()) + ->method('getChannel') + ->will($this->returnValue($channel)); + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('integrity.check.disabled', false) + ->will($this->returnValue(true)); + + $result = $this->invokePrivate($this->checker, 'isCodeCheckEnforced'); + $this->assertSame(false, $result); + } } diff --git a/tests/lib/integritycheck/helpers/EnvironmentHelperTest.php b/tests/lib/integritycheck/helpers/EnvironmentHelperTest.php index 4a292188e75..a1d1f671b07 100644 --- a/tests/lib/integritycheck/helpers/EnvironmentHelperTest.php +++ b/tests/lib/integritycheck/helpers/EnvironmentHelperTest.php @@ -25,8 +25,19 @@ use OC\IntegrityCheck\Helpers\EnvironmentHelper; use Test\TestCase; class EnvironmentHelperTest extends TestCase { + /** @var EnvironmentHelper */ + private $environmentHelper; + + public function setUp() { + $this->environmentHelper = new EnvironmentHelper(); + return parent::setUp(); + } + public function testGetServerRoot() { - $factory = new EnvironmentHelper(); - $this->assertSame(\OC::$SERVERROOT, $factory->getServerRoot()); + $this->assertSame(\OC::$SERVERROOT, $this->environmentHelper->getServerRoot()); + } + + public function testGetChannel() { + $this->assertSame(\OC_Util::getChannel(), $this->environmentHelper->getChannel()); } } diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php index 631432caea2..d77548c5bf5 100644 --- a/tests/lib/l10n.php +++ b/tests/lib/l10n.php @@ -156,11 +156,6 @@ class Test_L10n extends \Test\TestCase { ); } - public function testGetLanguageCode() { - $l = OC_L10N::get('lib', 'de'); - $this->assertEquals('de', $l->getLanguageCode()); - } - public function testFactoryGetLanguageCode() { $factory = new \OC\L10N\Factory(); $l = $factory->get('lib', 'de'); diff --git a/tests/lib/ocsclienttest.php b/tests/lib/ocsclienttest.php index 80102eb62ee..66e4c4b938e 100644 --- a/tests/lib/ocsclienttest.php +++ b/tests/lib/ocsclienttest.php @@ -748,7 +748,7 @@ class OCSClientTest extends \Test\TestCase { ->expects($this->once()) ->method('get') ->with( - 'https://api.owncloud.com/v1/content/data/MyId', + 'https://api.owncloud.com/v1/content/data/166053', [ 'timeout' => 5, 'query' => ['version' => '8x1x0x7'], @@ -779,8 +779,145 @@ class OCSClientTest extends \Test\TestCase { 'score' => 50, 'level' => 200, ]; - $this->assertSame($expected, $this->ocsClient->getApplication('MyId', [8, 1, 0, 7])); + $this->assertSame($expected, $this->ocsClient->getApplication(166053, [8, 1, 0, 7])); } + + public function testGetApplicationSuccessfulWithOldId() { + $this->config + ->expects($this->at(0)) + ->method('getSystemValue') + ->with('appstoreenabled', true) + ->will($this->returnValue(true)); + $this->config + ->expects($this->at(1)) + ->method('getSystemValue') + ->with('appstoreurl', 'https://api.owncloud.com/v1') + ->will($this->returnValue('https://api.owncloud.com/v1')); + + $response = $this->getMock('\OCP\Http\Client\IResponse'); + $response + ->expects($this->once()) + ->method('getBody') + ->will($this->returnValue('<?xml version="1.0"?> + <ocs> + <meta> + <status>ok</status> + <statuscode>100</statuscode> + <message></message> + </meta> + <data> + <content details="full"> + <id>1337</id> + <name>Versioning</name> + <version>0.0.1</version> + <label>recommended</label> + <typeid>925</typeid> + <typename>ownCloud other</typename> + <language></language> + <personid>owncloud</personid> + <profilepage>http://opendesktop.org/usermanager/search.php?username=owncloud</profilepage> + <created>2014-07-07T16:34:40+02:00</created> + <changed>2014-07-07T16:34:40+02:00</changed> + <downloads>140</downloads> + <score>50</score> + <description>Placeholder for future updates</description> + <summary></summary> + <feedbackurl></feedbackurl> + <changelog></changelog> + <homepage></homepage> + <homepagetype></homepagetype> + <homepage2></homepage2> + <homepagetype2></homepagetype2> + <homepage3></homepage3> + <homepagetype3></homepagetype3> + <homepage4></homepage4> + <homepagetype4></homepagetype4> + <homepage5></homepage5> + <homepagetype5></homepagetype5> + <homepage6></homepage6> + <homepagetype6></homepagetype6> + <homepage7></homepage7> + <homepagetype7></homepagetype7> + <homepage8></homepage8> + <homepagetype8></homepagetype8> + <homepage9></homepage9> + <homepagetype9></homepagetype9> + <homepage10></homepage10> + <homepagetype10></homepagetype10> + <licensetype>16</licensetype> + <license>AGPL</license> + <donationpage></donationpage> + <comments>0</comments> + <commentspage>http://apps.owncloud.com/content/show.php?content=166053</commentspage> + <fans>0</fans> + <fanspage>http://apps.owncloud.com/content/show.php?action=fan&content=166053</fanspage> + <knowledgebaseentries>0</knowledgebaseentries> + <knowledgebasepage>http://apps.owncloud.com/content/show.php?action=knowledgebase&content=166053</knowledgebasepage> + <depend>ownCloud 7</depend> + <preview1></preview1> + <preview2></preview2> + <preview3></preview3> + <previewpic1></previewpic1> + <previewpic2></previewpic2> + <previewpic3></previewpic3> + <picsmall1></picsmall1> + <picsmall2></picsmall2> + <picsmall3></picsmall3> + <detailpage>https://apps.owncloud.com/content/show.php?content=166053</detailpage> + <downloadtype1></downloadtype1> + <downloadprice1>0</downloadprice1> + <downloadlink1>http://apps.owncloud.com/content/download.php?content=166053&id=1</downloadlink1> + <downloadname1></downloadname1> + <downloadgpgfingerprint1></downloadgpgfingerprint1> + <downloadgpgsignature1></downloadgpgsignature1> + <downloadpackagename1></downloadpackagename1> + <downloadrepository1></downloadrepository1> + <downloadsize1>1</downloadsize1> + <approved>200</approved> + </content> + </data> + </ocs> + ')); + + $client = $this->getMock('\OCP\Http\Client\IClient'); + $client + ->expects($this->once()) + ->method('get') + ->with( + 'https://api.owncloud.com/v1/content/data/166053', + [ + 'timeout' => 5, + 'query' => ['version' => '8x1x0x7'], + ] + ) + ->will($this->returnValue($response)); + + $this->clientService + ->expects($this->once()) + ->method('newClient') + ->will($this->returnValue($client)); + + $expected = [ + 'id' => 166053, + 'name' => 'Versioning', + 'version' => '0.0.1', + 'type' => '925', + 'label' => 'recommended', + 'typename' => 'ownCloud other', + 'personid' => 'owncloud', + 'profilepage' => 'http://opendesktop.org/usermanager/search.php?username=owncloud', + 'detailpage' => 'https://apps.owncloud.com/content/show.php?content=166053', + 'preview1' => '', + 'preview2' => '', + 'preview3' => '', + 'changed' => 1404743680, + 'description' => 'Placeholder for future updates', + 'score' => 50, + 'level' => 200, + ]; + $this->assertSame($expected, $this->ocsClient->getApplication(166053, [8, 1, 0, 7])); + } + public function testGetApplicationEmptyXml() { $this->config ->expects($this->at(0)) diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php index f2e29cab18e..e9ccea39efe 100644 --- a/tests/lib/security/certificatemanager.php +++ b/tests/lib/security/certificatemanager.php @@ -14,6 +14,8 @@ use \OC\Security\CertificateManager; * @group DB */ class CertificateManagerTest extends \Test\TestCase { + use \Test\Traits\UserTrait; + use \Test\Traits\MountProviderTrait; /** @var CertificateManager */ private $certificateManager; @@ -24,7 +26,10 @@ class CertificateManagerTest extends \Test\TestCase { parent::setUp(); $this->username = $this->getUniqueID('', 20); - \OC::$server->getUserManager()->createUser($this->username, $this->getUniqueID('', 20)); + $this->createUser($this->username, ''); + + $storage = new \OC\Files\Storage\Temporary(); + $this->registerMount($this->username, $storage, '/' . $this->username . '/'); \OC_Util::tearDownFS(); \OC_User::setUserId(''); @@ -40,7 +45,9 @@ class CertificateManagerTest extends \Test\TestCase { protected function tearDown() { $user = \OC::$server->getUserManager()->get($this->username); - if ($user !== null) { $user->delete(); } + if ($user !== null) { + $user->delete(); + } parent::tearDown(); } @@ -56,14 +63,14 @@ class CertificateManagerTest extends \Test\TestCase { $this->assertSame(array(), $this->certificateManager->listCertificates()); // Add some certificates - $this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt'), 'GoodCertificate'); + $this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'), 'GoodCertificate'); $certificateStore = array(); - $certificateStore[] = new \OC\Security\Certificate(file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt'), 'GoodCertificate'); + $certificateStore[] = new \OC\Security\Certificate(file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'), 'GoodCertificate'); $this->assertEqualsArrays($certificateStore, $this->certificateManager->listCertificates()); // Add another certificates - $this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate'); - $certificateStore[] = new \OC\Security\Certificate(file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate'); + $this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate'); + $certificateStore[] = new \OC\Security\Certificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate'); $this->assertEqualsArrays($certificateStore, $this->certificateManager->listCertificates()); } @@ -93,7 +100,7 @@ class CertificateManagerTest extends \Test\TestCase { * @param string $filename */ function testAddDangerousFile($filename) { - $this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt'), $filename); + $this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), $filename); } function testRemoveDangerousFile() { @@ -101,7 +108,7 @@ class CertificateManagerTest extends \Test\TestCase { } function testRemoveExistingFile() { - $this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt'), 'GoodCertificate'); + $this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'), 'GoodCertificate'); $this->assertTrue($this->certificateManager->removeCertificate('GoodCertificate')); } diff --git a/tests/lib/security/securerandom.php b/tests/lib/security/securerandom.php index af437640805..526066d92ee 100644 --- a/tests/lib/security/securerandom.php +++ b/tests/lib/security/securerandom.php @@ -42,7 +42,7 @@ class SecureRandomTest extends \Test\TestCase { * @dataProvider stringGenerationProvider */ function testGetLowStrengthGeneratorLength($length, $expectedLength) { - $generator = $this->rng->getLowStrengthGenerator(); + $generator = $this->rng; $this->assertEquals($expectedLength, strlen($generator->generate($length))); } @@ -51,7 +51,7 @@ class SecureRandomTest extends \Test\TestCase { * @dataProvider stringGenerationProvider */ function testMediumLowStrengthGeneratorLength($length, $expectedLength) { - $generator = $this->rng->getMediumStrengthGenerator(); + $generator = $this->rng; $this->assertEquals($expectedLength, strlen($generator->generate($length))); } @@ -67,7 +67,7 @@ class SecureRandomTest extends \Test\TestCase { * @dataProvider charCombinations */ public function testScheme($charName, $chars) { - $generator = $this->rng->getMediumStrengthGenerator(); + $generator = $this->rng; $scheme = constant('OCP\Security\ISecureRandom::' . $charName); $randomString = $generator->generate(100, $scheme); $matchesRegex = preg_match('/^'.$chars.'+$/', $randomString); diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index 93b354863a9..38d5cf49320 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -150,7 +150,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { * @return string */ protected static function getUniqueID($prefix = '', $length = 13) { - return $prefix . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate( + return $prefix . \OC::$server->getSecureRandom()->generate( $length, // Do not use dots and slashes as we use the value for file names ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER diff --git a/tests/settings/controller/CertificateControllerTest.php b/tests/settings/controller/CertificateControllerTest.php index 023d7753cca..2fdbbb8b0ac 100644 --- a/tests/settings/controller/CertificateControllerTest.php +++ b/tests/settings/controller/CertificateControllerTest.php @@ -44,12 +44,15 @@ class CertificateControllerTest extends \Test\TestCase { private $l10n; /** @var IAppManager */ private $appManager; + /** @var ICertificateManager */ + private $systemCertificateManager; public function setUp() { parent::setUp(); $this->request = $this->getMock('\OCP\IRequest'); $this->certificateManager = $this->getMock('\OCP\ICertificateManager'); + $this->systemCertificateManager = $this->getMock('\OCP\ICertificateManager'); $this->l10n = $this->getMock('\OCP\IL10N'); $this->appManager = $this->getMock('OCP\App\IAppManager'); @@ -59,6 +62,7 @@ class CertificateControllerTest extends \Test\TestCase { 'settings', $this->request, $this->certificateManager, + $this->systemCertificateManager, $this->l10n, $this->appManager ] diff --git a/version.php b/version.php index b8b1ad2b5fa..5fdb132421e 100644 --- a/version.php +++ b/version.php @@ -3,10 +3,10 @@ * @author Frank Karlitschek <frank@owncloud.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify |