diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php index 75e6180f..62255dd1 100644 --- a/admin/admin_reply_ticket.php +++ b/admin/admin_reply_ticket.php @@ -201,9 +201,9 @@ if (!empty($_POST['set_priority'])) { } $options = array( - 0 => '' . $hesklang['critical'] . '', - 1 => '' . $hesklang['high'] . '', - 2 => '' . $hesklang['medium'] . '', + 0 => '' . $hesklang['critical'] . '', + 1 => '' . $hesklang['high'] . '', + 2 => '' . $hesklang['medium'] . '', 3 => $hesklang['low'] ); diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 557eb193..532c2746 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -31,6 +31,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('WYSIWYG', 1); +define('VALIDATOR', 1); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); @@ -668,28 +669,51 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); @@ -1213,10 +1237,13 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?>
-
-
+
+ +
+

- +
-

+ data-error="" + placeholder="" class="form-control" required> +
+
+
+
+
@@ -1678,8 +1710,14 @@ function hesk_printReplyForm()
- + + >
- +
- - +
+ + +
- - +

@@ -1733,14 +1771,16 @@ function hesk_printReplyForm() -
- +
+
+ ?> +
- +
- +
- + +
diff --git a/admin/banned_ips.php b/admin/banned_ips.php index 90ab1c7d..d26c5512 100644 --- a/admin/banned_ips.php +++ b/admin/banned_ips.php @@ -127,15 +127,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); /* This will handle error, success and notice messages */ hesk_handle_messages(); ?> - +
- + +
diff --git a/admin/mail.php b/admin/mail.php index 4d32fb95..e0bd296f 100644 --- a/admin/mail.php +++ b/admin/mail.php @@ -541,13 +541,15 @@ function mail_list_messages()
+ - + + ' . $pm['subject'] . ''; } $pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? '' . $admins[$pm[$hesk_settings['mailtmp']['other']]] . '' : (($pm['from'] == 9999) ? 'HESK.com' : $hesklang['e_udel']); - $pm['dt'] = hesk_dateToString($pm['dt'], 0, 0, 0, true); - - echo << - - - - - - -EOC; + $pm['dt'] = hesk_dateToString($pm['dt'], 0, 0, 0, true) + ?> + + + + + + +
 $pm[subject]$pm[name]$pm[dt]
 
@@ -620,7 +620,7 @@ function show_new_form() global $hesk_settings, $hesklang, $admins; ?>
- +

@@ -629,7 +629,8 @@ global $hesk_settings, $hesklang, $admins;
- $v) { @@ -643,6 +644,7 @@ global $hesk_settings, $hesklang, $admins; } ?> +
@@ -655,21 +657,25 @@ global $hesk_settings, $hesklang, $admins; if (isset($_SESSION['mail']['subject'])) { echo ' value="' . stripslashes($_SESSION['mail']['subject']) . '" '; } - ?> - /> + ?> data-error="" required> +
- - + +
+
+
+
+
-
+
+
: | diff --git a/admin/manage_categories.php b/admin/manage_categories.php index 99ea294d..772d5795 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -30,6 +30,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); +define('VALIDATOR', 1); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); @@ -118,7 +119,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
- +

@@ -135,7 +136,9 @@ while ($mycat = hesk_dbFetchAssoc($res)) { echo ' value="' . hesk_input($_SESSION['catname']) . '" '; } ?> - /> + data-error="" + required> +
@@ -193,7 +196,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
-
+

@@ -212,7 +215,10 @@ while ($mycat = hesk_dbFetchAssoc($res)) { placeholder="" type="text" name="name" size="40" maxlength="40" /> + } ?> + data-error="" + required> +
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php index e1c86bea..53eb4915 100644 --- a/admin/manage_knowledgebase.php +++ b/admin/manage_knowledgebase.php @@ -30,6 +30,7 @@ define('IN_SCRIPT',1); define('HESK_PATH','../'); +define('VALIDATOR', 1); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); @@ -351,7 +352,13 @@ if (!isset($_SESSION['hide']['new_article']))

- + + >
@@ -405,9 +412,14 @@ if (!isset($_SESSION['hide']['new_article']))
- /> + required> +
+
+
+ +
-

@@ -427,8 +439,11 @@ if (!isset($_SESSION['hide']['new_article']))
- - + +
+ + +
@@ -497,14 +512,15 @@ if (!isset($_SESSION['hide']['new_category'])) ?>
- +

- +
- + +
@@ -530,8 +546,10 @@ if (!isset($_SESSION['hide']['new_category']))
- - +
+ + +
@@ -1325,8 +1343,13 @@ function edit_article()

- -
+ + >
@@ -1403,9 +1426,15 @@ function edit_article()
- + +
+
+
+ +
-
@@ -1601,10 +1630,13 @@ function manage_category() {
- +
- + +
@@ -1637,12 +1669,14 @@ function manage_category() {
-
+
- - +
+ + +
diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php index 373a1629..790a9f85 100644 --- a/admin/manage_permission_templates.php +++ b/admin/manage_permission_templates.php @@ -30,6 +30,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); +define('VALIDATOR', 1); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); @@ -95,35 +96,38 @@ while ($row = hesk_dbFetchAssoc($res)) { } ?>
-
-

- -

- -
+
- - - - - - - - - - - - - - - + + + +
- - - +
+
+

+ + + + + + +

+
+ + + + + + + + + + + + - - - -
+ + + @@ -141,17 +145,18 @@ while ($row = hesk_dbFetchAssoc($res)) { title=""> - - - -
+ if ($row['id'] != 1 && $row['id'] != 2): + ?> + + + +
+
-
+
@@ -205,14 +210,19 @@ function createEditModal($template, $features, $categories)
-
- -
-
- +
+
+ +
+
+ +
+
@@ -220,8 +230,8 @@ function createEditModal($template, $features, $categories)

- -
+
+
-
- + +
+

- -
+
+
-
- + +
+
@@ -287,7 +299,7 @@ function buildCreateModal($features, $categories) aria-hidden="true">
- +
@@ -295,13 +307,16 @@ function buildCreateModal($features, $categories)
-
- -
-
- +
+
+ +
+
+ +
+
@@ -309,33 +324,39 @@ function buildCreateModal($features, $categories)

- -
+
+
-
- + +
+

- -
+
+
-
- + +
+
@@ -350,6 +371,9 @@ function buildCreateModal($features, $categories)
+
diff --git a/admin/manage_statuses.php b/admin/manage_statuses.php index 9a4c4bd8..a30d6020 100644 --- a/admin/manage_statuses.php +++ b/admin/manage_statuses.php @@ -102,7 +102,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

- + @@ -470,7 +470,9 @@ function buildCreateModal()
+ data-error="" + class="form-control" name="name[]" required> +

@@ -490,7 +492,9 @@ function buildCreateModal()
+ data-error="" + placeholder="" required> +
@@ -571,7 +575,7 @@ function buildEditModal($statusId) aria-labelledby="myLargeModalLabel" aria-hidden="true">
- +
@@ -613,7 +617,9 @@ function buildEditModal($statusId)
+ data-error="" + value="" required> +
@@ -634,7 +640,9 @@ function buildEditModal($statusId)
+ data-error="" + placeholder="" required> +
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php index f4b2ed48..775d176b 100644 --- a/admin/manage_ticket_templates.php +++ b/admin/manage_ticket_templates.php @@ -30,6 +30,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); +define('VALIDATOR', 1); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); @@ -187,8 +188,13 @@ $num = hesk_dbNumRows($result); - + >

@@ -235,21 +241,24 @@ $num = hesk_dbNumRows($result);
> + } ?> required> +
-
+
+
diff --git a/admin/manage_users.php b/admin/manage_users.php index a32d71ac..cafbd317 100644 --- a/admin/manage_users.php +++ b/admin/manage_users.php @@ -30,6 +30,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); +define('VALIDATOR', 1); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); @@ -326,7 +327,7 @@ EOC;
- +
diff --git a/admin/new_ticket.php b/admin/new_ticket.php index 7f9908ae..4d349edd 100644 --- a/admin/new_ticket.php +++ b/admin/new_ticket.php @@ -31,6 +31,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('WYSIWYG', 1); +define('VALIDATOR', 1); // Auto-focus first empty or error field define('AUTOFOCUS', true); @@ -176,9 +177,15 @@ if (!$show['show']) { }); /* ]]> */ - +
+ enctype="multipart/form-data" >
- +
'; } ?> - +
- +
'; } ?> - +
- > +
@@ -342,7 +359,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { switch ($v['type']) { /* Radio box */ case 'radio': - echo '
'; + echo '
'; $options = explode('#HESK#', $v['value']); $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; @@ -375,7 +392,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; - echo '
+ echo '
'; $options = explode('#HESK#', $v['value']); @@ -438,7 +455,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $formattedId = preg_replace("/[\s-]+/", " ", $v['name']); $formattedId = preg_replace("/[\s_]/", "-", $v['name']); - echo '
'; + echo '
'; $options = explode('#HESK#', $v['value']); $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; @@ -468,7 +485,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; echo '
- +
'; break; @@ -486,7 +503,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { echo '
- +
@@ -512,7 +529,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; echo '
- +
'; @@ -545,7 +562,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; echo '
- +
'; @@ -564,7 +581,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; echo '
- +
'; } @@ -672,7 +689,7 @@ if (hesk_dbNumRows($res)) { if (strlen($can_options)) { ?>
- +
@@ -686,7 +703,7 @@ if (strlen($can_options)) {
- +
+ } ?>" placeholder="" + data-error="" + required> +
'; + echo '
'; } else { - echo '
'; + echo '
'; } ?>
+
@@ -772,7 +795,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $formattedId = preg_replace("/[\s-]+/", " ", $v['name']); $formattedId = preg_replace("/[\s_]/", "-", $v['name']); - echo '
'; + echo '
'; $options = explode('#HESK#', $v['value']); $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; @@ -800,7 +823,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; - echo '
+ echo '
'; break; @@ -881,7 +904,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { echo '
- +
@@ -897,7 +920,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; - echo '
+ echo '
'; @@ -971,7 +994,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; echo '
- +
'; @@ -990,7 +1013,7 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) { $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : ''; echo '
- +
'; } @@ -1108,6 +1131,10 @@ if ($modsForHesk_settings['request_location']):
+
-
+
diff --git a/admin/service_messages.php b/admin/service_messages.php index 70cb2787..e30d600c 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -296,7 +296,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); class="fa fa-question-circle settingsquestionmark">
-
+
@@ -415,7 +415,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); type="text" name="title" size="70" maxlength="255" > + } ?> data-error="" required> +
@@ -438,7 +439,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+ class="btn btn-primary">
diff --git a/inc/header.inc.php b/inc/header.inc.php index e9124a79..61848b5a 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -92,6 +92,7 @@ $modsForHesk_settings = mfh_getSettings(); +