Merge pull request #917 from akrherz/of1030

OF-1030 prevent entry of 'any' as date to cause exception

src/plugins/monitoring/changelog.html

@@ -43,6 +43,11 @@
 <h1>
 Monitoring Plugin Changelog
 </h1>
+<p><b>1.5.8</b> -- Nov 13, 2017</p>
+<ul>
+    <li>[<a href='https://issues.igniterealtime.org/browse/OF-1030'>OF-1030</a>] - Monitoring Service plugin Search Archive Date Range field validation</li>
+</ul>
+
 <p><b>1.5.7</b> -- May 19, 2017</p>
 <ul>
     <li>[<a href='https://issues.igniterealtime.org/browse/OF-1334'>OF-1334</a>] - Monitoring Plugin displays "Archive index rebuild failed"</li>

src/plugins/monitoring/plugin.xml

@@ -5,8 +5,8 @@
     <name>Monitoring Service</name>
     <description>Monitors conversations and statistics of the server.</description>
     <author>IgniteRealtime // Jive Software</author>
-    <version>1.5.7</version>
-    <date>5/19/2017</date>
+    <version>1.5.8</version>
+    <date>11/13/2017</date>
     <minServerVersion>4.1.0</minServerVersion>
     <databaseKey>monitoring</databaseKey>
     <databaseVersion>4</databaseVersion>

src/plugins/monitoring/src/web/archive-search.jsp

@@ -48,19 +48,19 @@
     int numPages = 1;
     int curPage = (start / range) + 1;
 
-    if (anyText.equals(participant1)) {
+    if (anyText.equalsIgnoreCase(participant1)) {
         participant1 = null;
     }
 
-    if (anyText.equals(participant2)) {
+    if (anyText.equalsIgnoreCase(participant2)) {
         participant2 = null;
     }
 
-    if (anyText.equals(startDate)) {
+    if (anyText.equalsIgnoreCase(startDate)) {
         startDate = null;
     }
 
-    if (anyText.equals(endDate)) {
+    if (anyText.equalsIgnoreCase(endDate)) {
         endDate = null;
     }
 
@@ -471,7 +471,7 @@
         '.textfield' : function(el) {
             el.onblur = function() {
                 var va = el.value;
-                if (va.length == 0 || va == 'Any') {
+                if (va.length == 0 || va == 'Any' || va == 'any') {
                     this.style.backgroundColor = '#efefef';
                     el.value = "<%= anyText%>";
                 }
@@ -858,4 +858,4 @@
     public String getFormattedDate(Conversation conv) {
         return JiveGlobals.formatDate(conv.getStartDate());
     }
-%>
+%>
\ No newline at end of file