diff --git a/index.php b/index.php index 84ad3523..8629bac0 100644 --- a/index.php +++ b/index.php @@ -85,22 +85,11 @@ function print_select_category($number_of_categories) hesk_process_messages($hesklang['sel_app_cat'],'NOREDIRECT','NOTICE'); } ?> - - - - - - - -
- - - - - -
> - > -
+ @@ -123,7 +112,7 @@ function print_select_category($number_of_categories) { ?>
- - + ?> +
+ +
+
+
+
+ +
+
+
+
+
+
'; + } + endforeach; } ?> @@ -326,7 +332,7 @@ function print_add_ticket() enctype="multipart/form-data" >
-
@@ -342,7 +348,7 @@ function print_add_ticket()
+ ($hesk_settings['require_email'] ? ' *' : ''); ?>
+ *' : ''; ?>
-
@@ -433,11 +439,11 @@ function print_add_ticket() /* custom fields BEFORE comments */ + $hidden_cf_buffer = ''; foreach ($hesk_settings['custom_fields'] as $k=>$v) { if ($v['use']==1 && $v['place']==0 && hesk_is_custom_field_in_category($k, $category) ) { - $v['req'] = $v['req'] ? '*' : ''; if ($v['type'] == 'checkbox') @@ -464,45 +470,40 @@ function print_add_ticket() { /* Radio box */ case 'radio': - echo ' - - '.$v['name:'].' '.$v['req'].' - '; - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + echo ' +
+ +
'; - foreach ($v['value']['radio_options'] as $option) - { + foreach ($v['value']['radio_options'] as $option) { if (strlen($k_value) == 0) { $k_value = $option; - $checked = empty($v['value']['no_default']) ? 'checked="checked"' : ''; + $checked = empty($v['value']['no_default']) ? 'checked' : ''; } elseif ($k_value == $option) { $k_value = $option; - $checked = 'checked="checked"'; - } - else - { + $checked = 'checked'; + } else { $checked = ''; } - echo '
'; + echo '
'; } - - echo ' - - '; + echo ' +
+
'; break; /* Select drop-down box */ case 'select': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - '; // Show "Click to select"? if ( ! empty($v['value']['show_select'])) { @@ -514,7 +515,7 @@ function print_add_ticket() if ($k_value == $option) { $k_value = $option; - $selected = 'selected="selected"'; + $selected = 'selected'; } else { @@ -524,77 +525,76 @@ function print_add_ticket() echo ''; } - echo ' - - '; + echo ' +
+
'; break; /* Checkbox */ case 'checkbox': + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - '; - - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; +
+ +
'; - foreach ($v['value']['checkbox_options'] as $option) + foreach ($v['value']['checkbox_options'] as $option) + { + if (in_array($option,$k_value)) { - if (in_array($option,$k_value)) - { - $checked = 'checked="checked"'; - } - else - { - $checked = ''; - } - - echo '
'; + $checked = 'checked'; + } + else + { + $checked = ''; } - echo ' - - '; + echo '
'; + } + echo '
+
'; break; /* Large text box */ case 'textarea': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; break; // Date case 'date': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; break; // Email case 'email': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; $suggest = $hesk_settings['detect_typos'] ? 'onblur="Javascript:hesk_suggestEmail(\''.$k.'\', \''.$k.'_suggestions\', 0, 0'.($v['value']['multiple'] ? ',1' : '').')"' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - -
- - - '; +
+ +
+ +
+
+
'; break; // Hidden @@ -603,7 +603,25 @@ function print_add_ticket() { $v['value']['default_value'] = $k_value; } - $hidden_cf_buffer .= ''; + $hidden_cf_buffer .= ''; + break; + + // Readonly + case 'readonly': + if (strlen($k_value) != 0 || isset($_SESSION["c_$k"])) + { + $v['value']['default_value'] = $k_value; + } + + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; + + echo ' +
+ +
+ +
+
'; break; /* Default text input */ @@ -613,14 +631,15 @@ function print_add_ticket() $v['value']['default_value'] = $k_value; } - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; } } } @@ -759,45 +778,40 @@ function print_add_ticket() { /* Radio box */ case 'radio': - echo ' - - '.$v['name:'].' '.$v['req'].' - '; - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + echo ' +
+ +
'; - foreach ($v['value']['radio_options'] as $option) - { + foreach ($v['value']['radio_options'] as $option) { if (strlen($k_value) == 0) { $k_value = $option; - $checked = empty($v['value']['no_default']) ? 'checked="checked"' : ''; + $checked = empty($v['value']['no_default']) ? 'checked' : ''; } elseif ($k_value == $option) { $k_value = $option; - $checked = 'checked="checked"'; - } - else - { + $checked = 'checked'; + } else { $checked = ''; } - echo '
'; + echo '
'; } - - echo ' - - '; + echo ' +
+
'; break; /* Select drop-down box */ case 'select': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - '; // Show "Click to select"? if ( ! empty($v['value']['show_select'])) { @@ -809,7 +823,7 @@ function print_add_ticket() if ($k_value == $option) { $k_value = $option; - $selected = 'selected="selected"'; + $selected = 'selected'; } else { @@ -819,85 +833,103 @@ function print_add_ticket() echo ''; } - echo ' - - '; + echo ' +
+
'; break; /* Checkbox */ case 'checkbox': + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - '; - - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; +
+ +
'; foreach ($v['value']['checkbox_options'] as $option) { if (in_array($option,$k_value)) { - $checked = 'checked="checked"'; + $checked = 'checked'; } else { $checked = ''; } - echo '
'; + echo '
'; } - - echo ' - - '; + echo '
+
'; break; /* Large text box */ case 'textarea': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; break; // Date case 'date': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; break; // Email case 'email': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; $suggest = $hesk_settings['detect_typos'] ? 'onblur="Javascript:hesk_suggestEmail(\''.$k.'\', \''.$k.'_suggestions\', 0, 0'.($v['value']['multiple'] ? ',1' : '').')"' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - -
- - - '; +
+ +
+ +
+
+
'; break; // Hidden case 'hidden': - if (strlen($k_value) != 0 || isset($_SESSION["c_$k"])) { + if (strlen($k_value) != 0 || isset($_SESSION["c_$k"])) + { $v['value']['default_value'] = $k_value; } - $hidden_cf_buffer .= ''; + $hidden_cf_buffer .= ''; + break; + + // Readonly + case 'readonly': + if (strlen($k_value) != 0 || isset($_SESSION["c_$k"])) + { + $v['value']['default_value'] = $k_value; + } + + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; + + echo ' +
+ +
+ +
+
'; break; /* Default text input */ @@ -907,14 +939,15 @@ function print_add_ticket() $v['value']['default_value'] = $k_value; } - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? 'isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; } } }