From 0eebff152a177dd59ed8773df26f1679f8a88e90 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 6 Nov 2017 15:56:42 +0100 Subject: Update license headers Signed-off-by: Morris Jobke --- apps/encryption/appinfo/app.php | 1 + apps/encryption/lib/AppInfo/Application.php | 1 + apps/encryption/lib/Command/DisableMasterKey.php | 2 ++ apps/encryption/lib/Command/MigrateKeys.php | 1 + apps/encryption/lib/Controller/StatusController.php | 2 ++ apps/encryption/lib/Crypto/Crypt.php | 2 ++ apps/encryption/lib/Crypto/EncryptAll.php | 1 + apps/encryption/lib/Crypto/Encryption.php | 2 ++ apps/encryption/lib/Hooks/UserHooks.php | 2 ++ apps/encryption/lib/KeyManager.php | 2 ++ apps/encryption/lib/Migration.php | 1 + apps/encryption/lib/Migration/SetMasterKeyStatus.php | 2 ++ apps/encryption/lib/Session.php | 1 + apps/encryption/lib/Util.php | 1 + apps/encryption/tests/Command/TestEnableMasterKey.php | 1 + apps/encryption/tests/Controller/RecoveryControllerTest.php | 1 + apps/encryption/tests/Controller/SettingsControllerTest.php | 2 ++ apps/encryption/tests/Controller/StatusControllerTest.php | 3 +++ apps/encryption/tests/Crypto/CryptTest.php | 3 +++ apps/encryption/tests/Crypto/DecryptAllTest.php | 1 + apps/encryption/tests/Crypto/EncryptAllTest.php | 3 +++ apps/encryption/tests/Crypto/EncryptionTest.php | 3 +++ apps/encryption/tests/HookManagerTest.php | 2 ++ apps/encryption/tests/Hooks/UserHooksTest.php | 3 +++ apps/encryption/tests/KeyManagerTest.php | 4 ++++ apps/encryption/tests/MigrationTest.php | 1 + apps/encryption/tests/RecoveryTest.php | 2 ++ apps/encryption/tests/SessionTest.php | 2 ++ apps/encryption/tests/Settings/AdminTest.php | 1 + apps/encryption/tests/Users/SetupTest.php | 2 ++ apps/encryption/tests/UtilTest.php | 3 +++ 31 files changed, 58 insertions(+) (limited to 'apps/encryption') diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php index 4f54f0e7251..63e99476602 100644 --- a/apps/encryption/appinfo/app.php +++ b/apps/encryption/appinfo/app.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php index dd9d173c8eb..2130044d1f4 100644 --- a/apps/encryption/lib/AppInfo/Application.php +++ b/apps/encryption/lib/AppInfo/Application.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Thomas Müller diff --git a/apps/encryption/lib/Command/DisableMasterKey.php b/apps/encryption/lib/Command/DisableMasterKey.php index 97c2ad40b61..230de754bfc 100644 --- a/apps/encryption/lib/Command/DisableMasterKey.php +++ b/apps/encryption/lib/Command/DisableMasterKey.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2017 Bjoern Schiessle * + * @author Bjoern Schiessle + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/apps/encryption/lib/Command/MigrateKeys.php b/apps/encryption/lib/Command/MigrateKeys.php index 1cdd76795d9..18eb6e710a6 100644 --- a/apps/encryption/lib/Command/MigrateKeys.php +++ b/apps/encryption/lib/Command/MigrateKeys.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Björn Schießle + * @author Thomas Müller * * @license AGPL-3.0 * diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php index 9ec9fd1234b..b133d5b2e5b 100644 --- a/apps/encryption/lib/Controller/StatusController.php +++ b/apps/encryption/lib/Controller/StatusController.php @@ -2,7 +2,9 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle + * @author Joas Schilling * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index 6e1b7387c88..090ca6184d6 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -2,10 +2,12 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Joas Schilling * @author Lukas Reschke + * @author Morris Jobke * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/encryption/lib/Crypto/EncryptAll.php b/apps/encryption/lib/Crypto/EncryptAll.php index 2afab22d522..c2619dc8ef1 100644 --- a/apps/encryption/lib/Crypto/EncryptAll.php +++ b/apps/encryption/lib/Crypto/EncryptAll.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Björn Schießle + * @author Kenneth Newwood * @author Morris Jobke * @author Roeland Jago Douma * @author Thomas Müller diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 4d20c103a5d..bd75e4ae10c 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -2,11 +2,13 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Jan-Christoph Borchardt * @author Joas Schilling * @author Lukas Reschke + * @author Morris Jobke * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php index a08796aee54..1dade9f782f 100644 --- a/apps/encryption/lib/Hooks/UserHooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php @@ -2,8 +2,10 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson + * @author Morris Jobke * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index 6039aaaaa0e..d25a25cdcb8 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -2,9 +2,11 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Lukas Reschke + * @author Morris Jobke * @author Thomas Müller * @author Vincent Petry * diff --git a/apps/encryption/lib/Migration.php b/apps/encryption/lib/Migration.php index 656cab6a1e1..35f35a1520c 100644 --- a/apps/encryption/lib/Migration.php +++ b/apps/encryption/lib/Migration.php @@ -4,6 +4,7 @@ * * @author Björn Schießle * @author Joas Schilling + * @author Morris Jobke * @author Robin Appelman * * @license AGPL-3.0 diff --git a/apps/encryption/lib/Migration/SetMasterKeyStatus.php b/apps/encryption/lib/Migration/SetMasterKeyStatus.php index a21d0acae24..2c515fd5f72 100644 --- a/apps/encryption/lib/Migration/SetMasterKeyStatus.php +++ b/apps/encryption/lib/Migration/SetMasterKeyStatus.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2017 Bjoern Schiessle * + * @author Bjoern Schiessle + * * @license GNU AGPL version 3 or any later version * * This program 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 a61ee25fadb..c8f6ac6d0da 100644 --- a/apps/encryption/lib/Session.php +++ b/apps/encryption/lib/Session.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Lukas Reschke diff --git a/apps/encryption/lib/Util.php b/apps/encryption/lib/Util.php index d6ae9bd7e5e..5926817dc48 100644 --- a/apps/encryption/lib/Util.php +++ b/apps/encryption/lib/Util.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Phil Davis diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php index 58118db8c53..3b58148f376 100644 --- a/apps/encryption/tests/Command/TestEnableMasterKey.php +++ b/apps/encryption/tests/Command/TestEnableMasterKey.php @@ -4,6 +4,7 @@ * * @author Björn Schießle * @author Joas Schilling + * @author Morris Jobke * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Controller/RecoveryControllerTest.php b/apps/encryption/tests/Controller/RecoveryControllerTest.php index 7ab3bc7eebb..c38436e68e2 100644 --- a/apps/encryption/tests/Controller/RecoveryControllerTest.php +++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php @@ -4,6 +4,7 @@ * * @author Clark Tomlinson * @author Joas Schilling + * @author Morris Jobke * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php index aceb94b23f7..b12652b51c9 100644 --- a/apps/encryption/tests/Controller/SettingsControllerTest.php +++ b/apps/encryption/tests/Controller/SettingsControllerTest.php @@ -4,6 +4,8 @@ * * @author Björn Schießle * @author Joas Schilling + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php index d72fcd1ac36..0dc04b0ba1c 100644 --- a/apps/encryption/tests/Controller/StatusControllerTest.php +++ b/apps/encryption/tests/Controller/StatusControllerTest.php @@ -2,8 +2,11 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Joas Schilling + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php index ace4453a803..9645dc3cce0 100644 --- a/apps/encryption/tests/Crypto/CryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -2,9 +2,12 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Joas Schilling * @author Lukas Reschke + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php index 99b1b47ba8e..c14549bb96a 100644 --- a/apps/encryption/tests/Crypto/DecryptAllTest.php +++ b/apps/encryption/tests/Crypto/DecryptAllTest.php @@ -4,6 +4,7 @@ * * @author Björn Schießle * @author Joas Schilling + * @author Morris Jobke * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php index 38b64a8b6bf..0d894ab6fd7 100644 --- a/apps/encryption/tests/Crypto/EncryptAllTest.php +++ b/apps/encryption/tests/Crypto/EncryptAllTest.php @@ -4,6 +4,9 @@ * * @author Björn Schießle * @author Joas Schilling + * @author Kenneth Newwood + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index 42da71b0eb1..3e47b4b0750 100644 --- a/apps/encryption/tests/Crypto/EncryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -2,8 +2,11 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Joas Schilling + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/HookManagerTest.php b/apps/encryption/tests/HookManagerTest.php index 109afb1ef8d..0b0c09bbf79 100644 --- a/apps/encryption/tests/HookManagerTest.php +++ b/apps/encryption/tests/HookManagerTest.php @@ -4,6 +4,8 @@ * * @author Clark Tomlinson * @author Joas Schilling + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php index f4c7a5ae0f7..f951ddb37f7 100644 --- a/apps/encryption/tests/Hooks/UserHooksTest.php +++ b/apps/encryption/tests/Hooks/UserHooksTest.php @@ -2,9 +2,12 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Joas Schilling + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php index 721b7f53a0c..7af9e39e95d 100644 --- a/apps/encryption/tests/KeyManagerTest.php +++ b/apps/encryption/tests/KeyManagerTest.php @@ -2,11 +2,15 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Joas Schilling * @author Lukas Reschke + * @author Morris Jobke + * @author Roeland Jago Douma * @author Thomas Müller + * @author Vincent Petry * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/MigrationTest.php b/apps/encryption/tests/MigrationTest.php index 71d2f52dd5c..3854a821809 100644 --- a/apps/encryption/tests/MigrationTest.php +++ b/apps/encryption/tests/MigrationTest.php @@ -4,6 +4,7 @@ * * @author Björn Schießle * @author Joas Schilling + * @author Morris Jobke * @author Robin Appelman * @author Roeland Jago Douma * diff --git a/apps/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php index 2dda774565c..b83b71737f3 100644 --- a/apps/encryption/tests/RecoveryTest.php +++ b/apps/encryption/tests/RecoveryTest.php @@ -6,6 +6,8 @@ * @author Clark Tomlinson * @author Joas Schilling * @author Lukas Reschke + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php index 3000fedf2c3..7bced196793 100644 --- a/apps/encryption/tests/SessionTest.php +++ b/apps/encryption/tests/SessionTest.php @@ -2,9 +2,11 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/encryption/tests/Settings/AdminTest.php b/apps/encryption/tests/Settings/AdminTest.php index 5fe3fe956e4..9afc024dfc8 100644 --- a/apps/encryption/tests/Settings/AdminTest.php +++ b/apps/encryption/tests/Settings/AdminTest.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2016 Lukas Reschke * * @author Lukas Reschke + * @author Morris Jobke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php index 27866ef3927..f61969039a8 100644 --- a/apps/encryption/tests/Users/SetupTest.php +++ b/apps/encryption/tests/Users/SetupTest.php @@ -5,6 +5,8 @@ * @author Björn Schießle * @author Clark Tomlinson * @author Joas Schilling + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * diff --git a/apps/encryption/tests/UtilTest.php b/apps/encryption/tests/UtilTest.php index e59565d3b84..1777d1f8f1f 100644 --- a/apps/encryption/tests/UtilTest.php +++ b/apps/encryption/tests/UtilTest.php @@ -2,9 +2,12 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Bjoern Schiessle * @author Björn Schießle * @author Clark Tomlinson * @author Joas Schilling + * @author Morris Jobke + * @author Roeland Jago Douma * * @license AGPL-3.0 * -- cgit v1.2.3