Removed some references to GPL in editor

sxbctv · Jan 8, 2019 · 8275db3 · 8275db3
1 parent 88b0c24
commit 8275db3
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 19 deletions.
diff --git a/editor-resources/templates/front-oldstyle.php b/editor-resources/templates/front-oldstyle.php
@@ -27,7 +27,8 @@
             <p>Create A New Map:<br>
                 <form method="GET">Named: <input type="text" name="mapname" size="20"><input name="action" type="hidden"
                                                                                              value="newmap"><input
-                            name="plug" type="hidden" value="<?php echo $fromplug ?>"><input type="submit" value="Create">
+                            name="plug" type="hidden" value="<?php echo $fromplug ?>"><input type="submit"
+                                                                                             value="Create">
             <p>
                 <small>Note: filenames must contain no spaces and end in .conf</small>
             </p>
@@ -46,8 +47,8 @@
                     <li>
                         <?php echo $notes[$file] ?>
                         <a href="?mapname=<?php echo $file ?>&action=nothing&plug=<?php
-                            echo $fromplug ?>"><?php echo $file ?></a>
-                         - <span class="comment"><?php echo $title ?></span>
+                        echo $fromplug ?>"><?php echo $file ?></a>
+                        - <span class="comment"><?php echo $title ?></span>
                     </li>
                 <?php endforeach ?>
             </ul>
@@ -56,8 +57,10 @@
             2005-2017
             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.
+                here</a>, along with other related software. PHP Weathermap is licensed under the MIT License, see
+            LICENSE file for more information.
+            This distribution also includes other open source software listed in
+            the README file.
         </div>
     </div>
 </div>

diff --git a/editor-resources/templates/front.php b/editor-resources/templates/front.php
@@ -35,7 +35,7 @@
                                     <span class="input-group"><input type="text" class="form-control"
                                                                      placeholder="filename" name="mapname"
                                                                      size="20"><span
-                                            class="input-group-addon"> .conf</span>
+                                                class="input-group-addon"> .conf</span>
                                     </span>
                                 </div>
 
@@ -44,8 +44,9 @@ class="input-group-addon"> .conf</span>
                                 <input name="plug" type="hidden" value="<?php echo $fromplug ?>">
 
                                 <div class="col-xs-4">
-                                    <input type="checkbox" name="template" value="copy"> <label>copied from</label> <select
-                                        name="sourcemap">
+                                    <input type="checkbox" name="template" value="copy"> <label>copied from</label>
+                                    <select
+                                            name="sourcemap">
                                         <?php foreach ($titles as $file => $title): ?>
                                             <option value="<?php echo $file ?>"><?php echo $file ?></option>
                                         <?php endforeach ?>
@@ -65,7 +66,7 @@ class="input-group-addon"> .conf</span>
                                     <tr>
                                         <td><?php echo $notes[$file] ?></td>
                                         <td><a href="?mapname=<?php echo $file ?>&action=nothing&plug=<?php
-                                        echo $fromplug ?>"><?php echo $file ?></a></td>
+                                            echo $fromplug ?>"><?php echo $file ?></a></td>
                                         <td><span class="comment"><?php echo $title ?></span></td>
                                     </tr>
                                 <?php endforeach ?>
@@ -78,9 +79,9 @@ class="input-group-addon"> .conf</span>
                             Copyright &copy; 2005-2016 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 other open source software listed in
+                            along with other related software. PHP Weathermap is licensed under the MIT License, see
+                            LICENSE file for more information.
+                            This distribution also includes other open source software listed in
                             the README file.
                         </small>
                     </div>

diff --git a/lib/Weathermap/Editor/Editor.php b/lib/Weathermap/Editor/Editor.php
@@ -2,7 +2,7 @@
 // PHP Weathermap 0.97b
 // Copyright Howard Jones, 2005-2012 [email protected]
 // http://www.network-weathermap.com/
-// Released under the GNU Public License
+// PHP Weathermap is licensed under the MIT License, see LICENSE file for more information.
 namespace Weathermap\Editor;
 
 use Weathermap\Core\Map;

diff --git a/lib/Weathermap/Editor/EditorUI.php b/lib/Weathermap/Editor/EditorUI.php
@@ -2,7 +2,7 @@
 // PHP Weathermap 0.97b
 // Copyright Howard Jones, 2005-2012 [email protected]
 // http://www.network-weathermap.com/
-// Released under the GNU Public License
+// PHP Weathermap is licensed under the MIT License, see LICENSE file for more information.
 
 
 namespace Weathermap\Editor;

diff --git a/lib/Weathermap/Plugins/Datasources/ExternalScript.php b/lib/Weathermap/Plugins/Datasources/ExternalScript.php
@@ -41,11 +41,13 @@ public function __construct()
     public function ReadData($targetString, &$map, &$mapItem)
     {
         // By default, fail.
-        // Remove this line ONLY if you understand the risks, and have taken appropriate measures
+        // Remove these 3 lines ONLY if you understand the risks, and have taken appropriate measures
         // so that users (or the public) can't access your map editor! Otherwise they can run
         // arbitrary scripts on your Weathermap server.
 
-        return $this->returnData();
+        if (!array_key_exists("WM_TESTS_RUNNING", $_ENV)) {
+            return $this->returnData();
+        }
 
         if (preg_match("/^!(.*)$/", $targetString, $matches)) {
             $command = $matches[1];
@@ -77,6 +79,7 @@ public function ReadData($targetString, &$map, &$mapItem)
             }
         }
 
+
         return $this->returnData();
     }
 }

diff --git a/lib/all.php b/lib/all.php
@@ -2,7 +2,7 @@
 /*   PHP Weathermap 1.0.0
      Copyright Howard Jones, 2005-2018 [email protected]
      http://www.network-weathermap.com/
-     Released under the GNU Public License
+     PHP Weathermap is licensed under the MIT License, see LICENSE file for more information.
 
     one file to include all the others...
 */

diff --git a/random-bits/cacti-integrate.php b/random-bits/cacti-integrate.php
@@ -142,7 +142,7 @@
             case '--help':
                 print "cacti-integrate.php\n";
                 print
-                    "Copyright Howard Jones, 2008-2010 [email protected]\nReleased under the GNU Public License\nhttp://www.network-weathermap.com/\n\n";
+                    "Copyright Howard Jones, 2008-2010 [email protected]\nPHP Weathermap is licensed under the MIT License, see LICENSE file for more information.\nhttp://www.network-weathermap.com/\n\n";
 
                 print "Usage: php cacti-integrate.php [options]\n\n";
 

diff --git a/weathermap b/weathermap
@@ -4,7 +4,7 @@
 // PHP Weathermap 1.0.0dev
 // Copyright Howard Jones, 2005-2018 [email protected]
 // http://www.network-weathermap.com/
-// Released under the GNU Public License
+// PHP Weathermap is licensed under the MIT License, see LICENSE file for more information.
 
 use Weathermap\CLI\Runner;