From 6afbec050e4035026bd0baa8983cdbefd2a363b2 Mon Sep 17 00:00:00 2001 From: bruno DA SILVA Date: Tue, 15 Jan 2019 17:22:36 +0100 Subject: [PATCH] :page_facing_up: Add Combodo license --- .gitignore | 1 + datamodel.combodo-notify-on-expiration.xml | 4 ++++ de.dict.combodo-notify-on-expiration.php | 18 +++------------ en.dict.combodo-notify-on-expiration.php | 18 +++------------ fr.dict.combodo-notify-on-expiration.php | 20 ++++------------ license.combodo-notify-on-expiration.xml | 27 ++++++++++++++++++++++ main.combodo-notify-on-expiration.php | 20 +++------------- module.combodo-notify-on-expiration.php | 20 +++++----------- triggerexpirationrule.class.inc.php | 20 ++++------------ 9 files changed, 55 insertions(+), 93 deletions(-) create mode 100644 .gitignore create mode 100644 license.combodo-notify-on-expiration.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..723ef36f4e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/datamodel.combodo-notify-on-expiration.xml b/datamodel.combodo-notify-on-expiration.xml index 16193c7807..56c449203f 100644 --- a/datamodel.combodo-notify-on-expiration.xml +++ b/datamodel.combodo-notify-on-expiration.xml @@ -1,4 +1,8 @@ + diff --git a/de.dict.combodo-notify-on-expiration.php b/de.dict.combodo-notify-on-expiration.php index 408b273cbc..d59183fb38 100644 --- a/de.dict.combodo-notify-on-expiration.php +++ b/de.dict.combodo-notify-on-expiration.php @@ -1,28 +1,16 @@ * @author Romain Quetiez * @author Denis Flaven * @author Guillaume Lajarige * @author Vincent Dumas - * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ // ExpirationRule diff --git a/en.dict.combodo-notify-on-expiration.php b/en.dict.combodo-notify-on-expiration.php index d9f0ae5f41..a687f92761 100644 --- a/en.dict.combodo-notify-on-expiration.php +++ b/en.dict.combodo-notify-on-expiration.php @@ -1,28 +1,16 @@ * @author Romain Quetiez * @author Denis Flaven * @author Guillaume Lajarige * @author Vincent Dumas - * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ // ExpirationRule diff --git a/fr.dict.combodo-notify-on-expiration.php b/fr.dict.combodo-notify-on-expiration.php index 9916c99c31..0782200f5f 100644 --- a/fr.dict.combodo-notify-on-expiration.php +++ b/fr.dict.combodo-notify-on-expiration.php @@ -1,28 +1,16 @@ * @author Romain Quetiez * @author Denis Flaven * @author Guillaume Lajarige * @author Vincent Dumas - * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ // ClosingRule @@ -74,5 +62,5 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Class:TriggerOnExpirationRule' => 'Déclencheur sur préavis atteint', 'Class:TriggerOnExpirationRule+' => 'Déclencheur activé lorsqu\'une régle de préavis est applicable à l\'objet', - + )); diff --git a/license.combodo-notify-on-expiration.xml b/license.combodo-notify-on-expiration.xml new file mode 100644 index 0000000000..054cbab8ea --- /dev/null +++ b/license.combodo-notify-on-expiration.xml @@ -0,0 +1,27 @@ + + + + Notify on expiration + 2010-2019 Combodo SARL + Combodo Software License + Combodo Software License +

Version 1.0

+

Copyright (c) 2018 Combodo SARL. All rights reserved.

+

Redistribution and use in source and binary forms, with or without modification, of this software is permitted provided that the following conditions are met:

+
    +
  1. Combodo grants you a non-exclusive, non-sublicensable and non-transferable license to install and use the software for your own business purposes, in accordance with this agreement, the documentation and all laws.
    2. +
  2. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    3. +
  3. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
    4. +
  4. The redistribution of the software covered by this license is limited to the individual or the company who purchased the software and its affiliates.
    5. +
  5. You cannot rent, lease, distribute, sell, sublicense, or transfer the software.
    6. +
  6. The use of the software is limited to only one set of production data (i.e. only one instance of iTop managing production data).
    7. +
  7. In the context of this license, the interaction with the installed software across a computer network is not considered as a redistribution.
    8. +
  8. Combodo SARL may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number.
    9. +Once covered code has been published under a particular version of the license, you may always continue to use it under the terms of that version. You may also choose to use such covered code under the terms of any subsequent version of the license published by Combodo SARL. No one other than Combodo SARL has the right to modify the terms applicable to covered code created under this License. +
+

THIS SOFTWARE IS PROVIDED BY COMBODO SARL “AS IS” AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COMBODO SARL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +For more information on Combodo SARL, please see https://www.combodo.com.

+]]> + + \ No newline at end of file diff --git a/main.combodo-notify-on-expiration.php b/main.combodo-notify-on-expiration.php index b28db9825d..a6b42b4376 100644 --- a/main.combodo-notify-on-expiration.php +++ b/main.combodo-notify-on-expiration.php @@ -1,29 +1,15 @@ * @author Romain Quetiez * @author Denis Flaven * @author Guillaume Lajarige * @author Vincent Dumas - * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ diff --git a/module.combodo-notify-on-expiration.php b/module.combodo-notify-on-expiration.php index 2f09b61617..0c3ed7ca34 100644 --- a/module.combodo-notify-on-expiration.php +++ b/module.combodo-notify-on-expiration.php @@ -1,18 +1,10 @@