Skip to content

Commit

Permalink
SWITCH LICENSE TO MIT, Copyright date bump, rebuild manual
Browse files Browse the repository at this point in the history
  • Loading branch information
howardjones committed May 4, 2019
1 parent 7a5c32b commit 9f53974
Show file tree
Hide file tree
Showing 33 changed files with 68 additions and 417 deletions.
340 changes: 0 additions & 340 deletions COPYING

This file was deleted.

15 changes: 15 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
The MIT License

Copyright 2005-2019 Howard Jones and contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "weathermap",
"version": "1.0.0",
"description": "Network Weathermap",
"license": "GPLv2",
"license": "MIT",
"private": true,
"ignore": [
"**/.*",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "howardjones/network-weathermap",
"license": "GPL",
"license": "MIT",
"minimum-stability": "dev",
"prefer-stable": true,
"authors": [
Expand Down
24 changes: 12 additions & 12 deletions docs/example/example.html

Large diffs are not rendered by default.

Binary file modified docs/example/example.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/cacti-plugin.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/cli-reference.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/config-reference.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/errorcodes.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down Expand Up @@ -307,7 +307,7 @@ <h3>FAQs</h3>
title = "jwz's law of software envelopment">mail-reading
capability</a> anytime soon), then it stands a better chance. Things
that take dozens of parameters to adjust something very subtle are
less likely. Ultimately, it is a GPLed program though, so <i>you</i> can
less likely. Ultimately, it is an open source program though, so <i>you</i> can
<i>always</i> add your own features! I try to keep a todo list on the
website for current work-in-progress. Obviously, things that
<i>I</i> want are <i>always</i> sensible and useful<tt>:-)</tt> . </p>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/install-cacti-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/install-cacti.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/install-cli-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/install-cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
18 changes: 3 additions & 15 deletions docs/pages/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,12 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
<div class = "license"><p>PHP Weathermap is free software; you can
redistribute it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.</p>

<p>PHP Weathermap 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 General
Public License for more details.</p>

<p>You should have received a copy of the GNU General Public License
along with PHP Weathermap; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA</p>
<div class = "license">
<p>PHP Weathermap is licensed under the MIT license. See LICENSE file for complete license.</p>

<p>Parts of this software distribution are by other authors. Please see
the README file for attribution and license details.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/targets.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/upgrading.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id = "header">
<h1>PHP Weathermap v0.98a </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/common-page-head.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div id = "header">
<h1>PHP Weathermap <?php echo $WEATHERMAP_VERSION; ?> </h1>

<h4>Copyright &copy; 2005-2018 Howard Jones,
<h4>Copyright &copy; 2005-2019 Howard Jones,
<tt><a href = "mailto:[email protected]">[email protected]</a></tt>. (<a
href = "http://www.network-weathermap.com/">Website</a>)</h4>
</div>
2 changes: 1 addition & 1 deletion docs/src/faq.php
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ function_exists()</dt>
title = "jwz's law of software envelopment">mail-reading
capability</a> anytime soon), then it stands a better chance. Things
that take dozens of parameters to adjust something very subtle are
less likely. Ultimately, it is a GPLed program though, so <i>you</i> can
less likely. Ultimately, it is an open source program though, so <i>you</i> can
<i>always</i> add your own features! I try to keep a todo list on the
website for current work-in-progress. Obviously, things that
<i>I</i> want are <i>always</i> sensible and useful<tt>:-)</tt> .</p>
Expand Down
16 changes: 2 additions & 14 deletions docs/src/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,8 @@
$PATH_EXTRA="../";
include "common-page-head.php";
?>
<div class = "license"><p>PHP Weathermap is free software; you can
redistribute it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.</p>

<p>PHP Weathermap 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 General
Public License for more details.</p>

<p>You should have received a copy of the GNU General Public License
along with PHP Weathermap; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA</p>
<div class = "license">
<p>PHP Weathermap is licensed under the MIT license. See LICENSE file for complete license.</p>

<p>Parts of this software distribution are by other authors. Please see
the README file for attribution and license details.</p>
Expand Down
4 changes: 2 additions & 2 deletions lib/HTML_ImageMap.class.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
// Copyright Howard Jones, 2005-2018 [email protected]
// Copyright Howard Jones, 2005-2019 [email protected]
// http://wotsit.thingy.com/haj/cacti/
// Released under the GNU Public License
// Released under the MIT License

// A simple port of the guts of Apache's mod_imap
// - if you have an image control in a form, it's not really defined what happens to USEMAP
Expand Down
4 changes: 2 additions & 2 deletions lib/WeatherMap.functions.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
// PHP Weathermap 0.98a
// Copyright Howard Jones, 2005-2018 [email protected]
// Copyright Howard Jones, 2005-2019 [email protected]
// http://www.network-weathermap.com/
// Released under the GNU Public License
// Released under the MIT License

// Utility functions
// Check for GD & PNG support This is just in here so that both the editor and CLI can use it without the need for another file
Expand Down
4 changes: 2 additions & 2 deletions lib/WeatherMapLink.class.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
// PHP Weathermap 0.98a
// Copyright Howard Jones, 2005-2018 [email protected]
// Copyright Howard Jones, 2005-2019 [email protected]
// http://www.network-weathermap.com/
// Released under the GNU Public License
// Released under the MIT License

require_once "HTML_ImageMap.class.php";

Expand Down
4 changes: 2 additions & 2 deletions lib/WeatherMapNode.class.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
// PHP Weathermap 0.98a
// Copyright Howard Jones, 2005-2018 [email protected]
// Copyright Howard Jones, 2005-2019 [email protected]
// http://www.network-weathermap.com/
// Released under the GNU Public License
// Released under the MIT License

require_once "HTML_ImageMap.class.php";

Expand Down
4 changes: 2 additions & 2 deletions lib/Weathermap.class.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
// PHP Weathermap 0.98a
// Copyright Howard Jones, 2005-2018 [email protected]
// Copyright Howard Jones, 2005-2019 [email protected]
// http://www.network-weathermap.com/
// Released under the GNU Public License
// Released under the MIT License

require_once "HTML_ImageMap.class.php";

Expand Down
2 changes: 1 addition & 1 deletion lib/editor.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ function show_editor_startpage()

print "</div>"; // dlgbody
print '<div class="dlgHelp" id="start_help">PHP Weathermap ' . $WEATHERMAP_VERSION
. ' Copyright &copy; 2005-2018 Howard Jones - [email protected]<br />The current version should always be <a href="http://www.network-weathermap.com/">available here</a>, along with other related software. PHP Weathermap is licensed under the GNU Public License, version 2. See COPYING for details. This distribution also includes the Overlib library by Erik Bosrup.</div>';
. ' Copyright &copy; 2005-2019 Howard Jones - [email protected]<br />The current version should always be <a href="http://www.network-weathermap.com/">available here</a>, along with other related software. PHP Weathermap is licensed under the GNU Public License, version 2. See COPYING for details. This distribution also includes the Overlib library by Erik Bosrup.</div>';

print "</div>"; // dlgStart
print "</div>"; // withjs
Expand Down
2 changes: 1 addition & 1 deletion random-bits/cacti-integrate.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
case '--help':
print "cacti-integrate.php\n";
print
"Copyright Howard Jones, 2008-2018 [email protected]\nReleased under the GNU Public License\nhttp://www.network-weathermap.com/\n\n";
"Copyright Howard Jones, 2008-2019 [email protected]\nReleased under the MIT License\nhttp://www.network-weathermap.com/\n\n";

print "Usage: php cacti-integrate.php [options]\n\n";

Expand Down
8 changes: 4 additions & 4 deletions weathermap
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/php
<?php

// PHP Weathermap 0.98
// Copyright Howard Jones, 2005-2016 [email protected]
// PHP Weathermap 0.98a
// Copyright Howard Jones, 2005-2019 [email protected]
// http://www.network-weathermap.com/
// Released under the GNU Public License
// Released under the MIT License
require_once 'Console/Getopt.php';

require_once "lib/Weathermap.class.php";
Expand Down Expand Up @@ -164,7 +164,7 @@ if (sizeof($gopts) > 0)

case '--help':
print 'PHP Network Weathermap v' . $WEATHERMAP_VERSION."\n";
print "Copyright Howard Jones, 2005-2007 [email protected]\nReleased under the GNU Public License\nhttp://www.network-weathermap.com/\n\n";
print "Copyright Howard Jones, 2005-2019 [email protected]\nReleased under the MIT License\nhttp://www.network-weathermap.com/\n\n";

print "Usage: php weathermap [options]\n\n";

Expand Down

0 comments on commit 9f53974

Please sign in to comment.