From c394575b8608f095a047b7e6c01ddaf9a4b79a3e Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 16 Dec 2017 14:06:39 -0700 Subject: [PATCH] Fully implement MPL-2.0 license --- LICENSE.md | 17 +++++++++++++++++ LICENSE_ASSETS.md | 16 ---------------- action.php | 4 ++++ api.php | 5 +++++ app.php | 7 ++++++- index.php | 7 ++++++- lang/en_us.php | 5 +++++ lang/messages.php | 5 +++++ lib/gencontent.php | 5 +++++ lib/getpubtable.php | 5 +++++ lib/iputils.php | 5 +++++ lib/login.php | 5 +++++ lib/userinfo.php | 5 +++++ mobile/index.php | 5 +++++ nbproject/mplheader.txt | 9 +++++++++ nbproject/project.properties | 1 + pages.php | 5 +++++ pages/404.php | 6 ++++++ pages/content.php | 5 +++++ pages/editpub.php | 5 +++++ pages/home.php | 5 +++++ pages/maillist.php | 7 +++++++ required.php | 5 +++++ settings.template.php | 16 +++++++++------- static/css/app.css | 4 ++++ static/css/content.css | 4 ++++ static/js/app.js | 3 +++ static/js/content.js | 4 ++++ static/js/editpub.js | 4 ++++ static/js/maillist.js | 4 ++++ style_dev/index.php | 5 +++++ style_dev/tile.css | 13 ++++--------- 32 files changed, 167 insertions(+), 34 deletions(-) delete mode 100644 LICENSE_ASSETS.md create mode 100644 nbproject/mplheader.txt diff --git a/LICENSE.md b/LICENSE.md index ab810ef..7cdc0cd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,3 +1,20 @@ +Copyright (c) 2017 Netsyms Technologies. + +If you modify and redistribute this project, you must replace the branding +assets with your own. + +The branding assets include: + * the application icon + * the Netsyms N punchcard logo + * the Netsyms for Business graph logo + +If you are unsure if your usage is allowed, please contact us: +https://netsyms.com/contact +legal@netsyms.com + +All other portions of this application, +unless otherwise noted (in comments, headers, etc), are licensed as follows: + Mozilla Public License Version 2.0 ================================== diff --git a/LICENSE_ASSETS.md b/LICENSE_ASSETS.md deleted file mode 100644 index b797278..0000000 --- a/LICENSE_ASSETS.md +++ /dev/null @@ -1,16 +0,0 @@ -Branding assets copyright (c) 2017 Netsyms Technologies. - -If you modify and redistribute this project, you must replace the branding -assets with your own. - -Private builds (i.e. not distributed outside your organization) or builds for -strictly personal use are exempted from this requirement. - -The branding assets include: - * the application icon - * the Netsyms N punchcard logo - * the Netsyms for Business graph logo - -If you are unsure if your usage is allowed, please contact us: -https://netsyms.com/contact -legal@netsyms.com \ No newline at end of file diff --git a/action.php b/action.php index 0eba00e..073592f 100644 --- a/action.php +++ b/action.php @@ -1,5 +1,9 @@
-
+
Copyright ©
diff --git a/index.php b/index.php index 2d4ccc2..0a629ff 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,9 @@
-
+
Copyright ©
diff --git a/lang/en_us.php b/lang/en_us.php index 886db14..a444d68 100644 --- a/lang/en_us.php +++ b/lang/en_us.php @@ -1,5 +1,10 @@ "Sign In", "username" => "Username", diff --git a/lang/messages.php b/lang/messages.php index f59da3d..04ecb73 100644 --- a/lang/messages.php +++ b/lang/messages.php @@ -1,5 +1,10 @@ [ "string" => "invalid parameters", diff --git a/lib/gencontent.php b/lib/gencontent.php index 65de7e7..4a16725 100644 --- a/lib/gencontent.php +++ b/lib/gencontent.php @@ -1,4 +1,9 @@ +${licenseFirst} + +${licensePrefix}This Source Code Form is subject to the terms of the Mozilla Public +${licensePrefix}License, v. 2.0. If a copy of the MPL was not distributed with this +${licensePrefix}file, You can obtain one at http://mozilla.org/MPL/2.0/. +<#if licenseLast??> +${licenseLast} + \ No newline at end of file diff --git a/nbproject/project.properties b/nbproject/project.properties index 364d4fd..044602b 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,6 +1,7 @@ auxiliary.org-netbeans-modules-html-editor-lib.default-html-public-id=-//W3C//DTD HTML 4.01 Transitional//EN include.path=${php.global.include.path} php.version=PHP_70 +project.licensePath=./nbproject/mplheader.txt source.encoding=UTF-8 src.dir=. tags.asp=false diff --git a/pages.php b/pages.php index 961b122..41d1324 100644 --- a/pages.php +++ b/pages.php @@ -1,5 +1,10 @@ [ diff --git a/pages/404.php b/pages/404.php index 030157e..751ccba 100644 --- a/pages/404.php +++ b/pages/404.php @@ -1,3 +1,9 @@ +

diff --git a/pages/content.php b/pages/content.php index fe3c71a..fb8d46e 100644 --- a/pages/content.php +++ b/pages/content.php @@ -1,4 +1,9 @@ \ No newline at end of file diff --git a/required.php b/required.php index eaaba47..9369073 100644 --- a/required.php +++ b/required.php @@ -1,5 +1,10 @@ diff --git a/style_dev/tile.css b/style_dev/tile.css index 9719b25..2daeb35 100644 --- a/style_dev/tile.css +++ b/style_dev/tile.css @@ -1,10 +1,5 @@ -/* -To change this license header, choose License Headers in Project Properties. -To change this template file, choose Tools | Templates -and open the template in the editor. -*/ -/* - Created on : Dec 2, 2017, 7:19:37 PM - Author : skylar -*/ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +