From 74cb0e2b881995855e788be1620f10cd7f68d253 Mon Sep 17 00:00:00 2001
From: Chip Childers <chipchilders@apache.org>
Date: Tue, 23 Jul 2013 14:59:41 -0400
Subject: [PATCH] Adding disallowSpecialCharacters to some fields

---
 client/WEB-INF/classes/resources/messages.properties | 1 +
 ui/dictionary.jsp                                    | 1 +
 ui/index.jsp                                         | 6 +++---
 ui/scripts/ui-custom/zoneWizard.js                   | 2 +-
 ui/scripts/ui/widgets/detailView.js                  | 2 +-
 ui/scripts/ui/widgets/listView.js                    | 5 +++++
 ui/scripts/ui/widgets/multiEdit.js                   | 2 ++
 7 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index a074639fab8..f0fa18bb252 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -16,6 +16,7 @@
 # under the License.
 
 #Stored by I18NEdit, may be edited!
+message.validate.invalid.characters=Invalid characters found; please correct.
 ICMP.code=ICMP Code
 ICMP.type=ICMP Type
 changed.item.properties=Changed item properties
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 508135611e3..4e316972142 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />',
 'label.enable.s3': '<fmt:message key="label.enable.s3"/>',
 'confirm.enable.s3': '<fmt:message key="confirm.enable.s3"/>',
 'message.after.enable.s3': '<fmt:message key="message.after.enable.s3"/>',
diff --git a/ui/index.jsp b/ui/index.jsp
index 5b43e62da36..dcb64bc2142 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -289,7 +289,7 @@ under the License.
                                 <div class="field name hide-if-unselected">
                                   <div class="name"> <span class="field-required">*</span> <fmt:message key="label.name"/></div>
                                   <div class="value">
-                                    <input type="text" class="required" name="new-network-name" />
+                                    <input type="text" class="required disallowSpecialCharacters" name="new-network-name" />
                                   </div>
                                 </div>
 
@@ -339,7 +339,7 @@ under the License.
                       <span><fmt:message key="label.name"/> (<fmt:message key="label.optional"/>)</span>
                     </div>
                     <div class="value">
-                      <input type="text" name="displayname" />
+                      <input type="text" name="displayname" class="disallowSpecialCharacters" />
                     </div>
                   </div>
                   <!-- Add to group -->
@@ -348,7 +348,7 @@ under the License.
                       <span><fmt:message key="label.add.to.group"/> (<fmt:message key="label.optional"/>)</span>
                     </div>
                     <div class="value">
-                      <input type="text" name="groupname" />
+                      <input type="text" name="groupname" class="disallowSpecialCharacters" />
                     </div>
                   </div>
                   <!-- Zone -->
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 0d4525f9ac3..fef59a76a97 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -576,7 +576,7 @@
           $('<label>').html('Physical network name')
 				),
 				$('<div>').addClass('value').append(
-					$('<input>').attr({ type: 'text' }).addClass('required')
+					$('<input>').attr({ type: 'text' }).addClass('required disallowSpecialCharacters')
         )				
       );	
 
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 4b4fbd5a477..2ca5849c4cb 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -541,7 +541,7 @@
               name: name,
               type: 'text',
               value: data
-			      }).data('original-value', data)
+			      }).addClass('disallowSpecialCharacters').data('original-value', data)
           );
         }
 		    
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 9e16ec2ae54..25a8eb192ef 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -486,6 +486,11 @@
         showEditField();
       }
       else if ($editInput.val() != $label.html()) { //click Save button with changed value
+        if ($editInput.val().match(/<|>/)) {
+          cloudStack.dialog.notice({ message: 'message.validate.invalid.characters' }); 
+          return false;
+        }
+
         $edit.animate({ opacity: 0.5 });
 
         var originalName = $label.html();
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index fe6c1454cfc..bfaf5e76d4c 100755
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -790,6 +790,7 @@
 
           $(field.range).each(function() {  //e.g. field.range = ['privateport', 'privateendport'];
             var $input = $('<input>')
+                  .addClass('disallowSpecialCharacters')
                   .attr({
                     name: this,
                     type: 'text'
@@ -814,6 +815,7 @@
                   type: field.isPassword ? 'password' : 'text'
                 })
                 .addClass(!field.isOptional ? 'required' : null)
+                .addClass('disallowSpecialCharacters')
                 .attr('disabled', field.isDisabled ? 'disabled' : false)
                 .appendTo($td);