From 6c8b0491c3c2072f02ea41fe0baa80467020ccf7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 22 Jan 2015 20:29:14 -0500
Subject: [PATCH] #119 Fix IDs

---
 admin/new_ticket.php | 124 +++++++++++++++++++++++++++++++-------
 index.php            | 140 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 226 insertions(+), 38 deletions(-)

diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index b2a44018..17e5f90d 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -305,7 +305,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$v['name'].'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+                                    //Clean up multiple dashes or whitespaces
+                                    $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                    $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$formattedId.'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
 
                                 echo '</div></div>';
@@ -314,10 +318,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	                        /* Select drop-down box */
 	                        case 'select':
 
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                 	            $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
 					            echo '<div class="form-group"><label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'" '.$cls.'>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'" '.$cls.'>';
 
                                 // Show "Click to select"?
                                 $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
@@ -348,10 +356,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	                        break;
 
                             case 'multiselect':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                                 $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
                                 echo '<div class="form-group"><label for="'.$v['name'].'[]" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'[]" '.$cls.' multiple>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'[]" '.$cls.' multiple>';
 
                                 $options = explode('#HESK#',$v['value']);
 
@@ -373,13 +385,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
                                 echo '</select>
                                 <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$v['name'].'\')">Select All</button>
-                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$v['name'].'\')">Deselect All</button>
+                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$formattedId.'\')">Select All</button>
+                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$formattedId.'\')">Deselect All</button>
                                 </div></div></div>';
                             break;
 
 	                        /* Checkbox */
 	        	            case 'checkbox':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
 					            echo '<div class="form-group"><label class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label><div align="left" class="col-sm-9">';
                                 $options = explode('#HESK#',$v['value']);
                                 $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
@@ -396,13 +412,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input id="'.$v['name'].'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+	                	            echo '<label style="font-weight: normal;"><input id="'.$formattedId.'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
                                 echo '</div></div>';
 	                        break;
 
 	                        /* Large text box */
 	                        case 'textarea':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
 	                            $size = explode('#',$v['value']);
                                 $size[0] = empty($size[0]) ? 5 : intval($size[0]);
                                 $size[1] = empty($size[1]) ? 30 : intval($size[1]);
@@ -411,11 +431,15 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><textarea class="form-control" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
+					            <div class="col-sm-9"><textarea class="form-control" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
                                 </div>';
 	                        break;
 
                             case 'date':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                                 if (strlen($k_value) != 0)
                                 {
                                     $v['value'] = $k_value;
@@ -427,7 +451,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 <div class="form-group">
                                     <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
                                     <div class="col-sm-9">
-                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" size="40"
+                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40"
                                             maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" readonly/>
                                         <span class="help-block">'.$hesklang['date_format'].'</span>
                                     </div>
@@ -435,6 +459,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 break;
 
                             case 'email':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                                 if (strlen($k_value) != 0)
                                 {
                                     $v['value'] = $k_value;
@@ -450,13 +478,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
                                 echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
                                 </div>';
 
                                 break;
 
 	                        /* Default text input */
 	                        default:
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                 	            if (strlen($k_value) != 0)
                                 {
                     	            $v['value'] = $k_value;
@@ -466,7 +498,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
                                 </div>';
 	                    }
 	                }
@@ -616,7 +648,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <!-- Custom After -->
                 <?php
 
-	            /* custom fields BEFORE comments */
+	            /* custom fields AFTER comments */
 
 	            foreach ($hesk_settings['custom_fields'] as $k=>$v)
 	            {
@@ -655,6 +687,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	                    {
 	        	            /* Radio box */
 	        	            case 'radio':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
 					            echo '<div class="form-group"><label class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label><div align="left" class="col-sm-9">';
 
 	            	            $options = explode('#HESK#',$v['value']);
@@ -673,7 +709,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$v['name'].'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$formattedId.'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
 
                                 echo '</div></div>';
@@ -681,11 +717,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 	                        /* Select drop-down box */
 	                        case 'select':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
 
                 	            $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
 					            echo '<div class="form-group"><label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'" '.$cls.'>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'" '.$cls.'>';
 
                                 // Show "Click to select"?
                                 $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
@@ -717,6 +756,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 	                        /* Checkbox */
 	        	            case 'checkbox':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
 					            echo '<div class="form-group"><label class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label><div align="left" class="col-sm-9">';
 
 	            	            $options = explode('#HESK#',$v['value']);
@@ -734,13 +777,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input id="'.$v['name'].'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+	                	            echo '<label style="font-weight: normal;"><input id="'.$formattedId.'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
                                 echo '</div></div>';
 	                        break;
 
 	                        /* Large text box */
 	                        case 'textarea':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
 	                            $size = explode('#',$v['value']);
                                 $size[0] = empty($size[0]) ? 5 : intval($size[0]);
                                 $size[1] = empty($size[1]) ? 30 : intval($size[1]);
@@ -749,11 +796,15 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><textarea class="form-control" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
+					            <div class="col-sm-9"><textarea class="form-control" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
                                 </div>';
 	                        break;
 
                             case 'date':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                                 if (strlen($k_value) != 0)
                                 {
                                     $v['value'] = $k_value;
@@ -765,7 +816,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 <div class="form-group">
                                     <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
                                     <div class="col-sm-9">
-                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" size="40"
+                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40"
                                             maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" readonly/>
                                         <span class="help-block">'.$hesklang['date_format'].'</span>
                                     </div>
@@ -773,10 +824,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 break;
 
                             case 'multiselect':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                                 $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
                                 echo '<div class="form-group"><label for="'.$v['name'].'[]" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'[]" '.$cls.' multiple>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'[]" '.$cls.' multiple>';
 
                                 $options = explode('#HESK#',$v['value']);
 
@@ -798,13 +853,42 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
                                 echo '</select>
                                 <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$v['name'].'\')">Select All</button>
-                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$v['name'].'\')">Deselect All</button>
+                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$formattedId.'\')">Select All</button>
+                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$formattedId.'\')">Deselect All</button>
                                 </div></div></div>';
                                 break;
 
+                            case 'email':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                if (strlen($k_value) != 0)
+                                {
+                                    $v['value'] = $k_value;
+                                }
+
+                                if ($v['value'] == 'cc' || $v['value'] == 'bcc')
+                                {
+                                    // (b)cc isn't a valid email but is the "value" used by settings. Just remove it.
+                                    $v['value'] = '';
+                                }
+
+                                $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                                <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
+					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+                                </div>';
+
+                                break;
+
 	                        /* Default text input */
 	                        default:
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
                 	            if (strlen($k_value) != 0)
                                 {
                     	            $v['value'] = $k_value;
@@ -814,7 +898,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
                                 </div>';
 	                    }
 	                }
diff --git a/index.php b/index.php
index 0ab86966..c98e2007 100644
--- a/index.php
+++ b/index.php
@@ -327,6 +327,10 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 	                    {
 	        	            /* Radio box */
 	        	            case 'radio':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
 					            echo '<div class="form-group"><label class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label><div align="left" class="col-sm-9">';
 
 	            	            $options = explode('#HESK#',$v['value']);
@@ -345,7 +349,7 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$v['name'].'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$formattedId.'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
 
                                 echo '</div></div>';
@@ -353,11 +357,14 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 	                        /* Select drop-down box */
 	                        case 'select':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
 
                 	            $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
 					            echo '<div class="form-group"><label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'" '.$cls.'>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'" '.$cls.'>';
 
                                 // Show "Click to select"?
                                 $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
@@ -389,6 +396,10 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 	                        /* Checkbox */
 	        	            case 'checkbox':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
 					            echo '<div class="form-group"><label class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label><div align="left" class="col-sm-9">';
 
 	            	            $options = explode('#HESK#',$v['value']);
@@ -406,13 +417,17 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input id="'.$v['name'].'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+	                	            echo '<label style="font-weight: normal;"><input id="'.$formattedId.'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
                                 echo '</div></div>';
 	                        break;
 
 	                        /* Large text box */
 	                        case 'textarea':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
 	                            $size = explode('#',$v['value']);
                                 $size[0] = empty($size[0]) ? 5 : intval($size[0]);
                                 $size[1] = empty($size[1]) ? 30 : intval($size[1]);
@@ -421,15 +436,19 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><textarea class="form-control" id="'.$v['name'].'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
+					            <div class="col-sm-9"><textarea class="form-control" id="'.$formattedId.'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
                                 </div>';
 	                        break;
 
                             case 'multiselect':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
                                 $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
                                 echo '<div class="form-group"><label for="'.$v['name'].'[]" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'[]" '.$cls.' multiple>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'[]" '.$cls.' multiple>';
 
                                 $options = explode('#HESK#',$v['value']);
 
@@ -451,13 +470,17 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
                                 echo '</select>
                                 <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$v['name'].'\')">Select All</button>
-                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$v['name'].'\')">Deselect All</button>
+                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$formattedId.'\')">Select All</button>
+                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$formattedId.'\')">Deselect All</button>
                                 </div>
                                 </div></div>';
                                 break;
 
                             case 'date':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
                                 if (strlen($k_value) != 0)
                                 {
                                     $v['value'] = $k_value;
@@ -469,15 +492,44 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
                                 <div class="form-group">
                                     <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
                                     <div class="col-sm-9">
-                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" size="40"
+                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40"
                                             maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" readonly/>
                                         <span class="help-block">'.$hesklang['date_format'].'</span>
                                     </div>
                                 </div>';
                                 break;
 
+                            case 'email':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
+                                if (strlen($k_value) != 0)
+                                {
+                                    $v['value'] = $k_value;
+                                }
+
+                                if ($v['value'] == 'cc' || $v['value'] == 'bcc')
+                                {
+                                    // (b)cc isn't a valid email but is the "value" used by settings. Just remove it.
+                                    $v['value'] = '';
+                                }
+
+                                $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                                <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
+					            <div class="col-sm-9"><input type="text" class="form-control" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+                                </div>';
+
+                                break;
+
 	                        /* Default text input */
 	                        default:
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
                 	            if (strlen($k_value) != 0)
                                 {
                     	            $v['value'] = $k_value;
@@ -487,7 +539,7 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" id="'.$v['name'].'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+					            <div class="col-sm-9"><input type="text" class="form-control" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
                                 </div>';
 	                    }
 	                }
@@ -574,6 +626,10 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 	                    {
 	        	            /* Radio box */
 	        	            case 'radio':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
 					            echo '<div class="form-group"><label class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label><div align="left" class="col-sm-9">';
 
 	            	            $options = explode('#HESK#',$v['value']);
@@ -592,7 +648,7 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$v['name'].'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+	                	            echo '<label style="font-weight: normal;"><input type="radio" id="'.$formattedId.'" name="'.$k.'" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
 
                                 echo '</div></div>';
@@ -600,11 +656,14 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 	                        /* Select drop-down box */
 	                        case 'select':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
 
                 	            $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
 					            echo '<div class="form-group"><label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'" '.$cls.'>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'" '.$cls.'>';
 
                                 // Show "Click to select"?
                                 $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
@@ -637,6 +696,10 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 	                        /* Checkbox */
 	        	            case 'checkbox':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
 					            echo '<div class="form-group"><label class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label><div align="left" class="col-sm-9">';
 
 	            	            $options = explode('#HESK#',$v['value']);
@@ -654,13 +717,17 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 	                    	            $checked = '';
 	                                }
 
-	                	            echo '<label style="font-weight: normal;"><input id="'.$v['name'].'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
+	                	            echo '<label style="font-weight: normal;"><input id="'.$formattedId.'" type="checkbox" name="'.$k.'[]" value="'.$option.'" '.$checked.' '.$cls.' /> '.$option.'</label><br />';
 	                            }
                                 echo '</div></div>';
 	                        break;
 
 	                        /* Large text box */
 	                        case 'textarea':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
 	                            $size = explode('#',$v['value']);
                                 $size[0] = empty($size[0]) ? 5 : intval($size[0]);
                                 $size[1] = empty($size[1]) ? 30 : intval($size[1]);
@@ -669,15 +736,19 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><textarea class="form-control" id="'.$v['name'].'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
+					            <div class="col-sm-9"><textarea class="form-control" id="'.$formattedId.'" name="'.$k.'" rows="'.$size[0].'" cols="'.$size[1].'" '.$cls.'>'.$k_value.'</textarea></div>
                                 </div>';
 	                        break;
 
                             case 'multiselect':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
                                 $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
 
                                 echo '<div class="form-group"><label for="'.$v['name'].'[]" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-                                <div class="col-sm-9"><select class="form-control" id="'.$v['name'].'" name="'.$k.'[]" '.$cls.' multiple>';
+                                <div class="col-sm-9"><select class="form-control" id="'.$formattedId.'" name="'.$k.'[]" '.$cls.' multiple>';
 
                                 $options = explode('#HESK#',$v['value']);
 
@@ -699,12 +770,16 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
                                 echo '</select>
                                 <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$v['name'].'\')">Select All</button>
-                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$v['name'].'\')">Deselect All</button>
+                                    <button type="button" class="btn btn-default" onclick="selectAll(\''.$formattedId.'\')">Select All</button>
+                                    <button type="button" class="btn btn-default" onclick="deselectAll(\''.$formattedId.'\')">Deselect All</button>
                                 </div></div></div>';
                                 break;
 
                             case 'date':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
                                 if (strlen($k_value) != 0)
                                 {
                                     $v['value'] = $k_value;
@@ -716,15 +791,44 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
                                 <div class="form-group">
                                     <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
                                     <div class="col-sm-9">
-                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$v['name'].'" name="'.$k.'" size="40"
+                                        <input type="text" class="datepicker form-control white-readonly '.$cls.'" placeholder="'.$v['name'].'" id="'.$formattedId.'" name="'.$k.'" size="40"
                                             maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" readonly/>
                                         <span class="help-block">'.$hesklang['date_format'].'</span>
                                     </div>
                                 </div>';
                                 break;
 
+                            case 'email':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
+                                if (strlen($k_value) != 0)
+                                {
+                                    $v['value'] = $k_value;
+                                }
+
+                                if ($v['value'] == 'cc' || $v['value'] == 'bcc')
+                                {
+                                    // (b)cc isn't a valid email but is the "value" used by settings. Just remove it.
+                                    $v['value'] = '';
+                                }
+
+                                $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                                <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
+					            <div class="col-sm-9"><input type="text" class="form-control" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+                                </div>';
+
+                                break;
+
 	                        /* Default text input */
 	                        default:
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
                 	            if (strlen($k_value) != 0)
                                 {
                     	            $v['value'] = $k_value;
@@ -734,7 +838,7 @@ if ( ! isset($_SESSION['c_category']) && ! $hesk_settings['select_cat'])
 
 					            echo '<div class="form-group">
                                 <label for="'.$v['name'].'" class="col-sm-3 control-label">'.$v['name'].': '.$v['req'].'</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" id="'.$v['name'].'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
+					            <div class="col-sm-9"><input type="text" class="form-control" id="'.$formattedId.'" name="'.$k.'" size="40" maxlength="'.$v['maxlen'].'" value="'.$v['value'].'" '.$cls.' /></div>
                                 </div>';
 	                    }
 	                }