mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6926 from nextcloud/license-remove-invalid-mail 

Remove invalid mail addresses when updating the license header
This commit is contained in:
Morris Jobke 2017-11-07 13:49:00 +01:00 committed by GitHub
parent 44f9779f9f 4866314ce0
commit aa789989bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -100,6 +100,7 @@ derkostka <sebastian.kostka@gmail.com>
Diederik de Haas <diederik@cknow.org>
Dominik Schmidt <dev@dominik-schmidt.de>
Donald Buczek <buczek@molgen.mpg.de>
Donquixote <marjunebatac@gmail.com> Donquixote <marjunebatac@gmailcom>
Doug Neiner <doug@pixelgraphics.us>
drarko <drarko@users.noreply.github.com>
dratini0 <dratini0@gmail.com>

12
AUTHORS
View File

@ -4,7 +4,7 @@ Nextcloud is written by:
- Aaron Wood <aaronjwood@gmail.com>
- Achim Königs <garfonso@tratschtante.de>
- Adam Williamson <awilliam@redhat.com>
- Administrator <Administrator@WINDOWS-2012>
- Administrator "Administrator@WINDOWS-2012"
- Aldo "xoen" Giambelluca <xoen@xoen.org>
- Alex Weirig <alex.weirig@technolink.lu>
- Alexander Bergolth <leo@strike.wu.ac.at>
@ -41,7 +41,7 @@ Nextcloud is written by:
- Christian Jürges <christian@eqipe.ch>
- Christian Kampka <christian@kampka.net>
- Christian Weiske <cweiske@cweiske.de>
- Christoph Schaefer <christophł@wolkesicher.de>
- Christoph Schaefer "christophł@wolkesicher.de"
- Christoph Wickert <cwickert@suse.de>
- Christoph Wurst <christoph@owncloud.com>
- Christopher Bartz <bartz@dkrz.de>
@ -60,7 +60,7 @@ Nextcloud is written by:
- David Toledo <dtoledo@solidgear.es>
- Derek <derek.kelly27@gmail.com>
- Dominik Schmidt <dev@dominik-schmidt.de>
- Donquixote <marjunebatac@gmailcom>
- Donquixote <marjunebatac@gmail.com>
- Fabian Henze <flyser42@gmx.de>
- Fabrizio Steiner <fabrizio.steiner@gmail.com>
- Felix A. Epp <work@felixepp.de>
@ -279,8 +279,8 @@ Nextcloud is written by:
- oparoz <owncloud@interfasys.ch>
- phisch <git@philippschaffrath.de>
- rakekniven <mark.ziegler@rakekniven.de>
- root "root@oc.(none)"
- root <root@localhost.localdomain>
- root <root@oc.(none)>
- scambra <sergio@entrecables.com>
- scolebrook <scolebrook@mac.com>
- shkdee <louis.traynard@m4x.org>
@ -289,8 +289,8 @@ Nextcloud is written by:
- tbelau666 <thomas.belau@gmx.de>
- tux-rampage <tux-rampage@users.noreply.github.com>
- v1r0x <vinzenz.rosenkranz@gmail.com>
- vkuimov <vkuimov@nextcloud>
- voxsim <Simon Vocella>
- vkuimov "vkuimov@nextcloud"
- voxsim "Simon Vocella"
With help from many libraries and frameworks including:
Open Collaboration Services

9
build/license.php
View File

@ -322,6 +322,7 @@ With help from many libraries and frameworks including:
}
$authors = array_map(function($author){
$author = $this->fixInvalidEmail($author);
$this->authors[$author] = $author;
return " * @author $author";
}, $authors);
@ -348,6 +349,14 @@ With help from many libraries and frameworks including:
}
return $author;
}
private function fixInvalidEmail($author) {
preg_match('/<(.*)>/', $author, $mailMatch);
if (count($mailMatch) === 2 && !filter_var($mailMatch[1], FILTER_VALIDATE_EMAIL)) {
$author = str_replace('<'.$mailMatch[1].'>', '"'.$mailMatch[1].'"', $author);
}
return $author;
}
}
$licenses = new Licenses;

2
lib/private/App/AppManager.php
View File

@ -4,7 +4,7 @@
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Christoph Schaefer <christophł@wolkesicher.de>
* @author Christoph Schaefer "christophł@wolkesicher.de"
* @author Christoph Wurst <christoph@owncloud.com>
* @author Joas Schilling <coding@schilljs.com>
* @author Julius Haertl <jus@bitgrid.net>

2
lib/private/Files/Storage/DAV.php
View File

@ -13,7 +13,7 @@
* @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
* @author vkuimov <vkuimov@nextcloud>
* @author vkuimov "vkuimov@nextcloud"
*
* @license AGPL-3.0
*

2
lib/private/Group/Manager.php
View File

@ -18,7 +18,7 @@
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
* @author Vinicius Cubas Brand <vinicius@eita.org.br>
* @author voxsim <Simon Vocella>
* @author voxsim "Simon Vocella"
*
* @license AGPL-3.0
*

2
lib/private/Installer.php
View File

@ -13,7 +13,7 @@
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <robin@icewind.nl>
* @author root <root@oc.(none)>
* @author root "root@oc.(none)"
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Thomas Tanghus <thomas@tanghus.net>
*

2
lib/private/Setup.php
View File

@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Administrator <Administrator@WINDOWS-2012>
* @author Administrator "Administrator@WINDOWS-2012"
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bart Visscher <bartv@thisnet.nl>
* @author Bernhard Posselt <dev@bernhard-posselt.com>

2
lib/public/AppFramework/Controller.php
View File

@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @author Donquixote <marjunebatac@gmailcom>
* @author Donquixote <marjunebatac@gmail.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>

2
lib/public/AppFramework/OCSController.php
View File

@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @author Donquixote <marjunebatac@gmailcom>
* @author Donquixote <marjunebatac@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Stefan Weil <sw@weilnetz.de>