From 96c2b0de6617b674a81d60dcbdcf875ccfc89c7b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 01:32:59 +0200 Subject: [PATCH 01/41] Use proper certificates Ports https://github.com/nextcloud/server/commit/bcf693539be82e872ba4d6cceb1f430a4bb841d9 --- lib/private/IntegrityCheck/Checker.php | 11 ++- resources/codesigning/core.crt | 49 ++++++------ resources/codesigning/root.crt | 104 ++++++++++--------------- 3 files changed, 77 insertions(+), 87 deletions(-) diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index 57127f280c4f9..2af402196ae84 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -323,13 +323,20 @@ private function verify($signaturePath, $basePath, $certificateCN) { $signature = base64_decode($signatureData['signature']); $certificate = $signatureData['certificate']; - // Check if certificate is signed by ownCloud Root Authority + // Check if certificate is signed by Nextcloud Root Authority $x509 = new \phpseclib\File\X509(); $rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt'); $x509->loadCA($rootCertificatePublicKey); $x509->loadX509($certificate); if(!$x509->validateSignature()) { - throw new InvalidSignatureException('Certificate is not valid.'); + // FIXME: Once Nextcloud has it's own appstore we should remove the ownCloud Root Authority from here + $x509 = new \phpseclib\File\X509(); + $rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/owncloud.crt'); + $x509->loadCA($rootCertificatePublicKey); + $x509->loadX509($certificate); + if(!$x509->validateSignature()) { + throw new InvalidSignatureException('Certificate is not valid.'); + } } // Verify if certificate has proper CN. "core" CN is always trusted. if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') { diff --git a/resources/codesigning/core.crt b/resources/codesigning/core.crt index 62f87c9d30c5e..f20533c717691 100644 --- a/resources/codesigning/core.crt +++ b/resources/codesigning/core.crt @@ -1,24 +1,27 @@ -----BEGIN CERTIFICATE----- -MIID8TCCAdkCAhAAMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD -VQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93 -bkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE2 -MDIwMzE3NTE0OVoXDTI2MDEzMTE3NTE0OVowDzENMAsGA1UEAwwEY29yZTCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPHdSljnHI+ueQd27UyWPO9n4Lqt -bK0kdekiC3si7Mee7uXXJaGuqXJozHEZYB1LIFLdCU/itCxEk9hyLcyNzeT+nRT/ -zDuOYdbLgCj7/A5bX+u3jc29UlCYybSFchfMdvn7a0njCna4dE+73b4yEj16tS2h -S1EUygSzgicWlJqMD3Z9Qc+zLEpdhq9oDdDB8HURi2NW4KzIraVncSH+zF1QduOh -nERDnF8x48D3FLdTxGA0W/Kg4gYsq4NRvU6g3DJNdp4YfqRSFMmLFDCgzDuhan7D -wgRlI9NAeHbnyoUPtrDBUceI7shIbC/i87xk9ptqV0AyFonkJtK6lWwZjNkCAwEA -ATANBgkqhkiG9w0BAQsFAAOCAgEAAMgymqZE1YaHYlRGwvTE7gGDY3gmFOMaxQL4 -E5m0CnkBz4BdIPRsQFFdOv3l/MIWkw5ED3vUB925VpQZYFSiEuv5NbnlPaHZlIMI -n8AV/sTP5jue3LhtAN4EM63xNBhudAT6wVsvGwOuQOx9Xv+ptO8Po7sTuNYP0CMH -EOQN+/q8tYlSm2VW+dAlaJ+zVZwZldhVjL+lSH4E9ktWn3PmgNQeKfcnJISUbus6 -ZtsYDF/X96/Z2ZQvMXOKksgvU6XlvIxllcyebC9Bxe/h0D63GCO2tqN5CWQzIIqn -apUynPX8BlLaaExqYGERwlUi/yOGaUVPUjEPVehviOQYgAqxlrkJk1dWeCrwUori -CXpi+IUYkidfgiJ9F88M3ElpwqIaXp7G3/4oHBuE2u6M+L+1/vqPJeTCAWUxxpJE -yYmM+db6D4TySFpQPENNzPS8bpR6T8w2hRumkldC42HrnyJJbpjOieTXhXzjdPvZ -IEP9JGtkhB2du6nBF2MNAq2TqRXpcfQrQEbnQ13aV9bl+roTwwO+SOWK/wgvdOMI -STQ0Xk0sTGlmQjPYPkibVceaWMR3sX4cNt5c33YhJys5jxHoAh42km4nN9tfykR5 -crl5lBlKjXh2GP0+omSO3x1jX4+iQPCW2TWoyKkUdLu/hGHG2w8RrTeme+kATECH -YSu356M= ------END CERTIFICATE----- +MIIEojCCA4qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCREUx +GzAZBgNVBAgMEkJhZGVuLVd1ZXJ0dGVtYmVyZzEXMBUGA1UECgwOTmV4dGNsb3Vk +IEdtYkgxNjA0BgNVBAMMLU5leHRjbG91ZCBDb2RlIFNpZ25pbmcgSW50ZXJtZWRp +YXRlIEF1dGhvcml0eTAeFw0xNjA2MTIyMTA1MDZaFw00MTA2MDYyMTA1MDZaMGYx +CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNV +BAcMCVN0dXR0Z2FydDEXMBUGA1UECgwOTmV4dGNsb3VkIEdtYkgxDTALBgNVBAMM +BGNvcmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUxcrn2DC892IX +8+dJjZVh9YeHF65n2ha886oeAizOuHBdWBfzqt+GoUYTOjqZF93HZMcwy0P+xyCf +Qqak5Ke9dybN06RXUuGP45k9UYBp03qzlUzCDalrkj+Jd30LqcSC1sjRTsfuhc+u +vH1IBuBnf7SMUJUcoEffbmmpAPlEcLHxlUGlGnz0q1e8UFzjbEFj3JucMO4ys35F +qZS4dhvCngQhRW3DaMlQLXEUL9k3kFV+BzlkPzVZEtSmk4HJujFCnZj1vMcjQBg/ +Bqq1HCmUB6tulnGcxUzt/Z/oSIgnuGyENeke077W3EyryINL7EIyD4Xp7sxLizTM +FCFCjjH1AgMBAAGjggFDMIIBPzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIG +QDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRp +ZmljYXRlMB0GA1UdDgQWBBQwc1H9AL8pRlW2e5SLCfPPqtqc0DCBpQYDVR0jBIGd +MIGagBRt6m6qqTcsPIktFz79Ru7DnnjtdKF+pHwwejELMAkGA1UEBhMCREUxGzAZ +BgNVBAgMEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBwwJU3R1dHRnYXJ0MRcw +FQYDVQQKDA5OZXh0Y2xvdWQgR21iSDEhMB8GA1UEAwwYTmV4dGNsb3VkIFJvb3Qg +QXV0aG9yaXR5ggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUH +AwEwDQYJKoZIhvcNAQELBQADggEBADZ6+HV/+0NEH3nahTBFxO6nKyR/VWigACH0 +naV0ecTcoQwDjKDNNFr+4S1WlHdwITlnNabC7v9rZ/6QvbkrOTuO9fOR6azp1EwW +2pixWqj0Sb9/dSIVRpSq+jpBE6JAiX44dSR7zoBxRB8DgVO2Afy0s80xEpr5JAzb +NYuPS7M5UHdAv2dr16fDcDIvn+vk92KpNh1NTeZFjBbRVQ9DXrgkRGW34TK8uSLI +YG6jnfJ6eJgTaO431ywWPXNg1mUMaT/+QBOgB299QVCKQU+lcZWptQt+RdsJUm46 +NY/nARy4Oi4uOe88SuWITj9KhrFmEvrUlgM8FvoXA1ldrR7KiEg= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/resources/codesigning/root.crt b/resources/codesigning/root.crt index cbd82898bab74..bcc45e0188dd5 100644 --- a/resources/codesigning/root.crt +++ b/resources/codesigning/root.crt @@ -1,66 +1,46 @@ -----BEGIN CERTIFICATE----- -MIIFtDCCA5ygAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwZTELMAkGA1UEBhMCVVMx -DzANBgNVBAgMBkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQgSW5jLjEtMCsGA1UE -Awwkb3duQ2xvdWQgQ29kZSBTaWduaW5nIFJvb3QgQXV0aG9yaXR5MB4XDTE2MDIw -MzE3NDMyNVoXDTI2MDEzMTE3NDMyNVowbTELMAkGA1UEBhMCVVMxDzANBgNVBAgM -BkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQgSW5jLjE1MDMGA1UEAwwsb3duQ2xv -dWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBBdXRob3JpdHkwggIiMA0GCSqG -SIb3DQEBAQUAA4ICDwAwggIKAoICAQDKMul4pWev6vtgzB73CLQPMy8nDZGbvqII -IgukQluMeLCW0P09I+J/mCiDd99mQTtWO+/LcpOChHYJ59qQz+g9TzKlVSuFDg47 -pc+jUvTLGGEDf9cAWtzsXYXlb9z7sTln/8JAvy8ghmaR/4JWU4hM/nmgDCpeXLLJ -NFrxKDbzPLYj53iHN+XyE9GT6sDYoQd1BIWhTsMdvMqg870Jw2yN4hKw3V7/KoI/ -Z5CAA9dP4tAmltBpMz79dmLCciqXOD8mWEWl2tSZU+/WVyPxiE19IHoJETOhSg4c -eud4DDdFt9Ohm4owvpxxRDbvV+Ic6sWb1gJBrM7/XJDmaUObpowjx8Daof1MuoHs -FKh6/Y7RBdVlrp/ig3htxfm9BBMqnXIxgFWDiSbjCMk0Ygvx49gKMnVoRhZ/7pla -j5nTRdbhsjS50E9zfc53EltM27YSwNZu62QKsU4yumg8UOhOYPRLHcySvNyyMZXS -o+Kst27oGSgurHytFS7FVG1M3UUn67zkMpnnMYhfx8dz7+tupY9e0l0kDciwvNAO -YrnvHoEiIbJmoyYOhL2j9WErUhAb3JKTSdYC0MmjaZZPv0HwCemx+rnApcoszmFG -woZTRAa6Q64WGxlmFq0vsgmcTNsTzlYY20Kv+ZpZOiVYonyHFkorKWdsXKZQcnYq -dcMqYxQE6wIDAQABo2YwZDAdBgNVHQ4EFgQUfZoNPRneQ1pk9SZT9A2lpG4Hw7Mw -HwYDVR0jBBgwFoAUcZdiBiGr+Y+OH2DrlNwK03zWH+YwEgYDVR0TAQH/BAgwBgEB -/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAA2hoAEdbdM9 -+ZA/q7UppF4BiKrSQNAQHLDwodutRY+gBYQsWpo8wLqdLvRVhlwDn3KmJEMfaDQm -5YM+/snBkew9olCIyYw+t7xYtNhoW1et/nNNDL+Qq7uyH6g+uOMp4m3c+BMv4x5H -EP3z7PY1qrPOVvzZu8o2iL8qpC0sXTKZy+xG/9VTYGnxCcG+V/Ua5aHOyetUttoN -bxEcEQHHe07V+JlCPuI53hPsiGgzHv+nz/1sJV95mn9w88SHY0JO9bHp9w+mq92K -r0Nv6Wctf7vNVmIOdRFHWOFie4+D3TpBSnB5PPQRbtf6IVEhjmcnWYBWcRGhH6cR -4dqpuqzwVFopIFLYMeaeKGu8wZHi2YRrkFcrnqqmFI9RtBbt3eyfUQcKH7b9P4Ri -qamb/h9sVjDM4wSQ6n+Qa2dgV28O0il35roa3qwvqySgn1wXS5CsAaeB1VWAS6/S -v1WFt93n9LrraV4EUuu1BGXp525aVn6v+B71zN4JzYnHVE4yAb0EdOpKrlfmCCm/ -9Z90+BF2uK3QnpkyrH+LEOQoHrlAt80RZYd2Tl/K1WWNrPUlnCGXdxjVYakVRnfy -Ud0KV4RsD93mNw/t2gU5U+SyYWU2fTJUE9qdJ4Ndw7B2DZ/5dcsu0rDV4sXkUoDY -+Dr25NoOcuqjCWRw2T3SBPSXBxjlhRTQ +MIID1zCCAr+gAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCREUx +GzAZBgNVBAgMEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBwwJU3R1dHRnYXJ0 +MRcwFQYDVQQKDA5OZXh0Y2xvdWQgR21iSDEhMB8GA1UEAwwYTmV4dGNsb3VkIFJv +b3QgQXV0aG9yaXR5MB4XDTE2MDYxMjIxMDEwMloXDTQxMDYwNjIxMDEwMlowezEL +MAkGA1UEBhMCREUxGzAZBgNVBAgMEkJhZGVuLVd1ZXJ0dGVtYmVyZzEXMBUGA1UE +CgwOTmV4dGNsb3VkIEdtYkgxNjA0BgNVBAMMLU5leHRjbG91ZCBDb2RlIFNpZ25p +bmcgSW50ZXJtZWRpYXRlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAJzBOypRqAhXeTB3XawW7UzwCxoovpMa0bP8fPzjeMMdCdPlZIYX +MshGHoQ4/VJyODOaq3H1AYRh20Kn/BKNAuVfRzcmY/7M5R09b0ts06l9tIVSbBeK +5krETjZtpt4crgukzQ6+8QhHE2DBdvPE7rds6EyBaiMRPNuGP1YrtGPQ+hYvajJL +yH3mq609ZZYFVOK9FuSxw5e5YBFp9Z6dNeFjnmEsYytWOhaJ+zPfQaL9JjLwxEM+ +BJ1kpf/zblzL6FwUOeXP2+UJ5TAU4xh+9WsvFBR0b6iq77eYTl3eFM1QtaweCA23 +OmZZZahCNLmcPA2iMyPZDGZ1mSW+h7+pMJkCAwEAAaNmMGQwHQYDVR0OBBYEFG3q +bqqpNyw8iS0XPv1G7sOeeO10MB8GA1UdIwQYMBaAFAQYAjwHzNjhemMwKilLlT4T +vZHIMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3 +DQEBCwUAA4IBAQCWnDNA14Q+bw7X0S+riMjyTabtgF443eAQIvby9sU2cHtd7qua +p/311+H7gB4F/CE+/CUxdtC5AgaW4vWRL8ge9+6jhYUjvmqdyV5wbBFrLmnqYS4h +PnNWo5cjA7apA6SrIxnJAF8vNCeyEQgHD57VeIlK35S0GpqcouuCSQvCeSjKcojx +6t/NGHcetWucHAUymzOk11NMyYyEMJ/tfUwn3drqkb4jp4Tqu4ftZt/uioDX8Gc9 +Aw+IaEHKfNnh9R//Vqc06Bad04ycI6jK4cVUpC/6I6tzoY6GXwZRbESkKUyLitlX +3EnBONP0UzEZmCilIwYYfevWGT+NWnpkmey7 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFsDCCA5igAwIBAgIJALFuk51OGp2KMA0GCSqGSIb3DQEBCwUAMGUxCzAJBgNV -BAYTAlVTMQ8wDQYDVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4x -LTArBgNVBAMMJG93bkNsb3VkIENvZGUgU2lnbmluZyBSb290IEF1dGhvcml0eTAe -Fw0xNjAyMDMxNzM5NThaFw0yNjAxMzExNzM5NThaMGUxCzAJBgNVBAYTAlVTMQ8w -DQYDVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xLTArBgNVBAMM -JG93bkNsb3VkIENvZGUgU2lnbmluZyBSb290IEF1dGhvcml0eTCCAiIwDQYJKoZI -hvcNAQEBBQADggIPADCCAgoCggIBAJmTnGtGaB0cDtQPxWr2r5FyXFzJ6GIkm4Lb -7iY/DYpIEarbRFwqDCDZ00V+PWsTBBF6qXW5W7eZ+fOOdIEGoNaDuGtIlGVjj3Dz -TZtmcFg0euimfLNYVvYZlPPh4kS3zDRZs30AgAdgq4RHWC4qjElWcVKTwERNQ2ln -gRFRQEv+i2DI7sEK9ZpK7B1SfJ1o1fm/kPL7bVfiYda+QKp0vOxBecDnGV+rfz4t -DT6mBOgwAiZnwojuiigfUJxSisv3roWri+0O+0TiXglV+oUtkIRrs0etkQGWAlgn -H4CC+sZ5N2TiGPH1hksLkXP4mymlio8/x7ax0WfcxeTZu3ok9eK5fwIQVWam6dd9 -klCqZVttKodZYspvdFfwqMlf4lPEIY+r2PIdGjUhKu4FsDhORaGj8WMYRJUR44ls -/r2ktCB/TOsh8DW2Pi9HAgxI4mrdmvL0WMSOBFZRcSC/nTz977oi1iiB2T+s7V0Z -Y0AHMQYiIn83MFB7rb+mVlEoLID/evVSTfUaUaO8DqcfeQN/OFM/zcJY9YHv8AlJ -3b8CPdeX9edMnyZWNdrhOSawjAbOBIna3o66RXdeC3oWg7FuckJmy7JLtRCJ2Owu -losRAxe0z5mQmjFzMczxCYJQ4A+4U5UZwbd/MQJg508StcOumroYqruDic/Wbc3C -v6DupG8dAgMBAAGjYzBhMB0GA1UdDgQWBBRxl2IGIav5j44fYOuU3ArTfNYf5jAf -BgNVHSMEGDAWgBRxl2IGIav5j44fYOuU3ArTfNYf5jAPBgNVHRMBAf8EBTADAQH/ -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAR6IZBOBw3KzRxvUP -+46RZYayMrdLyAgMzbDvQe7WCaeuA2UoPVL8jN7X2Lvw12Mz84+EKs1voR0OBxlY -6muuyl0SETa2k4UtklVscMvcokG+m5aVNJ7/HHGFmKsTyJDMxSzDA/r3KRPXZOwV -CLUVTkr5fQbIaVljA89U2p3pN/X7gNq89xi/XiszNCEIvvSscRmBGlRmx4XbjXHK -XKO74+HiM/ahqUI792ae97jlsy9jG4OIelse3+e1KBWNsGtU90asnUHgyMXVL8gp -ocznGvWceAhkcogUCUCXq1Rh/mKcGQdi2z0g/X+MGzfA9Ij4NQZLnNPh2UjgxCtG -KWPUzs0t/xoCtJh1WpwqTrOUcYqFAaBa282sD/O8tX4t076aGKdbhfo6tvaOFwDU -iRPgdMol++BFnfCld53Yivg2+S6+xo1wzuPkNjVFXHjx9vMyiov/HHKqJoBsuCwU -7VegzM/6Cvh32lSZfUHsfynCab/7vv923KyaANWxb0QsHZSSt+mmOK3ZmC96vCEa -55IGNckOvOGW9yCIz3Q0kEj2hoJs1bw0SkwGWs7N1TkugQjM/S7/Im1LJUxdtqQK -Zjn+8U6U3TR1aKLYEdqHCGcVoRXKDG/S40FHxyeV/9buTI7SSvhzZfj+qasmJe1L -Kd08UdS/im8RwbVSS1mih5hbAHg= +MIID2jCCAsKgAwIBAgIJAKCc9xL4epmrMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV +BAYTAkRFMRswGQYDVQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcMCVN0 +dXR0Z2FydDEXMBUGA1UECgwOTmV4dGNsb3VkIEdtYkgxITAfBgNVBAMMGE5leHRj +bG91ZCBSb290IEF1dGhvcml0eTAeFw0xNjA2MTIyMDU4MzVaFw00MTA2MDYyMDU4 +MzVaMHoxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJCYWRlbi1XdWVydHRlbWJlcmcx +EjAQBgNVBAcMCVN0dXR0Z2FydDEXMBUGA1UECgwOTmV4dGNsb3VkIEdtYkgxITAf +BgNVBAMMGE5leHRjbG91ZCBSb290IEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAJuTxu0LpRExcpYJwMxc5N+YbEe7WVPIsLtKUNCXMfkc +aPlTpVydNi5zKQDpLQuHm5RE9u+L3sTck8yVj8DkgX9QfuRTbvg01paV+5ILY7Qn +47E8eHq6tf6MF0W20OxNRjcUCEoRA59AZV9FxkVGHniBx17Upk0BQXlZHViHZ9Ey +2Zhsw9ZetT0VCv9UGuN0Rr6T6fzgW84HoDWsesG7UwEpnct/hQf20w/iIhZspew7 +RAHJZTOYnNSaBUnyiCf58SaOyxvmdfseItjMuE1FBR6bTWkLQ/a/1xH2FCk0izm5 +1foZF0Ya0fAzVHwBkOVZeIuswjvuqgp/TkB6W0i73aUCAwEAAaNjMGEwHQYDVR0O +BBYEFAQYAjwHzNjhemMwKilLlT4TvZHIMB8GA1UdIwQYMBaAFAQYAjwHzNjhemMw +KilLlT4TvZHIMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqG +SIb3DQEBCwUAA4IBAQCBv40RAXMtMah61q6wYATw4q4cvIKLjKoyApHPHZhQnWwe +VLv/D2a26A8VwDNQ1LGv4NzzIDcpWz+pk+rXMNnyjXwr0AtKM2Vg07yKqkZB9J1c +duYm0j8FLdCHXIjRucgMA/wiwR4mB9PVGtQfCvUQl2Hfkiagkw31llGCXugQPsnh +vhfMWxkdVFAnzDoATWe2SDuuyyd5Sl4/LKn8HEysusaYCMpPDP+seZGjA0ukZ3F+ +pO0PlAEb3OypRavz8iR8s+VbE0wdAX1mPByx8SU8Wkq76p4G261PvTrfYKnreU8z +b47G5k8BAiPCtNze/Ihul6lpLK6yk+FRXcZCl1sg -----END CERTIFICATE----- \ No newline at end of file From fb006181adfbac78ed227324b13546099290949a Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 01:34:35 +0200 Subject: [PATCH 02/41] Add ownCloud cert --- resources/codesigning/owncloud.crt | 66 ++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 resources/codesigning/owncloud.crt diff --git a/resources/codesigning/owncloud.crt b/resources/codesigning/owncloud.crt new file mode 100644 index 0000000000000..cbd82898bab74 --- /dev/null +++ b/resources/codesigning/owncloud.crt @@ -0,0 +1,66 @@ +-----BEGIN CERTIFICATE----- +MIIFtDCCA5ygAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwZTELMAkGA1UEBhMCVVMx +DzANBgNVBAgMBkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQgSW5jLjEtMCsGA1UE +Awwkb3duQ2xvdWQgQ29kZSBTaWduaW5nIFJvb3QgQXV0aG9yaXR5MB4XDTE2MDIw +MzE3NDMyNVoXDTI2MDEzMTE3NDMyNVowbTELMAkGA1UEBhMCVVMxDzANBgNVBAgM +BkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQgSW5jLjE1MDMGA1UEAwwsb3duQ2xv +dWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBBdXRob3JpdHkwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQDKMul4pWev6vtgzB73CLQPMy8nDZGbvqII +IgukQluMeLCW0P09I+J/mCiDd99mQTtWO+/LcpOChHYJ59qQz+g9TzKlVSuFDg47 +pc+jUvTLGGEDf9cAWtzsXYXlb9z7sTln/8JAvy8ghmaR/4JWU4hM/nmgDCpeXLLJ +NFrxKDbzPLYj53iHN+XyE9GT6sDYoQd1BIWhTsMdvMqg870Jw2yN4hKw3V7/KoI/ +Z5CAA9dP4tAmltBpMz79dmLCciqXOD8mWEWl2tSZU+/WVyPxiE19IHoJETOhSg4c +eud4DDdFt9Ohm4owvpxxRDbvV+Ic6sWb1gJBrM7/XJDmaUObpowjx8Daof1MuoHs +FKh6/Y7RBdVlrp/ig3htxfm9BBMqnXIxgFWDiSbjCMk0Ygvx49gKMnVoRhZ/7pla +j5nTRdbhsjS50E9zfc53EltM27YSwNZu62QKsU4yumg8UOhOYPRLHcySvNyyMZXS +o+Kst27oGSgurHytFS7FVG1M3UUn67zkMpnnMYhfx8dz7+tupY9e0l0kDciwvNAO +YrnvHoEiIbJmoyYOhL2j9WErUhAb3JKTSdYC0MmjaZZPv0HwCemx+rnApcoszmFG +woZTRAa6Q64WGxlmFq0vsgmcTNsTzlYY20Kv+ZpZOiVYonyHFkorKWdsXKZQcnYq +dcMqYxQE6wIDAQABo2YwZDAdBgNVHQ4EFgQUfZoNPRneQ1pk9SZT9A2lpG4Hw7Mw +HwYDVR0jBBgwFoAUcZdiBiGr+Y+OH2DrlNwK03zWH+YwEgYDVR0TAQH/BAgwBgEB +/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAA2hoAEdbdM9 ++ZA/q7UppF4BiKrSQNAQHLDwodutRY+gBYQsWpo8wLqdLvRVhlwDn3KmJEMfaDQm +5YM+/snBkew9olCIyYw+t7xYtNhoW1et/nNNDL+Qq7uyH6g+uOMp4m3c+BMv4x5H +EP3z7PY1qrPOVvzZu8o2iL8qpC0sXTKZy+xG/9VTYGnxCcG+V/Ua5aHOyetUttoN +bxEcEQHHe07V+JlCPuI53hPsiGgzHv+nz/1sJV95mn9w88SHY0JO9bHp9w+mq92K +r0Nv6Wctf7vNVmIOdRFHWOFie4+D3TpBSnB5PPQRbtf6IVEhjmcnWYBWcRGhH6cR +4dqpuqzwVFopIFLYMeaeKGu8wZHi2YRrkFcrnqqmFI9RtBbt3eyfUQcKH7b9P4Ri +qamb/h9sVjDM4wSQ6n+Qa2dgV28O0il35roa3qwvqySgn1wXS5CsAaeB1VWAS6/S +v1WFt93n9LrraV4EUuu1BGXp525aVn6v+B71zN4JzYnHVE4yAb0EdOpKrlfmCCm/ +9Z90+BF2uK3QnpkyrH+LEOQoHrlAt80RZYd2Tl/K1WWNrPUlnCGXdxjVYakVRnfy +Ud0KV4RsD93mNw/t2gU5U+SyYWU2fTJUE9qdJ4Ndw7B2DZ/5dcsu0rDV4sXkUoDY ++Dr25NoOcuqjCWRw2T3SBPSXBxjlhRTQ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFsDCCA5igAwIBAgIJALFuk51OGp2KMA0GCSqGSIb3DQEBCwUAMGUxCzAJBgNV +BAYTAlVTMQ8wDQYDVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4x +LTArBgNVBAMMJG93bkNsb3VkIENvZGUgU2lnbmluZyBSb290IEF1dGhvcml0eTAe +Fw0xNjAyMDMxNzM5NThaFw0yNjAxMzExNzM5NThaMGUxCzAJBgNVBAYTAlVTMQ8w +DQYDVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xLTArBgNVBAMM +JG93bkNsb3VkIENvZGUgU2lnbmluZyBSb290IEF1dGhvcml0eTCCAiIwDQYJKoZI +hvcNAQEBBQADggIPADCCAgoCggIBAJmTnGtGaB0cDtQPxWr2r5FyXFzJ6GIkm4Lb +7iY/DYpIEarbRFwqDCDZ00V+PWsTBBF6qXW5W7eZ+fOOdIEGoNaDuGtIlGVjj3Dz +TZtmcFg0euimfLNYVvYZlPPh4kS3zDRZs30AgAdgq4RHWC4qjElWcVKTwERNQ2ln +gRFRQEv+i2DI7sEK9ZpK7B1SfJ1o1fm/kPL7bVfiYda+QKp0vOxBecDnGV+rfz4t +DT6mBOgwAiZnwojuiigfUJxSisv3roWri+0O+0TiXglV+oUtkIRrs0etkQGWAlgn +H4CC+sZ5N2TiGPH1hksLkXP4mymlio8/x7ax0WfcxeTZu3ok9eK5fwIQVWam6dd9 +klCqZVttKodZYspvdFfwqMlf4lPEIY+r2PIdGjUhKu4FsDhORaGj8WMYRJUR44ls +/r2ktCB/TOsh8DW2Pi9HAgxI4mrdmvL0WMSOBFZRcSC/nTz977oi1iiB2T+s7V0Z +Y0AHMQYiIn83MFB7rb+mVlEoLID/evVSTfUaUaO8DqcfeQN/OFM/zcJY9YHv8AlJ +3b8CPdeX9edMnyZWNdrhOSawjAbOBIna3o66RXdeC3oWg7FuckJmy7JLtRCJ2Owu +losRAxe0z5mQmjFzMczxCYJQ4A+4U5UZwbd/MQJg508StcOumroYqruDic/Wbc3C +v6DupG8dAgMBAAGjYzBhMB0GA1UdDgQWBBRxl2IGIav5j44fYOuU3ArTfNYf5jAf +BgNVHSMEGDAWgBRxl2IGIav5j44fYOuU3ArTfNYf5jAPBgNVHRMBAf8EBTADAQH/ +MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAR6IZBOBw3KzRxvUP ++46RZYayMrdLyAgMzbDvQe7WCaeuA2UoPVL8jN7X2Lvw12Mz84+EKs1voR0OBxlY +6muuyl0SETa2k4UtklVscMvcokG+m5aVNJ7/HHGFmKsTyJDMxSzDA/r3KRPXZOwV +CLUVTkr5fQbIaVljA89U2p3pN/X7gNq89xi/XiszNCEIvvSscRmBGlRmx4XbjXHK +XKO74+HiM/ahqUI792ae97jlsy9jG4OIelse3+e1KBWNsGtU90asnUHgyMXVL8gp +ocznGvWceAhkcogUCUCXq1Rh/mKcGQdi2z0g/X+MGzfA9Ij4NQZLnNPh2UjgxCtG +KWPUzs0t/xoCtJh1WpwqTrOUcYqFAaBa282sD/O8tX4t076aGKdbhfo6tvaOFwDU +iRPgdMol++BFnfCld53Yivg2+S6+xo1wzuPkNjVFXHjx9vMyiov/HHKqJoBsuCwU +7VegzM/6Cvh32lSZfUHsfynCab/7vv923KyaANWxb0QsHZSSt+mmOK3ZmC96vCEa +55IGNckOvOGW9yCIz3Q0kEj2hoJs1bw0SkwGWs7N1TkugQjM/S7/Im1LJUxdtqQK +Zjn+8U6U3TR1aKLYEdqHCGcVoRXKDG/S40FHxyeV/9buTI7SSvhzZfj+qasmJe1L +Kd08UdS/im8RwbVSS1mih5hbAHg= +-----END CERTIFICATE----- \ No newline at end of file From d4f9a69a7239aff0948708d60e276c8370ed8f4e Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 01:46:11 +0200 Subject: [PATCH 03/41] Port 2d37341 to stable10 --- lib/private/IntegrityCheck/Checker.php | 13 +++++++++++++ .../Iterator/ExcludeFoldersByPathFilterIterator.php | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index 2af402196ae84..d087720c11ace 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -354,6 +354,19 @@ private function verify($signaturePath, $basePath, $certificateCN) { throw new InvalidSignatureException('Signature could not get verified.'); } + // Fixes for the updater as shipped with ownCloud 9.0.x: The updater is + // replaced after the code integrity check is performed. + // + // Due to this reason we exclude the whole updater/ folder from the code + // integrity check. + if($basePath === $this->environmentHelper->getServerRoot()) { + foreach($expectedHashes as $fileName => $hash) { + if(strpos($fileName, 'updater/') === 0) { + unset($expectedHashes[$fileName]); + } + } + } + // Compare the list of files which are not identical $currentInstanceHashes = $this->generateHashes($this->getFolderIterator($basePath), $basePath); $differencesA = array_diff($expectedHashes, $currentInstanceHashes); diff --git a/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php index c8db8022112a1..80a89e8c3a4b8 100644 --- a/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php +++ b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php @@ -40,6 +40,11 @@ public function __construct(\RecursiveIterator $iterator, $root = '') { rtrim($root . '/apps', '/'), rtrim($root . '/assets', '/'), rtrim($root . '/lost+found', '/'), + // Ignore folders generated by updater since the updater is replaced + // after the integrity check is run. + // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846 + rtrim($root . '/updater', '/'), + rtrim($root . '/_oc_upgrade', '/'), ]; $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', ''); if($customDataDir !== '') { From decfd1ab59ead5bba4215a68dedbcf5682409b70 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 01:56:47 +0200 Subject: [PATCH 04/41] Link to proper clients --- lib/private/legacy/defaults.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php index 3c64ec494c7e8..58aa4e1106193 100644 --- a/lib/private/legacy/defaults.php +++ b/lib/private/legacy/defaults.php @@ -49,16 +49,15 @@ class OC_Defaults { function __construct() { $this->l = \OC::$server->getL10N('lib'); - $version = \OCP\Util::getVersion(); $this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */ $this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */ $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */ $this->defaultBaseUrl = 'https://nextcloud.com'; $this->defaultSyncClientUrl = 'https://nextcloud.com/install'; - $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8'; - $this->defaultiTunesAppId = '543672169'; - $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android'; + $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'; + $this->defaultiTunesAppId = '1125420102'; + $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client'; $this->defaultDocBaseUrl = 'https://docs.nextcloud.org'; $this->defaultDocVersion = '10'; // used to generate doc links $this->defaultSlogan = $this->l->t('a safe home for all your data'); From 305534225ea67f3e7fe655bdc4a1aa39e465cd13 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 02:08:56 +0200 Subject: [PATCH 05/41] Revert "Remove "Help" link from personal sidebar" This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779. --- lib/private/legacy/app.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 37ceea35ac043..9753e2efd506a 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -421,9 +421,7 @@ public static function getSettingsNavigation() { $settings = array(); // by default, settings only contain the help menu - /* - * FIXME: Add help sidebar back once documentation is properly branded. - if (OC_Util::getEditionString() === '' && + if (OC_Util::getEditionString() === '' && \OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true ) { $settings = array( @@ -435,7 +433,7 @@ public static function getSettingsNavigation() { "icon" => $urlGenerator->imagePath("settings", "help.svg") ) ); - }*/ + } // if the user is logged-in if (OC_User::isLoggedIn()) { From ed219169996f9cc01a9aed82d8722fb97f3df3ca Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 02:10:28 +0200 Subject: [PATCH 06/41] Add proper links --- settings/templates/help.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/settings/templates/help.php b/settings/templates/help.php index 79584aba84d11..11726d60387f4 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -16,19 +16,19 @@
  • - + t('Online documentation')); ?> ↗
  • - + t('Forum')); ?> ↗
  • - t('Issue tracker')); ?> ↗ @@ -36,7 +36,7 @@
  • - + t('Commercial support')); ?> ↗
    • From 10f3178215113953b8c7111dbd7f5eb8487b6ea9 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 02:15:14 +0200 Subject: [PATCH 07/41] [master] Properly link to nextcloud --- settings/templates/apps.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 2edbf1530eba6..be8a911c1aa05 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -31,7 +31,7 @@
  • - t('Developer documentation'));?> ↗ + t('Developer documentation'));?> ↗
    • From 0caeb31d832b717232c52c02ea8fe834722b0df4 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 02:20:29 +0200 Subject: [PATCH 08/41] Use proper branding Stable9 has this already --- apps/federation/templates/settings-admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index e86d8beb75e71..70d051ad7d645 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -17,8 +17,8 @@

    t('Trusted Servers')); ?>

    - - + +

      From f98bc936d76d5f68e79bdebafdeea19845ae8a20 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 20 Jul 2016 18:34:32 +0200 Subject: [PATCH 09/41] move closing div to the right place --- apps/files_sharing/templates/public.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index f587b5109d41b..fe363ed82f521 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -106,6 +106,7 @@ +
      @@ -123,7 +124,6 @@
      -
      From 2abd83212e5702051ef0b131a088f1d7e303475f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 20 Jul 2016 21:30:39 +0200 Subject: [PATCH 10/41] AppFramework do not get default response The OCSResponse differs from other responses in that it defaults to XML. However we fell back to json by default. This makes sure that if nothing is set we don't pass anything. Which defaults then to the controllers default (which is often 'json') but in the case of the OCSResponse 'xml'. --- lib/private/AppFramework/Http/Dispatcher.php | 8 ++++++-- .../AppFramework/Middleware/OCSMiddleware.php | 2 +- lib/public/AppFramework/Controller.php | 7 ++++--- lib/public/AppFramework/OCSController.php | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index fdf99a578418e..965d340fc776b 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -167,10 +167,14 @@ private function executeController($controller, $methodName) { // if none is given try the first Accept header if($format === null) { $headers = $this->request->getHeader('Accept'); - $format = $controller->getResponderByHTTPHeader($headers); + $format = $controller->getResponderByHTTPHeader($headers, null); } - $response = $controller->buildResponse($response, $format); + if ($format !== null) { + $response = $controller->buildResponse($response, $format); + } else { + $response = $controller->buildResponse($response); + } } return $response; diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index 2c7d1167e7cb7..b21e8e05a9016 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -72,7 +72,7 @@ private function getFormat($controller) { // if none is given try the first Accept header if($format === null) { $headers = $this->request->getHeader('Accept'); - $format = $controller->getResponderByHTTPHeader($headers); + $format = $controller->getResponderByHTTPHeader($headers, 'xml'); } return $format; diff --git a/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php index daf6018cd1261..c6baa5e30c16e 100644 --- a/lib/public/AppFramework/Controller.php +++ b/lib/public/AppFramework/Controller.php @@ -104,8 +104,9 @@ public function __construct($appName, * @param string $acceptHeader * @return string the responder type * @since 7.0.0 + * @since 9.1.0 Added default parameter */ - public function getResponderByHTTPHeader($acceptHeader) { + public function getResponderByHTTPHeader($acceptHeader, $default='json') { $headers = explode(',', $acceptHeader); // return the first matching responder @@ -119,8 +120,8 @@ public function getResponderByHTTPHeader($acceptHeader) { } } - // no matching header defaults to json - return 'json'; + // no matching header return default + return $default; } diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php index e118b34250d15..e67c0fc21aeb2 100644 --- a/lib/public/AppFramework/OCSController.php +++ b/lib/public/AppFramework/OCSController.php @@ -31,6 +31,7 @@ use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\OCSResponse; +use OCP\AppFramework\Http\Response; use OCP\IRequest; @@ -69,6 +70,19 @@ public function __construct($appName, }); } + /** + * Since the OCS endpoints default to XML we need to find out the format + * again + * @param mixed $response the value that was returned from a controller and + * is not a Response instance + * @param string $format the format for which a formatter has been registered + * @throws \DomainException if format does not match a registered formatter + * @return Response + * @since 9.1.0 + */ + public function buildResponse($response, $format = 'xml') { + return parent::buildResponse($response, $format); + } /** * Unwrap data and build ocs response From c8c78fd981132141fb812a2ce22a7df866c04679 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 21 Jul 2016 12:26:48 +0200 Subject: [PATCH 11/41] Make the changes from https://github.com/nextcloud/documentation/commit/6ccd2c5678b85d35a8673d784bef5c6c89e7ecb9 persistant --- config/config.sample.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index c9f5fecf5f9db..3376603373a4f 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -435,7 +435,7 @@ * Both minimum and maximum times can be set together to explicitly define * file and folder deletion. For migration purposes, this setting is installed * initially set to "auto", which is equivalent to the default setting in - * ownCloud 8.1 and before. + * Nextloud. * * Available values: * @@ -475,7 +475,7 @@ * Both minimum and maximum times can be set together to explicitly define * version deletion. For migration purposes, this setting is installed * initially set to "auto", which is equivalent to the default setting in - * ownCloud 8.1 and before. + * Nextloud. * * Available values: * @@ -659,7 +659,7 @@ 'customclient_android' => 'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'customclient_ios' => - 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8', + 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', /** * Apps @@ -1136,12 +1136,12 @@ 'cipher' => 'AES-256-CFB', /** - * The minimum ownCloud desktop client version that will be allowed to sync with + * The minimum Nextcloud desktop client version that will be allowed to sync with * this server instance. All connections made from earlier clients will be denied - * by the server. Defaults to the minimum officially supported ownCloud desktop + * by the server. Defaults to the minimum officially supported Nextcloud desktop * clientversion at the time of release of this server version. * - * When changing this, note that older unsupported versions of the ownCloud desktop + * When changing this, note that older unsupported versions of the Nextcloud desktop * client may not function as expected, and could lead to permanent data loss for * clients or other unexpected results. */ From f4fbdbabee6c7a0d27dc7d3afdda2aabe91dc423 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 21 Jul 2016 12:57:05 +0200 Subject: [PATCH 12/41] Change the app name --- apps/dav/appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index df147a032fe04..5a783bc5521ad 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -2,7 +2,7 @@ dav WebDAV - ownCloud WebDAV endpoint + WebDAV endpoint AGPL owncloud.org 0.2.5 From 413968d4ba812246922b46bbede4edec96c28969 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 22 Jul 2016 09:53:52 +0200 Subject: [PATCH 13/41] FIx typo --- config/config.sample.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 3376603373a4f..d761ae92c2298 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -435,7 +435,7 @@ * Both minimum and maximum times can be set together to explicitly define * file and folder deletion. For migration purposes, this setting is installed * initially set to "auto", which is equivalent to the default setting in - * Nextloud. + * Nextcloud. * * Available values: * @@ -475,7 +475,7 @@ * Both minimum and maximum times can be set together to explicitly define * version deletion. For migration purposes, this setting is installed * initially set to "auto", which is equivalent to the default setting in - * Nextloud. + * Nextcloud. * * Available values: * From 3f4db2d02bd5aff945ca64d99f4ef745b2adcf6b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 21 Jul 2016 17:08:43 +0200 Subject: [PATCH 14/41] Fix the license script --- build/license.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/license.php b/build/license.php index 1712899d6866b..4091afe2fb59e 100644 --- a/build/license.php +++ b/build/license.php @@ -124,7 +124,7 @@ function exec($folder, $gitRoot = false) { function writeAuthorsFile() { ksort($this->authors); - $template = "ownCloud is written by: + $template = "Nextcloud is written by: @AUTHORS@ With help from many libraries and frameworks including: @@ -277,7 +277,7 @@ private function checkCopyrightState($path, $gitRoot) { private function printFilesToCheck() { if (!empty($this->checkFiles)) { print "\n"; - print "For following files all lines changes since the Nextcloud fork." . PHP_EOL; + print "For following files all lines changed since the Nextcloud fork." . PHP_EOL; print "Please check if these files can be moved over to AGPLv3 or later" . PHP_EOL; print "\n"; foreach ($this->checkFiles as $file) { @@ -349,6 +349,7 @@ private function checkCoreMailMap($author) { $licenses->exec($argv[1], isset($argv[2]) ? $argv[1] : false); } else { $licenses->exec([ + '../apps/admin_audit', '../apps/comments', '../apps/dav', '../apps/encryption', @@ -362,8 +363,10 @@ private function checkCoreMailMap($author) { '../apps/provisioning_api', '../apps/systemtags', '../apps/testing', + '../apps/theming', '../apps/updatenotification', '../apps/user_ldap', + '../build/integration/features/bootstrap', '../core', '../lib', '../ocs', From d3a11e9cf1bd55bc5930863ed3dd2cc29822eb58 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 21 Jul 2016 18:01:31 +0200 Subject: [PATCH 15/41] only search the license header for @copyright statements --- build/license.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/license.php b/build/license.php index 4091afe2fb59e..11675f21a0722 100644 --- a/build/license.php +++ b/build/license.php @@ -228,9 +228,10 @@ private function eatOldLicense($source) { private function getCopyrightNotices($path, $file) { $licenseHeaderEndsAtLine = (int)trim(shell_exec("grep -n '*/' $path | head -n 1 | cut -d ':' -f 1")); - $lineByLine = explode(PHP_EOL, $file, $licenseHeaderEndsAtLine); + $lineByLine = explode(PHP_EOL, $file, $licenseHeaderEndsAtLine + 1); $copyrightNotice = []; - foreach ($lineByLine as $line) { + $licensePart = array_slice($lineByLine, 0, $licenseHeaderEndsAtLine); + foreach ($licensePart as $line) { if (strpos($line, '@copyright') !== false) { $copyrightNotice[] = $line; } From 2d5a854f4546d693afa5c4db5dff3fef3e960b75 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 21 Jul 2016 17:32:03 +0200 Subject: [PATCH 16/41] Fix more mailmap entries --- .mailmap | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 41d9ad6e582eb..82805b664c0b2 100644 --- a/.mailmap +++ b/.mailmap @@ -39,6 +39,7 @@ Björn Schießle Björn Schießle Björn Schiessle Björn Schießle Bjoern Schießle Björn Schießle Bjoern Schiessle +Björn Schießle Björn Schießle BlackEagle Boris Rybalkin Borjan Tchakaloff @@ -302,13 +303,13 @@ Riccardo Iaconelli Richard Clarkson rnveach Robert Jäckel -Robin Appelman icewind1991 -Robin Appelman icewind1991 -Robin Appelman Robin -Robin Appelman Robin -Robin Appelman Robin Appelman -Robin Appelman Robin Appelman -Robin Appelman Robin Appelman +Robin Appelman icewind1991 +Robin Appelman icewind1991 +Robin Appelman Robin +Robin Appelman Robin +Robin Appelman Robin Appelman +Robin Appelman Robin Appelman +Robin Appelman Robin Appelman Robin McCorkell Robin McCorkell Robin McCorkell Robin McCorkell Rodrigo Hjort From a08e201d1948956a719ca0ee52e1e6c12d81fc23 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 21 Jul 2016 14:48:26 +0200 Subject: [PATCH 17/41] Fix e-mail in mailmap --- .mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 82805b664c0b2..f160206ac9cb8 100644 --- a/.mailmap +++ b/.mailmap @@ -313,8 +313,8 @@ Robin Appelman Robin Appelman Robin McCorkell Robin McCorkell Robin McCorkell Robin McCorkell Rodrigo Hjort -Roeland Jago Douma Roeland Jago Douma -Roeland Jago Douma Roeland Douma +Roeland Jago Douma Roeland Jago Douma +Roeland Jago Douma Roeland Douma rok Roland Hager Roland van Laar From 23b205ed4890aaabfbde4eb12a07460ead77a9b2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 22 Jul 2016 09:45:36 +0200 Subject: [PATCH 18/41] Run the license script --- AUTHORS | 30 ++++++++++++++----- apps/admin_audit/appinfo/app.php | 3 ++ apps/admin_audit/lib/actions/action.php | 2 ++ apps/admin_audit/lib/actions/auth.php | 2 ++ apps/admin_audit/lib/actions/files.php | 2 ++ .../lib/actions/groupmanagement.php | 3 ++ apps/admin_audit/lib/actions/sharing.php | 2 ++ apps/admin_audit/lib/actions/trashbin.php | 2 ++ .../lib/actions/usermanagement.php | 3 ++ apps/admin_audit/lib/actions/versions.php | 2 ++ apps/admin_audit/lib/auditlogger.php | 2 ++ apps/comments/appinfo/app.php | 5 ++-- apps/comments/lib/Activity/Extension.php | 5 ++-- apps/comments/lib/Activity/Listener.php | 5 ++-- apps/dav/appinfo/app.php | 5 ++-- apps/dav/appinfo/register_command.php | 5 ++-- apps/dav/appinfo/v1/caldav.php | 6 ++-- apps/dav/appinfo/v1/carddav.php | 7 +++-- apps/dav/appinfo/v1/publicwebdav.php | 10 ++++--- apps/dav/appinfo/v1/webdav.php | 6 ++-- apps/dav/appinfo/v2/remote.php | 3 +- apps/dav/bin/chunkperf.php | 3 +- apps/dav/lib/AppInfo/Application.php | 6 ++-- apps/dav/lib/CalDAV/BirthdayService.php | 4 ++- apps/dav/lib/CalDAV/CalDavBackend.php | 6 ++-- apps/dav/lib/CalDAV/Calendar.php | 5 ++-- apps/dav/lib/CalDAV/CalendarHome.php | 3 +- apps/dav/lib/CalDAV/CalendarObject.php | 3 +- apps/dav/lib/CalDAV/CalendarRoot.php | 3 +- apps/dav/lib/CalDAV/Schedule/IMipPlugin.php | 3 +- apps/dav/lib/CardDAV/AddressBook.php | 3 +- apps/dav/lib/CardDAV/AddressBookImpl.php | 4 ++- apps/dav/lib/CardDAV/AddressBookRoot.php | 3 +- apps/dav/lib/CardDAV/CardDavBackend.php | 7 +++-- apps/dav/lib/CardDAV/ContactsManager.php | 5 +++- apps/dav/lib/CardDAV/Converter.php | 3 +- apps/dav/lib/CardDAV/ImageExportPlugin.php | 5 ++-- apps/dav/lib/CardDAV/Plugin.php | 3 +- apps/dav/lib/CardDAV/SyncJob.php | 5 ++-- apps/dav/lib/CardDAV/SyncService.php | 5 ++-- apps/dav/lib/CardDAV/UserAddressBooks.php | 3 +- apps/dav/lib/CardDAV/Xml/Groups.php | 3 +- apps/dav/lib/Command/CreateAddressBook.php | 3 +- apps/dav/lib/Command/CreateCalendar.php | 3 +- apps/dav/lib/Command/SyncBirthdayCalendar.php | 5 ++-- .../dav/lib/Command/SyncSystemAddressBook.php | 3 +- apps/dav/lib/Comments/CommentNode.php | 4 ++- apps/dav/lib/Comments/CommentsPlugin.php | 5 ++-- apps/dav/lib/Comments/EntityCollection.php | 5 ++-- .../dav/lib/Comments/EntityTypeCollection.php | 5 ++-- apps/dav/lib/Comments/RootCollection.php | 5 ++-- apps/dav/lib/Connector/LegacyDAVACL.php | 5 ++-- apps/dav/lib/Connector/PublicAuth.php | 8 +++-- .../lib/Connector/Sabre/AppEnabledPlugin.php | 5 ++-- apps/dav/lib/Connector/Sabre/Auth.php | 4 ++- .../Sabre/BlockLegacyClientPlugin.php | 3 +- apps/dav/lib/Connector/Sabre/ChecksumList.php | 5 ++-- .../Sabre/CommentPropertiesPlugin.php | 3 +- .../Connector/Sabre/CopyEtagHeaderPlugin.php | 3 +- .../Sabre/CustomPropertiesBackend.php | 4 ++- apps/dav/lib/Connector/Sabre/DavAclPlugin.php | 3 +- apps/dav/lib/Connector/Sabre/Directory.php | 9 +++--- .../Sabre/DummyGetResponsePlugin.php | 3 +- .../Sabre/Exception/EntityTooLarge.php | 3 +- .../Connector/Sabre/Exception/FileLocked.php | 3 +- .../Connector/Sabre/Exception/Forbidden.php | 5 ++-- .../Connector/Sabre/Exception/InvalidPath.php | 3 +- .../Exception/PasswordLoginForbidden.php | 5 ++-- .../Sabre/Exception/UnsupportedMediaType.php | 3 +- .../Connector/Sabre/ExceptionLoggerPlugin.php | 6 ++-- .../lib/Connector/Sabre/FakeLockerPlugin.php | 3 +- apps/dav/lib/Connector/Sabre/File.php | 9 +++--- apps/dav/lib/Connector/Sabre/FilesPlugin.php | 8 +++-- .../lib/Connector/Sabre/FilesReportPlugin.php | 5 ++-- apps/dav/lib/Connector/Sabre/LockPlugin.php | 7 +++-- .../lib/Connector/Sabre/MaintenancePlugin.php | 7 +++-- apps/dav/lib/Connector/Sabre/Node.php | 7 +++-- apps/dav/lib/Connector/Sabre/ObjectTree.php | 9 ++++-- apps/dav/lib/Connector/Sabre/Principal.php | 3 +- apps/dav/lib/Connector/Sabre/QuotaPlugin.php | 5 ++-- apps/dav/lib/Connector/Sabre/Server.php | 3 +- .../dav/lib/Connector/Sabre/ServerFactory.php | 9 +++--- .../dav/lib/Connector/Sabre/ShareTypeList.php | 3 +- apps/dav/lib/Connector/Sabre/SharesPlugin.php | 3 +- apps/dav/lib/Connector/Sabre/TagList.php | 3 +- apps/dav/lib/Connector/Sabre/TagsPlugin.php | 3 +- apps/dav/lib/DAV/GroupPrincipalBackend.php | 3 +- apps/dav/lib/DAV/Sharing/Backend.php | 5 ++-- apps/dav/lib/DAV/Sharing/IShareable.php | 3 +- apps/dav/lib/DAV/Sharing/Plugin.php | 3 +- apps/dav/lib/DAV/Sharing/Xml/Invite.php | 4 ++- apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php | 3 +- apps/dav/lib/DAV/SystemPrincipalBackend.php | 3 +- apps/dav/lib/Files/BrowserErrorPagePlugin.php | 3 +- .../dav/lib/Files/CustomPropertiesBackend.php | 4 ++- apps/dav/lib/Files/FilesHome.php | 3 +- apps/dav/lib/Files/RootCollection.php | 3 +- .../Files/Sharing/PublicLinkCheckPlugin.php | 5 ++-- apps/dav/lib/HookManager.php | 3 +- apps/dav/lib/Migration/Classification.php | 3 +- apps/dav/lib/Migration/GenerateBirthdays.php | 3 +- apps/dav/lib/RootCollection.php | 5 ++-- apps/dav/lib/Server.php | 8 +++-- .../lib/SystemTag/SystemTagMappingNode.php | 3 +- apps/dav/lib/SystemTag/SystemTagNode.php | 3 +- apps/dav/lib/SystemTag/SystemTagPlugin.php | 3 +- .../SystemTag/SystemTagsByIdCollection.php | 3 +- .../SystemTagsObjectMappingCollection.php | 3 +- .../SystemTagsObjectTypeCollection.php | 4 ++- .../SystemTagsRelationsCollection.php | 6 ++-- apps/dav/lib/Upload/AssemblyStream.php | 4 ++- apps/dav/lib/Upload/FutureFile.php | 4 ++- apps/dav/lib/Upload/RootCollection.php | 4 ++- apps/dav/lib/Upload/UploadFolder.php | 4 ++- apps/dav/lib/Upload/UploadHome.php | 4 ++- .../tests/unit/AppInfo/ApplicationTest.php | 5 ++-- .../unit/CalDAV/AbstractCalDavBackendTest.php | 4 +-- .../tests/unit/CalDAV/CalDavBackendTest.php | 6 ++-- apps/dav/tests/unit/CalDAV/CalendarTest.php | 5 ++-- .../unit/CalDAV/Schedule/IMipPluginTest.php | 5 ++-- .../unit/CardDAV/AddressBookImplTest.php | 7 +++-- .../tests/unit/CardDAV/AddressBookTest.php | 5 ++-- .../unit/CardDAV/BirthdayServiceTest.php | 6 ++-- .../tests/unit/CardDAV/CardDavBackendTest.php | 7 +++-- .../unit/CardDAV/ContactsManagerTest.php | 6 ++-- apps/dav/tests/unit/CardDAV/ConverterTest.php | 7 +++-- .../unit/CardDAV/ImageExportPluginTest.php | 6 ++-- .../tests/unit/CardDAV/Sharing/PluginTest.php | 5 ++-- .../tests/unit/CardDAV/SyncServiceTest.php | 6 ++-- .../tests/unit/Comments/CommentsNodeTest.php | 7 +++-- .../unit/Comments/CommentsPluginTest.php | 6 ++-- .../unit/Comments/EntityCollectionTest.php | 6 ++-- .../Comments/EntityTypeCollectionTest.php | 6 ++-- .../unit/Comments/RootCollectionTest.php | 6 ++-- .../tests/unit/Connector/PublicAuthTest.php | 8 +++-- .../tests/unit/Connector/Sabre/AuthTest.php | 7 +++-- .../Sabre/BlockLegacyClientPluginTest.php | 6 ++-- .../Sabre/CommentsPropertiesPluginTest.php | 6 ++-- .../Sabre/CopyEtagHeaderPluginTest.php | 5 ++-- .../Sabre/CustomPropertiesBackendTest.php | 6 ++-- .../unit/Connector/Sabre/DirectoryTest.php | 8 +++-- .../Sabre/DummyGetResponsePluginTest.php | 6 ++-- .../Sabre/Exception/ForbiddenTest.php | 6 ++-- .../Sabre/Exception/InvalidPathTest.php | 6 ++-- .../Sabre/ExceptionLoggerPluginTest.php | 5 ++-- .../Connector/Sabre/FakeLockerPluginTest.php | 6 ++-- .../tests/unit/Connector/Sabre/FileTest.php | 8 +++-- .../unit/Connector/Sabre/FilesPluginTest.php | 7 +++-- .../Connector/Sabre/FilesReportPluginTest.php | 7 +++-- .../Connector/Sabre/MaintenancePluginTest.php | 6 ++-- .../tests/unit/Connector/Sabre/NodeTest.php | 9 +++--- .../unit/Connector/Sabre/ObjectTreeTest.php | 9 ++++-- .../unit/Connector/Sabre/PrincipalTest.php | 5 ++-- .../unit/Connector/Sabre/QuotaPluginTest.php | 8 +++-- .../unit/Connector/Sabre/RequestTest/Auth.php | 7 +++-- .../Sabre/RequestTest/DeleteTest.php | 7 ++--- .../Sabre/RequestTest/DownloadTest.php | 7 +++-- .../RequestTest/EncryptionUploadTest.php | 7 +++-- .../Sabre/RequestTest/ExceptionPlugin.php | 7 +++-- .../RequestTest/PartFileInRootUploadTest.php | 8 +++-- .../Sabre/RequestTest/RequestTest.php | 8 +++-- .../unit/Connector/Sabre/RequestTest/Sapi.php | 7 +++-- .../Sabre/RequestTest/UploadTest.php | 7 +++-- .../unit/Connector/Sabre/SharesPluginTest.php | 6 ++-- .../unit/Connector/Sabre/TagsPluginTest.php | 6 ++-- .../unit/DAV/BrowserErrorPagePluginTest.php | 5 ++-- .../dav/tests/unit/DAV/GroupPrincipalTest.php | 5 ++-- apps/dav/tests/unit/DAV/HookManagerTest.php | 5 ++-- .../dav/tests/unit/DAV/Sharing/PluginTest.php | 5 ++-- .../unit/DAV/SystemPrincipalBackendTest.php | 5 ++-- .../unit/Migration/ClassificationTest.php | 3 +- apps/dav/tests/unit/ServerTest.php | 6 ++-- .../SystemTag/SystemTagMappingNodeTest.php | 6 ++-- .../unit/SystemTag/SystemTagNodeTest.php | 6 ++-- .../unit/SystemTag/SystemTagPluginTest.php | 6 ++-- .../SystemTagsByIdCollectionTest.php | 6 ++-- .../SystemTagsObjectMappingCollectionTest.php | 6 ++-- .../SystemTagsObjectTypeCollectionTest.php | 6 ++-- .../tests/unit/Upload/AssemblyStreamTest.php | 5 +++- apps/dav/tests/unit/Upload/FutureFileTest.php | 5 +++- apps/dav/tests/unit/bootstrap.php | 5 ++-- apps/encryption/appinfo/app.php | 3 +- apps/encryption/appinfo/register_command.php | 3 +- apps/encryption/appinfo/routes.php | 3 +- apps/encryption/lib/AppInfo/Application.php | 3 +- .../lib/Command/EnableMasterKey.php | 3 +- apps/encryption/lib/Command/MigrateKeys.php | 3 +- .../lib/Controller/RecoveryController.php | 3 +- .../lib/Controller/SettingsController.php | 5 ++-- .../lib/Controller/StatusController.php | 3 +- apps/encryption/lib/Crypto/Crypt.php | 5 ++-- apps/encryption/lib/Crypto/DecryptAll.php | 3 +- apps/encryption/lib/Crypto/EncryptAll.php | 6 ++-- apps/encryption/lib/Crypto/Encryption.php | 5 ++-- .../Exceptions/MultiKeyDecryptException.php | 3 +- .../Exceptions/MultiKeyEncryptException.php | 3 +- .../Exceptions/PrivateKeyMissingException.php | 3 +- .../Exceptions/PublicKeyMissingException.php | 3 +- apps/encryption/lib/HookManager.php | 3 +- apps/encryption/lib/Hooks/Contracts/IHook.php | 3 +- apps/encryption/lib/Hooks/UserHooks.php | 3 +- apps/encryption/lib/KeyManager.php | 3 +- apps/encryption/lib/Migration.php | 7 +++-- apps/encryption/lib/Recovery.php | 3 +- apps/encryption/lib/Session.php | 3 +- apps/encryption/lib/Users/Setup.php | 3 +- apps/encryption/lib/Util.php | 3 +- apps/encryption/settings/settings-admin.php | 3 +- .../encryption/settings/settings-personal.php | 3 +- .../tests/Command/TestEnableMasterKey.php | 5 ++-- .../Controller/RecoveryControllerTest.php | 5 ++-- .../Controller/SettingsControllerTest.php | 5 ++-- .../tests/Controller/StatusControllerTest.php | 5 ++-- apps/encryption/tests/Crypto/CryptTest.php | 5 ++-- .../tests/Crypto/DecryptAllTest.php | 5 ++-- .../tests/Crypto/EncryptAllTest.php | 5 ++-- .../tests/Crypto/EncryptionTest.php | 5 ++-- apps/encryption/tests/HookManagerTest.php | 5 ++-- apps/encryption/tests/Hooks/UserHooksTest.php | 5 ++-- apps/encryption/tests/KeyManagerTest.php | 5 ++-- apps/encryption/tests/MigrationTest.php | 9 +++--- apps/encryption/tests/RecoveryTest.php | 5 ++-- apps/encryption/tests/SessionTest.php | 5 ++-- apps/encryption/tests/Users/SetupTest.php | 5 ++-- apps/encryption/tests/UtilTest.php | 5 ++-- apps/federatedfilesharing/appinfo/app.php | 5 ++-- apps/federatedfilesharing/appinfo/routes.php | 3 ++ .../lib/AddressHandler.php | 3 +- .../lib/AppInfo/Application.php | 3 +- .../lib/BackgroundJob/RetryJob.php | 3 +- .../Controller/MountPublicLinkController.php | 5 ++-- .../lib/DiscoveryManager.php | 6 +++- .../lib/FederatedShareProvider.php | 7 +++-- .../lib/Notifications.php | 6 +++- apps/federatedfilesharing/lib/Notifier.php | 5 ++-- .../lib/RequestHandler.php | 5 ++-- .../federatedfilesharing/lib/TokenHandler.php | 3 +- apps/federatedfilesharing/settings-admin.php | 4 ++- .../settings-personal.php | 4 ++- .../tests/AddressHandlerTest.php | 5 ++-- .../MountPublicLinkControllerTest.php | 5 ++-- .../tests/DiscoveryManagerTest.php | 4 ++- .../tests/FederatedShareProviderTest.php | 6 ++-- .../tests/NotificationsTest.php | 3 +- .../tests/RequestHandlerTest.php | 7 +++-- apps/federatedfilesharing/tests/TestCase.php | 3 +- .../tests/TokenHandlerTest.php | 5 ++-- apps/federation/appinfo/app.php | 3 +- apps/federation/appinfo/register_command.php | 3 +- apps/federation/appinfo/routes.php | 3 +- apps/federation/lib/API/OCSAuthAPI.php | 7 +++-- apps/federation/lib/AppInfo/Application.php | 5 ++-- .../lib/BackgroundJob/GetSharedSecret.php | 6 ++-- .../lib/BackgroundJob/RequestSharedSecret.php | 7 +++-- .../Command/SyncFederationAddressBooks.php | 3 +- .../lib/Controller/SettingsController.php | 4 ++- apps/federation/lib/DAV/FedAuth.php | 4 ++- apps/federation/lib/DbHandler.php | 5 +++- apps/federation/lib/Hooks.php | 3 +- .../lib/Middleware/AddServerMiddleware.php | 5 ++-- .../lib/SyncFederationAddressBooks.php | 3 +- apps/federation/lib/SyncJob.php | 3 +- apps/federation/lib/TrustedServers.php | 6 ++-- apps/federation/settings/settings-admin.php | 3 +- apps/federation/tests/API/OCSAuthAPITest.php | 5 ++-- .../BackgroundJob/GetSharedSecretTest.php | 5 ++-- .../BackgroundJob/RequestSharedSecretTest.php | 5 ++-- .../Controller/SettingsControllerTest.php | 3 +- apps/federation/tests/DAV/FedAuthTest.php | 3 +- apps/federation/tests/DbHandlerTest.php | 5 ++-- apps/federation/tests/HooksTest.php | 5 ++-- .../Middleware/AddServerMiddlewareTest.php | 3 +- .../tests/SyncFederationAddressbooksTest.php | 5 ++-- apps/federation/tests/TrustedServersTest.php | 6 ++-- apps/files/admin.php | 6 ++-- apps/files/ajax/download.php | 5 ++-- apps/files/ajax/getstoragestats.php | 5 ++-- apps/files/ajax/list.php | 5 ++-- apps/files/ajax/upload.php | 7 +++-- apps/files/appinfo/app.php | 7 +++-- apps/files/appinfo/register_command.php | 5 ++-- apps/files/appinfo/routes.php | 5 ++-- apps/files/appinfo/update.php | 5 ++-- apps/files/download.php | 7 +++-- apps/files/lib/Activity.php | 5 ++-- apps/files/lib/ActivityHelper.php | 5 ++-- apps/files/lib/App.php | 3 +- apps/files/lib/AppInfo/Application.php | 5 ++-- .../lib/BackgroundJob/CleanupFileLocks.php | 3 +- .../lib/BackgroundJob/DeleteOrphanedItems.php | 5 ++-- apps/files/lib/BackgroundJob/ScanFiles.php | 3 +- apps/files/lib/Capabilities.php | 7 +++-- .../files/lib/Command/DeleteOrphanedFiles.php | 5 ++-- apps/files/lib/Command/Scan.php | 5 ++-- apps/files/lib/Command/TransferOwnership.php | 5 ++-- apps/files/lib/Controller/ApiController.php | 7 +++-- apps/files/lib/Controller/ViewController.php | 5 +++- apps/files/lib/Helper.php | 7 +++-- apps/files/lib/Service/TagService.php | 5 ++-- apps/files/list.php | 3 +- apps/files/simplelist.php | 3 +- apps/files/tests/ActivityTest.php | 5 ++-- .../DeleteOrphanedItemsJobTest.php | 3 +- .../tests/BackgroundJob/ScanFilesTest.php | 3 +- .../tests/Command/DeleteOrphanedFilesTest.php | 5 ++-- .../tests/Controller/ApiControllerTest.php | 5 ++-- .../tests/Controller/ViewControllerTest.php | 5 ++-- apps/files/tests/HelperTest.php | 7 +++-- apps/files/tests/Service/TagServiceTest.php | 7 +++-- apps/files_external/ajax/applicable.php | 3 +- apps/files_external/ajax/oauth1.php | 5 ++-- apps/files_external/ajax/oauth2.php | 5 ++-- apps/files_external/appinfo/app.php | 9 +++--- .../appinfo/register_command.php | 7 +++-- apps/files_external/appinfo/routes.php | 7 +++-- apps/files_external/appinfo/update.php | 7 +++-- .../lib/AppInfo/Application.php | 10 ++++--- .../files_external/lib/Command/Applicable.php | 7 +++-- apps/files_external/lib/Command/Backends.php | 5 ++-- apps/files_external/lib/Command/Config.php | 7 +++-- apps/files_external/lib/Command/Create.php | 7 +++-- apps/files_external/lib/Command/Delete.php | 7 +++-- apps/files_external/lib/Command/Export.php | 5 ++-- apps/files_external/lib/Command/Import.php | 7 +++-- .../lib/Command/ListCommand.php | 7 +++-- apps/files_external/lib/Command/Notify.php | 2 ++ apps/files_external/lib/Command/Option.php | 7 +++-- apps/files_external/lib/Command/Verify.php | 7 +++-- .../lib/Config/ConfigAdapter.php | 7 +++-- .../lib/Controller/AjaxController.php | 6 ++-- .../Controller/GlobalStoragesController.php | 8 +++-- .../lib/Controller/StoragesController.php | 8 +++-- .../UserGlobalStoragesController.php | 8 +++-- .../lib/Controller/UserStoragesController.php | 8 +++-- apps/files_external/lib/Lib/Api.php | 5 ++-- .../lib/Lib/Auth/AmazonS3/AccessKey.php | 3 +- .../lib/Lib/Auth/AuthMechanism.php | 5 ++-- apps/files_external/lib/Lib/Auth/Builtin.php | 3 +- .../lib/Lib/Auth/IUserProvided.php | 5 ++-- .../lib/Lib/Auth/NullMechanism.php | 3 +- .../lib/Lib/Auth/OAuth1/OAuth1.php | 3 +- .../lib/Lib/Auth/OAuth2/OAuth2.php | 3 +- .../lib/Lib/Auth/OpenStack/OpenStack.php | 3 +- .../lib/Lib/Auth/OpenStack/Rackspace.php | 3 +- .../lib/Lib/Auth/Password/GlobalAuth.php | 5 ++-- .../Lib/Auth/Password/LoginCredentials.php | 5 ++-- .../lib/Lib/Auth/Password/Password.php | 3 +- .../Lib/Auth/Password/SessionCredentials.php | 3 +- .../lib/Lib/Auth/Password/UserProvided.php | 5 ++-- .../lib/Lib/Auth/PublicKey/RSA.php | 3 +- .../lib/Lib/Backend/AmazonS3.php | 3 +- .../lib/Lib/Backend/Backend.php | 3 +- apps/files_external/lib/Lib/Backend/DAV.php | 3 +- .../lib/Lib/Backend/Dropbox.php | 3 +- apps/files_external/lib/Lib/Backend/FTP.php | 3 +- .../files_external/lib/Lib/Backend/Google.php | 3 +- .../lib/Lib/Backend/LegacyBackend.php | 3 +- apps/files_external/lib/Lib/Backend/Local.php | 3 +- .../lib/Lib/Backend/OwnCloud.php | 3 +- apps/files_external/lib/Lib/Backend/SFTP.php | 3 +- .../lib/Lib/Backend/SFTP_Key.php | 3 +- apps/files_external/lib/Lib/Backend/SMB.php | 3 +- .../files_external/lib/Lib/Backend/SMB_OC.php | 3 +- apps/files_external/lib/Lib/Backend/Swift.php | 3 +- .../lib/Lib/Config/IAuthMechanismProvider.php | 3 +- .../lib/Lib/Config/IBackendProvider.php | 3 +- .../lib/Lib/DefinitionParameter.php | 5 ++-- .../lib/Lib/DependencyTrait.php | 3 +- .../lib/Lib/FrontendDefinitionTrait.php | 5 ++-- .../lib/Lib/IdentifierTrait.php | 3 +- ...icientDataForMeaningfulAnswerException.php | 5 ++-- .../lib/Lib/LegacyDependencyCheckPolyfill.php | 3 +- .../lib/Lib/MissingDependency.php | 3 +- apps/files_external/lib/Lib/PersonalMount.php | 5 ++-- apps/files_external/lib/Lib/PriorityTrait.php | 3 +- .../lib/Lib/SessionStorageWrapper.php | 3 +- .../lib/Lib/Storage/AmazonS3.php | 5 ++-- .../lib/Lib/Storage/Dropbox.php | 7 +++-- apps/files_external/lib/Lib/Storage/FTP.php | 5 ++-- .../files_external/lib/Lib/Storage/Google.php | 5 ++-- .../lib/Lib/Storage/OwnCloud.php | 3 +- apps/files_external/lib/Lib/Storage/SFTP.php | 5 ++-- apps/files_external/lib/Lib/Storage/SMB.php | 5 ++-- .../lib/Lib/Storage/StreamWrapper.php | 5 ++-- apps/files_external/lib/Lib/Storage/Swift.php | 5 ++-- apps/files_external/lib/Lib/StorageConfig.php | 7 +++-- .../lib/Lib/StorageModifierTrait.php | 3 +- .../lib/Lib/VisibilityTrait.php | 3 +- .../lib/Migration/DummyUserSession.php | 7 +++-- .../lib/Migration/StorageMigrator.php | 7 +++-- apps/files_external/lib/NotFoundException.php | 5 ++-- .../lib/Service/BackendService.php | 3 +- .../lib/Service/DBConfigService.php | 7 +++-- .../Service/GlobalLegacyStoragesService.php | 7 +++-- .../lib/Service/GlobalStoragesService.php | 7 +++-- .../Service/ImportLegacyStoragesService.php | 7 +++-- .../lib/Service/LegacyStoragesService.php | 7 +++-- .../lib/Service/StoragesService.php | 7 +++-- .../lib/Service/UserGlobalStoragesService.php | 5 ++-- .../lib/Service/UserLegacyStoragesService.php | 7 +++-- .../lib/Service/UserStoragesService.php | 7 +++-- apps/files_external/lib/Service/UserTrait.php | 3 +- apps/files_external/lib/config.php | 8 +++-- apps/files_external/list.php | 3 +- apps/files_external/personal.php | 7 +++-- apps/files_external/settings.php | 8 ++--- .../tests/AmazonS3MigrationTest.php | 5 ++-- .../tests/Auth/AuthMechanismTest.php | 3 +- .../tests/Auth/Password/GlobalAuth.php | 5 ++-- .../tests/Backend/BackendTest.php | 3 +- .../tests/Backend/LegacyBackendTest.php | 3 +- .../tests/Command/ApplicableTest.php | 5 ++-- .../tests/Command/CommandTest.php | 7 +++-- .../tests/Command/ListCommandTest.php | 7 +++-- .../tests/Controller/AjaxControllerTest.php | 2 ++ .../GlobalStoragesControllerTest.php | 7 +++-- .../Controller/StoragesControllerTest.php | 5 ++-- .../Controller/UserStoragesControllerTest.php | 7 +++-- .../tests/DefinitionParameterTest.php | 5 ++-- .../tests/FrontendDefinitionTraitTest.php | 5 ++-- .../LegacyDependencyCheckPolyfillTest.php | 3 +- .../tests/OwnCloudFunctionsTest.php | 5 ++-- .../tests/PersonalMountTest.php | 7 +++-- .../tests/Service/BackendServiceTest.php | 3 +- .../tests/Service/DBConfigServiceTest.php | 5 ++-- .../Service/GlobalStoragesServiceTest.php | 7 +++-- .../tests/Service/StoragesServiceTest.php | 7 +++-- .../Service/UserGlobalStoragesServiceTest.php | 7 +++-- .../tests/Service/UserStoragesServiceTest.php | 7 +++-- .../tests/Storage/Amazons3Test.php | 7 +++-- .../tests/Storage/DropboxTest.php | 7 +++-- apps/files_external/tests/Storage/FtpTest.php | 7 +++-- .../tests/Storage/GoogleTest.php | 8 +++-- .../tests/Storage/OwncloudTest.php | 5 ++-- .../tests/Storage/SFTP_KeyTest.php | 3 +- .../files_external/tests/Storage/SftpTest.php | 7 +++-- apps/files_external/tests/Storage/SmbTest.php | 7 +++-- .../tests/Storage/SwiftTest.php | 7 +++-- .../tests/Storage/WebdavTest.php | 7 +++-- .../tests/StorageConfigTest.php | 5 ++-- apps/files_external/tests/config.php | 5 ++-- apps/files_sharing/ajax/publicpreview.php | 5 ++-- apps/files_sharing/ajax/shareinfo.php | 9 ++++-- apps/files_sharing/appinfo/app.php | 8 ++--- apps/files_sharing/appinfo/routes.php | 9 +++--- apps/files_sharing/appinfo/update.php | 5 ++-- .../files_sharing/lib/API/OCSShareWrapper.php | 5 ++-- apps/files_sharing/lib/API/Remote.php | 7 +++-- apps/files_sharing/lib/API/Share20OCS.php | 8 +++-- apps/files_sharing/lib/API/Sharees.php | 7 +++-- apps/files_sharing/lib/Activity.php | 5 ++-- .../files_sharing/lib/AppInfo/Application.php | 10 ++++--- apps/files_sharing/lib/Cache.php | 7 +++-- apps/files_sharing/lib/Capabilities.php | 5 ++-- .../Controllers/ExternalSharesController.php | 7 +++-- .../lib/Controllers/ShareController.php | 11 +++---- .../lib/DeleteOrphanedSharesJob.php | 5 ++-- .../lib/Exceptions/BrokenPath.php | 3 +- .../lib/Exceptions/S2SException.php | 5 ++-- apps/files_sharing/lib/ExpireSharesJob.php | 5 ++-- apps/files_sharing/lib/External/Cache.php | 5 ++-- apps/files_sharing/lib/External/Manager.php | 9 +++--- apps/files_sharing/lib/External/Mount.php | 5 ++-- .../lib/External/MountProvider.php | 5 ++-- apps/files_sharing/lib/External/Scanner.php | 5 ++-- apps/files_sharing/lib/External/Storage.php | 6 ++-- apps/files_sharing/lib/External/Watcher.php | 5 ++-- apps/files_sharing/lib/Helper.php | 10 +++---- apps/files_sharing/lib/Hooks.php | 7 +++-- apps/files_sharing/lib/ISharedStorage.php | 5 ++-- apps/files_sharing/lib/Maintainer.php | 5 ++-- .../lib/Middleware/SharingCheckMiddleware.php | 5 ++-- apps/files_sharing/lib/Migration.php | 6 ++-- apps/files_sharing/lib/MountProvider.php | 8 +++-- apps/files_sharing/lib/Scanner.php | 7 +++-- apps/files_sharing/lib/SharedMount.php | 10 ++++--- apps/files_sharing/lib/SharedPropagator.php | 7 +++-- apps/files_sharing/lib/Updater.php | 5 ++-- apps/files_sharing/lib/share/file.php | 8 +++-- apps/files_sharing/lib/share/folder.php | 5 ++-- apps/files_sharing/lib/sharedstorage.php | 9 +++--- apps/files_sharing/list.php | 3 +- apps/files_sharing/public.php | 3 +- .../tests/API/Share20OCSTest.php | 6 ++-- apps/files_sharing/tests/API/ShareesTest.php | 7 +++-- apps/files_sharing/tests/ActivityTest.php | 5 ++-- apps/files_sharing/tests/ApiTest.php | 9 +++--- apps/files_sharing/tests/BackendTest.php | 7 +++-- apps/files_sharing/tests/CacheTest.php | 9 +++--- apps/files_sharing/tests/CapabilitiesTest.php | 7 +++-- .../ExternalShareControllerTest.php | 7 +++-- .../tests/Controllers/ShareControllerTest.php | 10 ++++--- .../tests/DeleteOrphanedSharesJobTest.php | 5 ++-- .../tests/EncryptedSizePropagationTest.php | 7 +++-- .../tests/EtagPropagationTest.php | 9 +++--- .../tests/ExpireSharesJobTest.php | 5 ++-- .../tests/External/CacheTest.php | 7 +++-- .../tests/External/ManagerTest.php | 7 +++-- .../tests/External/ScannerTest.php | 5 ++-- .../tests/ExternalStorageTest.php | 7 +++-- .../tests/GroupEtagPropagationTest.php | 9 +++--- apps/files_sharing/tests/HelperTest.php | 5 ++-- apps/files_sharing/tests/LockingTest.php | 9 +++--- .../Middleware/SharingCheckMiddlewareTest.php | 5 ++-- apps/files_sharing/tests/MigrationTest.php | 7 +++-- .../files_sharing/tests/MountProviderTest.php | 5 +++- apps/files_sharing/tests/PermissionsTest.php | 9 +++--- .../tests/PropagationTestCase.php | 7 +++-- apps/files_sharing/tests/ShareTest.php | 9 +++--- apps/files_sharing/tests/SharedMountTest.php | 9 +++--- .../files_sharing/tests/SharedStorageTest.php | 9 +++--- .../tests/SizePropagationTest.php | 9 +++--- apps/files_sharing/tests/TestCase.php | 9 +++--- .../tests/UnshareChildrenTest.php | 9 +++--- apps/files_sharing/tests/UpdaterTest.php | 9 +++--- apps/files_sharing/tests/WatcherTest.php | 9 +++--- apps/files_trashbin/ajax/delete.php | 7 +++-- apps/files_trashbin/ajax/isEmpty.php | 3 +- apps/files_trashbin/ajax/list.php | 3 +- apps/files_trashbin/ajax/preview.php | 5 ++-- apps/files_trashbin/ajax/undelete.php | 7 +++-- apps/files_trashbin/appinfo/app.php | 5 ++-- .../appinfo/register_command.php | 3 +- apps/files_trashbin/appinfo/routes.php | 5 ++-- apps/files_trashbin/appinfo/update.php | 3 +- .../lib/AppInfo/Application.php | 5 ++-- .../lib/BackgroundJob/ExpireTrash.php | 5 ++-- apps/files_trashbin/lib/Capabilities.php | 5 ++-- apps/files_trashbin/lib/Command/CleanUp.php | 5 ++-- apps/files_trashbin/lib/Command/Expire.php | 7 +++-- .../lib/Exceptions/CopyRecursiveException.php | 3 +- apps/files_trashbin/lib/Expiration.php | 3 +- apps/files_trashbin/lib/Helper.php | 7 +++-- apps/files_trashbin/lib/Hooks.php | 3 +- apps/files_trashbin/lib/Storage.php | 5 ++-- apps/files_trashbin/lib/Trashbin.php | 7 +++-- apps/files_trashbin/list.php | 3 +- .../tests/BackgroundJob/ExpireTrashTest.php | 5 ++-- .../tests/Command/CleanUpTest.php | 5 ++-- .../tests/Command/ExpireTest.php | 5 ++-- apps/files_trashbin/tests/ExpirationTest.php | 5 ++-- apps/files_trashbin/tests/StorageTest.php | 9 +++--- apps/files_trashbin/tests/TrashbinTest.php | 9 +++--- apps/files_versions/ajax/getVersions.php | 3 +- apps/files_versions/ajax/preview.php | 5 ++-- apps/files_versions/ajax/rollbackVersion.php | 5 ++-- apps/files_versions/appinfo/app.php | 3 +- .../appinfo/register_command.php | 3 +- apps/files_versions/appinfo/routes.php | 5 ++-- apps/files_versions/download.php | 5 ++-- .../lib/AppInfo/Application.php | 5 ++-- .../lib/BackgroundJob/ExpireVersions.php | 5 ++-- apps/files_versions/lib/Capabilities.php | 5 ++-- apps/files_versions/lib/Command/CleanUp.php | 3 +- apps/files_versions/lib/Command/Expire.php | 7 +++-- apps/files_versions/lib/Expiration.php | 3 +- apps/files_versions/lib/Hooks.php | 5 ++-- apps/files_versions/lib/Storage.php | 9 ++++-- .../tests/Command/CleanupTest.php | 3 +- .../tests/Command/ExpireTest.php | 5 ++-- apps/files_versions/tests/ExpirationTest.php | 5 ++-- apps/files_versions/tests/VersioningTest.php | 9 +++--- apps/provisioning_api/appinfo/routes.php | 7 +++-- apps/provisioning_api/lib/Apps.php | 6 ++-- apps/provisioning_api/lib/Groups.php | 6 ++-- apps/provisioning_api/lib/Users.php | 7 +++-- apps/provisioning_api/tests/AppsTest.php | 7 +++-- apps/provisioning_api/tests/GroupsTest.php | 7 +++-- apps/provisioning_api/tests/TestCase.php | 7 +++-- apps/provisioning_api/tests/UsersTest.php | 7 +++-- apps/systemtags/appinfo/app.php | 5 ++-- apps/systemtags/lib/Activity/Extension.php | 5 ++-- apps/systemtags/lib/Activity/Listener.php | 6 ++-- apps/systemtags/list.php | 3 +- apps/testing/appinfo/routes.php | 5 ++-- apps/testing/lib/Config.php | 5 ++-- .../testing/locking/fakedblockingprovider.php | 5 ++-- apps/testing/locking/provisioning.php | 5 ++-- apps/theming/appinfo/app.php | 3 ++ apps/theming/appinfo/routes.php | 4 +++ .../lib/controller/themingcontroller.php | 5 ++++ apps/theming/lib/template.php | 4 +++ apps/theming/lib/util.php | 2 ++ apps/theming/settings/settings-admin.php | 3 ++ apps/theming/tests/lib/TemplateTest.php | 3 ++ apps/theming/tests/lib/UtilTest.php | 2 ++ .../lib/controller/ThemingControllerTest.php | 4 +++ apps/updatenotification/admin.php | 3 +- apps/updatenotification/appinfo/app.php | 5 ++-- apps/updatenotification/appinfo/routes.php | 5 ++-- .../lib/AppInfo/Application.php | 3 +- .../lib/Controller/AdminController.php | 5 ++-- .../lib/Notification/BackgroundJob.php | 5 ++-- .../lib/Notification/Notifier.php | 6 ++-- .../lib/ResetTokenBackgroundJob.php | 3 +- apps/updatenotification/lib/UpdateChecker.php | 3 +- .../tests/Controller/AdminControllerTest.php | 5 ++-- .../tests/Notification/BackgroundJobTest.php | 5 ++-- .../tests/Notification/NotifierTest.php | 5 ++-- .../tests/ResetTokenBackgroundJobTest.php | 3 +- .../tests/UpdateCheckerTest.php | 3 +- apps/user_ldap/ajax/clearMappings.php | 3 +- apps/user_ldap/ajax/deleteConfiguration.php | 7 +++-- apps/user_ldap/ajax/getConfiguration.php | 5 ++-- .../ajax/getNewServerConfigPrefix.php | 5 ++-- apps/user_ldap/ajax/setConfiguration.php | 5 ++-- apps/user_ldap/ajax/testConfiguration.php | 7 +++-- apps/user_ldap/ajax/wizard.php | 7 +++-- apps/user_ldap/appinfo/app.php | 7 +++-- apps/user_ldap/appinfo/install.php | 3 +- apps/user_ldap/appinfo/register_command.php | 5 ++-- apps/user_ldap/appinfo/routes.php | 3 +- apps/user_ldap/lib/Access.php | 6 ++-- apps/user_ldap/lib/BackendUtility.php | 5 ++-- apps/user_ldap/lib/Command/CheckUser.php | 5 ++-- .../lib/Command/CreateEmptyConfig.php | 5 ++-- apps/user_ldap/lib/Command/DeleteConfig.php | 5 ++-- apps/user_ldap/lib/Command/Search.php | 5 ++-- apps/user_ldap/lib/Command/SetConfig.php | 5 ++-- apps/user_ldap/lib/Command/ShowConfig.php | 5 ++-- apps/user_ldap/lib/Command/ShowRemnants.php | 5 ++-- apps/user_ldap/lib/Command/TestConfig.php | 5 ++-- apps/user_ldap/lib/Configuration.php | 7 +++-- apps/user_ldap/lib/Connection.php | 7 +++-- apps/user_ldap/lib/FilesystemHelper.php | 5 ++-- apps/user_ldap/lib/Group_LDAP.php | 9 +++--- apps/user_ldap/lib/Group_Proxy.php | 5 ++-- apps/user_ldap/lib/Helper.php | 5 ++-- apps/user_ldap/lib/ILDAPWrapper.php | 5 ++-- apps/user_ldap/lib/Jobs/CleanUp.php | 5 ++-- apps/user_ldap/lib/Jobs/UpdateGroups.php | 7 +++-- apps/user_ldap/lib/LDAP.php | 5 ++-- apps/user_ldap/lib/LDAPUtility.php | 5 ++-- apps/user_ldap/lib/LogWrapper.php | 5 ++-- .../user_ldap/lib/Mapping/AbstractMapping.php | 4 ++- apps/user_ldap/lib/Mapping/GroupMapping.php | 3 +- apps/user_ldap/lib/Mapping/UserMapping.php | 3 +- apps/user_ldap/lib/Proxy.php | 6 ++-- apps/user_ldap/lib/User/DeletedUsersIndex.php | 5 ++-- apps/user_ldap/lib/User/IUserTools.php | 5 ++-- apps/user_ldap/lib/User/Manager.php | 5 ++-- apps/user_ldap/lib/User/OfflineUser.php | 5 ++-- apps/user_ldap/lib/User/User.php | 5 ++-- apps/user_ldap/lib/User_LDAP.php | 8 +++-- apps/user_ldap/lib/User_Proxy.php | 5 ++-- apps/user_ldap/lib/Wizard.php | 7 +++-- apps/user_ldap/lib/WizardResult.php | 5 ++-- apps/user_ldap/settings.php | 8 ++--- apps/user_ldap/tests/AccessTest.php | 5 ++-- apps/user_ldap/tests/ConfigurationTest.php | 5 ++-- apps/user_ldap/tests/ConnectionTest.php | 5 ++-- apps/user_ldap/tests/Group_LDAPTest.php | 6 ++-- .../Integration/AbstractIntegrationTest.php | 5 ++-- .../Integration/ExceptionOnLostConnection.php | 5 ++-- .../tests/Integration/FakeManager.php | 5 ++-- ...IntegrationTestAccessGroupsMatchFilter.php | 5 ++-- .../Lib/IntegrationTestBackupServer.php | 5 ++-- ...ntegrationTestBatchApplyUserAttributes.php | 5 ++-- .../Lib/IntegrationTestConnect.php | 5 ++-- .../IntegrationTestCountUsersByLoginName.php | 5 ++-- .../IntegrationTestFetchUsersByLoginName.php | 5 ++-- .../Integration/Lib/IntegrationTestPaging.php | 5 ++-- .../Lib/IntegrationTestUserHome.php | 5 ++-- .../Lib/User/IntegrationTestUserAvatar.php | 5 ++-- .../User/IntegrationTestUserDisplayName.php | 5 ++-- .../setup-scripts/createExplicitGroups.php | 3 +- .../createExplicitGroupsDifferentOU.php | 3 +- .../setup-scripts/createExplicitUsers.php | 3 +- .../createUsersWithoutDisplayName.php | 3 +- apps/user_ldap/tests/Jobs/CleanUpTest.php | 5 ++-- .../tests/Mapping/AbstractMappingTest.php | 6 ++-- .../tests/Mapping/GroupMappingTest.php | 5 ++-- .../tests/Mapping/UserMappingTest.php | 5 ++-- apps/user_ldap/tests/User/ManagerTest.php | 5 ++-- apps/user_ldap/tests/User/UserTest.php | 5 ++-- apps/user_ldap/tests/User_LDAPTest.php | 5 ++-- apps/user_ldap/tests/WizardTest.php | 5 ++-- .../features/bootstrap/AppConfiguration.php | 22 +++++++++++++- build/integration/features/bootstrap/Auth.php | 20 +++++++++++++ .../features/bootstrap/BasicStructure.php | 26 +++++++++++++++- .../features/bootstrap/CalDavContext.php | 6 ++-- .../bootstrap/CapabilitiesContext.php | 22 ++++++++++++++ .../features/bootstrap/CardDavContext.php | 6 ++-- .../features/bootstrap/ChecksumsContext.php | 21 +++++++++++++ .../features/bootstrap/CommentsContext.php | 6 ++-- .../features/bootstrap/FeatureContext.php | 21 +++++++++++++ .../features/bootstrap/FederationContext.php | 22 ++++++++++++++ .../features/bootstrap/Provisioning.php | 28 ++++++++++++++++- .../features/bootstrap/ShareesContext.php | 21 +++++++++++++ .../features/bootstrap/Sharing.php | 27 ++++++++++++++++- .../features/bootstrap/TagsContext.php | 7 +++-- .../integration/features/bootstrap/WebDav.php | 30 ++++++++++++++++++- console.php | 8 ++--- core/Application.php | 6 ++-- core/Command/App/CheckCode.php | 5 ++-- core/Command/App/Disable.php | 7 +++-- core/Command/App/Enable.php | 7 +++-- core/Command/App/GetPath.php | 3 +- core/Command/App/ListApps.php | 7 +++-- core/Command/Base.php | 5 ++-- core/Command/Check.php | 5 ++-- core/Command/Config/App/DeleteConfig.php | 5 ++-- core/Command/Config/App/GetConfig.php | 5 ++-- core/Command/Config/App/SetConfig.php | 5 ++-- core/Command/Config/Import.php | 5 ++-- core/Command/Config/ListConfigs.php | 5 ++-- core/Command/Config/System/DeleteConfig.php | 5 ++-- core/Command/Config/System/GetConfig.php | 5 ++-- core/Command/Config/System/SetConfig.php | 5 ++-- core/Command/Db/ConvertType.php | 5 ++-- core/Command/Db/GenerateChangeScript.php | 3 +- .../Encryption/ChangeKeyStorageRoot.php | 3 +- core/Command/Encryption/DecryptAll.php | 8 +++-- core/Command/Encryption/Disable.php | 5 ++-- core/Command/Encryption/Enable.php | 5 ++-- core/Command/Encryption/EncryptAll.php | 5 ++-- core/Command/Encryption/ListModules.php | 5 ++-- core/Command/Encryption/SetDefaultModule.php | 5 ++-- .../Command/Encryption/ShowKeyStorageRoot.php | 3 +- core/Command/Encryption/Status.php | 5 ++-- core/Command/Group/AddUser.php | 2 ++ core/Command/Group/ListCommand.php | 2 ++ core/Command/Group/RemoveUser.php | 2 ++ core/Command/Integrity/CheckApp.php | 3 +- core/Command/Integrity/CheckCore.php | 3 +- core/Command/Integrity/SignApp.php | 3 +- core/Command/Integrity/SignCore.php | 3 +- core/Command/L10n/CreateJs.php | 3 +- core/Command/Log/Manage.php | 6 ++-- core/Command/Log/OwnCloud.php | 4 ++- core/Command/Maintenance/DataFingerprint.php | 5 ++-- core/Command/Maintenance/Install.php | 6 +++- .../Command/Maintenance/Mimetype/UpdateDB.php | 3 +- .../Command/Maintenance/Mimetype/UpdateJS.php | 7 +++-- core/Command/Maintenance/Mode.php | 3 +- core/Command/Maintenance/Repair.php | 7 +++-- core/Command/Maintenance/SingleUser.php | 5 ++-- core/Command/Maintenance/UpdateHtaccess.php | 3 +- core/Command/Security/ImportCertificate.php | 5 ++-- core/Command/Security/ListCertificates.php | 5 ++-- core/Command/Security/RemoveCertificate.php | 5 ++-- core/Command/Status.php | 5 ++-- core/Command/TwoFactorAuth/Disable.php | 3 +- core/Command/TwoFactorAuth/Enable.php | 3 +- core/Command/Upgrade.php | 6 ++-- core/Command/User/Add.php | 5 ++-- core/Command/User/Delete.php | 5 ++-- core/Command/User/Disable.php | 3 +- core/Command/User/Enable.php | 3 +- core/Command/User/Info.php | 2 ++ core/Command/User/LastSeen.php | 5 ++-- core/Command/User/ListCommand.php | 2 ++ core/Command/User/Report.php | 5 ++-- core/Command/User/ResetPassword.php | 5 ++-- core/Command/User/Setting.php | 3 +- core/Controller/AvatarController.php | 9 +++--- core/Controller/LoginController.php | 5 +++- core/Controller/LostController.php | 6 ++-- core/Controller/SetupController.php | 5 ++-- core/Controller/TokenController.php | 4 ++- .../TwoFactorChallengeController.php | 4 ++- core/Controller/UserController.php | 3 +- core/Middleware/TwoFactorMiddleware.php | 5 ++-- core/Tags/Controller.php | 3 +- core/ajax/appconfig.php | 5 ++-- core/ajax/preview.php | 7 +++-- core/ajax/share.php | 9 +++--- core/ajax/update.php | 7 +++-- core/js/config.php | 9 +++--- core/register_command.php | 9 +++--- core/routes.php | 7 +++-- core/search/ajax/search.php | 5 ++-- core/strings.php | 5 ++-- cron.php | 7 +++-- index.php | 5 ++-- lib/autoloader.php | 9 +++--- lib/base.php | 12 ++++---- lib/composer/autoload.php | 20 +++++++++++++ lib/composer/composer/ClassLoader.php | 23 ++++++++++---- lib/composer/composer/autoload_classmap.php | 20 +++++++++++++ lib/composer/composer/autoload_namespaces.php | 20 +++++++++++++ lib/composer/composer/autoload_psr4.php | 21 +++++++++++++ lib/composer/composer/autoload_real.php | 20 +++++++++++++ lib/composer/composer/autoload_static.php | 20 +++++++++++++ lib/private/Activity/Event.php | 5 ++-- lib/private/Activity/Manager.php | 5 ++-- lib/private/AllConfig.php | 8 +++-- lib/private/App/AppManager.php | 8 +++-- lib/private/App/CodeChecker/AbstractCheck.php | 5 ++-- lib/private/App/CodeChecker/CodeChecker.php | 5 ++-- .../App/CodeChecker/DeprecationCheck.php | 5 ++-- lib/private/App/CodeChecker/EmptyCheck.php | 5 ++-- lib/private/App/CodeChecker/ICheck.php | 5 ++-- lib/private/App/CodeChecker/InfoChecker.php | 5 ++-- lib/private/App/CodeChecker/NodeVisitor.php | 5 ++-- lib/private/App/CodeChecker/PrivateCheck.php | 5 ++-- .../App/CodeChecker/StrongComparisonCheck.php | 5 ++-- lib/private/App/DependencyAnalyzer.php | 5 ++-- lib/private/App/InfoParser.php | 3 +- lib/private/App/Platform.php | 3 +- lib/private/App/PlatformRepository.php | 3 +- lib/private/AppConfig.php | 7 +++-- lib/private/AppFramework/App.php | 3 +- lib/private/AppFramework/Core/API.php | 5 ++-- lib/private/AppFramework/Db/Db.php | 7 +++-- .../DependencyInjection/DIContainer.php | 7 +++-- lib/private/AppFramework/Http.php | 5 ++-- lib/private/AppFramework/Http/Dispatcher.php | 3 +- lib/private/AppFramework/Http/Output.php | 3 +- lib/private/AppFramework/Http/Request.php | 9 +++--- .../Middleware/MiddlewareDispatcher.php | 3 +- .../AppFramework/Middleware/OCSMiddleware.php | 1 + .../Middleware/Security/CORSMiddleware.php | 4 ++- .../Exceptions/AppNotEnabledException.php | 5 ++-- .../CrossSiteRequestForgeryException.php | 5 ++-- .../Security/Exceptions/NotAdminException.php | 5 ++-- .../Exceptions/NotLoggedInException.php | 5 ++-- .../Security/Exceptions/SecurityException.php | 3 +- .../StrictCookieMissingException.php | 2 ++ .../Security/SecurityMiddleware.php | 5 ++-- .../Middleware/SessionMiddleware.php | 3 +- .../Routing/RouteActionHandler.php | 5 ++-- .../AppFramework/Routing/RouteConfig.php | 7 +++-- .../Utility/ControllerMethodReflector.php | 3 +- .../AppFramework/Utility/SimpleContainer.php | 5 ++-- .../AppFramework/Utility/TimeFactory.php | 3 +- lib/private/AppHelper.php | 3 +- lib/private/Archive/Archive.php | 9 +++--- lib/private/Archive/TAR.php | 9 +++--- lib/private/Archive/ZIP.php | 9 +++--- .../Exceptions/InvalidTokenException.php | 3 +- .../Exceptions/LoginRequiredException.php | 3 +- .../PasswordLoginForbiddenException.php | 4 +-- .../Exceptions/PasswordlessTokenException.php | 4 +-- .../TwoFactorAuthRequiredException.php | 3 +- .../UserAlreadyLoggedInException.php | 3 +- .../Authentication/Token/DefaultToken.php | 3 +- .../Token/DefaultTokenCleanupJob.php | 3 +- .../Token/DefaultTokenMapper.php | 3 +- .../Token/DefaultTokenProvider.php | 3 +- .../Authentication/Token/IProvider.php | 3 +- lib/private/Authentication/Token/IToken.php | 3 +- .../Authentication/TwoFactorAuth/Manager.php | 3 +- lib/private/Avatar.php | 7 +++-- lib/private/AvatarManager.php | 7 +++-- lib/private/BackgroundJob/Job.php | 5 ++-- lib/private/BackgroundJob/JobList.php | 7 +++-- .../BackgroundJob/Legacy/QueuedJob.php | 5 ++-- .../BackgroundJob/Legacy/RegularJob.php | 5 ++-- lib/private/BackgroundJob/QueuedJob.php | 5 ++-- lib/private/BackgroundJob/TimedJob.php | 5 ++-- lib/private/Cache/CappedMemoryCache.php | 5 ++-- lib/private/Cache/File.php | 7 +++-- lib/private/CapabilitiesManager.php | 5 ++-- lib/private/Command/AsyncBus.php | 5 ++-- lib/private/Command/CallableJob.php | 5 ++-- lib/private/Command/ClosureJob.php | 5 ++-- lib/private/Command/CommandJob.php | 5 ++-- lib/private/Command/FileAccess.php | 5 ++-- lib/private/Command/QueueBus.php | 5 ++-- lib/private/Comments/Comment.php | 5 ++-- lib/private/Comments/Manager.php | 5 ++-- lib/private/Comments/ManagerFactory.php | 5 ++-- lib/private/Config.php | 7 +++-- lib/private/Console/Application.php | 5 ++-- lib/private/Console/TimestampFormatter.php | 5 ++-- lib/private/ContactsManager.php | 5 ++-- lib/private/DB/Adapter.php | 7 +++-- lib/private/DB/AdapterMySQL.php | 7 +++-- lib/private/DB/AdapterOCI8.php | 5 ++-- lib/private/DB/AdapterPgSql.php | 3 +- lib/private/DB/AdapterSqlite.php | 7 +++-- lib/private/DB/Connection.php | 9 +++--- lib/private/DB/ConnectionFactory.php | 5 ++-- lib/private/DB/MDB2SchemaManager.php | 7 +++-- lib/private/DB/MDB2SchemaReader.php | 7 +++-- lib/private/DB/MDB2SchemaWriter.php | 3 +- lib/private/DB/MigrationException.php | 5 ++-- lib/private/DB/Migrator.php | 5 ++-- lib/private/DB/MySQLMigrator.php | 5 ++-- lib/private/DB/NoCheckMigrator.php | 5 ++-- lib/private/DB/OCSqlitePlatform.php | 5 ++-- lib/private/DB/OracleConnection.php | 5 ++-- lib/private/DB/OracleMigrator.php | 5 ++-- lib/private/DB/PgSqlTools.php | 3 +- lib/private/DB/PostgreSqlMigrator.php | 3 +- .../DB/QueryBuilder/CompositeExpression.php | 5 ++-- .../ExpressionBuilder/ExpressionBuilder.php | 7 +++-- .../MySqlExpressionBuilder.php | 5 ++-- .../OCIExpressionBuilder.php | 7 +++-- .../PgSqlExpressionBuilder.php | 5 ++-- lib/private/DB/QueryBuilder/Literal.php | 5 ++-- lib/private/DB/QueryBuilder/Parameter.php | 5 ++-- lib/private/DB/QueryBuilder/QueryBuilder.php | 7 +++-- lib/private/DB/QueryBuilder/QueryFunction.php | 5 ++-- lib/private/DB/QueryBuilder/QuoteHelper.php | 5 ++-- lib/private/DB/SQLiteMigrator.php | 5 ++-- lib/private/DB/SQLiteSessionInit.php | 5 ++-- lib/private/DatabaseException.php | 5 ++-- lib/private/DatabaseSetupException.php | 5 ++-- lib/private/DateTimeFormatter.php | 5 ++-- lib/private/DateTimeZone.php | 5 ++-- lib/private/Diagnostics/Event.php | 5 ++-- lib/private/Diagnostics/EventLogger.php | 5 ++-- lib/private/Diagnostics/NullEventLogger.php | 5 ++-- lib/private/Diagnostics/NullQueryLogger.php | 5 ++-- lib/private/Diagnostics/Query.php | 5 ++-- lib/private/Diagnostics/QueryLogger.php | 5 ++-- lib/private/Encryption/DecryptAll.php | 6 +++- lib/private/Encryption/EncryptionWrapper.php | 3 +- .../Exceptions/DecryptionFailedException.php | 3 +- .../EmptyEncryptionDataException.php | 3 +- .../Exceptions/EncryptionFailedException.php | 3 +- .../EncryptionHeaderKeyExistsException.php | 3 +- .../EncryptionHeaderToLargeException.php | 3 +- .../ModuleAlreadyExistsException.php | 3 +- .../ModuleDoesNotExistsException.php | 3 +- .../Exceptions/UnknownCipherException.php | 3 +- lib/private/Encryption/File.php | 4 ++- lib/private/Encryption/HookManager.php | 3 +- lib/private/Encryption/Keys/Storage.php | 5 ++-- lib/private/Encryption/Manager.php | 5 ++-- lib/private/Encryption/Update.php | 5 ++-- lib/private/Encryption/Util.php | 5 ++-- lib/private/Files/Cache/Cache.php | 9 +++--- lib/private/Files/Cache/CacheEntry.php | 5 ++-- lib/private/Files/Cache/FailedCache.php | 5 ++-- lib/private/Files/Cache/HomeCache.php | 5 ++-- lib/private/Files/Cache/HomePropagator.php | 5 ++-- .../Files/Cache/MoveFromCacheTrait.php | 5 ++-- lib/private/Files/Cache/Propagator.php | 5 ++-- lib/private/Files/Cache/Scanner.php | 7 +++-- lib/private/Files/Cache/Storage.php | 7 +++-- lib/private/Files/Cache/Updater.php | 5 ++-- lib/private/Files/Cache/Watcher.php | 5 ++-- lib/private/Files/Cache/Wrapper/CacheJail.php | 7 +++-- .../Cache/Wrapper/CachePermissionsMask.php | 5 ++-- .../Files/Cache/Wrapper/CacheWrapper.php | 7 +++-- lib/private/Files/Config/CachedMountInfo.php | 5 ++-- .../Files/Config/LazyStorageMountInfo.php | 5 ++-- .../Files/Config/MountProviderCollection.php | 5 ++-- lib/private/Files/Config/UserMountCache.php | 7 +++-- .../Files/Config/UserMountCacheListener.php | 5 ++-- lib/private/Files/FileInfo.php | 9 +++--- lib/private/Files/Filesystem.php | 9 +++--- .../Files/Mount/CacheMountProvider.php | 5 ++-- .../Files/Mount/LocalHomeMountProvider.php | 5 ++-- lib/private/Files/Mount/Manager.php | 5 ++-- lib/private/Files/Mount/MountPoint.php | 6 ++-- lib/private/Files/Mount/MoveableMount.php | 5 ++-- .../Files/Mount/ObjectHomeMountProvider.php | 7 +++-- lib/private/Files/Node/File.php | 9 +++--- lib/private/Files/Node/Folder.php | 7 +++-- lib/private/Files/Node/HookConnector.php | 5 ++-- lib/private/Files/Node/LazyRoot.php | 5 ++-- lib/private/Files/Node/Node.php | 9 +++--- lib/private/Files/Node/NonExistingFile.php | 5 ++-- lib/private/Files/Node/NonExistingFolder.php | 5 ++-- lib/private/Files/Node/Root.php | 9 +++--- .../ObjectStore/HomeObjectStoreStorage.php | 3 +- lib/private/Files/ObjectStore/Mapper.php | 5 ++-- lib/private/Files/ObjectStore/NoopScanner.php | 7 +++-- .../Files/ObjectStore/ObjectStoreStorage.php | 7 +++-- lib/private/Files/ObjectStore/Swift.php | 5 ++-- lib/private/Files/Storage/Common.php | 9 +++--- lib/private/Files/Storage/CommonTest.php | 5 ++-- lib/private/Files/Storage/DAV.php | 5 ++-- lib/private/Files/Storage/FailedStorage.php | 5 ++-- lib/private/Files/Storage/Flysystem.php | 5 ++-- lib/private/Files/Storage/Home.php | 5 ++-- lib/private/Files/Storage/Local.php | 7 +++-- .../Files/Storage/LocalTempFileTrait.php | 3 +- .../Files/Storage/PolyFill/CopyDirectory.php | 5 ++-- lib/private/Files/Storage/Storage.php | 5 ++-- lib/private/Files/Storage/StorageFactory.php | 5 ++-- lib/private/Files/Storage/Temporary.php | 5 ++-- .../Files/Storage/Wrapper/Availability.php | 5 ++-- .../Files/Storage/Wrapper/Encoding.php | 3 +- .../Files/Storage/Wrapper/Encryption.php | 7 +++-- lib/private/Files/Storage/Wrapper/Jail.php | 7 +++-- .../Files/Storage/Wrapper/PermissionsMask.php | 5 ++-- lib/private/Files/Storage/Wrapper/Quota.php | 5 ++-- lib/private/Files/Storage/Wrapper/Wrapper.php | 5 ++-- lib/private/Files/Stream/Close.php | 5 ++-- lib/private/Files/Stream/Dir.php | 5 ++-- lib/private/Files/Stream/Encryption.php | 5 ++-- lib/private/Files/Stream/OC.php | 5 ++-- lib/private/Files/Stream/Quota.php | 5 ++-- lib/private/Files/Stream/StaticStream.php | 5 ++-- lib/private/Files/Type/Detection.php | 8 +++-- lib/private/Files/Type/Loader.php | 3 +- lib/private/Files/Type/TemplateManager.php | 5 ++-- lib/private/Files/Utils/Scanner.php | 5 ++-- lib/private/Files/View.php | 10 ++++--- lib/private/ForbiddenException.php | 3 +- lib/private/Group/Backend.php | 5 ++-- lib/private/Group/Database.php | 6 ++-- lib/private/Group/Group.php | 7 +++-- lib/private/Group/Manager.php | 9 +++--- lib/private/Group/MetaData.php | 5 ++-- lib/private/HTTPHelper.php | 3 +- lib/private/HintException.php | 3 +- lib/private/Hooks/BasicEmitter.php | 5 ++-- lib/private/Hooks/Emitter.php | 5 ++-- lib/private/Hooks/EmitterTrait.php | 5 ++-- lib/private/Hooks/ForwardingEmitter.php | 5 ++-- lib/private/Hooks/LegacyEmitter.php | 5 ++-- lib/private/Hooks/PublicEmitter.php | 5 ++-- lib/private/Http/Client/Client.php | 5 ++-- lib/private/Http/Client/ClientService.php | 3 +- lib/private/Http/Client/Response.php | 5 ++-- lib/private/Installer.php | 9 +++--- lib/private/IntegrityCheck/Checker.php | 6 ++-- .../Exceptions/InvalidSignatureException.php | 3 +- .../IntegrityCheck/Helpers/AppLocator.php | 3 +- .../Helpers/EnvironmentHelper.php | 3 +- .../Helpers/FileAccessHelper.php | 3 +- .../ExcludeFileByNameFilterIterator.php | 4 ++- .../ExcludeFoldersByPathFilterIterator.php | 3 +- lib/private/L10N/Factory.php | 7 +++-- lib/private/L10N/L10N.php | 5 ++-- lib/private/LargeFileHelper.php | 3 +- lib/private/Lock/AbstractLockingProvider.php | 5 ++-- lib/private/Lock/DBLockingProvider.php | 7 +++-- lib/private/Lock/MemcacheLockingProvider.php | 5 ++-- lib/private/Lock/NoopLockingProvider.php | 5 ++-- lib/private/Log.php | 9 +++--- lib/private/Log/ErrorHandler.php | 3 +- lib/private/Log/Owncloud.php | 9 ++++-- lib/private/Log/Rotate.php | 3 +- lib/private/Log/Syslog.php | 5 ++-- lib/private/Mail/Mailer.php | 3 +- lib/private/Mail/Message.php | 3 +- lib/private/Memcache/APC.php | 5 ++-- lib/private/Memcache/APCu.php | 5 ++-- lib/private/Memcache/ArrayCache.php | 7 +++-- lib/private/Memcache/CADTrait.php | 5 ++-- lib/private/Memcache/CASTrait.php | 5 ++-- lib/private/Memcache/Cache.php | 5 ++-- lib/private/Memcache/Factory.php | 5 ++-- lib/private/Memcache/Memcached.php | 7 +++-- lib/private/Memcache/NullCache.php | 5 ++-- lib/private/Memcache/Redis.php | 7 +++-- lib/private/Memcache/XCache.php | 7 +++-- lib/private/Migration/BackgroundRepair.php | 3 +- lib/private/NaturalSort.php | 3 +- lib/private/NaturalSort_DefaultCollator.php | 5 ++-- lib/private/NavigationManager.php | 5 ++-- lib/private/NeedsUpdateException.php | 5 ++-- lib/private/NotSquareException.php | 3 +- lib/private/Notification/Action.php | 5 ++-- lib/private/Notification/Manager.php | 5 ++-- lib/private/Notification/Notification.php | 5 ++-- lib/private/OCS/Cloud.php | 5 ++-- lib/private/OCS/Config.php | 5 ++-- lib/private/OCS/CoreCapabilities.php | 5 ++-- lib/private/OCS/Exception.php | 5 ++-- lib/private/OCS/Person.php | 5 ++-- lib/private/OCS/PrivateData.php | 5 ++-- lib/private/OCS/Provider.php | 5 ++-- lib/private/OCS/Result.php | 5 ++-- lib/private/OCSClient.php | 5 ++-- lib/private/Preview.php | 9 +++--- lib/private/Preview/BMP.php | 3 +- lib/private/Preview/Bitmap.php | 5 ++-- lib/private/Preview/Font.php | 3 +- lib/private/Preview/GIF.php | 3 +- lib/private/Preview/Illustrator.php | 5 ++-- lib/private/Preview/Image.php | 7 +++-- lib/private/Preview/JPEG.php | 3 +- lib/private/Preview/MP3.php | 6 ++-- lib/private/Preview/MSOffice2003.php | 5 ++-- lib/private/Preview/MSOffice2007.php | 5 ++-- lib/private/Preview/MSOfficeDoc.php | 5 ++-- lib/private/Preview/MarkDown.php | 5 ++-- lib/private/Preview/Movie.php | 5 ++-- lib/private/Preview/Office.php | 5 ++-- lib/private/Preview/OpenDocument.php | 5 ++-- lib/private/Preview/PDF.php | 5 ++-- lib/private/Preview/PNG.php | 3 +- lib/private/Preview/Photoshop.php | 5 ++-- lib/private/Preview/Postscript.php | 5 ++-- lib/private/Preview/Provider.php | 7 +++-- lib/private/Preview/SVG.php | 5 ++-- lib/private/Preview/StarOffice.php | 5 ++-- lib/private/Preview/TIFF.php | 5 ++-- lib/private/Preview/TXT.php | 7 +++-- lib/private/Preview/XBitmap.php | 3 +- lib/private/PreviewManager.php | 7 +++-- lib/private/RedisFactory.php | 5 ++-- lib/private/Repair.php | 8 +++-- lib/private/Repair/AssetCache.php | 4 ++- lib/private/Repair/AvatarPermissions.php | 5 ++-- lib/private/Repair/CleanTags.php | 5 ++-- lib/private/Repair/Collation.php | 5 ++-- lib/private/Repair/DropOldJobs.php | 5 ++-- lib/private/Repair/DropOldTables.php | 6 ++-- lib/private/Repair/FillETags.php | 5 ++-- lib/private/Repair/InnoDB.php | 5 ++-- .../Repair/OldGroupMembershipShares.php | 5 ++-- lib/private/Repair/Preview.php | 3 +- lib/private/Repair/RemoveGetETagEntries.php | 3 +- lib/private/Repair/RemoveOldShares.php | 5 ++-- lib/private/Repair/RemoveRootShares.php | 5 ++-- lib/private/Repair/RepairInvalidShares.php | 5 ++-- lib/private/Repair/RepairLegacyStorages.php | 6 ++-- lib/private/Repair/RepairMimeTypes.php | 7 +++-- lib/private/Repair/SearchLuceneTables.php | 3 +- lib/private/Repair/SharePropagation.php | 5 ++-- lib/private/Repair/SqliteAutoincrement.php | 3 +- lib/private/Repair/UpdateCertificateStore.php | 3 +- lib/private/Repair/UpdateOutdatedOcsIds.php | 3 +- lib/private/RepairException.php | 3 +- lib/private/Route/CachingRouter.php | 7 +++-- lib/private/Route/Route.php | 5 ++-- lib/private/Route/Router.php | 9 +++--- lib/private/Search.php | 5 ++-- lib/private/Search/Provider/File.php | 3 +- lib/private/Search/Result/Audio.php | 3 +- lib/private/Search/Result/File.php | 3 +- lib/private/Search/Result/Folder.php | 3 +- lib/private/Search/Result/Image.php | 3 +- lib/private/Security/Bruteforce/Throttler.php | 2 ++ .../Security/CSP/ContentSecurityPolicy.php | 3 +- .../CSP/ContentSecurityPolicyManager.php | 3 +- lib/private/Security/CSRF/CsrfToken.php | 3 +- .../Security/CSRF/CsrfTokenGenerator.php | 3 +- .../Security/CSRF/CsrfTokenManager.php | 3 +- .../CSRF/TokenStorage/SessionStorage.php | 3 +- lib/private/Security/Certificate.php | 5 ++-- lib/private/Security/CertificateManager.php | 8 +++-- lib/private/Security/CredentialsManager.php | 3 +- lib/private/Security/Crypto.php | 5 ++-- lib/private/Security/Hasher.php | 3 +- lib/private/Security/SecureRandom.php | 3 +- lib/private/Security/TrustedDomainHelper.php | 4 ++- lib/private/Server.php | 12 ++++---- lib/private/ServerContainer.php | 5 ++-- lib/private/ServerNotAvailableException.php | 3 +- lib/private/ServiceUnavailableException.php | 5 ++-- lib/private/Session/CryptoSessionData.php | 5 ++-- lib/private/Session/CryptoWrapper.php | 7 +++-- lib/private/Session/Internal.php | 5 ++-- lib/private/Session/Memory.php | 5 ++-- lib/private/Session/Session.php | 5 ++-- lib/private/Setup.php | 9 +++--- lib/private/Setup/AbstractDatabase.php | 7 +++-- lib/private/Setup/MySQL.php | 7 +++-- lib/private/Setup/OCI.php | 8 +++-- lib/private/Setup/PostgreSQL.php | 9 +++--- lib/private/Setup/Sqlite.php | 3 +- lib/private/Share/Constants.php | 3 +- lib/private/Share/Helper.php | 7 +++-- lib/private/Share/MailNotifications.php | 7 +++-- lib/private/Share/SearchResultSorter.php | 3 +- lib/private/Share/Share.php | 12 ++++---- lib/private/Share20/DefaultShareProvider.php | 7 +++-- .../Share20/Exception/BackendError.php | 5 ++-- .../Share20/Exception/InvalidShare.php | 5 ++-- .../Share20/Exception/ProviderException.php | 5 ++-- lib/private/Share20/Hooks.php | 5 ++-- lib/private/Share20/Manager.php | 9 ++++-- lib/private/Share20/ProviderFactory.php | 5 ++-- lib/private/Share20/Share.php | 5 ++-- lib/private/Streamer.php | 5 ++-- lib/private/SubAdmin.php | 5 ++-- lib/private/SystemConfig.php | 7 +++-- lib/private/SystemTag/ManagerFactory.php | 5 ++-- lib/private/SystemTag/SystemTag.php | 5 ++-- lib/private/SystemTag/SystemTagManager.php | 5 ++-- .../SystemTag/SystemTagObjectMapper.php | 5 ++-- lib/private/TagManager.php | 3 +- lib/private/Tagging/Tag.php | 3 +- lib/private/Tagging/TagMapper.php | 3 +- lib/private/Tags.php | 7 +++-- lib/private/TempManager.php | 5 ++-- lib/private/Template/Base.php | 3 +- lib/private/Template/CSSResourceLocator.php | 5 ++-- lib/private/Template/JSResourceLocator.php | 5 ++-- lib/private/Template/ResourceLocator.php | 5 ++-- .../Template/ResourceNotFoundException.php | 5 ++-- lib/private/Template/TemplateFileLocator.php | 3 +- lib/private/TemplateLayout.php | 10 +++---- lib/private/URLGenerator.php | 7 +++-- lib/private/Updater.php | 7 +++-- lib/private/Updater/VersionCheck.php | 3 +- lib/private/User/Backend.php | 5 ++-- lib/private/User/Database.php | 10 ++++--- lib/private/User/LoginException.php | 5 ++-- lib/private/User/Manager.php | 9 +++--- lib/private/User/NoUserException.php | 3 +- lib/private/User/Session.php | 5 ++-- lib/private/User/User.php | 7 +++-- lib/private/legacy/api.php | 9 +++--- lib/private/legacy/app.php | 10 ++++--- lib/private/legacy/db.php | 7 +++-- lib/private/legacy/db/statementwrapper.php | 5 ++-- lib/private/legacy/defaults.php | 5 ++-- lib/private/legacy/eventsource.php | 5 ++-- lib/private/legacy/filechunking.php | 7 +++-- lib/private/legacy/files.php | 7 +++-- lib/private/legacy/group.php | 7 +++-- lib/private/legacy/group/backend.php | 9 +++--- lib/private/legacy/group/database.php | 5 ++-- lib/private/legacy/group/example.php | 5 ++-- lib/private/legacy/group/interface.php | 3 +- lib/private/legacy/helper.php | 9 +++--- lib/private/legacy/hook.php | 5 ++-- lib/private/legacy/image.php | 9 +++--- lib/private/legacy/json.php | 6 ++-- lib/private/legacy/l10n.php | 7 +++-- lib/private/legacy/l10n/string.php | 5 ++-- lib/private/legacy/ocs.php | 5 ++-- lib/private/legacy/ocs/cloud.php | 5 ++-- lib/private/legacy/ocs/config.php | 5 ++-- lib/private/legacy/ocs/person.php | 5 ++-- lib/private/legacy/ocs/privatedata.php | 5 ++-- lib/private/legacy/ocs/result.php | 5 ++-- lib/private/legacy/response.php | 3 +- lib/private/legacy/template.php | 11 ++++--- lib/private/legacy/template/functions.php | 7 +++-- lib/private/legacy/user.php | 9 +++--- lib/private/legacy/user/backend.php | 7 +++-- lib/private/legacy/user/interface.php | 3 +- lib/private/legacy/util.php | 11 +++---- lib/public/API.php | 6 ++-- lib/public/Activity/IConsumer.php | 5 ++-- lib/public/Activity/IEvent.php | 5 ++-- lib/public/Activity/IExtension.php | 5 ++-- lib/public/Activity/IManager.php | 5 ++-- lib/public/App.php | 5 ++-- lib/public/App/IAppManager.php | 5 ++-- lib/public/App/ManagerEvent.php | 3 +- lib/public/AppFramework/ApiController.php | 3 +- lib/public/AppFramework/App.php | 7 +++-- lib/public/AppFramework/Controller.php | 3 +- .../AppFramework/Db/DoesNotExistException.php | 3 +- lib/public/AppFramework/Db/Entity.php | 3 +- lib/public/AppFramework/Db/Mapper.php | 5 ++-- .../Db/MultipleObjectsReturnedException.php | 3 +- lib/public/AppFramework/Http.php | 3 +- .../Http/ContentSecurityPolicy.php | 3 +- .../AppFramework/Http/DataDisplayResponse.php | 5 ++-- .../Http/DataDownloadResponse.php | 3 +- lib/public/AppFramework/Http/DataResponse.php | 3 +- .../AppFramework/Http/DownloadResponse.php | 3 +- .../Http/EmptyContentSecurityPolicy.php | 3 +- .../AppFramework/Http/ICallbackResponse.php | 3 +- lib/public/AppFramework/Http/IOutput.php | 3 +- lib/public/AppFramework/Http/JSONResponse.php | 3 +- .../AppFramework/Http/NotFoundResponse.php | 3 +- lib/public/AppFramework/Http/OCSResponse.php | 3 +- .../AppFramework/Http/RedirectResponse.php | 3 +- lib/public/AppFramework/Http/Response.php | 3 +- .../AppFramework/Http/StreamResponse.php | 3 +- .../AppFramework/Http/TemplateResponse.php | 3 +- lib/public/AppFramework/IApi.php | 3 +- lib/public/AppFramework/IAppContainer.php | 5 ++-- lib/public/AppFramework/Middleware.php | 3 +- .../OCS/OCSBadRequestException.php | 1 + lib/public/AppFramework/OCS/OCSException.php | 1 + .../OCS/OCSForbiddenException.php | 1 + .../AppFramework/OCS/OCSNotFoundException.php | 1 + lib/public/AppFramework/OCSController.php | 3 +- lib/public/AppFramework/QueryException.php | 3 +- .../Utility/IControllerMethodReflector.php | 5 ++-- .../AppFramework/Utility/ITimeFactory.php | 3 +- lib/public/Authentication/IApacheBackend.php | 3 +- .../TwoFactorAuth/IProvider.php | 3 +- lib/public/AutoloadNotAllowedException.php | 3 +- lib/public/BackgroundJob.php | 7 +++-- lib/public/BackgroundJob/IJob.php | 7 +++-- lib/public/BackgroundJob/IJobList.php | 7 +++-- lib/public/Capabilities/ICapability.php | 5 ++-- lib/public/Command/IBus.php | 5 ++-- lib/public/Command/ICommand.php | 5 ++-- lib/public/Comments/CommentsEntityEvent.php | 5 ++-- lib/public/Comments/CommentsEvent.php | 5 ++-- lib/public/Comments/IComment.php | 3 +- lib/public/Comments/ICommentsManager.php | 5 ++-- .../Comments/ICommentsManagerFactory.php | 3 +- .../Comments/IllegalIDChangeException.php | 3 +- .../Comments/MessageTooLongException.php | 3 +- lib/public/Comments/NotFoundException.php | 3 +- lib/public/Config.php | 5 ++-- lib/public/Console/ConsoleEvent.php | 5 ++-- lib/public/Constants.php | 7 +++-- lib/public/Contacts.php | 3 +- lib/public/Contacts/IManager.php | 3 +- lib/public/DB.php | 7 +++-- .../DB/QueryBuilder/ICompositeExpression.php | 7 +++-- .../DB/QueryBuilder/IExpressionBuilder.php | 7 +++-- lib/public/DB/QueryBuilder/ILiteral.php | 5 ++-- lib/public/DB/QueryBuilder/IParameter.php | 5 ++-- lib/public/DB/QueryBuilder/IQueryBuilder.php | 5 ++-- lib/public/DB/QueryBuilder/IQueryFunction.php | 5 ++-- lib/public/Defaults.php | 4 ++- lib/public/Diagnostics/IEvent.php | 5 ++-- lib/public/Diagnostics/IEventLogger.php | 5 ++-- lib/public/Diagnostics/IQuery.php | 5 ++-- lib/public/Diagnostics/IQueryLogger.php | 5 ++-- .../Exceptions/GenericEncryptionException.php | 3 +- lib/public/Encryption/IEncryptionModule.php | 3 +- lib/public/Encryption/IFile.php | 3 +- lib/public/Encryption/IManager.php | 5 ++-- lib/public/Encryption/Keys/IStorage.php | 5 ++-- lib/public/Files.php | 7 +++-- lib/public/Files/AlreadyExistsException.php | 5 ++-- lib/public/Files/Cache/ICache.php | 5 ++-- lib/public/Files/Cache/ICacheEntry.php | 5 ++-- lib/public/Files/Cache/IPropagator.php | 5 ++-- lib/public/Files/Cache/IScanner.php | 5 ++-- lib/public/Files/Cache/IUpdater.php | 5 ++-- lib/public/Files/Cache/IWatcher.php | 5 ++-- lib/public/Files/Config/ICachedMountInfo.php | 5 ++-- .../Files/Config/IHomeMountProvider.php | 5 ++-- lib/public/Files/Config/IMountProvider.php | 5 ++-- .../Files/Config/IMountProviderCollection.php | 5 ++-- lib/public/Files/Config/IUserMountCache.php | 5 ++-- lib/public/Files/EntityTooLargeException.php | 3 +- lib/public/Files/File.php | 7 +++-- lib/public/Files/FileInfo.php | 9 +++--- lib/public/Files/FileNameTooLongException.php | 3 +- lib/public/Files/Folder.php | 5 ++-- lib/public/Files/ForbiddenException.php | 5 ++-- lib/public/Files/IHomeStorage.php | 5 ++-- lib/public/Files/IMimeTypeDetector.php | 5 ++-- lib/public/Files/IMimeTypeLoader.php | 3 +- lib/public/Files/IRootFolder.php | 3 +- .../Files/InvalidCharacterInPathException.php | 3 +- lib/public/Files/InvalidContentException.php | 3 +- lib/public/Files/InvalidPathException.php | 3 +- lib/public/Files/LockNotAcquiredException.php | 5 ++-- lib/public/Files/Mount/IMountManager.php | 5 ++-- lib/public/Files/Mount/IMountPoint.php | 5 ++-- lib/public/Files/Node.php | 7 +++-- lib/public/Files/NotEnoughSpaceException.php | 5 ++-- lib/public/Files/NotFoundException.php | 5 ++-- lib/public/Files/NotPermittedException.php | 5 ++-- lib/public/Files/ObjectStore/IObjectStore.php | 3 +- lib/public/Files/ReservedWordException.php | 3 +- lib/public/Files/Storage.php | 5 ++-- lib/public/Files/Storage/ILockingStorage.php | 5 ++-- lib/public/Files/Storage/INotifyStorage.php | 2 ++ lib/public/Files/Storage/IStorage.php | 5 ++-- lib/public/Files/Storage/IStorageFactory.php | 5 ++-- lib/public/Files/StorageAuthException.php | 3 +- .../Files/StorageBadConfigException.php | 3 +- .../Files/StorageConnectionException.php | 3 +- lib/public/Files/StorageInvalidException.php | 5 ++-- .../Files/StorageNotAvailableException.php | 5 ++-- lib/public/Files/StorageTimeoutException.php | 3 +- lib/public/Files/UnseekableException.php | 3 +- lib/public/GroupInterface.php | 3 +- lib/public/Http/Client/IClient.php | 3 +- lib/public/Http/Client/IClientService.php | 3 +- lib/public/Http/Client/IResponse.php | 5 ++-- lib/public/IAddressBook.php | 3 +- lib/public/IAppConfig.php | 6 ++-- lib/public/IAvatar.php | 9 +++--- lib/public/IAvatarManager.php | 5 ++-- lib/public/ICache.php | 3 +- lib/public/ICacheFactory.php | 5 ++-- lib/public/ICertificate.php | 5 ++-- lib/public/ICertificateManager.php | 5 ++-- lib/public/IConfig.php | 7 +++-- lib/public/IContainer.php | 5 ++-- lib/public/IDBConnection.php | 7 +++-- lib/public/IDateTimeFormatter.php | 5 ++-- lib/public/IDateTimeZone.php | 5 ++-- lib/public/IDb.php | 3 +- lib/public/IEventSource.php | 5 ++-- lib/public/IGroup.php | 5 ++-- lib/public/IGroupManager.php | 7 +++-- lib/public/IHelper.php | 3 +- lib/public/IImage.php | 5 ++-- lib/public/IL10N.php | 5 ++-- lib/public/ILogger.php | 3 +- lib/public/IMemcache.php | 5 ++-- lib/public/IMemcacheTTL.php | 5 ++-- lib/public/INavigationManager.php | 5 ++-- lib/public/IPreview.php | 7 +++-- lib/public/IRequest.php | 4 ++- lib/public/ISearch.php | 3 +- lib/public/IServerContainer.php | 9 +++--- lib/public/ISession.php | 3 +- lib/public/ITagManager.php | 3 +- lib/public/ITags.php | 3 +- lib/public/ITempManager.php | 5 ++-- lib/public/IURLGenerator.php | 5 ++-- lib/public/IUser.php | 5 ++-- lib/public/IUserBackend.php | 3 +- lib/public/IUserManager.php | 5 ++-- lib/public/IUserSession.php | 5 ++-- lib/public/Image.php | 3 +- lib/public/JSON.php | 3 +- lib/public/L10N/IFactory.php | 5 ++-- lib/public/Lock/ILockingProvider.php | 5 ++-- lib/public/Lock/LockedException.php | 5 ++-- lib/public/Mail/IMailer.php | 5 ++-- lib/public/Migration/IOutput.php | 3 +- lib/public/Migration/IRepairStep.php | 3 +- lib/public/Notification/IAction.php | 5 ++-- lib/public/Notification/IApp.php | 5 ++-- lib/public/Notification/IManager.php | 5 ++-- lib/public/Notification/INotification.php | 5 ++-- lib/public/Notification/INotifier.php | 5 ++-- lib/public/PreConditionNotMetException.php | 3 +- lib/public/Preview/IProvider.php | 5 ++-- lib/public/Response.php | 5 ++-- lib/public/Route/IRoute.php | 5 ++-- lib/public/Route/IRouter.php | 7 +++-- lib/public/SabrePluginEvent.php | 5 ++-- lib/public/SabrePluginException.php | 5 ++-- lib/public/Search/PagedProvider.php | 5 ++-- lib/public/Search/Provider.php | 3 +- lib/public/Search/Result.php | 3 +- .../IContentSecurityPolicyManager.php | 3 +- lib/public/Security/ICredentialsManager.php | 3 +- lib/public/Security/ICrypto.php | 3 +- lib/public/Security/IHasher.php | 3 +- lib/public/Security/ISecureRandom.php | 3 +- lib/public/Security/StringUtils.php | 3 +- .../SessionNotAvailableException.php | 3 +- lib/public/Share.php | 7 +++-- .../Exceptions/GenericShareException.php | 5 ++-- .../Exceptions/IllegalIDChangeException.php | 5 ++-- lib/public/Share/Exceptions/ShareNotFound.php | 5 ++-- lib/public/Share/IManager.php | 5 ++-- lib/public/Share/IProviderFactory.php | 5 ++-- lib/public/Share/IShare.php | 5 ++-- lib/public/Share/IShareProvider.php | 5 ++-- lib/public/Share_Backend.php | 5 ++-- lib/public/Share_Backend_Collection.php | 5 ++-- lib/public/Share_Backend_File_Dependent.php | 5 ++-- lib/public/SystemTag/ISystemTag.php | 3 +- lib/public/SystemTag/ISystemTagManager.php | 5 ++-- .../SystemTag/ISystemTagManagerFactory.php | 3 +- .../SystemTag/ISystemTagObjectMapper.php | 5 ++-- lib/public/SystemTag/ManagerEvent.php | 5 ++-- lib/public/SystemTag/MapperEvent.php | 5 ++-- .../SystemTag/SystemTagsEntityEvent.php | 3 +- .../SystemTag/TagAlreadyExistsException.php | 3 +- lib/public/SystemTag/TagNotFoundException.php | 5 ++-- lib/public/Template.php | 5 ++-- lib/public/User.php | 5 ++-- lib/public/UserInterface.php | 3 +- lib/public/Util.php | 9 +++--- ocs/providers.php | 3 +- ocs/routes.php | 6 ++-- ocs/v1.php | 9 ++++-- ocs/v2.php | 3 +- public.php | 7 +++-- remote.php | 7 +++-- settings/Application.php | 9 +++--- settings/ChangePassword/Controller.php | 6 ++-- settings/Controller/AppSettingsController.php | 5 ++-- .../Controller/AuthSettingsController.php | 4 ++- settings/Controller/CertificateController.php | 5 ++-- settings/Controller/CheckSetupController.php | 7 +++-- settings/Controller/EncryptionController.php | 3 +- settings/Controller/GroupsController.php | 5 ++-- settings/Controller/LogSettingsController.php | 8 +++-- .../Controller/MailSettingsController.php | 5 ++-- .../Controller/SecuritySettingsController.php | 3 +- settings/Controller/UsersController.php | 9 +++--- settings/Middleware/SubadminMiddleware.php | 5 ++-- settings/admin.php | 11 +++---- settings/ajax/disableapp.php | 3 +- settings/ajax/enableapp.php | 7 +++-- settings/ajax/installapp.php | 5 ++-- settings/ajax/navigationdetect.php | 5 ++-- settings/ajax/setlanguage.php | 7 +++-- settings/ajax/setquota.php | 5 ++-- settings/ajax/togglegroups.php | 5 ++-- settings/ajax/togglesubadmins.php | 3 +- settings/ajax/uninstallapp.php | 5 ++-- settings/ajax/updateapp.php | 5 ++-- settings/help.php | 7 +++-- settings/languageCodes.php | 5 ++-- settings/personal.php | 11 +++---- settings/routes.php | 9 +++--- settings/users.php | 9 +++--- status.php | 5 ++-- version.php | 6 ++-- 1485 files changed, 4959 insertions(+), 2875 deletions(-) diff --git a/AUTHORS b/AUTHORS index b7f1616f78f5c..296a80d90946c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,6 @@ -ownCloud is written by: +Nextcloud is written by: - AW-UC + - Aaron Wood - Achim Königs - Adam Williamson - Administrator @@ -18,14 +19,16 @@ ownCloud is written by: - Bernhard Posselt - Bernhard Reiter - Birk Borkason + - Bjoern Schiessle - Björn Schießle - Borjan Tchakaloff - Brice Maron - Byron Marohn - - C Montero-Luque - Carla Schroder - Carlos Cerrillo + - Carlos Damken - Christian Berendt + - Christian Jürges - Christian Kampka - Christian Weiske - Christoph Schaefer @@ -40,12 +43,13 @@ ownCloud is written by: - Daniel Molkentin - Daniel Tosello - David Prévot + - David Toledo - Dominik Schmidt - - Edward Crompton - Fabian Henze - Faruk Uzun - Felix Böhm - Felix Moeller + - Florian Preinstorfer - Florian Pritz - Florin Peter - Francesco Rovelli @@ -66,11 +70,13 @@ ownCloud is written by: - Jens-Christian Fischer - Jesús Macias - Joachim Bauch - - Joas Schilling + - Joachim Sokolowski + - Joas Schilling - Johan Björk + - Johannes Ernst - Johannes Willnecker - Jonny007-MKD <1-23-4-5@web.de> - - Jost Baron + - Juan Pablo Villafáñez - Julius Haertl - Jörn Friedrich Dreyer - Kamil Domanski @@ -119,7 +125,6 @@ ownCloud is written by: - Phil Davis - Philipp Kapfer - Philippe Jung - - Philippe Le Brouster - Pierre Jochem - Pierre Ozoux - Piotr Filiciak @@ -132,9 +137,9 @@ ownCloud is written by: - RealRancor - Remco Brenninkmeijer - Renaud Fortier - - Robin Appelman + - Robin Appelman - Robin McCorkell - - Roeland Jago Douma + - Roeland Jago Douma - Roman Geber - Roman Kreisel - Ross Nicoll @@ -145,6 +150,8 @@ ownCloud is written by: - Sebastian Döll - Senorsen - Serge Martin + - Sergio Bertolin + - Sergio Bertolín - Simon Könnecke - Sjors van der Pluijm - Stefan Herbrechtsmeier @@ -154,13 +161,16 @@ ownCloud is written by: - Stephan Peijnik - TheSFReader - Thibaut GRIDEL + - Thomas Citharel - Thomas Müller + - Thomas Pulzer - Thomas Tanghus - Tigran Mkrtchyan - Tim Dettrick - Tobia De Koninck - Tobias Kaminsky - Tom Needham + - Torben Dannhauer - Victor Dubiniuk - Viktor Szépe - Vincent Chan @@ -174,9 +184,11 @@ ownCloud is written by: - cmeh - dampfklon - davidgumberg + - davitol - derkostka - eduardo - fabian + - felixboehm - goodkiller - helix84 - hkjolhede @@ -184,12 +196,14 @@ ownCloud is written by: - j-ed - jknockaert - josh4trunks + - karakayasemi - macjohnny - martin-rueegg - martin.mattel@diemattels.at - michag86 - mmccarn - nishiki + - oparoz - root - scambra - scolebrook diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php index ea5fb0286bf6a..a085b74585da5 100644 --- a/apps/admin_audit/appinfo/app.php +++ b/apps/admin_audit/appinfo/app.php @@ -1,5 +1,8 @@ * @author Lukas Reschke * * @license GNU AGPL version 3 or any later version diff --git a/apps/admin_audit/lib/actions/action.php b/apps/admin_audit/lib/actions/action.php index 6aafacc618914..0525910f8ddcd 100644 --- a/apps/admin_audit/lib/actions/action.php +++ b/apps/admin_audit/lib/actions/action.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Lukas Reschke + * * @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/admin_audit/lib/actions/auth.php b/apps/admin_audit/lib/actions/auth.php index 4061ca89c4b67..c035cf785fe04 100644 --- a/apps/admin_audit/lib/actions/auth.php +++ b/apps/admin_audit/lib/actions/auth.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Lukas Reschke + * * @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/admin_audit/lib/actions/files.php b/apps/admin_audit/lib/actions/files.php index 46da0ade6bbee..d7b35aa2d3ea5 100644 --- a/apps/admin_audit/lib/actions/files.php +++ b/apps/admin_audit/lib/actions/files.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Lukas Reschke + * * @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/admin_audit/lib/actions/groupmanagement.php b/apps/admin_audit/lib/actions/groupmanagement.php index 4ece8994f39d2..a341e4de27bde 100644 --- a/apps/admin_audit/lib/actions/groupmanagement.php +++ b/apps/admin_audit/lib/actions/groupmanagement.php @@ -2,6 +2,9 @@ /** * @copyright Copyright (c) 2016 Bjoern Schiessle * + * @author Bjoern Schiessle + * @author Lukas Reschke + * * @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/admin_audit/lib/actions/sharing.php b/apps/admin_audit/lib/actions/sharing.php index 5f26374846584..85afeccd6fc88 100644 --- a/apps/admin_audit/lib/actions/sharing.php +++ b/apps/admin_audit/lib/actions/sharing.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Lukas Reschke + * * @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/admin_audit/lib/actions/trashbin.php b/apps/admin_audit/lib/actions/trashbin.php index f665698678ecd..fd7869b1b2253 100644 --- a/apps/admin_audit/lib/actions/trashbin.php +++ b/apps/admin_audit/lib/actions/trashbin.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 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/admin_audit/lib/actions/usermanagement.php b/apps/admin_audit/lib/actions/usermanagement.php index 5005d15096183..925d8b0a7153e 100644 --- a/apps/admin_audit/lib/actions/usermanagement.php +++ b/apps/admin_audit/lib/actions/usermanagement.php @@ -2,6 +2,9 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Bjoern Schiessle + * @author Lukas Reschke + * * @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/admin_audit/lib/actions/versions.php b/apps/admin_audit/lib/actions/versions.php index 006c33bf04f71..3e690e12a2529 100644 --- a/apps/admin_audit/lib/actions/versions.php +++ b/apps/admin_audit/lib/actions/versions.php @@ -2,6 +2,8 @@ /** * @copyright 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/admin_audit/lib/auditlogger.php b/apps/admin_audit/lib/auditlogger.php index 050dc9c475db7..674282b5fe2d3 100644 --- a/apps/admin_audit/lib/auditlogger.php +++ b/apps/admin_audit/lib/auditlogger.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 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/comments/appinfo/app.php b/apps/comments/appinfo/app.php index b060a5db1cae9..00085cf914892 100644 --- a/apps/comments/appinfo/app.php +++ b/apps/comments/appinfo/app.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/comments/lib/Activity/Extension.php b/apps/comments/lib/Activity/Extension.php index ef800e88abc22..6e5ac894c0f75 100644 --- a/apps/comments/lib/Activity/Extension.php +++ b/apps/comments/lib/Activity/Extension.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/comments/lib/Activity/Listener.php b/apps/comments/lib/Activity/Listener.php index 7c6970df837f4..ad1e277414888 100644 --- a/apps/comments/lib/Activity/Listener.php +++ b/apps/comments/lib/Activity/Listener.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php index 45e9fee620e13..ebc1d09e3f110 100644 --- a/apps/dav/appinfo/app.php +++ b/apps/dav/appinfo/app.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/appinfo/register_command.php b/apps/dav/appinfo/register_command.php index ef18dd77e6821..7595c1b833555 100644 --- a/apps/dav/appinfo/register_command.php +++ b/apps/dav/appinfo/register_command.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php index 975fd34ae8ec9..490f4477a7b2a 100644 --- a/apps/dav/appinfo/v1/caldav.php +++ b/apps/dav/appinfo/v1/caldav.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Christoph Wurst + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/dav/appinfo/v1/carddav.php b/apps/dav/appinfo/v1/carddav.php index e2d8944fcb6a3..005946830ae38 100644 --- a/apps/dav/appinfo/v1/carddav.php +++ b/apps/dav/appinfo/v1/carddav.php @@ -1,10 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Christoph Wurst + * @author Georg Ehrke + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php index 2202cbb977cab..286629b20f97e 100644 --- a/apps/dav/appinfo/v1/publicwebdav.php +++ b/apps/dav/appinfo/v1/publicwebdav.php @@ -1,15 +1,17 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php index 2af49177ce146..59d4f05bdc58c 100644 --- a/apps/dav/appinfo/v1/webdav.php +++ b/apps/dav/appinfo/v1/webdav.php @@ -1,10 +1,12 @@ * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/appinfo/v2/remote.php b/apps/dav/appinfo/v2/remote.php index 4e9cf8fd08220..ab05e376503d9 100644 --- a/apps/dav/appinfo/v2/remote.php +++ b/apps/dav/appinfo/v2/remote.php @@ -1,8 +1,9 @@ * - * @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/dav/bin/chunkperf.php b/apps/dav/bin/chunkperf.php index a193f001a4185..bd976e74384b4 100644 --- a/apps/dav/bin/chunkperf.php +++ b/apps/dav/bin/chunkperf.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php index b7b24ba763207..fa9d6e29fdeab 100644 --- a/apps/dav/lib/AppInfo/Application.php +++ b/apps/dav/lib/AppInfo/Application.php @@ -1,10 +1,12 @@ - * @author Joas Schilling + * @author Georg Ehrke + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php index 573713d2a9886..31a6c73f48485 100644 --- a/apps/dav/lib/CalDAV/BirthdayService.php +++ b/apps/dav/lib/CalDAV/BirthdayService.php @@ -1,9 +1,11 @@ + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 565ad0ec663a9..1f337ab0143bd 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Stefan Weil + * @author Thomas Citharel * @author Thomas Müller * - * @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/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index 785bb5699e241..821a71babb11f 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/dav/lib/CalDAV/CalendarHome.php b/apps/dav/lib/CalDAV/CalendarHome.php index 7652ff44d7cdb..f84b0c863c6d8 100644 --- a/apps/dav/lib/CalDAV/CalendarHome.php +++ b/apps/dav/lib/CalDAV/CalendarHome.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/CalDAV/CalendarObject.php b/apps/dav/lib/CalDAV/CalendarObject.php index b4a58b52093f3..db3c7e1929c85 100644 --- a/apps/dav/lib/CalDAV/CalendarObject.php +++ b/apps/dav/lib/CalDAV/CalendarObject.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/CalDAV/CalendarRoot.php b/apps/dav/lib/CalDAV/CalendarRoot.php index 83fbab6ae0e3d..2c1c8bb4ef27d 100644 --- a/apps/dav/lib/CalDAV/CalendarRoot.php +++ b/apps/dav/lib/CalDAV/CalendarRoot.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index d9f2ec674f051..843da65ce252b 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/CardDAV/AddressBook.php b/apps/dav/lib/CardDAV/AddressBook.php index 8b1b600ec3de4..76633511504c7 100644 --- a/apps/dav/lib/CardDAV/AddressBook.php +++ b/apps/dav/lib/CardDAV/AddressBook.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php index b26f81766c6a7..c83ee613d3756 100644 --- a/apps/dav/lib/CardDAV/AddressBookImpl.php +++ b/apps/dav/lib/CardDAV/AddressBookImpl.php @@ -1,9 +1,11 @@ + * @author Georg Ehrke * @author Thomas Müller * - * @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/dav/lib/CardDAV/AddressBookRoot.php b/apps/dav/lib/CardDAV/AddressBookRoot.php index 99c36c2e767e3..41c858e35ecca 100644 --- a/apps/dav/lib/CardDAV/AddressBookRoot.php +++ b/apps/dav/lib/CardDAV/AddressBookRoot.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 39f76a4b42065..f8552f1323e11 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -1,12 +1,15 @@ + * @author Bjoern Schiessle * @author Björn Schießle - * @author Joas Schilling + * @author Georg Ehrke + * @author Joas Schilling * @author Stefan Weil * @author Thomas Müller * - * @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/dav/lib/CardDAV/ContactsManager.php b/apps/dav/lib/CardDAV/ContactsManager.php index a9f35d53d76a2..3f2019d582b49 100644 --- a/apps/dav/lib/CardDAV/ContactsManager.php +++ b/apps/dav/lib/CardDAV/ContactsManager.php @@ -1,8 +1,11 @@ + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php index c8d9b94c2675f..69c96f5ed6510 100644 --- a/apps/dav/lib/CardDAV/Converter.php +++ b/apps/dav/lib/CardDAV/Converter.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php index fcd36b3ff35a3..31e8ed6a5e5db 100644 --- a/apps/dav/lib/CardDAV/ImageExportPlugin.php +++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Georg Ehrke + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/CardDAV/Plugin.php b/apps/dav/lib/CardDAV/Plugin.php index e02cc5686b8ed..b291a8360e196 100644 --- a/apps/dav/lib/CardDAV/Plugin.php +++ b/apps/dav/lib/CardDAV/Plugin.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/CardDAV/SyncJob.php b/apps/dav/lib/CardDAV/SyncJob.php index c6ffcdfbe510c..f0f8d51c2ca77 100644 --- a/apps/dav/lib/CardDAV/SyncJob.php +++ b/apps/dav/lib/CardDAV/SyncJob.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php index 859b636c73a62..1ad37da6bfe4b 100644 --- a/apps/dav/lib/CardDAV/SyncService.php +++ b/apps/dav/lib/CardDAV/SyncService.php @@ -1,10 +1,11 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/lib/CardDAV/UserAddressBooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php index 734e3829e6906..2ac89f302fdf2 100644 --- a/apps/dav/lib/CardDAV/UserAddressBooks.php +++ b/apps/dav/lib/CardDAV/UserAddressBooks.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/CardDAV/Xml/Groups.php b/apps/dav/lib/CardDAV/Xml/Groups.php index b39615db033d3..1b439b6b82119 100644 --- a/apps/dav/lib/CardDAV/Xml/Groups.php +++ b/apps/dav/lib/CardDAV/Xml/Groups.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Command/CreateAddressBook.php b/apps/dav/lib/Command/CreateAddressBook.php index d8955e84a20ab..a0416966f054e 100644 --- a/apps/dav/lib/Command/CreateAddressBook.php +++ b/apps/dav/lib/Command/CreateAddressBook.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Command/CreateCalendar.php b/apps/dav/lib/Command/CreateCalendar.php index d7f82dd0e524f..7d07ad0327986 100644 --- a/apps/dav/lib/Command/CreateCalendar.php +++ b/apps/dav/lib/Command/CreateCalendar.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Command/SyncBirthdayCalendar.php b/apps/dav/lib/Command/SyncBirthdayCalendar.php index a1cebae6fb649..a99e2ea4b89ec 100644 --- a/apps/dav/lib/Command/SyncBirthdayCalendar.php +++ b/apps/dav/lib/Command/SyncBirthdayCalendar.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/lib/Command/SyncSystemAddressBook.php b/apps/dav/lib/Command/SyncSystemAddressBook.php index b62a42d7b90ef..e642d9af5aa6d 100644 --- a/apps/dav/lib/Command/SyncSystemAddressBook.php +++ b/apps/dav/lib/Command/SyncSystemAddressBook.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Comments/CommentNode.php b/apps/dav/lib/Comments/CommentNode.php index 5c22f8a8a71e3..101e3d8772175 100644 --- a/apps/dav/lib/Comments/CommentNode.php +++ b/apps/dav/lib/Comments/CommentNode.php @@ -1,8 +1,10 @@ + * @author Vincent Petry * - * @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/dav/lib/Comments/CommentsPlugin.php b/apps/dav/lib/Comments/CommentsPlugin.php index 33096f3886ecf..f3cf4fb2030e3 100644 --- a/apps/dav/lib/Comments/CommentsPlugin.php +++ b/apps/dav/lib/Comments/CommentsPlugin.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Vincent Petry * - * @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/dav/lib/Comments/EntityCollection.php b/apps/dav/lib/Comments/EntityCollection.php index 7310b63d99326..e84fbb50566bd 100644 --- a/apps/dav/lib/Comments/EntityCollection.php +++ b/apps/dav/lib/Comments/EntityCollection.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/dav/lib/Comments/EntityTypeCollection.php b/apps/dav/lib/Comments/EntityTypeCollection.php index b5327519c1698..1f7f36dffab22 100644 --- a/apps/dav/lib/Comments/EntityTypeCollection.php +++ b/apps/dav/lib/Comments/EntityTypeCollection.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/dav/lib/Comments/RootCollection.php b/apps/dav/lib/Comments/RootCollection.php index aa3fe8586a388..839eb34aa9096 100644 --- a/apps/dav/lib/Comments/RootCollection.php +++ b/apps/dav/lib/Comments/RootCollection.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/dav/lib/Connector/LegacyDAVACL.php b/apps/dav/lib/Connector/LegacyDAVACL.php index 719b73a9fda21..83b08ec44fb20 100644 --- a/apps/dav/lib/Connector/LegacyDAVACL.php +++ b/apps/dav/lib/Connector/LegacyDAVACL.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php index 38d91f086c79e..94fa370a8735b 100644 --- a/apps/dav/lib/Connector/PublicAuth.php +++ b/apps/dav/lib/Connector/PublicAuth.php @@ -1,14 +1,16 @@ + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/AppEnabledPlugin.php b/apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php index cb061d6a30985..a806659351c27 100644 --- a/apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php +++ b/apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php index 3f9e16b04c506..bd80b17b640d1 100644 --- a/apps/dav/lib/Connector/Sabre/Auth.php +++ b/apps/dav/lib/Connector/Sabre/Auth.php @@ -1,9 +1,12 @@ * @author Bart Visscher * @author Christoph Wurst * @author Jakob Sack + * @author Joas Schilling * @author Lukas Reschke * @author Markus Goetz * @author Michael Gapczynski @@ -11,7 +14,6 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php index 3f2cd1b1ae5f0..5d39d83a2870d 100644 --- a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php +++ b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Connector/Sabre/ChecksumList.php b/apps/dav/lib/Connector/Sabre/ChecksumList.php index f137222accabb..17e04a4c7a8cc 100644 --- a/apps/dav/lib/Connector/Sabre/ChecksumList.php +++ b/apps/dav/lib/Connector/Sabre/ChecksumList.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php index c129f50d35d9a..e48105f6d7aa3 100644 --- a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php index 49b6a7b2de76d..b8f55d9e2135f 100644 --- a/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php +++ b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/CustomPropertiesBackend.php b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php index b319350c7f09e..e9118cfc9e089 100644 --- a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php +++ b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php @@ -1,10 +1,12 @@ * @author Lukas Reschke * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/DavAclPlugin.php b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php index bf305171a0904..6b6d78932628a 100644 --- a/apps/dav/lib/Connector/Sabre/DavAclPlugin.php +++ b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index ddab34605f3a5..25cca40a88980 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -1,17 +1,18 @@ * @author Bart Visscher * @author Björn Schießle * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php index 843923ff6db2d..102c902aed074 100644 --- a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php +++ b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php b/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php index d16e93bb6379d..09ced83803740 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php +++ b/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php @@ -1,10 +1,11 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/Exception/FileLocked.php b/apps/dav/lib/Connector/Sabre/Exception/FileLocked.php index fea44f8f5cbc5..8b9fb83e9aaf0 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/FileLocked.php +++ b/apps/dav/lib/Connector/Sabre/Exception/FileLocked.php @@ -1,12 +1,13 @@ * @author Morris Jobke * @author Owen Winkler * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/Exception/Forbidden.php b/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php index f2467e6b29872..d5e4e253c97d8 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php +++ b/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php b/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php index 7951a0a89b7bb..9d60b22761291 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php +++ b/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php b/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php index 6537da3d56dea..2a90ceeb7ff14 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php +++ b/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php @@ -1,9 +1,10 @@ + * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php b/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php index 99e3c222c7548..5edead6c1e374 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php +++ b/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php @@ -1,10 +1,11 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php index addacec9b0350..56a8b2b764153 100644 --- a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php +++ b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php @@ -1,12 +1,14 @@ * @author Pierre Jochem - * @author Robin Appelman + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/FakeLockerPlugin.php b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php index 22d2beec51a97..c330e5d203a93 100644 --- a/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index 6ecb6e6206624..f2c69eccff9d5 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -1,19 +1,20 @@ * @author Björn Schießle * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Owen Winkler - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index 0a2e6713cb483..203c0a4683f34 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -1,15 +1,17 @@ + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/FilesReportPlugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php index d4e1cbe3b20b1..5b96f4f0f648e 100644 --- a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/LockPlugin.php b/apps/dav/lib/Connector/Sabre/LockPlugin.php index 7ab0993f32242..de0aaed4c69ff 100644 --- a/apps/dav/lib/Connector/Sabre/LockPlugin.php +++ b/apps/dav/lib/Connector/Sabre/LockPlugin.php @@ -1,11 +1,12 @@ - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * - * @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/dav/lib/Connector/Sabre/MaintenancePlugin.php b/apps/dav/lib/Connector/Sabre/MaintenancePlugin.php index 6e9a5930b78c5..57284b224450e 100644 --- a/apps/dav/lib/Connector/Sabre/MaintenancePlugin.php +++ b/apps/dav/lib/Connector/Sabre/MaintenancePlugin.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php index c41b5137fde42..a63282c75e23d 100644 --- a/apps/dav/lib/Connector/Sabre/Node.php +++ b/apps/dav/lib/Connector/Sabre/Node.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Björn Schießle @@ -8,12 +10,11 @@ * @author Klaas Freitag * @author Markus Goetz * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php index d8c1d71e7f173..e872ea58279ad 100644 --- a/apps/dav/lib/Connector/Sabre/ObjectTree.php +++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php @@ -1,13 +1,16 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling + * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php index 1985d8f8b3f43..a592ed8091809 100644 --- a/apps/dav/lib/Connector/Sabre/Principal.php +++ b/apps/dav/lib/Connector/Sabre/Principal.php @@ -1,5 +1,7 @@ * @author Jakob Sack * @author Jörn Friedrich Dreyer @@ -9,7 +11,6 @@ * @author Thomas Tanghus * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php index a093c52851c86..0682fca94ea05 100644 --- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php +++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php @@ -1,13 +1,14 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author scambra * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/Server.php b/apps/dav/lib/Connector/Sabre/Server.php index 421fc64422df8..9915ffdba03b4 100644 --- a/apps/dav/lib/Connector/Sabre/Server.php +++ b/apps/dav/lib/Connector/Sabre/Server.php @@ -1,11 +1,12 @@ * @author scolebrook * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index c5b4f6a9352d2..9f142b996eeeb 100644 --- a/apps/dav/lib/Connector/Sabre/ServerFactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/ShareTypeList.php b/apps/dav/lib/Connector/Sabre/ShareTypeList.php index 763586412ad7a..fd9ba3f726701 100644 --- a/apps/dav/lib/Connector/Sabre/ShareTypeList.php +++ b/apps/dav/lib/Connector/Sabre/ShareTypeList.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Connector/Sabre/SharesPlugin.php b/apps/dav/lib/Connector/Sabre/SharesPlugin.php index c76068969e9ae..1082b8906e7ed 100644 --- a/apps/dav/lib/Connector/Sabre/SharesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/SharesPlugin.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Connector/Sabre/TagList.php b/apps/dav/lib/Connector/Sabre/TagList.php index 5c1cd8b4f1ddd..23576171262c3 100644 --- a/apps/dav/lib/Connector/Sabre/TagList.php +++ b/apps/dav/lib/Connector/Sabre/TagList.php @@ -1,10 +1,11 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Connector/Sabre/TagsPlugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php index dfc1a2dd95d07..b1a6d1fb96b59 100644 --- a/apps/dav/lib/Connector/Sabre/TagsPlugin.php +++ b/apps/dav/lib/Connector/Sabre/TagsPlugin.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/dav/lib/DAV/GroupPrincipalBackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php index e056863978411..f8dc1e6088136 100644 --- a/apps/dav/lib/DAV/GroupPrincipalBackend.php +++ b/apps/dav/lib/DAV/GroupPrincipalBackend.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/DAV/Sharing/Backend.php b/apps/dav/lib/DAV/Sharing/Backend.php index 0284c4f719e42..006fe334ba221 100644 --- a/apps/dav/lib/DAV/Sharing/Backend.php +++ b/apps/dav/lib/DAV/Sharing/Backend.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/dav/lib/DAV/Sharing/IShareable.php b/apps/dav/lib/DAV/Sharing/IShareable.php index f6b6bfa88624b..07492d70a2445 100644 --- a/apps/dav/lib/DAV/Sharing/IShareable.php +++ b/apps/dav/lib/DAV/Sharing/IShareable.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/DAV/Sharing/Plugin.php b/apps/dav/lib/DAV/Sharing/Plugin.php index 3173d1397ba11..4cd95fe8a342e 100644 --- a/apps/dav/lib/DAV/Sharing/Plugin.php +++ b/apps/dav/lib/DAV/Sharing/Plugin.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/DAV/Sharing/Xml/Invite.php b/apps/dav/lib/DAV/Sharing/Xml/Invite.php index 7ffe9a322c1d9..376ae3ee78c3c 100644 --- a/apps/dav/lib/DAV/Sharing/Xml/Invite.php +++ b/apps/dav/lib/DAV/Sharing/Xml/Invite.php @@ -1,9 +1,11 @@ + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/lib/DAV/Sharing/Xml/ShareRequest.php b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php index 776fb446b6c04..6bdf8c1aca2ae 100644 --- a/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php +++ b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/DAV/SystemPrincipalBackend.php b/apps/dav/lib/DAV/SystemPrincipalBackend.php index 8001ec4e6c6a6..ba7e73f165ef5 100644 --- a/apps/dav/lib/DAV/SystemPrincipalBackend.php +++ b/apps/dav/lib/DAV/SystemPrincipalBackend.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Files/BrowserErrorPagePlugin.php b/apps/dav/lib/Files/BrowserErrorPagePlugin.php index 5fe6f412f9764..8c257b324b9c8 100644 --- a/apps/dav/lib/Files/BrowserErrorPagePlugin.php +++ b/apps/dav/lib/Files/BrowserErrorPagePlugin.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Files/CustomPropertiesBackend.php b/apps/dav/lib/Files/CustomPropertiesBackend.php index 41c596b9612c5..43c02e7d6eb0a 100644 --- a/apps/dav/lib/Files/CustomPropertiesBackend.php +++ b/apps/dav/lib/Files/CustomPropertiesBackend.php @@ -1,8 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Files/FilesHome.php b/apps/dav/lib/Files/FilesHome.php index ef572d6618b1e..a4fb7d285a607 100644 --- a/apps/dav/lib/Files/FilesHome.php +++ b/apps/dav/lib/Files/FilesHome.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Files/RootCollection.php b/apps/dav/lib/Files/RootCollection.php index 63328aac8e386..10459aa8ada6d 100644 --- a/apps/dav/lib/Files/RootCollection.php +++ b/apps/dav/lib/Files/RootCollection.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php b/apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php index 751f63d394eda..76ec8db25b7c8 100644 --- a/apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php +++ b/apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index aa3777088f858..d89c4b822ffc4 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Migration/Classification.php b/apps/dav/lib/Migration/Classification.php index b793f790af5e6..a18646023c87f 100644 --- a/apps/dav/lib/Migration/Classification.php +++ b/apps/dav/lib/Migration/Classification.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/Migration/GenerateBirthdays.php b/apps/dav/lib/Migration/GenerateBirthdays.php index dfc8838bcbba9..20e000314acef 100644 --- a/apps/dav/lib/Migration/GenerateBirthdays.php +++ b/apps/dav/lib/Migration/GenerateBirthdays.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/RootCollection.php b/apps/dav/lib/RootCollection.php index f83b0495e1c03..16df85d814624 100644 --- a/apps/dav/lib/RootCollection.php +++ b/apps/dav/lib/RootCollection.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Server.php b/apps/dav/lib/Server.php index 982d299c951a9..c488feeb8003d 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -1,12 +1,16 @@ + * @author Christoph Wurst + * @author Georg Ehrke * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/SystemTag/SystemTagMappingNode.php b/apps/dav/lib/SystemTag/SystemTagMappingNode.php index 09a3c79c7577b..b601aef50ec0f 100644 --- a/apps/dav/lib/SystemTag/SystemTagMappingNode.php +++ b/apps/dav/lib/SystemTag/SystemTagMappingNode.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/dav/lib/SystemTag/SystemTagNode.php b/apps/dav/lib/SystemTag/SystemTagNode.php index dfa51edb6b359..36fddcd824076 100644 --- a/apps/dav/lib/SystemTag/SystemTagNode.php +++ b/apps/dav/lib/SystemTag/SystemTagNode.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/dav/lib/SystemTag/SystemTagPlugin.php b/apps/dav/lib/SystemTag/SystemTagPlugin.php index b3ab0d2db7438..87aebe51beead 100644 --- a/apps/dav/lib/SystemTag/SystemTagPlugin.php +++ b/apps/dav/lib/SystemTag/SystemTagPlugin.php @@ -1,10 +1,11 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/SystemTag/SystemTagsByIdCollection.php b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php index 2b24bce9f35f3..176a130774d9b 100644 --- a/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php index c4c45dc76d6c5..ab0b77342584f 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php @@ -1,8 +1,9 @@ * - * @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/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php index f9ec3183f8221..608a781cd7751 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php @@ -1,9 +1,11 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/SystemTag/SystemTagsRelationsCollection.php b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php index 7c4c613dc47fe..c76ab832b147a 100644 --- a/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/lib/Upload/AssemblyStream.php b/apps/dav/lib/Upload/AssemblyStream.php index db600ef897bc6..5853adfa77b1c 100644 --- a/apps/dav/lib/Upload/AssemblyStream.php +++ b/apps/dav/lib/Upload/AssemblyStream.php @@ -1,8 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Upload/FutureFile.php b/apps/dav/lib/Upload/FutureFile.php index f5e734983ce26..5dac34b4d6f00 100644 --- a/apps/dav/lib/Upload/FutureFile.php +++ b/apps/dav/lib/Upload/FutureFile.php @@ -1,8 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Upload/RootCollection.php b/apps/dav/lib/Upload/RootCollection.php index 9298be0dd5daa..696de064dd875 100644 --- a/apps/dav/lib/Upload/RootCollection.php +++ b/apps/dav/lib/Upload/RootCollection.php @@ -1,8 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Upload/UploadFolder.php b/apps/dav/lib/Upload/UploadFolder.php index be1853914f2df..b3d43fef95d2a 100644 --- a/apps/dav/lib/Upload/UploadFolder.php +++ b/apps/dav/lib/Upload/UploadFolder.php @@ -1,8 +1,10 @@ * @author Thomas Müller * - * @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/dav/lib/Upload/UploadHome.php b/apps/dav/lib/Upload/UploadHome.php index e3d4aa0d236aa..296eb2df3a9d1 100644 --- a/apps/dav/lib/Upload/UploadHome.php +++ b/apps/dav/lib/Upload/UploadHome.php @@ -1,8 +1,10 @@ * @author Thomas Müller * - * @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/dav/tests/unit/AppInfo/ApplicationTest.php b/apps/dav/tests/unit/AppInfo/ApplicationTest.php index 509caccfa4423..d5fb4e811d227 100644 --- a/apps/dav/tests/unit/AppInfo/ApplicationTest.php +++ b/apps/dav/tests/unit/AppInfo/ApplicationTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php index 49e5e5a2bcc2d..2b7424272e233 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php @@ -1,9 +1,9 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Thomas Müller * - * @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/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index baa8540c43cf3..48434b2512dd2 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Thomas Citharel * @author Thomas Müller * - * @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/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php index 56a2d4fcba76e..a11d8dd96ea66 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php index bea9c651bd4ee..2b9d10c9e81ff 100644 --- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php +++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php index 749a98e307ee0..ba8527dc76e46 100644 --- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php @@ -1,10 +1,13 @@ - * @author Joas Schilling + * @author Georg Ehrke + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/AddressBookTest.php b/apps/dav/tests/unit/CardDAV/AddressBookTest.php index 4fa8bb47047eb..8a608e277e2a1 100644 --- a/apps/dav/tests/unit/CardDAV/AddressBookTest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php index 9b11c3b82a0ae..33968ec242d56 100644 --- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php +++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index 9845d2d6909d5..f74d12f665804 100644 --- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php +++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php @@ -1,11 +1,14 @@ + * @author Bjoern Schiessle * @author Björn Schießle - * @author Joas Schilling + * @author Georg Ehrke + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/ContactsManagerTest.php b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php index 23a49a1962f94..6859d0686df0a 100644 --- a/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php +++ b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Georg Ehrke + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php index 3dc4d1bb14def..0e4502b9c0a66 100644 --- a/apps/dav/tests/unit/CardDAV/ConverterTest.php +++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php @@ -1,10 +1,11 @@ - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php index 0679df4e2f765..229fa7ec6f232 100644 --- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php +++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Georg Ehrke + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php index 3728b83022ce3..0004907586511 100644 --- a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php +++ b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/CardDAV/SyncServiceTest.php b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php index c9fde55c5271f..62225dc293805 100644 --- a/apps/dav/tests/unit/CardDAV/SyncServiceTest.php +++ b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php @@ -1,10 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Comments/CommentsNodeTest.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php index e7b3dd548c7ed..1c7bd78249682 100644 --- a/apps/dav/tests/unit/Comments/CommentsNodeTest.php +++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php @@ -1,9 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Roeland Jago Douma + * @author Vincent Petry * - * @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/dav/tests/unit/Comments/CommentsPluginTest.php b/apps/dav/tests/unit/Comments/CommentsPluginTest.php index 74223e8d5ca63..bb512465a8931 100644 --- a/apps/dav/tests/unit/Comments/CommentsPluginTest.php +++ b/apps/dav/tests/unit/Comments/CommentsPluginTest.php @@ -1,10 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/Comments/EntityCollectionTest.php b/apps/dav/tests/unit/Comments/EntityCollectionTest.php index c96db595394c0..c4e343d49d418 100644 --- a/apps/dav/tests/unit/Comments/EntityCollectionTest.php +++ b/apps/dav/tests/unit/Comments/EntityCollectionTest.php @@ -1,9 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Roeland Jago Douma * - * @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/dav/tests/unit/Comments/EntityTypeCollectionTest.php b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php index 771e9d4856989..17c4f70fa7f9f 100644 --- a/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php +++ b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php @@ -1,9 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Roeland Jago Douma * - * @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/dav/tests/unit/Comments/RootCollectionTest.php b/apps/dav/tests/unit/Comments/RootCollectionTest.php index 322db53d7b910..95afc42a912f5 100644 --- a/apps/dav/tests/unit/Comments/RootCollectionTest.php +++ b/apps/dav/tests/unit/Comments/RootCollectionTest.php @@ -1,9 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Roeland Jago Douma * - * @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/dav/tests/unit/Connector/PublicAuthTest.php b/apps/dav/tests/unit/Connector/PublicAuthTest.php index e985775f41ceb..47e1a5be7b874 100644 --- a/apps/dav/tests/unit/Connector/PublicAuthTest.php +++ b/apps/dav/tests/unit/Connector/PublicAuthTest.php @@ -1,10 +1,12 @@ - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Lukas Reschke + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/AuthTest.php b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php index 142b83a45b8e3..6262407eb950e 100644 --- a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php @@ -1,14 +1,15 @@ * @author Christoph Wurst - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php index 890d11465a4e3..933460a630ce7 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php index 70ef523359873..13e10476a41db 100644 --- a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php @@ -1,9 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Roeland Jago Douma * - * @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/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php index 9b5e19459765b..0ee1b9591f3dc 100644 --- a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php index 0fb012d953801..f0f4caa07a0fb 100644 --- a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php index 7511d6b02f712..fedf76f79296c 100644 --- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php @@ -1,11 +1,13 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php index 797f306c7ba6c..1c2e249e8c002 100644 --- a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php b/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php index 61f78d1354796..f8115411b4282 100644 --- a/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php b/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php index 25960cc3cb866..c32b2002b46a9 100644 --- a/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php index e10d7526d7705..225955beb07c1 100644 --- a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php index 29d2ce469a1c3..abf6e5cf18278 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php index bb87027bd1d81..999326463a16f 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php @@ -1,11 +1,13 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index 9419296bd5b8c..74f1d844b2440 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php @@ -1,12 +1,13 @@ - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php index 71beccd079c2e..3302c23c3c6a6 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php @@ -1,10 +1,11 @@ - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php index 43e875d25d78d..56306e87136cf 100644 --- a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/NodeTest.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php index 328e99c9fbe40..0aa3fe6101d13 100644 --- a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php @@ -1,12 +1,13 @@ - * @author Joas Schilling - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php index 617a0bd5dfab4..0b942aa1bc81f 100644 --- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php @@ -1,12 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php index 14b1df3b3a701..0385680702618 100644 --- a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php index bf827fd358560..48c920541a859 100644 --- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php @@ -1,11 +1,13 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php index ac9cd91ad3ebb..ff056da35d355 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php index 4f481cba557e6..240a51d01f27b 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php @@ -1,10 +1,9 @@ - * @author Robin Appelman - * @author Thomas Müller - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php index a0283a754cd0a..8aac99e8c545e 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php index 8619ffe070fd0..e65d58b816fdf 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php index 1380815428b55..0be2bc5ef79e7 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php index efa1f0a7a5c64..00e012197d97a 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php @@ -1,9 +1,11 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php index 3e3f9e5994614..a254aca77235d 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php @@ -1,11 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php index 3dd972afa8bde..31f8e051ecc29 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php index 7ba476e94f58c..f22da14a0d8cd 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php index 0c6446e291119..433ef4ba63a72 100644 --- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php index 8e6e514971449..9189a73f77f1b 100644 --- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php index bac24e5c4210c..cdeaceefedf2e 100644 --- a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php +++ b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/DAV/GroupPrincipalTest.php b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php index 06915517fe963..e532ed164e92a 100644 --- a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php +++ b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index 647d13ebed742..5e6e65e59b433 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/DAV/Sharing/PluginTest.php b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php index 63968bc663d1d..c4dae96e52f6a 100644 --- a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php +++ b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/DAV/SystemPrincipalBackendTest.php b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php index 8bf81211e8969..3a5566e8f7041 100644 --- a/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php +++ b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/dav/tests/unit/Migration/ClassificationTest.php b/apps/dav/tests/unit/Migration/ClassificationTest.php index 5c7fa62722675..f19702e9cb2be 100644 --- a/apps/dav/tests/unit/Migration/ClassificationTest.php +++ b/apps/dav/tests/unit/Migration/ClassificationTest.php @@ -1,8 +1,9 @@ * - * @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/dav/tests/unit/ServerTest.php b/apps/dav/tests/unit/ServerTest.php index 97c165683bd03..19e75c7b24eef 100644 --- a/apps/dav/tests/unit/ServerTest.php +++ b/apps/dav/tests/unit/ServerTest.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke + * @author Robin Appelman * @author Thomas Müller * - * @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/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php index c54de152785e8..c52b8fb1cf345 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/SystemTag/SystemTagNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php index 252e592f73f72..43674f4b795d8 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/SystemTag/SystemTagPluginTest.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php index d8d955d89efbe..fcfa528ac647e 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php @@ -1,11 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php index ee7a1f658a460..734313930716c 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php index e4f7e1bbd40ad..9aa35c2ab2431 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php index 3c4d4dfc71622..0c065d3451ad8 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php @@ -1,9 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php index 80e2c8fbaf9d2..ea875886af7db 100644 --- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php +++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php @@ -1,8 +1,11 @@ + * @author Lukas Reschke * @author Thomas Müller * - * @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/dav/tests/unit/Upload/FutureFileTest.php b/apps/dav/tests/unit/Upload/FutureFileTest.php index d3833aa9416ac..d94f14ab0974a 100644 --- a/apps/dav/tests/unit/Upload/FutureFileTest.php +++ b/apps/dav/tests/unit/Upload/FutureFileTest.php @@ -1,8 +1,11 @@ + * @author Lukas Reschke * @author Thomas Müller * - * @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/dav/tests/unit/bootstrap.php b/apps/dav/tests/unit/bootstrap.php index 879b31077fc96..178bc695b6adb 100644 --- a/apps/dav/tests/unit/bootstrap.php +++ b/apps/dav/tests/unit/bootstrap.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php index 3827e7a8a8565..22c35f879135a 100644 --- a/apps/encryption/appinfo/app.php +++ b/apps/encryption/appinfo/app.php @@ -1,9 +1,10 @@ * @author Clark Tomlinson * - * @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/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php index c2a3c2305166d..ced82d21a647b 100644 --- a/apps/encryption/appinfo/register_command.php +++ b/apps/encryption/appinfo/register_command.php @@ -1,8 +1,9 @@ * - * @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/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php index 1e640bb17b666..22f3af7fbfb74 100644 --- a/apps/encryption/appinfo/routes.php +++ b/apps/encryption/appinfo/routes.php @@ -1,9 +1,10 @@ * @author Clark Tomlinson * - * @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/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php index 7ad14e79ae1c2..bba522fbc8c7c 100644 --- a/apps/encryption/lib/AppInfo/Application.php +++ b/apps/encryption/lib/AppInfo/Application.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Thomas Müller * - * @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/encryption/lib/Command/EnableMasterKey.php b/apps/encryption/lib/Command/EnableMasterKey.php index 10c47f63ed7f8..6f0800c9340ef 100644 --- a/apps/encryption/lib/Command/EnableMasterKey.php +++ b/apps/encryption/lib/Command/EnableMasterKey.php @@ -1,8 +1,9 @@ * - * @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/encryption/lib/Command/MigrateKeys.php b/apps/encryption/lib/Command/MigrateKeys.php index 2b172dfa9aa73..c3935277661ce 100644 --- a/apps/encryption/lib/Command/MigrateKeys.php +++ b/apps/encryption/lib/Command/MigrateKeys.php @@ -1,8 +1,9 @@ * - * @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/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php index 60b95c7cd133f..58ea4e4ece73e 100644 --- a/apps/encryption/lib/Controller/RecoveryController.php +++ b/apps/encryption/lib/Controller/RecoveryController.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Lukas Reschke * - * @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/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php index 74c527604382c..f19f63925650e 100644 --- a/apps/encryption/lib/Controller/SettingsController.php +++ b/apps/encryption/lib/Controller/SettingsController.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php index a8fdcce457fb4..a508c3c6b72f9 100644 --- a/apps/encryption/lib/Controller/StatusController.php +++ b/apps/encryption/lib/Controller/StatusController.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index 4c146f8599982..7d6636d882e98 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -1,12 +1,13 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/encryption/lib/Crypto/DecryptAll.php b/apps/encryption/lib/Crypto/DecryptAll.php index 0da4c2bba439f..195dc7891fc30 100644 --- a/apps/encryption/lib/Crypto/DecryptAll.php +++ b/apps/encryption/lib/Crypto/DecryptAll.php @@ -1,8 +1,9 @@ * - * @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/encryption/lib/Crypto/EncryptAll.php b/apps/encryption/lib/Crypto/EncryptAll.php index 1adf1ae480432..60c7b13b7082f 100644 --- a/apps/encryption/lib/Crypto/EncryptAll.php +++ b/apps/encryption/lib/Crypto/EncryptAll.php @@ -1,10 +1,12 @@ - * @author Roeland Jago Douma + * @author Morris Jobke + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 9423332de9722..c71e25b64425a 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -1,13 +1,14 @@ * @author Clark Tomlinson * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/encryption/lib/Exceptions/MultiKeyDecryptException.php b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php index 59bea59344d12..ec1770cc0198b 100644 --- a/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php +++ b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php @@ -1,8 +1,9 @@ * - * @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/encryption/lib/Exceptions/MultiKeyEncryptException.php b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php index bc0872ffdd222..6b7c360b9047c 100644 --- a/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php +++ b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php @@ -1,8 +1,9 @@ * - * @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/encryption/lib/Exceptions/PrivateKeyMissingException.php b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php index 7d6ac83368ba3..c25ddf9204be8 100644 --- a/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php +++ b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Thomas Müller * - * @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/encryption/lib/Exceptions/PublicKeyMissingException.php b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php index 6fad4693dcc6b..463d7db7d93fc 100644 --- a/apps/encryption/lib/Exceptions/PublicKeyMissingException.php +++ b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php @@ -1,8 +1,9 @@ * - * @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/encryption/lib/HookManager.php b/apps/encryption/lib/HookManager.php index d9408b0de17f5..8434b6aaba574 100644 --- a/apps/encryption/lib/HookManager.php +++ b/apps/encryption/lib/HookManager.php @@ -1,9 +1,10 @@ * @author Clark Tomlinson * - * @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/encryption/lib/Hooks/Contracts/IHook.php b/apps/encryption/lib/Hooks/Contracts/IHook.php index 4bf7ead8c155e..c73ea2e7eccdd 100644 --- a/apps/encryption/lib/Hooks/Contracts/IHook.php +++ b/apps/encryption/lib/Hooks/Contracts/IHook.php @@ -1,8 +1,9 @@ * - * @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/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php index a9528a06f6281..16e4e962432ea 100644 --- a/apps/encryption/lib/Hooks/UserHooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Thomas Müller * - * @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/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index 53a93d634b8c2..4099da4b5ab63 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -1,12 +1,13 @@ * @author Clark Tomlinson * @author Lukas Reschke * @author Thomas Müller * @author Vincent Petry * - * @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/encryption/lib/Migration.php b/apps/encryption/lib/Migration.php index 2a36b22c2343e..7f4acbb68d438 100644 --- a/apps/encryption/lib/Migration.php +++ b/apps/encryption/lib/Migration.php @@ -1,10 +1,11 @@ - * @author Joas Schilling - * @author Robin Appelman + * @author Joas Schilling + * @author Robin Appelman * - * @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/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php index 832f26dfdcd08..17533e7b11428 100644 --- a/apps/encryption/lib/Recovery.php +++ b/apps/encryption/lib/Recovery.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Lukas Reschke * - * @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/encryption/lib/Session.php b/apps/encryption/lib/Session.php index 86ac2d11ffecb..92132d6080c96 100644 --- a/apps/encryption/lib/Session.php +++ b/apps/encryption/lib/Session.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Lukas Reschke * - * @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/encryption/lib/Users/Setup.php b/apps/encryption/lib/Users/Setup.php index 5ebc1dbe6b501..b757228a7da0d 100644 --- a/apps/encryption/lib/Users/Setup.php +++ b/apps/encryption/lib/Users/Setup.php @@ -1,11 +1,12 @@ * @author Clark Tomlinson * @author Lukas Reschke * @author Thomas Müller * - * @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/encryption/lib/Util.php b/apps/encryption/lib/Util.php index 46d50cc9c364b..72afa68aad2cd 100644 --- a/apps/encryption/lib/Util.php +++ b/apps/encryption/lib/Util.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Phil Davis * - * @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/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php index bca3d5168a0a3..a424ea038741c 100644 --- a/apps/encryption/settings/settings-admin.php +++ b/apps/encryption/settings/settings-admin.php @@ -1,11 +1,12 @@ * @author Clark Tomlinson * @author Lukas Reschke * @author Thomas Müller * - * @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/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php index f69affc3a6933..66083408881d9 100644 --- a/apps/encryption/settings/settings-personal.php +++ b/apps/encryption/settings/settings-personal.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson * @author Thomas Müller * - * @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/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php index 6362dc3c39947..75d5fa3d5e72f 100644 --- a/apps/encryption/tests/Command/TestEnableMasterKey.php +++ b/apps/encryption/tests/Command/TestEnableMasterKey.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/Controller/RecoveryControllerTest.php b/apps/encryption/tests/Controller/RecoveryControllerTest.php index d167b060bfff1..fd1b0663b49d2 100644 --- a/apps/encryption/tests/Controller/RecoveryControllerTest.php +++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/Controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php index 8098a0e194ba2..5661ab7033ffc 100644 --- a/apps/encryption/tests/Controller/SettingsControllerTest.php +++ b/apps/encryption/tests/Controller/SettingsControllerTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/Controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php index e6ccceb6e5552..17cec468438b8 100644 --- a/apps/encryption/tests/Controller/StatusControllerTest.php +++ b/apps/encryption/tests/Controller/StatusControllerTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php index e6bed6b12ec05..7bd06471b53b8 100644 --- a/apps/encryption/tests/Crypto/CryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * - * @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/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php index 971e1e37135a0..fdef37adc847c 100644 --- a/apps/encryption/tests/Crypto/DecryptAllTest.php +++ b/apps/encryption/tests/Crypto/DecryptAllTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php index 52cc8b04d407f..8232af5f9f2e1 100644 --- a/apps/encryption/tests/Crypto/EncryptAllTest.php +++ b/apps/encryption/tests/Crypto/EncryptAllTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index 45160aba509d4..4d8b6bbbf2fe4 100644 --- a/apps/encryption/tests/Crypto/EncryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/HookManagerTest.php b/apps/encryption/tests/HookManagerTest.php index 4228db318a164..1154368fa3f9d 100644 --- a/apps/encryption/tests/HookManagerTest.php +++ b/apps/encryption/tests/HookManagerTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php index 31561a7cd6125..6ccca3d2afa17 100644 --- a/apps/encryption/tests/Hooks/UserHooksTest.php +++ b/apps/encryption/tests/Hooks/UserHooksTest.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php index f31a3ef3500cd..9ac3befdfcb40 100644 --- a/apps/encryption/tests/KeyManagerTest.php +++ b/apps/encryption/tests/KeyManagerTest.php @@ -1,12 +1,13 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/encryption/tests/MigrationTest.php b/apps/encryption/tests/MigrationTest.php index 0b281566571c6..3126dd2ff2cbb 100644 --- a/apps/encryption/tests/MigrationTest.php +++ b/apps/encryption/tests/MigrationTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php index 2bd3c58d19d46..477913a1a69ea 100644 --- a/apps/encryption/tests/RecoveryTest.php +++ b/apps/encryption/tests/RecoveryTest.php @@ -1,11 +1,12 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * - * @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/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php index 1337680c34263..1a22726f5b15f 100644 --- a/apps/encryption/tests/SessionTest.php +++ b/apps/encryption/tests/SessionTest.php @@ -1,11 +1,12 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php index 7c871671b5ec8..252092f9e5ea8 100644 --- a/apps/encryption/tests/Users/SetupTest.php +++ b/apps/encryption/tests/Users/SetupTest.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * - * @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/encryption/tests/UtilTest.php b/apps/encryption/tests/UtilTest.php index 0a2313291acc5..84a9ad493d7c0 100644 --- a/apps/encryption/tests/UtilTest.php +++ b/apps/encryption/tests/UtilTest.php @@ -1,10 +1,11 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * - * @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/federatedfilesharing/appinfo/app.php b/apps/federatedfilesharing/appinfo/app.php index e6fbe615e7f93..f54c47b7829ee 100644 --- a/apps/federatedfilesharing/appinfo/app.php +++ b/apps/federatedfilesharing/appinfo/app.php @@ -1,9 +1,10 @@ * @author Björn Schießle - * @author Joas Schilling * - * @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/federatedfilesharing/appinfo/routes.php b/apps/federatedfilesharing/appinfo/routes.php index ec7b662686ff5..a4f56e372c941 100644 --- a/apps/federatedfilesharing/appinfo/routes.php +++ b/apps/federatedfilesharing/appinfo/routes.php @@ -2,6 +2,9 @@ /** * @copyright Copyright (c) 2016 Bjoern Schiessle * + * @author Bjoern Schiessle + * @author Björn Schießle + * * @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/federatedfilesharing/lib/AddressHandler.php b/apps/federatedfilesharing/lib/AddressHandler.php index e911d2e4f9ce4..3c178b813e4cb 100644 --- a/apps/federatedfilesharing/lib/AddressHandler.php +++ b/apps/federatedfilesharing/lib/AddressHandler.php @@ -1,8 +1,9 @@ * - * @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/federatedfilesharing/lib/AppInfo/Application.php b/apps/federatedfilesharing/lib/AppInfo/Application.php index ea5018e6a9030..b4ddc6cfe0455 100644 --- a/apps/federatedfilesharing/lib/AppInfo/Application.php +++ b/apps/federatedfilesharing/lib/AppInfo/Application.php @@ -1,8 +1,9 @@ * - * @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/federatedfilesharing/lib/BackgroundJob/RetryJob.php b/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php index f867271e657db..26afcae32b740 100644 --- a/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php +++ b/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php @@ -1,8 +1,9 @@ * - * @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/federatedfilesharing/lib/Controller/MountPublicLinkController.php b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php index 3e61d355b63fc..93ccafb001cf1 100644 --- a/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php +++ b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php @@ -1,10 +1,11 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2016, Björn Schießle * + * @author Bjoern Schiessle + * @author Björn Schießle + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federatedfilesharing/lib/DiscoveryManager.php b/apps/federatedfilesharing/lib/DiscoveryManager.php index d65dad3085e3f..8c8c72dbd662b 100644 --- a/apps/federatedfilesharing/lib/DiscoveryManager.php +++ b/apps/federatedfilesharing/lib/DiscoveryManager.php @@ -1,8 +1,12 @@ + * @author Joas Schilling * @author Lukas Reschke + * @author Vincent Petry * - * @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/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 7b64b56a16d7f..c567b92c3e4f0 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -1,10 +1,13 @@ * @author Björn Schießle - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/federatedfilesharing/lib/Notifications.php b/apps/federatedfilesharing/lib/Notifications.php index ac55642b8580b..074991c43f854 100644 --- a/apps/federatedfilesharing/lib/Notifications.php +++ b/apps/federatedfilesharing/lib/Notifications.php @@ -1,9 +1,13 @@ * @author Björn Schießle + * @author Joas Schilling * @author Lukas Reschke + * @author Vincent Petry * - * @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/federatedfilesharing/lib/Notifier.php b/apps/federatedfilesharing/lib/Notifier.php index 18ecfd4396aae..62816ee929b7e 100644 --- a/apps/federatedfilesharing/lib/Notifier.php +++ b/apps/federatedfilesharing/lib/Notifier.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/federatedfilesharing/lib/RequestHandler.php b/apps/federatedfilesharing/lib/RequestHandler.php index 45ec5d203ad9f..1870b03665b29 100644 --- a/apps/federatedfilesharing/lib/RequestHandler.php +++ b/apps/federatedfilesharing/lib/RequestHandler.php @@ -1,12 +1,13 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * - * @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/federatedfilesharing/lib/TokenHandler.php b/apps/federatedfilesharing/lib/TokenHandler.php index 54c90a9ff8aa1..bfe02169fbd41 100644 --- a/apps/federatedfilesharing/lib/TokenHandler.php +++ b/apps/federatedfilesharing/lib/TokenHandler.php @@ -1,8 +1,9 @@ * - * @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/federatedfilesharing/settings-admin.php b/apps/federatedfilesharing/settings-admin.php index dc5a4d6826cf5..5ccd223b0a337 100644 --- a/apps/federatedfilesharing/settings-admin.php +++ b/apps/federatedfilesharing/settings-admin.php @@ -1,9 +1,11 @@ * @author Björn Schießle * @author Morris Jobke * - * @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/federatedfilesharing/settings-personal.php b/apps/federatedfilesharing/settings-personal.php index 261d540f48d18..a937106ce0ea6 100644 --- a/apps/federatedfilesharing/settings-personal.php +++ b/apps/federatedfilesharing/settings-personal.php @@ -1,10 +1,12 @@ * @author Björn Schießle * @author Jan-Christoph Borchardt * @author Thomas Müller * - * @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/federatedfilesharing/tests/AddressHandlerTest.php b/apps/federatedfilesharing/tests/AddressHandlerTest.php index 3f07b23c2e379..9ae37bb251df0 100644 --- a/apps/federatedfilesharing/tests/AddressHandlerTest.php +++ b/apps/federatedfilesharing/tests/AddressHandlerTest.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php index 3fe05e72cf4ab..bd091bed410d7 100644 --- a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php @@ -1,10 +1,11 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2016, Björn Schießle * + * @author Bjoern Schiessle + * @author Björn Schießle + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php index a9c324f02442b..ec79a16a3aa34 100644 --- a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php +++ b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php @@ -1,9 +1,11 @@ * @author Lukas Reschke + * @author Vincent Petry * - * @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/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index 8c5efdab7b00e..d1a15158afa8e 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -1,10 +1,12 @@ * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/federatedfilesharing/tests/NotificationsTest.php b/apps/federatedfilesharing/tests/NotificationsTest.php index a0f295d179a8d..415afbd750cef 100644 --- a/apps/federatedfilesharing/tests/NotificationsTest.php +++ b/apps/federatedfilesharing/tests/NotificationsTest.php @@ -1,8 +1,9 @@ * - * @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/federatedfilesharing/tests/RequestHandlerTest.php b/apps/federatedfilesharing/tests/RequestHandlerTest.php index 025f8a3db4b04..9689716af3dd4 100644 --- a/apps/federatedfilesharing/tests/RequestHandlerTest.php +++ b/apps/federatedfilesharing/tests/RequestHandlerTest.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/federatedfilesharing/tests/TestCase.php b/apps/federatedfilesharing/tests/TestCase.php index 5a25d0fc1f810..22d41038e6c20 100644 --- a/apps/federatedfilesharing/tests/TestCase.php +++ b/apps/federatedfilesharing/tests/TestCase.php @@ -1,8 +1,9 @@ * - * @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/federatedfilesharing/tests/TokenHandlerTest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php index 1ce2f84411405..e6fc470b55348 100644 --- a/apps/federatedfilesharing/tests/TokenHandlerTest.php +++ b/apps/federatedfilesharing/tests/TokenHandlerTest.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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 abcc6ee15c652..92b64b9c05855 100644 --- a/apps/federation/appinfo/app.php +++ b/apps/federation/appinfo/app.php @@ -1,8 +1,9 @@ * - * @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 67cff701e660e..c7cec58efd412 100644 --- a/apps/federation/appinfo/register_command.php +++ b/apps/federation/appinfo/register_command.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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 1797975d34f02..03acc60c68251 100644 --- a/apps/federation/appinfo/routes.php +++ b/apps/federation/appinfo/routes.php @@ -1,8 +1,9 @@ * - * @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/API/OCSAuthAPI.php b/apps/federation/lib/API/OCSAuthAPI.php index 74cee82a35325..a22de155d4c5a 100644 --- a/apps/federation/lib/API/OCSAuthAPI.php +++ b/apps/federation/lib/API/OCSAuthAPI.php @@ -1,12 +1,13 @@ * @author Lukas Reschke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/AppInfo/Application.php b/apps/federation/lib/AppInfo/Application.php index d72872eb688ad..5d8da05c8e111 100644 --- a/apps/federation/lib/AppInfo/Application.php +++ b/apps/federation/lib/AppInfo/Application.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php index 2a7d5ad8ef69d..521ffca8a7035 100644 --- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php @@ -1,10 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php index ae992842bbbf2..fa7a67a1cafa1 100644 --- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php @@ -1,11 +1,12 @@ - * @author Joas Schilling - * @author Robin Appelman + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/Command/SyncFederationAddressBooks.php b/apps/federation/lib/Command/SyncFederationAddressBooks.php index bfaa27f118aac..bea75cc83a1cc 100644 --- a/apps/federation/lib/Command/SyncFederationAddressBooks.php +++ b/apps/federation/lib/Command/SyncFederationAddressBooks.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Thomas Müller * - * @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/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php index 5a157d5aca5a9..79eb06e0fda2d 100644 --- a/apps/federation/lib/Controller/SettingsController.php +++ b/apps/federation/lib/Controller/SettingsController.php @@ -1,8 +1,10 @@ + * @author Morris Jobke * - * @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/DAV/FedAuth.php b/apps/federation/lib/DAV/FedAuth.php index ff83932283cd1..705ccbdd3bb81 100644 --- a/apps/federation/lib/DAV/FedAuth.php +++ b/apps/federation/lib/DAV/FedAuth.php @@ -1,8 +1,10 @@ * @author Thomas Müller * - * @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 5cfbc9f021a00..b30ce740092d5 100644 --- a/apps/federation/lib/DbHandler.php +++ b/apps/federation/lib/DbHandler.php @@ -1,9 +1,12 @@ + * @author Morris Jobke + * @author Robin Appelman * @author Thomas Müller * - * @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 a7ffcd3422395..6601b9c0eb7a4 100644 --- a/apps/federation/lib/Hooks.php +++ b/apps/federation/lib/Hooks.php @@ -1,8 +1,9 @@ * - * @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/Middleware/AddServerMiddleware.php b/apps/federation/lib/Middleware/AddServerMiddleware.php index 75be847aaf195..d920aee3e4ecf 100644 --- a/apps/federation/lib/Middleware/AddServerMiddleware.php +++ b/apps/federation/lib/Middleware/AddServerMiddleware.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/SyncFederationAddressBooks.php b/apps/federation/lib/SyncFederationAddressBooks.php index 5557d2bf24ddf..759b59183aa5e 100644 --- a/apps/federation/lib/SyncFederationAddressBooks.php +++ b/apps/federation/lib/SyncFederationAddressBooks.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Thomas Müller * - * @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 2b904813b9207..060504efb7bda 100644 --- a/apps/federation/lib/SyncJob.php +++ b/apps/federation/lib/SyncJob.php @@ -1,8 +1,9 @@ * - * @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 c8ab4dec6320a..fff19e414d56b 100644 --- a/apps/federation/lib/TrustedServers.php +++ b/apps/federation/lib/TrustedServers.php @@ -1,10 +1,12 @@ - * @author Roeland Jago Douma + * @author Morris Jobke + * @author Roeland Jago Douma * @author Thomas Müller * - * @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 4511ff954b52c..aa21a1e9920e3 100644 --- a/apps/federation/settings/settings-admin.php +++ b/apps/federation/settings/settings-admin.php @@ -1,8 +1,9 @@ * - * @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/API/OCSAuthAPITest.php b/apps/federation/tests/API/OCSAuthAPITest.php index 914182f11f5bb..7861e917ff8ed 100644 --- a/apps/federation/tests/API/OCSAuthAPITest.php +++ b/apps/federation/tests/API/OCSAuthAPITest.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php index 4545ff6de9591..0746c517fa7af 100644 --- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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 009bc89af1a6c..339a2cbad006e 100644 --- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php index aec08ef464933..e73d1f47cdd52 100644 --- a/apps/federation/tests/Controller/SettingsControllerTest.php +++ b/apps/federation/tests/Controller/SettingsControllerTest.php @@ -1,8 +1,9 @@ * - * @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/DAV/FedAuthTest.php b/apps/federation/tests/DAV/FedAuthTest.php index b716084a45dcf..10c5e165eefff 100644 --- a/apps/federation/tests/DAV/FedAuthTest.php +++ b/apps/federation/tests/DAV/FedAuthTest.php @@ -1,8 +1,9 @@ * - * @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/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php index bad103db5231c..f27317cfad9e1 100644 --- a/apps/federation/tests/DbHandlerTest.php +++ b/apps/federation/tests/DbHandlerTest.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/HooksTest.php b/apps/federation/tests/HooksTest.php index 9b26d0caf0c4b..e60c244d08c92 100644 --- a/apps/federation/tests/HooksTest.php +++ b/apps/federation/tests/HooksTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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 d416c0af989d8..9eed79b0db00f 100644 --- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php +++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/SyncFederationAddressbooksTest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php index f0d4b10deeb91..1a2dbf1bcae3f 100644 --- a/apps/federation/tests/SyncFederationAddressbooksTest.php +++ b/apps/federation/tests/SyncFederationAddressbooksTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php index 363e93a302197..63086c76002c5 100644 --- a/apps/federation/tests/TrustedServersTest.php +++ b/apps/federation/tests/TrustedServersTest.php @@ -1,10 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Morris Jobke * @author Thomas Müller * - * @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/files/admin.php b/apps/files/admin.php index 48a6100838f14..ad7b16a3a23f1 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -1,16 +1,16 @@ * @author Clark Tomlinson * @author Frank Karlitschek - * @author Jakob Sack * @author Michael Göhler * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/files/ajax/download.php b/apps/files/ajax/download.php index 52c88d3923a89..17a7fd8b32290 100644 --- a/apps/files/ajax/download.php +++ b/apps/files/ajax/download.php @@ -1,5 +1,7 @@ * @author Björn Schießle * @author Frank Karlitschek @@ -7,9 +9,8 @@ * @author Lukas Reschke * @author Morris Jobke * @author Piotr Filiciak - * @author Robin Appelman + * @author Robin Appelman * - * @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/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php index 04f7702ae48a5..d1d8d57b46851 100644 --- a/apps/files/ajax/getstoragestats.php +++ b/apps/files/ajax/getstoragestats.php @@ -1,12 +1,13 @@ * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files/ajax/list.php b/apps/files/ajax/list.php index 4dde15f3642a0..bb95f124dab7d 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/files/ajax/upload.php b/apps/files/ajax/upload.php index d243b6ad97e13..9de5c0bce39d0 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Björn Schießle @@ -7,17 +9,16 @@ * @author Florian Pritz * @author Frank Karlitschek * @author Individual IT Services - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Luke Policinski - * @author Robin Appelman + * @author Robin Appelman * @author Roman Geber * @author TheSFReader * @author Thomas Müller * @author Vincent Petry * - * @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/files/appinfo/app.php b/apps/files/appinfo/app.php index 2ab43ff2afcf1..cc86e9bf27096 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files/appinfo/register_command.php b/apps/files/appinfo/register_command.php index 3ac6d74134cc5..e0d3ba622f358 100644 --- a/apps/files/appinfo/register_command.php +++ b/apps/files/appinfo/register_command.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/files/appinfo/routes.php b/apps/files/appinfo/routes.php index cea960b1a4991..34bb10117733d 100644 --- a/apps/files/appinfo/routes.php +++ b/apps/files/appinfo/routes.php @@ -1,14 +1,15 @@ * @author Christoph Wurst * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tobias Kaminsky * @author Tom Needham * @author Vincent Petry * - * @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/files/appinfo/update.php b/apps/files/appinfo/update.php index 75a5132512fca..6a0cfe6caa179 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Stefan Weil * - * @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/files/download.php b/apps/files/download.php index da01f98ed6234..60f386f50f036 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -1,15 +1,16 @@ * @author Felix Moeller * @author Frank Karlitschek * @author Jakob Sack * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files/lib/Activity.php b/apps/files/lib/Activity.php index 1cbd6c3b973da..b9cc98cf7eacc 100644 --- a/apps/files/lib/Activity.php +++ b/apps/files/lib/Activity.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/files/lib/ActivityHelper.php b/apps/files/lib/ActivityHelper.php index 046dd59bc7605..f5660de4b3757 100644 --- a/apps/files/lib/ActivityHelper.php +++ b/apps/files/lib/ActivityHelper.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files/lib/App.php b/apps/files/lib/App.php index 981c41ff413a5..add27a2d2df02 100644 --- a/apps/files/lib/App.php +++ b/apps/files/lib/App.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Thomas Müller * @author Vincent Petry * - * @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/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php index 4ebf67a2374c7..fac8e3a3a4bea 100644 --- a/apps/files/lib/AppInfo/Application.php +++ b/apps/files/lib/AppInfo/Application.php @@ -1,11 +1,12 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tobias Kaminsky * @author Vincent Petry * - * @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/files/lib/BackgroundJob/CleanupFileLocks.php b/apps/files/lib/BackgroundJob/CleanupFileLocks.php index b5cf8e945513c..f4898b24873ea 100644 --- a/apps/files/lib/BackgroundJob/CleanupFileLocks.php +++ b/apps/files/lib/BackgroundJob/CleanupFileLocks.php @@ -1,8 +1,9 @@ * - * @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/files/lib/BackgroundJob/DeleteOrphanedItems.php b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php index c2711f51da052..5c4ba6ac06cc5 100644 --- a/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php +++ b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Vincent Petry * - * @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/files/lib/BackgroundJob/ScanFiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php index 865ef85ad0314..cb2b9d4b1c9fa 100644 --- a/apps/files/lib/BackgroundJob/ScanFiles.php +++ b/apps/files/lib/BackgroundJob/ScanFiles.php @@ -1,8 +1,9 @@ * - * @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/files/lib/Capabilities.php b/apps/files/lib/Capabilities.php index 80305f4fd70dd..2b6bf57b90dd6 100644 --- a/apps/files/lib/Capabilities.php +++ b/apps/files/lib/Capabilities.php @@ -1,11 +1,12 @@ - * @author Joas Schilling - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Roeland Jago Douma * @author Tom Needham * - * @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/files/lib/Command/DeleteOrphanedFiles.php b/apps/files/lib/Command/DeleteOrphanedFiles.php index 91043471ce5c7..77a22945a9a95 100644 --- a/apps/files/lib/Command/DeleteOrphanedFiles.php +++ b/apps/files/lib/Command/DeleteOrphanedFiles.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php index 835fa15eb1284..25933ae25aa0b 100644 --- a/apps/files/lib/Command/Scan.php +++ b/apps/files/lib/Command/Scan.php @@ -1,14 +1,15 @@ * @author Jörn Friedrich Dreyer * @author martin.mattel@diemattels.at * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php index 230667afdf96f..d3994bbdf9f58 100644 --- a/apps/files/lib/Command/TransferOwnership.php +++ b/apps/files/lib/Command/TransferOwnership.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php index a442d7ea909e0..57eb43bbe9cff 100644 --- a/apps/files/lib/Controller/ApiController.php +++ b/apps/files/lib/Controller/ApiController.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tobias Kaminsky * @author Vincent Petry * - * @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/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 1137f47c6d2d1..5e342e6589bc4 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -1,11 +1,14 @@ + * @author Joas Schilling * @author Lukas Reschke + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files/lib/Helper.php b/apps/files/lib/Helper.php index 8adec5670cc12..26bc020c87117 100644 --- a/apps/files/lib/Helper.php +++ b/apps/files/lib/Helper.php @@ -1,17 +1,18 @@ * @author brumsel * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files/lib/Service/TagService.php b/apps/files/lib/Service/TagService.php index 57cad43a53942..04e962b5e1709 100644 --- a/apps/files/lib/Service/TagService.php +++ b/apps/files/lib/Service/TagService.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * @author Vincent Petry * - * @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/files/list.php b/apps/files/list.php index 2d7a304df2426..a932cc9a80529 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/files/simplelist.php b/apps/files/simplelist.php index 2e65eedd1b3c5..1d61b397050d3 100644 --- a/apps/files/simplelist.php +++ b/apps/files/simplelist.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/files/tests/ActivityTest.php b/apps/files/tests/ActivityTest.php index bc062dd05422f..e6199013e8158 100644 --- a/apps/files/tests/ActivityTest.php +++ b/apps/files/tests/ActivityTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php index 0e7309cac5780..bf4e78d6b21e5 100644 --- a/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php +++ b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/files/tests/BackgroundJob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php index 00610e9dee93b..16bf1d793b743 100644 --- a/apps/files/tests/BackgroundJob/ScanFilesTest.php +++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php @@ -1,8 +1,9 @@ * - * @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/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php index ff29942bc4a69..b4d16e546176d 100644 --- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php +++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php index 2fbf6e794b8b6..1d39c88021bea 100644 --- a/apps/files/tests/Controller/ApiControllerTest.php +++ b/apps/files/tests/Controller/ApiControllerTest.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 34c40ecea5cd0..ceb48a2241f3f 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Vincent Petry * - * @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/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php index d2d52b4f8a313..8afd52abd9534 100644 --- a/apps/files/tests/HelperTest.php +++ b/apps/files/tests/HelperTest.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/files/tests/Service/TagServiceTest.php b/apps/files/tests/Service/TagServiceTest.php index fb058fc3d26fb..388c9c28fa1f0 100644 --- a/apps/files/tests/Service/TagServiceTest.php +++ b/apps/files/tests/Service/TagServiceTest.php @@ -1,11 +1,12 @@ - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php index 32d217a38c1c1..4ee922b63ac7c 100644 --- a/apps/files_external/ajax/applicable.php +++ b/apps/files_external/ajax/applicable.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Robin McCorkell * - * @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/files_external/ajax/oauth1.php b/apps/files_external/ajax/oauth1.php index e363e6c42920a..f0f872c99fffb 100644 --- a/apps/files_external/ajax/oauth1.php +++ b/apps/files_external/ajax/oauth1.php @@ -1,13 +1,14 @@ * @author Lukas Reschke * @author Michael Gapczynski - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php index 2d1fae23cffba..db2570800af3d 100644 --- a/apps/files_external/ajax/oauth2.php +++ b/apps/files_external/ajax/oauth2.php @@ -1,16 +1,17 @@ * @author Christopher Schäpers * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * @author Volkan Gezer * - * @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/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index 7ec094a536a34..3a90cf0c2c18f 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -1,15 +1,16 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Jan-Christoph Borchardt - * @author Joas Schilling - * @author Robin Appelman + * @author j-ed + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Ross Nicoll * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php index 629970722de3d..614f0c0a97ab3 100644 --- a/apps/files_external/appinfo/register_command.php +++ b/apps/files_external/appinfo/register_command.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php index 1062ae524fffa..97c2d7b0e000f 100644 --- a/apps/files_external/appinfo/routes.php +++ b/apps/files_external/appinfo/routes.php @@ -1,14 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Ross Nicoll * @author Vincent Petry * - * @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/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php index 6b955044f2163..3d173f300e707 100644 --- a/apps/files_external/appinfo/update.php +++ b/apps/files_external/appinfo/update.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php index c3c1b764c5adc..a32a3a26c7f3f 100644 --- a/apps/files_external/lib/AppInfo/Application.php +++ b/apps/files_external/lib/AppInfo/Application.php @@ -1,14 +1,16 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Ross Nicoll * @author Vincent Petry * - * @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/files_external/lib/Command/Applicable.php b/apps/files_external/lib/Command/Applicable.php index 1869d27891b58..c7c2f6aa21694 100644 --- a/apps/files_external/lib/Command/Applicable.php +++ b/apps/files_external/lib/Command/Applicable.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Backends.php b/apps/files_external/lib/Command/Backends.php index d1da6db3f6a6e..b5c1b7f7a54bc 100644 --- a/apps/files_external/lib/Command/Backends.php +++ b/apps/files_external/lib/Command/Backends.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Config.php b/apps/files_external/lib/Command/Config.php index 4f1d2fd4e63e0..cd1c9244d130d 100644 --- a/apps/files_external/lib/Command/Config.php +++ b/apps/files_external/lib/Command/Config.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Create.php b/apps/files_external/lib/Command/Create.php index f2ef8b1fb72d7..d5b320dcfc279 100644 --- a/apps/files_external/lib/Command/Create.php +++ b/apps/files_external/lib/Command/Create.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Delete.php b/apps/files_external/lib/Command/Delete.php index 7d9f69d8676ba..d63aa35050ce5 100644 --- a/apps/files_external/lib/Command/Delete.php +++ b/apps/files_external/lib/Command/Delete.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Export.php b/apps/files_external/lib/Command/Export.php index 89655c1efc701..9e586609d62b4 100644 --- a/apps/files_external/lib/Command/Export.php +++ b/apps/files_external/lib/Command/Export.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Import.php b/apps/files_external/lib/Command/Import.php index 4d0e7702104e8..2159c0a001ecd 100644 --- a/apps/files_external/lib/Command/Import.php +++ b/apps/files_external/lib/Command/Import.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php index e29a5f58f4058..fc1f2bf6c5ab3 100644 --- a/apps/files_external/lib/Command/ListCommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php index 63d027b6778f0..913299b59b4c1 100644 --- a/apps/files_external/lib/Command/Notify.php +++ b/apps/files_external/lib/Command/Notify.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Robin Appelman + * * @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/files_external/lib/Command/Option.php b/apps/files_external/lib/Command/Option.php index fbfe437e92de2..59fde157dacf7 100644 --- a/apps/files_external/lib/Command/Option.php +++ b/apps/files_external/lib/Command/Option.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Command/Verify.php b/apps/files_external/lib/Command/Verify.php index dc9e207667ee5..57a10eaac5744 100644 --- a/apps/files_external/lib/Command/Verify.php +++ b/apps/files_external/lib/Command/Verify.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Config/ConfigAdapter.php b/apps/files_external/lib/Config/ConfigAdapter.php index 9375ff74c56d3..00366135ea4be 100644 --- a/apps/files_external/lib/Config/ConfigAdapter.php +++ b/apps/files_external/lib/Config/ConfigAdapter.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/lib/Controller/AjaxController.php b/apps/files_external/lib/Controller/AjaxController.php index 068abbb809d3e..0bee1ce977880 100644 --- a/apps/files_external/lib/Controller/AjaxController.php +++ b/apps/files_external/lib/Controller/AjaxController.php @@ -1,11 +1,13 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Ross Nicoll * - * @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/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index 71bef7dc714c9..c6a19004e8e3e 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -1,11 +1,13 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Juan Pablo Villafáñez + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php index c1216008ffa00..ef7cc8c6e4f04 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -1,12 +1,14 @@ - * @author Joas Schilling - * @author Robin Appelman + * @author Joas Schilling + * @author Juan Pablo Villafáñez + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php index 3006e72666da9..4acbc1562617f 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -1,10 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Juan Pablo Villafáñez + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index 5dc23aad769de..db07834631313 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -1,11 +1,13 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Juan Pablo Villafáñez + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/lib/Lib/Api.php b/apps/files_external/lib/Lib/Api.php index 589317dcf9822..82dd377cd1666 100644 --- a/apps/files_external/lib/Lib/Api.php +++ b/apps/files_external/lib/Lib/Api.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php index 296ed59a77a03..dbf14b76da8b9 100644 --- a/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php +++ b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/AuthMechanism.php b/apps/files_external/lib/Lib/Auth/AuthMechanism.php index 68d6f023487e2..1229fd7f07e17 100644 --- a/apps/files_external/lib/Lib/Auth/AuthMechanism.php +++ b/apps/files_external/lib/Lib/Auth/AuthMechanism.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Lib/Auth/Builtin.php b/apps/files_external/lib/Lib/Auth/Builtin.php index c5c3a19e54f5a..d39f459c66034 100644 --- a/apps/files_external/lib/Lib/Auth/Builtin.php +++ b/apps/files_external/lib/Lib/Auth/Builtin.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/IUserProvided.php b/apps/files_external/lib/Lib/Auth/IUserProvided.php index 6852c804be5d8..ed4abaf657379 100644 --- a/apps/files_external/lib/Lib/Auth/IUserProvided.php +++ b/apps/files_external/lib/Lib/Auth/IUserProvided.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Lib/Auth/NullMechanism.php b/apps/files_external/lib/Lib/Auth/NullMechanism.php index 671a5ff66c530..f0d741e01248f 100644 --- a/apps/files_external/lib/Lib/Auth/NullMechanism.php +++ b/apps/files_external/lib/Lib/Auth/NullMechanism.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/OAuth1/OAuth1.php b/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php index 808681530ea0f..2602d5de41b5a 100644 --- a/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php +++ b/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/OAuth2/OAuth2.php b/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php index d4bba8ef0ebdb..325efb0e1a0dc 100644 --- a/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php +++ b/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/OpenStack/OpenStack.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStack.php index 80bbb1299f7ae..17c2c8bd146a8 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStack.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStack.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/OpenStack/Rackspace.php b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php index c968321ca6c3e..caff8e26ae319 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/Password/GlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php index 5fa4dc5d1d457..502024be4f201 100644 --- a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php +++ b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2015, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php index 25bd66fb41a8f..80703b52a9ac5 100644 --- a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php +++ b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2015, ownCloud, Inc. + * + * @author Lukas Reschke + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Lib/Auth/Password/Password.php b/apps/files_external/lib/Lib/Auth/Password/Password.php index 3b1942cc4a8fa..cf8d6b9f4589b 100644 --- a/apps/files_external/lib/Lib/Auth/Password/Password.php +++ b/apps/files_external/lib/Lib/Auth/Password/Password.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Auth/Password/SessionCredentials.php b/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php index 429c549d80afc..2fa939764d73a 100644 --- a/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php +++ b/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php index 2f277163184a6..7eb2f63e7d3c3 100644 --- a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php +++ b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2015, ownCloud, Inc. + * + * @author Lukas Reschke + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php index 7732beeddf8e3..cb387b2201298 100644 --- a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php +++ b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/AmazonS3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php index 449b6c0379d69..c975901512199 100644 --- a/apps/files_external/lib/Lib/Backend/AmazonS3.php +++ b/apps/files_external/lib/Lib/Backend/AmazonS3.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/Backend.php b/apps/files_external/lib/Lib/Backend/Backend.php index 8fb84b0e8357d..3ce524d3c55d1 100644 --- a/apps/files_external/lib/Lib/Backend/Backend.php +++ b/apps/files_external/lib/Lib/Backend/Backend.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/DAV.php b/apps/files_external/lib/Lib/Backend/DAV.php index c6e9630be9eb7..a8053f81d3668 100644 --- a/apps/files_external/lib/Lib/Backend/DAV.php +++ b/apps/files_external/lib/Lib/Backend/DAV.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/Dropbox.php b/apps/files_external/lib/Lib/Backend/Dropbox.php index 2133c2749960f..1a40faff5a762 100644 --- a/apps/files_external/lib/Lib/Backend/Dropbox.php +++ b/apps/files_external/lib/Lib/Backend/Dropbox.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/FTP.php b/apps/files_external/lib/Lib/Backend/FTP.php index 3960592d0bcfd..edb8884f5955b 100644 --- a/apps/files_external/lib/Lib/Backend/FTP.php +++ b/apps/files_external/lib/Lib/Backend/FTP.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/Google.php b/apps/files_external/lib/Lib/Backend/Google.php index b18b7bdb34883..de14dfb753390 100644 --- a/apps/files_external/lib/Lib/Backend/Google.php +++ b/apps/files_external/lib/Lib/Backend/Google.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/LegacyBackend.php b/apps/files_external/lib/Lib/Backend/LegacyBackend.php index 752c501e1ec3e..4d3aa3e7e931d 100644 --- a/apps/files_external/lib/Lib/Backend/LegacyBackend.php +++ b/apps/files_external/lib/Lib/Backend/LegacyBackend.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/Local.php b/apps/files_external/lib/Lib/Backend/Local.php index 1db707e72473a..298b0af1c7a77 100644 --- a/apps/files_external/lib/Lib/Backend/Local.php +++ b/apps/files_external/lib/Lib/Backend/Local.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/OwnCloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php index e92288b13543d..59d1b2cec52b6 100644 --- a/apps/files_external/lib/Lib/Backend/OwnCloud.php +++ b/apps/files_external/lib/Lib/Backend/OwnCloud.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/SFTP.php b/apps/files_external/lib/Lib/Backend/SFTP.php index fa33caeb57608..cc3c72d283247 100644 --- a/apps/files_external/lib/Lib/Backend/SFTP.php +++ b/apps/files_external/lib/Lib/Backend/SFTP.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/SFTP_Key.php b/apps/files_external/lib/Lib/Backend/SFTP_Key.php index 838cf6c52b265..80ac1ceecc483 100644 --- a/apps/files_external/lib/Lib/Backend/SFTP_Key.php +++ b/apps/files_external/lib/Lib/Backend/SFTP_Key.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php index 7ea30dd11bdc0..c4aadbd13f64c 100644 --- a/apps/files_external/lib/Lib/Backend/SMB.php +++ b/apps/files_external/lib/Lib/Backend/SMB.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php index c543a19bdd81e..76126fd649f85 100644 --- a/apps/files_external/lib/Lib/Backend/SMB_OC.php +++ b/apps/files_external/lib/Lib/Backend/SMB_OC.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Backend/Swift.php b/apps/files_external/lib/Lib/Backend/Swift.php index 58677575f5298..52ed66b95ae4c 100644 --- a/apps/files_external/lib/Lib/Backend/Swift.php +++ b/apps/files_external/lib/Lib/Backend/Swift.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Config/IAuthMechanismProvider.php b/apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php index 035b8e891f5e7..251b04eada025 100644 --- a/apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php +++ b/apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Config/IBackendProvider.php b/apps/files_external/lib/Lib/Config/IBackendProvider.php index 2335e7133a60a..178e5e5d2b64a 100644 --- a/apps/files_external/lib/Lib/Config/IBackendProvider.php +++ b/apps/files_external/lib/Lib/Config/IBackendProvider.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/DefinitionParameter.php b/apps/files_external/lib/Lib/DefinitionParameter.php index 16c07f4b8cc25..c1108fccce791 100644 --- a/apps/files_external/lib/Lib/DefinitionParameter.php +++ b/apps/files_external/lib/Lib/DefinitionParameter.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Lib/DependencyTrait.php b/apps/files_external/lib/Lib/DependencyTrait.php index eed3ba1b327bc..bae2d277a59af 100644 --- a/apps/files_external/lib/Lib/DependencyTrait.php +++ b/apps/files_external/lib/Lib/DependencyTrait.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/FrontendDefinitionTrait.php b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php index ccc2a75fd1bf3..ae4b8ec4c378b 100644 --- a/apps/files_external/lib/Lib/FrontendDefinitionTrait.php +++ b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Lib/IdentifierTrait.php b/apps/files_external/lib/Lib/IdentifierTrait.php index c49f4fcbc8d57..dd5837285459a 100644 --- a/apps/files_external/lib/Lib/IdentifierTrait.php +++ b/apps/files_external/lib/Lib/IdentifierTrait.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php b/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php index 1906057eb6700..925dae7030dc4 100644 --- a/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php +++ b/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php index 7d6c0c4b45b5f..4db4e6d74deb9 100644 --- a/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php +++ b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/MissingDependency.php b/apps/files_external/lib/Lib/MissingDependency.php index a4a20dd11288d..056f57638eb2b 100644 --- a/apps/files_external/lib/Lib/MissingDependency.php +++ b/apps/files_external/lib/Lib/MissingDependency.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/PersonalMount.php b/apps/files_external/lib/Lib/PersonalMount.php index c3b71fbef32bf..c54ed0a79f3a3 100644 --- a/apps/files_external/lib/Lib/PersonalMount.php +++ b/apps/files_external/lib/Lib/PersonalMount.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Lib/PriorityTrait.php b/apps/files_external/lib/Lib/PriorityTrait.php index 9745015bef4ce..d060dbe2f9da0 100644 --- a/apps/files_external/lib/Lib/PriorityTrait.php +++ b/apps/files_external/lib/Lib/PriorityTrait.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/SessionStorageWrapper.php b/apps/files_external/lib/Lib/SessionStorageWrapper.php index c592cb87a34ba..ba0f68b4e118a 100644 --- a/apps/files_external/lib/Lib/SessionStorageWrapper.php +++ b/apps/files_external/lib/Lib/SessionStorageWrapper.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index d67db9858cafb..25b8e74b820e2 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -1,5 +1,7 @@ * @author Arthur Schiwon * @author Bart Visscher @@ -11,12 +13,11 @@ * @author Michael Gapczynski * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/Dropbox.php b/apps/files_external/lib/Lib/Storage/Dropbox.php index f0f62f9f35a6f..45bc6cd0e9870 100644 --- a/apps/files_external/lib/Lib/Storage/Dropbox.php +++ b/apps/files_external/lib/Lib/Storage/Dropbox.php @@ -1,16 +1,17 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Michael Gapczynski * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php index e89efe8796190..6f34416d11198 100644 --- a/apps/files_external/lib/Lib/Storage/FTP.php +++ b/apps/files_external/lib/Lib/Storage/FTP.php @@ -1,5 +1,7 @@ * @author Björn Schießle * @author Felix Moeller @@ -7,13 +9,12 @@ * @author Michael Gapczynski * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Senorsen * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php index 0b617aafe9d1d..a3133cb4743dc 100644 --- a/apps/files_external/lib/Lib/Storage/Google.php +++ b/apps/files_external/lib/Lib/Storage/Google.php @@ -1,5 +1,7 @@ * @author Arthur Schiwon * @author Bart Visscher @@ -10,12 +12,11 @@ * @author Michael Gapczynski * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/OwnCloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php index 22ecb4c806a89..4a10844a770de 100644 --- a/apps/files_external/lib/Lib/Storage/OwnCloud.php +++ b/apps/files_external/lib/Lib/Storage/OwnCloud.php @@ -1,10 +1,11 @@ * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php index 4d4fe6945aa59..9d20742fcb0e5 100644 --- a/apps/files_external/lib/Lib/Storage/SFTP.php +++ b/apps/files_external/lib/Lib/Storage/SFTP.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author hkjolhede @@ -7,14 +9,13 @@ * @author Lennart Rosam * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Ross Nicoll * @author SA * @author Senorsen * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index 6a24c6b17d94f..50ea186060abc 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -1,17 +1,18 @@ * @author Jesús Macias * @author Jörn Friedrich Dreyer * @author Michael Gapczynski * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/StreamWrapper.php b/apps/files_external/lib/Lib/Storage/StreamWrapper.php index 8e3df78878054..5b44091006038 100644 --- a/apps/files_external/lib/Lib/Storage/StreamWrapper.php +++ b/apps/files_external/lib/Lib/Storage/StreamWrapper.php @@ -1,14 +1,15 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index b7f833f9e72f0..ba0b4898e2ec9 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -1,5 +1,7 @@ * @author Benjamin Liles * @author Christian Berendt @@ -9,13 +11,12 @@ * @author Martin Mattel * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Tim Dettrick * @author Vincent Petry * - * @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/files_external/lib/Lib/StorageConfig.php b/apps/files_external/lib/Lib/StorageConfig.php index ba37ba4c33c69..093e6840a1918 100644 --- a/apps/files_external/lib/Lib/StorageConfig.php +++ b/apps/files_external/lib/Lib/StorageConfig.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/lib/Lib/StorageModifierTrait.php b/apps/files_external/lib/Lib/StorageModifierTrait.php index 30c2108feecf4..3327869e1a392 100644 --- a/apps/files_external/lib/Lib/StorageModifierTrait.php +++ b/apps/files_external/lib/Lib/StorageModifierTrait.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Lib/VisibilityTrait.php b/apps/files_external/lib/Lib/VisibilityTrait.php index 916c8e69d9c23..7d886de04ddad 100644 --- a/apps/files_external/lib/Lib/VisibilityTrait.php +++ b/apps/files_external/lib/Lib/VisibilityTrait.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/Migration/DummyUserSession.php b/apps/files_external/lib/Migration/DummyUserSession.php index 0edeab672d055..004ca019eb067 100644 --- a/apps/files_external/lib/Migration/DummyUserSession.php +++ b/apps/files_external/lib/Migration/DummyUserSession.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Migration/StorageMigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php index 4e3c883807921..e48c672613679 100644 --- a/apps/files_external/lib/Migration/StorageMigrator.php +++ b/apps/files_external/lib/Migration/StorageMigrator.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Vincent Petry * - * @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/files_external/lib/NotFoundException.php b/apps/files_external/lib/NotFoundException.php index 607c3c7618acb..4b4d051c4a118 100644 --- a/apps/files_external/lib/NotFoundException.php +++ b/apps/files_external/lib/NotFoundException.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/files_external/lib/Service/BackendService.php b/apps/files_external/lib/Service/BackendService.php index c3dc4da017745..49af01f5bf967 100644 --- a/apps/files_external/lib/Service/BackendService.php +++ b/apps/files_external/lib/Service/BackendService.php @@ -1,9 +1,10 @@ * @author Robin McCorkell * - * @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/files_external/lib/Service/DBConfigService.php b/apps/files_external/lib/Service/DBConfigService.php index 3e38f4aed94d3..a94b73772e76f 100644 --- a/apps/files_external/lib/Service/DBConfigService.php +++ b/apps/files_external/lib/Service/DBConfigService.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Service/GlobalLegacyStoragesService.php b/apps/files_external/lib/Service/GlobalLegacyStoragesService.php index a07ca66f63e63..ee7f158b79225 100644 --- a/apps/files_external/lib/Service/GlobalLegacyStoragesService.php +++ b/apps/files_external/lib/Service/GlobalLegacyStoragesService.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Service/GlobalStoragesService.php b/apps/files_external/lib/Service/GlobalStoragesService.php index 39d3da5d8031c..d0431ed11a650 100644 --- a/apps/files_external/lib/Service/GlobalStoragesService.php +++ b/apps/files_external/lib/Service/GlobalStoragesService.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * @author Vincent Petry * - * @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/files_external/lib/Service/ImportLegacyStoragesService.php b/apps/files_external/lib/Service/ImportLegacyStoragesService.php index 78bdda536f82b..9b3dc5336befd 100644 --- a/apps/files_external/lib/Service/ImportLegacyStoragesService.php +++ b/apps/files_external/lib/Service/ImportLegacyStoragesService.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Service/LegacyStoragesService.php b/apps/files_external/lib/Service/LegacyStoragesService.php index 212e5418e203b..68faf0f285462 100644 --- a/apps/files_external/lib/Service/LegacyStoragesService.php +++ b/apps/files_external/lib/Service/LegacyStoragesService.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Stefan Weil * - * @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/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php index bc1386c059ec2..43839a17d760c 100644 --- a/apps/files_external/lib/Service/StoragesService.php +++ b/apps/files_external/lib/Service/StoragesService.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * @author Vincent Petry * - * @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/files_external/lib/Service/UserGlobalStoragesService.php b/apps/files_external/lib/Service/UserGlobalStoragesService.php index b5e2d13c71211..c22508e57c4f4 100644 --- a/apps/files_external/lib/Service/UserGlobalStoragesService.php +++ b/apps/files_external/lib/Service/UserGlobalStoragesService.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/lib/Service/UserLegacyStoragesService.php b/apps/files_external/lib/Service/UserLegacyStoragesService.php index 5c0cb8dfa0530..dec673b6f7268 100644 --- a/apps/files_external/lib/Service/UserLegacyStoragesService.php +++ b/apps/files_external/lib/Service/UserLegacyStoragesService.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/apps/files_external/lib/Service/UserStoragesService.php index a61694ce7c910..b225f1eec8cbd 100644 --- a/apps/files_external/lib/Service/UserStoragesService.php +++ b/apps/files_external/lib/Service/UserStoragesService.php @@ -1,12 +1,13 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * @author Vincent Petry * - * @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/files_external/lib/Service/UserTrait.php b/apps/files_external/lib/Service/UserTrait.php index 536c0f67e1f8b..5c6464cf7199b 100644 --- a/apps/files_external/lib/Service/UserTrait.php +++ b/apps/files_external/lib/Service/UserTrait.php @@ -1,8 +1,9 @@ * - * @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/files_external/lib/config.php b/apps/files_external/lib/config.php index 3510b675d4d3a..cd3b4d9f3cb43 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -1,21 +1,23 @@ * @author Bart Visscher * @author Björn Schießle * @author Frank Karlitschek * @author Jesús Macias - * @author Joas Schilling + * @author Joas Schilling + * @author Juan Pablo Villafáñez * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/list.php b/apps/files_external/list.php index 15e05b0e35c36..bda484d996e2e 100644 --- a/apps/files_external/list.php +++ b/apps/files_external/list.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/files_external/personal.php b/apps/files_external/personal.php index 8c289f8e30f06..e2131252384fa 100644 --- a/apps/files_external/personal.php +++ b/apps/files_external/personal.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/settings.php b/apps/files_external/settings.php index 24cd9cd9aebac..cb9ee5ccde036 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -1,13 +1,13 @@ - * @author Joas Schilling + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/tests/AmazonS3MigrationTest.php b/apps/files_external/tests/AmazonS3MigrationTest.php index 132d907ab14ac..2788ef6cbb4d4 100644 --- a/apps/files_external/tests/AmazonS3MigrationTest.php +++ b/apps/files_external/tests/AmazonS3MigrationTest.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/files_external/tests/Auth/AuthMechanismTest.php b/apps/files_external/tests/Auth/AuthMechanismTest.php index 789d1f62478c8..5d635a5036aa3 100644 --- a/apps/files_external/tests/Auth/AuthMechanismTest.php +++ b/apps/files_external/tests/Auth/AuthMechanismTest.php @@ -1,8 +1,9 @@ * - * @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/files_external/tests/Auth/Password/GlobalAuth.php b/apps/files_external/tests/Auth/Password/GlobalAuth.php index 912bfd1574d3e..1f0841a34930c 100644 --- a/apps/files_external/tests/Auth/Password/GlobalAuth.php +++ b/apps/files_external/tests/Auth/Password/GlobalAuth.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/Backend/BackendTest.php b/apps/files_external/tests/Backend/BackendTest.php index 50f6d975bf076..762b9f4c0e86a 100644 --- a/apps/files_external/tests/Backend/BackendTest.php +++ b/apps/files_external/tests/Backend/BackendTest.php @@ -1,8 +1,9 @@ * - * @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/files_external/tests/Backend/LegacyBackendTest.php b/apps/files_external/tests/Backend/LegacyBackendTest.php index 465b79a6be633..c1d54d1ca34c1 100644 --- a/apps/files_external/tests/Backend/LegacyBackendTest.php +++ b/apps/files_external/tests/Backend/LegacyBackendTest.php @@ -1,8 +1,9 @@ * - * @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/files_external/tests/Command/ApplicableTest.php b/apps/files_external/tests/Command/ApplicableTest.php index 64d41f6f245cc..7e2ba9563a218 100644 --- a/apps/files_external/tests/Command/ApplicableTest.php +++ b/apps/files_external/tests/Command/ApplicableTest.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/Command/CommandTest.php b/apps/files_external/tests/Command/CommandTest.php index d914f0221af12..568fdd7a52f47 100644 --- a/apps/files_external/tests/Command/CommandTest.php +++ b/apps/files_external/tests/Command/CommandTest.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/Command/ListCommandTest.php b/apps/files_external/tests/Command/ListCommandTest.php index 5475a61b78509..256b35d8883d7 100644 --- a/apps/files_external/tests/Command/ListCommandTest.php +++ b/apps/files_external/tests/Command/ListCommandTest.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/Controller/AjaxControllerTest.php b/apps/files_external/tests/Controller/AjaxControllerTest.php index c51172f89951f..0fcd89611cf35 100644 --- a/apps/files_external/tests/Controller/AjaxControllerTest.php +++ b/apps/files_external/tests/Controller/AjaxControllerTest.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Lukas Reschke + * * @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/files_external/tests/Controller/GlobalStoragesControllerTest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php index 980746567f4cb..627892613ec8a 100644 --- a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php index e9c518567f482..35a055e6be583 100644 --- a/apps/files_external/tests/Controller/StoragesControllerTest.php +++ b/apps/files_external/tests/Controller/StoragesControllerTest.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/Controller/UserStoragesControllerTest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php index af59c67bef35d..36182505bf6cf 100644 --- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/DefinitionParameterTest.php b/apps/files_external/tests/DefinitionParameterTest.php index 2f4069af0bd51..d60d9677dbe96 100644 --- a/apps/files_external/tests/DefinitionParameterTest.php +++ b/apps/files_external/tests/DefinitionParameterTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/tests/FrontendDefinitionTraitTest.php b/apps/files_external/tests/FrontendDefinitionTraitTest.php index b3846fa151072..7efc7c665863e 100644 --- a/apps/files_external/tests/FrontendDefinitionTraitTest.php +++ b/apps/files_external/tests/FrontendDefinitionTraitTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/tests/LegacyDependencyCheckPolyfillTest.php b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php index 4b1351a809d1f..89c9fc76faead 100644 --- a/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php +++ b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php @@ -1,8 +1,9 @@ * - * @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/files_external/tests/OwnCloudFunctionsTest.php b/apps/files_external/tests/OwnCloudFunctionsTest.php index 41ae0421ebf68..95222f66972b8 100644 --- a/apps/files_external/tests/OwnCloudFunctionsTest.php +++ b/apps/files_external/tests/OwnCloudFunctionsTest.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/tests/PersonalMountTest.php b/apps/files_external/tests/PersonalMountTest.php index 380b2d3e016e4..28c3bab74550e 100644 --- a/apps/files_external/tests/PersonalMountTest.php +++ b/apps/files_external/tests/PersonalMountTest.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_external/tests/Service/BackendServiceTest.php b/apps/files_external/tests/Service/BackendServiceTest.php index ba9a1f533f22d..efc0a32af5a18 100644 --- a/apps/files_external/tests/Service/BackendServiceTest.php +++ b/apps/files_external/tests/Service/BackendServiceTest.php @@ -1,8 +1,9 @@ * - * @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/files_external/tests/Service/DBConfigServiceTest.php b/apps/files_external/tests/Service/DBConfigServiceTest.php index 3cfa33f0bc877..e6115ddec2022 100644 --- a/apps/files_external/tests/Service/DBConfigServiceTest.php +++ b/apps/files_external/tests/Service/DBConfigServiceTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/files_external/tests/Service/GlobalStoragesServiceTest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php index 81cb02c523684..ba62feb7f96b6 100644 --- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/Service/StoragesServiceTest.php b/apps/files_external/tests/Service/StoragesServiceTest.php index 9ed75c3521117..5dcd93c8ae006 100644 --- a/apps/files_external/tests/Service/StoragesServiceTest.php +++ b/apps/files_external/tests/Service/StoragesServiceTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php index 93a0dae8ae6ae..6d4aa922c72f2 100644 --- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/Service/UserStoragesServiceTest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php index 7e754e4204044..85338065c7376 100644 --- a/apps/files_external/tests/Service/UserStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php index 2776f929a4e70..ce616ca175f64 100644 --- a/apps/files_external/tests/Storage/Amazons3Test.php +++ b/apps/files_external/tests/Storage/Amazons3Test.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/files_external/tests/Storage/DropboxTest.php b/apps/files_external/tests/Storage/DropboxTest.php index 0cb7ab0b53005..910f8245e9399 100644 --- a/apps/files_external/tests/Storage/DropboxTest.php +++ b/apps/files_external/tests/Storage/DropboxTest.php @@ -1,14 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/tests/Storage/FtpTest.php b/apps/files_external/tests/Storage/FtpTest.php index 4c9b69380eda6..5b56becb4adf4 100644 --- a/apps/files_external/tests/Storage/FtpTest.php +++ b/apps/files_external/tests/Storage/FtpTest.php @@ -1,14 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/tests/Storage/GoogleTest.php b/apps/files_external/tests/Storage/GoogleTest.php index eb19cc463b1fb..2a73da4be836e 100644 --- a/apps/files_external/tests/Storage/GoogleTest.php +++ b/apps/files_external/tests/Storage/GoogleTest.php @@ -1,15 +1,17 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller + * @author Vincent Petry * - * @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/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php index 6c1d3789e1a7c..45b5071d9418a 100644 --- a/apps/files_external/tests/Storage/OwncloudTest.php +++ b/apps/files_external/tests/Storage/OwncloudTest.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/tests/Storage/SFTP_KeyTest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php index cb78c6f6110eb..6cd62309e6805 100644 --- a/apps/files_external/tests/Storage/SFTP_KeyTest.php +++ b/apps/files_external/tests/Storage/SFTP_KeyTest.php @@ -1,12 +1,13 @@ * @author Robin McCorkell * @author Ross Nicoll * @author Thomas Müller * @author Viktor Szépe * - * @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/files_external/tests/Storage/SftpTest.php b/apps/files_external/tests/Storage/SftpTest.php index fc518df2a0e51..85b2eec057fb9 100644 --- a/apps/files_external/tests/Storage/SftpTest.php +++ b/apps/files_external/tests/Storage/SftpTest.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php index 48f18bfa3a709..150d4d3a0359f 100644 --- a/apps/files_external/tests/Storage/SmbTest.php +++ b/apps/files_external/tests/Storage/SmbTest.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/tests/Storage/SwiftTest.php b/apps/files_external/tests/Storage/SwiftTest.php index 1bcbb8150675c..19f185ed033c1 100644 --- a/apps/files_external/tests/Storage/SwiftTest.php +++ b/apps/files_external/tests/Storage/SwiftTest.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/files_external/tests/Storage/WebdavTest.php b/apps/files_external/tests/Storage/WebdavTest.php index 116a749b153a4..1e518e23b779b 100644 --- a/apps/files_external/tests/Storage/WebdavTest.php +++ b/apps/files_external/tests/Storage/WebdavTest.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/files_external/tests/StorageConfigTest.php b/apps/files_external/tests/StorageConfigTest.php index 9a2092ea5c8aa..96d4fda5050dd 100644 --- a/apps/files_external/tests/StorageConfigTest.php +++ b/apps/files_external/tests/StorageConfigTest.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Robin McCorkell * @author Vincent Petry * - * @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/files_external/tests/config.php b/apps/files_external/tests/config.php index 9784de7db1584..8f953753fdd1a 100644 --- a/apps/files_external/tests/config.php +++ b/apps/files_external/tests/config.php @@ -1,14 +1,15 @@ * @author hkjolhede * @author Michael Gapczynski - * @author Robin Appelman + * @author Robin Appelman * @author Ross Nicoll * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php index c02d475a769f5..4c60f9c20ca6b 100644 --- a/apps/files_sharing/ajax/publicpreview.php +++ b/apps/files_sharing/ajax/publicpreview.php @@ -1,13 +1,14 @@ * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php index b9b29022cc346..75d6e6081eca1 100644 --- a/apps/files_sharing/ajax/shareinfo.php +++ b/apps/files_sharing/ajax/shareinfo.php @@ -1,13 +1,16 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * @author Vincent Petry * - * @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/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 219fa298d51fa..2df7f099838ec 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -1,15 +1,15 @@ * @author Björn Schießle * @author Gadzy - * @author Joas Schilling + * @author Joas Schilling * @author Michael Gapczynski - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman * @author Vincent Petry * - * @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/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 26d32c3a990f5..92c2759ed1454 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -1,14 +1,15 @@ * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index 92542f98eee8f..d53d878881e66 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_sharing/lib/API/OCSShareWrapper.php b/apps/files_sharing/lib/API/OCSShareWrapper.php index 8ce9271a7091e..fc1115647ed6a 100644 --- a/apps/files_sharing/lib/API/OCSShareWrapper.php +++ b/apps/files_sharing/lib/API/OCSShareWrapper.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/API/Remote.php b/apps/files_sharing/lib/API/Remote.php index 6a7c67604a289..c641899da936c 100644 --- a/apps/files_sharing/lib/API/Remote.php +++ b/apps/files_sharing/lib/API/Remote.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_sharing/lib/API/Share20OCS.php b/apps/files_sharing/lib/API/Share20OCS.php index 9d7aeffcc1b52..fd5e5ddc786f2 100644 --- a/apps/files_sharing/lib/API/Share20OCS.php +++ b/apps/files_sharing/lib/API/Share20OCS.php @@ -1,9 +1,11 @@ - * @author Roeland Jago Douma - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma + * @author Vincent Petry + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/API/Sharees.php b/apps/files_sharing/lib/API/Sharees.php index ea7830ae4c0a9..a7eb13708f3bd 100644 --- a/apps/files_sharing/lib/API/Sharees.php +++ b/apps/files_sharing/lib/API/Sharees.php @@ -1,11 +1,12 @@ - * @author Joas Schilling - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/lib/Activity.php b/apps/files_sharing/lib/Activity.php index f44f5977f105e..f69f86175f81b 100644 --- a/apps/files_sharing/lib/Activity.php +++ b/apps/files_sharing/lib/Activity.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php index b91b0f3ef6e28..aff42cd43dcfa 100644 --- a/apps/files_sharing/lib/AppInfo/Application.php +++ b/apps/files_sharing/lib/AppInfo/Application.php @@ -1,12 +1,14 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php index a0519cadbaa2b..7977410f587b6 100644 --- a/apps/files_sharing/lib/Cache.php +++ b/apps/files_sharing/lib/Cache.php @@ -1,13 +1,14 @@ * @author Jörn Friedrich Dreyer * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php index 5ec540ad4e0c3..8dde2dafb0d98 100644 --- a/apps/files_sharing/lib/Capabilities.php +++ b/apps/files_sharing/lib/Capabilities.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/Controllers/ExternalSharesController.php b/apps/files_sharing/lib/Controllers/ExternalSharesController.php index d9307f6582e46..24b3211e0091a 100644 --- a/apps/files_sharing/lib/Controllers/ExternalSharesController.php +++ b/apps/files_sharing/lib/Controllers/ExternalSharesController.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/files_sharing/lib/Controllers/ShareController.php b/apps/files_sharing/lib/Controllers/ShareController.php index 7a955f6f96087..cd0d40048cf1f 100644 --- a/apps/files_sharing/lib/Controllers/ShareController.php +++ b/apps/files_sharing/lib/Controllers/ShareController.php @@ -1,18 +1,19 @@ + * @author Bjoern Schiessle * @author Björn Schießle * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Piotr Filiciak - * @author Robin Appelman - * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files_sharing/lib/DeleteOrphanedSharesJob.php b/apps/files_sharing/lib/DeleteOrphanedSharesJob.php index 98c3137cffb87..56cbbe10336e5 100644 --- a/apps/files_sharing/lib/DeleteOrphanedSharesJob.php +++ b/apps/files_sharing/lib/DeleteOrphanedSharesJob.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Vincent Petry * - * @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/files_sharing/lib/Exceptions/BrokenPath.php b/apps/files_sharing/lib/Exceptions/BrokenPath.php index 9ed8f916f6970..c6676f3cd0cb2 100644 --- a/apps/files_sharing/lib/Exceptions/BrokenPath.php +++ b/apps/files_sharing/lib/Exceptions/BrokenPath.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/files_sharing/lib/Exceptions/S2SException.php b/apps/files_sharing/lib/Exceptions/S2SException.php index 7869f9e7e6af1..7a888020f8402 100644 --- a/apps/files_sharing/lib/Exceptions/S2SException.php +++ b/apps/files_sharing/lib/Exceptions/S2SException.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php index 479f407e68fe6..19c0606dc463d 100644 --- a/apps/files_sharing/lib/ExpireSharesJob.php +++ b/apps/files_sharing/lib/ExpireSharesJob.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/External/Cache.php b/apps/files_sharing/lib/External/Cache.php index da9bf83cdfa5f..eaf8e0c4acff1 100644 --- a/apps/files_sharing/lib/External/Cache.php +++ b/apps/files_sharing/lib/External/Cache.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php index 3f665b0978d58..741428d8e8804 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * - * @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/files_sharing/lib/External/Mount.php b/apps/files_sharing/lib/External/Mount.php index b5a42e8506142..d756a1830b212 100644 --- a/apps/files_sharing/lib/External/Mount.php +++ b/apps/files_sharing/lib/External/Mount.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/files_sharing/lib/External/MountProvider.php b/apps/files_sharing/lib/External/MountProvider.php index 67d85f27d8129..f46bb009ab0bc 100644 --- a/apps/files_sharing/lib/External/MountProvider.php +++ b/apps/files_sharing/lib/External/MountProvider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/External/Scanner.php b/apps/files_sharing/lib/External/Scanner.php index 9e3859f196688..a0443338114d5 100644 --- a/apps/files_sharing/lib/External/Scanner.php +++ b/apps/files_sharing/lib/External/Scanner.php @@ -1,12 +1,13 @@ * @author Morris Jobke * @author Olivier Paroz - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php index bc8d898f8ef37..1ed6375cd4f74 100644 --- a/apps/files_sharing/lib/External/Storage.php +++ b/apps/files_sharing/lib/External/Storage.php @@ -1,13 +1,15 @@ + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/lib/External/Watcher.php b/apps/files_sharing/lib/External/Watcher.php index 6be35bdeb3b20..e733e16679820 100644 --- a/apps/files_sharing/lib/External/Watcher.php +++ b/apps/files_sharing/lib/External/Watcher.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php index 67312ae97cdcb..5ba65ea1317b7 100644 --- a/apps/files_sharing/lib/Helper.php +++ b/apps/files_sharing/lib/Helper.php @@ -1,16 +1,16 @@ * @author Björn Schießle - * @author Joas Schilling - * @author Jörn Friedrich Dreyer + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files_sharing/lib/Hooks.php b/apps/files_sharing/lib/Hooks.php index 164e7fb0657b9..237e845bc4ea1 100644 --- a/apps/files_sharing/lib/Hooks.php +++ b/apps/files_sharing/lib/Hooks.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/files_sharing/lib/ISharedStorage.php b/apps/files_sharing/lib/ISharedStorage.php index bb47b011f484a..b8abd5821d74f 100644 --- a/apps/files_sharing/lib/ISharedStorage.php +++ b/apps/files_sharing/lib/ISharedStorage.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/files_sharing/lib/Maintainer.php b/apps/files_sharing/lib/Maintainer.php index 89d7cadcd3474..db8f4aae0aaa5 100644 --- a/apps/files_sharing/lib/Maintainer.php +++ b/apps/files_sharing/lib/Maintainer.php @@ -1,10 +1,11 @@ * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_sharing/lib/Middleware/SharingCheckMiddleware.php b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php index afc3a5885a1f1..7c5eb5afbdc12 100644 --- a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php +++ b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/lib/Migration.php b/apps/files_sharing/lib/Migration.php index b3759ea7b5f0b..9c971bf7f4916 100644 --- a/apps/files_sharing/lib/Migration.php +++ b/apps/files_sharing/lib/Migration.php @@ -1,10 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index c71c0e8ddea62..1a08b5e9b65f2 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -1,10 +1,12 @@ - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma + * @author Vincent Petry * - * @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/files_sharing/lib/Scanner.php b/apps/files_sharing/lib/Scanner.php index e75d79e0e9209..6982f1b4612ea 100644 --- a/apps/files_sharing/lib/Scanner.php +++ b/apps/files_sharing/lib/Scanner.php @@ -1,11 +1,12 @@ - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php index 2b066bd2d944d..e5b7edc8e0295 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -1,12 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma + * @author Vincent Petry * - * @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/files_sharing/lib/SharedPropagator.php b/apps/files_sharing/lib/SharedPropagator.php index 064efd6f6a20c..cd4aab3b522f6 100644 --- a/apps/files_sharing/lib/SharedPropagator.php +++ b/apps/files_sharing/lib/SharedPropagator.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/lib/Updater.php b/apps/files_sharing/lib/Updater.php index 0df445a91f2be..de45b45ab3744 100644 --- a/apps/files_sharing/lib/Updater.php +++ b/apps/files_sharing/lib/Updater.php @@ -1,11 +1,12 @@ * @author Michael Gapczynski * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index e7588a589e83e..fe078c7cbea77 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -1,17 +1,19 @@ * @author Bart Visscher + * @author Bjoern Schiessle * @author Björn Schießle * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php index d0a6dc446706e..e4d90274db1b4 100644 --- a/apps/files_sharing/lib/share/folder.php +++ b/apps/files_sharing/lib/share/folder.php @@ -1,13 +1,14 @@ * @author Björn Schießle * @author Michael Gapczynski * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index b5b5e41688422..710137cfe9ac1 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -1,17 +1,18 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author scambra * @author Vincent Petry * - * @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/files_sharing/list.php b/apps/files_sharing/list.php index 5d5d061187ce8..d94d5625e8eab 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -1,8 +1,9 @@ * - * @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/files_sharing/public.php b/apps/files_sharing/public.php index 0d486749d4a25..0aae9e958008a 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/files_sharing/tests/API/Share20OCSTest.php b/apps/files_sharing/tests/API/Share20OCSTest.php index 02c2eb42419f8..5486a83c159b8 100644 --- a/apps/files_sharing/tests/API/Share20OCSTest.php +++ b/apps/files_sharing/tests/API/Share20OCSTest.php @@ -1,9 +1,11 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma + * @author Vincent Petry * - * @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/files_sharing/tests/API/ShareesTest.php b/apps/files_sharing/tests/API/ShareesTest.php index 00e3a133fa9fb..041b45216afcf 100644 --- a/apps/files_sharing/tests/API/ShareesTest.php +++ b/apps/files_sharing/tests/API/ShareesTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/ActivityTest.php b/apps/files_sharing/tests/ActivityTest.php index 605aacedeb418..8acf1996609ea 100644 --- a/apps/files_sharing/tests/ActivityTest.php +++ b/apps/files_sharing/tests/ActivityTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index c642f21ef1ce9..88b7d86e6f163 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/BackendTest.php b/apps/files_sharing/tests/BackendTest.php index 1a900b4289d5a..f5fd726d6370b 100644 --- a/apps/files_sharing/tests/BackendTest.php +++ b/apps/files_sharing/tests/BackendTest.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/files_sharing/tests/CacheTest.php b/apps/files_sharing/tests/CacheTest.php index ff70990ad20d0..531aa13aa33ac 100644 --- a/apps/files_sharing/tests/CacheTest.php +++ b/apps/files_sharing/tests/CacheTest.php @@ -1,16 +1,17 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php index 08797b26810a6..0c4a68b997c59 100644 --- a/apps/files_sharing/tests/CapabilitiesTest.php +++ b/apps/files_sharing/tests/CapabilitiesTest.php @@ -1,10 +1,11 @@ - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/Controllers/ExternalShareControllerTest.php b/apps/files_sharing/tests/Controllers/ExternalShareControllerTest.php index 42b574515b423..e5fd739c4faed 100644 --- a/apps/files_sharing/tests/Controllers/ExternalShareControllerTest.php +++ b/apps/files_sharing/tests/Controllers/ExternalShareControllerTest.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_sharing/tests/Controllers/ShareControllerTest.php b/apps/files_sharing/tests/Controllers/ShareControllerTest.php index 5b85619874288..34ed08629af1e 100644 --- a/apps/files_sharing/tests/Controllers/ShareControllerTest.php +++ b/apps/files_sharing/tests/Controllers/ShareControllerTest.php @@ -1,16 +1,18 @@ * @author Björn Schießle * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Cloutier * - * @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/files_sharing/tests/DeleteOrphanedSharesJobTest.php b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php index a967357af5a7a..6f7bef24b85e2 100644 --- a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php +++ b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/EncryptedSizePropagationTest.php b/apps/files_sharing/tests/EncryptedSizePropagationTest.php index cf0666dd44660..6b6ed2cd73e81 100644 --- a/apps/files_sharing/tests/EncryptedSizePropagationTest.php +++ b/apps/files_sharing/tests/EncryptedSizePropagationTest.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/EtagPropagationTest.php b/apps/files_sharing/tests/EtagPropagationTest.php index 70f1c50e27ca6..977f98f0497bf 100644 --- a/apps/files_sharing/tests/EtagPropagationTest.php +++ b/apps/files_sharing/tests/EtagPropagationTest.php @@ -1,14 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/ExpireSharesJobTest.php b/apps/files_sharing/tests/ExpireSharesJobTest.php index bb4f756e6c79a..53180f31c5688 100644 --- a/apps/files_sharing/tests/ExpireSharesJobTest.php +++ b/apps/files_sharing/tests/ExpireSharesJobTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/External/CacheTest.php b/apps/files_sharing/tests/External/CacheTest.php index d25bded3bba17..a31a748a69b39 100644 --- a/apps/files_sharing/tests/External/CacheTest.php +++ b/apps/files_sharing/tests/External/CacheTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php index 319fd224b6eb2..931c1fed14d36 100644 --- a/apps/files_sharing/tests/External/ManagerTest.php +++ b/apps/files_sharing/tests/External/ManagerTest.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/files_sharing/tests/External/ScannerTest.php b/apps/files_sharing/tests/External/ScannerTest.php index f16e9952fce2a..1ad19d5c80f83 100644 --- a/apps/files_sharing/tests/External/ScannerTest.php +++ b/apps/files_sharing/tests/External/ScannerTest.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/ExternalStorageTest.php b/apps/files_sharing/tests/ExternalStorageTest.php index c5ff4ad023641..48c348667c55f 100644 --- a/apps/files_sharing/tests/ExternalStorageTest.php +++ b/apps/files_sharing/tests/ExternalStorageTest.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/GroupEtagPropagationTest.php b/apps/files_sharing/tests/GroupEtagPropagationTest.php index 9769079a624ea..0ff3a4c01c6d2 100644 --- a/apps/files_sharing/tests/GroupEtagPropagationTest.php +++ b/apps/files_sharing/tests/GroupEtagPropagationTest.php @@ -1,10 +1,11 @@ - * @author Robin Appelman - * @author Roeland Jago Douma - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/HelperTest.php b/apps/files_sharing/tests/HelperTest.php index eb66081ccc183..d5fe83f44e27e 100644 --- a/apps/files_sharing/tests/HelperTest.php +++ b/apps/files_sharing/tests/HelperTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/files_sharing/tests/LockingTest.php b/apps/files_sharing/tests/LockingTest.php index 74835ac84c714..4af5e3e2cee89 100644 --- a/apps/files_sharing/tests/LockingTest.php +++ b/apps/files_sharing/tests/LockingTest.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php index 2b7e3d7b8783b..2323317f66dac 100644 --- a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/MigrationTest.php b/apps/files_sharing/tests/MigrationTest.php index a8514502a4904..7d6ca7840ed10 100644 --- a/apps/files_sharing/tests/MigrationTest.php +++ b/apps/files_sharing/tests/MigrationTest.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php index ea2e213ca9aef..8fe43d454f657 100644 --- a/apps/files_sharing/tests/MountProviderTest.php +++ b/apps/files_sharing/tests/MountProviderTest.php @@ -1,8 +1,11 @@ + * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/PermissionsTest.php b/apps/files_sharing/tests/PermissionsTest.php index ebcf26a3a175a..2eca474e966a5 100644 --- a/apps/files_sharing/tests/PermissionsTest.php +++ b/apps/files_sharing/tests/PermissionsTest.php @@ -1,13 +1,14 @@ - * @author Joas Schilling - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/PropagationTestCase.php b/apps/files_sharing/tests/PropagationTestCase.php index 20b6b2d43f53a..21cea3033afc4 100644 --- a/apps/files_sharing/tests/PropagationTestCase.php +++ b/apps/files_sharing/tests/PropagationTestCase.php @@ -1,9 +1,10 @@ - * @author Robin Appelman - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php index cc7fdc29cc31d..c1e61152e6364 100644 --- a/apps/files_sharing/tests/ShareTest.php +++ b/apps/files_sharing/tests/ShareTest.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php index da751ad0c842d..7427304eb1484 100644 --- a/apps/files_sharing/tests/SharedMountTest.php +++ b/apps/files_sharing/tests/SharedMountTest.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/SharedStorageTest.php b/apps/files_sharing/tests/SharedStorageTest.php index c62248fa47f07..9be52b3febb3b 100644 --- a/apps/files_sharing/tests/SharedStorageTest.php +++ b/apps/files_sharing/tests/SharedStorageTest.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/SizePropagationTest.php b/apps/files_sharing/tests/SizePropagationTest.php index d7d0336c8718f..3655977fd94f8 100644 --- a/apps/files_sharing/tests/SizePropagationTest.php +++ b/apps/files_sharing/tests/SizePropagationTest.php @@ -1,11 +1,12 @@ - * @author Robin Appelman - * @author Roeland Jago Douma + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php index 3209b14a79a31..de7968dd3ecd8 100644 --- a/apps/files_sharing/tests/TestCase.php +++ b/apps/files_sharing/tests/TestCase.php @@ -1,17 +1,18 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/UnshareChildrenTest.php b/apps/files_sharing/tests/UnshareChildrenTest.php index ea977d7ec35ed..2bde37af20ed3 100644 --- a/apps/files_sharing/tests/UnshareChildrenTest.php +++ b/apps/files_sharing/tests/UnshareChildrenTest.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php index e927219b52af0..da292826f0aba 100644 --- a/apps/files_sharing/tests/UpdaterTest.php +++ b/apps/files_sharing/tests/UpdaterTest.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_sharing/tests/WatcherTest.php b/apps/files_sharing/tests/WatcherTest.php index 8a5c3ace2d250..e6ca5f40a8fa4 100644 --- a/apps/files_sharing/tests/WatcherTest.php +++ b/apps/files_sharing/tests/WatcherTest.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 833b74dc2d325..d75325c3aeb5c 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -1,13 +1,14 @@ * @author Björn Schießle * @author Lukas Reschke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files_trashbin/ajax/isEmpty.php b/apps/files_trashbin/ajax/isEmpty.php index c22b712b96fb0..1ee671334f285 100644 --- a/apps/files_trashbin/ajax/isEmpty.php +++ b/apps/files_trashbin/ajax/isEmpty.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Morris Jobke * - * @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/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php index 162f27e961b17..dff647aa694c9 100644 --- a/apps/files_trashbin/ajax/list.php +++ b/apps/files_trashbin/ajax/list.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Vincent Petry * - * @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/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php index ae1ea5f193783..1a0131da28c6e 100644 --- a/apps/files_trashbin/ajax/preview.php +++ b/apps/files_trashbin/ajax/preview.php @@ -1,13 +1,14 @@ * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 3d480a40fae1c..9095c551b4ff9 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -1,14 +1,15 @@ * @author Björn Schießle * @author Lukas Reschke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 3f86dd5b17e2b..ed53657d22a70 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -1,13 +1,14 @@ * @author Christopher Schäpers * @author Florin Peter - * @author Robin Appelman + * @author Robin Appelman * @author Victor Dubiniuk * @author Vincent Petry * - * @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/files_trashbin/appinfo/register_command.php b/apps/files_trashbin/appinfo/register_command.php index c5e7e1e8bdfce..676e3f5891c25 100644 --- a/apps/files_trashbin/appinfo/register_command.php +++ b/apps/files_trashbin/appinfo/register_command.php @@ -1,8 +1,9 @@ * - * @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/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php index d6225f01dd7c9..2f4988c9dcc15 100644 --- a/apps/files_trashbin/appinfo/routes.php +++ b/apps/files_trashbin/appinfo/routes.php @@ -1,10 +1,11 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php index 676c39735119b..6685eea80dac8 100644 --- a/apps/files_trashbin/appinfo/update.php +++ b/apps/files_trashbin/appinfo/update.php @@ -1,9 +1,10 @@ * @author Victor Dubiniuk * - * @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/files_trashbin/lib/AppInfo/Application.php b/apps/files_trashbin/lib/AppInfo/Application.php index 841c9d90f1ba8..ee1c9481286fb 100644 --- a/apps/files_trashbin/lib/AppInfo/Application.php +++ b/apps/files_trashbin/lib/AppInfo/Application.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Victor Dubiniuk * - * @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/files_trashbin/lib/BackgroundJob/ExpireTrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php index b682f42608875..f2c16843b7004 100644 --- a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php +++ b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Victor Dubiniuk * - * @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/files_trashbin/lib/Capabilities.php b/apps/files_trashbin/lib/Capabilities.php index 2517eac680e45..a348a9105fb9a 100644 --- a/apps/files_trashbin/lib/Capabilities.php +++ b/apps/files_trashbin/lib/Capabilities.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/files_trashbin/lib/Command/CleanUp.php b/apps/files_trashbin/lib/Command/CleanUp.php index 40b1f55e2fc59..b727dd9e1339e 100644 --- a/apps/files_trashbin/lib/Command/CleanUp.php +++ b/apps/files_trashbin/lib/Command/CleanUp.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/files_trashbin/lib/Command/Expire.php b/apps/files_trashbin/lib/Command/Expire.php index 9e0f58e12ceff..0d9bb4a088a28 100644 --- a/apps/files_trashbin/lib/Command/Expire.php +++ b/apps/files_trashbin/lib/Command/Expire.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/files_trashbin/lib/Exceptions/CopyRecursiveException.php b/apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php index d1fbc6f1990a1..1e639a56868f0 100644 --- a/apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php +++ b/apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/files_trashbin/lib/Expiration.php b/apps/files_trashbin/lib/Expiration.php index 171392bf74b99..03f126fc415e5 100644 --- a/apps/files_trashbin/lib/Expiration.php +++ b/apps/files_trashbin/lib/Expiration.php @@ -1,9 +1,10 @@ * @author Victor Dubiniuk * - * @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/files_trashbin/lib/Helper.php b/apps/files_trashbin/lib/Helper.php index 0ce871f6781a5..836f799381af0 100644 --- a/apps/files_trashbin/lib/Helper.php +++ b/apps/files_trashbin/lib/Helper.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/files_trashbin/lib/Hooks.php b/apps/files_trashbin/lib/Hooks.php index c9821e1834de4..eb585aa051c49 100644 --- a/apps/files_trashbin/lib/Hooks.php +++ b/apps/files_trashbin/lib/Hooks.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Robin McCorkell * @author Vincent Petry * - * @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/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php index 5a5e03a8c9ba6..a6672dbf63aaa 100644 --- a/apps/files_trashbin/lib/Storage.php +++ b/apps/files_trashbin/lib/Storage.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 6dfd71fd8c789..db6eb29228b77 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -1,5 +1,7 @@ * @author Bastien Ho * @author Björn Schießle @@ -9,16 +11,15 @@ * @author Lukas Reschke * @author Morris Jobke * @author Qingping Hou - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sjors van der Pluijm * @author Stefan Weil * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/files_trashbin/list.php b/apps/files_trashbin/list.php index 5a5c87d268e7a..77823617831ee 100644 --- a/apps/files_trashbin/list.php +++ b/apps/files_trashbin/list.php @@ -1,10 +1,11 @@ * @author Björn Schießle * @author Vincent Petry * - * @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/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php index db6180cedb7a3..d92984bbce94c 100644 --- a/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php +++ b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Victor Dubiniuk * - * @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/files_trashbin/tests/Command/CleanUpTest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php index e758fede924f1..6cf2c60948b98 100644 --- a/apps/files_trashbin/tests/Command/CleanUpTest.php +++ b/apps/files_trashbin/tests/Command/CleanUpTest.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/files_trashbin/tests/Command/ExpireTest.php b/apps/files_trashbin/tests/Command/ExpireTest.php index e481e29330f1a..bdc8d86794443 100644 --- a/apps/files_trashbin/tests/Command/ExpireTest.php +++ b/apps/files_trashbin/tests/Command/ExpireTest.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/files_trashbin/tests/ExpirationTest.php b/apps/files_trashbin/tests/ExpirationTest.php index 246409e24f400..86c9d21fe57a5 100644 --- a/apps/files_trashbin/tests/ExpirationTest.php +++ b/apps/files_trashbin/tests/ExpirationTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Victor Dubiniuk * - * @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/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php index d6ed92f0e43c5..2aebe6414f7d5 100644 --- a/apps/files_trashbin/tests/StorageTest.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * @author Vincent Petry * - * @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/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php index 961cea04fef67..cb5a9fed5bba4 100644 --- a/apps/files_trashbin/tests/TrashbinTest.php +++ b/apps/files_trashbin/tests/TrashbinTest.php @@ -1,15 +1,16 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php index a25d1a14fbe3b..c3cb47da88947 100644 --- a/apps/files_versions/ajax/getVersions.php +++ b/apps/files_versions/ajax/getVersions.php @@ -1,5 +1,7 @@ * @author Björn Schießle * @author Frank Karlitschek @@ -7,7 +9,6 @@ * @author Sam Tuke * @author Vincent Petry * - * @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/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php index b5b851a1b4a6b..78e830d7c8f66 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -1,12 +1,13 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php index 9a6970fa6b1a0..6d5933e07fd6f 100644 --- a/apps/files_versions/ajax/rollbackVersion.php +++ b/apps/files_versions/ajax/rollbackVersion.php @@ -1,15 +1,16 @@ * @author Björn Schießle * @author Frank Karlitschek * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Sam Tuke * @author Thomas Müller * @author Thomas Tanghus * - * @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/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 1cc563d6835b4..1ac7d40689ed3 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -1,10 +1,11 @@ * @author Frank Karlitschek * @author Victor Dubiniuk * - * @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/files_versions/appinfo/register_command.php b/apps/files_versions/appinfo/register_command.php index 9f3c34f2f7c1e..b991c72b944be 100644 --- a/apps/files_versions/appinfo/register_command.php +++ b/apps/files_versions/appinfo/register_command.php @@ -1,8 +1,9 @@ * - * @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/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index 068c46e968deb..c2b686c38f391 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -1,14 +1,15 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/files_versions/download.php b/apps/files_versions/download.php index 0a4543dab04c7..a2ecd2fc12a47 100644 --- a/apps/files_versions/download.php +++ b/apps/files_versions/download.php @@ -1,13 +1,14 @@ * @author Björn Schießle * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/files_versions/lib/AppInfo/Application.php b/apps/files_versions/lib/AppInfo/Application.php index b32cf54729d5d..f75fea1e11705 100644 --- a/apps/files_versions/lib/AppInfo/Application.php +++ b/apps/files_versions/lib/AppInfo/Application.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Victor Dubiniuk * - * @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/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php index f357b73409ba4..a5d3efda77b26 100644 --- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php +++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Victor Dubiniuk * - * @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/files_versions/lib/Capabilities.php b/apps/files_versions/lib/Capabilities.php index 441b2adfba3aa..a4d13adf8bd40 100644 --- a/apps/files_versions/lib/Capabilities.php +++ b/apps/files_versions/lib/Capabilities.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tom Needham * - * @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/files_versions/lib/Command/CleanUp.php b/apps/files_versions/lib/Command/CleanUp.php index a6d652f6850a4..7254d1e5bf27a 100644 --- a/apps/files_versions/lib/Command/CleanUp.php +++ b/apps/files_versions/lib/Command/CleanUp.php @@ -1,8 +1,9 @@ * - * @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/files_versions/lib/Command/Expire.php b/apps/files_versions/lib/Command/Expire.php index b1f72980633e4..fecffd2f3cc95 100644 --- a/apps/files_versions/lib/Command/Expire.php +++ b/apps/files_versions/lib/Command/Expire.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php index ffc7640e7f90d..1dad880123022 100644 --- a/apps/files_versions/lib/Expiration.php +++ b/apps/files_versions/lib/Expiration.php @@ -1,8 +1,9 @@ * - * @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/files_versions/lib/Hooks.php b/apps/files_versions/lib/Hooks.php index b27a298f989a8..5181bb1b1ab1d 100644 --- a/apps/files_versions/lib/Hooks.php +++ b/apps/files_versions/lib/Hooks.php @@ -1,15 +1,16 @@ * @author Björn Schießle * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Sam Tuke * @author Vincent Petry * - * @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/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index cd4830d546966..cf0e09f64cab7 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -1,21 +1,24 @@ * @author Bart Visscher + * @author Bjoern Schiessle * @author Björn Schießle + * @author Carlos Damken * @author Felix Moeller * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php index 4cc793bad0ecc..d716bc1ddbb05 100644 --- a/apps/files_versions/tests/Command/CleanupTest.php +++ b/apps/files_versions/tests/Command/CleanupTest.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/files_versions/tests/Command/ExpireTest.php b/apps/files_versions/tests/Command/ExpireTest.php index f89ece82515d2..3815bc5b75e27 100644 --- a/apps/files_versions/tests/Command/ExpireTest.php +++ b/apps/files_versions/tests/Command/ExpireTest.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Thomas Müller * - * @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/files_versions/tests/ExpirationTest.php b/apps/files_versions/tests/ExpirationTest.php index 2486b9c85c868..7fe6b279b9a23 100644 --- a/apps/files_versions/tests/ExpirationTest.php +++ b/apps/files_versions/tests/ExpirationTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Victor Dubiniuk * - * @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/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index 832f7bcc66fa7..15bcaf9a90cd2 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -1,19 +1,20 @@ * @author Björn Schießle * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * @author Vincent Petry * - * @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/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php index 3201f9a6ceeb4..907e16ebf3c48 100644 --- a/apps/provisioning_api/appinfo/routes.php +++ b/apps/provisioning_api/appinfo/routes.php @@ -1,14 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author michag86 * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/provisioning_api/lib/Apps.php b/apps/provisioning_api/lib/Apps.php index c23591a684a3f..f880e41905b09 100644 --- a/apps/provisioning_api/lib/Apps.php +++ b/apps/provisioning_api/lib/Apps.php @@ -1,12 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tom Needham * - * @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/provisioning_api/lib/Groups.php b/apps/provisioning_api/lib/Groups.php index 90a40c07654ee..18302595ae97c 100644 --- a/apps/provisioning_api/lib/Groups.php +++ b/apps/provisioning_api/lib/Groups.php @@ -1,12 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tom Needham * - * @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/provisioning_api/lib/Users.php b/apps/provisioning_api/lib/Users.php index 0d64f24c6724e..0e5a8043e8a93 100644 --- a/apps/provisioning_api/lib/Users.php +++ b/apps/provisioning_api/lib/Users.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author michag86 * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/provisioning_api/tests/AppsTest.php b/apps/provisioning_api/tests/AppsTest.php index 34f0d8f4ddb59..35808b1581618 100644 --- a/apps/provisioning_api/tests/AppsTest.php +++ b/apps/provisioning_api/tests/AppsTest.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/provisioning_api/tests/GroupsTest.php b/apps/provisioning_api/tests/GroupsTest.php index a94ed7884025f..2fa19c4f8b451 100644 --- a/apps/provisioning_api/tests/GroupsTest.php +++ b/apps/provisioning_api/tests/GroupsTest.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tom Needham * - * @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/provisioning_api/tests/TestCase.php b/apps/provisioning_api/tests/TestCase.php index 743c1c9c44bc0..1ff2c82a3bed4 100644 --- a/apps/provisioning_api/tests/TestCase.php +++ b/apps/provisioning_api/tests/TestCase.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/provisioning_api/tests/UsersTest.php b/apps/provisioning_api/tests/UsersTest.php index cba24f3c45776..e67d603e487bf 100644 --- a/apps/provisioning_api/tests/UsersTest.php +++ b/apps/provisioning_api/tests/UsersTest.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author michag86 * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php index a32ecd516d0b8..af91e5fdbcd54 100644 --- a/apps/systemtags/appinfo/app.php +++ b/apps/systemtags/appinfo/app.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/systemtags/lib/Activity/Extension.php b/apps/systemtags/lib/Activity/Extension.php index ed99753d1e747..c7342bd2af78c 100644 --- a/apps/systemtags/lib/Activity/Extension.php +++ b/apps/systemtags/lib/Activity/Extension.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/systemtags/lib/Activity/Listener.php b/apps/systemtags/lib/Activity/Listener.php index 435109053bd21..69ba888c4fb0e 100644 --- a/apps/systemtags/lib/Activity/Listener.php +++ b/apps/systemtags/lib/Activity/Listener.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Vincent Petry + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/systemtags/list.php b/apps/systemtags/list.php index dd4fe01e76743..67fdeca93e9a7 100644 --- a/apps/systemtags/list.php +++ b/apps/systemtags/list.php @@ -1,8 +1,9 @@ * - * @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/testing/appinfo/routes.php b/apps/testing/appinfo/routes.php index 619daf40da9d6..13caa2289df93 100644 --- a/apps/testing/appinfo/routes.php +++ b/apps/testing/appinfo/routes.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/testing/lib/Config.php b/apps/testing/lib/Config.php index d1cb021581daa..6cdd28d4b3e94 100644 --- a/apps/testing/lib/Config.php +++ b/apps/testing/lib/Config.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/testing/locking/fakedblockingprovider.php b/apps/testing/locking/fakedblockingprovider.php index fd090e0e07564..174cc2ec7fea7 100644 --- a/apps/testing/locking/fakedblockingprovider.php +++ b/apps/testing/locking/fakedblockingprovider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/testing/locking/provisioning.php b/apps/testing/locking/provisioning.php index 55a1be0caee6a..84587fa9a62c0 100644 --- a/apps/testing/locking/provisioning.php +++ b/apps/testing/locking/provisioning.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/theming/appinfo/app.php b/apps/theming/appinfo/app.php index edf2c7d345ac1..76580879ca112 100644 --- a/apps/theming/appinfo/app.php +++ b/apps/theming/appinfo/app.php @@ -3,6 +3,9 @@ * @copyright Copyright (c) 2016 Bjoern Schiessle * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Bjoern Schiessle + * @author Lukas Reschke + * * @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/theming/appinfo/routes.php b/apps/theming/appinfo/routes.php index dcbb0618fa218..073dacb789c71 100644 --- a/apps/theming/appinfo/routes.php +++ b/apps/theming/appinfo/routes.php @@ -3,6 +3,10 @@ * @copyright Copyright (c) 2016 Bjoern Schiessle * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Bjoern Schiessle + * @author Lukas Reschke + * @author oparoz + * * @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/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index 303bb85f54087..b6fb1a6be5b9a 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -3,6 +3,11 @@ * @copyright Copyright (c) 2016 Bjoern Schiessle * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Bjoern Schiessle + * @author Julius Haertl + * @author Lukas Reschke + * @author oparoz + * * @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/theming/lib/template.php b/apps/theming/lib/template.php index 436dfe86a038d..8cd2befc1d112 100644 --- a/apps/theming/lib/template.php +++ b/apps/theming/lib/template.php @@ -3,6 +3,10 @@ * @copyright Copyright (c) 2016 Bjoern Schiessle * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Bjoern Schiessle + * @author Joas Schilling + * @author Lukas Reschke + * * @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/theming/lib/util.php b/apps/theming/lib/util.php index 8ff5ae89b1442..2088650b19db7 100644 --- a/apps/theming/lib/util.php +++ b/apps/theming/lib/util.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Julius Härtl * + * @author Julius Haertl + * * @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/theming/settings/settings-admin.php b/apps/theming/settings/settings-admin.php index a7643960adc44..d9aa05cfca064 100644 --- a/apps/theming/settings/settings-admin.php +++ b/apps/theming/settings/settings-admin.php @@ -3,6 +3,9 @@ * @copyright Copyright (c) 2016 Bjoern Schiessle * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Bjoern Schiessle + * @author Lukas Reschke + * * @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/theming/tests/lib/TemplateTest.php b/apps/theming/tests/lib/TemplateTest.php index cd7115d2086ec..c3c792657ec6e 100644 --- a/apps/theming/tests/lib/TemplateTest.php +++ b/apps/theming/tests/lib/TemplateTest.php @@ -2,6 +2,9 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Joas Schilling + * @author Lukas Reschke + * * @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/theming/tests/lib/UtilTest.php b/apps/theming/tests/lib/UtilTest.php index 266e6fc6c2dd4..9ebb11d628843 100644 --- a/apps/theming/tests/lib/UtilTest.php +++ b/apps/theming/tests/lib/UtilTest.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Julius Härtl * + * @author Julius Haertl + * * @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/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 1ed82ab8b58b5..6dcb4b548c43d 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -2,6 +2,10 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Julius Haertl + * @author Lukas Reschke + * @author oparoz + * * @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/updatenotification/admin.php b/apps/updatenotification/admin.php index e79e560561011..81c7a8fb5576c 100644 --- a/apps/updatenotification/admin.php +++ b/apps/updatenotification/admin.php @@ -1,8 +1,9 @@ * - * @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/updatenotification/appinfo/app.php b/apps/updatenotification/appinfo/app.php index 01cf3330aaa66..0f49d2525e57d 100644 --- a/apps/updatenotification/appinfo/app.php +++ b/apps/updatenotification/appinfo/app.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller * - * @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/updatenotification/appinfo/routes.php b/apps/updatenotification/appinfo/routes.php index f9ebbe3015464..fd508d37051fe 100644 --- a/apps/updatenotification/appinfo/routes.php +++ b/apps/updatenotification/appinfo/routes.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * - * @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/updatenotification/lib/AppInfo/Application.php b/apps/updatenotification/lib/AppInfo/Application.php index 2d7644ced678c..aefed9cca5c88 100644 --- a/apps/updatenotification/lib/AppInfo/Application.php +++ b/apps/updatenotification/lib/AppInfo/Application.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php index 8acb966f5c95f..ada04bdd68cc6 100644 --- a/apps/updatenotification/lib/Controller/AdminController.php +++ b/apps/updatenotification/lib/Controller/AdminController.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * - * @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/updatenotification/lib/Notification/BackgroundJob.php b/apps/updatenotification/lib/Notification/BackgroundJob.php index e455a1642f4d2..70cde58bcb462 100644 --- a/apps/updatenotification/lib/Notification/BackgroundJob.php +++ b/apps/updatenotification/lib/Notification/BackgroundJob.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/updatenotification/lib/Notification/Notifier.php b/apps/updatenotification/lib/Notification/Notifier.php index bd89c11d62ddc..48ce31f7374fc 100644 --- a/apps/updatenotification/lib/Notification/Notifier.php +++ b/apps/updatenotification/lib/Notification/Notifier.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Morris Jobke + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/updatenotification/lib/ResetTokenBackgroundJob.php b/apps/updatenotification/lib/ResetTokenBackgroundJob.php index 0456f032e797c..93b5a750789a4 100644 --- a/apps/updatenotification/lib/ResetTokenBackgroundJob.php +++ b/apps/updatenotification/lib/ResetTokenBackgroundJob.php @@ -1,8 +1,9 @@ * - * @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/updatenotification/lib/UpdateChecker.php b/apps/updatenotification/lib/UpdateChecker.php index 1d30bb5a35e27..dd51831007c99 100644 --- a/apps/updatenotification/lib/UpdateChecker.php +++ b/apps/updatenotification/lib/UpdateChecker.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php index d08ff2feb130b..0343542ef4187 100644 --- a/apps/updatenotification/tests/Controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * - * @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/updatenotification/tests/Notification/BackgroundJobTest.php b/apps/updatenotification/tests/Notification/BackgroundJobTest.php index d1076e10be52e..c60a142957685 100644 --- a/apps/updatenotification/tests/Notification/BackgroundJobTest.php +++ b/apps/updatenotification/tests/Notification/BackgroundJobTest.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/updatenotification/tests/Notification/NotifierTest.php b/apps/updatenotification/tests/Notification/NotifierTest.php index d85cf3e70721d..8848a3124fbe3 100644 --- a/apps/updatenotification/tests/Notification/NotifierTest.php +++ b/apps/updatenotification/tests/Notification/NotifierTest.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php index 648688962b5fa..71b72a40021cb 100644 --- a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php +++ b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php @@ -1,8 +1,9 @@ * - * @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/updatenotification/tests/UpdateCheckerTest.php b/apps/updatenotification/tests/UpdateCheckerTest.php index 4ff8c07d2ee77..c2c9ba1438dc3 100644 --- a/apps/updatenotification/tests/UpdateCheckerTest.php +++ b/apps/updatenotification/tests/UpdateCheckerTest.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php index ae000e8d6ef16..4ec0330729605 100644 --- a/apps/user_ldap/ajax/clearMappings.php +++ b/apps/user_ldap/ajax/clearMappings.php @@ -1,11 +1,12 @@ * @author Christopher Schäpers * @author Lukas Reschke * @author Morris Jobke * - * @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/user_ldap/ajax/deleteConfiguration.php b/apps/user_ldap/ajax/deleteConfiguration.php index 236d44288616b..683a63435e244 100644 --- a/apps/user_ldap/ajax/deleteConfiguration.php +++ b/apps/user_ldap/ajax/deleteConfiguration.php @@ -1,14 +1,15 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/user_ldap/ajax/getConfiguration.php b/apps/user_ldap/ajax/getConfiguration.php index 75d99eade6976..0537349bbeb78 100644 --- a/apps/user_ldap/ajax/getConfiguration.php +++ b/apps/user_ldap/ajax/getConfiguration.php @@ -1,12 +1,13 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * - * @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/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php index db47d13c2bb85..ae0199f79a766 100644 --- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php +++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php index a1b100ef9307b..51737cc995332 100644 --- a/apps/user_ldap/ajax/setConfiguration.php +++ b/apps/user_ldap/ajax/setConfiguration.php @@ -1,13 +1,14 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Lennart Rosam * @author Lukas Reschke * @author Morris Jobke * - * @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/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index 20a82d056d26c..6581e8453bd10 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -1,13 +1,14 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index c1dda550cd147..b5eab90af48a8 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 30e9711ccf044..18987614bdbca 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -1,15 +1,16 @@ * @author Bart Visscher * @author Christopher Schäpers * @author Dominik Schmidt - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php index 1c2cf1be55231..b3c92b0024ae6 100644 --- a/apps/user_ldap/appinfo/install.php +++ b/apps/user_ldap/appinfo/install.php @@ -1,9 +1,10 @@ * @author Christopher Schäpers * - * @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/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index c2e0e8aec3e68..59e2dca565fbb 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/appinfo/routes.php b/apps/user_ldap/appinfo/routes.php index 31bc196031502..c01a3c114725b 100644 --- a/apps/user_ldap/appinfo/routes.php +++ b/apps/user_ldap/appinfo/routes.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index cdf1233147739..dabf243eda161 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -1,12 +1,15 @@ * @author Alexander Bergolth * @author Andreas Fischer * @author Arthur Schiwon * @author Bart Visscher * @author Benjamin Diele * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lorenzo M. Catucci * @author Lukas Reschke @@ -18,7 +21,6 @@ * @author Renaud Fortier * @author Robin McCorkell * - * @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/user_ldap/lib/BackendUtility.php b/apps/user_ldap/lib/BackendUtility.php index 7f3b905823090..dc5a8a36ce4a9 100644 --- a/apps/user_ldap/lib/BackendUtility.php +++ b/apps/user_ldap/lib/BackendUtility.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * - * @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/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php index 4bf7ecc42b89c..236d2e51d0b93 100644 --- a/apps/user_ldap/lib/Command/CheckUser.php +++ b/apps/user_ldap/lib/Command/CheckUser.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/Command/CreateEmptyConfig.php b/apps/user_ldap/lib/Command/CreateEmptyConfig.php index 486a10fedabb9..53cc4cbf46603 100644 --- a/apps/user_ldap/lib/Command/CreateEmptyConfig.php +++ b/apps/user_ldap/lib/Command/CreateEmptyConfig.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Martin Konrad * @author Morris Jobke * - * @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/user_ldap/lib/Command/DeleteConfig.php b/apps/user_ldap/lib/Command/DeleteConfig.php index 54b157b35b031..a986dd6be779e 100644 --- a/apps/user_ldap/lib/Command/DeleteConfig.php +++ b/apps/user_ldap/lib/Command/DeleteConfig.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Martin Konrad * @author Morris Jobke * - * @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/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php index 6e4ae24990785..e1db3f4744841 100644 --- a/apps/user_ldap/lib/Command/Search.php +++ b/apps/user_ldap/lib/Command/Search.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/Command/SetConfig.php b/apps/user_ldap/lib/Command/SetConfig.php index a53b4a743080a..a1d5e90f3edaa 100644 --- a/apps/user_ldap/lib/Command/SetConfig.php +++ b/apps/user_ldap/lib/Command/SetConfig.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/lib/Command/ShowConfig.php b/apps/user_ldap/lib/Command/ShowConfig.php index 0fd4399a83df7..ac70468b1c4f7 100644 --- a/apps/user_ldap/lib/Command/ShowConfig.php +++ b/apps/user_ldap/lib/Command/ShowConfig.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Laurens Post * @author Morris Jobke * - * @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/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php index c26a4e54f40fd..df38d6f650dd9 100644 --- a/apps/user_ldap/lib/Command/ShowRemnants.php +++ b/apps/user_ldap/lib/Command/ShowRemnants.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author scolebrook * - * @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/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php index 9ed0f9a2cc652..55a834812aa41 100644 --- a/apps/user_ldap/lib/Command/TestConfig.php +++ b/apps/user_ldap/lib/Command/TestConfig.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php index d4e6a92a5347a..2fa42efda2687 100644 --- a/apps/user_ldap/lib/Configuration.php +++ b/apps/user_ldap/lib/Configuration.php @@ -1,16 +1,17 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Alexander Bergolth + * @author Alex Weirig * @author Arthur Schiwon - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lennart Rosam * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * - * @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/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index 1f4516a28e34b..7bd5e97e4f4ca 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -1,16 +1,17 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Lyonel Vincent * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/user_ldap/lib/FilesystemHelper.php b/apps/user_ldap/lib/FilesystemHelper.php index 29611ab7769d1..689fcfeda7e20 100644 --- a/apps/user_ldap/lib/FilesystemHelper.php +++ b/apps/user_ldap/lib/FilesystemHelper.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 14d86fb0619fb..67caa415efa09 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -1,23 +1,24 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Alexander Bergolth + * @author Alex Weirig * @author alexweirig * @author Andreas Fischer * @author Arthur Schiwon * @author Bart Visscher * @author Christopher Schäpers * @author Frédéric Fortier - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Nicolas Grekas * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php index 3b2ec56970aa4..64b85427f8f9c 100644 --- a/apps/user_ldap/lib/Group_Proxy.php +++ b/apps/user_ldap/lib/Group_Proxy.php @@ -1,12 +1,13 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * - * @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/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php index d29fe8cd313e6..ccc1d2c0b44e0 100644 --- a/apps/user_ldap/lib/Helper.php +++ b/apps/user_ldap/lib/Helper.php @@ -1,15 +1,16 @@ * @author Brice Maron - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * @author Vincent Petry * - * @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/user_ldap/lib/ILDAPWrapper.php b/apps/user_ldap/lib/ILDAPWrapper.php index 4f28165736da7..4fd3b31428add 100644 --- a/apps/user_ldap/lib/ILDAPWrapper.php +++ b/apps/user_ldap/lib/ILDAPWrapper.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * - * @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/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php index 5041aead3783b..21c3ece866290 100644 --- a/apps/user_ldap/lib/Jobs/CleanUp.php +++ b/apps/user_ldap/lib/Jobs/CleanUp.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php index 71c74ad58fa0c..91d40d5874215 100644 --- a/apps/user_ldap/lib/Jobs/UpdateGroups.php +++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php @@ -1,16 +1,17 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php index 8ad943aa51051..5376d92a742f2 100644 --- a/apps/user_ldap/lib/LDAP.php +++ b/apps/user_ldap/lib/LDAP.php @@ -1,14 +1,15 @@ * @author Arthur Schiwon - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * - * @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/user_ldap/lib/LDAPUtility.php b/apps/user_ldap/lib/LDAPUtility.php index 506a2bb2b27f7..4c908ee44ddbd 100644 --- a/apps/user_ldap/lib/LDAPUtility.php +++ b/apps/user_ldap/lib/LDAPUtility.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * - * @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/user_ldap/lib/LogWrapper.php b/apps/user_ldap/lib/LogWrapper.php index 2f1d2d05d2e51..dd05b58666d36 100644 --- a/apps/user_ldap/lib/LogWrapper.php +++ b/apps/user_ldap/lib/LogWrapper.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php index 67fbd9fe8519f..8e7f1f8b13735 100644 --- a/apps/user_ldap/lib/Mapping/AbstractMapping.php +++ b/apps/user_ldap/lib/Mapping/AbstractMapping.php @@ -1,9 +1,11 @@ * @author Arthur Schiwon * @author Morris Jobke * - * @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/user_ldap/lib/Mapping/GroupMapping.php b/apps/user_ldap/lib/Mapping/GroupMapping.php index d743971c9a9ea..135faa3018734 100644 --- a/apps/user_ldap/lib/Mapping/GroupMapping.php +++ b/apps/user_ldap/lib/Mapping/GroupMapping.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/user_ldap/lib/Mapping/UserMapping.php b/apps/user_ldap/lib/Mapping/UserMapping.php index 2cdf32d2aa157..10be4b3375e0c 100644 --- a/apps/user_ldap/lib/Mapping/UserMapping.php +++ b/apps/user_ldap/lib/Mapping/UserMapping.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php index 2af55430b7ba4..07cc1ea0e8c70 100644 --- a/apps/user_ldap/lib/Proxy.php +++ b/apps/user_ldap/lib/Proxy.php @@ -1,15 +1,17 @@ * @author Bart Visscher * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell + * @author Thomas Müller * - * @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/user_ldap/lib/User/DeletedUsersIndex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php index 512ff54bbdca5..9ec95a01b5893 100644 --- a/apps/user_ldap/lib/User/DeletedUsersIndex.php +++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/User/IUserTools.php b/apps/user_ldap/lib/User/IUserTools.php index 981e6bd9e2247..4ba9cebb1a63c 100644 --- a/apps/user_ldap/lib/User/IUserTools.php +++ b/apps/user_ldap/lib/User/IUserTools.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php index 767a2351aebf3..1a9138176b0e2 100644 --- a/apps/user_ldap/lib/User/Manager.php +++ b/apps/user_ldap/lib/User/Manager.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php index a4bd022f1ce4f..4ee3bd09911f3 100644 --- a/apps/user_ldap/lib/User/OfflineUser.php +++ b/apps/user_ldap/lib/User/OfflineUser.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index c82bde0704c67..56d881c5d5acc 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index 7929394893b25..a2a65bb8406af 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -1,19 +1,21 @@ * @author Bart Visscher * @author Dominik Schmidt - * @author Joas Schilling + * @author felixboehm + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Renaud Fortier - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Tom Needham * - * @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/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php index 1bd793b6e16a1..c86d4f29ec417 100644 --- a/apps/user_ldap/lib/User_Proxy.php +++ b/apps/user_ldap/lib/User_Proxy.php @@ -1,14 +1,15 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index ea4d36a767d6d..be4d1821ee149 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -1,20 +1,21 @@ * @author Arthur Schiwon * @author Bart Visscher * @author Jean-Louis Dupond - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Nicolas Grekas - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * @author Victor Dubiniuk * - * @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/user_ldap/lib/WizardResult.php b/apps/user_ldap/lib/WizardResult.php index 1f36f2fef2fba..e5294a7650655 100644 --- a/apps/user_ldap/lib/WizardResult.php +++ b/apps/user_ldap/lib/WizardResult.php @@ -1,13 +1,14 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * - * @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/user_ldap/settings.php b/apps/user_ldap/settings.php index 5c69b2ed961de..f20f873e1343b 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -1,16 +1,16 @@ * @author Dominik Schmidt - * @author Frank Karlitschek - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Volkan Gezer * - * @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/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php index 97b87d853c7f3..f96813ba711b7 100644 --- a/apps/user_ldap/tests/AccessTest.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -1,12 +1,13 @@ * @author Arthur Schiwon - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/tests/ConfigurationTest.php b/apps/user_ldap/tests/ConfigurationTest.php index 54096ab38bf84..9951b97e06c12 100644 --- a/apps/user_ldap/tests/ConfigurationTest.php +++ b/apps/user_ldap/tests/ConfigurationTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/ConnectionTest.php b/apps/user_ldap/tests/ConnectionTest.php index 08b91ed14e1fd..ed0a1481589b8 100644 --- a/apps/user_ldap/tests/ConnectionTest.php +++ b/apps/user_ldap/tests/ConnectionTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index 35d525068a642..71120bdb838d7 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -1,13 +1,15 @@ * @author Frédéric Fortier - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller + * @author Vincent Petry * - * @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/user_ldap/tests/Integration/AbstractIntegrationTest.php b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php index 95525c253e1e6..4ec36617c14ae 100644 --- a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php +++ b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/ExceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php index 951c8169902e2..918dad6d5d0ac 100644 --- a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php +++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/FakeManager.php b/apps/user_ldap/tests/Integration/FakeManager.php index a105c1b802b6b..1eb405298a26b 100644 --- a/apps/user_ldap/tests/Integration/FakeManager.php +++ b/apps/user_ldap/tests/Integration/FakeManager.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php index 898e8e27121db..4fcc83343384c 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php index 1deb740d0a46c..1d4bd05b8a575 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php index 0428abd1a606f..2574877fca41b 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php index 67c06212cb349..85a185c8ac6b6 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php index c281787197f05..4d20d52595e0a 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php index d713a7fd30b2d..56f44cc58b2e4 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php index 9cce9e9d7ed15..7acd49af00a62 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php index ece6abc17b10e..a4db8cae68119 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php index 8e804b8d61990..bd4da5ea97f25 100644 --- a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php +++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php index d77202ead0117..de86e17d0144a 100644 --- a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php +++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/user_ldap/tests/Integration/setup-scripts/createExplicitGroups.php b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroups.php index ff2b75e8dc0f2..597b85020c8ee 100644 --- a/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroups.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroups.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/user_ldap/tests/Integration/setup-scripts/createExplicitGroupsDifferentOU.php b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroupsDifferentOU.php index 2c317b9ce5c79..b99115074a4d1 100644 --- a/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroupsDifferentOU.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroupsDifferentOU.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/user_ldap/tests/Integration/setup-scripts/createExplicitUsers.php b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitUsers.php index 640bef68784dd..11f3ce310db66 100644 --- a/apps/user_ldap/tests/Integration/setup-scripts/createExplicitUsers.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitUsers.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/user_ldap/tests/Integration/setup-scripts/createUsersWithoutDisplayName.php b/apps/user_ldap/tests/Integration/setup-scripts/createUsersWithoutDisplayName.php index 6699450c79eae..e08dd798341c4 100644 --- a/apps/user_ldap/tests/Integration/setup-scripts/createUsersWithoutDisplayName.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createUsersWithoutDisplayName.php @@ -1,8 +1,9 @@ * - * @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/user_ldap/tests/Jobs/CleanUpTest.php b/apps/user_ldap/tests/Jobs/CleanUpTest.php index 4b39cfd97f5a8..45e7998da0186 100644 --- a/apps/user_ldap/tests/Jobs/CleanUpTest.php +++ b/apps/user_ldap/tests/Jobs/CleanUpTest.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/user_ldap/tests/Mapping/AbstractMappingTest.php b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php index a2e9f850913e0..1d988126df092 100644 --- a/apps/user_ldap/tests/Mapping/AbstractMappingTest.php +++ b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php @@ -1,11 +1,13 @@ * @author Arthur Schiwon - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Stefan Weil * - * @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/user_ldap/tests/Mapping/GroupMappingTest.php b/apps/user_ldap/tests/Mapping/GroupMappingTest.php index 9101202eb0853..4b31f07a7d11f 100644 --- a/apps/user_ldap/tests/Mapping/GroupMappingTest.php +++ b/apps/user_ldap/tests/Mapping/GroupMappingTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/tests/Mapping/UserMappingTest.php b/apps/user_ldap/tests/Mapping/UserMappingTest.php index e8544211d775b..c1752c5f67baf 100644 --- a/apps/user_ldap/tests/Mapping/UserMappingTest.php +++ b/apps/user_ldap/tests/Mapping/UserMappingTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php index 0b11ca33d5a22..0c370f12c434b 100644 --- a/apps/user_ldap/tests/User/ManagerTest.php +++ b/apps/user_ldap/tests/User/ManagerTest.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Philippe Jung * @author Thomas Müller * - * @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/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 4d4d19be027b8..cf1514009d877 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 245ed954c6d5a..ae86e3cf3a21d 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php index ca5872e0a8ee7..cc110c6ee0def 100644 --- a/apps/user_ldap/tests/WizardTest.php +++ b/apps/user_ldap/tests/WizardTest.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * @author Viktor Szépe * - * @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/build/integration/features/bootstrap/AppConfiguration.php b/build/integration/features/bootstrap/AppConfiguration.php index af904a3089698..2f84dce3f1b2a 100644 --- a/build/integration/features/bootstrap/AppConfiguration.php +++ b/build/integration/features/bootstrap/AppConfiguration.php @@ -1,5 +1,25 @@ + * + * @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 . + * + */ use Behat\Behat\Hook\Scope\AfterScenarioScope; use Behat\Behat\Hook\Scope\BeforeScenarioScope; use GuzzleHttp\Message\ResponseInterface; diff --git a/build/integration/features/bootstrap/Auth.php b/build/integration/features/bootstrap/Auth.php index 5f36b199e0658..e0eb5393bb8d8 100644 --- a/build/integration/features/bootstrap/Auth.php +++ b/build/integration/features/bootstrap/Auth.php @@ -1,5 +1,25 @@ + * + * @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 . + * + */ use GuzzleHttp\Client; use GuzzleHttp\Exception\ClientException; diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index 9248b2cd252f7..0999000f2e385 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -1,5 +1,29 @@ + * @author Joas Schilling + * @author Lukas Reschke + * @author Sergio Bertolin + * @author Thomas Müller + * + * @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 . + * + */ use GuzzleHttp\Client; use GuzzleHttp\Message\ResponseInterface; diff --git a/build/integration/features/bootstrap/CalDavContext.php b/build/integration/features/bootstrap/CalDavContext.php index 30c50630b3e95..5db56f0fe7ad9 100644 --- a/build/integration/features/bootstrap/CalDavContext.php +++ b/build/integration/features/bootstrap/CalDavContext.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Lukas Reschke + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php index 57db355579000..1220e22415857 100644 --- a/build/integration/features/bootstrap/CapabilitiesContext.php +++ b/build/integration/features/bootstrap/CapabilitiesContext.php @@ -1,5 +1,27 @@ + * @author Roeland Jago Douma + * @author Sergio Bertolin + * + * @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 . + * + */ use Behat\Behat\Context\Context; use Behat\Behat\Context\SnippetAcceptingContext; use Behat\Behat\Hook\Scope\AfterScenarioScope; diff --git a/build/integration/features/bootstrap/CardDavContext.php b/build/integration/features/bootstrap/CardDavContext.php index d317ba5193feb..bfdd51bfdb092 100644 --- a/build/integration/features/bootstrap/CardDavContext.php +++ b/build/integration/features/bootstrap/CardDavContext.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Lukas Reschke + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/build/integration/features/bootstrap/ChecksumsContext.php b/build/integration/features/bootstrap/ChecksumsContext.php index af8f9e5590d4c..3d2d90007947c 100644 --- a/build/integration/features/bootstrap/ChecksumsContext.php +++ b/build/integration/features/bootstrap/ChecksumsContext.php @@ -1,5 +1,26 @@ + * @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 . + * + */ require __DIR__ . '/../../vendor/autoload.php'; use GuzzleHttp\Client; diff --git a/build/integration/features/bootstrap/CommentsContext.php b/build/integration/features/bootstrap/CommentsContext.php index e74e9580dcc14..5c3b0edafac4b 100644 --- a/build/integration/features/bootstrap/CommentsContext.php +++ b/build/integration/features/bootstrap/CommentsContext.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Lukas Reschke + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php index 21ca8d8729529..c066fa5419812 100644 --- a/build/integration/features/bootstrap/FeatureContext.php +++ b/build/integration/features/bootstrap/FeatureContext.php @@ -1,5 +1,26 @@ + * @author Thomas Müller + * + * @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 . + * + */ use Behat\Behat\Context\Context; use Behat\Behat\Context\SnippetAcceptingContext; diff --git a/build/integration/features/bootstrap/FederationContext.php b/build/integration/features/bootstrap/FederationContext.php index 55f3a55da0d90..e6e99e2fa9221 100644 --- a/build/integration/features/bootstrap/FederationContext.php +++ b/build/integration/features/bootstrap/FederationContext.php @@ -1,5 +1,27 @@ + * @author Sergio Bertolin + * @author Sergio Bertolín + * + * @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 . + * + */ use Behat\Behat\Context\Context; use Behat\Behat\Context\SnippetAcceptingContext; use GuzzleHttp\Client; diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php index 6cf5751448367..bc3fc9a4c4a26 100644 --- a/build/integration/features/bootstrap/Provisioning.php +++ b/build/integration/features/bootstrap/Provisioning.php @@ -1,5 +1,31 @@ + * @author Morris Jobke + * @author Roeland Jago Douma + * @author Sergio Bertolin + * @author Sergio Bertolín + * @author Thomas Müller + * @author Vincent Petry + * + * @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 . + * + */ use GuzzleHttp\Client; use GuzzleHttp\Message\ResponseInterface; diff --git a/build/integration/features/bootstrap/ShareesContext.php b/build/integration/features/bootstrap/ShareesContext.php index bd08ae6e138ba..822a70112709d 100644 --- a/build/integration/features/bootstrap/ShareesContext.php +++ b/build/integration/features/bootstrap/ShareesContext.php @@ -1,5 +1,26 @@ + * @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 . + * + */ use Behat\Behat\Context\Context; use Behat\Behat\Context\SnippetAcceptingContext; use GuzzleHttp\Message\ResponseInterface; diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php index d423a28f1964a..9d230e35ac699 100644 --- a/build/integration/features/bootstrap/Sharing.php +++ b/build/integration/features/bootstrap/Sharing.php @@ -1,5 +1,30 @@ + * @author Lukas Reschke + * @author Roeland Jago Douma + * @author Sergio Bertolin + * @author Sergio Bertolín + * @author Vincent Petry + * + * @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 . + * + */ use GuzzleHttp\Client; use GuzzleHttp\Message\ResponseInterface; diff --git a/build/integration/features/bootstrap/TagsContext.php b/build/integration/features/bootstrap/TagsContext.php index 882f5d9e13a5f..91fb585d640fd 100644 --- a/build/integration/features/bootstrap/TagsContext.php +++ b/build/integration/features/bootstrap/TagsContext.php @@ -1,8 +1,11 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Lukas Reschke + * @author Vincent Petry + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index 23f80c2fa766c..9b0050d82dd5e 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -1,5 +1,33 @@ + * @author Joas Schilling + * @author Lukas Reschke + * @author Morris Jobke + * @author Roeland Jago Douma + * @author Sergio Bertolin + * @author Sergio Bertolín + * @author Thomas Müller + * @author Vincent Petry + * + * @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 . + * + */ use GuzzleHttp\Client as GClient; use GuzzleHttp\Message\ResponseInterface; use Sabre\DAV\Client as SClient; diff --git a/console.php b/console.php index 4576cce885cb8..8765b176ac77e 100644 --- a/console.php +++ b/console.php @@ -1,16 +1,14 @@ - * @author Edward Crompton - * @author Joas Schilling - * @author Jost Baron + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Philippe Le Brouster * @author Thomas Müller * @author Victor Dubiniuk * - * @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/core/Application.php b/core/Application.php index 82ec5ad023c02..a0deaff2b93d2 100644 --- a/core/Application.php +++ b/core/Application.php @@ -1,14 +1,16 @@ * @author Christoph Wurst + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Victor Dubiniuk * - * @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/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index f73c84570326c..9c9485254da2f 100644 --- a/core/Command/App/CheckCode.php +++ b/core/Command/App/CheckCode.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/core/Command/App/Disable.php b/core/Command/App/Disable.php index 743a78cb88d5d..07e752ee8393e 100644 --- a/core/Command/App/Disable.php +++ b/core/Command/App/Disable.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/core/Command/App/Enable.php b/core/Command/App/Enable.php index 0f6ce51fe8f2d..d5b161f8eafd6 100644 --- a/core/Command/App/Enable.php +++ b/core/Command/App/Enable.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/core/Command/App/GetPath.php b/core/Command/App/GetPath.php index 33a3f64c53d69..3eeee5c2c4487 100644 --- a/core/Command/App/GetPath.php +++ b/core/Command/App/GetPath.php @@ -1,8 +1,9 @@ * - * @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/core/Command/App/ListApps.php b/core/Command/App/ListApps.php index d7546b3c0c71e..08449dd8dc961 100644 --- a/core/Command/App/ListApps.php +++ b/core/Command/App/ListApps.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Victor Dubiniuk * - * @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/core/Command/Base.php b/core/Command/Base.php index 7538effd74a34..5fa4468f6ebc5 100644 --- a/core/Command/Base.php +++ b/core/Command/Base.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/core/Command/Check.php b/core/Command/Check.php index c2e92f7a8da71..8ced96a91c335 100644 --- a/core/Command/Check.php +++ b/core/Command/Check.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/core/Command/Config/App/DeleteConfig.php b/core/Command/Config/App/DeleteConfig.php index cccd92ea3d63f..82099556ca132 100644 --- a/core/Command/Config/App/DeleteConfig.php +++ b/core/Command/Config/App/DeleteConfig.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Config/App/GetConfig.php b/core/Command/Config/App/GetConfig.php index abe71e57d8cc5..eb81b1b19b0de 100644 --- a/core/Command/Config/App/GetConfig.php +++ b/core/Command/Config/App/GetConfig.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Config/App/SetConfig.php b/core/Command/Config/App/SetConfig.php index 097fde6ba9589..aa84ddf1d8e83 100644 --- a/core/Command/Config/App/SetConfig.php +++ b/core/Command/Config/App/SetConfig.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Config/Import.php b/core/Command/Config/Import.php index 7f1e09d2c95dd..a27d1b62f0bac 100644 --- a/core/Command/Config/Import.php +++ b/core/Command/Config/Import.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Config/ListConfigs.php b/core/Command/Config/ListConfigs.php index afebe4c4c0756..e11eec1a7a198 100644 --- a/core/Command/Config/ListConfigs.php +++ b/core/Command/Config/ListConfigs.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Config/System/DeleteConfig.php b/core/Command/Config/System/DeleteConfig.php index 374f5ac69b74a..65f26f7b2a829 100644 --- a/core/Command/Config/System/DeleteConfig.php +++ b/core/Command/Config/System/DeleteConfig.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Config/System/GetConfig.php b/core/Command/Config/System/GetConfig.php index b76474112a085..7c2f663e42c32 100644 --- a/core/Command/Config/System/GetConfig.php +++ b/core/Command/Config/System/GetConfig.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php index c7f206b05d104..fcbf3c0baa534 100644 --- a/core/Command/Config/System/SetConfig.php +++ b/core/Command/Config/System/SetConfig.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Robin McCorkell * - * @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/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php index 8c8b6350fac25..6e15f9afbc754 100644 --- a/core/Command/Db/ConvertType.php +++ b/core/Command/Db/ConvertType.php @@ -1,14 +1,15 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author tbelau666 * @author Thomas Müller * @author unclejamal3000 * - * @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/core/Command/Db/GenerateChangeScript.php b/core/Command/Db/GenerateChangeScript.php index 85436b02d6511..9ef4d57967a7b 100644 --- a/core/Command/Db/GenerateChangeScript.php +++ b/core/Command/Db/GenerateChangeScript.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/core/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php index 4b485c12749d8..97709d54bdde8 100644 --- a/core/Command/Encryption/ChangeKeyStorageRoot.php +++ b/core/Command/Encryption/ChangeKeyStorageRoot.php @@ -1,8 +1,9 @@ * - * @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/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index cda7853b8b40f..7d77cc62e67e1 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -1,9 +1,13 @@ - * @author Joas Schilling + * @author davitol + * @author Joas Schilling + * @author Sergio Bertolín + * @author Vincent Petry * - * @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/core/Command/Encryption/Disable.php b/core/Command/Encryption/Disable.php index 0e08a31447328..26e8627867452 100644 --- a/core/Command/Encryption/Disable.php +++ b/core/Command/Encryption/Disable.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Encryption/Enable.php b/core/Command/Encryption/Enable.php index 273320e615542..a84a5fc7f7fe8 100644 --- a/core/Command/Encryption/Enable.php +++ b/core/Command/Encryption/Enable.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Encryption/EncryptAll.php b/core/Command/Encryption/EncryptAll.php index 5f879ef9aab6f..f26c163aa2f88 100644 --- a/core/Command/Encryption/EncryptAll.php +++ b/core/Command/Encryption/EncryptAll.php @@ -1,9 +1,10 @@ - * @author Joas Schilling + * @author Joas Schilling * - * @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/core/Command/Encryption/ListModules.php b/core/Command/Encryption/ListModules.php index 9c061b6e764fd..82a2e5f50f719 100644 --- a/core/Command/Encryption/ListModules.php +++ b/core/Command/Encryption/ListModules.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Encryption/SetDefaultModule.php b/core/Command/Encryption/SetDefaultModule.php index e997853620185..1a008c7724a2a 100644 --- a/core/Command/Encryption/SetDefaultModule.php +++ b/core/Command/Encryption/SetDefaultModule.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Encryption/ShowKeyStorageRoot.php b/core/Command/Encryption/ShowKeyStorageRoot.php index 15b370021d207..4270ee9f57fd5 100644 --- a/core/Command/Encryption/ShowKeyStorageRoot.php +++ b/core/Command/Encryption/ShowKeyStorageRoot.php @@ -1,8 +1,9 @@ * - * @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/core/Command/Encryption/Status.php b/core/Command/Encryption/Status.php index b97ea8833fa3c..0582703d4d39f 100644 --- a/core/Command/Encryption/Status.php +++ b/core/Command/Encryption/Status.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Group/AddUser.php b/core/Command/Group/AddUser.php index 23aa193fbc0f0..05ae4e2d52656 100644 --- a/core/Command/Group/AddUser.php +++ b/core/Command/Group/AddUser.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Robin Appelman + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/core/Command/Group/ListCommand.php b/core/Command/Group/ListCommand.php index d0c0adacd3ae0..f3703bc1099ac 100644 --- a/core/Command/Group/ListCommand.php +++ b/core/Command/Group/ListCommand.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Robin Appelman + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/core/Command/Group/RemoveUser.php b/core/Command/Group/RemoveUser.php index f579468a74d17..09f081004d29b 100644 --- a/core/Command/Group/RemoveUser.php +++ b/core/Command/Group/RemoveUser.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Robin Appelman + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php index 203455e508bb5..0774cca6582a9 100644 --- a/core/Command/Integrity/CheckApp.php +++ b/core/Command/Integrity/CheckApp.php @@ -1,9 +1,10 @@ * @author Victor Dubiniuk * - * @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/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php index 9d42d405b307c..5aaf9c2dec877 100644 --- a/core/Command/Integrity/CheckCore.php +++ b/core/Command/Integrity/CheckCore.php @@ -1,9 +1,10 @@ * @author Victor Dubiniuk * - * @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/core/Command/Integrity/SignApp.php b/core/Command/Integrity/SignApp.php index fbf2cd814fedd..3bc79eb011480 100644 --- a/core/Command/Integrity/SignApp.php +++ b/core/Command/Integrity/SignApp.php @@ -1,8 +1,9 @@ * - * @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/core/Command/Integrity/SignCore.php b/core/Command/Integrity/SignCore.php index 2495d7e7f086f..440c3da3b2345 100644 --- a/core/Command/Integrity/SignCore.php +++ b/core/Command/Integrity/SignCore.php @@ -1,8 +1,9 @@ * - * @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/core/Command/L10n/CreateJs.php b/core/Command/L10n/CreateJs.php index c2cfc5d093415..53e897e6b43eb 100644 --- a/core/Command/L10n/CreateJs.php +++ b/core/Command/L10n/CreateJs.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/core/Command/Log/Manage.php b/core/Command/Log/Manage.php index 2f92c639bacf0..14d41170dcaca 100644 --- a/core/Command/Log/Manage.php +++ b/core/Command/Log/Manage.php @@ -1,9 +1,11 @@ * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/core/Command/Log/OwnCloud.php b/core/Command/Log/OwnCloud.php index b469f2064f78e..391259f76b8de 100644 --- a/core/Command/Log/OwnCloud.php +++ b/core/Command/Log/OwnCloud.php @@ -1,8 +1,10 @@ + * @author Thomas Pulzer * - * @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/core/Command/Maintenance/DataFingerprint.php b/core/Command/Maintenance/DataFingerprint.php index 38f490fd12a9b..37e8de2455218 100644 --- a/core/Command/Maintenance/DataFingerprint.php +++ b/core/Command/Maintenance/DataFingerprint.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index 3e9e043b036a1..c8a7e8891213e 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -1,11 +1,15 @@ * @author Christian Kampka + * @author Joas Schilling + * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Thomas Müller + * @author Thomas Pulzer * - * @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/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php index 9532f9e1cd96d..1c8d651b9c0d0 100644 --- a/core/Command/Maintenance/Mimetype/UpdateDB.php +++ b/core/Command/Maintenance/Mimetype/UpdateDB.php @@ -1,8 +1,9 @@ * - * @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/core/Command/Maintenance/Mimetype/UpdateJS.php b/core/Command/Maintenance/Mimetype/UpdateJS.php index a87f50e32ded3..7908d066c808b 100644 --- a/core/Command/Maintenance/Mimetype/UpdateJS.php +++ b/core/Command/Maintenance/Mimetype/UpdateJS.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php index 28f4fb2f7f1cd..30d72da3583ed 100644 --- a/core/Command/Maintenance/Mode.php +++ b/core/Command/Maintenance/Mode.php @@ -1,9 +1,10 @@ * @author scolebrook * - * @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/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php index df684b45a1c5c..236326b4e322c 100644 --- a/core/Command/Maintenance/Repair.php +++ b/core/Command/Maintenance/Repair.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/core/Command/Maintenance/SingleUser.php b/core/Command/Maintenance/SingleUser.php index 2e6f1f136e781..e4f945596d289 100644 --- a/core/Command/Maintenance/SingleUser.php +++ b/core/Command/Maintenance/SingleUser.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php index 5bfcb88a752fc..218507862002f 100644 --- a/core/Command/Maintenance/UpdateHtaccess.php +++ b/core/Command/Maintenance/UpdateHtaccess.php @@ -1,8 +1,9 @@ * - * @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/core/Command/Security/ImportCertificate.php b/core/Command/Security/ImportCertificate.php index 6aae7ad1d9f99..38a774add5003 100644 --- a/core/Command/Security/ImportCertificate.php +++ b/core/Command/Security/ImportCertificate.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Security/ListCertificates.php b/core/Command/Security/ListCertificates.php index 91deb2d340ae8..fe19348876a30 100644 --- a/core/Command/Security/ListCertificates.php +++ b/core/Command/Security/ListCertificates.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/core/Command/Security/RemoveCertificate.php b/core/Command/Security/RemoveCertificate.php index 2dcdccfbb0f36..8be7123ad0812 100644 --- a/core/Command/Security/RemoveCertificate.php +++ b/core/Command/Security/RemoveCertificate.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/core/Command/Status.php b/core/Command/Status.php index 6bc9c28d4d168..2f7173341b4f6 100644 --- a/core/Command/Status.php +++ b/core/Command/Status.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/core/Command/TwoFactorAuth/Disable.php b/core/Command/TwoFactorAuth/Disable.php index f8e19ca811e52..60e1bf7181ffb 100644 --- a/core/Command/TwoFactorAuth/Disable.php +++ b/core/Command/TwoFactorAuth/Disable.php @@ -1,8 +1,9 @@ * - * @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/core/Command/TwoFactorAuth/Enable.php b/core/Command/TwoFactorAuth/Enable.php index 7039f922ea7e7..54fc6cdf065cc 100644 --- a/core/Command/TwoFactorAuth/Enable.php +++ b/core/Command/TwoFactorAuth/Enable.php @@ -1,8 +1,9 @@ * - * @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/core/Command/Upgrade.php b/core/Command/Upgrade.php index 3550271fb5b05..952034fd22291 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -1,16 +1,18 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Owen Winkler * @author Steffen Lindner * @author Thomas Müller + * @author Thomas Pulzer * @author Vincent Petry * - * @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/core/Command/User/Add.php b/core/Command/User/Add.php index 6c7e3a4723114..a0ca331515468 100644 --- a/core/Command/User/Add.php +++ b/core/Command/User/Add.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Laurens Post * - * @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/core/Command/User/Delete.php b/core/Command/User/Delete.php index b12e441e7bc4d..495c0903bba59 100644 --- a/core/Command/User/Delete.php +++ b/core/Command/User/Delete.php @@ -1,11 +1,12 @@ * @author Jens-Christian Fischer - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/core/Command/User/Disable.php b/core/Command/User/Disable.php index 018f11190d648..94be87e6ee05a 100644 --- a/core/Command/User/Disable.php +++ b/core/Command/User/Disable.php @@ -1,8 +1,9 @@ * - * @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/core/Command/User/Enable.php b/core/Command/User/Enable.php index ffe2e40d65447..d8a983155d2ce 100644 --- a/core/Command/User/Enable.php +++ b/core/Command/User/Enable.php @@ -1,8 +1,9 @@ * - * @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/core/Command/User/Info.php b/core/Command/User/Info.php index 1888e5cc644b6..b23ddd942a095 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Robin Appelman + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index c820369562c8e..58592e051508d 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Pierre Ozoux * - * @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/core/Command/User/ListCommand.php b/core/Command/User/ListCommand.php index b9e10f6a31c33..77d99eb2130f2 100644 --- a/core/Command/User/ListCommand.php +++ b/core/Command/User/ListCommand.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Robin Appelman + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/core/Command/User/Report.php b/core/Command/User/Report.php index 6c8c14b43a93a..01eb51f17f9cf 100644 --- a/core/Command/User/Report.php +++ b/core/Command/User/Report.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php index f3f2d5b063065..ed8cf53b99007 100644 --- a/core/Command/User/ResetPassword.php +++ b/core/Command/User/ResetPassword.php @@ -1,13 +1,14 @@ * @author Christopher Schäpers * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Laurens Post * @author Morris Jobke * - * @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/core/Command/User/Setting.php b/core/Command/User/Setting.php index 7a62b5529b3e1..368a0c15dcde5 100644 --- a/core/Command/User/Setting.php +++ b/core/Command/User/Setting.php @@ -1,8 +1,9 @@ * - * @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/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 788125f0cfec8..ed63025aca499 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -1,14 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/core/Controller/LoginController.php b/core/Controller/LoginController.php index 66bb13dbb54a6..44635cc709b65 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -1,9 +1,12 @@ + * @author Joas Schilling * @author Lukas Reschke + * @author Thomas Müller * - * @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/core/Controller/LostController.php b/core/Controller/LostController.php index 774404af0a5f2..c3716e9a8e782 100644 --- a/core/Controller/LostController.php +++ b/core/Controller/LostController.php @@ -1,15 +1,17 @@ * @author Björn Schießle + * @author Joas Schilling * @author Julius Haertl * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Victor Dubiniuk * - * @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/core/Controller/SetupController.php b/core/Controller/SetupController.php index 3f17f8f0516ef..fc1efe4c11b5b 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -1,14 +1,15 @@ * @author ideaship * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/core/Controller/TokenController.php b/core/Controller/TokenController.php index 8401c4f23a9f7..9d4fd7c965604 100644 --- a/core/Controller/TokenController.php +++ b/core/Controller/TokenController.php @@ -1,8 +1,10 @@ + * @author Lukas Reschke * - * @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/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php index edaf3378cd8da..b9e10b147ce6a 100644 --- a/core/Controller/TwoFactorChallengeController.php +++ b/core/Controller/TwoFactorChallengeController.php @@ -1,8 +1,10 @@ + * @author Joas Schilling * - * @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/core/Controller/UserController.php b/core/Controller/UserController.php index ce67d50429e7a..0cede94eb6ec9 100644 --- a/core/Controller/UserController.php +++ b/core/Controller/UserController.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php index 0bad8a2c40f76..c87058d11fae0 100644 --- a/core/Middleware/TwoFactorMiddleware.php +++ b/core/Middleware/TwoFactorMiddleware.php @@ -1,9 +1,10 @@ + * @author Joas Schilling * - * @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/core/Tags/Controller.php b/core/Tags/Controller.php index 9798a59d56f20..3cba40636bc58 100644 --- a/core/Tags/Controller.php +++ b/core/Tags/Controller.php @@ -1,9 +1,10 @@ * @author Thomas Tanghus * - * @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/core/ajax/appconfig.php b/core/ajax/appconfig.php index f7c077ccadd0d..6bb70e4c3930c 100644 --- a/core/ajax/appconfig.php +++ b/core/ajax/appconfig.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/core/ajax/preview.php b/core/ajax/preview.php index ae705e6e09073..2894efdc8e382 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/core/ajax/share.php b/core/ajax/share.php index c6efb75394dec..adcf31a0dfa68 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -1,23 +1,24 @@ * @author Bart Visscher * @author Björn Schießle * @author Craig Morrissey * @author dampfklon * @author Felix Böhm - * @author Joas Schilling + * @author Joas Schilling * @author Leonardo Diez * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke * @author Ramiro Aparicio - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * - * @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/core/ajax/update.php b/core/ajax/update.php index 606a91d12a35b..fca40477d60e0 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -1,16 +1,17 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/core/js/config.php b/core/js/config.php index c2e6213e8f766..e88d9c741a143 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -1,21 +1,22 @@ * @author Björn Schießle * @author Clark Tomlinson * @author Guillaume AMAT * @author Hasso Tepper - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Owen Winkler - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Chan * @author Vincent Petry * - * @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/core/register_command.php b/core/register_command.php index 70a1d7ed42e0c..6f20769fa70e4 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -1,20 +1,21 @@ * @author Björn Schießle * @author Christian Kampka * @author Christoph Wurst - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/core/routes.php b/core/routes.php index 402277d8f3e6c..98454946d45c5 100644 --- a/core/routes.php +++ b/core/routes.php @@ -1,19 +1,20 @@ * @author Bernhard Posselt - * @author Christoph Wurst * @author Christopher Schäpers + * @author Christoph Wurst * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * @author Victor Dubiniuk * @author Vincent Petry * - * @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/core/search/ajax/search.php b/core/search/ajax/search.php index 69fe61b74df0e..1de53158ada09 100644 --- a/core/search/ajax/search.php +++ b/core/search/ajax/search.php @@ -1,13 +1,14 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/core/strings.php b/core/strings.php index 733d8a97f47ff..48592e9d16985 100644 --- a/core/strings.php +++ b/core/strings.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Stefan Weil * - * @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/cron.php b/cron.php index 5be52a302a5af..b1dedaa84b230 100644 --- a/cron.php +++ b/cron.php @@ -1,18 +1,19 @@ * @author Christopher Schäpers * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Oliver Kohl D.Sc. - * @author Robin Appelman + * @author Robin Appelman * @author Steffen Lindner * @author Thomas Müller * @author Vincent Petry * - * @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/index.php b/index.php index 489a6382c90a0..2b344dadfff9a 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,14 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/autoloader.php b/lib/autoloader.php index d7a3c18d9ffb9..08188ef8e5966 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -1,18 +1,19 @@ * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Markus Goetz * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/base.php b/lib/base.php index b2ac0bab7d859..d22490ca5dc7e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -1,5 +1,7 @@ * @author Andreas Fischer * @author Arthur Schiwon @@ -14,7 +16,8 @@ * @author Individual IT Services * @author Jakob Sack * @author Joachim Bauch - * @author Joas Schilling + * @author Joachim Sokolowski + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski @@ -22,17 +25,16 @@ * @author Owen Winkler * @author Phil Davis * @author Ramiro Aparicio - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma - * @author scolebrook + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller + * @author Thomas Pulzer * @author Thomas Tanghus * @author Vincent Petry * @author Volkan Gezer * - * @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/lib/composer/autoload.php b/lib/composer/autoload.php index 610dbf34bca96..c7aedcf4ddc68 100644 --- a/lib/composer/autoload.php +++ b/lib/composer/autoload.php @@ -1,5 +1,25 @@ + * + * @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 . + * + */ // autoload.php @generated by Composer require_once __DIR__ . '/composer' . '/autoload_real.php'; diff --git a/lib/composer/composer/ClassLoader.php b/lib/composer/composer/ClassLoader.php index ff6ecfb822f89..e5cea955291d6 100644 --- a/lib/composer/composer/ClassLoader.php +++ b/lib/composer/composer/ClassLoader.php @@ -1,13 +1,24 @@ - * Jordi Boggiano + * @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 . * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. */ namespace Composer\Autoload; diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 7618410a7ebff..cac64112365e6 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1,5 +1,25 @@ + * + * @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 . + * + */ // autoload_classmap.php @generated by Composer $vendorDir = dirname(dirname(__FILE__)); diff --git a/lib/composer/composer/autoload_namespaces.php b/lib/composer/composer/autoload_namespaces.php index 4a9c20beed071..56c59c82123ab 100644 --- a/lib/composer/composer/autoload_namespaces.php +++ b/lib/composer/composer/autoload_namespaces.php @@ -1,5 +1,25 @@ + * + * @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 . + * + */ // autoload_namespaces.php @generated by Composer $vendorDir = dirname(dirname(__FILE__)); diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php index 2561f0048c502..ac203b88feeb1 100644 --- a/lib/composer/composer/autoload_psr4.php +++ b/lib/composer/composer/autoload_psr4.php @@ -1,5 +1,26 @@ + * @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 . + * + */ // autoload_psr4.php @generated by Composer $vendorDir = dirname(dirname(__FILE__)); diff --git a/lib/composer/composer/autoload_real.php b/lib/composer/composer/autoload_real.php index 43d6760695410..c429e5c68b315 100644 --- a/lib/composer/composer/autoload_real.php +++ b/lib/composer/composer/autoload_real.php @@ -1,5 +1,25 @@ + * + * @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 . + * + */ // autoload_real.php @generated by Composer class ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index a979997571993..a921a659382c7 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1,5 +1,25 @@ + * + * @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 . + * + */ // autoload_static.php @generated by Composer namespace Composer\Autoload; diff --git a/lib/private/Activity/Event.php b/lib/private/Activity/Event.php index b7e271b210411..af0605d82c899 100644 --- a/lib/private/Activity/Event.php +++ b/lib/private/Activity/Event.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Phil Davis * - * @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/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php index 42e287f7d4482..455bb3b8ee83c 100644 --- a/lib/private/Activity/Manager.php +++ b/lib/private/Activity/Manager.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/AllConfig.php b/lib/private/AllConfig.php index b50fc0f42ced0..52d77bf3f5294 100644 --- a/lib/private/AllConfig.php +++ b/lib/private/AllConfig.php @@ -1,15 +1,17 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 636f43c8c5756..55fd575e1292e 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -1,16 +1,18 @@ + * @author Bjoern Schiessle * @author Christoph Schaefer * @author Christoph Wurst - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/App/CodeChecker/AbstractCheck.php b/lib/private/App/CodeChecker/AbstractCheck.php index ca91d36648268..64fd3a9f47125 100644 --- a/lib/private/App/CodeChecker/AbstractCheck.php +++ b/lib/private/App/CodeChecker/AbstractCheck.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/App/CodeChecker/CodeChecker.php b/lib/private/App/CodeChecker/CodeChecker.php index 0ca597ccb4ee5..569a452df7327 100644 --- a/lib/private/App/CodeChecker/CodeChecker.php +++ b/lib/private/App/CodeChecker/CodeChecker.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/App/CodeChecker/DeprecationCheck.php b/lib/private/App/CodeChecker/DeprecationCheck.php index fa5eae8ab1dd6..60e7fdf078deb 100644 --- a/lib/private/App/CodeChecker/DeprecationCheck.php +++ b/lib/private/App/CodeChecker/DeprecationCheck.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/App/CodeChecker/EmptyCheck.php b/lib/private/App/CodeChecker/EmptyCheck.php index b779926d5e482..02fbb46d7de23 100644 --- a/lib/private/App/CodeChecker/EmptyCheck.php +++ b/lib/private/App/CodeChecker/EmptyCheck.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/App/CodeChecker/ICheck.php b/lib/private/App/CodeChecker/ICheck.php index 97e0bc9b8a022..4dfaa23c5382d 100644 --- a/lib/private/App/CodeChecker/ICheck.php +++ b/lib/private/App/CodeChecker/ICheck.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/App/CodeChecker/InfoChecker.php b/lib/private/App/CodeChecker/InfoChecker.php index 812007d8839f4..3ee99dc6478aa 100644 --- a/lib/private/App/CodeChecker/InfoChecker.php +++ b/lib/private/App/CodeChecker/InfoChecker.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/App/CodeChecker/NodeVisitor.php b/lib/private/App/CodeChecker/NodeVisitor.php index f9386caeeae1d..b7f256ea3d792 100644 --- a/lib/private/App/CodeChecker/NodeVisitor.php +++ b/lib/private/App/CodeChecker/NodeVisitor.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/App/CodeChecker/PrivateCheck.php b/lib/private/App/CodeChecker/PrivateCheck.php index 32248ab21e207..5d160b8f32abf 100644 --- a/lib/private/App/CodeChecker/PrivateCheck.php +++ b/lib/private/App/CodeChecker/PrivateCheck.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/App/CodeChecker/StrongComparisonCheck.php b/lib/private/App/CodeChecker/StrongComparisonCheck.php index 919647a6a542b..b98730c0d47ae 100644 --- a/lib/private/App/CodeChecker/StrongComparisonCheck.php +++ b/lib/private/App/CodeChecker/StrongComparisonCheck.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php index e97cf2a4013f7..9ccc974e3a60d 100644 --- a/lib/private/App/DependencyAnalyzer.php +++ b/lib/private/App/DependencyAnalyzer.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Stefan Weil * @author Thomas Müller * - * @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/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index 0923f7d2c2066..734f5c2c6af9b 100644 --- a/lib/private/App/InfoParser.php +++ b/lib/private/App/InfoParser.php @@ -1,12 +1,13 @@ * @author Christoph Wurst * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/App/Platform.php b/lib/private/App/Platform.php index 028adb8f4f4cc..4959ce7ae4b2f 100644 --- a/lib/private/App/Platform.php +++ b/lib/private/App/Platform.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php index 7363b2a44b1f3..f94fb3ad504f0 100644 --- a/lib/private/App/PlatformRepository.php +++ b/lib/private/App/PlatformRepository.php @@ -1,8 +1,9 @@ * - * @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/lib/private/AppConfig.php b/lib/private/AppConfig.php index 4e48ee149ef80..d92e8965b5cc2 100644 --- a/lib/private/AppConfig.php +++ b/lib/private/AppConfig.php @@ -1,15 +1,16 @@ * @author Bart Visscher * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index c6cf8057799a8..01844e4c2d54b 100644 --- a/lib/private/AppFramework/App.php +++ b/lib/private/AppFramework/App.php @@ -1,12 +1,13 @@ * @author Bernhard Posselt * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/AppFramework/Core/API.php b/lib/private/AppFramework/Core/API.php index b08f74fa6c51d..85cdc00a63a00 100644 --- a/lib/private/AppFramework/Core/API.php +++ b/lib/private/AppFramework/Core/API.php @@ -1,13 +1,14 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/AppFramework/Db/Db.php b/lib/private/AppFramework/Db/Db.php index ab06d56cfd154..5fea09747af2f 100644 --- a/lib/private/AppFramework/Db/Db.php +++ b/lib/private/AppFramework/Db/Db.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 893d6cb9aa66e..59803d02bee06 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -1,17 +1,18 @@ * @author Christoph Wurst - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php index 17e5a99fdbd4e..526509a45838b 100644 --- a/lib/private/AppFramework/Http.php +++ b/lib/private/AppFramework/Http.php @@ -1,14 +1,15 @@ * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index fdf99a578418e..0d502462d0e9f 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -1,5 +1,7 @@ * @author Georg Ehrke * @author Lukas Reschke @@ -7,7 +9,6 @@ * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/AppFramework/Http/Output.php b/lib/private/AppFramework/Http/Output.php index 0c239425401ff..85f0e6f8feb50 100644 --- a/lib/private/AppFramework/Http/Output.php +++ b/lib/private/AppFramework/Http/Output.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Stefan Weil * - * @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/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 8fc99f125b207..8fb19f2d9b25f 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -1,20 +1,21 @@ * @author Bernhard Posselt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Mitar * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php index 5cdcbdc6d4714..306b8095a9720 100644 --- a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php +++ b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php @@ -1,5 +1,7 @@ * @author Lukas Reschke * @author Morris Jobke @@ -7,7 +9,6 @@ * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index 2c7d1167e7cb7..f72c7c2ff2da2 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -1,5 +1,6 @@ * diff --git a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php index 04de4bc92d34d..4b50b0d20b383 100644 --- a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php @@ -1,11 +1,13 @@ + * @author Christoph Wurst * @author Lukas Reschke * @author Morris Jobke * @author Stefan Weil * - * @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/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php index 986c30ac455a2..202e7aa8bfe0f 100644 --- a/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php index 5b6e4ed4b9365..9b6ac11dd3433 100644 --- a/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php index 7ce1797059c60..0c7da432afe33 100644 --- a/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php index 17c62edbe32aa..7f675c4f11a00 100644 --- a/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php index 26671b768380d..20b87b1bab1e2 100644 --- a/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/AppFramework/Middleware/Security/Exceptions/StrictCookieMissingException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/StrictCookieMissingException.php index 9ccaed4566fd4..5602e46fb46ac 100644 --- a/lib/private/AppFramework/Middleware/Security/Exceptions/StrictCookieMissingException.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/StrictCookieMissingException.php @@ -1,5 +1,7 @@ * * @license GNU AGPL version 3 or any later version diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index 98117751e21ae..daac36606f248 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -1,14 +1,15 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/AppFramework/Middleware/SessionMiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php index b218b48ea11c3..c5fefa77fc42f 100644 --- a/lib/private/AppFramework/Middleware/SessionMiddleware.php +++ b/lib/private/AppFramework/Middleware/SessionMiddleware.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/AppFramework/Routing/RouteActionHandler.php b/lib/private/AppFramework/Routing/RouteActionHandler.php index 14036d350a8d2..bcbe2eb400b9b 100644 --- a/lib/private/AppFramework/Routing/RouteActionHandler.php +++ b/lib/private/AppFramework/Routing/RouteActionHandler.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index eca0051691fc7..066c0da1138ac 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -1,14 +1,15 @@ * @author Morris Jobke * @author Patrick Paysant - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/AppFramework/Utility/ControllerMethodReflector.php b/lib/private/AppFramework/Utility/ControllerMethodReflector.php index de83749fbaf0d..33a117d812178 100644 --- a/lib/private/AppFramework/Utility/ControllerMethodReflector.php +++ b/lib/private/AppFramework/Utility/ControllerMethodReflector.php @@ -1,12 +1,13 @@ * @author Morris Jobke * @author Olivier Paroz * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 95287b89215eb..5f637518f4dbb 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/AppFramework/Utility/TimeFactory.php b/lib/private/AppFramework/Utility/TimeFactory.php index 5241b36706924..30d38d9bde451 100644 --- a/lib/private/AppFramework/Utility/TimeFactory.php +++ b/lib/private/AppFramework/Utility/TimeFactory.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/AppHelper.php b/lib/private/AppHelper.php index 4cfae435b5299..c99cf4a8304b0 100644 --- a/lib/private/AppHelper.php +++ b/lib/private/AppHelper.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/private/Archive/Archive.php b/lib/private/Archive/Archive.php index f0b2a36407f80..da2c53f2aa14c 100644 --- a/lib/private/Archive/Archive.php +++ b/lib/private/Archive/Archive.php @@ -1,18 +1,19 @@ * @author Bart Visscher * @author Christopher Schäpers * @author Felix Moeller - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php index 7dcc2edbbcf4f..bbd24bd05a1fe 100644 --- a/lib/private/Archive/TAR.php +++ b/lib/private/Archive/TAR.php @@ -1,19 +1,20 @@ * @author Christian Weiske * @author Christopher Schäpers * @author Felix Moeller - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Remco Brenninkmeijer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/Archive/ZIP.php b/lib/private/Archive/ZIP.php index a4b2cab2e6c6f..9e9fe40b2b471 100644 --- a/lib/private/Archive/ZIP.php +++ b/lib/private/Archive/ZIP.php @@ -1,17 +1,18 @@ * @author Christopher Schäpers * @author Felix Moeller - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * - * @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/lib/private/Authentication/Exceptions/InvalidTokenException.php b/lib/private/Authentication/Exceptions/InvalidTokenException.php index 15b6869313405..b7a4b1c5e8dde 100644 --- a/lib/private/Authentication/Exceptions/InvalidTokenException.php +++ b/lib/private/Authentication/Exceptions/InvalidTokenException.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Exceptions/LoginRequiredException.php b/lib/private/Authentication/Exceptions/LoginRequiredException.php index 318eaedb72d48..a336fa36c3116 100644 --- a/lib/private/Authentication/Exceptions/LoginRequiredException.php +++ b/lib/private/Authentication/Exceptions/LoginRequiredException.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Exceptions/PasswordLoginForbiddenException.php b/lib/private/Authentication/Exceptions/PasswordLoginForbiddenException.php index 2e9f9534dbd65..34396b70587fa 100644 --- a/lib/private/Authentication/Exceptions/PasswordLoginForbiddenException.php +++ b/lib/private/Authentication/Exceptions/PasswordLoginForbiddenException.php @@ -1,9 +1,9 @@ * - * @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/lib/private/Authentication/Exceptions/PasswordlessTokenException.php b/lib/private/Authentication/Exceptions/PasswordlessTokenException.php index dbe0ee8fbcaa5..3c70f0127d4fa 100644 --- a/lib/private/Authentication/Exceptions/PasswordlessTokenException.php +++ b/lib/private/Authentication/Exceptions/PasswordlessTokenException.php @@ -1,9 +1,9 @@ * - * @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/lib/private/Authentication/Exceptions/TwoFactorAuthRequiredException.php b/lib/private/Authentication/Exceptions/TwoFactorAuthRequiredException.php index 445c4d6268f9d..41153408744c7 100644 --- a/lib/private/Authentication/Exceptions/TwoFactorAuthRequiredException.php +++ b/lib/private/Authentication/Exceptions/TwoFactorAuthRequiredException.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Exceptions/UserAlreadyLoggedInException.php b/lib/private/Authentication/Exceptions/UserAlreadyLoggedInException.php index d5cdaaca9df1b..46d8201ce5d67 100644 --- a/lib/private/Authentication/Exceptions/UserAlreadyLoggedInException.php +++ b/lib/private/Authentication/Exceptions/UserAlreadyLoggedInException.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Token/DefaultToken.php b/lib/private/Authentication/Token/DefaultToken.php index 79b03eed27f86..904df9baa28da 100644 --- a/lib/private/Authentication/Token/DefaultToken.php +++ b/lib/private/Authentication/Token/DefaultToken.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Token/DefaultTokenCleanupJob.php b/lib/private/Authentication/Token/DefaultTokenCleanupJob.php index 7746d6be91529..a0af822d9862f 100644 --- a/lib/private/Authentication/Token/DefaultTokenCleanupJob.php +++ b/lib/private/Authentication/Token/DefaultTokenCleanupJob.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Token/DefaultTokenMapper.php b/lib/private/Authentication/Token/DefaultTokenMapper.php index 2e105dd4a5dc6..0ce26197ccfe5 100644 --- a/lib/private/Authentication/Token/DefaultTokenMapper.php +++ b/lib/private/Authentication/Token/DefaultTokenMapper.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php index b9d06829572b7..b0fbeb9b47ec6 100644 --- a/lib/private/Authentication/Token/DefaultTokenProvider.php +++ b/lib/private/Authentication/Token/DefaultTokenProvider.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php index d4bbe158e0ae4..4fb2830c3acd5 100644 --- a/lib/private/Authentication/Token/IProvider.php +++ b/lib/private/Authentication/Token/IProvider.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/Token/IToken.php b/lib/private/Authentication/Token/IToken.php index 096550fd0915a..e1e78ca369a49 100644 --- a/lib/private/Authentication/Token/IToken.php +++ b/lib/private/Authentication/Token/IToken.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php index 6ca4fd065a6ad..bca75263a71ae 100644 --- a/lib/private/Authentication/TwoFactorAuth/Manager.php +++ b/lib/private/Authentication/TwoFactorAuth/Manager.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Avatar.php b/lib/private/Avatar.php index a319d46d82c18..80691774b64a9 100644 --- a/lib/private/Avatar.php +++ b/lib/private/Avatar.php @@ -1,14 +1,15 @@ * @author Christopher Schäpers * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/AvatarManager.php b/lib/private/AvatarManager.php index 7eb91b4999e3e..e461a70608b36 100644 --- a/lib/private/AvatarManager.php +++ b/lib/private/AvatarManager.php @@ -1,13 +1,14 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/BackgroundJob/Job.php b/lib/private/BackgroundJob/Job.php index e726889484846..726c66ef5d7fe 100644 --- a/lib/private/BackgroundJob/Job.php +++ b/lib/private/BackgroundJob/Job.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index c84969776c28c..b6a235e9e4037 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/BackgroundJob/Legacy/QueuedJob.php b/lib/private/BackgroundJob/Legacy/QueuedJob.php index 983c06fe551be..e519a654713f5 100644 --- a/lib/private/BackgroundJob/Legacy/QueuedJob.php +++ b/lib/private/BackgroundJob/Legacy/QueuedJob.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/BackgroundJob/Legacy/RegularJob.php b/lib/private/BackgroundJob/Legacy/RegularJob.php index aedd6ef657ad4..e329b186a596e 100644 --- a/lib/private/BackgroundJob/Legacy/RegularJob.php +++ b/lib/private/BackgroundJob/Legacy/RegularJob.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/BackgroundJob/QueuedJob.php b/lib/private/BackgroundJob/QueuedJob.php index bf34db7cc028a..e5afc792331b6 100644 --- a/lib/private/BackgroundJob/QueuedJob.php +++ b/lib/private/BackgroundJob/QueuedJob.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/BackgroundJob/TimedJob.php b/lib/private/BackgroundJob/TimedJob.php index abf487a89e1b1..22b48a80371df 100644 --- a/lib/private/BackgroundJob/TimedJob.php +++ b/lib/private/BackgroundJob/TimedJob.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Cache/CappedMemoryCache.php b/lib/private/Cache/CappedMemoryCache.php index e3efbf76a2394..29446c74bd968 100644 --- a/lib/private/Cache/CappedMemoryCache.php +++ b/lib/private/Cache/CappedMemoryCache.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php index a75f271312646..7d9b3e0680ec5 100644 --- a/lib/private/Cache/File.php +++ b/lib/private/Cache/File.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php index 8b89692faa97e..99a37d652a113 100644 --- a/lib/private/CapabilitiesManager.php +++ b/lib/private/CapabilitiesManager.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Command/AsyncBus.php b/lib/private/Command/AsyncBus.php index eb692f9a8fbca..3c1f67da0cb32 100644 --- a/lib/private/Command/AsyncBus.php +++ b/lib/private/Command/AsyncBus.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Command/CallableJob.php b/lib/private/Command/CallableJob.php index acfeb83d60655..1d0557ffa6dbe 100644 --- a/lib/private/Command/CallableJob.php +++ b/lib/private/Command/CallableJob.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Command/ClosureJob.php b/lib/private/Command/ClosureJob.php index be2b5f0a4ba20..baa46bc99de39 100644 --- a/lib/private/Command/ClosureJob.php +++ b/lib/private/Command/ClosureJob.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Command/CommandJob.php b/lib/private/Command/CommandJob.php index 5d613c0305bc1..5522f61ced0d4 100644 --- a/lib/private/Command/CommandJob.php +++ b/lib/private/Command/CommandJob.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Command/FileAccess.php b/lib/private/Command/FileAccess.php index 6fe3e111aefb4..08b2a61e41b09 100644 --- a/lib/private/Command/FileAccess.php +++ b/lib/private/Command/FileAccess.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Command/QueueBus.php b/lib/private/Command/QueueBus.php index be4ee589e6fb9..7f2fc88a703ff 100644 --- a/lib/private/Command/QueueBus.php +++ b/lib/private/Command/QueueBus.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php index 4a301e4047efb..d640c606f8e7b 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 2b45e01a2d74a..59678775d88d0 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Comments/ManagerFactory.php b/lib/private/Comments/ManagerFactory.php index af3d386c8f3ab..4ce3ec2d0da19 100644 --- a/lib/private/Comments/ManagerFactory.php +++ b/lib/private/Comments/ManagerFactory.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Config.php b/lib/private/Config.php index 4b7497decd992..e6a27a76b2e4f 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -1,5 +1,7 @@ * @author Aldo "xoen" Giambelluca * @author Bart Visscher @@ -7,14 +9,13 @@ * @author Frank Karlitschek * @author Jakob Sack * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/Console/Application.php b/lib/private/Console/Application.php index be561342178ba..b3e7003c82cba 100644 --- a/lib/private/Console/Application.php +++ b/lib/private/Console/Application.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * @author Victor Dubiniuk * - * @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/lib/private/Console/TimestampFormatter.php b/lib/private/Console/TimestampFormatter.php index 3beac5e2f9f06..5b292439a4c36 100644 --- a/lib/private/Console/TimestampFormatter.php +++ b/lib/private/Console/TimestampFormatter.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php index a2640d369454c..6a83a718d419b 100644 --- a/lib/private/ContactsManager.php +++ b/lib/private/ContactsManager.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * @author Tobia De Koninck * - * @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/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php index bcced395cb738..3123a1b0d5303 100644 --- a/lib/private/DB/Adapter.php +++ b/lib/private/DB/Adapter.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jonny007-MKD <1-23-4-5@web.de> * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/AdapterMySQL.php b/lib/private/DB/AdapterMySQL.php index 8ddd8f5fc30d7..3e2fceda8db7e 100644 --- a/lib/private/DB/AdapterMySQL.php +++ b/lib/private/DB/AdapterMySQL.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/DB/AdapterOCI8.php b/lib/private/DB/AdapterOCI8.php index 970d3eefa4d5c..e23f74345ae70 100644 --- a/lib/private/DB/AdapterOCI8.php +++ b/lib/private/DB/AdapterOCI8.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php index a7d9377a0bf68..47ef4dff0378d 100644 --- a/lib/private/DB/AdapterPgSql.php +++ b/lib/private/DB/AdapterPgSql.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/private/DB/AdapterSqlite.php b/lib/private/DB/AdapterSqlite.php index cefb06ffac696..7a69cb7e8c222 100644 --- a/lib/private/DB/AdapterSqlite.php +++ b/lib/private/DB/AdapterSqlite.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index 9d2482010a1a6..4fa25aae08d38 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index 6a096e504d80d..b2c356edef76d 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -1,12 +1,13 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/MDB2SchemaManager.php b/lib/private/DB/MDB2SchemaManager.php index 79811d8c6cd5a..494c8fd53f14b 100644 --- a/lib/private/DB/MDB2SchemaManager.php +++ b/lib/private/DB/MDB2SchemaManager.php @@ -1,15 +1,16 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/DB/MDB2SchemaReader.php b/lib/private/DB/MDB2SchemaReader.php index 375fec185cbc5..3f183c9723ac4 100644 --- a/lib/private/DB/MDB2SchemaReader.php +++ b/lib/private/DB/MDB2SchemaReader.php @@ -1,17 +1,18 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Oliver Gasser - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/lib/private/DB/MDB2SchemaWriter.php b/lib/private/DB/MDB2SchemaWriter.php index 7dc3bd223a7b2..26e32b036fe61 100644 --- a/lib/private/DB/MDB2SchemaWriter.php +++ b/lib/private/DB/MDB2SchemaWriter.php @@ -1,12 +1,13 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author tbelau666 * @author Thomas Müller * - * @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/lib/private/DB/MigrationException.php b/lib/private/DB/MigrationException.php index 57e4c5b833444..34cac82a26291 100644 --- a/lib/private/DB/MigrationException.php +++ b/lib/private/DB/MigrationException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php index f2efd6916d7d1..1d00d9a1b454f 100644 --- a/lib/private/DB/Migrator.php +++ b/lib/private/DB/Migrator.php @@ -1,14 +1,15 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author tbelau666 * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/lib/private/DB/MySQLMigrator.php b/lib/private/DB/MySQLMigrator.php index 75e4fba4d4129..6058e8cafc42d 100644 --- a/lib/private/DB/MySQLMigrator.php +++ b/lib/private/DB/MySQLMigrator.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Victor Dubiniuk * - * @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/lib/private/DB/NoCheckMigrator.php b/lib/private/DB/NoCheckMigrator.php index 23afae11816f5..723653511b9f0 100644 --- a/lib/private/DB/NoCheckMigrator.php +++ b/lib/private/DB/NoCheckMigrator.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/DB/OCSqlitePlatform.php b/lib/private/DB/OCSqlitePlatform.php index fe68bc3cc91c4..9fcd8038f4f0b 100644 --- a/lib/private/DB/OCSqlitePlatform.php +++ b/lib/private/DB/OCSqlitePlatform.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/DB/OracleConnection.php b/lib/private/DB/OracleConnection.php index 8b7daf1e0bd18..08d713651722a 100644 --- a/lib/private/DB/OracleConnection.php +++ b/lib/private/DB/OracleConnection.php @@ -1,11 +1,12 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/DB/OracleMigrator.php b/lib/private/DB/OracleMigrator.php index 010f9213a1d9e..908b2dedf0340 100644 --- a/lib/private/DB/OracleMigrator.php +++ b/lib/private/DB/OracleMigrator.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/PgSqlTools.php b/lib/private/DB/PgSqlTools.php index e9e507551e6b4..3aeeab6efd170 100644 --- a/lib/private/DB/PgSqlTools.php +++ b/lib/private/DB/PgSqlTools.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author tbelau666 * @author Thomas Müller * - * @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/lib/private/DB/PostgreSqlMigrator.php b/lib/private/DB/PostgreSqlMigrator.php index 75e6e0a16c91d..563e7252e0208 100644 --- a/lib/private/DB/PostgreSqlMigrator.php +++ b/lib/private/DB/PostgreSqlMigrator.php @@ -1,8 +1,9 @@ * - * @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/lib/private/DB/QueryBuilder/CompositeExpression.php b/lib/private/DB/QueryBuilder/CompositeExpression.php index 927dfe383788c..1b3f06be94762 100644 --- a/lib/private/DB/QueryBuilder/CompositeExpression.php +++ b/lib/private/DB/QueryBuilder/CompositeExpression.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php index ce98816c42dca..f9170e97a0257 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php index 0d34787d26a06..66d8851632ffe 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php index 5d615ae52e893..69c34947feb54 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php index a8f1af87a45f4..bd18b38c52e1c 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/DB/QueryBuilder/Literal.php b/lib/private/DB/QueryBuilder/Literal.php index 0cc96ab48b493..7cf2e0ed157c7 100644 --- a/lib/private/DB/QueryBuilder/Literal.php +++ b/lib/private/DB/QueryBuilder/Literal.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/DB/QueryBuilder/Parameter.php b/lib/private/DB/QueryBuilder/Parameter.php index 1c233c83f1d31..8ec5809367dd9 100644 --- a/lib/private/DB/QueryBuilder/Parameter.php +++ b/lib/private/DB/QueryBuilder/Parameter.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index bb463e43a75c8..eac77dd98fdcd 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DB/QueryBuilder/QueryFunction.php b/lib/private/DB/QueryBuilder/QueryFunction.php index ac6d73f3cbf79..92be0a347f3d7 100644 --- a/lib/private/DB/QueryBuilder/QueryFunction.php +++ b/lib/private/DB/QueryBuilder/QueryFunction.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/DB/QueryBuilder/QuoteHelper.php b/lib/private/DB/QueryBuilder/QuoteHelper.php index fda243a378687..6d15cec5a0550 100644 --- a/lib/private/DB/QueryBuilder/QuoteHelper.php +++ b/lib/private/DB/QueryBuilder/QuoteHelper.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/DB/SQLiteMigrator.php b/lib/private/DB/SQLiteMigrator.php index 837a3a2987ff8..b7c32148aef8b 100644 --- a/lib/private/DB/SQLiteMigrator.php +++ b/lib/private/DB/SQLiteMigrator.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Victor Dubiniuk * - * @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/lib/private/DB/SQLiteSessionInit.php b/lib/private/DB/SQLiteSessionInit.php index 0683c47d08e5f..f8e6dcef8addd 100644 --- a/lib/private/DB/SQLiteSessionInit.php +++ b/lib/private/DB/SQLiteSessionInit.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/DatabaseException.php b/lib/private/DatabaseException.php index 4d50fe82b0f7a..7ca7435c02809 100644 --- a/lib/private/DatabaseException.php +++ b/lib/private/DatabaseException.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/DatabaseSetupException.php b/lib/private/DatabaseSetupException.php index 30bd00de2d6b2..f64655e5b0b72 100644 --- a/lib/private/DatabaseSetupException.php +++ b/lib/private/DatabaseSetupException.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/DateTimeFormatter.php b/lib/private/DateTimeFormatter.php index 5639ab1cace9e..3d0a4dd620cba 100644 --- a/lib/private/DateTimeFormatter.php +++ b/lib/private/DateTimeFormatter.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/DateTimeZone.php b/lib/private/DateTimeZone.php index 5359cd6b39110..59da2f601ab71 100644 --- a/lib/private/DateTimeZone.php +++ b/lib/private/DateTimeZone.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Diagnostics/Event.php b/lib/private/Diagnostics/Event.php index 8b5bb7e3bd80c..00a40b77e7ffd 100644 --- a/lib/private/Diagnostics/Event.php +++ b/lib/private/Diagnostics/Event.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Diagnostics/EventLogger.php b/lib/private/Diagnostics/EventLogger.php index 3d909ce79cd38..5abaae3f1dd53 100644 --- a/lib/private/Diagnostics/EventLogger.php +++ b/lib/private/Diagnostics/EventLogger.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Diagnostics/NullEventLogger.php b/lib/private/Diagnostics/NullEventLogger.php index 1b5e7af3ac9ce..9fe7461eb45c1 100644 --- a/lib/private/Diagnostics/NullEventLogger.php +++ b/lib/private/Diagnostics/NullEventLogger.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Diagnostics/NullQueryLogger.php b/lib/private/Diagnostics/NullQueryLogger.php index 98ddef2e7839d..873f556f90e04 100644 --- a/lib/private/Diagnostics/NullQueryLogger.php +++ b/lib/private/Diagnostics/NullQueryLogger.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Diagnostics/Query.php b/lib/private/Diagnostics/Query.php index 567bc83ed4bec..908ad17f9dbc2 100644 --- a/lib/private/Diagnostics/Query.php +++ b/lib/private/Diagnostics/Query.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Diagnostics/QueryLogger.php b/lib/private/Diagnostics/QueryLogger.php index 66a65b71d0401..5cf7e0689f8e3 100644 --- a/lib/private/Diagnostics/QueryLogger.php +++ b/lib/private/Diagnostics/QueryLogger.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index 34a3e1bff911a..6e309b5c8926d 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -1,8 +1,12 @@ + * @author Christian Jürges + * @author Joas Schilling + * @author Vincent Petry * - * @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/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index 36a9ada0c0e67..233390f873942 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Encryption/Exceptions/DecryptionFailedException.php b/lib/private/Encryption/Exceptions/DecryptionFailedException.php index a0cbbc5cce0b0..de13536b0c5b7 100644 --- a/lib/private/Encryption/Exceptions/DecryptionFailedException.php +++ b/lib/private/Encryption/Exceptions/DecryptionFailedException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php b/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php index 2c90c2db7dfdf..3e93e633ce128 100644 --- a/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php +++ b/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Exceptions/EncryptionFailedException.php b/lib/private/Encryption/Exceptions/EncryptionFailedException.php index 98e92eb199c29..fefd8d4f0ba8a 100644 --- a/lib/private/Encryption/Exceptions/EncryptionFailedException.php +++ b/lib/private/Encryption/Exceptions/EncryptionFailedException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php b/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php index c932c78a12816..e1a82b218a4eb 100644 --- a/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php +++ b/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php b/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php index 7b706e621de22..00bb0cf4262b1 100644 --- a/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php +++ b/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php b/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php index 88cffc6329160..e2793d641e194 100644 --- a/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php +++ b/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Exceptions/ModuleDoesNotExistsException.php b/lib/private/Encryption/Exceptions/ModuleDoesNotExistsException.php index 7981ee7cd5cd5..deda9b67f228b 100644 --- a/lib/private/Encryption/Exceptions/ModuleDoesNotExistsException.php +++ b/lib/private/Encryption/Exceptions/ModuleDoesNotExistsException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Exceptions/UnknownCipherException.php b/lib/private/Encryption/Exceptions/UnknownCipherException.php index beb4cb7f2e550..d2c2eb6289c1d 100644 --- a/lib/private/Encryption/Exceptions/UnknownCipherException.php +++ b/lib/private/Encryption/Exceptions/UnknownCipherException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/File.php b/lib/private/Encryption/File.php index 3573ff19c6e8d..240a8f1ccab00 100644 --- a/lib/private/Encryption/File.php +++ b/lib/private/Encryption/File.php @@ -1,9 +1,11 @@ * @author Thomas Müller + * @author Vincent Petry * - * @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/lib/private/Encryption/HookManager.php b/lib/private/Encryption/HookManager.php index c602dccacc2f3..2e40f2a819c4b 100644 --- a/lib/private/Encryption/HookManager.php +++ b/lib/private/Encryption/HookManager.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php index f977cd4aab2e6..8149ffe9dcefb 100644 --- a/lib/private/Encryption/Keys/Storage.php +++ b/lib/private/Encryption/Keys/Storage.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php index 21b2e2f4099f1..4d40675801eb2 100644 --- a/lib/private/Encryption/Manager.php +++ b/lib/private/Encryption/Manager.php @@ -1,11 +1,12 @@ * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Encryption/Update.php b/lib/private/Encryption/Update.php index 37a2bb8679d44..ad40183767bff 100644 --- a/lib/private/Encryption/Update.php +++ b/lib/private/Encryption/Update.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php index 721869b4402c2..0e8de5147e1ad 100644 --- a/lib/private/Encryption/Util.php +++ b/lib/private/Encryption/Util.php @@ -1,11 +1,12 @@ * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 813a2af6f6cf9..5083b99b862cd 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -1,22 +1,23 @@ * @author Björn Schießle * @author Florin Peter * @author Jens-Christian Fischer - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author TheSFReader * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Cache/CacheEntry.php b/lib/private/Files/Cache/CacheEntry.php index 6d3c5d5b08993..4a2579a88f89a 100644 --- a/lib/private/Files/Cache/CacheEntry.php +++ b/lib/private/Files/Cache/CacheEntry.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Cache/FailedCache.php b/lib/private/Files/Cache/FailedCache.php index 0386ba3ca324b..3a0424b5e2690 100644 --- a/lib/private/Files/Cache/FailedCache.php +++ b/lib/private/Files/Cache/FailedCache.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Cache/HomeCache.php b/lib/private/Files/Cache/HomeCache.php index 13eaf26a2841f..e9dca27711437 100644 --- a/lib/private/Files/Cache/HomeCache.php +++ b/lib/private/Files/Cache/HomeCache.php @@ -1,13 +1,14 @@ * @author Björn Schießle * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Files/Cache/HomePropagator.php b/lib/private/Files/Cache/HomePropagator.php index db9e30ae0fcaf..8f41a1be9da55 100644 --- a/lib/private/Files/Cache/HomePropagator.php +++ b/lib/private/Files/Cache/HomePropagator.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Cache/MoveFromCacheTrait.php b/lib/private/Files/Cache/MoveFromCacheTrait.php index 7d8ed7b5d21eb..a814a081dca71 100644 --- a/lib/private/Files/Cache/MoveFromCacheTrait.php +++ b/lib/private/Files/Cache/MoveFromCacheTrait.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php index 52bb4dfdfca1c..48122ae5529c1 100644 --- a/lib/private/Files/Cache/Propagator.php +++ b/lib/private/Files/Cache/Propagator.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index c17f9bfd51b44..28f7be0b65ace 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -1,5 +1,7 @@ * @author Björn Schießle * @author Daniel Jagszent @@ -9,13 +11,12 @@ * @author Michael Gapczynski * @author Morris Jobke * @author Owen Winkler - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Cache/Storage.php b/lib/private/Files/Cache/Storage.php index 90c451ecc21b1..99b127ab2208e 100644 --- a/lib/private/Files/Cache/Storage.php +++ b/lib/private/Files/Cache/Storage.php @@ -1,14 +1,15 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php index 361db4b3f8545..57a3d895cd28b 100644 --- a/lib/private/Files/Cache/Updater.php +++ b/lib/private/Files/Cache/Updater.php @@ -1,13 +1,14 @@ * @author Daniel Jagszent * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Files/Cache/Watcher.php b/lib/private/Files/Cache/Watcher.php index 4a4c23c08b7e4..47dde26d7b776 100644 --- a/lib/private/Files/Cache/Watcher.php +++ b/lib/private/Files/Cache/Watcher.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php index 858132930f232..d121ee25361a6 100644 --- a/lib/private/Files/Cache/Wrapper/CacheJail.php +++ b/lib/private/Files/Cache/Wrapper/CacheJail.php @@ -1,13 +1,14 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php b/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php index b3a7bcb3a73e4..83cf01045a7f8 100644 --- a/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php +++ b/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 475e0e0e2dd08..7a8177566c7fc 100644 --- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php +++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * @author Vincent Petry * - * @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/lib/private/Files/Config/CachedMountInfo.php b/lib/private/Files/Config/CachedMountInfo.php index b81cd11a1c186..f68949f8d55ba 100644 --- a/lib/private/Files/Config/CachedMountInfo.php +++ b/lib/private/Files/Config/CachedMountInfo.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Config/LazyStorageMountInfo.php b/lib/private/Files/Config/LazyStorageMountInfo.php index 58f288135e61a..2e9639f5f084d 100644 --- a/lib/private/Files/Config/LazyStorageMountInfo.php +++ b/lib/private/Files/Config/LazyStorageMountInfo.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php index 60c90d7a01905..a09f246e6b399 100644 --- a/lib/private/Files/Config/MountProviderCollection.php +++ b/lib/private/Files/Config/MountProviderCollection.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index d9b538a002adf..ab58a97687334 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Files/Config/UserMountCacheListener.php b/lib/private/Files/Config/UserMountCacheListener.php index 99673cf6285e1..78b8b894bf894 100644 --- a/lib/private/Files/Config/UserMountCacheListener.php +++ b/lib/private/Files/Config/UserMountCacheListener.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php index 9e87ee00111f9..d463abfadcd4c 100644 --- a/lib/private/Files/FileInfo.php +++ b/lib/private/Files/FileInfo.php @@ -1,16 +1,17 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author tbartenstein * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 3d3345a5c80fa..d835fea7f4c1a 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -1,22 +1,23 @@ * @author Bart Visscher * @author Christopher Schäpers * @author Florin Peter - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sam Tuke * @author Stephan Peijnik * @author Vincent Petry * - * @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/lib/private/Files/Mount/CacheMountProvider.php b/lib/private/Files/Mount/CacheMountProvider.php index c8422c4a50720..14ebb7c5843d4 100644 --- a/lib/private/Files/Mount/CacheMountProvider.php +++ b/lib/private/Files/Mount/CacheMountProvider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Mount/LocalHomeMountProvider.php b/lib/private/Files/Mount/LocalHomeMountProvider.php index 102df59a5364e..23bbfcd5ffad3 100644 --- a/lib/private/Files/Mount/LocalHomeMountProvider.php +++ b/lib/private/Files/Mount/LocalHomeMountProvider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Mount/Manager.php b/lib/private/Files/Mount/Manager.php index d5238c467bfa1..7bd888a6389f0 100644 --- a/lib/private/Files/Mount/Manager.php +++ b/lib/private/Files/Mount/Manager.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php index f76e8151059ab..d6a6a5565ad6f 100644 --- a/lib/private/Files/Mount/MountPoint.php +++ b/lib/private/Files/Mount/MountPoint.php @@ -1,14 +1,16 @@ + * @author Georg Ehrke * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Mount/MoveableMount.php b/lib/private/Files/Mount/MoveableMount.php index 8a1bd7dd9c53a..6a9647067a379 100644 --- a/lib/private/Files/Mount/MoveableMount.php +++ b/lib/private/Files/Mount/MoveableMount.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Mount/ObjectHomeMountProvider.php b/lib/private/Files/Mount/ObjectHomeMountProvider.php index c491a0c764d2c..c1eea34a72ec4 100644 --- a/lib/private/Files/Mount/ObjectHomeMountProvider.php +++ b/lib/private/Files/Mount/ObjectHomeMountProvider.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Node/File.php b/lib/private/Files/Node/File.php index 9e0014abb0bb9..c4430b9181daf 100644 --- a/lib/private/Files/Node/File.php +++ b/lib/private/Files/Node/File.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index f4d7dae20a3a7..8813b6c0775cf 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/lib/private/Files/Node/HookConnector.php b/lib/private/Files/Node/HookConnector.php index 5c36ca3848e0a..27f65d9987bea 100644 --- a/lib/private/Files/Node/HookConnector.php +++ b/lib/private/Files/Node/HookConnector.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Node/LazyRoot.php b/lib/private/Files/Node/LazyRoot.php index 9661f0365791e..1203fc4d16276 100644 --- a/lib/private/Files/Node/LazyRoot.php +++ b/lib/private/Files/Node/LazyRoot.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Node/Node.php b/lib/private/Files/Node/Node.php index c4fabfc2e2eb2..226c182622f2b 100644 --- a/lib/private/Files/Node/Node.php +++ b/lib/private/Files/Node/Node.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Vincent Petry * - * @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/lib/private/Files/Node/NonExistingFile.php b/lib/private/Files/Node/NonExistingFile.php index c1d09bcc49165..fbfb67749bb05 100644 --- a/lib/private/Files/Node/NonExistingFile.php +++ b/lib/private/Files/Node/NonExistingFile.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Node/NonExistingFolder.php b/lib/private/Files/Node/NonExistingFolder.php index 7d6576f1bd664..efc359181c66c 100644 --- a/lib/private/Files/Node/NonExistingFolder.php +++ b/lib/private/Files/Node/NonExistingFolder.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php index 476d3ef5fdd94..bad865a798742 100644 --- a/lib/private/Files/Node/Root.php +++ b/lib/private/Files/Node/Root.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Stefan Weil * - * @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/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php index 7960696a5d07c..fb5e8d83ab120 100644 --- a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/private/Files/ObjectStore/Mapper.php b/lib/private/Files/ObjectStore/Mapper.php index f0004f1f966da..bfb4e9981508a 100644 --- a/lib/private/Files/ObjectStore/Mapper.php +++ b/lib/private/Files/ObjectStore/Mapper.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/ObjectStore/NoopScanner.php b/lib/private/Files/ObjectStore/NoopScanner.php index f5316175ecfb5..a3a396651a233 100644 --- a/lib/private/Files/ObjectStore/NoopScanner.php +++ b/lib/private/Files/ObjectStore/NoopScanner.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 8c643dbdcc7df..0f0229c9ca598 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php index 4af09dca2540b..dbb8dde32abc4 100644 --- a/lib/private/Files/ObjectStore/Swift.php +++ b/lib/private/Files/ObjectStore/Swift.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 6c4013d2acb8d..63d3c004fd2ea 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -1,25 +1,26 @@ * @author Bart Visscher * @author Björn Schießle * @author hkjolhede - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Martin Mattel * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sam Tuke * @author scambra * @author Stefan Weil * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Storage/CommonTest.php b/lib/private/Files/Storage/CommonTest.php index 0047a51169ca0..b979a8816c247 100644 --- a/lib/private/Files/Storage/CommonTest.php +++ b/lib/private/Files/Storage/CommonTest.php @@ -1,14 +1,15 @@ * @author Christopher Schäpers * @author Felix Moeller * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 7eb6aa199b147..ea4bbba2748c0 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -1,5 +1,7 @@ * @author Björn Schießle * @author Carlos Cerrillo @@ -9,11 +11,10 @@ * @author Michael Gapczynski * @author Morris Jobke * @author Philipp Kapfer - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Storage/FailedStorage.php b/lib/private/Files/Storage/FailedStorage.php index 223fa6a728e2f..f717c798c5a00 100644 --- a/lib/private/Files/Storage/FailedStorage.php +++ b/lib/private/Files/Storage/FailedStorage.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/lib/private/Files/Storage/Flysystem.php b/lib/private/Files/Storage/Flysystem.php index 608639b71a6f3..423a6f0d83e79 100644 --- a/lib/private/Files/Storage/Flysystem.php +++ b/lib/private/Files/Storage/Flysystem.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Files/Storage/Home.php b/lib/private/Files/Storage/Home.php index 2085384d5a101..e5ba0f9dfe433 100644 --- a/lib/private/Files/Storage/Home.php +++ b/lib/private/Files/Storage/Home.php @@ -1,12 +1,13 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index 005b5f9ab91f8..19674fc941374 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -1,21 +1,22 @@ * @author Brice Maron * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Klaas Freitag * @author Martin Mattel * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Sjors van der Pluijm * @author Stefan Weil * @author Thomas Müller * @author Tigran Mkrtchyan * @author Vincent Petry * - * @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/lib/private/Files/Storage/LocalTempFileTrait.php b/lib/private/Files/Storage/LocalTempFileTrait.php index d4a006e39bdba..26b47ba97dc98 100644 --- a/lib/private/Files/Storage/LocalTempFileTrait.php +++ b/lib/private/Files/Storage/LocalTempFileTrait.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Files/Storage/PolyFill/CopyDirectory.php b/lib/private/Files/Storage/PolyFill/CopyDirectory.php index aac4479cad668..9fe29d075d52c 100644 --- a/lib/private/Files/Storage/PolyFill/CopyDirectory.php +++ b/lib/private/Files/Storage/PolyFill/CopyDirectory.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Stefan Weil * - * @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/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php index c066336d4b8dd..49a714587a78e 100644 --- a/lib/private/Files/Storage/Storage.php +++ b/lib/private/Files/Storage/Storage.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Files/Storage/StorageFactory.php b/lib/private/Files/Storage/StorageFactory.php index 84362cabeccaa..fa94f4f05f6d5 100644 --- a/lib/private/Files/Storage/StorageFactory.php +++ b/lib/private/Files/Storage/StorageFactory.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Files/Storage/Temporary.php b/lib/private/Files/Storage/Temporary.php index 2d8e84c2d5271..2633de4980eb1 100644 --- a/lib/private/Files/Storage/Temporary.php +++ b/lib/private/Files/Storage/Temporary.php @@ -1,11 +1,12 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php index 8d6fc4b336963..2a44a3a17d52e 100644 --- a/lib/private/Files/Storage/Wrapper/Availability.php +++ b/lib/private/Files/Storage/Wrapper/Availability.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php index 0171dfe19b7db..389da06f7b786 100644 --- a/lib/private/Files/Storage/Wrapper/Encoding.php +++ b/lib/private/Files/Storage/Wrapper/Encoding.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index f047464282d67..8531ccc0dd079 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php index 1df28e9a74778..80c75523748f0 100644 --- a/lib/private/Files/Storage/Wrapper/Jail.php +++ b/lib/private/Files/Storage/Wrapper/Jail.php @@ -1,10 +1,11 @@ - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php index 466b0a80e1cd3..39375602c3436 100644 --- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php +++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php @@ -1,12 +1,13 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * - * @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/lib/private/Files/Storage/Wrapper/Quota.php b/lib/private/Files/Storage/Wrapper/Quota.php index 500677b092e63..7312ed61dcc4b 100644 --- a/lib/private/Files/Storage/Wrapper/Quota.php +++ b/lib/private/Files/Storage/Wrapper/Quota.php @@ -1,12 +1,13 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Vincent Petry * - * @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/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php index 21d7db1099be0..706023a289320 100644 --- a/lib/private/Files/Storage/Wrapper/Wrapper.php +++ b/lib/private/Files/Storage/Wrapper/Wrapper.php @@ -1,12 +1,13 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Stream/Close.php b/lib/private/Files/Stream/Close.php index 1c9b30705ddc0..7cc9903c9124b 100644 --- a/lib/private/Files/Stream/Close.php +++ b/lib/private/Files/Stream/Close.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Stream/Dir.php b/lib/private/Files/Stream/Dir.php index 7489ee683a29c..f8f6b1fa89a18 100644 --- a/lib/private/Files/Stream/Dir.php +++ b/lib/private/Files/Stream/Dir.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php index 8eaee69afdfa0..d1f68696848d9 100644 --- a/lib/private/Files/Stream/Encryption.php +++ b/lib/private/Files/Stream/Encryption.php @@ -1,13 +1,14 @@ * @author jknockaert * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Files/Stream/OC.php b/lib/private/Files/Stream/OC.php index 8439770e8fa61..f415bc13b1500 100644 --- a/lib/private/Files/Stream/OC.php +++ b/lib/private/Files/Stream/OC.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/Files/Stream/Quota.php b/lib/private/Files/Stream/Quota.php index 8d27575c5689a..f064ca6c0112d 100644 --- a/lib/private/Files/Stream/Quota.php +++ b/lib/private/Files/Stream/Quota.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Files/Stream/StaticStream.php b/lib/private/Files/Stream/StaticStream.php index 7aacf7a9fe4b8..3c91b23fd36f5 100644 --- a/lib/private/Files/Stream/StaticStream.php +++ b/lib/private/Files/Stream/StaticStream.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php index 2d68c92b14efb..492025b7bfc30 100644 --- a/lib/private/Files/Type/Detection.php +++ b/lib/private/Files/Type/Detection.php @@ -1,15 +1,17 @@ + * @author Hendrik Leppelsack * @author Jens-Christian Fischer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Tanghus * - * @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/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php index 95ba7597257e8..d1f447d808149 100644 --- a/lib/private/Files/Type/Loader.php +++ b/lib/private/Files/Type/Loader.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Files/Type/TemplateManager.php b/lib/private/Files/Type/TemplateManager.php index 363fb7a2a6c60..8b30eb6b4e815 100644 --- a/lib/private/Files/Type/TemplateManager.php +++ b/lib/private/Files/Type/TemplateManager.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index e4e5e353f9f53..f672cc75744c1 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -1,12 +1,13 @@ * @author Morris Jobke * @author Olivier Paroz - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Files/View.php b/lib/private/Files/View.php index 7d9771e6394dd..fa6ba20c342f3 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1,13 +1,16 @@ * @author Bart Visscher * @author Björn Schießle * @author cmeh * @author Florin Peter * @author Jesús Macias - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer + * @author karakayasemi * @author Klaas Freitag * @author Lukas Reschke * @author Luke Policinski @@ -16,16 +19,15 @@ * @author Morris Jobke * @author Petr Svoboda * @author Piotr Filiciak - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sam Tuke * @author Stefan Weil * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/ForbiddenException.php b/lib/private/ForbiddenException.php index 48be35ba316e5..bb25efbf856b9 100644 --- a/lib/private/ForbiddenException.php +++ b/lib/private/ForbiddenException.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/lib/private/Group/Backend.php b/lib/private/Group/Backend.php index 120c0d4d5369e..14c36d934225a 100644 --- a/lib/private/Group/Backend.php +++ b/lib/private/Group/Backend.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index 64f249d4d2573..e4144fdbe200e 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -1,8 +1,10 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Aaron Wood + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index 96e73e3b68f82..9379d604c48c4 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -1,14 +1,15 @@ * @author Bart Visscher * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/Group/Manager.php b/lib/private/Group/Manager.php index fb199be8afc52..31911138985bb 100644 --- a/lib/private/Group/Manager.php +++ b/lib/private/Group/Manager.php @@ -1,21 +1,22 @@ * @author Bart Visscher * @author Bernhard Posselt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author macjohnny * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Roman Kreisel * @author Thomas Müller * @author voxsim * - * @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/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php index 7fe82ff3bcbc4..d5c8b581f8bcd 100644 --- a/lib/private/Group/MetaData.php +++ b/lib/private/Group/MetaData.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Stephan Peijnik * @author Thomas Müller * - * @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/lib/private/HTTPHelper.php b/lib/private/HTTPHelper.php index 448a2cfd81880..d58f81fbbdcfb 100644 --- a/lib/private/HTTPHelper.php +++ b/lib/private/HTTPHelper.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/private/HintException.php b/lib/private/HintException.php index 05adc64dcd7d2..7ff8240afd258 100644 --- a/lib/private/HintException.php +++ b/lib/private/HintException.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Hooks/BasicEmitter.php b/lib/private/Hooks/BasicEmitter.php index 067962ec081b3..0feba32ea6002 100644 --- a/lib/private/Hooks/BasicEmitter.php +++ b/lib/private/Hooks/BasicEmitter.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Hooks/Emitter.php b/lib/private/Hooks/Emitter.php index d639e5ef89240..a93a71bc5c1ef 100644 --- a/lib/private/Hooks/Emitter.php +++ b/lib/private/Hooks/Emitter.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Hooks/EmitterTrait.php b/lib/private/Hooks/EmitterTrait.php index 775f46f838cdd..cb061d4b998f6 100644 --- a/lib/private/Hooks/EmitterTrait.php +++ b/lib/private/Hooks/EmitterTrait.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Hooks/ForwardingEmitter.php b/lib/private/Hooks/ForwardingEmitter.php index 6a1fc571cea03..67234bc03df6a 100644 --- a/lib/private/Hooks/ForwardingEmitter.php +++ b/lib/private/Hooks/ForwardingEmitter.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Hooks/LegacyEmitter.php b/lib/private/Hooks/LegacyEmitter.php index ac83477a1444c..4f936e8aab5f2 100644 --- a/lib/private/Hooks/LegacyEmitter.php +++ b/lib/private/Hooks/LegacyEmitter.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Hooks/PublicEmitter.php b/lib/private/Hooks/PublicEmitter.php index 4fe71073a1ecc..4bdaeec3b4935 100644 --- a/lib/private/Hooks/PublicEmitter.php +++ b/lib/private/Hooks/PublicEmitter.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index f98da97a0a90b..8e1821113037a 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Http/Client/ClientService.php b/lib/private/Http/Client/ClientService.php index 39099e1afa947..108ffa709cf26 100644 --- a/lib/private/Http/Client/ClientService.php +++ b/lib/private/Http/Client/ClientService.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Http/Client/Response.php b/lib/private/Http/Client/Response.php index ef041d4a34113..48885de9f3a00 100644 --- a/lib/private/Http/Client/Response.php +++ b/lib/private/Http/Client/Response.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Installer.php b/lib/private/Installer.php index cd23f95b85710..eed97e18d94ce 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Brice Maron @@ -8,19 +10,18 @@ * @author Frank Karlitschek * @author Georg Ehrke * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Kamil Domanski * @author Lukas Reschke * @author michag86 * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author root * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index d087720c11ace..e6eeaec73497d 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -1,9 +1,11 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma + * @author Vincent Petry * - * @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/lib/private/IntegrityCheck/Exceptions/InvalidSignatureException.php b/lib/private/IntegrityCheck/Exceptions/InvalidSignatureException.php index 6cf8ba35e6047..d5dcd2d80dad7 100644 --- a/lib/private/IntegrityCheck/Exceptions/InvalidSignatureException.php +++ b/lib/private/IntegrityCheck/Exceptions/InvalidSignatureException.php @@ -1,8 +1,9 @@ * - * @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/lib/private/IntegrityCheck/Helpers/AppLocator.php b/lib/private/IntegrityCheck/Helpers/AppLocator.php index 0ad2ea8b75d69..c8d4e1b9b27ae 100644 --- a/lib/private/IntegrityCheck/Helpers/AppLocator.php +++ b/lib/private/IntegrityCheck/Helpers/AppLocator.php @@ -1,8 +1,9 @@ * - * @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/lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php b/lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php index 14ee1cc1d9d5f..c5e919971309c 100644 --- a/lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php +++ b/lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php @@ -1,8 +1,9 @@ * - * @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/lib/private/IntegrityCheck/Helpers/FileAccessHelper.php b/lib/private/IntegrityCheck/Helpers/FileAccessHelper.php index 30909b72d14d1..9e2b76ce11a62 100644 --- a/lib/private/IntegrityCheck/Helpers/FileAccessHelper.php +++ b/lib/private/IntegrityCheck/Helpers/FileAccessHelper.php @@ -1,8 +1,9 @@ * - * @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/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php b/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php index 5c72bfaa57cee..4801d7bb748e1 100644 --- a/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php +++ b/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php @@ -1,8 +1,10 @@ + * @author Thomas Müller * - * @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/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php index 80a89e8c3a4b8..31dd05ef312cb 100644 --- a/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php +++ b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php @@ -1,9 +1,10 @@ * @author RealRancor * - * @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/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index f1f13e734a953..74f759a4e0daf 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index 3e999e8c67107..c83b6ea3960f8 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index 06e5003814f93..f89d3216a391b 100644 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Michael Roitzsch * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Lock/AbstractLockingProvider.php b/lib/private/Lock/AbstractLockingProvider.php index ff9f99a9630e0..6ad1dd7ca1b63 100644 --- a/lib/private/Lock/AbstractLockingProvider.php +++ b/lib/private/Lock/AbstractLockingProvider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Lock/DBLockingProvider.php b/lib/private/Lock/DBLockingProvider.php index ce4c28cab5bc5..c521bcf548b2f 100644 --- a/lib/private/Lock/DBLockingProvider.php +++ b/lib/private/Lock/DBLockingProvider.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/lib/private/Lock/MemcacheLockingProvider.php b/lib/private/Lock/MemcacheLockingProvider.php index 56e581b2192a3..c4b1469b50f82 100644 --- a/lib/private/Lock/MemcacheLockingProvider.php +++ b/lib/private/Lock/MemcacheLockingProvider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Lock/NoopLockingProvider.php b/lib/private/Lock/NoopLockingProvider.php index dc58230f77eb8..6dfbd8ccb44e5 100644 --- a/lib/private/Lock/NoopLockingProvider.php +++ b/lib/private/Lock/NoopLockingProvider.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/private/Log.php b/lib/private/Log.php index b759021ad1f74..59233cf5c125c 100644 --- a/lib/private/Log.php +++ b/lib/private/Log.php @@ -1,17 +1,18 @@ * @author Bernhard Posselt - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Olivier Paroz - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Victor Dubiniuk * - * @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/lib/private/Log/ErrorHandler.php b/lib/private/Log/ErrorHandler.php index 2a20d22b02a2e..39c2d2b0947e9 100644 --- a/lib/private/Log/ErrorHandler.php +++ b/lib/private/Log/ErrorHandler.php @@ -1,11 +1,12 @@ * @author Björn Schießle * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Log/Owncloud.php b/lib/private/Log/Owncloud.php index d76145ebdd358..2cc70015e3ce0 100644 --- a/lib/private/Log/Owncloud.php +++ b/lib/private/Log/Owncloud.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Georg Ehrke @@ -7,11 +9,12 @@ * @author Michael Gapczynski * @author Morris Jobke * @author Phiber2000 - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller + * @author Thomas Pulzer + * @author Vincent Petry * - * @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/lib/private/Log/Rotate.php b/lib/private/Log/Rotate.php index 458661c82d09b..6c87c16737832 100644 --- a/lib/private/Log/Rotate.php +++ b/lib/private/Log/Rotate.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Log/Syslog.php b/lib/private/Log/Syslog.php index 26b38fcf26154..c6ea0a403502d 100644 --- a/lib/private/Log/Syslog.php +++ b/lib/private/Log/Syslog.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 93f15fa3d49a9..df8fa80f2c2cb 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Mail/Message.php b/lib/private/Mail/Message.php index be69e64f782a0..3184f26848bea 100644 --- a/lib/private/Mail/Message.php +++ b/lib/private/Mail/Message.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Memcache/APC.php b/lib/private/Memcache/APC.php index 2354ad077499c..7db6d64b085f8 100644 --- a/lib/private/Memcache/APC.php +++ b/lib/private/Memcache/APC.php @@ -1,12 +1,13 @@ * @author Clark Tomlinson * @author Morris Jobke * @author Otto Sabart - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Memcache/APCu.php b/lib/private/Memcache/APCu.php index ad8885c1ccd24..713ed152648c7 100644 --- a/lib/private/Memcache/APCu.php +++ b/lib/private/Memcache/APCu.php @@ -1,13 +1,14 @@ * @author Bart Visscher * @author Clark Tomlinson * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Memcache/ArrayCache.php b/lib/private/Memcache/ArrayCache.php index 837f888a307a8..2f63ba371aa1e 100644 --- a/lib/private/Memcache/ArrayCache.php +++ b/lib/private/Memcache/ArrayCache.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Memcache/CADTrait.php b/lib/private/Memcache/CADTrait.php index d44d98cba0b56..e45e9d28fd1b7 100644 --- a/lib/private/Memcache/CADTrait.php +++ b/lib/private/Memcache/CADTrait.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Memcache/CASTrait.php b/lib/private/Memcache/CASTrait.php index 43253fc966b66..b95c150a3eef1 100644 --- a/lib/private/Memcache/CASTrait.php +++ b/lib/private/Memcache/CASTrait.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Memcache/Cache.php b/lib/private/Memcache/Cache.php index 1730e169325a7..5ed0eca58805b 100644 --- a/lib/private/Memcache/Cache.php +++ b/lib/private/Memcache/Cache.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/Memcache/Factory.php b/lib/private/Memcache/Factory.php index d83aed816accd..f3841d316795b 100644 --- a/lib/private/Memcache/Factory.php +++ b/lib/private/Memcache/Factory.php @@ -1,16 +1,17 @@ * @author Lukas Reschke * @author Markus Goetz * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php index d02b62edb0e44..12f457393744a 100644 --- a/lib/private/Memcache/Memcached.php +++ b/lib/private/Memcache/Memcached.php @@ -1,15 +1,16 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/Memcache/NullCache.php b/lib/private/Memcache/NullCache.php index c490ca7e03c27..5d4f176f8416b 100644 --- a/lib/private/Memcache/NullCache.php +++ b/lib/private/Memcache/NullCache.php @@ -1,12 +1,13 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Memcache/Redis.php b/lib/private/Memcache/Redis.php index efb8fbfd6d64e..c3184e458560e 100644 --- a/lib/private/Memcache/Redis.php +++ b/lib/private/Memcache/Redis.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Stefan Weil * - * @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/lib/private/Memcache/XCache.php b/lib/private/Memcache/XCache.php index d2178c09983b0..7eb7a138d1ff9 100644 --- a/lib/private/Memcache/XCache.php +++ b/lib/private/Memcache/XCache.php @@ -1,14 +1,15 @@ * @author Bart Visscher * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php index d85c8550d5d6c..495b868607c60 100644 --- a/lib/private/Migration/BackgroundRepair.php +++ b/lib/private/Migration/BackgroundRepair.php @@ -1,8 +1,9 @@ * - * @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/lib/private/NaturalSort.php b/lib/private/NaturalSort.php index 04b36f84ac44c..636e5cd021957 100644 --- a/lib/private/NaturalSort.php +++ b/lib/private/NaturalSort.php @@ -1,5 +1,7 @@ * @author Lukas Reschke * @author Morris Jobke @@ -7,7 +9,6 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/NaturalSort_DefaultCollator.php b/lib/private/NaturalSort_DefaultCollator.php index 7b8400fa8e139..e7fe5575a40d0 100644 --- a/lib/private/NaturalSort_DefaultCollator.php +++ b/lib/private/NaturalSort_DefaultCollator.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/NavigationManager.php b/lib/private/NavigationManager.php index 6dbb9c925e0ac..3e9ddfc6466b9 100644 --- a/lib/private/NavigationManager.php +++ b/lib/private/NavigationManager.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/NeedsUpdateException.php b/lib/private/NeedsUpdateException.php index 90c642780d8c3..04d62da7c5675 100644 --- a/lib/private/NeedsUpdateException.php +++ b/lib/private/NeedsUpdateException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/NotSquareException.php b/lib/private/NotSquareException.php index e3494463850a0..1d2ee28ebb3a2 100644 --- a/lib/private/NotSquareException.php +++ b/lib/private/NotSquareException.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/private/Notification/Action.php b/lib/private/Notification/Action.php index deac680765314..8dfeecb98cb5e 100644 --- a/lib/private/Notification/Action.php +++ b/lib/private/Notification/Action.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Notification/Manager.php b/lib/private/Notification/Manager.php index 3ddc9b2116187..240cb1e11ff07 100644 --- a/lib/private/Notification/Manager.php +++ b/lib/private/Notification/Manager.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Notification/Notification.php b/lib/private/Notification/Notification.php index db0a76a7c3203..62a48f434fe4b 100644 --- a/lib/private/Notification/Notification.php +++ b/lib/private/Notification/Notification.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/OCS/Cloud.php b/lib/private/OCS/Cloud.php index 9686e9bfb5863..84fcfe6e51250 100644 --- a/lib/private/OCS/Cloud.php +++ b/lib/private/OCS/Cloud.php @@ -1,11 +1,12 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/lib/private/OCS/Config.php b/lib/private/OCS/Config.php index 293648e5f44b6..a8bf8c325c3f6 100644 --- a/lib/private/OCS/Config.php +++ b/lib/private/OCS/Config.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tom Needham * - * @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/lib/private/OCS/CoreCapabilities.php b/lib/private/OCS/CoreCapabilities.php index 388a58791b479..1a65a709c57db 100644 --- a/lib/private/OCS/CoreCapabilities.php +++ b/lib/private/OCS/CoreCapabilities.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/OCS/Exception.php b/lib/private/OCS/Exception.php index 3c8a14b93f75f..58b13f52df92f 100644 --- a/lib/private/OCS/Exception.php +++ b/lib/private/OCS/Exception.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/OCS/Person.php b/lib/private/OCS/Person.php index facaa5d7403c6..bbb4a39e1e8b5 100644 --- a/lib/private/OCS/Person.php +++ b/lib/private/OCS/Person.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Tom Needham * - * @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/lib/private/OCS/PrivateData.php b/lib/private/OCS/PrivateData.php index 46c84175e3e62..0f5c48b121877 100644 --- a/lib/private/OCS/PrivateData.php +++ b/lib/private/OCS/PrivateData.php @@ -1,15 +1,16 @@ * @author Bart Visscher * @author Frank Karlitschek * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/lib/private/OCS/Provider.php b/lib/private/OCS/Provider.php index 4d6e0593d5b22..7d53479c6e2d3 100644 --- a/lib/private/OCS/Provider.php +++ b/lib/private/OCS/Provider.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * - * @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/lib/private/OCS/Result.php b/lib/private/OCS/Result.php index 9629d1f75176f..69bb0d86faffb 100644 --- a/lib/private/OCS/Result.php +++ b/lib/private/OCS/Result.php @@ -1,16 +1,17 @@ * @author Björn Schießle * @author Christopher Schäpers * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * - * @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/lib/private/OCSClient.php b/lib/private/OCSClient.php index 27fc090722a35..d864e6d4dcb32 100644 --- a/lib/private/OCSClient.php +++ b/lib/private/OCSClient.php @@ -1,11 +1,13 @@ * @author Brice Maron * @author Felix Moeller * @author Frank Karlitschek * @author Jarrett - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Kamil Domanski * @author Lukas Reschke @@ -14,7 +16,6 @@ * @author Sam Tuke * @author Thomas Müller * - * @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/lib/private/Preview.php b/lib/private/Preview.php index 8bc262d70478d..70b000a30ee3a 100644 --- a/lib/private/Preview.php +++ b/lib/private/Preview.php @@ -1,19 +1,20 @@ * @author Frank Karlitschek * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Olivier Paroz - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Tobias Kaminsky * - * @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/lib/private/Preview/BMP.php b/lib/private/Preview/BMP.php index da13cd9e5b8aa..de08cfe0c8f16 100644 --- a/lib/private/Preview/BMP.php +++ b/lib/private/Preview/BMP.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php index 34bc2f93fc7d4..d3f75b4a2058c 100644 --- a/lib/private/Preview/Bitmap.php +++ b/lib/private/Preview/Bitmap.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Olivier Paroz * @author Thomas Müller * - * @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/lib/private/Preview/Font.php b/lib/private/Preview/Font.php index caac292378950..4d5732eb88017 100644 --- a/lib/private/Preview/Font.php +++ b/lib/private/Preview/Font.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Preview/GIF.php b/lib/private/Preview/GIF.php index 0716a6f44065f..2189273b3b507 100644 --- a/lib/private/Preview/GIF.php +++ b/lib/private/Preview/GIF.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Preview/Illustrator.php b/lib/private/Preview/Illustrator.php index ef8448d7b5327..733b679f3f53b 100644 --- a/lib/private/Preview/Illustrator.php +++ b/lib/private/Preview/Illustrator.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Preview/Image.php b/lib/private/Preview/Image.php index 540cb57ef8083..7fdf1bbd500d3 100644 --- a/lib/private/Preview/Image.php +++ b/lib/private/Preview/Image.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author josh4trunks * @author Olivier Paroz - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/Preview/JPEG.php b/lib/private/Preview/JPEG.php index 2ee5dd2441916..1937d4a4a8a86 100644 --- a/lib/private/Preview/JPEG.php +++ b/lib/private/Preview/JPEG.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php index f96b422f57ada..804ec7fbcd979 100644 --- a/lib/private/Preview/MP3.php +++ b/lib/private/Preview/MP3.php @@ -1,12 +1,14 @@ - * @author Joas Schilling + * @author Hendrik Leppelsack + * @author Joas Schilling * @author Lukas Reschke * @author Olivier Paroz * @author Thomas Tanghus * - * @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/lib/private/Preview/MSOffice2003.php b/lib/private/Preview/MSOffice2003.php index 20dbe13543a3b..39ba4bc3f5c6b 100644 --- a/lib/private/Preview/MSOffice2003.php +++ b/lib/private/Preview/MSOffice2003.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Preview/MSOffice2007.php b/lib/private/Preview/MSOffice2007.php index ef6758843f1ac..2e033683c20e0 100644 --- a/lib/private/Preview/MSOffice2007.php +++ b/lib/private/Preview/MSOffice2007.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Preview/MSOfficeDoc.php b/lib/private/Preview/MSOfficeDoc.php index 05d839d508f56..7e9d22fcf591f 100644 --- a/lib/private/Preview/MSOfficeDoc.php +++ b/lib/private/Preview/MSOfficeDoc.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Preview/MarkDown.php b/lib/private/Preview/MarkDown.php index 394af6576c78b..f49efbaaa0718 100644 --- a/lib/private/Preview/MarkDown.php +++ b/lib/private/Preview/MarkDown.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 43a8d674fc92a..d6a589dfaea60 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Olivier Paroz * @author Thomas Müller * - * @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/lib/private/Preview/Office.php b/lib/private/Preview/Office.php index 6496e091b1d17..9b445a2bbee94 100644 --- a/lib/private/Preview/Office.php +++ b/lib/private/Preview/Office.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Olivier Paroz * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/Preview/OpenDocument.php b/lib/private/Preview/OpenDocument.php index 0da1e88cafa3b..40971a0951be7 100644 --- a/lib/private/Preview/OpenDocument.php +++ b/lib/private/Preview/OpenDocument.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Preview/PDF.php b/lib/private/Preview/PDF.php index 6ddf33cdea260..04d7c66e59546 100644 --- a/lib/private/Preview/PDF.php +++ b/lib/private/Preview/PDF.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Preview/PNG.php b/lib/private/Preview/PNG.php index 5dd9ae484a598..cafe081818d87 100644 --- a/lib/private/Preview/PNG.php +++ b/lib/private/Preview/PNG.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Preview/Photoshop.php b/lib/private/Preview/Photoshop.php index df91247f0726b..243fd7052e50d 100644 --- a/lib/private/Preview/Photoshop.php +++ b/lib/private/Preview/Photoshop.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Preview/Postscript.php b/lib/private/Preview/Postscript.php index edfd43968c268..c20347d74ffd0 100644 --- a/lib/private/Preview/Postscript.php +++ b/lib/private/Preview/Postscript.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Preview/Provider.php b/lib/private/Preview/Provider.php index 738d13d7fc80b..5c9234fcf7848 100644 --- a/lib/private/Preview/Provider.php +++ b/lib/private/Preview/Provider.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Olivier Paroz - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Preview/SVG.php b/lib/private/Preview/SVG.php index 6618c1fbf8244..4ad274c893b10 100644 --- a/lib/private/Preview/SVG.php +++ b/lib/private/Preview/SVG.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Olivier Paroz * @author Thomas Müller * - * @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/lib/private/Preview/StarOffice.php b/lib/private/Preview/StarOffice.php index 6ea4efa514438..3537d4baddb96 100644 --- a/lib/private/Preview/StarOffice.php +++ b/lib/private/Preview/StarOffice.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Preview/TIFF.php b/lib/private/Preview/TIFF.php index 006ced6aec008..9f03e3c79f6be 100644 --- a/lib/private/Preview/TIFF.php +++ b/lib/private/Preview/TIFF.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php index a27517c9f39dd..8448991be232b 100644 --- a/lib/private/Preview/TXT.php +++ b/lib/private/Preview/TXT.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Nmz - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Preview/XBitmap.php b/lib/private/Preview/XBitmap.php index 604a51a6a8340..7a282e5d1e1a9 100644 --- a/lib/private/Preview/XBitmap.php +++ b/lib/private/Preview/XBitmap.php @@ -1,8 +1,9 @@ * - * @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/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index 43c414ccb6318..109feb45864c5 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Olivier Paroz - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/RedisFactory.php b/lib/private/RedisFactory.php index d286c0167b2de..3ba637c414229 100644 --- a/lib/private/RedisFactory.php +++ b/lib/private/RedisFactory.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 2b33dc413b429..6c1eef5b9f66f 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -1,15 +1,17 @@ * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Repair/AssetCache.php b/lib/private/Repair/AssetCache.php index 84c22d4d8a240..74eb9c5198685 100644 --- a/lib/private/Repair/AssetCache.php +++ b/lib/private/Repair/AssetCache.php @@ -1,10 +1,12 @@ * @author Morris Jobke + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/Repair/AvatarPermissions.php b/lib/private/Repair/AvatarPermissions.php index d23479f5ba8f9..9d75062358cdf 100644 --- a/lib/private/Repair/AvatarPermissions.php +++ b/lib/private/Repair/AvatarPermissions.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Repair/CleanTags.php b/lib/private/Repair/CleanTags.php index 4241fa6da3aa6..8b62395a50143 100644 --- a/lib/private/Repair/CleanTags.php +++ b/lib/private/Repair/CleanTags.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php index 4890382e4d2e8..74c4ca2e6acd8 100644 --- a/lib/private/Repair/Collation.php +++ b/lib/private/Repair/Collation.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Repair/DropOldJobs.php b/lib/private/Repair/DropOldJobs.php index d8dbcdaad1719..126df9e940fbd 100644 --- a/lib/private/Repair/DropOldJobs.php +++ b/lib/private/Repair/DropOldJobs.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Repair/DropOldTables.php b/lib/private/Repair/DropOldTables.php index bd43ba09d482d..dfc3f757ea885 100644 --- a/lib/private/Repair/DropOldTables.php +++ b/lib/private/Repair/DropOldTables.php @@ -1,10 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Florian Preinstorfer + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Repair/FillETags.php b/lib/private/Repair/FillETags.php index 7ed55f20ac185..2954c0eaa636c 100644 --- a/lib/private/Repair/FillETags.php +++ b/lib/private/Repair/FillETags.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Repair/InnoDB.php b/lib/private/Repair/InnoDB.php index 7c3014313d8db..174cc3344829e 100644 --- a/lib/private/Repair/InnoDB.php +++ b/lib/private/Repair/InnoDB.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Repair/OldGroupMembershipShares.php b/lib/private/Repair/OldGroupMembershipShares.php index bc88d9d70656d..ea0256f64b820 100644 --- a/lib/private/Repair/OldGroupMembershipShares.php +++ b/lib/private/Repair/OldGroupMembershipShares.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/private/Repair/Preview.php b/lib/private/Repair/Preview.php index d70d82e5d6ad5..8391c3bf726a3 100644 --- a/lib/private/Repair/Preview.php +++ b/lib/private/Repair/Preview.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Repair/RemoveGetETagEntries.php b/lib/private/Repair/RemoveGetETagEntries.php index 4ea4398fbad70..d701a8f26de23 100644 --- a/lib/private/Repair/RemoveGetETagEntries.php +++ b/lib/private/Repair/RemoveGetETagEntries.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Repair/RemoveOldShares.php b/lib/private/Repair/RemoveOldShares.php index 2c05d97b15c13..32a17189fbff2 100644 --- a/lib/private/Repair/RemoveOldShares.php +++ b/lib/private/Repair/RemoveOldShares.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Repair/RemoveRootShares.php b/lib/private/Repair/RemoveRootShares.php index 89f797e3ef080..1fd7d8d7dae9e 100644 --- a/lib/private/Repair/RemoveRootShares.php +++ b/lib/private/Repair/RemoveRootShares.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php index 728632486d013..6cb690057bb3a 100644 --- a/lib/private/Repair/RepairInvalidShares.php +++ b/lib/private/Repair/RepairInvalidShares.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Repair/RepairLegacyStorages.php b/lib/private/Repair/RepairLegacyStorages.php index 096300f51c240..8bb4eb5017ff4 100644 --- a/lib/private/Repair/RepairLegacyStorages.php +++ b/lib/private/Repair/RepairLegacyStorages.php @@ -1,11 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Aaron Wood + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index 7c8fe16205060..86427af4c4742 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -1,16 +1,17 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Normal Ra * @author Olivier Paroz - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/lib/private/Repair/SearchLuceneTables.php b/lib/private/Repair/SearchLuceneTables.php index ce12b896c6f02..0a06371ce9004 100644 --- a/lib/private/Repair/SearchLuceneTables.php +++ b/lib/private/Repair/SearchLuceneTables.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Repair/SharePropagation.php b/lib/private/Repair/SharePropagation.php index 03c32bb6748fe..c0cca3bd1ad8c 100644 --- a/lib/private/Repair/SharePropagation.php +++ b/lib/private/Repair/SharePropagation.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Repair/SqliteAutoincrement.php b/lib/private/Repair/SqliteAutoincrement.php index 1f13f43b4d973..814f955dc700d 100644 --- a/lib/private/Repair/SqliteAutoincrement.php +++ b/lib/private/Repair/SqliteAutoincrement.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/lib/private/Repair/UpdateCertificateStore.php b/lib/private/Repair/UpdateCertificateStore.php index 9416b1f63865b..a3313d5c23eb5 100644 --- a/lib/private/Repair/UpdateCertificateStore.php +++ b/lib/private/Repair/UpdateCertificateStore.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/Repair/UpdateOutdatedOcsIds.php b/lib/private/Repair/UpdateOutdatedOcsIds.php index 00cfed3f345fc..6f4f2447e94e2 100644 --- a/lib/private/Repair/UpdateOutdatedOcsIds.php +++ b/lib/private/Repair/UpdateOutdatedOcsIds.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/RepairException.php b/lib/private/RepairException.php index e244f2bb820f4..a69bb5a19b94f 100644 --- a/lib/private/RepairException.php +++ b/lib/private/RepairException.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/lib/private/Route/CachingRouter.php b/lib/private/Route/CachingRouter.php index 6f1fc18138be5..355f9e80c3f4b 100644 --- a/lib/private/Route/CachingRouter.php +++ b/lib/private/Route/CachingRouter.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Route/Route.php b/lib/private/Route/Route.php index 966790a63c0bf..3a953af901143 100644 --- a/lib/private/Route/Route.php +++ b/lib/private/Route/Route.php @@ -1,14 +1,15 @@ * @author David Prévot * @author Felix Moeller * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Tanghus * - * @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/lib/private/Route/Router.php b/lib/private/Route/Router.php index f7da827c3db5a..ac42c4025c20c 100644 --- a/lib/private/Route/Router.php +++ b/lib/private/Route/Router.php @@ -1,18 +1,19 @@ * @author Bernhard Posselt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Search.php b/lib/private/Search.php index 7d1e27341959f..17958c8e08e14 100644 --- a/lib/private/Search.php +++ b/lib/private/Search.php @@ -1,12 +1,13 @@ * @author Bart Visscher * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Search/Provider/File.php b/lib/private/Search/Provider/File.php index 69ffbd3ae6bef..ddb05c759eaa4 100644 --- a/lib/private/Search/Provider/File.php +++ b/lib/private/Search/Provider/File.php @@ -1,12 +1,13 @@ * @author Bart Visscher * @author Jakob Sack * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/private/Search/Result/Audio.php b/lib/private/Search/Result/Audio.php index 3f9b3dc640cb0..59456d003bb20 100644 --- a/lib/private/Search/Result/Audio.php +++ b/lib/private/Search/Result/Audio.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/private/Search/Result/File.php b/lib/private/Search/Result/File.php index 1d783a7aa9bb2..eb4750d8de396 100644 --- a/lib/private/Search/Result/File.php +++ b/lib/private/Search/Result/File.php @@ -1,11 +1,12 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/private/Search/Result/Folder.php b/lib/private/Search/Result/Folder.php index 6f0c0a7b2a545..c9cab28293ea4 100644 --- a/lib/private/Search/Result/Folder.php +++ b/lib/private/Search/Result/Folder.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/private/Search/Result/Image.php b/lib/private/Search/Result/Image.php index 87b36fc9f73f1..c052783d80097 100644 --- a/lib/private/Search/Result/Image.php +++ b/lib/private/Search/Result/Image.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/private/Security/Bruteforce/Throttler.php b/lib/private/Security/Bruteforce/Throttler.php index 0de7677285b97..11a343918c647 100644 --- a/lib/private/Security/Bruteforce/Throttler.php +++ b/lib/private/Security/Bruteforce/Throttler.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Lukas Reschke * + * @author Lukas Reschke + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/lib/private/Security/CSP/ContentSecurityPolicy.php b/lib/private/Security/CSP/ContentSecurityPolicy.php index 902647c26de6b..47314609498ed 100644 --- a/lib/private/Security/CSP/ContentSecurityPolicy.php +++ b/lib/private/Security/CSP/ContentSecurityPolicy.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Security/CSP/ContentSecurityPolicyManager.php b/lib/private/Security/CSP/ContentSecurityPolicyManager.php index af1e19fc16649..0e6f0ac615246 100644 --- a/lib/private/Security/CSP/ContentSecurityPolicyManager.php +++ b/lib/private/Security/CSP/ContentSecurityPolicyManager.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Security/CSRF/CsrfToken.php b/lib/private/Security/CSRF/CsrfToken.php index 9d4e4483ac4cd..bf61e339f7717 100644 --- a/lib/private/Security/CSRF/CsrfToken.php +++ b/lib/private/Security/CSRF/CsrfToken.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Security/CSRF/CsrfTokenGenerator.php b/lib/private/Security/CSRF/CsrfTokenGenerator.php index f49b2120b96f3..85207956e1a30 100644 --- a/lib/private/Security/CSRF/CsrfTokenGenerator.php +++ b/lib/private/Security/CSRF/CsrfTokenGenerator.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Security/CSRF/CsrfTokenManager.php b/lib/private/Security/CSRF/CsrfTokenManager.php index 83d995b310d8d..d621cc2c29f66 100644 --- a/lib/private/Security/CSRF/CsrfTokenManager.php +++ b/lib/private/Security/CSRF/CsrfTokenManager.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Security/CSRF/TokenStorage/SessionStorage.php b/lib/private/Security/CSRF/TokenStorage/SessionStorage.php index 2dbdf5634e9f0..cf4cdfa503619 100644 --- a/lib/private/Security/CSRF/TokenStorage/SessionStorage.php +++ b/lib/private/Security/CSRF/TokenStorage/SessionStorage.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Security/Certificate.php b/lib/private/Security/Certificate.php index 9a09f3ad8b50f..0bc568113126f 100644 --- a/lib/private/Security/Certificate.php +++ b/lib/private/Security/Certificate.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Security/CertificateManager.php b/lib/private/Security/CertificateManager.php index 1639df01a2170..f7bf0df58c5ff 100644 --- a/lib/private/Security/CertificateManager.php +++ b/lib/private/Security/CertificateManager.php @@ -1,12 +1,14 @@ * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Security/CredentialsManager.php b/lib/private/Security/CredentialsManager.php index d4104dbe71272..44f3d32ea9315 100644 --- a/lib/private/Security/CredentialsManager.php +++ b/lib/private/Security/CredentialsManager.php @@ -1,8 +1,9 @@ * - * @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/lib/private/Security/Crypto.php b/lib/private/Security/Crypto.php index c9f2afabf4de7..176faf68e2d27 100644 --- a/lib/private/Security/Crypto.php +++ b/lib/private/Security/Crypto.php @@ -1,11 +1,12 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/Security/Hasher.php b/lib/private/Security/Hasher.php index 674fd269c2271..3bc546fa0a235 100644 --- a/lib/private/Security/Hasher.php +++ b/lib/private/Security/Hasher.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/private/Security/SecureRandom.php b/lib/private/Security/SecureRandom.php index ad37826fbfc33..884ee842b9d75 100644 --- a/lib/private/Security/SecureRandom.php +++ b/lib/private/Security/SecureRandom.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/private/Security/TrustedDomainHelper.php b/lib/private/Security/TrustedDomainHelper.php index cf4def63dd3e1..a8cbdb6ee6cf9 100644 --- a/lib/private/Security/TrustedDomainHelper.php +++ b/lib/private/Security/TrustedDomainHelper.php @@ -1,9 +1,11 @@ * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/private/Server.php b/lib/private/Server.php index 6ffdeb9211eb5..de2970d9bfadf 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1,25 +1,27 @@ * @author Bart Visscher * @author Bernhard Posselt * @author Bernhard Reiter + * @author Bjoern Schiessle * @author Björn Schießle - * @author Christoph Wurst * @author Christopher Schäpers - * @author Joas Schilling + * @author Christoph Wurst + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sander * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/ServerContainer.php b/lib/private/ServerContainer.php index d297c9fd39c69..1bab2587e8d74 100644 --- a/lib/private/ServerContainer.php +++ b/lib/private/ServerContainer.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/ServerNotAvailableException.php b/lib/private/ServerNotAvailableException.php index f4b5f4f8cf3cd..d9abc82991c15 100644 --- a/lib/private/ServerNotAvailableException.php +++ b/lib/private/ServerNotAvailableException.php @@ -1,8 +1,9 @@ * - * @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/lib/private/ServiceUnavailableException.php b/lib/private/ServiceUnavailableException.php index fb4920b360728..2f7eeeda39b53 100644 --- a/lib/private/ServiceUnavailableException.php +++ b/lib/private/ServiceUnavailableException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/Session/CryptoSessionData.php b/lib/private/Session/CryptoSessionData.php index 8bd254513e37e..58020edf66d62 100644 --- a/lib/private/Session/CryptoSessionData.php +++ b/lib/private/Session/CryptoSessionData.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * - * @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/lib/private/Session/CryptoWrapper.php b/lib/private/Session/CryptoWrapper.php index 87c2d43b6b20e..67a673cb3097c 100644 --- a/lib/private/Session/CryptoWrapper.php +++ b/lib/private/Session/CryptoWrapper.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Phil Davis - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/Session/Internal.php b/lib/private/Session/Internal.php index 2a8dbb4b59cda..22878154c0530 100644 --- a/lib/private/Session/Internal.php +++ b/lib/private/Session/Internal.php @@ -1,14 +1,15 @@ * @author Christoph Wurst * @author Lukas Reschke * @author Morris Jobke * @author Phil Davis - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Session/Memory.php b/lib/private/Session/Memory.php index fac907d8035cf..22d6ffa0110b9 100644 --- a/lib/private/Session/Memory.php +++ b/lib/private/Session/Memory.php @@ -1,13 +1,14 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Session/Session.php b/lib/private/Session/Session.php index 198d00499567d..49afc5643062e 100644 --- a/lib/private/Session/Session.php +++ b/lib/private/Session/Session.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/Setup.php b/lib/private/Setup.php index 4a81bb31516df..3b3a57c3e965f 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -1,5 +1,7 @@ * @author Arthur Schiwon * @author Bart Visscher @@ -8,18 +10,17 @@ * @author Christoph Wurst * @author François Kubler * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Martin Mattel * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Sean Comeau * @author Serge Martin * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 8dee96b1ba5b0..65f6a8c5b7c0d 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -1,11 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Manish Bisht + * @author Robin Appelman * @author Thomas Müller + * @author Thomas Pulzer * - * @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/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 03a1421f428ef..817a6060608ff 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Michael Göhler * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Stefan Weil * @author Thomas Müller * - * @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/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php index 2366a014c53d4..2a20cfa83605f 100644 --- a/lib/private/Setup/OCI.php +++ b/lib/private/Setup/OCI.php @@ -1,16 +1,18 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Manish Bisht * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller + * @author Thomas Pulzer * @author Victor Dubiniuk * - * @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/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index b4b0ebeb299c5..3647d5bdcec97 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -1,14 +1,15 @@ * @author eduardo - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Roeland Jago Douma - * @author Stefan Weil + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/Setup/Sqlite.php b/lib/private/Setup/Sqlite.php index 61bc501fd75a3..63b970be42e58 100644 --- a/lib/private/Setup/Sqlite.php +++ b/lib/private/Setup/Sqlite.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/private/Share/Constants.php b/lib/private/Share/Constants.php index 3308166800380..13a5a044e8a32 100644 --- a/lib/private/Share/Constants.php +++ b/lib/private/Share/Constants.php @@ -1,10 +1,11 @@ * @author Christopher Schäpers * @author Morris Jobke * - * @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/lib/private/Share/Helper.php b/lib/private/Share/Helper.php index 7dc8cd12cd5d8..20aaa7937280f 100644 --- a/lib/private/Share/Helper.php +++ b/lib/private/Share/Helper.php @@ -1,15 +1,16 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Miguel Prokop * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Share/MailNotifications.php b/lib/private/Share/MailNotifications.php index 31f2c78a05300..aaecd5353e593 100644 --- a/lib/private/Share/MailNotifications.php +++ b/lib/private/Share/MailNotifications.php @@ -1,16 +1,17 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author scolebrook * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/Share/SearchResultSorter.php b/lib/private/Share/SearchResultSorter.php index 4a50466b08525..da63dd33b8ec9 100644 --- a/lib/private/Share/SearchResultSorter.php +++ b/lib/private/Share/SearchResultSorter.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Robin McCorkell * - * @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/lib/private/Share/Share.php b/lib/private/Share/Share.php index bcda779e73391..fdc5818dbf72c 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -1,27 +1,29 @@ * @author Bart Visscher * @author Bernhard Reiter * @author Björn Schießle - * @author Christoph Wurst * @author Christopher Schäpers + * @author Christoph Wurst * @author Daniel Hansson - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Kuhn * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sebastian Döll * @author Stefan Weil * @author Thomas Müller + * @author Torben Dannhauer * @author Vincent Petry * @author Volkan Gezer * - * @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/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index aa8f1729a9d90..f33c297b02deb 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1,10 +1,11 @@ - * @author Joas Schilling - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Roeland Jago Douma * - * @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/lib/private/Share20/Exception/BackendError.php b/lib/private/Share20/Exception/BackendError.php index f15dea4a243c8..10dae34cc3434 100644 --- a/lib/private/Share20/Exception/BackendError.php +++ b/lib/private/Share20/Exception/BackendError.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Share20/Exception/InvalidShare.php b/lib/private/Share20/Exception/InvalidShare.php index c176e4424bad6..1e7337b041813 100644 --- a/lib/private/Share20/Exception/InvalidShare.php +++ b/lib/private/Share20/Exception/InvalidShare.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Share20/Exception/ProviderException.php b/lib/private/Share20/Exception/ProviderException.php index a14d526658130..f7ada6d48fdfc 100644 --- a/lib/private/Share20/Exception/ProviderException.php +++ b/lib/private/Share20/Exception/ProviderException.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php index f29114a1b5d7d..4519b709a8c87 100644 --- a/lib/private/Share20/Hooks.php +++ b/lib/private/Share20/Hooks.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 9383255bc734b..b4fe69a83e271 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1,11 +1,14 @@ + * @author Bjoern Schiessle * @author Björn Schießle - * @author Joas Schilling - * @author Roeland Jago Douma + * @author Joas Schilling + * @author Roeland Jago Douma + * @author Vincent Petry * - * @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/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index 78d2cbf7e4cc1..e3de10a8aeee9 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -1,10 +1,11 @@ * @author Lukas Reschke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/Share20/Share.php b/lib/private/Share20/Share.php index 87001146796e4..c565809c07889 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/Streamer.php b/lib/private/Streamer.php index 23c191b68dadf..75877ab166a9c 100644 --- a/lib/private/Streamer.php +++ b/lib/private/Streamer.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * @author Victor Dubiniuk * - * @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/lib/private/SubAdmin.php b/lib/private/SubAdmin.php index 68e0e799d50b8..9a2beed09fe5c 100644 --- a/lib/private/SubAdmin.php +++ b/lib/private/SubAdmin.php @@ -1,13 +1,14 @@ * @author Bart Visscher * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/SystemConfig.php b/lib/private/SystemConfig.php index 4d9882c953898..1029a6619ffd2 100644 --- a/lib/private/SystemConfig.php +++ b/lib/private/SystemConfig.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/SystemTag/ManagerFactory.php b/lib/private/SystemTag/ManagerFactory.php index 6b238e3c428d4..12af2523f473b 100644 --- a/lib/private/SystemTag/ManagerFactory.php +++ b/lib/private/SystemTag/ManagerFactory.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/lib/private/SystemTag/SystemTag.php b/lib/private/SystemTag/SystemTag.php index 559b6fdefa8a6..15eb15efd9e97 100644 --- a/lib/private/SystemTag/SystemTag.php +++ b/lib/private/SystemTag/SystemTag.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php index 7055fafbf2482..7c21c0e004eab 100644 --- a/lib/private/SystemTag/SystemTagManager.php +++ b/lib/private/SystemTag/SystemTagManager.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/lib/private/SystemTag/SystemTagObjectMapper.php b/lib/private/SystemTag/SystemTagObjectMapper.php index 412842b69e32d..e562a2dfd4b7a 100644 --- a/lib/private/SystemTag/SystemTagObjectMapper.php +++ b/lib/private/SystemTag/SystemTagObjectMapper.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/lib/private/TagManager.php b/lib/private/TagManager.php index a9e1cdfe0760f..0ee6274cbf676 100644 --- a/lib/private/TagManager.php +++ b/lib/private/TagManager.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/Tagging/Tag.php b/lib/private/Tagging/Tag.php index e35ac433e00d3..de5ab0a485c9f 100644 --- a/lib/private/Tagging/Tag.php +++ b/lib/private/Tagging/Tag.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/private/Tagging/TagMapper.php b/lib/private/Tagging/TagMapper.php index 364dbc99b4d27..d52a3f3eb8330 100644 --- a/lib/private/Tagging/TagMapper.php +++ b/lib/private/Tagging/TagMapper.php @@ -1,10 +1,11 @@ * @author Bernhard Reiter * @author Morris Jobke * - * @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/lib/private/Tags.php b/lib/private/Tags.php index cf39a9a9759f3..3ec1af00e3f4e 100644 --- a/lib/private/Tags.php +++ b/lib/private/Tags.php @@ -1,17 +1,18 @@ * @author derkostka - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/TempManager.php b/lib/private/TempManager.php index 4e361147fef46..4dfcbe7f5230b 100644 --- a/lib/private/TempManager.php +++ b/lib/private/TempManager.php @@ -1,15 +1,16 @@ * @author Lukas Reschke * @author Martin Mattel * @author Morris Jobke * @author Olivier Paroz - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Stefan Weil * - * @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/lib/private/Template/Base.php b/lib/private/Template/Base.php index d078a4eafd853..6af679f0a6617 100644 --- a/lib/private/Template/Base.php +++ b/lib/private/Template/Base.php @@ -1,5 +1,7 @@ * @author Björn Schießle * @author Christopher Schäpers @@ -8,7 +10,6 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 6a547931ee362..ffeaf765ff546 100644 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index 6ea7b6291c0ac..724f49965b389 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/Template/ResourceLocator.php b/lib/private/Template/ResourceLocator.php index e64fce81afc86..420317d27ac8a 100644 --- a/lib/private/Template/ResourceLocator.php +++ b/lib/private/Template/ResourceLocator.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Robin McCorkell * - * @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/lib/private/Template/ResourceNotFoundException.php b/lib/private/Template/ResourceNotFoundException.php index 8c7f1f1417538..0ddb0a479b60e 100644 --- a/lib/private/Template/ResourceNotFoundException.php +++ b/lib/private/Template/ResourceNotFoundException.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/private/Template/TemplateFileLocator.php b/lib/private/Template/TemplateFileLocator.php index f855315691495..3f62bc517cd50 100644 --- a/lib/private/Template/TemplateFileLocator.php +++ b/lib/private/Template/TemplateFileLocator.php @@ -1,11 +1,12 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 4255c8998f6b7..9e3bbf8847034 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -1,23 +1,23 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Bart Visscher * @author Christopher Schäpers * @author Clark Tomlinson * @author Hendrik Leppelsack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke * @author Remco Brenninkmeijer - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Victor Dubiniuk * - * @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/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index c7b2b222faf95..0f3c60b132325 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -1,17 +1,18 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author mmccarn * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/Updater.php b/lib/private/Updater.php index 229f1123aa8e9..0a6d9c9a31d8e 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -1,17 +1,18 @@ * @author Frank Karlitschek - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Steffen Lindner * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index 2d07677323afe..d240687f9bd28 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/private/User/Backend.php b/lib/private/User/Backend.php index 2838905585548..da86a4b0534ea 100644 --- a/lib/private/User/Backend.php +++ b/lib/private/User/Backend.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index 85cbddca35929..354609d0a988f 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -1,25 +1,27 @@ * @author Aldo "xoen" Giambelluca * @author Arthur Schiwon * @author Bart Visscher + * @author Bjoern Schiessle * @author Björn Schießle * @author fabian * @author Georg Ehrke * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke * @author nishiki - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/User/LoginException.php b/lib/private/User/LoginException.php index 84426f7f5da16..9019075fcd491 100644 --- a/lib/private/User/LoginException.php +++ b/lib/private/User/LoginException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/private/User/Manager.php b/lib/private/User/Manager.php index 055f428bb1756..eb2f1ce1da362 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -1,19 +1,20 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael U * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Chan * @author Volkan Gezer * - * @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/lib/private/User/NoUserException.php b/lib/private/User/NoUserException.php index afd5c729fcf06..a80bf7dc54b56 100644 --- a/lib/private/User/NoUserException.php +++ b/lib/private/User/NoUserException.php @@ -1,8 +1,9 @@ * - * @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/lib/private/User/Session.php b/lib/private/User/Session.php index 8d12982dd1a66..3db6cd1a11aa2 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -1,17 +1,18 @@ * @author Bernhard Posselt * @author Christoph Wurst * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/User/User.php b/lib/private/User/User.php index a48941ea2c089..4d403535bf306 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -1,16 +1,17 @@ * @author Bart Visscher * @author Björn Schießle * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/legacy/api.php b/lib/private/legacy/api.php index 88eb7b09a789a..c1991a6b9de69 100644 --- a/lib/private/legacy/api.php +++ b/lib/private/legacy/api.php @@ -1,21 +1,22 @@ * @author Bernhard Posselt * @author Björn Schießle * @author Christoph Wurst - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * @author Vincent Petry * - * @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/lib/private/legacy/app.php b/lib/private/legacy/app.php index 9753e2efd506a..4cfa68cff2d36 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Bernhard Posselt @@ -12,23 +14,23 @@ * @author Georg Ehrke * @author Jakob Sack * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Kamil Domanski + * @author Klaas Freitag * @author Lukas Reschke * @author Markus Goetz * @author Morris Jobke * @author RealRancor - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sam Tuke * @author Thomas Müller * @author Thomas Tanghus * @author Tom Needham * @author Vincent Petry * - * @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/lib/private/legacy/db.php b/lib/private/legacy/db.php index 5d61231291986..2d48e830ec296 100644 --- a/lib/private/legacy/db.php +++ b/lib/private/legacy/db.php @@ -1,15 +1,16 @@ * @author Bart Visscher - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/legacy/db/statementwrapper.php b/lib/private/legacy/db/statementwrapper.php index 20dce846c6b61..0c3a6ea62a274 100644 --- a/lib/private/legacy/db/statementwrapper.php +++ b/lib/private/legacy/db/statementwrapper.php @@ -1,14 +1,15 @@ * @author Bart Visscher * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php index 58aa4e1106193..38bbaa8daa160 100644 --- a/lib/private/legacy/defaults.php +++ b/lib/private/legacy/defaults.php @@ -1,18 +1,19 @@ * @author Jan-Christoph Borchardt * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Pascal de Bruijn - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author scolebrook * @author Thomas Müller * @author Volkan Gezer * - * @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/lib/private/legacy/eventsource.php b/lib/private/legacy/eventsource.php index 70e9847d23739..6211d8514269d 100644 --- a/lib/private/legacy/eventsource.php +++ b/lib/private/legacy/eventsource.php @@ -1,14 +1,15 @@ * @author Felix Moeller * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/legacy/filechunking.php b/lib/private/legacy/filechunking.php index eac1d2c9ec409..5b48271787e48 100644 --- a/lib/private/legacy/filechunking.php +++ b/lib/private/legacy/filechunking.php @@ -1,16 +1,17 @@ * @author Felix Moeller * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/legacy/files.php b/lib/private/legacy/files.php index cb8dc35aa5c15..064fa9e1d7abd 100644 --- a/lib/private/legacy/files.php +++ b/lib/private/legacy/files.php @@ -1,25 +1,26 @@ * @author Bart Visscher * @author Björn Schießle * @author Clark Tomlinson * @author Frank Karlitschek * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski * @author Nicolai Ehemann * @author Piotr Filiciak - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thibaut GRIDEL * @author Thomas Müller * @author Victor Dubiniuk * @author Vincent Petry * - * @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/lib/private/legacy/group.php b/lib/private/legacy/group.php index 361d9ff846cad..6b58cb4c834f7 100644 --- a/lib/private/legacy/group.php +++ b/lib/private/legacy/group.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Björn Schießle @@ -11,12 +13,11 @@ * @author Michael Gapczynski * @author Morris Jobke * @author Qingping Hou - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/legacy/group/backend.php b/lib/private/legacy/group/backend.php index 970468a58fac7..534004c97e965 100644 --- a/lib/private/legacy/group/backend.php +++ b/lib/private/legacy/group/backend.php @@ -1,14 +1,15 @@ * @author Bart Visscher * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/lib/private/legacy/group/database.php b/lib/private/legacy/group/database.php index de9b18a6ca32b..ddf9d29037e7f 100644 --- a/lib/private/legacy/group/database.php +++ b/lib/private/legacy/group/database.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/private/legacy/group/example.php b/lib/private/legacy/group/example.php index c519af9cd87b8..c800c54b8a0c1 100644 --- a/lib/private/legacy/group/example.php +++ b/lib/private/legacy/group/example.php @@ -1,14 +1,15 @@ * @author Felix Moeller * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/private/legacy/group/interface.php b/lib/private/legacy/group/interface.php index 33e299e5f65b5..c3563b157760d 100644 --- a/lib/private/legacy/group/interface.php +++ b/lib/private/legacy/group/interface.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 06cffe80837c2..62814e495d5d8 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Björn Schießle @@ -10,22 +12,21 @@ * @author Georg Ehrke * @author Jakob Sack * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke * @author Olivier Paroz * @author Pellaeon Lin - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Simon Könnecke * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/legacy/hook.php b/lib/private/legacy/hook.php index a2b568c1bd62d..f78fe134a0fc1 100644 --- a/lib/private/legacy/hook.php +++ b/lib/private/legacy/hook.php @@ -1,17 +1,18 @@ * @author Jakob Sack * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Sam Tuke * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/legacy/image.php b/lib/private/legacy/image.php index 313b781f0d322..2c20daf5d44cc 100644 --- a/lib/private/legacy/image.php +++ b/lib/private/legacy/image.php @@ -1,24 +1,25 @@ - * @author Bart Visscher * @author Bartek Przybylski + * @author Bart Visscher * @author Björn Schießle * @author Byron Marohn * @author Christopher Schäpers * @author Georg Ehrke * @author j-ed - * @author Joas Schilling + * @author Joas Schilling * @author Johannes Willnecker * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Olivier Paroz - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/legacy/json.php b/lib/private/legacy/json.php index 557e1d7701203..2882ac94ea920 100644 --- a/lib/private/legacy/json.php +++ b/lib/private/legacy/json.php @@ -1,17 +1,19 @@ * @author Bernhard Posselt + * @author Christoph Wurst * @author Felix Moeller * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/private/legacy/l10n.php b/lib/private/legacy/l10n.php index d5bd58c483afc..94eff197ab610 100644 --- a/lib/private/legacy/l10n.php +++ b/lib/private/legacy/l10n.php @@ -1,18 +1,19 @@ * @author Bernhard Posselt * @author Jakob Sack * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/private/legacy/l10n/string.php b/lib/private/legacy/l10n/string.php index 9c93b8c5a64a6..3d9d72e06902a 100644 --- a/lib/private/legacy/l10n/string.php +++ b/lib/private/legacy/l10n/string.php @@ -1,14 +1,15 @@ * @author Bernhard Posselt * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Thomas Müller * - * @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/lib/private/legacy/ocs.php b/lib/private/legacy/ocs.php index cc3599f6325ce..2ed17e7dae0f4 100644 --- a/lib/private/legacy/ocs.php +++ b/lib/private/legacy/ocs.php @@ -1,13 +1,14 @@ * @author Frank Karlitschek * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/private/legacy/ocs/cloud.php b/lib/private/legacy/ocs/cloud.php index fb55543358323..11152958301c3 100644 --- a/lib/private/legacy/ocs/cloud.php +++ b/lib/private/legacy/ocs/cloud.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/legacy/ocs/config.php b/lib/private/legacy/ocs/config.php index 5b8e054fbe1ea..dba9a061bb7e3 100644 --- a/lib/private/legacy/ocs/config.php +++ b/lib/private/legacy/ocs/config.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/legacy/ocs/person.php b/lib/private/legacy/ocs/person.php index 1aae9de616af1..bd01639a73739 100644 --- a/lib/private/legacy/ocs/person.php +++ b/lib/private/legacy/ocs/person.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/legacy/ocs/privatedata.php b/lib/private/legacy/ocs/privatedata.php index 3b4b0773fe56b..3571c842b9f15 100644 --- a/lib/private/legacy/ocs/privatedata.php +++ b/lib/private/legacy/ocs/privatedata.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/legacy/ocs/result.php b/lib/private/legacy/ocs/result.php index a3726c83775d2..fd90e56c60202 100644 --- a/lib/private/legacy/ocs/result.php +++ b/lib/private/legacy/ocs/result.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/private/legacy/response.php b/lib/private/legacy/response.php index 54a9385b7a6a9..0ec27251ba5ff 100644 --- a/lib/private/legacy/response.php +++ b/lib/private/legacy/response.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Jörn Friedrich Dreyer @@ -10,7 +12,6 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/legacy/template.php b/lib/private/legacy/template.php index b42c14095b5ad..477fd624a9d9b 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -1,25 +1,24 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Bart Visscher - * @author Björn Schießle * @author Brice Maron * @author Frank Karlitschek * @author Hendrik Leppelsack * @author Individual IT Services * @author Jakob Sack * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Raghu Nayyar - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php index e3b090d1cefee..226cf04688453 100644 --- a/lib/private/legacy/template/functions.php +++ b/lib/private/legacy/template/functions.php @@ -1,17 +1,18 @@ * @author Bernhard Posselt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/lib/private/legacy/user.php b/lib/private/legacy/user.php index d4d84ed3fa2bc..af2382dbb8648 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -1,10 +1,12 @@ * @author Andreas Fischer * @author Arthur Schiwon - * @author Bart Visscher * @author Bartek Przybylski + * @author Bart Visscher * @author Björn Schießle * @author Christoph Wurst * @author Georg Ehrke @@ -12,14 +14,13 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author shkdee * @author Thomas Müller * @author Tom Needham * - * @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/lib/private/legacy/user/backend.php b/lib/private/legacy/user/backend.php index 1f3696593651c..86909c1438a3a 100644 --- a/lib/private/legacy/user/backend.php +++ b/lib/private/legacy/user/backend.php @@ -1,15 +1,16 @@ * @author Dominik Schmidt * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sam Tuke * @author Tigran Mkrtchyan * - * @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/lib/private/legacy/user/interface.php b/lib/private/legacy/user/interface.php index b9df649d0307b..e178d9c6f6832 100644 --- a/lib/private/legacy/user/interface.php +++ b/lib/private/legacy/user/interface.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/private/legacy/util.php b/lib/private/legacy/util.php index 63da546ec82a3..f3a79311a186d 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -1,5 +1,7 @@ * @author Andreas Fischer * @author Arthur Schiwon @@ -8,8 +10,8 @@ * @author Birk Borkason * @author Björn Schießle * @author Brice Maron - * @author Christoph Wurst * @author Christopher Schäpers + * @author Christoph Wurst * @author Clark Tomlinson * @author cmeh * @author Florin Peter @@ -18,7 +20,7 @@ * @author helix84 * @author Individual IT Services * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Markus Goetz @@ -26,9 +28,9 @@ * @author Marvin Thomas Rabe * @author Michael Gapczynski * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Stefan Rado * @author Stefan Weil * @author Thomas Müller @@ -37,7 +39,6 @@ * @author Vincent Petry * @author Volkan Gezer * - * @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/lib/public/API.php b/lib/public/API.php index d5c08f4334732..9a594f7688cf4 100644 --- a/lib/public/API.php +++ b/lib/public/API.php @@ -1,11 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke + * @author Roeland Jago Douma * @author Tom Needham * - * @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/lib/public/Activity/IConsumer.php b/lib/public/Activity/IConsumer.php index fc536fd0a5640..d56719c4de339 100644 --- a/lib/public/Activity/IConsumer.php +++ b/lib/public/Activity/IConsumer.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/Activity/IEvent.php b/lib/public/Activity/IEvent.php index 9b6df9126b22e..0d4966e617efb 100644 --- a/lib/public/Activity/IEvent.php +++ b/lib/public/Activity/IEvent.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Activity/IExtension.php b/lib/public/Activity/IExtension.php index cefa6861a78c8..a86837892bad0 100644 --- a/lib/public/Activity/IExtension.php +++ b/lib/public/Activity/IExtension.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/Activity/IManager.php b/lib/public/Activity/IManager.php index cbd08722410cc..c1476e1a2ae40 100644 --- a/lib/public/Activity/IManager.php +++ b/lib/public/Activity/IManager.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/App.php b/lib/public/App.php index f7915536b3ddc..06dde22b8d1f5 100644 --- a/lib/public/App.php +++ b/lib/public/App.php @@ -1,15 +1,16 @@ * @author Frank Karlitschek * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/public/App/IAppManager.php b/lib/public/App/IAppManager.php index 52cea89b708fd..44990b7c47cff 100644 --- a/lib/public/App/IAppManager.php +++ b/lib/public/App/IAppManager.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/App/ManagerEvent.php b/lib/public/App/ManagerEvent.php index be5e2bb7310fd..a70345b62fd15 100644 --- a/lib/public/App/ManagerEvent.php +++ b/lib/public/App/ManagerEvent.php @@ -1,8 +1,9 @@ * - * @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/lib/public/AppFramework/ApiController.php b/lib/public/AppFramework/ApiController.php index 5687cf6546a2f..857cb19101af7 100644 --- a/lib/public/AppFramework/ApiController.php +++ b/lib/public/AppFramework/ApiController.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Stefan Weil * - * @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/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php index 0073a077bc664..313f1e490a146 100644 --- a/lib/public/AppFramework/App.php +++ b/lib/public/AppFramework/App.php @@ -1,13 +1,14 @@ * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php index daf6018cd1261..05c2f090925c9 100644 --- a/lib/public/AppFramework/Controller.php +++ b/lib/public/AppFramework/Controller.php @@ -1,5 +1,7 @@ * @author Lukas Reschke * @author Morris Jobke @@ -7,7 +9,6 @@ * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/public/AppFramework/Db/DoesNotExistException.php b/lib/public/AppFramework/Db/DoesNotExistException.php index 9682a08d3cff3..b8adc36c7ba68 100644 --- a/lib/public/AppFramework/Db/DoesNotExistException.php +++ b/lib/public/AppFramework/Db/DoesNotExistException.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/AppFramework/Db/Entity.php b/lib/public/AppFramework/Db/Entity.php index d7db4d3c5a775..e339707d85fd9 100644 --- a/lib/public/AppFramework/Db/Entity.php +++ b/lib/public/AppFramework/Db/Entity.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/AppFramework/Db/Mapper.php b/lib/public/AppFramework/Db/Mapper.php index f47982fce185a..aa3d9cdde37cd 100644 --- a/lib/public/AppFramework/Db/Mapper.php +++ b/lib/public/AppFramework/Db/Mapper.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php b/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php index b9207051826ba..a17d95e0ef111 100644 --- a/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php +++ b/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/AppFramework/Http.php b/lib/public/AppFramework/Http.php index e0108146db736..5abd69920358b 100644 --- a/lib/public/AppFramework/Http.php +++ b/lib/public/AppFramework/Http.php @@ -1,10 +1,11 @@ * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public/AppFramework/Http/ContentSecurityPolicy.php index 689220ca1ed07..082aa0206c743 100644 --- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author sualko * - * @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/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php index 4209c86a059b4..0fc10129b8aa5 100644 --- a/lib/public/AppFramework/Http/DataDisplayResponse.php +++ b/lib/public/AppFramework/Http/DataDisplayResponse.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/public/AppFramework/Http/DataDownloadResponse.php b/lib/public/AppFramework/Http/DataDownloadResponse.php index 55ef4e6c82ccd..1107c9941e1aa 100644 --- a/lib/public/AppFramework/Http/DataDownloadResponse.php +++ b/lib/public/AppFramework/Http/DataDownloadResponse.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/AppFramework/Http/DataResponse.php b/lib/public/AppFramework/Http/DataResponse.php index 3ec4e2bdc32f2..17e6813443890 100644 --- a/lib/public/AppFramework/Http/DataResponse.php +++ b/lib/public/AppFramework/Http/DataResponse.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/AppFramework/Http/DownloadResponse.php b/lib/public/AppFramework/Http/DownloadResponse.php index af0d76951caf9..46f318d9b8277 100644 --- a/lib/public/AppFramework/Http/DownloadResponse.php +++ b/lib/public/AppFramework/Http/DownloadResponse.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php index 26d138d68d4f5..4fca1588e7fce 100644 --- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php @@ -1,8 +1,9 @@ * - * @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/lib/public/AppFramework/Http/ICallbackResponse.php b/lib/public/AppFramework/Http/ICallbackResponse.php index 57ccb8e7a6b97..4bf5ce36f7e84 100644 --- a/lib/public/AppFramework/Http/ICallbackResponse.php +++ b/lib/public/AppFramework/Http/ICallbackResponse.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/public/AppFramework/Http/IOutput.php b/lib/public/AppFramework/Http/IOutput.php index a9d7375f4b277..1544c7d6375a1 100644 --- a/lib/public/AppFramework/Http/IOutput.php +++ b/lib/public/AppFramework/Http/IOutput.php @@ -1,11 +1,12 @@ * @author Lukas Reschke * @author Morris Jobke * @author Stefan Weil * - * @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/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php index 32f2947b4be95..1b8b676e6013c 100644 --- a/lib/public/AppFramework/Http/JSONResponse.php +++ b/lib/public/AppFramework/Http/JSONResponse.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/AppFramework/Http/NotFoundResponse.php b/lib/public/AppFramework/Http/NotFoundResponse.php index 8ef966fb9ce66..26338623efe70 100644 --- a/lib/public/AppFramework/Http/NotFoundResponse.php +++ b/lib/public/AppFramework/Http/NotFoundResponse.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/AppFramework/Http/OCSResponse.php b/lib/public/AppFramework/Http/OCSResponse.php index da9de712c0ab7..0fb0f9678d061 100644 --- a/lib/public/AppFramework/Http/OCSResponse.php +++ b/lib/public/AppFramework/Http/OCSResponse.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/AppFramework/Http/RedirectResponse.php b/lib/public/AppFramework/Http/RedirectResponse.php index 97140c9955f6b..adda83c7cfa39 100644 --- a/lib/public/AppFramework/Http/RedirectResponse.php +++ b/lib/public/AppFramework/Http/RedirectResponse.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Thomas Müller * @author v1r0x * - * @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/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php index eb573507accd0..eed9aa7c1a269 100644 --- a/lib/public/AppFramework/Http/Response.php +++ b/lib/public/AppFramework/Http/Response.php @@ -1,5 +1,7 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke @@ -7,7 +9,6 @@ * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/AppFramework/Http/StreamResponse.php b/lib/public/AppFramework/Http/StreamResponse.php index 01243e15488f1..b5852fb562068 100644 --- a/lib/public/AppFramework/Http/StreamResponse.php +++ b/lib/public/AppFramework/Http/StreamResponse.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/public/AppFramework/Http/TemplateResponse.php b/lib/public/AppFramework/Http/TemplateResponse.php index 7774d881e4d75..ccb0c61bfd464 100644 --- a/lib/public/AppFramework/Http/TemplateResponse.php +++ b/lib/public/AppFramework/Http/TemplateResponse.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/AppFramework/IApi.php b/lib/public/AppFramework/IApi.php index 6661432887332..419e17826862d 100644 --- a/lib/public/AppFramework/IApi.php +++ b/lib/public/AppFramework/IApi.php @@ -1,11 +1,12 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/AppFramework/IAppContainer.php b/lib/public/AppFramework/IAppContainer.php index 905539e735eeb..2fa049d6e851c 100644 --- a/lib/public/AppFramework/IAppContainer.php +++ b/lib/public/AppFramework/IAppContainer.php @@ -1,12 +1,13 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/public/AppFramework/Middleware.php b/lib/public/AppFramework/Middleware.php index fc4c46617c2ac..75cd3beea02c6 100644 --- a/lib/public/AppFramework/Middleware.php +++ b/lib/public/AppFramework/Middleware.php @@ -1,11 +1,12 @@ * @author Stefan Weil * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/AppFramework/OCS/OCSBadRequestException.php b/lib/public/AppFramework/OCS/OCSBadRequestException.php index 0f4278fddc4f0..1b374376a75c4 100644 --- a/lib/public/AppFramework/OCS/OCSBadRequestException.php +++ b/lib/public/AppFramework/OCS/OCSBadRequestException.php @@ -1,5 +1,6 @@ * diff --git a/lib/public/AppFramework/OCS/OCSException.php b/lib/public/AppFramework/OCS/OCSException.php index f95b5a16844d1..428fcff8e1e60 100644 --- a/lib/public/AppFramework/OCS/OCSException.php +++ b/lib/public/AppFramework/OCS/OCSException.php @@ -1,5 +1,6 @@ * diff --git a/lib/public/AppFramework/OCS/OCSForbiddenException.php b/lib/public/AppFramework/OCS/OCSForbiddenException.php index 0c792722d9a4f..7eef56facf148 100644 --- a/lib/public/AppFramework/OCS/OCSForbiddenException.php +++ b/lib/public/AppFramework/OCS/OCSForbiddenException.php @@ -1,5 +1,6 @@ * diff --git a/lib/public/AppFramework/OCS/OCSNotFoundException.php b/lib/public/AppFramework/OCS/OCSNotFoundException.php index aaef36af1c73c..18951b3703573 100644 --- a/lib/public/AppFramework/OCS/OCSNotFoundException.php +++ b/lib/public/AppFramework/OCS/OCSNotFoundException.php @@ -1,5 +1,6 @@ * diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php index e118b34250d15..ee9eaae52f105 100644 --- a/lib/public/AppFramework/OCSController.php +++ b/lib/public/AppFramework/OCSController.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Stefan Weil * @author Thomas Müller * - * @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/lib/public/AppFramework/QueryException.php b/lib/public/AppFramework/QueryException.php index 62ab77dd83917..020199868a3bf 100644 --- a/lib/public/AppFramework/QueryException.php +++ b/lib/public/AppFramework/QueryException.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/AppFramework/Utility/IControllerMethodReflector.php b/lib/public/AppFramework/Utility/IControllerMethodReflector.php index e2939ff88962c..e9fb4a5a969f2 100644 --- a/lib/public/AppFramework/Utility/IControllerMethodReflector.php +++ b/lib/public/AppFramework/Utility/IControllerMethodReflector.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Olivier Paroz * - * @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/lib/public/AppFramework/Utility/ITimeFactory.php b/lib/public/AppFramework/Utility/ITimeFactory.php index a3333dd19496c..eb65abf8501d8 100644 --- a/lib/public/AppFramework/Utility/ITimeFactory.php +++ b/lib/public/AppFramework/Utility/ITimeFactory.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Authentication/IApacheBackend.php b/lib/public/Authentication/IApacheBackend.php index f1f408cfa6d19..908bc5ace3d1f 100644 --- a/lib/public/Authentication/IApacheBackend.php +++ b/lib/public/Authentication/IApacheBackend.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Authentication/TwoFactorAuth/IProvider.php b/lib/public/Authentication/TwoFactorAuth/IProvider.php index fa812d8c56d2c..51b126426c366 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvider.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvider.php @@ -1,8 +1,9 @@ * - * @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/lib/public/AutoloadNotAllowedException.php b/lib/public/AutoloadNotAllowedException.php index f0028b7d49dfd..6c7b979f2d65f 100644 --- a/lib/public/AutoloadNotAllowedException.php +++ b/lib/public/AutoloadNotAllowedException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/BackgroundJob.php b/lib/public/BackgroundJob.php index f532a97c74798..b49dd9227866b 100644 --- a/lib/public/BackgroundJob.php +++ b/lib/public/BackgroundJob.php @@ -1,15 +1,16 @@ * @author Felix Moeller * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/public/BackgroundJob/IJob.php b/lib/public/BackgroundJob/IJob.php index 71cdee6563650..05927989b6459 100644 --- a/lib/public/BackgroundJob/IJob.php +++ b/lib/public/BackgroundJob/IJob.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/BackgroundJob/IJobList.php b/lib/public/BackgroundJob/IJobList.php index 9e401e6841933..fbc4619222744 100644 --- a/lib/public/BackgroundJob/IJobList.php +++ b/lib/public/BackgroundJob/IJobList.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/public/Capabilities/ICapability.php b/lib/public/Capabilities/ICapability.php index 0facab6f2559a..2a59689665d54 100644 --- a/lib/public/Capabilities/ICapability.php +++ b/lib/public/Capabilities/ICapability.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Command/IBus.php b/lib/public/Command/IBus.php index 62b6edef4d418..bf7f98e87ac6b 100644 --- a/lib/public/Command/IBus.php +++ b/lib/public/Command/IBus.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Command/ICommand.php b/lib/public/Command/ICommand.php index e53d52d2fa362..bf7210f40cd8d 100644 --- a/lib/public/Command/ICommand.php +++ b/lib/public/Command/ICommand.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Comments/CommentsEntityEvent.php b/lib/public/Comments/CommentsEntityEvent.php index 5f012a79885bc..fe8585a213e8b 100644 --- a/lib/public/Comments/CommentsEntityEvent.php +++ b/lib/public/Comments/CommentsEntityEvent.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Comments/CommentsEvent.php b/lib/public/Comments/CommentsEvent.php index 3101c4e6c5014..a0bff349fb4ed 100644 --- a/lib/public/Comments/CommentsEvent.php +++ b/lib/public/Comments/CommentsEvent.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Comments/IComment.php b/lib/public/Comments/IComment.php index d5112dec0482d..bb997a0722388 100644 --- a/lib/public/Comments/IComment.php +++ b/lib/public/Comments/IComment.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php index d605820a3b1aa..f2edaaa5eaf77 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/public/Comments/ICommentsManagerFactory.php b/lib/public/Comments/ICommentsManagerFactory.php index 43884362817be..4a38d992bc32e 100644 --- a/lib/public/Comments/ICommentsManagerFactory.php +++ b/lib/public/Comments/ICommentsManagerFactory.php @@ -1,10 +1,11 @@ * @author Thomas Müller * @author Vincent Petry * - * @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/lib/public/Comments/IllegalIDChangeException.php b/lib/public/Comments/IllegalIDChangeException.php index 65f6fa5ec6b37..97f18fee12ecb 100644 --- a/lib/public/Comments/IllegalIDChangeException.php +++ b/lib/public/Comments/IllegalIDChangeException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Comments/MessageTooLongException.php b/lib/public/Comments/MessageTooLongException.php index 1ec4fd6ff4621..4c46ed46524b6 100644 --- a/lib/public/Comments/MessageTooLongException.php +++ b/lib/public/Comments/MessageTooLongException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Comments/NotFoundException.php b/lib/public/Comments/NotFoundException.php index ebce2c6c8e1ca..ab83e4095c26e 100644 --- a/lib/public/Comments/NotFoundException.php +++ b/lib/public/Comments/NotFoundException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Config.php b/lib/public/Config.php index 514ddbb85b30b..b8f25b93026f4 100644 --- a/lib/public/Config.php +++ b/lib/public/Config.php @@ -1,15 +1,16 @@ * @author Frank Karlitschek * @author Georg Ehrke * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/Console/ConsoleEvent.php b/lib/public/Console/ConsoleEvent.php index b3f1229f0e8df..7b3201999a350 100644 --- a/lib/public/Console/ConsoleEvent.php +++ b/lib/public/Console/ConsoleEvent.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Constants.php b/lib/public/Constants.php index abf5f95eb9652..ca4b5fa473f14 100644 --- a/lib/public/Constants.php +++ b/lib/public/Constants.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/public/Contacts.php b/lib/public/Contacts.php index 590fd9af1bdff..16cd52d19cf3b 100644 --- a/lib/public/Contacts.php +++ b/lib/public/Contacts.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index c6d557eaba723..328b40931d77c 100644 --- a/lib/public/Contacts/IManager.php +++ b/lib/public/Contacts/IManager.php @@ -1,12 +1,13 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/public/DB.php b/lib/public/DB.php index 08d8a6ec2eb15..d22da39d9c20b 100644 --- a/lib/public/DB.php +++ b/lib/public/DB.php @@ -1,17 +1,18 @@ * @author Dan Bartram * @author Felix Moeller * @author Frank Karlitschek - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/DB/QueryBuilder/ICompositeExpression.php b/lib/public/DB/QueryBuilder/ICompositeExpression.php index 7060815138530..7bde808344d9b 100644 --- a/lib/public/DB/QueryBuilder/ICompositeExpression.php +++ b/lib/public/DB/QueryBuilder/ICompositeExpression.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/DB/QueryBuilder/IExpressionBuilder.php b/lib/public/DB/QueryBuilder/IExpressionBuilder.php index 0db25704dd7af..8164c738ca53b 100644 --- a/lib/public/DB/QueryBuilder/IExpressionBuilder.php +++ b/lib/public/DB/QueryBuilder/IExpressionBuilder.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/DB/QueryBuilder/ILiteral.php b/lib/public/DB/QueryBuilder/ILiteral.php index ab1cc59229a95..99b45ee7c29ad 100644 --- a/lib/public/DB/QueryBuilder/ILiteral.php +++ b/lib/public/DB/QueryBuilder/ILiteral.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/DB/QueryBuilder/IParameter.php b/lib/public/DB/QueryBuilder/IParameter.php index be141cea9a72e..c4e3fe29971d5 100644 --- a/lib/public/DB/QueryBuilder/IParameter.php +++ b/lib/public/DB/QueryBuilder/IParameter.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index 444910a9c5a3b..8ef8a96b25f1a 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/DB/QueryBuilder/IQueryFunction.php b/lib/public/DB/QueryBuilder/IQueryFunction.php index 8050bd295e436..5c3191947395c 100644 --- a/lib/public/DB/QueryBuilder/IQueryFunction.php +++ b/lib/public/DB/QueryBuilder/IQueryFunction.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/Defaults.php b/lib/public/Defaults.php index 5194484fea20d..ae873831b8b8e 100644 --- a/lib/public/Defaults.php +++ b/lib/public/Defaults.php @@ -1,11 +1,13 @@ + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author scolebrook * - * @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/lib/public/Diagnostics/IEvent.php b/lib/public/Diagnostics/IEvent.php index a3e42ee137f58..fe69d97c4c68f 100644 --- a/lib/public/Diagnostics/IEvent.php +++ b/lib/public/Diagnostics/IEvent.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Diagnostics/IEventLogger.php b/lib/public/Diagnostics/IEventLogger.php index 34e521db10cb8..517a131d43682 100644 --- a/lib/public/Diagnostics/IEventLogger.php +++ b/lib/public/Diagnostics/IEventLogger.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Diagnostics/IQuery.php b/lib/public/Diagnostics/IQuery.php index 3b4d1b4c96516..9aaf7c423b9a8 100644 --- a/lib/public/Diagnostics/IQuery.php +++ b/lib/public/Diagnostics/IQuery.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Diagnostics/IQueryLogger.php b/lib/public/Diagnostics/IQueryLogger.php index 285a85efde126..58ea78795e25b 100644 --- a/lib/public/Diagnostics/IQueryLogger.php +++ b/lib/public/Diagnostics/IQueryLogger.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Encryption/Exceptions/GenericEncryptionException.php b/lib/public/Encryption/Exceptions/GenericEncryptionException.php index 3822a0ba7d35d..ac880c4306767 100644 --- a/lib/public/Encryption/Exceptions/GenericEncryptionException.php +++ b/lib/public/Encryption/Exceptions/GenericEncryptionException.php @@ -1,12 +1,13 @@ * @author Clark Tomlinson * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/Encryption/IEncryptionModule.php b/lib/public/Encryption/IEncryptionModule.php index 57a1baa0c1c3f..6be9763c9c8a5 100644 --- a/lib/public/Encryption/IEncryptionModule.php +++ b/lib/public/Encryption/IEncryptionModule.php @@ -1,11 +1,12 @@ * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/Encryption/IFile.php b/lib/public/Encryption/IFile.php index dd1d8161f6950..ffb2611bada63 100644 --- a/lib/public/Encryption/IFile.php +++ b/lib/public/Encryption/IFile.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/Encryption/IManager.php b/lib/public/Encryption/IManager.php index a6eb06a34eb52..b32ccf03eb685 100644 --- a/lib/public/Encryption/IManager.php +++ b/lib/public/Encryption/IManager.php @@ -1,10 +1,11 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/Encryption/Keys/IStorage.php b/lib/public/Encryption/Keys/IStorage.php index 9c2322a1dd7fd..e17de04316b8f 100644 --- a/lib/public/Encryption/Keys/IStorage.php +++ b/lib/public/Encryption/Keys/IStorage.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/Files.php b/lib/public/Files.php index 0ffaec8f68180..08fcbe0bbeb9f 100644 --- a/lib/public/Files.php +++ b/lib/public/Files.php @@ -1,17 +1,18 @@ * @author Björn Schießle * @author Frank Karlitschek * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Stefan Weil * @author Thomas Müller * - * @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/lib/public/Files/AlreadyExistsException.php b/lib/public/Files/AlreadyExistsException.php index 243129cb1db28..af80195924769 100644 --- a/lib/public/Files/AlreadyExistsException.php +++ b/lib/public/Files/AlreadyExistsException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/Cache/ICache.php b/lib/public/Files/Cache/ICache.php index 4ef88f6480f6c..7d01b1a290881 100644 --- a/lib/public/Files/Cache/ICache.php +++ b/lib/public/Files/Cache/ICache.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Cache/ICacheEntry.php b/lib/public/Files/Cache/ICacheEntry.php index 00c8e201b9a7c..bbc9982935e29 100644 --- a/lib/public/Files/Cache/ICacheEntry.php +++ b/lib/public/Files/Cache/ICacheEntry.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Cache/IPropagator.php b/lib/public/Files/Cache/IPropagator.php index 541135b9e6006..301811d46349c 100644 --- a/lib/public/Files/Cache/IPropagator.php +++ b/lib/public/Files/Cache/IPropagator.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Cache/IScanner.php b/lib/public/Files/Cache/IScanner.php index 74bc2fc884369..6028299623248 100644 --- a/lib/public/Files/Cache/IScanner.php +++ b/lib/public/Files/Cache/IScanner.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Cache/IUpdater.php b/lib/public/Files/Cache/IUpdater.php index 5267aa6f023a4..0fc9e8c35e085 100644 --- a/lib/public/Files/Cache/IUpdater.php +++ b/lib/public/Files/Cache/IUpdater.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Cache/IWatcher.php b/lib/public/Files/Cache/IWatcher.php index c33129a247385..ff49616ecdc70 100644 --- a/lib/public/Files/Cache/IWatcher.php +++ b/lib/public/Files/Cache/IWatcher.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Config/ICachedMountInfo.php b/lib/public/Files/Config/ICachedMountInfo.php index 24c0965421233..2986f1d98c5e4 100644 --- a/lib/public/Files/Config/ICachedMountInfo.php +++ b/lib/public/Files/Config/ICachedMountInfo.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Config/IHomeMountProvider.php b/lib/public/Files/Config/IHomeMountProvider.php index 97747ea61d71f..615ac54c275d0 100644 --- a/lib/public/Files/Config/IHomeMountProvider.php +++ b/lib/public/Files/Config/IHomeMountProvider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Config/IMountProvider.php b/lib/public/Files/Config/IMountProvider.php index d1498fd5f6131..db2397331dcce 100644 --- a/lib/public/Files/Config/IMountProvider.php +++ b/lib/public/Files/Config/IMountProvider.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/Config/IMountProviderCollection.php b/lib/public/Files/Config/IMountProviderCollection.php index 29208cb6f5313..f0f5bf4be258f 100644 --- a/lib/public/Files/Config/IMountProviderCollection.php +++ b/lib/public/Files/Config/IMountProviderCollection.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/Config/IUserMountCache.php b/lib/public/Files/Config/IUserMountCache.php index 2f2c11da1a020..c141d019c2fd4 100644 --- a/lib/public/Files/Config/IUserMountCache.php +++ b/lib/public/Files/Config/IUserMountCache.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/EntityTooLargeException.php b/lib/public/Files/EntityTooLargeException.php index 8dabc08f8bbdd..4a74403106cea 100644 --- a/lib/public/Files/EntityTooLargeException.php +++ b/lib/public/Files/EntityTooLargeException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Files/File.php b/lib/public/Files/File.php index 553dd48c24f76..8b57b3cfd8724 100644 --- a/lib/public/Files/File.php +++ b/lib/public/Files/File.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php index a9f05863e78b8..d61726c4217aa 100644 --- a/lib/public/Files/FileInfo.php +++ b/lib/public/Files/FileInfo.php @@ -1,13 +1,14 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/public/Files/FileNameTooLongException.php b/lib/public/Files/FileNameTooLongException.php index 68fba4ad516d0..8c46b7f551969 100644 --- a/lib/public/Files/FileNameTooLongException.php +++ b/lib/public/Files/FileNameTooLongException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Files/Folder.php b/lib/public/Files/Folder.php index 0644ab6203433..9a2a338b559fd 100644 --- a/lib/public/Files/Folder.php +++ b/lib/public/Files/Folder.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/public/Files/ForbiddenException.php b/lib/public/Files/ForbiddenException.php index 5a4f03d176d41..5492b8538b463 100644 --- a/lib/public/Files/ForbiddenException.php +++ b/lib/public/Files/ForbiddenException.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/IHomeStorage.php b/lib/public/Files/IHomeStorage.php index 4101545aafe67..3144dd8bc9478 100644 --- a/lib/public/Files/IHomeStorage.php +++ b/lib/public/Files/IHomeStorage.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/Files/IMimeTypeDetector.php b/lib/public/Files/IMimeTypeDetector.php index 7d9cd606e6953..f66eb4e0b9f5d 100644 --- a/lib/public/Files/IMimeTypeDetector.php +++ b/lib/public/Files/IMimeTypeDetector.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/IMimeTypeLoader.php b/lib/public/Files/IMimeTypeLoader.php index 57a6d7ba30989..d582c55ae1386 100644 --- a/lib/public/Files/IMimeTypeLoader.php +++ b/lib/public/Files/IMimeTypeLoader.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Files/IRootFolder.php b/lib/public/Files/IRootFolder.php index 3b6243f7638f6..38e45f4967865 100644 --- a/lib/public/Files/IRootFolder.php +++ b/lib/public/Files/IRootFolder.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Files/InvalidCharacterInPathException.php b/lib/public/Files/InvalidCharacterInPathException.php index 8e649b5bb62b2..8e8f1a15e3a63 100644 --- a/lib/public/Files/InvalidCharacterInPathException.php +++ b/lib/public/Files/InvalidCharacterInPathException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Files/InvalidContentException.php b/lib/public/Files/InvalidContentException.php index f25b7fef87fb8..bdde7909b5839 100644 --- a/lib/public/Files/InvalidContentException.php +++ b/lib/public/Files/InvalidContentException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Files/InvalidPathException.php b/lib/public/Files/InvalidPathException.php index ee21d7432be23..bb8aff50913e0 100644 --- a/lib/public/Files/InvalidPathException.php +++ b/lib/public/Files/InvalidPathException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Files/LockNotAcquiredException.php b/lib/public/Files/LockNotAcquiredException.php index 247c9f5f5cbb8..1ef0e676b342b 100644 --- a/lib/public/Files/LockNotAcquiredException.php +++ b/lib/public/Files/LockNotAcquiredException.php @@ -1,10 +1,11 @@ * @author Owen Winkler - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/Mount/IMountManager.php b/lib/public/Files/Mount/IMountManager.php index 9e3002a26d153..2b6458bf7c830 100644 --- a/lib/public/Files/Mount/IMountManager.php +++ b/lib/public/Files/Mount/IMountManager.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php index 824b60a1024bf..f9a00af7cb59e 100644 --- a/lib/public/Files/Mount/IMountPoint.php +++ b/lib/public/Files/Mount/IMountPoint.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/Node.php b/lib/public/Files/Node.php index c69077c7f2ae7..59bd0e193c6a4 100644 --- a/lib/public/Files/Node.php +++ b/lib/public/Files/Node.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/NotEnoughSpaceException.php b/lib/public/Files/NotEnoughSpaceException.php index 4e67ac2670075..f4407a9578583 100644 --- a/lib/public/Files/NotEnoughSpaceException.php +++ b/lib/public/Files/NotEnoughSpaceException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/NotFoundException.php b/lib/public/Files/NotFoundException.php index 10a3dacda44fc..f0ccb90a52b45 100644 --- a/lib/public/Files/NotFoundException.php +++ b/lib/public/Files/NotFoundException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/NotPermittedException.php b/lib/public/Files/NotPermittedException.php index 3dcbd9e499ba1..516c323181b0e 100644 --- a/lib/public/Files/NotPermittedException.php +++ b/lib/public/Files/NotPermittedException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/ObjectStore/IObjectStore.php b/lib/public/Files/ObjectStore/IObjectStore.php index 78be18fb2e9fc..7ae34ce1bc0e9 100644 --- a/lib/public/Files/ObjectStore/IObjectStore.php +++ b/lib/public/Files/ObjectStore/IObjectStore.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Files/ReservedWordException.php b/lib/public/Files/ReservedWordException.php index 6a560a563feb4..67b205de57b3d 100644 --- a/lib/public/Files/ReservedWordException.php +++ b/lib/public/Files/ReservedWordException.php @@ -1,9 +1,10 @@ * @author Thomas Müller * - * @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/lib/public/Files/Storage.php b/lib/public/Files/Storage.php index 2511690b7d3e4..cf67879908c19 100644 --- a/lib/public/Files/Storage.php +++ b/lib/public/Files/Storage.php @@ -1,14 +1,15 @@ * @author Michael Roth * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/public/Files/Storage/ILockingStorage.php b/lib/public/Files/Storage/ILockingStorage.php index 7c46391f425f7..635c607537f58 100644 --- a/lib/public/Files/Storage/ILockingStorage.php +++ b/lib/public/Files/Storage/ILockingStorage.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Storage/INotifyStorage.php b/lib/public/Files/Storage/INotifyStorage.php index 0ebfd689b8780..e99124abdfdcd 100644 --- a/lib/public/Files/Storage/INotifyStorage.php +++ b/lib/public/Files/Storage/INotifyStorage.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Robin Appelman + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php index ab1915bb93ec4..b806dc3b7d124 100644 --- a/lib/public/Files/Storage/IStorage.php +++ b/lib/public/Files/Storage/IStorage.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Files/Storage/IStorageFactory.php b/lib/public/Files/Storage/IStorageFactory.php index 01a05eeff1227..668a70375cfdb 100644 --- a/lib/public/Files/Storage/IStorageFactory.php +++ b/lib/public/Files/Storage/IStorageFactory.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/public/Files/StorageAuthException.php b/lib/public/Files/StorageAuthException.php index 35a2907b856ab..f73915df9d92a 100644 --- a/lib/public/Files/StorageAuthException.php +++ b/lib/public/Files/StorageAuthException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Files/StorageBadConfigException.php b/lib/public/Files/StorageBadConfigException.php index 1c340b18b7c73..a3a96a80dc157 100644 --- a/lib/public/Files/StorageBadConfigException.php +++ b/lib/public/Files/StorageBadConfigException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Files/StorageConnectionException.php b/lib/public/Files/StorageConnectionException.php index 8938a60265cfb..7a5381aef731c 100644 --- a/lib/public/Files/StorageConnectionException.php +++ b/lib/public/Files/StorageConnectionException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Files/StorageInvalidException.php b/lib/public/Files/StorageInvalidException.php index a34ee7ae49ac3..c772a714fcdd0 100644 --- a/lib/public/Files/StorageInvalidException.php +++ b/lib/public/Files/StorageInvalidException.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Files/StorageNotAvailableException.php b/lib/public/Files/StorageNotAvailableException.php index 1ed2b1cae7542..a28a66f25102c 100644 --- a/lib/public/Files/StorageNotAvailableException.php +++ b/lib/public/Files/StorageNotAvailableException.php @@ -1,12 +1,13 @@ * @author Jesús Macias * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/public/Files/StorageTimeoutException.php b/lib/public/Files/StorageTimeoutException.php index ed4d98af89b5d..16675710dff48 100644 --- a/lib/public/Files/StorageTimeoutException.php +++ b/lib/public/Files/StorageTimeoutException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Files/UnseekableException.php b/lib/public/Files/UnseekableException.php index b59f844ce2f34..059a8d551266c 100644 --- a/lib/public/Files/UnseekableException.php +++ b/lib/public/Files/UnseekableException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/GroupInterface.php b/lib/public/GroupInterface.php index e0b18fb1e2f63..6f456f51fd788 100644 --- a/lib/public/GroupInterface.php +++ b/lib/public/GroupInterface.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/public/Http/Client/IClient.php b/lib/public/Http/Client/IClient.php index 6179208a7bd11..49e679a7ade37 100644 --- a/lib/public/Http/Client/IClient.php +++ b/lib/public/Http/Client/IClient.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Http/Client/IClientService.php b/lib/public/Http/Client/IClientService.php index d802c0a49bd01..09a1f1f7b40b9 100644 --- a/lib/public/Http/Client/IClientService.php +++ b/lib/public/Http/Client/IClientService.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Http/Client/IResponse.php b/lib/public/Http/Client/IResponse.php index 9c6c8c73e2936..94817f012b3e6 100644 --- a/lib/public/Http/Client/IResponse.php +++ b/lib/public/Http/Client/IResponse.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/IAddressBook.php b/lib/public/IAddressBook.php index 63e7e061448aa..67c34c9e8c95e 100644 --- a/lib/public/IAddressBook.php +++ b/lib/public/IAddressBook.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/public/IAppConfig.php b/lib/public/IAppConfig.php index 22fcdbbb20576..01aca47ad816f 100644 --- a/lib/public/IAppConfig.php +++ b/lib/public/IAppConfig.php @@ -1,11 +1,13 @@ + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/public/IAvatar.php b/lib/public/IAvatar.php index f243ece6774bf..369cafa00c131 100644 --- a/lib/public/IAvatar.php +++ b/lib/public/IAvatar.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/lib/public/IAvatarManager.php b/lib/public/IAvatarManager.php index 58b3073016d39..04f4cd00d0da0 100644 --- a/lib/public/IAvatarManager.php +++ b/lib/public/IAvatarManager.php @@ -1,12 +1,13 @@ * @author Christopher Schäpers * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/public/ICache.php b/lib/public/ICache.php index 0568d61d75c79..ba61100925ba5 100644 --- a/lib/public/ICache.php +++ b/lib/public/ICache.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/ICacheFactory.php b/lib/public/ICacheFactory.php index 233a4f5525da2..717fbc5e6279a 100644 --- a/lib/public/ICacheFactory.php +++ b/lib/public/ICacheFactory.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/ICertificate.php b/lib/public/ICertificate.php index c3a003fbf0a3c..fc2c0a6f1e4cc 100644 --- a/lib/public/ICertificate.php +++ b/lib/public/ICertificate.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/ICertificateManager.php b/lib/public/ICertificateManager.php index 1cd507348f641..d4564adfcd818 100644 --- a/lib/public/ICertificateManager.php +++ b/lib/public/ICertificateManager.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/IConfig.php b/lib/public/IConfig.php index 05158e9063e03..e4cd158f87209 100644 --- a/lib/public/IConfig.php +++ b/lib/public/IConfig.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/IContainer.php b/lib/public/IContainer.php index d23ee5ea3b513..9dc7f9f941e72 100644 --- a/lib/public/IContainer.php +++ b/lib/public/IContainer.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/IDBConnection.php b/lib/public/IDBConnection.php index 4ecf01ca27e23..188e715aba076 100644 --- a/lib/public/IDBConnection.php +++ b/lib/public/IDBConnection.php @@ -1,13 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/public/IDateTimeFormatter.php b/lib/public/IDateTimeFormatter.php index e8d357ae50f8e..20b01467e29a1 100644 --- a/lib/public/IDateTimeFormatter.php +++ b/lib/public/IDateTimeFormatter.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/IDateTimeZone.php b/lib/public/IDateTimeZone.php index 3df705a2413cf..5e4e930b2b168 100644 --- a/lib/public/IDateTimeZone.php +++ b/lib/public/IDateTimeZone.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/IDb.php b/lib/public/IDb.php index f21fedd1f54b7..bb04cf540fa1a 100644 --- a/lib/public/IDb.php +++ b/lib/public/IDb.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/IEventSource.php b/lib/public/IEventSource.php index b643d1c9da7d1..747c3e2453c6c 100644 --- a/lib/public/IEventSource.php +++ b/lib/public/IEventSource.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/IGroup.php b/lib/public/IGroup.php index 02f2ef201fd80..d5fcbcc5cd99f 100644 --- a/lib/public/IGroup.php +++ b/lib/public/IGroup.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/IGroupManager.php b/lib/public/IGroupManager.php index 0bd600cf258b3..4d76fa76fb3d8 100644 --- a/lib/public/IGroupManager.php +++ b/lib/public/IGroupManager.php @@ -1,14 +1,15 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/IHelper.php b/lib/public/IHelper.php index 6fbad4049df93..707884b82f89b 100644 --- a/lib/public/IHelper.php +++ b/lib/public/IHelper.php @@ -1,10 +1,11 @@ * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/public/IImage.php b/lib/public/IImage.php index db0ca0f93be14..f63a1b8ca608d 100644 --- a/lib/public/IImage.php +++ b/lib/public/IImage.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * @author Olivier Paroz * - * @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/lib/public/IL10N.php b/lib/public/IL10N.php index f1954eeb4b9ac..68bbb5a51fa73 100644 --- a/lib/public/IL10N.php +++ b/lib/public/IL10N.php @@ -1,14 +1,15 @@ * @author Bernhard Posselt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/public/ILogger.php b/lib/public/ILogger.php index fa947612fcd16..5680ec781cb93 100644 --- a/lib/public/ILogger.php +++ b/lib/public/ILogger.php @@ -1,10 +1,11 @@ * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/IMemcache.php b/lib/public/IMemcache.php index b5c0cef923dad..8f182553b676a 100644 --- a/lib/public/IMemcache.php +++ b/lib/public/IMemcache.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/IMemcacheTTL.php b/lib/public/IMemcacheTTL.php index f2d03dcdf404e..c9dbec4f5c4be 100644 --- a/lib/public/IMemcacheTTL.php +++ b/lib/public/IMemcacheTTL.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/INavigationManager.php b/lib/public/INavigationManager.php index 243f6ea3eea79..216f8a897d830 100644 --- a/lib/public/INavigationManager.php +++ b/lib/public/INavigationManager.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/IPreview.php b/lib/public/IPreview.php index cfcbebd863973..071b5b8064c2f 100644 --- a/lib/public/IPreview.php +++ b/lib/public/IPreview.php @@ -1,11 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/IRequest.php b/lib/public/IRequest.php index 46e67d1415f79..11242c481f0ef 100644 --- a/lib/public/IRequest.php +++ b/lib/public/IRequest.php @@ -1,13 +1,15 @@ + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/ISearch.php b/lib/public/ISearch.php index ec6673dabbda1..93dc3b9c1f2e6 100644 --- a/lib/public/ISearch.php +++ b/lib/public/ISearch.php @@ -1,12 +1,13 @@ * @author Bart Visscher * @author Jakob Sack * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/public/IServerContainer.php b/lib/public/IServerContainer.php index 2ec18a5462055..b736af2899a78 100644 --- a/lib/public/IServerContainer.php +++ b/lib/public/IServerContainer.php @@ -1,22 +1,23 @@ * @author Bart Visscher * @author Bernhard Posselt * @author Björn Schießle * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/public/ISession.php b/lib/public/ISession.php index 68f68dfc85de8..2d234976862d2 100644 --- a/lib/public/ISession.php +++ b/lib/public/ISession.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * @author Thomas Tanghus * - * @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/lib/public/ITagManager.php b/lib/public/ITagManager.php index e6d67ddd02c7c..60d547e44ad5b 100644 --- a/lib/public/ITagManager.php +++ b/lib/public/ITagManager.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/public/ITags.php b/lib/public/ITags.php index cbc178c37bf4e..ef9b3e8796e4c 100644 --- a/lib/public/ITags.php +++ b/lib/public/ITags.php @@ -1,11 +1,12 @@ * @author Morris Jobke * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/public/ITempManager.php b/lib/public/ITempManager.php index 025e43d8563f4..e74797516d568 100644 --- a/lib/public/ITempManager.php +++ b/lib/public/ITempManager.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/public/IURLGenerator.php b/lib/public/IURLGenerator.php index a702ca47bfcc8..e309336c0f0bb 100644 --- a/lib/public/IURLGenerator.php +++ b/lib/public/IURLGenerator.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller * - * @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/lib/public/IUser.php b/lib/public/IUser.php index 83d0bd11b55b1..13aa60b3807c5 100644 --- a/lib/public/IUser.php +++ b/lib/public/IUser.php @@ -1,12 +1,13 @@ * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/IUserBackend.php b/lib/public/IUserBackend.php index 5cd7945dd7a27..502856fc354ad 100644 --- a/lib/public/IUserBackend.php +++ b/lib/public/IUserBackend.php @@ -1,8 +1,9 @@ * - * @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/lib/public/IUserManager.php b/lib/public/IUserManager.php index 77f5d389b46a7..1e0c298edcfbb 100644 --- a/lib/public/IUserManager.php +++ b/lib/public/IUserManager.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/lib/public/IUserSession.php b/lib/public/IUserSession.php index 7d70d6eb81da7..d7bf5f9a3852f 100644 --- a/lib/public/IUserSession.php +++ b/lib/public/IUserSession.php @@ -1,13 +1,14 @@ * @author Bernhard Posselt * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Image.php b/lib/public/Image.php index 4a7ffe8bc9aa6..d583dffe91dd7 100644 --- a/lib/public/Image.php +++ b/lib/public/Image.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/public/JSON.php b/lib/public/JSON.php index e136fde070425..02c515e863e88 100644 --- a/lib/public/JSON.php +++ b/lib/public/JSON.php @@ -1,5 +1,7 @@ * @author Frank Karlitschek * @author Lukas Reschke @@ -8,7 +10,6 @@ * @author Thomas Tanghus * @author Vincent Petry * - * @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/lib/public/L10N/IFactory.php b/lib/public/L10N/IFactory.php index 264c971963945..0d6e583c7e58a 100644 --- a/lib/public/L10N/IFactory.php +++ b/lib/public/L10N/IFactory.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Lock/ILockingProvider.php b/lib/public/Lock/ILockingProvider.php index b4b579bbc7a97..6fe9894b7b581 100644 --- a/lib/public/Lock/ILockingProvider.php +++ b/lib/public/Lock/ILockingProvider.php @@ -1,9 +1,10 @@ - * @author Robin Appelman + * @author Robin Appelman * - * @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/lib/public/Lock/LockedException.php b/lib/public/Lock/LockedException.php index d084046046e4a..87ae4511ac98d 100644 --- a/lib/public/Lock/LockedException.php +++ b/lib/public/Lock/LockedException.php @@ -1,10 +1,11 @@ - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/lib/public/Mail/IMailer.php b/lib/public/Mail/IMailer.php index 61559c82e70ba..9ecebd2ee4071 100644 --- a/lib/public/Mail/IMailer.php +++ b/lib/public/Mail/IMailer.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * - * @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/lib/public/Migration/IOutput.php b/lib/public/Migration/IOutput.php index 2e6ad00c640d9..7c6b12ceaf4c5 100644 --- a/lib/public/Migration/IOutput.php +++ b/lib/public/Migration/IOutput.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/lib/public/Migration/IRepairStep.php b/lib/public/Migration/IRepairStep.php index 84619128b4e7f..0ba834e2cbf11 100644 --- a/lib/public/Migration/IRepairStep.php +++ b/lib/public/Migration/IRepairStep.php @@ -1,9 +1,10 @@ * @author Vincent Petry * - * @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/lib/public/Notification/IAction.php b/lib/public/Notification/IAction.php index 1f4d1d5b7fe54..6f2b78e3a8d74 100644 --- a/lib/public/Notification/IAction.php +++ b/lib/public/Notification/IAction.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Notification/IApp.php b/lib/public/Notification/IApp.php index 98da265559be4..fa06a63ccc6cf 100644 --- a/lib/public/Notification/IApp.php +++ b/lib/public/Notification/IApp.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Notification/IManager.php b/lib/public/Notification/IManager.php index a18af747b10ff..35878d2af36fa 100644 --- a/lib/public/Notification/IManager.php +++ b/lib/public/Notification/IManager.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Notification/INotification.php b/lib/public/Notification/INotification.php index 2d8557ec64da8..492e30dfaf19a 100644 --- a/lib/public/Notification/INotification.php +++ b/lib/public/Notification/INotification.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Notification/INotifier.php b/lib/public/Notification/INotifier.php index 0d9cecc88b857..5e2a47266ad24 100644 --- a/lib/public/Notification/INotifier.php +++ b/lib/public/Notification/INotifier.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/PreConditionNotMetException.php b/lib/public/PreConditionNotMetException.php index 212efc08ded9c..ea6350afb4da6 100644 --- a/lib/public/PreConditionNotMetException.php +++ b/lib/public/PreConditionNotMetException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Preview/IProvider.php b/lib/public/Preview/IProvider.php index 8231e90f000f8..ca545d8eb764b 100644 --- a/lib/public/Preview/IProvider.php +++ b/lib/public/Preview/IProvider.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/Response.php b/lib/public/Response.php index 62827450d7f31..b68da6443520d 100644 --- a/lib/public/Response.php +++ b/lib/public/Response.php @@ -1,16 +1,17 @@ * @author Bart Visscher * @author Frank Karlitschek * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Stefan Weil * @author Thomas Müller * @author Vincent Petry * - * @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/lib/public/Route/IRoute.php b/lib/public/Route/IRoute.php index 904cb81b0bd16..9b8218085ad06 100644 --- a/lib/public/Route/IRoute.php +++ b/lib/public/Route/IRoute.php @@ -1,11 +1,12 @@ * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * - * @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/lib/public/Route/IRouter.php b/lib/public/Route/IRouter.php index 3266842928bb5..1245e8324da7d 100644 --- a/lib/public/Route/IRouter.php +++ b/lib/public/Route/IRouter.php @@ -1,13 +1,14 @@ * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/lib/public/SabrePluginEvent.php b/lib/public/SabrePluginEvent.php index 11d939aee4708..d75c84965f63d 100644 --- a/lib/public/SabrePluginEvent.php +++ b/lib/public/SabrePluginEvent.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Thomas Müller * - * @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/lib/public/SabrePluginException.php b/lib/public/SabrePluginException.php index 2c5a799c4f70e..b5dd45b5bc13d 100644 --- a/lib/public/SabrePluginException.php +++ b/lib/public/SabrePluginException.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Search/PagedProvider.php b/lib/public/Search/PagedProvider.php index 80a2896f73f73..43d8c31665295 100644 --- a/lib/public/Search/PagedProvider.php +++ b/lib/public/Search/PagedProvider.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/public/Search/Provider.php b/lib/public/Search/Provider.php index 9bcbe36ef7a95..6760fa347b218 100644 --- a/lib/public/Search/Provider.php +++ b/lib/public/Search/Provider.php @@ -1,12 +1,13 @@ * @author Bart Visscher * @author Jakob Sack * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/public/Search/Result.php b/lib/public/Search/Result.php index e90c261903284..c441081a8ceb1 100644 --- a/lib/public/Search/Result.php +++ b/lib/public/Search/Result.php @@ -1,11 +1,12 @@ * @author Jakob Sack * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/public/Security/IContentSecurityPolicyManager.php b/lib/public/Security/IContentSecurityPolicyManager.php index 7b4544b936e48..ebd477f75aa17 100644 --- a/lib/public/Security/IContentSecurityPolicyManager.php +++ b/lib/public/Security/IContentSecurityPolicyManager.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Security/ICredentialsManager.php b/lib/public/Security/ICredentialsManager.php index d576bbcfbd8b0..6c1bb67192d05 100644 --- a/lib/public/Security/ICredentialsManager.php +++ b/lib/public/Security/ICredentialsManager.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Security/ICrypto.php b/lib/public/Security/ICrypto.php index 7c0ab7c793382..0de2e47b75511 100644 --- a/lib/public/Security/ICrypto.php +++ b/lib/public/Security/ICrypto.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Security/IHasher.php b/lib/public/Security/IHasher.php index b5e458294266f..11159cbc010ce 100644 --- a/lib/public/Security/IHasher.php +++ b/lib/public/Security/IHasher.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php index 03ac51aa1686f..c60529ef8033d 100644 --- a/lib/public/Security/ISecureRandom.php +++ b/lib/public/Security/ISecureRandom.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Security/StringUtils.php b/lib/public/Security/StringUtils.php index d34f6dda31529..04b5028cbd2e3 100644 --- a/lib/public/Security/StringUtils.php +++ b/lib/public/Security/StringUtils.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/lib/public/Session/Exceptions/SessionNotAvailableException.php b/lib/public/Session/Exceptions/SessionNotAvailableException.php index 6ec4a33989741..ae2a32db3c8a3 100644 --- a/lib/public/Session/Exceptions/SessionNotAvailableException.php +++ b/lib/public/Session/Exceptions/SessionNotAvailableException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/Share.php b/lib/public/Share.php index bff45864db00f..bc7aa828f6272 100644 --- a/lib/public/Share.php +++ b/lib/public/Share.php @@ -1,20 +1,21 @@ * @author Bart Visscher * @author Björn Schießle - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Michael Gapczynski * @author Michael Kuhn * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Sam Tuke * @author Stefan Weil * @author Thomas Müller * - * @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/lib/public/Share/Exceptions/GenericShareException.php b/lib/public/Share/Exceptions/GenericShareException.php index eeb08ccdb2238..4a05d7a034092 100644 --- a/lib/public/Share/Exceptions/GenericShareException.php +++ b/lib/public/Share/Exceptions/GenericShareException.php @@ -1,9 +1,10 @@ - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/lib/public/Share/Exceptions/IllegalIDChangeException.php b/lib/public/Share/Exceptions/IllegalIDChangeException.php index 6cd887c386bbd..46cbe5fbf9fbd 100644 --- a/lib/public/Share/Exceptions/IllegalIDChangeException.php +++ b/lib/public/Share/Exceptions/IllegalIDChangeException.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Share/Exceptions/ShareNotFound.php b/lib/public/Share/Exceptions/ShareNotFound.php index 96e7c0964926b..dd2137379a446 100644 --- a/lib/public/Share/Exceptions/ShareNotFound.php +++ b/lib/public/Share/Exceptions/ShareNotFound.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php index 0ff115679eee9..37751911883c7 100644 --- a/lib/public/Share/IManager.php +++ b/lib/public/Share/IManager.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Share/IProviderFactory.php b/lib/public/Share/IProviderFactory.php index 3a8baccf33ba6..8d9ea5bfdd098 100644 --- a/lib/public/Share/IProviderFactory.php +++ b/lib/public/Share/IProviderFactory.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Share/IShare.php b/lib/public/Share/IShare.php index ee71715f436bf..206b0e286a2ad 100644 --- a/lib/public/Share/IShare.php +++ b/lib/public/Share/IShare.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php index ac75a6f20b0b8..c4e116ac7fd3e 100644 --- a/lib/public/Share/IShareProvider.php +++ b/lib/public/Share/IShareProvider.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Roeland Jago Douma + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/Share_Backend.php b/lib/public/Share_Backend.php index 0e01911757f03..7ebad8b64d394 100644 --- a/lib/public/Share_Backend.php +++ b/lib/public/Share_Backend.php @@ -1,11 +1,12 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * - * @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/lib/public/Share_Backend_Collection.php b/lib/public/Share_Backend_Collection.php index 185cf32ce3ead..0c87a58ce954d 100644 --- a/lib/public/Share_Backend_Collection.php +++ b/lib/public/Share_Backend_Collection.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/Share_Backend_File_Dependent.php b/lib/public/Share_Backend_File_Dependent.php index 64b3bf433199d..a7f866dd7d0a5 100644 --- a/lib/public/Share_Backend_File_Dependent.php +++ b/lib/public/Share_Backend_File_Dependent.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Morris Jobke * - * @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/lib/public/SystemTag/ISystemTag.php b/lib/public/SystemTag/ISystemTag.php index 02d020372937a..539c7835fae4a 100644 --- a/lib/public/SystemTag/ISystemTag.php +++ b/lib/public/SystemTag/ISystemTag.php @@ -1,8 +1,9 @@ * - * @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/lib/public/SystemTag/ISystemTagManager.php b/lib/public/SystemTag/ISystemTagManager.php index 35447b05fdca9..bdfa19286f0be 100644 --- a/lib/public/SystemTag/ISystemTagManager.php +++ b/lib/public/SystemTag/ISystemTagManager.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/lib/public/SystemTag/ISystemTagManagerFactory.php b/lib/public/SystemTag/ISystemTagManagerFactory.php index ad7467633b19e..0d6526974907e 100644 --- a/lib/public/SystemTag/ISystemTagManagerFactory.php +++ b/lib/public/SystemTag/ISystemTagManagerFactory.php @@ -1,8 +1,9 @@ * - * @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/lib/public/SystemTag/ISystemTagObjectMapper.php b/lib/public/SystemTag/ISystemTagObjectMapper.php index 59b988a365640..3e28ab1577397 100644 --- a/lib/public/SystemTag/ISystemTagObjectMapper.php +++ b/lib/public/SystemTag/ISystemTagObjectMapper.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/lib/public/SystemTag/ManagerEvent.php b/lib/public/SystemTag/ManagerEvent.php index a0429fc9f6712..85e7863492e24 100644 --- a/lib/public/SystemTag/ManagerEvent.php +++ b/lib/public/SystemTag/ManagerEvent.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/SystemTag/MapperEvent.php b/lib/public/SystemTag/MapperEvent.php index e05a5ce09c869..a86497c844002 100644 --- a/lib/public/SystemTag/MapperEvent.php +++ b/lib/public/SystemTag/MapperEvent.php @@ -1,8 +1,9 @@ - * * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling + * * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/lib/public/SystemTag/SystemTagsEntityEvent.php b/lib/public/SystemTag/SystemTagsEntityEvent.php index 7ad161027adb6..15ae4439986c7 100644 --- a/lib/public/SystemTag/SystemTagsEntityEvent.php +++ b/lib/public/SystemTag/SystemTagsEntityEvent.php @@ -1,8 +1,9 @@ * - * @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/lib/public/SystemTag/TagAlreadyExistsException.php b/lib/public/SystemTag/TagAlreadyExistsException.php index 5c3d86ad642fa..caf0d9f08bc3c 100644 --- a/lib/public/SystemTag/TagAlreadyExistsException.php +++ b/lib/public/SystemTag/TagAlreadyExistsException.php @@ -1,8 +1,9 @@ * - * @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/lib/public/SystemTag/TagNotFoundException.php b/lib/public/SystemTag/TagNotFoundException.php index 12feda8f58a46..c983e2afc80b5 100644 --- a/lib/public/SystemTag/TagNotFoundException.php +++ b/lib/public/SystemTag/TagNotFoundException.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Vincent Petry * - * @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/lib/public/Template.php b/lib/public/Template.php index 3721f1f124fa2..590f430e24ceb 100644 --- a/lib/public/Template.php +++ b/lib/public/Template.php @@ -1,17 +1,18 @@ * @author Frank Karlitschek * @author Georg Ehrke * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/lib/public/User.php b/lib/public/User.php index 5ffb61a28c24f..75ca6b6f75705 100644 --- a/lib/public/User.php +++ b/lib/public/User.php @@ -1,10 +1,12 @@ * @author Björn Schießle * @author Frank Karlitschek * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lorenzo M. Catucci * @author Lukas Reschke @@ -12,7 +14,6 @@ * @author Robin McCorkell * @author Thomas Müller * - * @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/lib/public/UserInterface.php b/lib/public/UserInterface.php index d3521992dbb02..119564da736b4 100644 --- a/lib/public/UserInterface.php +++ b/lib/public/UserInterface.php @@ -1,10 +1,11 @@ * @author Jörn Friedrich Dreyer * @author Morris Jobke * - * @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/lib/public/Util.php b/lib/public/Util.php index 9422dbac66ac0..aa8e5288c74c0 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Björn Schießle @@ -7,23 +9,22 @@ * @author Georg Ehrke * @author Individual IT Services * @author Jens-Christian Fischer - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Michael Gapczynski * @author Morris Jobke * @author Nicolas Grekas * @author Pellaeon Lin * @author Randolph Carter - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Stefan Herbrechtsmeier * @author Thomas Müller * @author Thomas Tanghus * @author Victor Dubiniuk * @author Vincent Petry * - * @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/ocs/providers.php b/ocs/providers.php index 8da105b6374dd..be0aff8add221 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -1,11 +1,12 @@ * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * - * @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/ocs/routes.php b/ocs/routes.php index c465e08e877bd..0606fe3e3096f 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -1,14 +1,16 @@ * @author Björn Schießle * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Morris Jobke * @author Robin McCorkell * @author Thomas Müller * @author Tom Needham * - * @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/ocs/v1.php b/ocs/v1.php index e3ecefccf29b9..0ea3ac4c766a4 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -1,15 +1,18 @@ - * @author Joas Schilling + * @author Christoph Wurst + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham * @author Vincent Petry * - * @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/ocs/v2.php b/ocs/v2.php index a9fffe529b0b3..45f65033056a0 100644 --- a/ocs/v2.php +++ b/ocs/v2.php @@ -1,8 +1,9 @@ * - * @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/public.php b/public.php index 964ed03c1aaed..48fca3e8c3893 100644 --- a/public.php +++ b/public.php @@ -1,14 +1,17 @@ * @author Christopher Schäpers * @author Jörn Friedrich Dreyer * @author Lukas Reschke - * @author Robin Appelman + * @author Morris Jobke + * @author Robin Appelman * @author Thomas Müller + * @author Victor Dubiniuk * @author Vincent Petry * - * @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/remote.php b/remote.php index f7e55e2be068c..d4c321be8025f 100644 --- a/remote.php +++ b/remote.php @@ -1,16 +1,17 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell * @author Thomas Müller * @author Vincent Petry * - * @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/settings/Application.php b/settings/Application.php index 1549b273c517e..657b3fe490a5b 100644 --- a/settings/Application.php +++ b/settings/Application.php @@ -1,16 +1,17 @@ * @author Christoph Wurst * @author Georg Ehrke - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/settings/ChangePassword/Controller.php b/settings/ChangePassword/Controller.php index 94fb1e4e7a2b5..496b2f8208c17 100644 --- a/settings/ChangePassword/Controller.php +++ b/settings/ChangePassword/Controller.php @@ -1,6 +1,9 @@ + * @author Bjoern Schiessle * @author Björn Schießle * @author Christopher Schäpers * @author Clark Tomlinson @@ -8,11 +11,10 @@ * @author Florin Peter * @author Jakob Sack * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Sam Tuke * @author Thomas Müller * - * @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/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php index c7722267f197c..2efd3b8a847d5 100644 --- a/settings/Controller/AppSettingsController.php +++ b/settings/Controller/AppSettingsController.php @@ -1,12 +1,13 @@ - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller * - * @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/settings/Controller/AuthSettingsController.php b/settings/Controller/AuthSettingsController.php index 47ab1fc03fdb0..5e6ad7859a7e5 100644 --- a/settings/Controller/AuthSettingsController.php +++ b/settings/Controller/AuthSettingsController.php @@ -1,8 +1,10 @@ + * @author Robin Appelman * - * @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/settings/Controller/CertificateController.php b/settings/Controller/CertificateController.php index cd75ce91eedb1..4a527036a7f43 100644 --- a/settings/Controller/CertificateController.php +++ b/settings/Controller/CertificateController.php @@ -1,11 +1,12 @@ * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Vincent Petry * - * @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/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 7e30616d1f529..4d9ad4765161f 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -1,12 +1,13 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/settings/Controller/EncryptionController.php b/settings/Controller/EncryptionController.php index 86ca897b9ce3b..b2757b0965f5f 100644 --- a/settings/Controller/EncryptionController.php +++ b/settings/Controller/EncryptionController.php @@ -1,9 +1,10 @@ * @author Lukas Reschke * - * @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/settings/Controller/GroupsController.php b/settings/Controller/GroupsController.php index 73385e3eddf60..feed45b118ebe 100644 --- a/settings/Controller/GroupsController.php +++ b/settings/Controller/GroupsController.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * - * @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/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php index 6c9fe76c2473d..ce4913c247874 100644 --- a/settings/Controller/LogSettingsController.php +++ b/settings/Controller/LogSettingsController.php @@ -1,12 +1,14 @@ - * @author Joas Schilling + * @author Joas Schilling + * @author Lukas Reschke * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Thomas Müller * - * @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/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php index cd3c6e2224a9a..6ff12dec40cdb 100644 --- a/settings/Controller/MailSettingsController.php +++ b/settings/Controller/MailSettingsController.php @@ -1,10 +1,11 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke * - * @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/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php index fb5a39a1010e9..44e07f25a0b2d 100644 --- a/settings/Controller/SecuritySettingsController.php +++ b/settings/Controller/SecuritySettingsController.php @@ -1,9 +1,10 @@ * @author Morris Jobke * - * @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/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 1bd6d9d18cdf3..d4831214da21e 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -1,16 +1,17 @@ * @author Clark Tomlinson - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/settings/Middleware/SubadminMiddleware.php b/settings/Middleware/SubadminMiddleware.php index f1ba399d5dac9..df34b80656bdc 100644 --- a/settings/Middleware/SubadminMiddleware.php +++ b/settings/Middleware/SubadminMiddleware.php @@ -1,10 +1,11 @@ * @author Morris Jobke - * @author Roeland Jago Douma + * @author Roeland Jago Douma * - * @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/settings/admin.php b/settings/admin.php index 81267ddef10da..11d3a3f40db10 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -1,19 +1,20 @@ * @author Björn Schießle - * @author Frank Karlitschek * @author Georg Ehrke * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Martin Mattel * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller + * @author Vincent Petry * - * @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/settings/ajax/disableapp.php b/settings/ajax/disableapp.php index 03626df5eb87d..1a000672e6e08 100644 --- a/settings/ajax/disableapp.php +++ b/settings/ajax/disableapp.php @@ -1,10 +1,11 @@ * @author Kamil Domanski * @author Lukas Reschke * - * @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/settings/ajax/enableapp.php b/settings/ajax/enableapp.php index fef295b8fdb04..db4503f20e79c 100644 --- a/settings/ajax/enableapp.php +++ b/settings/ajax/enableapp.php @@ -1,14 +1,15 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Kamil Domanski * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/settings/ajax/installapp.php b/settings/ajax/installapp.php index d579f75f71756..8831305e223e5 100644 --- a/settings/ajax/installapp.php +++ b/settings/ajax/installapp.php @@ -1,10 +1,11 @@ * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * - * @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/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php index 61ec93a79b5ff..167f819f91e46 100644 --- a/settings/ajax/navigationdetect.php +++ b/settings/ajax/navigationdetect.php @@ -1,9 +1,10 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Robin Appelman * @author Robin McCorkell * - * @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/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php index 4e3140aa9b4f3..7c19c14b32e3b 100644 --- a/settings/ajax/setlanguage.php +++ b/settings/ajax/setlanguage.php @@ -1,14 +1,15 @@ * @author Christopher Schäpers - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/settings/ajax/setquota.php b/settings/ajax/setquota.php index 069c618a28ef2..eee1de407b9b2 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Björn Schießle @@ -8,10 +10,9 @@ * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index e39669f0dd404..ff79861b81192 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -1,14 +1,15 @@ * @author Christopher Schäpers * @author Georg Ehrke * @author Jakob Sack * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php index 3113fe5aacfb6..390e5c09ef31f 100644 --- a/settings/ajax/togglesubadmins.php +++ b/settings/ajax/togglesubadmins.php @@ -1,10 +1,11 @@ * @author Georg Ehrke * @author Lukas Reschke * - * @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/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php index 49328f8275dc4..be8196f4b3339 100644 --- a/settings/ajax/uninstallapp.php +++ b/settings/ajax/uninstallapp.php @@ -1,10 +1,11 @@ * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * - * @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/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index d140f438208ea..47ecac26cf1aa 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -1,13 +1,14 @@ * @author Frank Karlitschek * @author Georg Ehrke * @author Lukas Reschke - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/settings/help.php b/settings/help.php index 5c95f3bebb3e9..62f10ade521e4 100644 --- a/settings/help.php +++ b/settings/help.php @@ -1,5 +1,7 @@ * @author Christopher Schäpers * @author Frank Karlitschek @@ -7,10 +9,9 @@ * @author Jan-Christoph Borchardt * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * - * @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/settings/languageCodes.php b/settings/languageCodes.php index f83123df672ea..20d6ea701c7e7 100644 --- a/settings/languageCodes.php +++ b/settings/languageCodes.php @@ -1,13 +1,14 @@ * @author Jan-Christoph Borchardt * @author Morris Jobke * @author Pellaeon Lin - * @author Robin Appelman + * @author Robin Appelman * @author Thomas Müller * - * @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/settings/personal.php b/settings/personal.php index 0519e68beaa7e..a0d08aa0bd57a 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -1,24 +1,25 @@ * @author Bart Visscher * @author Björn Schießle - * @author Christoph Wurst * @author Christopher Schäpers + * @author Christoph Wurst * @author Georg Ehrke * @author Jakob Sack * @author Jan-Christoph Borchardt - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Marvin Thomas Rabe * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * @author Volkan Gezer * - * @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/settings/routes.php b/settings/routes.php index c4046a52a38d4..94732b3192a6a 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -1,20 +1,21 @@ * @author Björn Schießle - * @author Christoph Wurst * @author Christopher Schäpers + * @author Christoph Wurst * @author Frank Karlitschek * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke * @author Raghu Nayyar - * @author Robin Appelman - * @author Roeland Jago Douma + * @author Robin Appelman + * @author Roeland Jago Douma * @author Thomas Müller * @author Vincent Petry * - * @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/settings/users.php b/settings/users.php index 430c2cc0a850f..5f31d35ff97b9 100644 --- a/settings/users.php +++ b/settings/users.php @@ -1,5 +1,7 @@ * @author Bart Visscher * @author Björn Schießle @@ -7,17 +9,16 @@ * @author Daniel Molkentin * @author Georg Ehrke * @author Jakob Sack - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke - * @author Robin Appelman + * @author Robin Appelman * @author Robin McCorkell - * @author Roeland Jago Douma + * @author Roeland Jago Douma * @author Stephan Peijnik * @author Thomas Müller * - * @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/status.php b/status.php index 0f2be4d56faf5..0d7c22856794c 100644 --- a/status.php +++ b/status.php @@ -1,15 +1,16 @@ * @author Christopher Schäpers * @author Frank Karlitschek - * @author Joas Schilling + * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Masaki Kawabata Neto * @author Morris Jobke * - * @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/version.php b/version.php index 31837b1543381..2bb6f24b9c147 100644 --- a/version.php +++ b/version.php @@ -1,12 +1,12 @@ + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Frank Karlitschek - * @author Joas Schilling + * @author Joas Schilling * @author Lukas Reschke * @author Vincent Petry * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify From 28dffaa32f3f05c4009fb6f38a71c6658136427b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 22 Jul 2016 16:49:33 +0200 Subject: [PATCH 19/41] Make sure we try to autoload the class --- lib/private/Server.php | 9 ++++++++- lib/private/URLGenerator.php | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/private/Server.php b/lib/private/Server.php index de2970d9bfadf..76d6bbad1efff 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -631,7 +631,14 @@ public function __construct($webRoot, \OC\Config $config) { return $factory->getManager(); }); $this->registerService('ThemingDefaults', function(Server $c) { - if(class_exists('OCA\Theming\Template', false) && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) { + try { + $classExists = class_exists('OCA\Theming\Template'); + } catch (\OCP\AutoloadNotAllowedException $e) { + // App disabled or in maintenance mode + $classExists = false; + } + + if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) { return new Template( $this->getConfig(), $this->getL10N('theming'), diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index 0f3c60b132325..93517dc9f7e9c 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -30,7 +30,8 @@ */ namespace OC; -use OCP\Defaults; + + use OCP\ICacheFactory; use OCP\IConfig; use OCP\IURLGenerator; From edc15db3bdf248a114c71b03f76599ee28ef636f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 25 Jul 2016 09:24:32 +0200 Subject: [PATCH 20/41] Fix error message while restoring all files * use $_POST['files'] only of ssinlge files are restored * fixes #528 --- apps/files_trashbin/ajax/undelete.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 9095c551b4ff9..ba6713253729a 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -29,7 +29,6 @@ OCP\JSON::callCheck(); \OC::$server->getSession()->close(); -$files = $_POST['files']; $dir = '/'; if (isset($_POST['dir'])) { $dir = rtrim((string)$_POST['dir'], '/'). '/'; @@ -50,7 +49,7 @@ $list[] = $fileName; } } else { - $list = json_decode($files); + $list = json_decode($_POST['files']); } $error = array(); From d5e783d2bdc9a366ed061fb78fa01b170485510a Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 25 Jul 2016 17:08:33 +0200 Subject: [PATCH 21/41] Add proper scope to files external CSS * for select2 --- apps/files_external/css/settings.css | 10 +++++----- apps/files_external/js/settings.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 6dfb012b15ebf..4d5dc69a4e789 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -68,23 +68,23 @@ td.mountPoint, td.backend { width:160px; } padding-left: 25px; } -#body-settings .select2-results .select2-result-label { +.files-external-select2 .select2-results .select2-result-label { height: 32px; padding: 3px; } -.select2-results .select2-result-label > span { +.files-external-select2 .select2-results .select2-result-label > span { display: block; position: relative; } -.select2-results .select2-result-label .avatardiv { +.files-external-select2 .select2-results .select2-result-label .avatardiv { display:inline-block; } -.select2-results .select2-result-label .avatardiv + span { +.files-external-select2 .select2-results .select2-result-label .avatardiv + span { position: absolute; top: 5px; margin-left: 10px; } -.select2-results .select2-result-label .avatardiv[data-type="group"] + span { +.files-external-select2 .select2-results .select2-result-label .avatardiv[data-type="group"] + span { vertical-align: top; top: 6px; position: absolute; diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 921bf92e775ef..fc6edefc64808 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -93,6 +93,7 @@ function addSelect2 ($elements, userListLimit) { placeholder: t('files_external', 'All users. Type to select user or group.'), allowClear: true, multiple: true, + dropdownCssClass: 'files-external-select2', //minimumInputLength: 1, ajax: { url: OC.generateUrl('apps/files_external/applicable'), From 148cb09e00160e892668682ad8ddf1448783ecc9 Mon Sep 17 00:00:00 2001 From: Jos Poortvliet Date: Fri, 22 Jul 2016 12:25:58 +0200 Subject: [PATCH 22/41] Update themingcontroller.php --- apps/theming/lib/controller/themingcontroller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index b6fb1a6be5b9a..7e7791b46ce7f 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -224,10 +224,11 @@ public function getStylesheet() { if($logo !== '') { $responseCss .= sprintf('#header .logo { background-image: url(\'./logo?v='.$cacheBusterValue.'\'); + background-size: contain; } #header .logo-icon { background-image: url(\'./logo?v='.$cacheBusterValue.'\'); - background-size: 62px 34px; + background-size: contain; }' ); } From a8616f68b5aab8c03386898a1b82aa6ea657090c Mon Sep 17 00:00:00 2001 From: Jos Poortvliet Date: Fri, 22 Jul 2016 14:23:00 +0200 Subject: [PATCH 23/41] Update header.css make the logo look good on the login page --- core/css/header.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/header.css b/core/css/header.css index 91c6639deec75..cf7c981955ead 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -71,7 +71,7 @@ background-image: url('../img/logo-icon.svg'); background-repeat: no-repeat; background-size: 175px; - background-position: center 30px; + background-position: center; width: 252px; height: 120px; margin: 0 auto; From 9281b008c5d5aa71a4219e7091fd2b9a5820c8aa Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 22 Jul 2016 14:58:30 +0200 Subject: [PATCH 24/41] Adjust tests --- .../tests/lib/controller/ThemingControllerTest.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 6dcb4b548c43d..3a8405909b032 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -383,10 +383,11 @@ public function testGetStylesheetWithOnlyHeaderLogo() { $expected = new Http\DataDownloadResponse('#header .logo { background-image: url(\'./logo?v=0\'); + background-size: contain; } #header .logo-icon { background-image: url(\'./logo?v=0\'); - background-size: 62px 34px; + background-size: contain; }', 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); @@ -445,10 +446,11 @@ public function testGetStylesheetWithAllCombined() { $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #000}#header .logo { background-image: url(\'./logo?v=0\'); + background-size: contain; } #header .logo-icon { background-image: url(\'./logo?v=0\'); - background-size: 62px 34px; + background-size: contain; }#body-login { background-image: url(\'./loginbackground?v=0\'); }', 'style', 'text/css'); @@ -479,10 +481,11 @@ public function testGetStylesheetWithAllCombinedInverted() { $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}#header .logo { background-image: url(\'./logo?v=0\'); + background-size: contain; } #header .logo-icon { background-image: url(\'./logo?v=0\'); - background-size: 62px 34px; + background-size: contain; }#body-login { background-image: url(\'./loginbackground?v=0\'); }#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); } .searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }', 'style', 'text/css'); From db755d72364128d3f89f96773f45f1e0e804fe8f Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Mon, 25 Jul 2016 18:54:13 +0200 Subject: [PATCH 25/41] Theming: Fix preview and center alignment of logo --- apps/theming/js/settings-admin.js | 8 ++++---- core/css/header.css | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 85e781411ed3f..941ec5c711bdd 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -75,11 +75,11 @@ function preview(setting, value) { var logos = document.getElementsByClassName('logo-icon'); var timestamp = new Date().getTime(); if (value !== '') { - logos[0].style.background = "url('" + OC.generateUrl('/apps/theming/logo') + "?v" + timestamp + "')"; - logos[0].style.backgroundSize = "62px 34px"; + logos[0].style.backgroundImage = "url('" + OC.generateUrl('/apps/theming/logo') + "?v" + timestamp + "')"; + logos[0].style.backgroundSize = "contain"; } else { - logos[0].style.background = "url('" + OC.getRootPath() + '/core/img/logo-icon.svg?v' + timestamp +"')"; - logos[0].style.backgroundSize = "62px 34px"; + logos[0].style.backgroundImage = "url('" + OC.getRootPath() + '/core/img/logo-icon.svg?v' + timestamp +"')"; + logos[0].style.backgroundSize = "contain"; } } } diff --git a/core/css/header.css b/core/css/header.css index cf7c981955ead..6078008f91f81 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -82,6 +82,7 @@ display: inline-block; background-image: url('../img/logo-icon.svg'); background-repeat: no-repeat; + background-position: center center; width: 62px; height: 34px; } From 1013fac4478c88227474e5ef2a669ce3d5c97b5d Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 25 Jul 2016 10:58:03 +0200 Subject: [PATCH 26/41] fix autoloading in LPAP integration tests, resolves #544 --- .../user_ldap/tests/Integration/Bootstrap.php | 26 +++++++++++++++++++ ...IntegrationTestAccessGroupsMatchFilter.php | 4 +-- .../Lib/IntegrationTestBackupServer.php | 3 +-- ...ntegrationTestBatchApplyUserAttributes.php | 3 +-- .../Lib/IntegrationTestConnect.php | 3 +-- .../IntegrationTestCountUsersByLoginName.php | 3 +-- .../IntegrationTestFetchUsersByLoginName.php | 3 +-- .../Integration/Lib/IntegrationTestPaging.php | 3 +-- .../Lib/IntegrationTestUserHome.php | 3 +-- .../Lib/User/IntegrationTestUserAvatar.php | 3 +-- .../User/IntegrationTestUserDisplayName.php | 3 +-- lib/private/legacy/app.php | 2 +- 12 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 apps/user_ldap/tests/Integration/Bootstrap.php diff --git a/apps/user_ldap/tests/Integration/Bootstrap.php b/apps/user_ldap/tests/Integration/Bootstrap.php new file mode 100644 index 0000000000000..f52f1322171dd --- /dev/null +++ b/apps/user_ldap/tests/Integration/Bootstrap.php @@ -0,0 +1,26 @@ + + * + * @author Arthur Schiwon + * + * @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 + * + */ + +define('CLI_TEST_RUN', true); +require_once __DIR__ . '/../../../../lib/base.php'; +require_once __DIR__ . '/setup-scripts/config.php'; diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php index 4fcc83343384c..2411a46d8eeae 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php @@ -23,10 +23,9 @@ namespace OCA\User_LDAP\Tests\Integration\Lib; - use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestAccessGroupsMatchFilter extends AbstractIntegrationTest { @@ -118,7 +117,6 @@ protected function initConnection() { } } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestAccessGroupsMatchFilter($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php index 1d4bd05b8a575..f433930bd2648 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php @@ -27,7 +27,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestBackupServer extends AbstractIntegrationTest { /** @var UserMapping */ @@ -113,7 +113,6 @@ protected function case3() { } } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestBackupServer($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php index 2574877fca41b..89ce764e51a84 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php @@ -26,7 +26,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestBatchApplyUserAttributes extends AbstractIntegrationTest { /** @@ -68,7 +68,6 @@ protected function case1() { } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestBatchApplyUserAttributes($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php index 85a185c8ac6b6..44b16aed6a12c 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php @@ -27,7 +27,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestConnect extends AbstractIntegrationTest { /** @var UserMapping */ @@ -161,7 +161,6 @@ protected function case6() { } } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestConnect($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php index 4d20d52595e0a..eb4a0a5c9cfe4 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php @@ -25,7 +25,7 @@ use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestCountUsersByLoginName extends AbstractIntegrationTest { @@ -61,7 +61,6 @@ protected function case2() { } } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestCountUsersByLoginName($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php index 56f44cc58b2e4..32fc2151a7c5a 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php @@ -27,7 +27,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestFetchUsersByLoginName extends AbstractIntegrationTest { /** @var UserMapping */ @@ -74,7 +74,6 @@ protected function case2() { } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestFetchUsersByLoginName($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php index 7acd49af00a62..3826cbdae517d 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php @@ -27,7 +27,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestPaging extends AbstractIntegrationTest { /** @var UserMapping */ @@ -76,7 +76,6 @@ protected function case1() { } } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestPaging($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php index a4db8cae68119..95c14ca89472c 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php @@ -28,7 +28,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; -require_once __DIR__ . '/../../../../../lib/base.php'; +require_once __DIR__ . '/../Bootstrap.php'; class IntegrationTestUserHome extends AbstractIntegrationTest { /** @var UserMapping */ @@ -169,7 +169,6 @@ protected function case3() { } } -require_once(__DIR__ . '/../setup-scripts/config.php'); $test = new IntegrationTestUserHome($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php index bd4da5ea97f25..7c8f9475b41c7 100644 --- a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php +++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php @@ -29,7 +29,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; -require_once __DIR__ . '/../../../../../../lib/base.php'; +require_once __DIR__ . '/../../Bootstrap.php'; class IntegrationTestUserAvatar extends AbstractIntegrationTest { /** @var UserMapping */ @@ -148,7 +148,6 @@ protected function initConnection() { } } -require_once(__DIR__ . '/../../setup-scripts/config.php'); $test = new IntegrationTestUserAvatar($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php index de86e17d0144a..ab0d2ffdcce5e 100644 --- a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php +++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php @@ -26,7 +26,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; -require_once __DIR__ . '/../../../../../../lib/base.php'; +require_once __DIR__ . '/../../Bootstrap.php'; class IntegrationTestUserDisplayName extends AbstractIntegrationTest { /** @var UserMapping */ @@ -100,7 +100,6 @@ protected function initConnection() { } } -require_once(__DIR__ . '/../../setup-scripts/config.php'); $test = new IntegrationTestUserDisplayName($host, $port, $adn, $apwd, $bdn); $test->init(); $test->run(); diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 4cfa68cff2d36..5395d1daeee2a 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -169,7 +169,7 @@ public static function registerAutoloading($app, $path) { // Register on PSR-4 composer autoloader $appNamespace = \OC\AppFramework\App::buildAppNamespace($app); \OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true); - if (defined('PHPUNIT_RUN')) { + if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) { \OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true); } From 24d3164abe86c81241cc89c026f18ddeeebb14c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Bl=C3=BCm?= Date: Wed, 27 Jul 2016 11:09:32 +0200 Subject: [PATCH 27/41] Add icon for comments app --- apps/comments/img/comments.svg | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 apps/comments/img/comments.svg diff --git a/apps/comments/img/comments.svg b/apps/comments/img/comments.svg new file mode 100644 index 0000000000000..cd85179906942 --- /dev/null +++ b/apps/comments/img/comments.svg @@ -0,0 +1,4 @@ + + + + From 4b96e3a93e1d9739785936da7a15ecf50e38bef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Bl=C3=BCm?= Date: Wed, 27 Jul 2016 11:10:52 +0200 Subject: [PATCH 28/41] Add icon for tags app --- apps/systemtags/img/app.svg | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 apps/systemtags/img/app.svg diff --git a/apps/systemtags/img/app.svg b/apps/systemtags/img/app.svg new file mode 100644 index 0000000000000..cd8dd1ffcadd5 --- /dev/null +++ b/apps/systemtags/img/app.svg @@ -0,0 +1,4 @@ + + + + From ac5987a017fa0d50fd0a89614080fbe3715d4417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 25 Jul 2016 09:46:19 +0200 Subject: [PATCH 29/41] [stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248 --- apps/user_ldap/lib/User_LDAP.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index a2a65bb8406af..3128f0de83c26 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -384,8 +384,14 @@ public function getDisplayName($uid) { } $user = $this->access->userManager->get($uid); - $displayName = $user->composeAndStoreDisplayName($displayName, $displayName2); - $this->access->connection->writeToCache($cacheKey, $displayName); + if ($user instanceof User) { + $displayName = $user->composeAndStoreDisplayName($displayName, $displayName2); + $this->access->connection->writeToCache($cacheKey, $displayName); + } + if ($user instanceof OfflineUser) { + /** @var OfflineUser $user*/ + $displayName = $user->getDisplayName(); + } return $displayName; } From 7c476e4fa205d0a2562f5c402b9de6eba8f41ded Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 27 Jul 2016 12:11:58 +0200 Subject: [PATCH 30/41] Redirect to default page after login --- core/Controller/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 44635cc709b65..91f7fa0b25a84 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -231,7 +231,7 @@ public function tryLogin($user, $password, $redirect_url) { return new RedirectResponse($location); } } - return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index')); + return new RedirectResponse(OC_Util::getDefaultPageUrl()); } } From dbafc183da50fd8f792ee3676cdb3159664aaa31 Mon Sep 17 00:00:00 2001 From: Olivier Paroz Date: Thu, 28 Jul 2016 09:22:59 +0200 Subject: [PATCH 31/41] change core to server --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64cad6ba647be..5e02664c9192e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ If you have questions about how to install or use Nextcloud, please direct these - Go to one of the repositories, click "issues" and type any word in the top search/command bar. - You can also filter by appending e. g. "state:open" to the search string. - More info on [search syntax within github](https://help.github.com/articles/searching-issues) -* This repository ([core](https://github.com/nextcloud/core/issues)) is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth +* This repository ([server](https://github.com/nextcloud/server/issues)) is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth * __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker. * The issues in other components should be reported in their respective repositories: You will find them in our [GitHub Organization](https://github.com/nextcloud/) From 88560096d401e4e5c9ac160a0d2d7afc738ed01e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 19 Jul 2016 12:05:57 +0200 Subject: [PATCH 32/41] fix searchbox overlapping on mobile --- apps/theming/lib/controller/themingcontroller.php | 4 ++-- core/css/styles.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index 7e7791b46ce7f..5984c1856e298 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -73,7 +73,7 @@ public function __construct( IRootFolder $rootFolder ) { parent::__construct($appName, $request); - + $this->template = $template; $this->l = $l; $this->config = $config; @@ -216,7 +216,7 @@ public function getStylesheet() { $color = $this->config->getAppValue($this->appName, 'color'); if($color !== '') { $responseCss .= sprintf( - '#body-user #header,#body-settings #header,#body-public #header {background-color: %s}', + '#body-user #header,#body-settings #header,#body-public #header,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}', $color ); } diff --git a/core/css/styles.css b/core/css/styles.css index c1bd76acbcf71..a8e632c594460 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -118,7 +118,7 @@ a.two-factor-cancel { width: 155px; max-width: 50%; cursor: text; - background-color: transparent; + background-color: #0082c9; border: 1px solid rgba(255, 255, 255, .5); } From 12a35e46ce1e2d8d82b23481d50fb295a26696a3 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 19 Jul 2016 12:08:59 +0200 Subject: [PATCH 33/41] also adjust log in background color in theme --- apps/theming/lib/controller/themingcontroller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index 5984c1856e298..3e5d6f3e0d1c0 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -216,7 +216,7 @@ public function getStylesheet() { $color = $this->config->getAppValue($this->appName, 'color'); if($color !== '') { $responseCss .= sprintf( - '#body-user #header,#body-settings #header,#body-public #header,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}', + '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}', $color ); } From c9b4a2b4cc03f4e1f1638084c16373725d085321 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 21 Jul 2016 23:44:50 +0200 Subject: [PATCH 34/41] Fix unit tests --- .../tests/lib/controller/ThemingControllerTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 3a8405909b032..24eb0510f9939 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -327,7 +327,7 @@ public function testGetStylesheetWithOnlyColor() { ->with('theming', 'backgroundMime', '') ->willReturn(''); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #000}', 'style', 'text/css'); + $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}', 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } @@ -354,7 +354,7 @@ public function testGetStylesheetWithOnlyColorInvert() { ->with('theming', 'backgroundMime', '') ->willReturn(''); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); } .searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }', 'style', 'text/css'); + $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); } .searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }', 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } @@ -444,7 +444,7 @@ public function testGetStylesheetWithAllCombined() { ->with('theming', 'backgroundMime', '') ->willReturn('image/png'); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #000}#header .logo { + $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}#header .logo { background-image: url(\'./logo?v=0\'); background-size: contain; } @@ -479,7 +479,7 @@ public function testGetStylesheetWithAllCombinedInverted() { ->with('theming', 'backgroundMime', '') ->willReturn('image/png'); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}#header .logo { + $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}#header .logo { background-image: url(\'./logo?v=0\'); background-size: contain; } From 6990a4e550a872c3ac6f70da9ec5fc0f08916e30 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 27 Jul 2016 15:28:35 +0200 Subject: [PATCH 35/41] Support subdir in the OCS v2 endpoint We should check against the ending substring since people could run their nextcloud in a subfolder. * Added test --- .../AppFramework/Middleware/OCSMiddleware.php | 8 ++++- .../Middleware/OCSMiddlewareTest.php | 33 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index 90355a39ef0ea..8d98ed07afd99 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -56,7 +56,13 @@ public function afterException($controller, $methodName, \Exception $exception) if ($code === 0) { $code = Http::STATUS_INTERNAL_SERVER_ERROR; } - return new OCSResponse($format, $code, $exception->getMessage()); + + $response = new OCSResponse($format, $code, $exception->getMessage()); + + if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) { + $response->setStatus($code); + } + return $response; } throw $exception; diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php index 66131aa4b253c..5544421f74adb 100644 --- a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php @@ -89,6 +89,9 @@ public function dataAfterException() { * @param int $code */ public function testAfterException($controller, $exception, $forward, $message = '', $code = 0) { + $this->request + ->method('getScriptName') + ->willReturn('/mysubfolder/ocs/v1.php'); $OCSMiddleware = new OCSMiddleware($this->request); try { @@ -105,4 +108,34 @@ public function testAfterException($controller, $exception, $forward, $message = } } + /** + * @dataProvider dataAfterException + * + * @param Controller $controller + * @param \Exception $exception + * @param bool $forward + * @param string $message + * @param int $code + */ + public function testAfterExceptionOCSv2SubFolder($controller, $exception, $forward, $message = '', $code = 0) { + $this->request + ->method('getScriptName') + ->willReturn('/mysubfolder/ocs/v2.php'); + $OCSMiddleware = new OCSMiddleware($this->request); + + try { + $result = $OCSMiddleware->afterException($controller, 'method', $exception); + $this->assertFalse($forward); + + $this->assertInstanceOf('OCP\AppFramework\Http\OCSResponse', $result); + + $this->assertSame($message, $this->invokePrivate($result, 'message')); + $this->assertSame($code, $this->invokePrivate($result, 'statuscode')); + $this->assertSame($code, $result->getStatus()); + } catch (\Exception $e) { + $this->assertTrue($forward); + $this->assertEquals($exception, $e); + } + } + } From 5c12c8cb02b463fe5b95bfd98462fa703290964f Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Tue, 19 Jul 2016 13:53:47 +0200 Subject: [PATCH 36/41] Theming: Preview for colorized checkboxes --- apps/theming/js/settings-admin.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 941ec5c711bdd..bf3571e24385e 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -51,24 +51,35 @@ function preview(setting, value) { var headerClass = document.getElementById('header'); var expandDisplayNameClass = document.getElementById('expandDisplayName'); var headerAppName = headerClass.getElementsByClassName('header-appname')[0]; - var textColor, icon; + var textColor, elementColor, icon; - if (calculateLuminance(value) > 0.5) { + var luminance = calculateLuminance(value); + var elementColor = value; + + if (luminance > 0.5) { textColor = "#000000"; icon = 'caret-dark'; } else { textColor = "#ffffff"; icon = 'caret'; } + if (luminance>0.8) { + elementColor = '#969696'; + } headerClass.style.background = value; headerClass.style.backgroundImage = '../img/logo-icon.svg'; expandDisplayNameClass.style.color = textColor; headerAppName.style.color = textColor; - $(headerClass).find('.icon-caret').each(function() { - $(this).css('background-image', "url('" + OC.getRootPath() + '/core/img/actions/' + icon + ".svg')"); - }); + $('#previewStyles').html( + '#header .icon-caret { background-image: url(\'' + OC.getRootPath() + '/core/img/actions/' + icon + '.svg\') }' + + 'input[type="checkbox"].checkbox:checked + label:before {' + + 'background-image: url(\'' + OC.getRootPath() + '/core/img/actions/checkmark-white.svg\');' + + 'background-color: ' + elementColor + ';' + + 'background-position: center center; background-size:contain;' + + 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px; }' + ); } if (setting === 'logoMime') { console.log(setting); @@ -87,6 +98,8 @@ function preview(setting, value) { $(document).ready(function () { $('#theming [data-toggle="tooltip"]').tooltip(); + $('html > head').append($('')); + var uploadParamsLogo = { pasteZone: null, dropZone: null, From 49ef99474f47bce9ac0f9a5242290286f75f2ad7 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Tue, 19 Jul 2016 14:00:33 +0200 Subject: [PATCH 37/41] Theming: Colorize checkboxes depending on luminance --- apps/theming/lib/controller/themingcontroller.php | 9 +++++++++ apps/theming/lib/util.php | 15 +++++++++++++++ apps/theming/tests/lib/UtilTest.php | 10 ++++++++++ 3 files changed, 34 insertions(+) diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index 3e5d6f3e0d1c0..32d96203d6240 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -214,11 +214,20 @@ public function getStylesheet() { $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0'); $responseCss = ''; $color = $this->config->getAppValue($this->appName, 'color'); + $elementColor = Util::elementColor($color); if($color !== '') { $responseCss .= sprintf( '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}', $color ); + $responseCss .= sprintf(' + input[type="checkbox"].checkbox:checked + label:before { + background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\'); + background-color: %s; background-position: center center; background-size:contain; + width:12px; height:12px; padding:0; margin:1px 6px 7px 2px; + }', + $elementColor + ); } $logo = $this->config->getAppValue($this->appName, 'logoMime'); if($logo !== '') { diff --git a/apps/theming/lib/util.php b/apps/theming/lib/util.php index 2088650b19db7..d342073d83e9e 100644 --- a/apps/theming/lib/util.php +++ b/apps/theming/lib/util.php @@ -38,6 +38,21 @@ public static function invertTextColor($color) { } } + /** + * get color for on-page elements: + * theme color by default, grey if theme color is to bright + * @param $color + * @return string + */ + public static function elementColor($color) { + $l = self::calculateLuminance($color); + if($l>0.8) { + return '#969696'; + } else { + return $color; + } + } + /** * @param string $color rgb color value * @return float diff --git a/apps/theming/tests/lib/UtilTest.php b/apps/theming/tests/lib/UtilTest.php index 9ebb11d628843..6451b65d0271d 100644 --- a/apps/theming/tests/lib/UtilTest.php +++ b/apps/theming/tests/lib/UtilTest.php @@ -65,4 +65,14 @@ public function testInvertTextColorEmpty() { $invert = Util::invertTextColor(''); $this->assertEquals(false, $invert); } + + public function testElementColorDefault() { + $elementColor = Util::elementColor("#000000"); + $this->assertEquals('#000000', $elementColor); + } + + public function testElementColorOnBrightBackground() { + $elementColor = Util::elementColor('#ffffff'); + $this->assertEquals('#969696', $elementColor); + } } From aa4e133443a5df2ddbe99f14845815b211e87583 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Tue, 19 Jul 2016 14:39:53 +0200 Subject: [PATCH 38/41] Theming: Clean up css generation and fix tests --- .../lib/controller/themingcontroller.php | 42 ++++---- .../lib/controller/ThemingControllerTest.php | 100 ++++++++++++------ 2 files changed, 87 insertions(+), 55 deletions(-) diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index 32d96203d6240..ed3e23b0c1f15 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -217,41 +217,39 @@ public function getStylesheet() { $elementColor = Util::elementColor($color); if($color !== '') { $responseCss .= sprintf( - '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}', + '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}'."\n", $color ); - $responseCss .= sprintf(' - input[type="checkbox"].checkbox:checked + label:before { - background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\'); - background-color: %s; background-position: center center; background-size:contain; - width:12px; height:12px; padding:0; margin:1px 6px 7px 2px; - }', + $responseCss .= sprintf('input[type="checkbox"].checkbox:checked + label:before {' . + 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . + 'background-color: %s; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . + '}' . PHP_EOL, $elementColor ); } $logo = $this->config->getAppValue($this->appName, 'logoMime'); if($logo !== '') { - $responseCss .= sprintf('#header .logo { - background-image: url(\'./logo?v='.$cacheBusterValue.'\'); - background-size: contain; - } - #header .logo-icon { - background-image: url(\'./logo?v='.$cacheBusterValue.'\'); - background-size: contain; - }' + $responseCss .= sprintf( + '#header .logo {' . + 'background-image: url(\'./logo?v='.$cacheBusterValue.'\')' . + 'background-size: contain;' . + '}' . PHP_EOL . + '#header .logo-icon {' . + 'background-image: url(\'./logo?v='.$cacheBusterValue.'\');' . + 'background-size: contain;' . + '}' . PHP_EOL ); } $backgroundLogo = $this->config->getAppValue($this->appName, 'backgroundMime'); if($backgroundLogo !== '') { - $responseCss .= '#body-login { - background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\'); - }'; + $responseCss .= '#body-login {background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\');}' . PHP_EOL; } if(Util::invertTextColor($color)) { - $responseCss .= '#header .header-appname, #expandDisplayName { color: #000000; } '; - $responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); } '; - $responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }'; - $responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }'; + $responseCss .= '#header .header-appname, #expandDisplayName { color: #000000; }' . PHP_EOL; + $responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . PHP_EOL; + $responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . PHP_EOL; + $responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . PHP_EOL; } \OC_Response::setExpiresHeader(gmdate('D, d M Y H:i:s', time() + (60*60*24*45)) . ' GMT'); diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 24eb0510f9939..5ad6beb18e539 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -327,7 +327,13 @@ public function testGetStylesheetWithOnlyColor() { ->with('theming', 'backgroundMime', '') ->willReturn(''); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}', 'style', 'text/css'); + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . PHP_EOL . + 'input[type="checkbox"].checkbox:checked + label:before {' . + 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . + 'background-color: #000; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . + '}' . PHP_EOL; + $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } @@ -354,7 +360,17 @@ public function testGetStylesheetWithOnlyColorInvert() { ->with('theming', 'backgroundMime', '') ->willReturn(''); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); } .searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }', 'style', 'text/css'); + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . PHP_EOL . + 'input[type="checkbox"].checkbox:checked + label:before {' . + 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . + 'background-color: #969696; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . + '}' . PHP_EOL . + '#header .header-appname, #expandDisplayName { color: #000000; }' . PHP_EOL . + '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . PHP_EOL . + '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . PHP_EOL . + '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . PHP_EOL; + $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } @@ -381,14 +397,15 @@ public function testGetStylesheetWithOnlyHeaderLogo() { ->with('theming', 'backgroundMime', '') ->willReturn(''); - $expected = new Http\DataDownloadResponse('#header .logo { - background-image: url(\'./logo?v=0\'); - background-size: contain; - } - #header .logo-icon { - background-image: url(\'./logo?v=0\'); - background-size: contain; - }', 'style', 'text/css'); + $expectedCss = '#header .logo {' . + 'background-image: url(\'./logo?v=0\')' . + 'background-size: contain;' . + '}' . PHP_EOL . + '#header .logo-icon {' . + 'background-image: url(\'./logo?v=0\');' . + 'background-size: contain;' . + '}' . PHP_EOL; + $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } @@ -415,9 +432,8 @@ public function testGetStylesheetWithOnlyBackgroundLogin() { ->with('theming', 'backgroundMime', '') ->willReturn('text/svg'); - $expected = new Http\DataDownloadResponse('#body-login { - background-image: url(\'./loginbackground?v=0\'); - }', 'style', 'text/css'); + $expectedCss = '#body-login {background-image: url(\'./loginbackground?v=0\');}' . PHP_EOL; + $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } @@ -444,16 +460,23 @@ public function testGetStylesheetWithAllCombined() { ->with('theming', 'backgroundMime', '') ->willReturn('image/png'); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}#header .logo { - background-image: url(\'./logo?v=0\'); - background-size: contain; - } - #header .logo-icon { - background-image: url(\'./logo?v=0\'); - background-size: contain; - }#body-login { - background-image: url(\'./loginbackground?v=0\'); - }', 'style', 'text/css'); + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . PHP_EOL . + 'input[type="checkbox"].checkbox:checked + label:before {' . + 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . + 'background-color: #000; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . + '}' . PHP_EOL; + $expectedCss .= '#header .logo {' . + 'background-image: url(\'./logo?v=0\')' . + 'background-size: contain;' . + '}' . PHP_EOL . + '#header .logo-icon {' . + 'background-image: url(\'./logo?v=0\');' . + 'background-size: contain;' . + '}' . PHP_EOL; + $expectedCss .= '#body-login {background-image: url(\'./loginbackground?v=0\');}' . PHP_EOL; + + $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } @@ -479,16 +502,27 @@ public function testGetStylesheetWithAllCombinedInverted() { ->with('theming', 'backgroundMime', '') ->willReturn('image/png'); - $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}#header .logo { - background-image: url(\'./logo?v=0\'); - background-size: contain; - } - #header .logo-icon { - background-image: url(\'./logo?v=0\'); - background-size: contain; - }#body-login { - background-image: url(\'./loginbackground?v=0\'); - }#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); } .searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }', 'style', 'text/css'); + + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . PHP_EOL . + 'input[type="checkbox"].checkbox:checked + label:before {' . + 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . + 'background-color: #969696; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . + '}' . PHP_EOL; + $expectedCss .= '#header .logo {' . + 'background-image: url(\'./logo?v=0\')' . + 'background-size: contain;' . + '}' . PHP_EOL . + '#header .logo-icon {' . + 'background-image: url(\'./logo?v=0\');' . + 'background-size: contain;' . + '}' . PHP_EOL; + $expectedCss .= '#body-login {background-image: url(\'./loginbackground?v=0\');}' . PHP_EOL; + $expectedCss .= '#header .header-appname, #expandDisplayName { color: #000000; }' . PHP_EOL . + '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . PHP_EOL . + '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . PHP_EOL . + '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . PHP_EOL; + $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); } From b7024b454f38ae7d877ab9cf754e9fc347e9d8ca Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Mon, 25 Jul 2016 16:44:56 +0200 Subject: [PATCH 39/41] Theming: Colorize radio buttons and append new styles on preview --- apps/theming/js/settings-admin.js | 16 ++- .../lib/controller/themingcontroller.php | 34 +++-- apps/theming/lib/util.php | 2 +- apps/theming/tests/lib/UtilTest.php | 2 +- .../lib/controller/ThemingControllerTest.php | 120 +++++++++++++----- core/css/inputs.css | 2 +- core/img/actions/radio-checked-white.svg | 1 + 7 files changed, 121 insertions(+), 56 deletions(-) create mode 100644 core/img/actions/radio-checked-white.svg diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index bf3571e24385e..a45694b9aa690 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -64,7 +64,7 @@ function preview(setting, value) { icon = 'caret'; } if (luminance>0.8) { - elementColor = '#969696'; + elementColor = '#555555'; } headerClass.style.background = value; @@ -74,11 +74,15 @@ function preview(setting, value) { $('#previewStyles').html( '#header .icon-caret { background-image: url(\'' + OC.getRootPath() + '/core/img/actions/' + icon + '.svg\') }' + - 'input[type="checkbox"].checkbox:checked + label:before {' + - 'background-image: url(\'' + OC.getRootPath() + '/core/img/actions/checkmark-white.svg\');' + - 'background-color: ' + elementColor + ';' + - 'background-position: center center; background-size:contain;' + - 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px; }' + 'html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' + + 'background-image:url(\'' + OC.getRootPath() + '/core/img/actions/checkmark-white.svg\');' + + 'background-color: ' + elementColor + '; background-position: center center; background-size:contain;' + + 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;}' + + 'html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' + + '-webkit-mask-image: url(\'' + OC.getRootPath() + '/core/img/actions/radio-checked-white.svg\');' + + '-webkit-mask-repeat: no-repeat;' + + 'background-color: ' + elementColor+ ';' + + 'background-image: none; }' ); } if (setting === 'logoMime') { diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index ed3e23b0c1f15..7d828d7798bb9 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -217,14 +217,24 @@ public function getStylesheet() { $elementColor = Util::elementColor($color); if($color !== '') { $responseCss .= sprintf( - '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}'."\n", + '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}' . "\n", $color ); - $responseCss .= sprintf('input[type="checkbox"].checkbox:checked + label:before {' . - 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . + $responseCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-color: %s; background-position: center center; background-size:contain;' . - 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . - '}' . PHP_EOL, + 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . + "}\n", + \OC::$WEBROOT, + $elementColor + ); + $responseCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . + '-webkit-mask-repeat: no-repeat;' . + 'background-color: %s;' . + 'background-image: none; '. + "}\n", + \OC::$WEBROOT, $elementColor ); } @@ -234,22 +244,22 @@ public function getStylesheet() { '#header .logo {' . 'background-image: url(\'./logo?v='.$cacheBusterValue.'\')' . 'background-size: contain;' . - '}' . PHP_EOL . + '}' . "\n" . '#header .logo-icon {' . 'background-image: url(\'./logo?v='.$cacheBusterValue.'\');' . 'background-size: contain;' . - '}' . PHP_EOL + '}' . "\n" ); } $backgroundLogo = $this->config->getAppValue($this->appName, 'backgroundMime'); if($backgroundLogo !== '') { - $responseCss .= '#body-login {background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\');}' . PHP_EOL; + $responseCss .= '#body-login {background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\');}' . "\n"; } if(Util::invertTextColor($color)) { - $responseCss .= '#header .header-appname, #expandDisplayName { color: #000000; }' . PHP_EOL; - $responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . PHP_EOL; - $responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . PHP_EOL; - $responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . PHP_EOL; + $responseCss .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n"; + $responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n"; + $responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n"; + $responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n"; } \OC_Response::setExpiresHeader(gmdate('D, d M Y H:i:s', time() + (60*60*24*45)) . ' GMT'); diff --git a/apps/theming/lib/util.php b/apps/theming/lib/util.php index d342073d83e9e..e83d854b99743 100644 --- a/apps/theming/lib/util.php +++ b/apps/theming/lib/util.php @@ -47,7 +47,7 @@ public static function invertTextColor($color) { public static function elementColor($color) { $l = self::calculateLuminance($color); if($l>0.8) { - return '#969696'; + return '#555555'; } else { return $color; } diff --git a/apps/theming/tests/lib/UtilTest.php b/apps/theming/tests/lib/UtilTest.php index 6451b65d0271d..fd3a963d5c04d 100644 --- a/apps/theming/tests/lib/UtilTest.php +++ b/apps/theming/tests/lib/UtilTest.php @@ -73,6 +73,6 @@ public function testElementColorDefault() { public function testElementColorOnBrightBackground() { $elementColor = Util::elementColor('#ffffff'); - $this->assertEquals('#969696', $elementColor); + $this->assertEquals('#555555', $elementColor); } } diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 5ad6beb18e539..737d351919a70 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -327,12 +327,25 @@ public function testGetStylesheetWithOnlyColor() { ->with('theming', 'backgroundMime', '') ->willReturn(''); - $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . PHP_EOL . - 'input[type="checkbox"].checkbox:checked + label:before {' . - 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . - 'background-color: #000; background-position: center center; background-size:contain;' . - 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . - '}' . PHP_EOL; + $elementColor = '#000'; + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . "\n"; + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . + 'background-color: %s; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . + "}\n", + \OC::$WEBROOT, + $elementColor + ); + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . + '-webkit-mask-repeat: no-repeat;' . + 'background-color: %s;' . + 'background-image: none; '. + "}\n", + \OC::$WEBROOT, + $elementColor + ); $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); @@ -359,17 +372,29 @@ public function testGetStylesheetWithOnlyColorInvert() { ->method('getAppValue') ->with('theming', 'backgroundMime', '') ->willReturn(''); - - $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . PHP_EOL . - 'input[type="checkbox"].checkbox:checked + label:before {' . - 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . - 'background-color: #969696; background-position: center center; background-size:contain;' . - 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . - '}' . PHP_EOL . - '#header .header-appname, #expandDisplayName { color: #000000; }' . PHP_EOL . - '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . PHP_EOL . - '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . PHP_EOL . - '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . PHP_EOL; + $elementColor = '#555555'; + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . "\n"; + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . + 'background-color: %s; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . + "}\n", + \OC::$WEBROOT, + $elementColor + ); + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . + '-webkit-mask-repeat: no-repeat;' . + 'background-color: %s;' . + 'background-image: none; '. + "}\n", + \OC::$WEBROOT, + $elementColor + ); + $expectedCss .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n" . + '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n" . + '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n" . + '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n"; $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); @@ -400,11 +425,11 @@ public function testGetStylesheetWithOnlyHeaderLogo() { $expectedCss = '#header .logo {' . 'background-image: url(\'./logo?v=0\')' . 'background-size: contain;' . - '}' . PHP_EOL . + '}' . "\n" . '#header .logo-icon {' . 'background-image: url(\'./logo?v=0\');' . 'background-size: contain;' . - '}' . PHP_EOL; + '}' . "\n"; $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); @@ -432,7 +457,7 @@ public function testGetStylesheetWithOnlyBackgroundLogin() { ->with('theming', 'backgroundMime', '') ->willReturn('text/svg'); - $expectedCss = '#body-login {background-image: url(\'./loginbackground?v=0\');}' . PHP_EOL; + $expectedCss = '#body-login {background-image: url(\'./loginbackground?v=0\');}' . "\n"; $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); @@ -460,20 +485,33 @@ public function testGetStylesheetWithAllCombined() { ->with('theming', 'backgroundMime', '') ->willReturn('image/png'); - $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . PHP_EOL . - 'input[type="checkbox"].checkbox:checked + label:before {' . - 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . - 'background-color: #000; background-position: center center; background-size:contain;' . - 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . - '}' . PHP_EOL; + $elementColor = '#000'; + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . "\n"; + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . + 'background-color: %s; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . + "}\n", + \OC::$WEBROOT, + $elementColor + ); + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . + '-webkit-mask-repeat: no-repeat;' . + 'background-color: %s;' . + 'background-image: none; '. + "}\n", + \OC::$WEBROOT, + $elementColor + ); $expectedCss .= '#header .logo {' . 'background-image: url(\'./logo?v=0\')' . 'background-size: contain;' . - '}' . PHP_EOL . + '}' . "\n" . '#header .logo-icon {' . 'background-image: url(\'./logo?v=0\');' . 'background-size: contain;' . - '}' . PHP_EOL; + '}' . "\n"; $expectedCss .= '#body-login {background-image: url(\'./loginbackground?v=0\');}' . PHP_EOL; $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); @@ -502,13 +540,25 @@ public function testGetStylesheetWithAllCombinedInverted() { ->with('theming', 'backgroundMime', '') ->willReturn('image/png'); - - $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . PHP_EOL . - 'input[type="checkbox"].checkbox:checked + label:before {' . - 'background-image:url(\'' . \OC::$WEBROOT . '/core/img/actions/checkmark-white.svg\');' . - 'background-color: #969696; background-position: center center; background-size:contain;' . - 'width:12px; height:12px; padding:0; margin:1px 6px 7px 2px;' . - '}' . PHP_EOL; + $elementColor = '#555555'; + $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . "\n"; + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . + 'background-color: %s; background-position: center center; background-size:contain;' . + 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . + "}\n", + \OC::$WEBROOT, + $elementColor + ); + $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . + '-webkit-mask-repeat: no-repeat;' . + 'background-color: %s;' . + 'background-image: none; '. + "}\n", + \OC::$WEBROOT, + $elementColor + ); $expectedCss .= '#header .logo {' . 'background-image: url(\'./logo?v=0\')' . 'background-size: contain;' . diff --git a/core/css/inputs.css b/core/css/inputs.css index cad627ac311b7..e56f06082e749 100644 --- a/core/css/inputs.css +++ b/core/css/inputs.css @@ -187,7 +187,7 @@ input[type="radio"].radio--white + label:before { } input[type="radio"].radio--white:checked + label:before { - background-image: url('../img/actions/radio-checked.svg'); + background-image: url('../img/actions/radio-checked-white.svg'); } input[type="radio"].radio--white:disabled + label:before { diff --git a/core/img/actions/radio-checked-white.svg b/core/img/actions/radio-checked-white.svg new file mode 100644 index 0000000000000..d024c91ff19e5 --- /dev/null +++ b/core/img/actions/radio-checked-white.svg @@ -0,0 +1 @@ + \ No newline at end of file From 1f3e55bc86e165d20be8d648358525f515b653e4 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Mon, 25 Jul 2016 17:32:11 +0200 Subject: [PATCH 40/41] Theming: Generate colorized radio buttons dynamically --- apps/theming/js/settings-admin.js | 15 +++-- .../lib/controller/themingcontroller.php | 14 ++--- apps/theming/lib/util.php | 10 ++++ apps/theming/tests/lib/UtilTest.php | 11 ++++ .../lib/controller/ThemingControllerTest.php | 57 ++++++------------- 5 files changed, 51 insertions(+), 56 deletions(-) diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index a45694b9aa690..8b0df5f4bf0a1 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -46,6 +46,12 @@ function calculateLuminance(rgb) { return (0.299*r + 0.587*g + 0.114*b)/255; } +function generateRadioButton(color) { + var radioButton = '' + + ''; + return btoa(radioButton); +} + function preview(setting, value) { if (setting === 'color') { var headerClass = document.getElementById('header'); @@ -74,15 +80,12 @@ function preview(setting, value) { $('#previewStyles').html( '#header .icon-caret { background-image: url(\'' + OC.getRootPath() + '/core/img/actions/' + icon + '.svg\') }' + - 'html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' + + 'input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' + 'background-image:url(\'' + OC.getRootPath() + '/core/img/actions/checkmark-white.svg\');' + 'background-color: ' + elementColor + '; background-position: center center; background-size:contain;' + 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;}' + - 'html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' + - '-webkit-mask-image: url(\'' + OC.getRootPath() + '/core/img/actions/radio-checked-white.svg\');' + - '-webkit-mask-repeat: no-repeat;' + - 'background-color: ' + elementColor+ ';' + - 'background-image: none; }' + 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' + + 'background-image: url(\'data:image/svg+xml;base64,' + generateRadioButton(elementColor) + '\'); }' ); } if (setting === 'logoMime') { diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index 7d828d7798bb9..6a61293828f2c 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -220,7 +220,7 @@ public function getStylesheet() { '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}' . "\n", $color ); - $responseCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + $responseCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-color: %s; background-position: center center; background-size:contain;' . 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . @@ -228,15 +228,9 @@ public function getStylesheet() { \OC::$WEBROOT, $elementColor ); - $responseCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . - '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . - '-webkit-mask-repeat: no-repeat;' . - 'background-color: %s;' . - 'background-image: none; '. - "}\n", - \OC::$WEBROOT, - $elementColor - ); + $responseCss .= 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + 'background-image: url(\'data:image/svg+xml;base64,'.Util::generateRadioButton($elementColor).'\');' . + "}\n"; } $logo = $this->config->getAppValue($this->appName, 'logoMime'); if($logo !== '') { diff --git a/apps/theming/lib/util.php b/apps/theming/lib/util.php index e83d854b99743..f0ce30ac5ba7d 100644 --- a/apps/theming/lib/util.php +++ b/apps/theming/lib/util.php @@ -71,4 +71,14 @@ public static function calculateLuminance($color) { return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255; } + /** + * @param $color + * @return string base64 encoded radio button svg + */ + public static function generateRadioButton($color) { + $radioButtonIcon = '' . + ''; + return base64_encode($radioButtonIcon); + } + } diff --git a/apps/theming/tests/lib/UtilTest.php b/apps/theming/tests/lib/UtilTest.php index fd3a963d5c04d..cf64b389d113b 100644 --- a/apps/theming/tests/lib/UtilTest.php +++ b/apps/theming/tests/lib/UtilTest.php @@ -75,4 +75,15 @@ public function testElementColorOnBrightBackground() { $elementColor = Util::elementColor('#ffffff'); $this->assertEquals('#555555', $elementColor); } + + public function testGenerateRadioButtonWhite() { + $button = Util::generateRadioButton('#ffffff'); + $expected = 'PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHdpZHRoPSIxNiI+PHBhdGggZD0iTTggMWE3IDcgMCAwIDAtNyA3IDcgNyAwIDAgMCA3IDcgNyA3IDAgMCAwIDctNyA3IDcgMCAwIDAtNy03em0wIDFhNiA2IDAgMCAxIDYgNiA2IDYgMCAwIDEtNiA2IDYgNiAwIDAgMS02LTYgNiA2IDAgMCAxIDYtNnptMCAyYTQgNCAwIDEgMCAwIDggNCA0IDAgMCAwIDAtOHoiIGZpbGw9IiNmZmZmZmYiLz48L3N2Zz4='; + $this->assertEquals($expected, $button); + } + public function testGenerateRadioButtonBlack() { + $button = Util::generateRadioButton('#000000'); + $expected = 'PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHdpZHRoPSIxNiI+PHBhdGggZD0iTTggMWE3IDcgMCAwIDAtNyA3IDcgNyAwIDAgMCA3IDcgNyA3IDAgMCAwIDctNyA3IDcgMCAwIDAtNy03em0wIDFhNiA2IDAgMCAxIDYgNiA2IDYgMCAwIDEtNiA2IDYgNiAwIDAgMS02LTYgNiA2IDAgMCAxIDYtNnptMCAyYTQgNCAwIDEgMCAwIDggNCA0IDAgMCAwIDAtOHoiIGZpbGw9IiMwMDAwMDAiLz48L3N2Zz4='; + $this->assertEquals($expected, $button); + } } diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 737d351919a70..59e33c755dba8 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -26,6 +26,7 @@ use OCA\Theming\Controller\ThemingController; use OCA\Theming\Template; +use OCA\Theming\Util; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\Files\IRootFolder; @@ -329,7 +330,7 @@ public function testGetStylesheetWithOnlyColor() { $elementColor = '#000'; $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . "\n"; - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + $expectedCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-color: %s; background-position: center center; background-size:contain;' . 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . @@ -337,15 +338,9 @@ public function testGetStylesheetWithOnlyColor() { \OC::$WEBROOT, $elementColor ); - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . - '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . - '-webkit-mask-repeat: no-repeat;' . - 'background-color: %s;' . - 'background-image: none; '. - "}\n", - \OC::$WEBROOT, - $elementColor - ); + $expectedCss .= 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + 'background-image: url(\'data:image/svg+xml;base64,'.Util::generateRadioButton($elementColor).'\');' . + "}\n"; $expected = new Http\DataDownloadResponse($expectedCss, 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); @@ -374,7 +369,7 @@ public function testGetStylesheetWithOnlyColorInvert() { ->willReturn(''); $elementColor = '#555555'; $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . "\n"; - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + $expectedCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-color: %s; background-position: center center; background-size:contain;' . 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . @@ -382,15 +377,9 @@ public function testGetStylesheetWithOnlyColorInvert() { \OC::$WEBROOT, $elementColor ); - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . - '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . - '-webkit-mask-repeat: no-repeat;' . - 'background-color: %s;' . - 'background-image: none; '. - "}\n", - \OC::$WEBROOT, - $elementColor - ); + $expectedCss .= 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + 'background-image: url(\'data:image/svg+xml;base64,'.Util::generateRadioButton($elementColor).'\');' . + "}\n"; $expectedCss .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n" . '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n" . '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n" . @@ -487,7 +476,7 @@ public function testGetStylesheetWithAllCombined() { $elementColor = '#000'; $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}' . "\n"; - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + $expectedCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-color: %s; background-position: center center; background-size:contain;' . 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . @@ -495,15 +484,9 @@ public function testGetStylesheetWithAllCombined() { \OC::$WEBROOT, $elementColor ); - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . - '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . - '-webkit-mask-repeat: no-repeat;' . - 'background-color: %s;' . - 'background-image: none; '. - "}\n", - \OC::$WEBROOT, - $elementColor - ); + $expectedCss .= 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + 'background-image: url(\'data:image/svg+xml;base64,'.Util::generateRadioButton($elementColor).'\');' . + "}\n"; $expectedCss .= '#header .logo {' . 'background-image: url(\'./logo?v=0\')' . 'background-size: contain;' . @@ -542,7 +525,7 @@ public function testGetStylesheetWithAllCombinedInverted() { $elementColor = '#555555'; $expectedCss = '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}' . "\n"; - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . + $expectedCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-color: %s; background-position: center center; background-size:contain;' . 'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' . @@ -550,15 +533,9 @@ public function testGetStylesheetWithAllCombinedInverted() { \OC::$WEBROOT, $elementColor ); - $expectedCss .= sprintf('html:not(.ie):not(.edge) input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . - '-webkit-mask-image: url(\'%s/core/img/actions/radio-checked-white.svg\');' . - '-webkit-mask-repeat: no-repeat;' . - 'background-color: %s;' . - 'background-image: none; '. - "}\n", - \OC::$WEBROOT, - $elementColor - ); + $expectedCss .= 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' . + 'background-image: url(\'data:image/svg+xml;base64,'.Util::generateRadioButton($elementColor).'\');' . + "}\n"; $expectedCss .= '#header .logo {' . 'background-image: url(\'./logo?v=0\')' . 'background-size: contain;' . From 4eb85f10a9df72bd12ce8a0bcdf8dfbe85fa50d3 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Wed, 27 Jul 2016 20:03:53 +0200 Subject: [PATCH 41/41] Theming: Cleanup and remove opacity from checkbox/radiobutton --- apps/theming/js/settings-admin.js | 3 +-- core/css/inputs.css | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 8b0df5f4bf0a1..01ff9123842c3 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -57,8 +57,7 @@ function preview(setting, value) { var headerClass = document.getElementById('header'); var expandDisplayNameClass = document.getElementById('expandDisplayName'); var headerAppName = headerClass.getElementsByClassName('header-appname')[0]; - var textColor, elementColor, icon; - + var textColor, icon; var luminance = calculateLuminance(value); var elementColor = value; diff --git a/core/css/inputs.css b/core/css/inputs.css index e56f06082e749..b58310a5c5851 100644 --- a/core/css/inputs.css +++ b/core/css/inputs.css @@ -93,7 +93,6 @@ input[type="checkbox"].checkbox + label:before { vertical-align: middle; background: url('../img/actions/checkbox.svg') left top no-repeat; - opacity: 0.7; } input[type="checkbox"].checkbox:disabled +label:before { opacity: .6; } @@ -167,7 +166,6 @@ input[type="radio"].radio + label:before { vertical-align: middle; background: url('../img/actions/radio.svg') left top no-repeat; - opacity: 0.7; } input[type="radio"].radio:checked + label:before {