From 890267c1bf40f4a63d2c3b8bc6baccb8a8adfef2 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 13 Nov 2019 00:24:47 -0800 Subject: [PATCH] (NFC) (dev/core#878) Simplify copyright header template https://lab.civicrm.org/dev/core/issues/878 --- header.sql | 24 ++++-------------------- header.tpl | 24 ++++-------------------- header.txt | 26 +++++--------------------- 3 files changed, 13 insertions(+), 61 deletions(-) diff --git a/header.sql b/header.sql index 4d016cbf41..a2b5c1b85d 100644 --- a/header.sql +++ b/header.sql @@ -1,23 +1,7 @@ -- +--------------------------------------------------------------------+ --- | CiviCRM version 5 | --- +--------------------------------------------------------------------+ --- | Copyright CiviCRM LLC (c) 2004-2018 | --- +--------------------------------------------------------------------+ --- | This file is a part of CiviCRM. | --- | | --- | CiviCRM is free software; you can copy, modify, and distribute it | --- | under the terms of the GNU Affero General Public License | --- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | --- | | --- | CiviCRM 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. | +-- | Copyright CiviCRM LLC. All rights reserved. | -- | | --- | You should have received a copy of the GNU Affero General Public | --- | License and the CiviCRM Licensing Exception along | --- | with this program; if not, contact CiviCRM LLC | --- | at info[AT]civicrm[DOT]org. If you have questions about the | --- | GNU Affero General Public License or the licensing of CiviCRM, | --- | see the CiviCRM license FAQ at http://civicrm.org/licensing | +-- | This work is published under the GNU AGPLv3 license with some | +-- | permitted exceptions and without any warranty. For full license | +-- | and copyright information, see https://civicrm.org/licensing | -- +--------------------------------------------------------------------+ diff --git a/header.tpl b/header.tpl index b90f04997c..550638d66a 100644 --- a/header.tpl +++ b/header.tpl @@ -1,25 +1,9 @@ {* +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2020 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM 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. | + | Copyright CiviCRM LLC. All rights reserved. | | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | + | This work is published under the GNU AGPLv3 license with some | + | permitted exceptions and without any warranty. For full license | + | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} diff --git a/header.txt b/header.txt index 2e75c6d27b..f78d207ac2 100644 --- a/header.txt +++ b/header.txt @@ -2,34 +2,18 @@ /* +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2020 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM 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. | + | Copyright CiviCRM LLC. All rights reserved. | | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | + | This work is published under the GNU AGPLv3 license with some | + | permitted exceptions and without any warranty. For full license | + | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ */ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2020 + * @copyright CiviCRM LLC https://civicrm.org/licensing * $Id$ * */ -- 2.25.1