diff options
Diffstat (limited to 'apps/federation')
29 files changed, 102 insertions, 63 deletions
diff --git a/apps/federation/api/ocsauthapi.php b/apps/federation/api/ocsauthapi.php index 2cc4f4948e1..83801ed2b2f 100644 --- a/apps/federation/api/ocsauthapi.php +++ b/apps/federation/api/ocsauthapi.php @@ -1,12 +1,14 @@ <?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> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Björn Schießle <bjoern@schiessle.org> + * @author Lukas Reschke <lukas@statuscode.ch> + * @author Robin Appelman <robin@icewind.nl> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @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 diff --git a/apps/federation/appinfo/app.php b/apps/federation/appinfo/app.php index 6686f90121c..92b64b9c058 100644 --- a/apps/federation/appinfo/app.php +++ b/apps/federation/appinfo/app.php @@ -1,8 +1,9 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * * @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 621a5d3d099..f2850106a5d 100644 --- a/apps/federation/appinfo/application.php +++ b/apps/federation/appinfo/application.php @@ -1,10 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Robin Appelman <icewind@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Robin Appelman <robin@icewind.nl> * @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 diff --git a/apps/federation/appinfo/install.php b/apps/federation/appinfo/install.php index f2a98d7f555..c37fc72f514 100644 --- a/apps/federation/appinfo/install.php +++ b/apps/federation/appinfo/install.php @@ -1,8 +1,9 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @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 diff --git a/apps/federation/appinfo/register_command.php b/apps/federation/appinfo/register_command.php index c7e79851946..c7cec58efd4 100644 --- a/apps/federation/appinfo/register_command.php +++ b/apps/federation/appinfo/register_command.php @@ -1,9 +1,10 @@ <?php /** - * @author Lukas Reschke <lukas@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Lukas Reschke <lukas@statuscode.ch> * @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 diff --git a/apps/federation/appinfo/routes.php b/apps/federation/appinfo/routes.php index 6b4124094df..03acc60c682 100644 --- a/apps/federation/appinfo/routes.php +++ b/apps/federation/appinfo/routes.php @@ -1,8 +1,9 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/appinfo/update.php b/apps/federation/appinfo/update.php index f2a98d7f555..c37fc72f514 100644 --- a/apps/federation/appinfo/update.php +++ b/apps/federation/appinfo/update.php @@ -1,8 +1,9 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @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 diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php index 66ab082c1a2..1d92879b6cb 100644 --- a/apps/federation/backgroundjob/getsharedsecret.php +++ b/apps/federation/backgroundjob/getsharedsecret.php @@ -1,9 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Joas Schilling <coding@schilljs.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 diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php index ccbe0feeeb6..e292dbbedf9 100644 --- a/apps/federation/backgroundjob/requestsharedsecret.php +++ b/apps/federation/backgroundjob/requestsharedsecret.php @@ -1,10 +1,13 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Robin Appelman <icewind@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Björn Schießle <bjoern@schiessle.org> + * @author Joas Schilling <coding@schilljs.com> + * @author Robin Appelman <robin@icewind.nl> * @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 diff --git a/apps/federation/command/syncfederationaddressbooks.php b/apps/federation/command/syncfederationaddressbooks.php index 879d38f8c22..bea75cc83a1 100644 --- a/apps/federation/command/syncfederationaddressbooks.php +++ b/apps/federation/command/syncfederationaddressbooks.php @@ -1,10 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Lukas Reschke <lukas@statuscode.ch> * @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 diff --git a/apps/federation/controller/settingscontroller.php b/apps/federation/controller/settingscontroller.php index 0e74db623e7..ad2b378b9d3 100644 --- a/apps/federation/controller/settingscontroller.php +++ b/apps/federation/controller/settingscontroller.php @@ -1,8 +1,10 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Björn Schießle <bjoern@schiessle.org> + * * @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 index bb1041adcdf..9229e2e629a 100644 --- a/apps/federation/dav/fedauth.php +++ b/apps/federation/dav/fedauth.php @@ -1,8 +1,9 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @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 diff --git a/apps/federation/lib/dbhandler.php b/apps/federation/lib/dbhandler.php index 7e85be96df1..ca63fbca563 100644 --- a/apps/federation/lib/dbhandler.php +++ b/apps/federation/lib/dbhandler.php @@ -1,9 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Björn Schießle <bjoern@schiessle.org> * @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 diff --git a/apps/federation/lib/hooks.php b/apps/federation/lib/hooks.php index b7f63d27f55..6601b9c0eb7 100644 --- a/apps/federation/lib/hooks.php +++ b/apps/federation/lib/hooks.php @@ -1,8 +1,9 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/lib/syncfederationaddressbooks.php b/apps/federation/lib/syncfederationaddressbooks.php index 209094266ca..759b59183aa 100644 --- a/apps/federation/lib/syncfederationaddressbooks.php +++ b/apps/federation/lib/syncfederationaddressbooks.php @@ -1,10 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Lukas Reschke <lukas@statuscode.ch> * @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 diff --git a/apps/federation/lib/syncjob.php b/apps/federation/lib/syncjob.php index 2b904813b92..060504efb7b 100644 --- a/apps/federation/lib/syncjob.php +++ b/apps/federation/lib/syncjob.php @@ -1,8 +1,9 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @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 diff --git a/apps/federation/lib/trustedservers.php b/apps/federation/lib/trustedservers.php index 54e2f2943f4..e2a795bab3e 100644 --- a/apps/federation/lib/trustedservers.php +++ b/apps/federation/lib/trustedservers.php @@ -1,10 +1,12 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Roeland Jago Douma <rullzer@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Björn Schießle <bjoern@schiessle.org> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @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 diff --git a/apps/federation/middleware/addservermiddleware.php b/apps/federation/middleware/addservermiddleware.php index 15781251349..66a10644940 100644 --- a/apps/federation/middleware/addservermiddleware.php +++ b/apps/federation/middleware/addservermiddleware.php @@ -1,9 +1,10 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> * @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 diff --git a/apps/federation/settings/settings-admin.php b/apps/federation/settings/settings-admin.php index a41d815feb8..f3c2911287a 100644 --- a/apps/federation/settings/settings-admin.php +++ b/apps/federation/settings/settings-admin.php @@ -1,8 +1,9 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * * @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 d3e61c0641a..7861e917ff8 100644 --- a/apps/federation/tests/api/ocsauthapitest.php +++ b/apps/federation/tests/api/ocsauthapitest.php @@ -1,9 +1,10 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Robin Appelman <icewind@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Robin Appelman <robin@icewind.nl> + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/tests/backgroundjob/getsharedsecrettest.php b/apps/federation/tests/backgroundjob/getsharedsecrettest.php index 25f7502741d..0746c517fa7 100644 --- a/apps/federation/tests/backgroundjob/getsharedsecrettest.php +++ b/apps/federation/tests/backgroundjob/getsharedsecrettest.php @@ -1,9 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Joas Schilling <coding@schilljs.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 diff --git a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php b/apps/federation/tests/backgroundjob/requestsharedsecrettest.php index 5b4a1f87a5f..cd92d8e33b1 100644 --- a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php +++ b/apps/federation/tests/backgroundjob/requestsharedsecrettest.php @@ -1,8 +1,10 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Joas Schilling <coding@schilljs.com> + * * @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 65f7d5f91d3..e73d1f47cdd 100644 --- a/apps/federation/tests/controller/settingscontrollertest.php +++ b/apps/federation/tests/controller/settingscontrollertest.php @@ -1,8 +1,9 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * * @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 index b716084a45d..10c5e165eef 100644 --- a/apps/federation/tests/dav/fedauthtest.php +++ b/apps/federation/tests/dav/fedauthtest.php @@ -1,8 +1,9 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @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 diff --git a/apps/federation/tests/lib/dbhandlertest.php b/apps/federation/tests/lib/dbhandlertest.php index 3ded486d36a..1aa2c6fc28f 100644 --- a/apps/federation/tests/lib/dbhandlertest.php +++ b/apps/federation/tests/lib/dbhandlertest.php @@ -1,9 +1,10 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> * @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 diff --git a/apps/federation/tests/lib/hookstest.php b/apps/federation/tests/lib/hookstest.php index 71569226dd2..a570a4c87a0 100644 --- a/apps/federation/tests/lib/hookstest.php +++ b/apps/federation/tests/lib/hookstest.php @@ -1,8 +1,9 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federation/tests/lib/syncfederationaddressbookstest.php b/apps/federation/tests/lib/syncfederationaddressbookstest.php index aa2bd9ac2cb..d84a79c9494 100644 --- a/apps/federation/tests/lib/syncfederationaddressbookstest.php +++ b/apps/federation/tests/lib/syncfederationaddressbookstest.php @@ -1,10 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> + * @author Lukas Reschke <lukas@statuscode.ch> * @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 diff --git a/apps/federation/tests/lib/trustedserverstest.php b/apps/federation/tests/lib/trustedserverstest.php index 39f9394ca2b..8e27a0c3b92 100644 --- a/apps/federation/tests/lib/trustedserverstest.php +++ b/apps/federation/tests/lib/trustedserverstest.php @@ -1,9 +1,11 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Björn Schießle <bjoern@schiessle.org> * @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 diff --git a/apps/federation/tests/middleware/addservermiddlewaretest.php b/apps/federation/tests/middleware/addservermiddlewaretest.php index be1d97c4035..9eed79b0db0 100644 --- a/apps/federation/tests/middleware/addservermiddlewaretest.php +++ b/apps/federation/tests/middleware/addservermiddlewaretest.php @@ -1,9 +1,10 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Björn Schießle <bjoern@schiessle.org> * @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 |