* added initial dynamic table prototype

6 files changed, 1151 insertions, 2 deletions

diff --git a/packages/dyntables/pkg/dyntables.inc b/packages/dyntables/pkg/dyntables.inc
new file mode 100644
index 00000000..853eea11
--- /dev/null
+++ b/packages/dyntables/pkg/dyntables.inc
@@ -0,0 +1,111 @@
+<?php
+/* $Id$ */
+/* ========================================================================== */
+/*
+    dyntables.inc
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2007 Daniel S. Haischt <me@daniel.stefan.haischt.name>
+    All rights reserved.
+
+    Based on m0n0wall (http://m0n0.ch/wall)
+    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+    All rights reserved.
+                                                                              */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+
+require_once("dyntables_classdefs.inc");
+
+function syncPackageDyntables() {
+
+}
+
+function installPackageDyntables() {
+
+}
+
+function deinstallPackageDyntables() {
+
+}
+
+function checkForExtension($alertClass) {
+    if(! extension_loaded( 'json' )) {
+        if(! @dl( 'json.so' )) {
+            return openNoExtDialog($alertClass);
+        }
+    }
+}
+
+/**
+ * openNoExtDialog()
+ *
+ * @param mixed $effectClass
+ * @return
+ */
+function openNoExtDialog($effectClass) {
+    $alertMessage = gettext("PHP extension json.so was not found or could not be loaded. Please check you PHP installation.");
+    $dialogScript = "
+        <script type='text/javascript'>
+            var anchor = document.getElementById('popupanchor');
+
+            function openNoExtDialog(html) {
+                var effect = new PopupEffect(html, {className: '${effectClass}'});
+                Dialog.alert('${alertMessage}',{className:'alphacube', top:150, width:400, height:null, showEffect:effect.show.bind(effect), hideEffect:effect.hide.bind(effect)});
+            }
+
+            openNoExtDialog(anchor);
+        </script>
+    ";
+
+    return $dialogScript;
+}
+
+/**
+* getWindowJSScriptRefs()
+*
+* @return an array of &lt;script /&gt; elements
+*/
+function getWindowJSScriptRefs(){
+  $result = array('<script type="text/javascript" src="/javascript/windows-js/javascript/window.js"></script>',
+                  '<script type="text/javascript" src="/javascript/windows-js/javascript/window_effects.js"></script>',
+                  '<script type="text/javascript" src="/javascript/windows-js/javascript/debug.js"></script>');
+
+  return $result;
+}
+
+/**
+* getWindowJSStyleRefs()
+*
+* @return an array of &lt;style /&gt; tags
+*/
+function getWindowJSStyleRefs(){
+  $result = array('<link href="/javascript/windows-js/themes/default.css" rel="stylesheet" type="text/css" />',
+                  '<link href="/javascript/windows-js/themes/alert.css" rel="stylesheet" type="text/css" />',
+                  '<link href="/javascript/windows-js/themes/alphacube.css" rel="stylesheet" type="text/css" />');
+
+  return $result;
+}
+
+?>
\ No newline at end of file
diff --git a/packages/dyntables/pkg/dyntables.xml b/packages/dyntables/pkg/dyntables.xml
new file mode 100644
index 00000000..529e587e
--- /dev/null
+++ b/packages/dyntables/pkg/dyntables.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../../xsl/package.xsl"?>
+<packagegui>
+  <copyright>
+        <![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+    dyntables.xml
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2007 Daniel S. Haischt <me@daniel.stefan.haischt.name>
+    All rights reserved.
+
+    Based on m0n0wall (http://m0n0.ch/wall)
+    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+    All rights reserved.
+                                                                              */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+  ]]>
+  </copyright>
+  <description>
+      This package adds dynamic reloading support of table data to
+      various pfSense web pages. Reloading table data is done using
+      Ajax.
+  </description>
+  <requirements>
+    This package is supposed to be run on RELENG based pfSense systems.
+  </requirements>
+  <faq>Currently there are no FAQ items provided.</faq>
+  <name>dyntables</name>
+  <version>1.0</version>
+  <title>System: Dynamic Tables</title>
+  <include_file>/usr/local/pkg/dyntables.inc</include_file>
+  <!-- Menu is where this packages menu will appear -->
+  <!--
+  <menu>
+    <name>Menu Name</name>
+    <section>Menu Section</section>
+    <url>/phpfile.php</url>
+  </menu>
+  -->
+  <!--
+  <service>
+    <name>yourservice</name>
+    <rcfile>/usr/local/etc/rc.d/yourservice.sh</rcfile>
+  </service>
+  -->
+  <tabs />
+  <!--
+    configpath gets expanded out automatically and config items
+    will be stored in that location
+  -->
+  <configpath>['installedpackages']['dyntables']['config']</configpath>
+  <!--
+    |
+    | PHP files (user management)
+    |
+  -->
+  <additional_files_needed>
+    <prefix>/usr/local/www/</prefix>
+    <chmod>0755</chmod>
+    <item>http://www.pfsense.com/packages/config/dyntables/www/php/diag_dhcp_leases.php</item>
+  </additional_files_needed>
+  <!--
+    |
+    | JavaScript files (*.js and *.inc.)
+    |
+  -->
+  <additional_files_needed>
+    <prefix>/usr/local/www/javascript</prefix>
+    <chmod>0755</chmod>
+    <item>http://www.pfsense.com/packages/config/dyntables/www/js/dyntables.js</item>
+  </additional_files_needed>
+  <!--
+    |
+    | Include files (class defs etc.)
+    |
+  -->
+  <additional_files_needed>
+    <prefix>/usr/local/pkg/</prefix>
+    <chmod>0755</chmod>
+    <item>http://www.pfsense.com/packages/config/dyntables/pkg/dyntables.inc</item>
+  </additional_files_needed>
+  <additional_files_needed>
+    <prefix>/usr/local/pkg/</prefix>
+    <chmod>0755</chmod>
+    <item>http://www.pfsense.com/packages/config/dyntables/pkg/dyntables_classdefs.inc</item>
+  </additional_files_needed>
+  <!--
+    |
+    | Binary files
+    |
+  -->
+  <additional_files_needed>
+    <prefix>/usr/local/lib/php/extensions/no-debug-non-zts-20020429/</prefix>
+    <chmod>0755</chmod>
+    <item>http://www.pfsense.com/packages/config/dyntables/bin/json.so</item>
+  </additional_files_needed>
+  <!--
+    fields gets invoked when the user adds or edits a item. The following items
+    will be parsed and rendered for the user as a gui with input, and selectboxes.
+  -->
+  <!--
+    Arbitrary PHP Code, that gets executed if a certain event gets triggered.
+  -->
+  <custom_php_resync_config_command>
+    syncPackageDyntables();
+  </custom_php_resync_config_command>
+  <custom_php_install_command>
+    installPackageDyntables();
+  </custom_php_install_command>
+  <custom_php_deinstall_command>
+    deinstallPackageDyntables();
+  </custom_php_deinstall_command>
+</packagegui>
diff --git a/packages/dyntables/pkg/dyntables_classdefs.inc b/packages/dyntables/pkg/dyntables_classdefs.inc
new file mode 100644
index 00000000..696170d1
--- /dev/null
+++ b/packages/dyntables/pkg/dyntables_classdefs.inc
@@ -0,0 +1,146 @@
+<?php
+/* $Id$ */
+/* ========================================================================== */
+/*
+    classdefs.inc
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2007 Daniel S. Haischt <me@daniel.stefan.haischt.name>
+    All rights reserved.
+
+    Based on m0n0wall (http://m0n0.ch/wall)
+    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+    All rights reserved.
+                                                                              */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+
+if (! class_exists("Object")) {
+    class Object {
+        function Object() {
+            $args = func_get_args();
+            if (method_exists($this, '__destruct')) {
+                        register_shutdown_function(array(&$this, '__destruct'));
+            }
+            call_user_func_array(array(&$this, '__construct'), $args);
+        }
+
+        function __construct() {
+        }
+    }
+}
+
+class Column extends Object {
+    var $defaultClass = "listhdrr";
+    var $class = null;
+    var $name = null;
+    var $sortID = null;
+
+    function __construct($name) {
+        // Perform object initialization here.
+        parent::__construct();
+        $this->name = $name;
+    }
+
+    function setClass($class) {
+        $this->class = $class;
+    }
+
+    function getClass() {
+        return $this->class;
+    }
+
+    function setSortID($id) {
+        $this->sortID = $id;
+    }
+
+    function getSortID() {
+        return $this->sortID;
+    }
+
+    function toHTML() {
+        global $_GET;
+
+        $classString = $this->class != null ? $this->class : $this->defaultClass;
+        $allString = isset($_GET['all']) ? ", {$_GET['all']}" : "";
+        return "<td class='{$classString}'><a id='{$this->sortID}' href='#' onclick='sortTable(this{$allString});'>{$this->name}</a></td>";
+    }
+}
+
+class Table extends Object {
+    var $columns = null;
+    var $data = null;
+
+    function __construct() {
+        // Perform object initialization here.
+        parent::__construct();
+        $this->columns = array();
+        $this->data = array();
+    }
+
+    function addColumn($column, $id = null, $class = null) {
+        $column = new Column($column);
+
+        if ($id != null) {
+            $column->setSortID($id);
+        }
+        if ($class != null) {
+            $column->setClass($class);
+        }
+
+        $this->columns[] = $column;
+    }
+
+    function addDataSet($dataSet) {
+        if (is_array($dataSet)) {
+            if (count($dataSet) == count($this->columns)) {
+                $this->data[] = $dataSet;
+            } else {
+                trigger_error("Dataset does not match column size.");
+            }
+        } else {
+            trigger_error("Adding non arrays as datasets to a table is not supported.");
+        }
+    }
+
+    function setData(&$data) {
+        $this->data = $data;
+    }
+
+    function getData() {
+        return $this->data;
+    }
+
+    function getColumnHTML() {
+        $htmlString = "";
+
+        foreach($this->columns as $column) {
+            $htmlString .= $column->toHtml();
+        }
+
+        return "<tr>{$htmlString}</tr>";
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/packages/dyntables/www/js/dyntables.js b/packages/dyntables/www/js/dyntables.js
new file mode 100644
index 00000000..9c74ee5d
--- /dev/null
+++ b/packages/dyntables/www/js/dyntables.js
@@ -0,0 +1,282 @@
+/* $Id$ */
+/* ========================================================================== */
+/*
+    authng_wizard.js
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2007 Daniel S. Haischt <me@daniel.stefan.haischt.name>
+    All rights reserved.
+
+    Based on m0n0wall (http://m0n0.ch/wall)
+    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+    All rights reserved.
+                                                                              */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+
+/**
+ *
+ * @access public
+ * @return void
+ **/
+function getFirstTD(node, index){
+    var firstTD = node.childNodes[index];
+
+    if (firstTD.tagName == 'TD') {
+        return firstTD;
+    } else {
+        return getFirstTD(node, ++index);
+    }
+}
+
+/**
+ *
+ * @access public
+ * @return void
+ **/
+function getTableRow(nodes, index){
+    var row = nodes[index];
+
+    if (row.tagName == 'TR') {
+        return row;
+    } else {
+        return getTableRow(nodes, ++index);
+    }
+}
+
+/**
+ *
+ * @access public
+ * @return void
+ **/
+function emtyDhcpLeaseTable(table) {
+    var tbody = table.childNodes[1];
+    var trNodes = tbody.childNodes;
+
+    for (i = 0; i < trNodes.length; i++) {
+        var currentRow = getTableRow(trNodes, i);
+        var firstTd = getFirstTD(currentRow, 0);
+        var classAttrib = firstTd.className;
+
+        if (classAttrib == 'listhdrr') {
+            continue;
+        } else if (currentRow.tagName == 'TR') {
+            tbody.removeChild(currentRow);
+        }
+    }
+}
+
+/**
+ * TODO: data[if], $fspans, $fspane,
+ *
+ **/
+function dhcpLeaseTableToHTML(table, json, theme) {
+    var tbody = table.childNodes[1];
+
+    if (json && json.length > 0) {
+        for (i = 0; i < json.length; i++) {
+            /* text nodes */
+            var newActTxt = document.createTextNode(json[i]['act']);
+            var newEndTxt = document.createTextNode(json[i]['end']);
+            var newStartTxt = document.createTextNode(json[i]['start']);
+            var newHostnameTxt = document.createTextNode(json[i]['hostname']);
+            var newIPTxt = document.createTextNode(json[i]['ip']);
+            var newMACTxt = document.createTextNode(json[i]['mac']);
+            var newOnlineTxt = document.createTextNode(json[i]['online']);
+            var newTypeTxt = document.createTextNode(json[i]['type']);
+
+            var newTR = document.createElement("tr");
+            var newTRIdAttrib = document.createAttribute("id");
+            newTRIdAttrib.nodeValue = "dhcpRow" + i;
+            newTR.setAttributeNode(newTRIdAttrib);
+
+            /* IP td element */
+            var newIPTD = document.createElement("td");
+            /* TD attributes */
+            var newIPTDClassAttrib = document.createAttribute("class");
+            newIPTDClassAttrib.nodeValue = "listlr";
+            /* assign attribs */
+            newIPTD.setAttributeNode(newIPTDClassAttrib);
+
+            /* MAC td element */
+            var newMACTD = document.createElement("td");
+            /* TD attributes */
+            var newMACTDClassAttrib = document.createAttribute("class");
+            newMACTDClassAttrib.nodeValue = "listr";
+            /* assign attribs */
+            newMACTD.setAttributeNode(newMACTDClassAttrib);
+
+            /* Hostname td element */
+            var newHostnameTD = document.createElement("td");
+            /* TD attributes */
+            var newHostnameTDClassAttrib = document.createAttribute("class");
+            newHostnameTDClassAttrib.nodeValue = "listr";
+            /* assign attribs */
+            newHostnameTD.setAttributeNode(newHostnameTDClassAttrib);
+
+            /* Start td element */
+            var newStartTD = document.createElement("td");
+            /* TD attributes */
+            var newStartTDClassAttrib = document.createAttribute("class");
+            newStartTDClassAttrib.nodeValue = "listr";
+            /* assign attribs */
+            newStartTD.setAttributeNode(newStartTDClassAttrib);
+
+            /* End td element */
+            var newEndTD = document.createElement("td");
+            /* TD attributes */
+            var newEndTDClassAttrib = document.createAttribute("class");
+            newEndTDClassAttrib.nodeValue = "listr";
+            /* assign attribs */
+            newEndTD.setAttributeNode(newEndTDClassAttrib);
+
+            /* Online td element */
+            var newOnlineTD = document.createElement("td");
+            /* TD attributes */
+            var newOnlineTDClassAttrib = document.createAttribute("class");
+            newOnlineTDClassAttrib.nodeValue = "listr";
+            /* assign attribs */
+            newOnlineTD.setAttributeNode(newOnlineTDClassAttrib);
+
+            /* Lease td element */
+            var newLeaseTD = document.createElement("td");
+            /* TD attributes */
+            var newLeaseTDClassAttrib = document.createAttribute("class");
+            newLeaseTDClassAttrib.nodeValue = "listr";
+            /* assign attribs */
+            newLeaseTD.setAttributeNode(newLeaseTDClassAttrib);
+
+            /* Mapping td element */
+            var newMappingTD = document.createElement("td");
+            /* TD attributes */
+            var newMappingTDClassAttrib = document.createAttribute("class");
+            newMappingTDClassAttrib.nodeValue = "list";
+            var newMappingTDValignAttrib = document.createAttribute("valign");
+            newMappingTDValignAttrib.nodeValue = "middle";
+            /* assign attribs */
+            newMappingTD.setAttributeNode(newMappingTDClassAttrib);
+            newMappingTD.setAttributeNode(newMappingTDValignAttrib);
+
+            /* WOL td element */
+            var newWOLTD = document.createElement("td");
+            /* TD attributes */
+            var newWOLTDValignAttrib = document.createAttribute("valign");
+            newWOLTDValignAttrib.nodeValue = "middle";
+            /* assign attribs */
+            newWOLTD.setAttributeNode(newWOLTDValignAttrib);
+
+            /* Mapping anchor */
+            var newMappingAnchor = document.createElement("a");
+            /* Anchor attribs */
+            var newMappingAnchorHrefAttrib = document.createAttribute("href");
+            newMappingAnchorHrefAttrib.nodeValue = "services_dhcp_edit.php?if=lan&mac=" + json[i]['mac'] + "&hostname=" + json[i]['hostname'];
+            /* assign attribs */
+            newMappingAnchor.setAttributeNode(newMappingAnchorHrefAttrib);
+
+            /* Mapping button */
+            var newMappingButton = document.createElement("img");
+            /* Button attribs */
+            var newMappingButtonSrcAttrib = document.createAttribute("src");
+            newMappingButtonSrcAttrib.nodeValue = "/themes/" + theme + "/images/icons/icon_plus.gif";
+            var newMappingButtonWidthAttrib = document.createAttribute("width");
+            newMappingButtonWidthAttrib.nodeValue = "17";
+            var newMappingButtonHeightAttrib = document.createAttribute("height");
+            newMappingButtonHeightAttrib.nodeValue = "17";
+            var newMappingButtonBorderAttrib = document.createAttribute("border");
+            newMappingButtonBorderAttrib.nodeValue = "0";
+            var newMappingButtonTitleAttrib = document.createAttribute("title");
+            newMappingButtonTitleAttrib.nodeValue = "add a static mapping for this MAC address";
+            var newMappingButtonAltAttrib = document.createAttribute("alt");
+            newMappingButtonAltAttrib.nodeValue = "add a static mapping for this MAC address";
+            /* assign attribs */
+            newMappingButton.setAttributeNode(newMappingButtonSrcAttrib);
+            newMappingButton.setAttributeNode(newMappingButtonWidthAttrib);
+            newMappingButton.setAttributeNode(newMappingButtonHeightAttrib);
+            newMappingButton.setAttributeNode(newMappingButtonBorderAttrib);
+            newMappingButton.setAttributeNode(newMappingButtonTitleAttrib);
+            newMappingButton.setAttributeNode(newMappingButtonAltAttrib);
+
+            /* WOL anchor */
+            var newWOLAnchor = document.createElement("a");
+            /* Anchor attribs */
+            var newWOLAnchorHrefAttrib = document.createAttribute("href");
+            newWOLAnchorHrefAttrib.nodeValue = "services_wol_edit.php?if=lan&mac=" + json[i]['mac'] + "&descr=pfSense";
+            /* assign attribs */
+            newWOLAnchor.setAttributeNode(newWOLAnchorHrefAttrib);
+
+            /* WOL button */
+            var newWOLButton = document.createElement("img");
+            /* Button attribs */
+            var newWOLButtonSrcAttrib = document.createAttribute("src");
+            newWOLButtonSrcAttrib.nodeValue = "/themes/" + theme + "/images/icons/icon_wol_all.gif";
+            var newWOLButtonWidthAttrib = document.createAttribute("width");
+            newWOLButtonWidthAttrib.nodeValue = "17";
+            var newWOLButtonHeightAttrib = document.createAttribute("height");
+            newWOLButtonHeightAttrib.nodeValue = "17";
+            var newWOLButtonBorderAttrib = document.createAttribute("border");
+            newWOLButtonBorderAttrib.nodeValue = "0";
+            var newWOLButtonTitleAttrib = document.createAttribute("title");
+            newWOLButtonTitleAttrib.nodeValue = "add a Wake on Lan mapping for this MAC address";
+            var newWOLButtonAltAttrib = document.createAttribute("alt");
+            newWOLButtonAltAttrib.nodeValue = "add a Wake on Lan mapping for this MAC address";
+            /* assign attribs */
+            newWOLButton.setAttributeNode(newWOLButtonSrcAttrib);
+            newWOLButton.setAttributeNode(newWOLButtonWidthAttrib);
+            newWOLButton.setAttributeNode(newWOLButtonHeightAttrib);
+            newWOLButton.setAttributeNode(newWOLButtonBorderAttrib);
+            newWOLButton.setAttributeNode(newWOLButtonTitleAttrib);
+            newWOLButton.setAttributeNode(newWOLButtonAltAttrib);
+
+            /* assign buttons to anchor elements */
+            newMappingAnchor.appendChild(newMappingButton);
+            newWOLAnchor.appendChild(newWOLButton);
+
+            /* assign anchors to TD elements */
+            newMappingTD.appendChild(newMappingAnchor);
+            newWOLTD.appendChild(newWOLAnchor);
+
+            /* assign text nodes to TD elements */
+            newIPTD.appendChild(newIPTxt);
+            newMACTD.appendChild(newMACTxt);
+            newHostnameTD.appendChild(newHostnameTxt);
+            newStartTD.appendChild(newStartTxt);
+            newEndTD.appendChild(newEndTxt);
+            newOnlineTD.appendChild(newOnlineTxt);
+            newLeaseTD.appendChild(newActTxt);
+
+            /* populate table body */
+            newTR.appendChild(newIPTD);
+            newTR.appendChild(newMACTD);
+            newTR.appendChild(newHostnameTD);
+            newTR.appendChild(newStartTD);
+            newTR.appendChild(newEndTD);
+            newTR.appendChild(newOnlineTD);
+            newTR.appendChild(newLeaseTD);
+            newTR.appendChild(newMappingTD);
+            newTR.appendChild(newWOLTD);
+
+            tbody.appendChild(newTR);
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/dyntables/www/php/diag_dhcp_leases.php b/packages/dyntables/www/php/diag_dhcp_leases.php
new file mode 100644
index 00000000..54883431
--- /dev/null
+++ b/packages/dyntables/www/php/diag_dhcp_leases.php
@@ -0,0 +1,438 @@
+<?php
+/* $Id$ */
+/*
+	diag_dhcp_leases.php
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially part of m0n0wall (http://m0n0.ch/wall)
+	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+require("dyntables.inc");
+
+/* ========================================================================== */
+/* ======================= NON GUI RELATED FUNCTIONS ======================== */
+/* ========================================================================== */
+
+function leasecmp($a, $b) {
+        return strcmp($a[$_GET['order']], $b[$_GET['order']]);
+}
+
+function adjust_gmt($dt) {
+        $ts = strtotime($dt . " GMT");
+        return strftime("%Y/%m/%d %H:%M:%S", $ts);
+}
+
+function remove_duplicate($array, $field)
+{
+  foreach ($array as $sub)
+   $cmp[] = $sub[$field];
+  $unique = array_unique($cmp);
+  foreach ($unique as $k => $rien)
+   $new[] = $array[$k];
+  return $new;
+}
+
+$leasesfile = "{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases";
+$awk = "/usr/bin/awk";
+/* this pattern sticks comments into a single array item */
+$cleanpattern = "'{ gsub(\"#.*\", \"\");} { gsub(\";\", \"\"); print;}'";
+/* We then split the leases file by } */
+$splitpattern = "'BEGIN { RS=\"}\";} {for (i=1; i<=NF; i++) printf \"%s \", \$i; printf \"}\\n\";}'";
+
+/* stuff the leases file in a proper format into a array by line */
+exec("cat {$leasesfile} | {$awk} {$cleanpattern} | {$awk} {$splitpattern}", $leases_content);
+$leases_count = count($leases_content);
+
+$pools = array();
+$leases = array();
+$i = 0;
+$l = 0;
+$p = 0;
+
+// Put everything together again
+while($i < $leases_count) {
+	/* split the line by space */
+	$data = explode(" ", $leases_content[$i]);
+	/* walk the fields */
+	$f = 0;
+	$fcount = count($data);
+	/* with less then 20 fields there is nothing useful */
+	if($fcount < 20) {
+		$i++;
+		continue;
+	}
+	while($f < $fcount) {
+		switch($data[$f]) {
+			case "failover":
+				$pools[$p]['name'] = $data[$f+2];
+				$pools[$p]['mystate'] = $data[$f+7];
+				$pools[$p]['peerstate'] = $data[$f+14];
+				$pools[$p]['mydate'] = $data[$f+10];
+				$pools[$p]['mydate'] .= " " . $data[$f+11];
+				$pools[$p]['peerdate'] = $data[$f+17];
+				$pools[$p]['peerdate'] .= " " . $data[$f+18];
+				$p++;
+				$i++;
+				continue 3;
+			case "lease":
+				$leases[$l]['ip'] = $data[$f+1];
+				$leases[$l]['type'] = "dynamic";
+				$f = $f+2;
+				break;
+			case "starts":
+				$leases[$l]['start'] = $data[$f+2];
+				$leases[$l]['start'] .= " " . $data[$f+3];
+				$f = $f+3;
+				break;
+			case "ends":
+				$leases[$l]['end'] = $data[$f+2];
+				$leases[$l]['end'] .= " " . $data[$f+3];
+				$f = $f+3;
+				break;
+			case "tstp":
+				$f = $f+3;
+				break;
+			case "tsfp":
+				$f = $f+3;
+				break;
+			case "atsfp":
+				$f = $f+3;
+				break;
+			case "cltt":
+				$f = $f+3;
+				break;
+			case "binding":
+				switch($data[$f+2]) {
+					case "active":
+						$leases[$l]['act'] = "active";
+						break;
+					case "free":
+						$leases[$l]['act'] = "expired";
+						$leases[$l]['online'] = "offline";
+						break;
+					case "backup":
+						$leases[$l]['act'] = "reserved";
+						$leases[$l]['online'] = "offline";
+						break;
+				}
+				$f = $f+1;
+				break;
+			case "next":
+				/* skip the next binding statement */
+				$f = $f+3;
+				break;
+			case "hardware":
+				$leases[$l]['mac'] = $data[$f+2];
+				/* check if it's online and the lease is active */
+				if($leases[$l]['act'] == "active") {
+					$online = exec("/usr/sbin/arp -an |/usr/bin/awk '/{$leases[$l]['ip']}/ {print}'|wc -l");
+					if ($online == 1) {
+						$leases[$l]['online'] = 'online';
+					} else {
+						$leases[$l]['online'] = 'offline';
+					}
+				}
+				$f = $f+2;
+				break;
+			case "client-hostname":
+				if($data[$f+1] <> "") {
+					$leases[$l]['hostname'] = preg_replace('/"/','',$data[$f+1]);
+				} else {
+					$hostname = gethostbyaddr($leases[$l]['ip']);
+					if($hostname <> "") {
+						$leases[$l]['hostname'] = $hostname;
+					}
+				}
+				$f = $f+1;
+				break;
+			case "uid":
+				$f = $f+1;
+				break;
+		}
+		$f++;
+	}
+	$l++;
+	$i++;
+}
+
+/* remove duplicate items by mac address */
+if(count($leases) > 0) {
+	$leases = remove_duplicate($leases,"ip");
+}
+
+if(count($pools) > 0) {
+	$pools = remove_duplicate($pools,"name");
+	asort($pools);
+}
+
+foreach($config['interfaces'] as $ifname => $ifarr) {
+	if (is_array($config['dhcpd'][$ifname]['staticmap'])) {
+		foreach($config['dhcpd'][$ifname]['staticmap'] as $static) {
+			$slease = array();
+			$slease['ip'] = $static['ipaddr'];
+			$slease['type'] = "static";
+			$slease['mac'] = $static['mac'];
+			$slease['start'] = gmdate("M d Y H:i:s", time());
+			$slease['end'] = gmdate("M d Y H:i:s", time());
+			$slease['end'] = gmdate("M d Y H:i:s", strtotime('+5 minutes'));
+			$slease['hostname'] = $static['hostname'];
+			$slease['act'] = "static";
+			$online = exec("/usr/sbin/arp -an |/usr/bin/grep {$slease['mac']}| /usr/bin/wc -l|/usr/bin/awk '{print $1;}'");
+			if ($online == 1) {
+				$slease['online'] = 'online';
+			} else {
+				$slease['online'] = 'offline';
+			}
+			$leases[] = $slease;
+		}
+	}
+}
+
+/* ========================================================================== */
+/* ====================== PROCESS POST AND GET VARS ========================= */
+/* ========================================================================== */
+
+if ($_GET['order']) {
+	usort($leases, "leasecmp");
+} else if ($_GET['refresh']) {
+    dl( 'json.so' );
+    echo json_encode($leases);
+    exit;
+}
+
+/* ========================================================================== */
+/* =================== GUI RELATED FUNCTIONS AND STUFF ====================== */
+/* ========================================================================== */
+
+$pgtitle = "Diagnostics: DHCP leases";
+
+$effectStyle = '
+    <style type="text/css">
+        .popup_dialog {
+            background: #000000;
+            opacity: 0.2;
+        }
+    </style>
+';
+
+include("head.inc");
+
+// add extra stuff to HTML head
+if (isset($pfSenseHead)) {
+    $pfSenseHead->setCloseHead(false);
+    print($pfSenseHead->getHTML());
+} else {
+    $closehead = false;
+}
+
+$scriptaculousRefs = '
+      <script type="text/javascript" src="/javascript/scriptaculous/prototype.js"></script>
+      <script type="text/javascript" src="/javascript/scriptaculous/scriptaculous.js"></script>
+';
+
+$ajaxRequest = "
+<script type='text/javascript' src='/javascript/dyntables.js'></script>
+<script type='text/javascript'>
+<!--
+    function refreshTable(column, all) {
+        var myAjax = new Ajax.Request(
+            '{$_SERVER['SCRIPT_NAME']}',
+            {
+                method: 'get',
+                parameters: 'refresh=true',
+                onSuccess: function(transport) {
+                    var json = transport.responseText.evalJSON();
+                    var table = document.getElementById('sortabletable');
+
+                    emtyDhcpLeaseTable(table);
+                    dhcpLeaseTableToHTML(table, json, '{$g['theme']}');
+                }
+            });
+    }
+//-->
+</script>
+";
+
+print($ajaxRequest);
+print($scriptaculousRefs);
+
+foreach(getWindowJSScriptRefs() as $jscript){
+    print("{$jscript}\n");
+}
+
+foreach(getWindowJSStyleRefs() as $style){
+    print("{$style}\n");
+}
+
+print($effectStyle);
+
+?>
+<script type="text/javascript" src="/javascript/sorttable.js"></script>
+</head>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+<?php
+/* only print pool status when we have one */
+if(count($pools) > 0) {
+?>
+<table class="sortable" id="sortabletable" name="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <td class="listhdrr">Failover Group</a></td>
+    <td class="listhdrr">My State</a></td>
+    <td class="listhdrr">Since</a></td>
+    <td class="listhdrr">Peer State</a></td>
+    <td class="listhdrr">Since</a></td>
+  </tr>
+<?php
+foreach ($pools as $data) {
+	echo "<tr>\n";
+	echo "<td class=\"listlr\">{$fspans}{$data['name']}{$fspane}&nbsp;</td>\n";
+	echo "<td class=\"listr\">{$fspans}{$data['mystate']}{$fspane}&nbsp;</td>\n";
+	echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['mydate']) . "{$fspane}&nbsp;</td>\n";
+	echo "<td class=\"listr\">{$fspans}{$data['peerstate']}{$fspane}&nbsp;</td>\n";
+	echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['peerdate']) . "{$fspane}&nbsp;</td>\n";
+	echo "<td class=\"list\" valign=\"middle\" width=\"17\">&nbsp;</td>\n";
+	echo "<td class=\"list\" valign=\"middle\" width=\"17\">&nbsp;</td>\n";
+	echo "</tr>\n";
+}
+
+?>
+</table>
+
+<?php
+/* only print pool status when we have one */
+}
+
+$table = new Table();
+
+// assemble columns
+$table->addColumn("IP address", "ip");
+$table->addColumn("MAC address", "mac");
+$table->addColumn("Hostname", "hostname");
+$table->addColumn("Start", "start");
+$table->addColumn("End", "end");
+$table->addColumn("Online", "online");
+$table->addColumn("Lease Type", "act", "listhdr");
+
+// populate table data
+$table->setData($leases);
+
+?>
+
+<p>
+
+<table class="sortable" id="sortabletable" name="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0">
+<?= $table->getColumnHTML(); ?>
+<?php
+foreach ($table->getData() as $data) {
+	if (($data['act'] == "active") || ($data['act'] == "static") || ($_GET['all'] == 1)) {
+		if ($data['act'] != "active" && $data['act'] != "static") {
+			$fspans = "<span class=\"gray\">";
+			$fspane = "</span>";
+		} else {
+			$fspans = $fspane = "";
+		}
+                $lip = ip2long($data['ip']);
+		if ($data['act'] == "static") {
+			foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) {
+				if(is_array($dhcpifconf['staticmap'])) {
+					foreach ($dhcpifconf['staticmap'] as $staticent) {
+						if ($data['ip'] == $staticent['ipaddr']) {
+							$data['if'] = $dhcpif;
+							break;
+						}
+					}
+				}
+				/* exit as soon as we have an interface */
+				if ($data['if'] != "")
+					break;
+			}
+		} else {
+                	foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) {
+                        	if (($lip >= ip2long($dhcpifconf['range']['from'])) && ($lip <= ip2long($dhcpifconf['range']['to']))) {
+                                	$data['if'] = $dhcpif;
+                                	break;
+                        	}
+			}
+                }
+		echo "<tr>\n";
+                echo "<td class=\"listlr\">{$fspans}{$data['ip']}{$fspane}&nbsp;</td>\n";
+                if ($data['online'] != "online") {
+                        echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&mac={$data['mac']}\" title=\"send Wake on Lan packet to mac\">{$data['mac']}</a>{$fspane}&nbsp;</td>\n";
+                } else {
+                	echo "<td class=\"listr\">{$fspans}{$data['mac']}{$fspane}&nbsp;</td>\n";
+                }
+                echo "<td class=\"listr\">{$fspans}{$data['hostname']}{$fspane}&nbsp;</td>\n";
+                echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['start']) . "{$fspane}&nbsp;</td>\n";
+                echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['end']) . "{$fspane}&nbsp;</td>\n";
+                echo "<td class=\"listr\">{$fspans}{$data['online']}{$fspane}&nbsp;</td>\n";
+                echo "<td class=\"listr\">{$fspans}{$data['act']}{$fspane}&nbsp;</td>\n";
+
+		if ($data['type'] == "dynamic") {
+                	echo "<td class=\"list\" valign=\"middle\"><a href=\"services_dhcp_edit.php?if={$data['if']}&mac={$data['mac']}&hostname={$data['hostname']}\">";
+			echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"add a static mapping for this MAC address\"></a></td>\n";
+		} else {
+                	echo "<td class=\"list\" valign=\"middle\">";
+			echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_plus_mo.gif\" width=\"17\" height=\"17\" border=\"0\"></td>\n";
+		}
+
+                echo "<td valign=\"middle\"><a href=\"services_wol_edit.php?if={$data['if']}&mac={$data['mac']}&descr={$data['hostname']}\">";
+		echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_wol_all.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"add a Wake on Lan mapping for this MAC address\"></a></td>\n";
+                echo "</tr>\n";
+	}
+}
+
+?>
+</table>
+<p>
+<form action="diag_dhcp_leases.php" method="GET">
+<input type="hidden" name="order" value="<?=$_GET['order'];?>">
+<?php if ($_GET['all']): ?>
+<input type="hidden" name="all" value="0">
+<input type="submit" class="formbtn" value="Show active and static leases only">
+<?php else: ?>
+<input type="hidden" name="all" value="1">
+<input type="submit" class="formbtn" value="Show all configured leases">
+<?php endif; ?>
+</form>
+<?php if($leases == 0): ?>
+<p><strong>No leases file found. Is the DHCP server active?</strong></p>
+<?php endif; ?>
+
+<div id="popupanchor">&#160;</div>
+<?= checkForExtension("popup_dialog"); ?>
+<?php include("fend.inc"); ?>
+<script type="text/javascript">
+<!--
+    window.setInterval("refreshTable()", 20000);
+//-->
+</script>
+</body>
+</html>
diff --git a/pkg_config.xml b/pkg_config.xml
index 6cb9a477..59c623ff 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -3,6 +3,39 @@
 <!-- $Id$ -->
 <pfsensepkgs>
   <packages>
+    <!--
+    <package>
+        <name>AuthNG</name>
+        <descr>Adds a per user- and groupmanager to the system.</descr>
+        <category>System</category>
+        <config_file>http://www.pfsense.com/packages/config/authng/pkg/authng.xml</config_file>
+        <version>1.0</version>
+        <status>ALPHA</status>
+        <maintainer>me@daniel.stefan.haischt.name</maintainer>
+        <required_version>1.2</required_version>
+        <configurationfile>authng.xml</configurationfile>
+        <depends_on_package>scriptaculous-js-1.7.1_1.tbz</depends_on_package>
+        <depends_on_package>windows_js-1.3_1.tbz</depends_on_package>
+    </package>
+    -->
+    <package>
+        <name>Dyntables</name>
+        <descr>Dynamically reloads table data using Ajax instead of wrong meta refresh tag..</descr>
+        <category>System</category>
+        <config_file>http://www.pfsense.com/packages/config/dyntables/pkg/dyntables.xml</config_file>
+        <version>1.0</version>
+        <status>ALPHA</status>
+        <maintainer>me@daniel.stefan.haischt.name</maintainer>
+        <required_version>1.2</required_version>
+        <configurationfile>dyntables.xml</configurationfile>
+        <!--
+          |
+          | Dependencies
+          |
+        -->
+        <depends_on_package>scriptaculous-js-1.7.1_1.tbz</depends_on_package>
+        <depends_on_package>windows_js-1.3_1.tbz</depends_on_package>
+    </package>
 	<package>
       <name>PerUserBW</name>
       <descr>Adds a per user bandwidth distribution option.  Requires 1.2 or newer.</descr>
@@ -225,8 +258,8 @@
 	</package>
     <package>
       <name>imspector</name>
-      <descr>IMSpector is an Instant Messenger transparent proxy with logging capabilities. 
-      Currently it supports MSN, AIM, ICQ, Yahoo and IRC to different degrees. 
+      <descr>IMSpector is an Instant Messenger transparent proxy with logging capabilities.
+      Currently it supports MSN, AIM, ICQ, Yahoo and IRC to different degrees.
       REQUIRES: 1.0.1-SNAPSHOT-01-22-2006 or later</descr>
       <website>http://www.imspector.org/</website>
       <category>Network Management</category>