Disabling Enter Key on Auto-Complete pages ...

Enter Key now Selects Auto-Complete Options ...
Added Auto-Complete to firewall_shaper_edit.php ...

7 files changed, 433 insertions, 10 deletions

diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php
index 9818467..f547369 100755
--- a/usr/local/www/firewall_shaper_edit.php
+++ b/usr/local/www/firewall_shaper_edit.php
@@ -483,7 +483,7 @@ function dst_rep_change() {
                       </tr>
                       <tr>
                         <td>Address:&nbsp;&nbsp;</td>
-                        <td><input autocomplete='off' onblur='actb_removedisp()' onkeypress='return (event.keyCode!=13);'  onkeydown='actb_checkkey(event, this);' onkeyup='actb_tocomplete(this,event,addressarray)' name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>">
+                        <td><input autocomplete='off' name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>">
                           /
                           <select name="srcmask" class="formfld" id="srcmask">
                             <?php for ($i = 31; $i > 0; $i--): ?>
@@ -512,7 +512,7 @@ function dst_rep_change() {
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
-                          </select> <input autocomplete='off' onblur='actb_removedisp()' onkeypress='return (event.keyCode!=13);'  onkeydown='actb_checkkey(event, this);' onkeyup='actb_tocomplete(this,event,customarray)' class="formfldalias" name="srcbeginport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['srcbeginport']) echo $pconfig['srcbeginport']; ?>"></td>
+                          </select> <input autocomplete='off' class="formfldalias" name="srcbeginport_cust" id="srcbeginport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['srcbeginport']) echo $pconfig['srcbeginport']; ?>"></td>
                       </tr>
                       <tr>
                         <td>to:</td>
@@ -527,7 +527,7 @@ function dst_rep_change() {
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
-                          </select> <input autocomplete='off' onblur='actb_removedisp()' onkeypress='return (event.keyCode!=13);'  onkeydown='actb_checkkey(event, this);' onkeyup='actb_tocomplete(this,event,customarray)' class="formfldalias" name="srcendport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['srcendport']) echo $pconfig['srcendport']; ?>"></td>
+                          </select> <input autocomplete='off' class="formfldalias" name="srcendport_cust" id="srcendport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['srcendport']) echo $pconfig['srcendport']; ?>"></td>
                       </tr>
                     </table>
                     <br> <span class="vexpl">Specify the port or port range for
@@ -563,7 +563,7 @@ function dst_rep_change() {
                       </tr>
                       <tr>
                         <td>Address:&nbsp;&nbsp;</td>
-                        <td><input name="dst" autocomplete='off' onblur='actb_removedisp()' onkeypress='return (event.keyCode!=13);'  onkeydown='actb_checkkey(event, this);' onkeyup='actb_tocomplete(this,event,addressarray)' type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>">
+                        <td><input name="dst" autocomplete='off' type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>">
                           /
                           <select name="dstmask" class="formfld" id="dstmask">
                             <?php for ($i = 31; $i > 0; $i--): ?>
@@ -592,7 +592,7 @@ function dst_rep_change() {
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
-                          </select> <input autocomplete='off' onblur='actb_removedisp()' onkeypress='return (event.keyCode!=13);'  onkeydown='actb_checkkey(event, this);' onkeyup='actb_tocomplete(this,event,customarray)' class="formfldalias" name="dstbeginport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['dstbeginport']) echo $pconfig['dstbeginport']; ?>"></td>
+                          </select> <input autocomplete='off' class="formfldalias" name="dstbeginport_cust" id="dstbeginport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['dstbeginport']) echo $pconfig['dstbeginport']; ?>"></td>
                       </tr>
                       <tr>
                         <td>to:</td>
@@ -607,7 +607,7 @@ function dst_rep_change() {
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
-                          </select> <input autocomplete='off' onblur='actb_removedisp()' onkeypress='return (event.keyCode!=13);'  onkeydown='actb_checkkey(event, this);' onkeyup='actb_tocomplete(this,event,customarray)' class="formfldalias" name="dstendport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['dstendport']) echo $pconfig['dstendport']; ?>"></td>
+                          </select> <input autocomplete='off' class="formfldalias" name="dstendport_cust" id="dstendport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['dstendport']) echo $pconfig['dstendport']; ?>"></td>
                       </tr>
                     </table>
                     <br> <span class="vexpl">Specify the port or port range for
@@ -718,12 +718,11 @@ if(is_array($config['aliases']['alias'])) {
 
 <script language="JavaScript">
 <!--
-var addressarray=new Array(<?php echo $aliasesaddr; ?>);
-var customarray=new Array(<?php echo $aliases; ?>);
+	var addressarray=new Array(<?php echo $aliasesaddr; ?>);
+	var customarray=new Array(<?php echo $aliases; ?>);
 //-->
 </script>
-<script type="text/javascript" language="javascript" src="auto_complete_helper.js">
-</script>
+
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/usr/local/www/javascript/firewall_nat_edit/disablekeys.js b/usr/local/www/javascript/firewall_nat_edit/disablekeys.js
new file mode 100644
index 0000000..5d6c87a
--- /dev/null
+++ b/usr/local/www/javascript/firewall_nat_edit/disablekeys.js
@@ -0,0 +1,6 @@
+function kH(e) {
+	var pK = document.all? window.event.keyCode:e.which;
+	return pK != 13;
+}
+document.onkeypress = kH;
+if (document.layers) document.captureEvents(Event.KEYPRESS);
\ No newline at end of file
diff --git a/usr/local/www/javascript/firewall_rules_edit/disablekeys.js b/usr/local/www/javascript/firewall_rules_edit/disablekeys.js
new file mode 100644
index 0000000..5d6c87a
--- /dev/null
+++ b/usr/local/www/javascript/firewall_rules_edit/disablekeys.js
@@ -0,0 +1,6 @@
+function kH(e) {
+	var pK = document.all? window.event.keyCode:e.which;
+	return pK != 13;
+}
+document.onkeypress = kH;
+if (document.layers) document.captureEvents(Event.KEYPRESS);
\ No newline at end of file
diff --git a/usr/local/www/javascript/firewall_shaper_edit/autosuggest.js b/usr/local/www/javascript/firewall_shaper_edit/autosuggest.js
new file mode 100644
index 0000000..a4ebd81
--- /dev/null
+++ b/usr/local/www/javascript/firewall_shaper_edit/autosuggest.js
@@ -0,0 +1,336 @@
+
+/**
+ * An autosuggest textbox control.
+ * @class
+ * @scope public
+ */
+function AutoSuggestControl(oTextbox /*:HTMLInputElement*/, 
+                            oProvider /*:SuggestionProvider*/) {
+    
+    /**
+     * The currently selected suggestions.
+     * @scope private
+     */   
+    this.cur /*:int*/ = -1;
+
+    /**
+     * The dropdown list layer.
+     * @scope private
+     */
+    this.layer = null;
+    
+    /**
+     * Suggestion provider for the autosuggest feature.
+     * @scope private.
+     */
+    this.provider /*:SuggestionProvider*/ = oProvider;
+    
+    /**
+     * The textbox to capture.
+     * @scope private
+     */
+    this.textbox /*:HTMLInputElement*/ = oTextbox;
+    
+    //initialize the control
+    this.init();
+    
+}
+
+/**
+ * Autosuggests one or more suggestions for what the user has typed.
+ * If no suggestions are passed in, then no autosuggest occurs.
+ * @scope private
+ * @param aSuggestions An array of suggestion strings.
+ * @param bTypeAhead If the control should provide a type ahead suggestion.
+ */
+AutoSuggestControl.prototype.autosuggest = function (aSuggestions /*:Array*/,
+                                                     bTypeAhead /*:boolean*/) {
+    
+    //make sure there's at least one suggestion
+    if (aSuggestions.length > 0) {
+        if (bTypeAhead) {
+           this.typeAhead(aSuggestions[0]);
+        }
+        
+        this.showSuggestions(aSuggestions);
+    } else {
+        this.hideSuggestions();
+    }
+};
+
+/**
+ * Creates the dropdown layer to display multiple suggestions.
+ * @scope private
+ */
+AutoSuggestControl.prototype.createDropDown = function () {
+
+    var oThis = this;
+
+    //create the layer and assign styles
+    this.layer = document.createElement("div");
+    this.layer.className = "suggestions";
+    this.layer.style.visibility = "hidden";
+    this.layer.style.width = this.textbox.offsetWidth;
+    
+    //when the user clicks on the a suggestion, get the text (innerHTML)
+    //and place it into a textbox
+    this.layer.onmousedown = 
+    this.layer.onmouseup = 
+    this.layer.onmouseover = function (oEvent) {
+        oEvent = oEvent || window.event;
+        oTarget = oEvent.target || oEvent.srcElement;
+
+        if (oEvent.type == "mousedown") {
+            oThis.textbox.value = oTarget.firstChild.nodeValue;
+            oThis.hideSuggestions();
+        } else if (oEvent.type == "mouseover") {
+            oThis.highlightSuggestion(oTarget);
+        } else {
+            oThis.textbox.focus();
+        }
+    };
+    
+    
+    document.body.appendChild(this.layer);
+};
+
+/**
+ * Gets the left coordinate of the textbox.
+ * @scope private
+ * @return The left coordinate of the textbox in pixels.
+ */
+AutoSuggestControl.prototype.getLeft = function () /*:int*/ {
+
+    var oNode = this.textbox;
+    var iLeft = 0;
+    
+    while(oNode.tagName != "BODY") {
+        iLeft += oNode.offsetLeft;
+        oNode = oNode.offsetParent;        
+    }
+    
+    return iLeft;
+};
+
+/**
+ * Gets the top coordinate of the textbox.
+ * @scope private
+ * @return The top coordinate of the textbox in pixels.
+ */
+AutoSuggestControl.prototype.getTop = function () /*:int*/ {
+
+    var oNode = this.textbox;
+    var iTop = 0;
+    
+    while(oNode.tagName != "BODY") {
+        iTop += oNode.offsetTop;
+        oNode = oNode.offsetParent;
+    }
+    
+    return iTop;
+};
+
+/**
+ * Handles three keydown events.
+ * @scope private
+ * @param oEvent The event object for the keydown event.
+ */
+AutoSuggestControl.prototype.handleKeyDown = function (oEvent /*:Event*/) {
+
+    switch(oEvent.keyCode) {
+        case 38: //up arrow
+            this.previousSuggestion();
+            break;
+        case 40: //down arrow 
+            this.nextSuggestion();
+            break;
+        case 13: //enter
+            this.hideSuggestions();
+            break;
+    }
+
+};
+
+/**
+ * Handles keyup events.
+ * @scope private
+ * @param oEvent The event object for the keyup event.
+ */
+AutoSuggestControl.prototype.handleKeyUp = function (oEvent /*:Event*/) {
+
+    var iKeyCode = oEvent.keyCode;
+
+    //for backspace (8) and delete (46), shows suggestions without typeahead
+    if (iKeyCode == 8 || iKeyCode == 46) {
+        this.provider.requestSuggestions(this, false);
+        
+    //make sure not to interfere with non-character keys
+    } else if (iKeyCode < 32 || (iKeyCode >= 33 && iKeyCode < 46) || (iKeyCode >= 112 && iKeyCode <= 123)) {
+        //ignore
+    } else {
+        //request suggestions from the suggestion provider with typeahead
+        this.provider.requestSuggestions(this, true);
+    }
+};
+
+/**
+ * Hides the suggestion dropdown.
+ * @scope private
+ */
+AutoSuggestControl.prototype.hideSuggestions = function () {
+    this.layer.style.visibility = "hidden";
+};
+
+/**
+ * Highlights the given node in the suggestions dropdown.
+ * @scope private
+ * @param oSuggestionNode The node representing a suggestion in the dropdown.
+ */
+AutoSuggestControl.prototype.highlightSuggestion = function (oSuggestionNode) {
+    
+    for (var i=0; i < this.layer.childNodes.length; i++) {
+        var oNode = this.layer.childNodes[i];
+        if (oNode == oSuggestionNode) {
+            oNode.className = "current"
+        } else if (oNode.className == "current") {
+            oNode.className = "";
+        }
+    }
+};
+
+/**
+ * Initializes the textbox with event handlers for
+ * auto suggest functionality.
+ * @scope private
+ */
+AutoSuggestControl.prototype.init = function () {
+
+    //save a reference to this object
+    var oThis = this;
+    
+    //assign the onkeyup event handler
+    this.textbox.onkeyup = function (oEvent) {
+    
+        //check for the proper location of the event object
+        if (!oEvent) {
+            oEvent = window.event;
+        }    
+        
+        //call the handleKeyUp() method with the event object
+        oThis.handleKeyUp(oEvent);
+    };
+    
+    //assign onkeydown event handler
+    this.textbox.onkeydown = function (oEvent) {
+    
+        //check for the proper location of the event object
+        if (!oEvent) {
+            oEvent = window.event;
+        }    
+        
+        //call the handleKeyDown() method with the event object
+        oThis.handleKeyDown(oEvent);
+    };
+    
+    //assign onblur event handler (hides suggestions)    
+    this.textbox.onblur = function () {
+        oThis.hideSuggestions();
+    };
+    
+    //create the suggestions dropdown
+    this.createDropDown();
+};
+
+/**
+ * Highlights the next suggestion in the dropdown and
+ * places the suggestion into the textbox.
+ * @scope private
+ */
+AutoSuggestControl.prototype.nextSuggestion = function () {
+    var cSuggestionNodes = this.layer.childNodes;
+
+    if (cSuggestionNodes.length > 0 && this.cur < cSuggestionNodes.length-1) {
+        var oNode = cSuggestionNodes[++this.cur];
+        this.highlightSuggestion(oNode);
+        this.textbox.value = oNode.firstChild.nodeValue; 
+    }
+};
+
+/**
+ * Highlights the previous suggestion in the dropdown and
+ * places the suggestion into the textbox.
+ * @scope private
+ */
+AutoSuggestControl.prototype.previousSuggestion = function () {
+    var cSuggestionNodes = this.layer.childNodes;
+
+    if (cSuggestionNodes.length > 0 && this.cur > 0) {
+        var oNode = cSuggestionNodes[--this.cur];
+        this.highlightSuggestion(oNode);
+        this.textbox.value = oNode.firstChild.nodeValue;   
+    }
+};
+
+/**
+ * Selects a range of text in the textbox.
+ * @scope public
+ * @param iStart The start index (base 0) of the selection.
+ * @param iLength The number of characters to select.
+ */
+AutoSuggestControl.prototype.selectRange = function (iStart /*:int*/, iLength /*:int*/) {
+
+    //use text ranges for Internet Explorer
+    if (this.textbox.createTextRange) {
+        var oRange = this.textbox.createTextRange(); 
+        oRange.moveStart("character", iStart); 
+        oRange.moveEnd("character", iLength - this.textbox.value.length);      
+        oRange.select();
+        
+    //use setSelectionRange() for Mozilla
+    } else if (this.textbox.setSelectionRange) {
+        this.textbox.setSelectionRange(iStart, iLength);
+    }     
+
+    //set focus back to the textbox
+    this.textbox.focus();      
+}; 
+
+/**
+ * Builds the suggestion layer contents, moves it into position,
+ * and displays the layer.
+ * @scope private
+ * @param aSuggestions An array of suggestions for the control.
+ */
+AutoSuggestControl.prototype.showSuggestions = function (aSuggestions /*:Array*/) {
+    
+    var oDiv = null;
+    this.layer.innerHTML = "";  //clear contents of the layer
+    
+    for (var i=0; i < aSuggestions.length; i++) {
+        oDiv = document.createElement("div");
+        oDiv.appendChild(document.createTextNode(aSuggestions[i]));
+        this.layer.appendChild(oDiv);
+    }
+    
+    this.layer.style.left = this.getLeft() + "px";
+    this.layer.style.top = (this.getTop()+this.textbox.offsetHeight) + "px";
+    this.layer.style.visibility = "visible";
+
+};
+
+/**
+ * Inserts a suggestion into the textbox, highlighting the 
+ * suggested part of the text.
+ * @scope private
+ * @param sSuggestion The suggestion for the textbox.
+ */
+AutoSuggestControl.prototype.typeAhead = function (sSuggestion /*:String*/) {
+
+    //check for support of typeahead functionality
+    if (this.textbox.createTextRange || this.textbox.setSelectionRange){
+        var iLen = this.textbox.value.length; 
+        this.textbox.value = sSuggestion; 
+        this.selectRange(iLen, sSuggestion.length);
+    }
+};
+
diff --git a/usr/local/www/javascript/firewall_shaper_edit/disablekeys.js b/usr/local/www/javascript/firewall_shaper_edit/disablekeys.js
new file mode 100644
index 0000000..5d6c87a
--- /dev/null
+++ b/usr/local/www/javascript/firewall_shaper_edit/disablekeys.js
@@ -0,0 +1,6 @@
+function kH(e) {
+	var pK = document.all? window.event.keyCode:e.which;
+	return pK != 13;
+}
+document.onkeypress = kH;
+if (document.layers) document.captureEvents(Event.KEYPRESS);
\ No newline at end of file
diff --git a/usr/local/www/javascript/firewall_shaper_edit/firewall_shaper_edit.js b/usr/local/www/javascript/firewall_shaper_edit/firewall_shaper_edit.js
new file mode 100644
index 0000000..2648207
--- /dev/null
+++ b/usr/local/www/javascript/firewall_shaper_edit/firewall_shaper_edit.js
@@ -0,0 +1,37 @@
+<!--
+function ext_change() {
+	if (document.iform.beginport.selectedIndex == 0) {
+		document.iform.beginport_cust.disabled = 0;
+	} else {
+		document.iform.beginport_cust.value = "";
+		document.iform.beginport_cust.disabled = 1;
+	}
+	if (document.iform.endport.selectedIndex == 0) {
+		document.iform.endport_cust.disabled = 0;
+	} else {
+		document.iform.endport_cust.value = "";
+		document.iform.endport_cust.disabled = 1;
+	}
+	if (document.iform.localbeginport.selectedIndex == 0) {
+		document.iform.localbeginport_cust.disabled = 0;
+	} else {
+		document.iform.localbeginport_cust.value = "";
+		document.iform.localbeginport_cust.disabled = 1;
+	}
+}
+function ext_rep_change() {
+	document.iform.endport.selectedIndex = document.iform.beginport.selectedIndex;
+	document.iform.localbeginport.selectedIndex = document.iform.beginport.selectedIndex;
+}
+
+
+window.onload = function () {
+	var oTextbox1 = new AutoSuggestControl(document.getElementById("src"), new StateSuggestions(addressarray));
+	var oTextbox2 = new AutoSuggestControl(document.getElementById("srcbeginport_cust"), new StateSuggestions(customarray));
+	var oTextbox3 = new AutoSuggestControl(document.getElementById("srcendport_cust"), new StateSuggestions(customarray));
+	var oTextbox1 = new AutoSuggestControl(document.getElementById("dst"), new StateSuggestions(addressarray));
+	var oTextbox2 = new AutoSuggestControl(document.getElementById("dstbeginport_cust"), new StateSuggestions(customarray));
+	var oTextbox3 = new AutoSuggestControl(document.getElementById("dstendport_cust"), new StateSuggestions(customarray));
+}
+
+//-->
\ No newline at end of file
diff --git a/usr/local/www/javascript/firewall_shaper_edit/suggestions.js b/usr/local/www/javascript/firewall_shaper_edit/suggestions.js
new file mode 100644
index 0000000..1b30fff
--- /dev/null
+++ b/usr/local/www/javascript/firewall_shaper_edit/suggestions.js
@@ -0,0 +1,33 @@
+
+/**
+ * Provides suggestions for state names (USA).
+ * @class
+ * @scope public
+ */
+function StateSuggestions(text) {
+    this.states = text;
+}
+
+/**
+ * Request suggestions for the given autosuggest control. 
+ * @scope protected
+ * @param oAutoSuggestControl The autosuggest control to provide suggestions for.
+ */
+StateSuggestions.prototype.requestSuggestions = function (oAutoSuggestControl /*:AutoSuggestControl*/,
+                                                          bTypeAhead /*:boolean*/) {
+    var aSuggestions = [];
+    var sTextboxValue = oAutoSuggestControl.textbox.value;
+    
+    if (sTextboxValue.length > 0){
+    
+        //search for matching states
+        for (var i=0; i < this.states.length; i++) { 
+            if (this.states[i].indexOf(sTextboxValue) == 0) {
+                aSuggestions.push(this.states[i]);
+            } 
+        }
+    }
+
+    //provide suggestions to the control
+    oAutoSuggestControl.autosuggest(aSuggestions, bTypeAhead);
+};
\ No newline at end of file