From 9c6656dadc55988fb65222e94beaeb132877dc17 Mon Sep 17 00:00:00 2001 From: Gavin Towey Date: Fri, 23 Mar 2012 11:55:17 -0700 Subject: [PATCH] updated license to Apache 2.0 --- LICENSE | 3 +++ index.php | 10 +++++++++ lib/Anemometer.php | 2 +- lib/AnemometerModel.php | 2 +- lib/Helpers.php | 2 +- lib/Loader.php | 2 +- lib/MySQLTableReport.php | 2 +- lib/QueryExplain.php | 2 +- lib/QueryTableParser.php | 2 +- views/.graph_search.php.swp | Bin 0 -> 20480 bytes views/graph_search.php | 40 ++++++++++++++++-------------------- 11 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 LICENSE create mode 100644 views/.graph_search.php.swp diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..c8748bcd --- /dev/null +++ b/LICENSE @@ -0,0 +1,3 @@ +This software is licensed under the Apache 2.0 license. This includes all files created by the authors in this distribution. This project includes work from third parties as well. Third party included files fall under their own license terms. + +The full text of the license agreement is at http://www.apache.org/licenses/LICENSE-2.0 diff --git a/index.php b/index.php index df505d64..8a272148 100755 --- a/index.php +++ b/index.php @@ -1,8 +1,18 @@ , Geoffrey Anderson + * @created 2012-01-01 + * @license Apache 2.0 license. See LICENSE document for more info + **/ + set_include_path( get_include_path() . PATH_SEPARATOR . "./lib"); require "Helpers.php"; require "Anemometer.php"; /* + * move these to github * todo: implement exra fields ... somehow
or remove extra fields for version 1 * todo: add reviewed_status to search fields ... tab for extended search?
* todo: possible report for reviewed (aggregate by reviewd type, reviwed/unreviewed / new or old, etc)
diff --git a/lib/Anemometer.php b/lib/Anemometer.php index 4e6cd7a2..68e92f67 100644 --- a/lib/Anemometer.php +++ b/lib/Anemometer.php @@ -15,7 +15,7 @@ * * @author Gavin Towey and Geoff Anderson * @created 2012-01-01 - * @license please contact the authors for licensing information + * @license Apache 2.0 license. See LICENSE document for more info * */ class Anemometer { diff --git a/lib/AnemometerModel.php b/lib/AnemometerModel.php index 80b28de6..afef3c53 100644 --- a/lib/AnemometerModel.php +++ b/lib/AnemometerModel.php @@ -11,7 +11,7 @@ * * @author Gavin Towey and Geoff Anderson * @created 2012-01-01 - * @license please contact the authors for licensing information + * @license Apache 2.0 license. See LICENSE document for more info */ class AnemometerModel { diff --git a/lib/Helpers.php b/lib/Helpers.php index d54de54f..5b23da48 100644 --- a/lib/Helpers.php +++ b/lib/Helpers.php @@ -3,7 +3,7 @@ * * Global helper functions for the weatherstation app * @author Gavin Towey - * @license please contact the authors for licensing information + * @license Apache 2.0 license. See LICENSE document for more info * @created 2012-01-01 */ diff --git a/lib/Loader.php b/lib/Loader.php index 388de3ae..c2b4d74b 100644 --- a/lib/Loader.php +++ b/lib/Loader.php @@ -4,7 +4,7 @@ * * @author Gavin Towey * @created 2012-01-01 - * @license please contact the authors for licensing information + * @license Apache 2.0 license. See LICENSE document for more info */ class Loader { diff --git a/lib/MySQLTableReport.php b/lib/MySQLTableReport.php index 1c2904a0..de573fcf 100644 --- a/lib/MySQLTableReport.php +++ b/lib/MySQLTableReport.php @@ -87,7 +87,7 @@ * * @author Gavin Towey * @created 2012-01-01 - * @license contact the author for details and permissions + * @license Apache 2.0 license. See LICENSE document for more info * * @todo create a base class * @todo create a pear package out of this diff --git a/lib/QueryExplain.php b/lib/QueryExplain.php index c4149f89..131bb5ee 100644 --- a/lib/QueryExplain.php +++ b/lib/QueryExplain.php @@ -38,7 +38,7 @@ * * @author Gavin Towey * @created 2012-01-01 - * + * @license Apache 2.0 license. See LICENSE document for more info * */ diff --git a/lib/QueryTableParser.php b/lib/QueryTableParser.php index 48833ab1..75b14e1f 100644 --- a/lib/QueryTableParser.php +++ b/lib/QueryTableParser.php @@ -13,7 +13,7 @@ * * @author Gavin Towey * @created 2012-01-01 - * @license Please contact the author for licensing + * @license Apache 2.0 license. See LICENSE document for more info * * @todo handle table names with spaces wrapped in backticks or quotes * @todo stop parsing early if possible -- after the JOIN clause (if any) diff --git a/views/.graph_search.php.swp b/views/.graph_search.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..d0cfc9fddd7a7dfecdecd67be4de9e2bc29d978b GIT binary patch literal 20480 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 literal 0 HcmV?d00001 diff --git a/views/graph_search.php b/views/graph_search.php index 08004f7a..4592cd7b 100644 --- a/views/graph_search.php +++ b/views/graph_search.php @@ -32,7 +32,7 @@ - + @@ -53,23 +53,23 @@ - +
> Show each host as a separate series - +
- +
- + - +
- +
- +
@@ -85,17 +85,14 @@