From d5b886e32f1e7adf86a0ee98514f9e46fb4666d2 Mon Sep 17 00:00:00 2001 From: Brad Peczka Date: Mon, 28 Oct 2013 19:49:22 +0800 Subject: [PATCH 1/3] Updated group name. --- addhost.php | 2 +- adduser.php | 2 +- alerts.php | 2 +- billing-calculate.php | 2 +- check-errors.php | 2 +- check-services.php | 2 +- delhost.php | 2 +- discovery.php | 2 +- generate-iplist.php | 2 +- irc.php | 2 +- poll-billing.php | 2 +- poll-device.php | 2 +- poller.php | 2 +- renamehost.php | 2 +- snmptrap.php | 2 +- syslog.php | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addhost.php b/addhost.php index 0689d7299a..132296f1b0 100755 --- a/addhost.php +++ b/addhost.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/adduser.php b/adduser.php index d70ade3e12..4afa047226 100755 --- a/adduser.php +++ b/adduser.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/alerts.php b/alerts.php index 52723fdb72..1ad4492a8c 100755 --- a/alerts.php +++ b/alerts.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/billing-calculate.php b/billing-calculate.php index 0d09609bd6..4cd5fd3ffd 100755 --- a/billing-calculate.php +++ b/billing-calculate.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/check-errors.php b/check-errors.php index 22052e5819..f8a3295f3c 100755 --- a/check-errors.php +++ b/check-errors.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/check-services.php b/check-services.php index 8c3539ad2e..6f6a83fed5 100755 --- a/check-services.php +++ b/check-services.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/delhost.php b/delhost.php index ee3d2b360e..9cfc0cee0e 100755 --- a/delhost.php +++ b/delhost.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/discovery.php b/discovery.php index c2aaad204c..85fe0a396e 100755 --- a/discovery.php +++ b/discovery.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/generate-iplist.php b/generate-iplist.php index 805b9d98c7..d644d4ded5 100755 --- a/generate-iplist.php +++ b/generate-iplist.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/irc.php b/irc.php index d1cbe47de5..32c120062c 100755 --- a/irc.php +++ b/irc.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/poll-billing.php b/poll-billing.php index f838e28292..c6845ef236 100755 --- a/poll-billing.php +++ b/poll-billing.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/poll-device.php b/poll-device.php index 96ea6f2431..834a6e1e0a 100755 --- a/poll-device.php +++ b/poll-device.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/poller.php b/poller.php index 55b09636d0..07dfa8a7cc 100755 --- a/poller.php +++ b/poller.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/renamehost.php b/renamehost.php index 5d7daa110c..b139d7ddbf 100755 --- a/renamehost.php +++ b/renamehost.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/snmptrap.php b/snmptrap.php index a7a29877e3..9beef48969 100755 --- a/snmptrap.php +++ b/snmptrap.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/syslog.php b/syslog.php index e6736154f5..6020f65013 100755 --- a/syslog.php +++ b/syslog.php @@ -10,7 +10,7 @@ * @subpackage cli * @author LibreNMS Group * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @copyright (C) 2013 LibreNMS Contributors * */ From fc5860b0ede51dd72a78b94bc7a8d4174e540540 Mon Sep 17 00:00:00 2001 From: Brad Peczka Date: Mon, 28 Oct 2013 19:49:34 +0800 Subject: [PATCH 2/3] Added Twitter and IRC! --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 790533db29..e968a6fb2b 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,10 @@ See `INSTALL.md` for details. Contributing ------------ -Clone the repo and file bug reports and pull requests here. -Join the [librenms-project][1] mailing list to post questions and suggestions. +* Clone the repo and file bug reports and pull requests here. +* Join the [librenms-project][1] mailing list to post questions and suggestions. +* Follow [@LibreNMS on Twitter][2]. +* Chat with developers and users on IRC! We're on the `irc.freenode.net` server, in the `##LibreNMS` channel. [1]: https://groups.google.com/forum/#!forum/librenms-project "LibreNMS" +[2]: https://twitter.com/LibreNMS From 985330f638efad677c277289fed60af2c34623d3 Mon Sep 17 00:00:00 2001 From: Brad Peczka Date: Mon, 28 Oct 2013 21:39:08 +0800 Subject: [PATCH 3/3] Updated copyright and package notices. --- addhost.php | 2 +- adduser.php | 2 +- alerts.php | 2 +- billing-calculate.php | 2 +- check-errors.php | 2 +- check-services.php | 2 +- delhost.php | 2 +- discovery.php | 2 +- generate-iplist.php | 2 +- html/ajax_listports.php | 13 +++++++------ html/bandwidth-graph.php | 13 +++++++------ html/billing-graph.php | 13 +++++++------ html/data.php | 13 +++++++------ html/graph-realtime.php | 6 +++--- html/graph.php | 13 +++++++------ html/index.php | 17 +++++++++-------- html/map.php | 13 +++++++------ html/netcmd.php | 13 +++++++------ html/pdf.php | 13 +++++++------ irc.php | 2 +- poll-billing.php | 2 +- poll-device.php | 2 +- poller.php | 2 +- renamehost.php | 2 +- snmptrap.php | 2 +- syslog.php | 2 +- 26 files changed, 84 insertions(+), 75 deletions(-) diff --git a/addhost.php b/addhost.php index 132296f1b0..461ab1fb53 100755 --- a/addhost.php +++ b/addhost.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/adduser.php b/adduser.php index 4afa047226..84b6656588 100755 --- a/adduser.php +++ b/adduser.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/alerts.php b/alerts.php index 1ad4492a8c..189c79b14b 100755 --- a/alerts.php +++ b/alerts.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/billing-calculate.php b/billing-calculate.php index 4cd5fd3ffd..ba02001f79 100755 --- a/billing-calculate.php +++ b/billing-calculate.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/check-errors.php b/check-errors.php index f8a3295f3c..d69b51d08b 100755 --- a/check-errors.php +++ b/check-errors.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/check-services.php b/check-services.php index 6f6a83fed5..f58bab2b44 100755 --- a/check-services.php +++ b/check-services.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/delhost.php b/delhost.php index 9cfc0cee0e..70b5be4d3f 100755 --- a/delhost.php +++ b/delhost.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/discovery.php b/discovery.php index 85fe0a396e..09bd1b4321 100755 --- a/discovery.php +++ b/discovery.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/generate-iplist.php b/generate-iplist.php index d644d4ded5..1ff94b7e65 100755 --- a/generate-iplist.php +++ b/generate-iplist.php @@ -8,7 +8,7 @@ * * @package librenms * @subpackage cli - * @author LibreNMS Group + * @author The LibreNMS Contributors * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) * @copyright (C) 2013 LibreNMS Contributors * diff --git a/html/ajax_listports.php b/html/ajax_listports.php index b9245ebe35..9c61d4d0a5 100755 --- a/html/ajax_listports.php +++ b/html/ajax_listports.php @@ -1,14 +1,15 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong + * @package librenms + * @subpackage cli + * @author The LibreNMS Contributors + * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/html/bandwidth-graph.php b/html/bandwidth-graph.php index fa4c296855..ab68567148 100644 --- a/html/bandwidth-graph.php +++ b/html/bandwidth-graph.php @@ -1,14 +1,15 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong + * @package librenms + * @subpackage cli + * @author The LibreNMS Contributors + * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/html/billing-graph.php b/html/billing-graph.php index f142804151..5997e04390 100755 --- a/html/billing-graph.php +++ b/html/billing-graph.php @@ -1,14 +1,15 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong + * @package librenms + * @subpackage cli + * @author The LibreNMS Contributors + * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/html/data.php b/html/data.php index bd3d5547e5..b3ba1a5d83 100644 --- a/html/data.php +++ b/html/data.php @@ -1,14 +1,15 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong + * @package librenms + * @subpackage cli + * @author The LibreNMS Contributors + * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/html/graph-realtime.php b/html/graph-realtime.php index 66d80194e5..c9548c99e6 100755 --- a/html/graph-realtime.php +++ b/html/graph-realtime.php @@ -1,11 +1,11 @@ + * This file is included with LibreNMS. It was originally part of m0n0wall * - * @package observium + * @package librenms * @subpackage graphing * @author T. Lechat , Manuel Kasper , Jonathan Watt * @copyright 2004-2006 T. Lechat , Manuel Kasper , Jonathan Watt diff --git a/html/graph.php b/html/graph.php index ca1a1d5950..e06bcfb7aa 100755 --- a/html/graph.php +++ b/html/graph.php @@ -1,14 +1,15 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong + * @package librenms + * @subpackage cli + * @author The LibreNMS Contributors + * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) + * @copyright (C) 2013 LibreNMS Contributors * */ diff --git a/html/index.php b/html/index.php index 6933ad9613..2073f25307 100755 --- a/html/index.php +++ b/html/index.php @@ -1,14 +1,15 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong + * @package librenms + * @subpackage cli + * @author The LibreNMS Contributors + * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) + * @copyright (C) 2013 LibreNMS Contributors * */ @@ -268,9 +269,9 @@ $runtime_end = utime(); $runtime = $runtime_end - $runtime_start; $gentime = substr($runtime, 0, 5); echo('