From 002d6bdd9da8357802fa7daa8f0057f6059ea861 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 24 Sep 2015 22:00:43 -0400
Subject: [PATCH] #325 Some refactoring, validate find a ticket box

---
 inc/headerAdmin.inc.php      |  1 +
 inc/show_search_form.inc.php | 13 +++++++++----
 index.php                    | 24 ++----------------------
 js/validation-scripts.js     | 25 +++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 4e1d8c2e..a641415f 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -88,6 +88,7 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.js"></script>
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/platform.js"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js"></script>
     <style>
         .navbar-default {
             background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php
index 810e9c65..dd7eb522 100644
--- a/inc/show_search_form.inc.php
+++ b/inc/show_search_form.inc.php
@@ -402,15 +402,20 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
             <tr>
                 <td valign="top">
 
-                    <form class="form-inline" action="find_tickets.php" method="get" name="findby" id="findby">
+                    <form data-toggle="validator" class="form-inline" action="find_tickets.php" method="get" name="findby" id="findby">
 
                         <table class="table" style="width: auto" border="0" cellpadding="3" cellspacing="0">
                             <tr style="border: none">
                                 <td class="text-left" style="border: none">
                                     <b style="color: #000"><?php echo $hesklang['s_for']; ?></b><br/>
-                                    <input class="form-control" type="text" name="q" size="30" <?php if (isset($q)) {
-                                        echo 'value="' . $q . '"';
-                                    } ?> />
+                                    <div class="form-group">
+                                        <input class="form-control" type="text" name="q" size="30" <?php if (isset($q)) {
+                                            echo 'value="' . $q . '"';
+                                        } ?>
+                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                           required>
+                                        <div class="help-block with-errors"></div>
+                                    </div>
                                 </td>
                                 <td class="text-left" style="border: none">
                                     <b style="color: #000"><?php echo $hesklang['s_in']; ?></b><br/>
diff --git a/index.php b/index.php
index 1cc61e1d..0ceeb3a3 100644
--- a/index.php
+++ b/index.php
@@ -1161,28 +1161,8 @@ function print_add_ticket()
                     < -->
             </form>
             <script>
-                $('form[name="form1"]').validator({
-                    custom: {
-                        checkbox: function($el) {
-                            var checkboxes = $('input[name="' + $el.attr('data-checkbox') + '[]"]');
-
-                            for (var checkbox in checkboxes) {
-                                if (checkboxes[checkbox].checked) {
-                                    return true;
-                                }
-                            }
-                            return false;
-                        },
-                        multiselect: function($el) {
-                            var count = $('select[name="' + $el.attr('data-multiselect') + '[]"] :selected').length;
-                            return count > 0;
-                        }
-                    },
-                    errors: {
-                        checkbox: '<?php echo addslashes($hesklang['select_at_least_one_value']); ?>',
-                        multiselect: '<?php echo addslashes($hesklang['select_at_least_one_value']); ?>'
-                    }
-                });
+                buildValidatorForTicketSubmission("form1",
+                    "<?php echo addslashes($hesklang['select_at_least_one_value']); ?>");
             </script>
         </div>
     </div>
diff --git a/js/validation-scripts.js b/js/validation-scripts.js
index 6fa0822b..7f240e07 100644
--- a/js/validation-scripts.js
+++ b/js/validation-scripts.js
@@ -10,4 +10,29 @@ function validateRichText(helpBlock, messageGroup, messageContainer, errorText)
         return false;
     }
     return true;
+}
+
+function buildValidatorForTicketSubmission(formName, validationText) {
+    $('form[name="' + formName + '"]').validator({
+        custom: {
+            checkbox: function($el) {
+                var checkboxes = $('input[name="' + $el.attr('data-checkbox') + '[]"]');
+
+                for (var checkbox in checkboxes) {
+                    if (checkboxes[checkbox].checked) {
+                        return true;
+                    }
+                }
+                return false;
+            },
+            multiselect: function($el) {
+                var count = $('select[name="' + $el.attr('data-multiselect') + '[]"] :selected').length;
+                return count > 0;
+            }
+        },
+        errors: {
+            checkbox: validationText,
+            multiselect: validationText
+        }
+    });
 }
\ No newline at end of file