From 6127c288e836a78a9cb77da5f05f131b019fe868 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 13 Jan 2020 14:23:49 +0100 Subject: Fix license headers Signed-off-by: Christoph Wurst --- AUTHORS | 5 ++++ apps/files/tests/Controller/ViewControllerTest.php | 1 + apps/files_sharing/lib/AppInfo/Application.php | 1 + .../lib/Controller/AcceptController.php | 4 ++- .../lib/Controller/ShareAPIController.php | 1 + .../lib/Controller/PreviewController.php | 1 + .../lib/Controller/ChangePasswordController.php | 26 +--------------- apps/settings/lib/Controller/UsersController.php | 35 +--------------------- apps/sharebymail/lib/ShareByMailProvider.php | 1 + build/license.php | 3 +- core/Command/Db/ConvertType.php | 1 + core/Command/User/Setting.php | 1 + core/Controller/CSRFTokenController.php | 1 + lib/private/App/AppStore/Fetcher/Fetcher.php | 1 + .../Listeners/UserDeletedStoreCleanupListener.php | 5 ++-- lib/private/Avatar/UserAvatar.php | 1 + lib/private/DirectEditing/Manager.php | 1 + lib/private/Preview/Movie.php | 1 + .../Http/Template/ExternalShareMenuAction.php | 1 + lib/public/Lock/ManuallyLockedException.php | 11 ++++--- .../WorkflowEngine/Events/RegisterChecksEvent.php | 4 ++- .../Events/RegisterEntitiesEvent.php | 4 ++- .../Events/RegisterOperationsEvent.php | 4 ++- lib/public/WorkflowEngine/IManager.php | 1 + 24 files changed, 43 insertions(+), 72 deletions(-) diff --git a/AUTHORS b/AUTHORS index b0bd4eb4b1c..583bd617244 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,6 +9,7 @@ Nextcloud is written by: - Alecks Gates - Alejandro Varela - Alex Weirig + - Alexander A. Klimov - Alexander Bergolth - Alexey Pyltsyn - Allan Nordhøy @@ -30,6 +31,7 @@ Nextcloud is written by: - Bastien Ho - Benjamin Diele - Benjamin Liles + - Bernhard Ostertag - Bernhard Posselt - Bernhard Reiter - Birk Borkason @@ -139,6 +141,7 @@ Nextcloud is written by: - Kawohl - Kenneth Newwood - Kevin Ndung'u + - Kim Brose - Klaas Freitag - Knut Ahlers - Ko- @@ -336,6 +339,7 @@ Nextcloud is written by: - duritong - eduardo - enoch + - exner104 <59639860+exner104@users.noreply.github.com> - fabian - felixboehm - fnuesse @@ -370,6 +374,7 @@ Nextcloud is written by: - scolebrook - shkdee - sidey79 + - simonspa <1677436+simonspa@users.noreply.github.com> - sualko - tbartenstein - tbelau666 diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 30d7bdfdc6d..3182172acfa 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -6,6 +6,7 @@ * @author Daniel Kesselberg * @author Joas Schilling * @author John Molakvoæ (skjnldsv) + * @author Julius Härtl * @author Lukas Reschke * @author Michael Weimann * @author Morris Jobke diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php index 5a18cce8e49..af80b85f224 100644 --- a/apps/files_sharing/lib/AppInfo/Application.php +++ b/apps/files_sharing/lib/AppInfo/Application.php @@ -6,6 +6,7 @@ * @author Björn Schießle * @author Joas Schilling * @author John Molakvoæ (skjnldsv) + * @author Julius Härtl * @author Lukas Reschke * @author Morris Jobke * @author Robin Appelman diff --git a/apps/files_sharing/lib/Controller/AcceptController.php b/apps/files_sharing/lib/Controller/AcceptController.php index 29924ce095d..b25382b45f5 100644 --- a/apps/files_sharing/lib/Controller/AcceptController.php +++ b/apps/files_sharing/lib/Controller/AcceptController.php @@ -1,5 +1,7 @@ * @@ -18,7 +20,7 @@ declare(strict_types=1); * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . * */ diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index ceda0e46c0c..7e6b3674b95 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -9,6 +9,7 @@ declare(strict_types=1); * @author Daniel Calviño Sánchez * @author Joas Schilling * @author John Molakvoæ (skjnldsv) + * @author Julius Härtl * @author Lukas Reschke * @author Maxence Lange * @author Maxence Lange diff --git a/apps/files_trashbin/lib/Controller/PreviewController.php b/apps/files_trashbin/lib/Controller/PreviewController.php index a734454bd50..f06265ec371 100644 --- a/apps/files_trashbin/lib/Controller/PreviewController.php +++ b/apps/files_trashbin/lib/Controller/PreviewController.php @@ -9,6 +9,7 @@ declare(strict_types=1); * @author Morris Jobke * @author Robin Appelman * @author Roeland Jago Douma + * @author simonspa <1677436+simonspa@users.noreply.github.com> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php index c374b3ff8bf..20b8357a6a9 100644 --- a/apps/settings/lib/Controller/ChangePasswordController.php +++ b/apps/settings/lib/Controller/ChangePasswordController.php @@ -26,34 +26,10 @@ * along with this program. If not, see . * */ + // FIXME: disabled for now to be able to inject IGroupManager and also use // getSubAdmin() //declare(strict_types=1); -/** - * - * - * @author Joas Schilling - * @author Lukas Reschke - * @author Matthew Setter - * @author Morris Jobke - * @author Roeland Jago Douma - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * 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 - * along with this program. If not, see . - * - */ namespace OCA\Settings\Controller; diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index 28fdead4abe..2c7c17bced2 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -23,43 +23,10 @@ * along with this program. If not, see * */ + // FIXME: disabled for now to be able to inject IGroupManager and also use // getSubAdmin() //declare(strict_types=1); -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Arthur Schiwon - * @author Bjoern Schiessle - * @author Björn Schießle - * @author Christoph Wurst - * @author Clark Tomlinson - * @author Joas Schilling - * @author Lukas Reschke - * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma - * @author Thomas Müller - * @author Thomas Pulzer - * @author Tobia De Koninck - * @author Tobias Kaminsky - * @author Vincent Petry - * - * @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 - * - */ namespace OCA\Settings\Controller; diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 597ac196697..48c60b168e8 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -6,6 +6,7 @@ * @author Bjoern Schiessle * @author comradekingu * @author Daniel Calviño Sánchez + * @author exner104 <59639860+exner104@users.noreply.github.com> * @author Frederic Werner * @author Joas Schilling * @author Lukas Reschke diff --git a/build/license.php b/build/license.php index aed716a15e4..9a22e915ce2 100644 --- a/build/license.php +++ b/build/license.php @@ -1,4 +1,5 @@ + * along with this program. If not, see * */ class Licenses diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php index 3c5d62aa4bd..c79ece79915 100644 --- a/core/Command/Db/ConvertType.php +++ b/core/Command/Db/ConvertType.php @@ -4,6 +4,7 @@ * * @author Andreas Fischer * @author Bart Visscher + * @author Bernhard Ostertag * @author Joas Schilling * @author Lukas Reschke * @author Łukasz Buśko diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php index 969e0372158..521ac850b92 100644 --- a/core/Command/User/Setting.php +++ b/core/Command/User/Setting.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Joas Schilling + * @author Kim Brose * @author Roeland Jago Douma * * @license AGPL-3.0 diff --git a/core/Controller/CSRFTokenController.php b/core/Controller/CSRFTokenController.php index b4b04ba2669..b120acbcd5f 100644 --- a/core/Controller/CSRFTokenController.php +++ b/core/Controller/CSRFTokenController.php @@ -6,6 +6,7 @@ declare(strict_types=1); * @copyright 2017 Christoph Wurst * * @author Christoph Wurst + * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version * diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index 76a37bfa7de..1738b2e832d 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2016 Lukas Reschke * * @author Daniel Kesselberg + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke diff --git a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php index 4a74ca82e1f..dc0be4e2e9b 100644 --- a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php @@ -5,7 +5,7 @@ declare(strict_types=1); /** * @copyright 2020 Christoph Wurst * - * @author 2020 Christoph Wurst + * @author Christoph Wurst * * @license GNU AGPL version 3 or any later version * @@ -20,7 +20,8 @@ declare(strict_types=1); * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . + * */ namespace OC\Authentication\Listeners; diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index 8e2a7475bb9..fb434fc6947 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -6,6 +6,7 @@ declare(strict_types=1); * @copyright Copyright (c) 2018, Michael Weimann * * @author Arthur Schiwon + * @author Joas Schilling * @author Michael Weimann * * @license GNU AGPL version 3 or any later version diff --git a/lib/private/DirectEditing/Manager.php b/lib/private/DirectEditing/Manager.php index a514eaea482..03bdba43564 100644 --- a/lib/private/DirectEditing/Manager.php +++ b/lib/private/DirectEditing/Manager.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2019 Julius Härtl * + * @author Christoph Wurst * @author Julius Härtl * @author Tobias Kaminsky * diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 57cf9ddeaf4..68157f1a87f 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Alexander A. Klimov * @author Daniel Schneider * @author Georg Ehrke * @author Joas Schilling diff --git a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php index 33ca3be94aa..af112a7076d 100644 --- a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php +++ b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2018 Julius Härtl * + * @author Daniel Calviño Sánchez * @author John Molakvoæ (skjnldsv) * @author Julius Härtl * @author Roeland Jago Douma diff --git a/lib/public/Lock/ManuallyLockedException.php b/lib/public/Lock/ManuallyLockedException.php index 04b4152c3a0..12567456e18 100644 --- a/lib/public/Lock/ManuallyLockedException.php +++ b/lib/public/Lock/ManuallyLockedException.php @@ -1,13 +1,12 @@ - * * @author Maxence Lange - * @copyright 2019, Maxence Lange + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify @@ -21,7 +20,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . * */ diff --git a/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php b/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php index cb6cca8bfe2..57249fe229c 100644 --- a/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php +++ b/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php @@ -1,5 +1,7 @@ * @@ -18,7 +20,7 @@ declare(strict_types=1); * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . * */ diff --git a/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php b/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php index f457a2b97b0..222b6b5faf2 100644 --- a/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php +++ b/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php @@ -1,5 +1,7 @@ * @@ -18,7 +20,7 @@ declare(strict_types=1); * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . * */ diff --git a/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php b/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php index a6bbbcb545e..8f964188773 100644 --- a/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php +++ b/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php @@ -1,5 +1,7 @@ * @@ -18,7 +20,7 @@ declare(strict_types=1); * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . * */ diff --git a/lib/public/WorkflowEngine/IManager.php b/lib/public/WorkflowEngine/IManager.php index c8a7afb3155..0eb504242df 100644 --- a/lib/public/WorkflowEngine/IManager.php +++ b/lib/public/WorkflowEngine/IManager.php @@ -4,6 +4,7 @@ * * @author Arthur Schiwon * @author Morris Jobke + * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version * -- cgit v1.2.3