Skip to content

Commit d28d7c4

Browse files
MorrisJobkeMorrisJobke
committed
Merge pull request #15441 from owncloud/fix-file-headers-master
fixing license headers - encryption code related
2 parents 1fbf5d8 + a448324 commit d28d7c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+461
-314
lines changed

‎apps/encryption/appinfo/app.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/19/15, 9:52 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
57
* @copyright Copyright (c) 2015, ownCloud, Inc.
68
* @license AGPL-3.0
79
*

‎apps/encryption/appinfo/application.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 3/11/15, 11:03 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
57
* @copyright Copyright (c) 2015, ownCloud, Inc.
68
* @license AGPL-3.0
79
*

‎apps/encryption/appinfo/routes.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/19/15, 11:22 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
*
56
* @copyright Copyright (c) 2015, ownCloud, Inc.
67
* @license AGPL-3.0
78
*

‎apps/encryption/controller/recoverycontroller.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/19/15, 11:25 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
*
56
* @copyright Copyright (c) 2015, ownCloud, Inc.
67
* @license AGPL-3.0
78
*

‎apps/encryption/hooks/contracts/ihook.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <clark@owncloud.com>
4-
* @since 2/19/15, 10:03 AM
3+
* @author Clark Tomlinson <fallen013@gmail.com>
4+
*
55
* @copyright Copyright (c) 2015, ownCloud, Inc.
66
* @license AGPL-3.0
77
*

‎apps/encryption/hooks/userhooks.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/19/15, 10:02 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
57
* @copyright Copyright (c) 2015, ownCloud, Inc.
68
* @license AGPL-3.0
79
*

‎apps/encryption/lib/crypto/crypt.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/19/15, 1:42 PM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
57
* @copyright Copyright (c) 2015, ownCloud, Inc.
68
* @license AGPL-3.0
79
*

‎apps/encryption/lib/crypto/encryption.php

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 3/6/15, 2:28 PM
5-
* @link http:/www.clarkt.com
6-
* @copyright Clark Tomlinson © 2015
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
7+
* @copyright Copyright (c) 2015, ownCloud, Inc.
8+
* @license AGPL-3.0
9+
*
10+
* This code is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU Affero General Public License, version 3,
12+
* as published by the Free Software Foundation.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License, version 3,
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>
721
*
822
*/
923

‎apps/encryption/lib/exceptions/multikeydecryptexception.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
<?php
2-
2+
/**
3+
* @author Thomas Müller <[email protected]>
4+
*
5+
* @copyright Copyright (c) 2015, ownCloud, Inc.
6+
* @license AGPL-3.0
7+
*
8+
* This code is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU Affero General Public License, version 3,
10+
* as published by the Free Software Foundation.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU Affero General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Affero General Public License, version 3,
18+
* along with this program. If not, see <http://www.gnu.org/licenses/>
19+
*
20+
*/
321
namespace OCA\Encryption\Exceptions;
422

523
use OCP\Encryption\Exceptions\GenericEncryptionException;

‎apps/encryption/lib/exceptions/multikeyencryptexception.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
<?php
2-
2+
/**
3+
* @author Thomas Müller <[email protected]>
4+
*
5+
* @copyright Copyright (c) 2015, ownCloud, Inc.
6+
* @license AGPL-3.0
7+
*
8+
* This code is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU Affero General Public License, version 3,
10+
* as published by the Free Software Foundation.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU Affero General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Affero General Public License, version 3,
18+
* along with this program. If not, see <http://www.gnu.org/licenses/>
19+
*
20+
*/
321
namespace OCA\Encryption\Exceptions;
422

523
use OCP\Encryption\Exceptions\GenericEncryptionException;

‎apps/encryption/lib/exceptions/privatekeymissingexception.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
2-
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/25/15, 9:39 AM
2+
/**
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
57
* @copyright Copyright (c) 2015, ownCloud, Inc.
68
* @license AGPL-3.0
79
*

‎apps/encryption/lib/exceptions/publickeymissingexception.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
<?php
2-
3-
2+
/**
3+
* @author Thomas Müller <[email protected]>
4+
*
5+
* @copyright Copyright (c) 2015, ownCloud, Inc.
6+
* @license AGPL-3.0
7+
*
8+
* This code is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU Affero General Public License, version 3,
10+
* as published by the Free Software Foundation.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU Affero General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Affero General Public License, version 3,
18+
* along with this program. If not, see <http://www.gnu.org/licenses/>
19+
*
20+
*/
421
namespace OCA\Encryption\Exceptions;
522

623
use OCP\Encryption\Exceptions\GenericEncryptionException;

‎apps/encryption/lib/hookmanager.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/19/15, 10:13 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
*
56
* @copyright Copyright (c) 2015, ownCloud, Inc.
67
* @license AGPL-3.0
78
*

‎apps/encryption/lib/keymanager.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
<?php
2-
2+
/**
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
7+
* @copyright Copyright (c) 2015, ownCloud, Inc.
8+
* @license AGPL-3.0
9+
*
10+
* This code is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU Affero General Public License, version 3,
12+
* as published by the Free Software Foundation.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License, version 3,
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>
21+
*
22+
*/
323
namespace OCA\Encryption;
424

525
use OC\Encryption\Exceptions\DecryptionFailedException;

‎apps/encryption/lib/recovery.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 2/19/15, 11:45 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
*
56
* @copyright Copyright (c) 2015, ownCloud, Inc.
67
* @license AGPL-3.0
78
*

‎apps/encryption/lib/session.php

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
<?php
2-
32
/**
4-
* ownCloud
5-
*
6-
* @copyright (C) 2015 ownCloud, Inc.
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
75
*
8-
* @author Bjoern Schiessle <[email protected]>
6+
* @copyright Copyright (c) 2015, ownCloud, Inc.
7+
* @license AGPL-3.0
98
*
10-
* This library is free software; you can redistribute it and/or
11-
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
12-
* License as published by the Free Software Foundation; either
13-
* version 3 of the License, or any later version.
9+
* This code is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU Affero General Public License, version 3,
11+
* as published by the Free Software Foundation.
1412
*
15-
* This library is distributed in the hope that it will be useful,
13+
* This program is distributed in the hope that it will be useful,
1614
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18-
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU Affero General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU Affero General Public License, version 3,
19+
* along with this program. If not, see <http://www.gnu.org/licenses/>
1920
*
20-
* You should have received a copy of the GNU Affero General Public
21-
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
2221
*/
2322

2423
namespace OCA\Encryption;

‎apps/encryption/lib/users/setup.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 3/6/15, 11:36 AM
5-
* @link http:/www.clarkt.com
6-
* @copyright Clark Tomlinson © 2015
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
*
6+
* @copyright Copyright (c) 2015, ownCloud, Inc.
7+
* @license AGPL-3.0
8+
*
9+
* This code is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU Affero General Public License, version 3,
11+
* as published by the Free Software Foundation.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU Affero General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU Affero General Public License, version 3,
19+
* along with this program. If not, see <http://www.gnu.org/licenses/>
720
*
821
*/
922

‎apps/encryption/lib/util.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <[email protected]>
4-
* @since 3/17/15, 10:31 AM
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
*
56
* @copyright Copyright (c) 2015, ownCloud, Inc.
67
* @license AGPL-3.0
78
*

‎apps/encryption/settings/settings-admin.php

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
<?php
22
/**
3-
* Copyright (c) 2015 Clark Tomlinson <[email protected]>
4-
* This file is licensed under the Affero General Public License version 3 or
5-
* later.
6-
* See the COPYING-README file.
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
7+
* @copyright Copyright (c) 2015, ownCloud, Inc.
8+
* @license AGPL-3.0
9+
*
10+
* This code is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU Affero General Public License, version 3,
12+
* as published by the Free Software Foundation.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License, version 3,
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>
21+
*
722
*/
823

924
\OC_Util::checkAdminUser();

‎apps/encryption/settings/settings-personal.php

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
<?php
22
/**
3-
* Copyright (c) 2015 Clark Tomlinson <[email protected]>
4-
* This file is licensed under the Affero General Public License version 3 or
5-
* later.
6-
* See the COPYING-README file.
3+
* @author Björn Schießle <[email protected]>
4+
* @author Clark Tomlinson <[email protected]>
5+
* @author Thomas Müller <[email protected]>
6+
*
7+
* @copyright Copyright (c) 2015, ownCloud, Inc.
8+
* @license AGPL-3.0
9+
*
10+
* This code is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU Affero General Public License, version 3,
12+
* as published by the Free Software Foundation.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License, version 3,
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>
21+
*
722
*/
823

924
$session = new \OCA\Encryption\Session(\OC::$server->getSession());

‎apps/encryption/tests/lib/HookManagerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* @author Clark Tomlinson <clark@owncloud.com>
4-
* @since 3/31/15, 1:54 PM
3+
* @author Clark Tomlinson <fallen013@gmail.com>
4+
*
55
* @copyright Copyright (c) 2015, ownCloud, Inc.
66
* @license AGPL-3.0
77
*

0 commit comments

Comments
 (0)