#91 Finished date custom fields

merge-requests/2/head
Mike Koch 9 years ago
parent b449953950
commit 2b234e8e1d

@ -95,7 +95,7 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v)
// Date will be handled by the jQuery datepicker // Date will be handled by the jQuery datepicker
if( $v['type'] == 'date' && $_POST[$k] != '') if( $v['type'] == 'date' && $_POST[$k] != '')
{ {
$tmpvar[$k] = hesk_date($_POST[$k]); $tmpvar[$k] = strtotime($_POST[$k]);
} else if (is_array($_POST[$k])) } else if (is_array($_POST[$k]))
{ {
$tmpvar[$k]=''; $tmpvar[$k]='';

@ -1036,8 +1036,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
{ {
if ($v['use'] && $v['place']==0) if ($v['use'] && $v['place']==0)
{ {
echo ' echo '<p>'.$v['name'].': ';
<p>'.$v['name'].': '.$ticket[$k].'</p>'; if ($v['type'] == 'date' && !empty($ticket[$k]))
{
$dt = date('Y-m-d h:i:s', $ticket[$k]);
echo hesk_dateToString($dt, 0);
} else
{
echo $ticket[$k];
}
echo '</p>';
} }
} }
?> ?>
@ -1054,8 +1062,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
{ {
if ($v['use'] && $v['place']) if ($v['use'] && $v['place'])
{ {
echo ' echo '<p>'.$v['name'].': ';
<p>'.$v['name'].': '.$ticket[$k].'</p>'; if ($v['type'] == 'date' && !empty($ticket[$k]))
{
$dt = date('Y-m-d h:i:s', $ticket[$k]);
echo hesk_dateToString($dt, 0);
} else
{
echo $ticket[$k];
}
echo '</p>';
} }
} }
/* Attachments */ /* Attachments */

@ -238,10 +238,21 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v)
{ {
$hesk_error_buffer[$k]=$hesklang['fill_all'].': '.$v['name']; $hesk_error_buffer[$k]=$hesklang['fill_all'].': '.$v['name'];
} }
if ($v['type'] == 'date')
{
$tmpvar[$k] = strtotime($_POST[$k]);
}
} }
else else
{ {
$tmpvar[$k]=hesk_makeURL(nl2br(hesk_input( hesk_POST($k) ))); if ($v['type'] == 'date' && $_POST[$k] != '')
{
$tmpvar[$k] = strtotime($_POST[$k]);
} else
{
$tmpvar[$k] = hesk_makeURL(nl2br(hesk_input(hesk_POST($k))));
}
} }
$_SESSION["c_$k"]=hesk_POST($k); $_SESSION["c_$k"]=hesk_POST($k);
} }

@ -330,8 +330,16 @@ require_once(HESK_PATH . 'inc/header.inc.php');
{ {
if ($v['use'] && $v['place']==0) if ($v['use'] && $v['place']==0)
{ {
echo ' echo '<p>'.$v['name'].': ';
<p>'.$v['name'].': '.$ticket[$k].'</p>'; if ($v['type'] == 'date' && !empty($ticket[$k]))
{
$dt = date('Y-m-d h:i:s', $ticket[$k]);
echo hesk_dateToString($dt, 0);
} else
{
echo $ticket[$k];
}
echo '</p>';
} }
} }
?> ?>
@ -348,8 +356,16 @@ require_once(HESK_PATH . 'inc/header.inc.php');
{ {
if ($v['use'] && $v['place']) if ($v['use'] && $v['place'])
{ {
echo ' echo '<p>'.$v['name'].': ';
<p>'.$v['name'].': '.$ticket[$k].'</p>'; if ($v['type'] == 'date' && !empty($ticket[$k]))
{
$dt = date('Y-m-d h:i:s', $ticket[$k]);
echo hesk_dateToString($dt, 0);
} else
{
echo $ticket[$k];
}
echo '</p>';
} }
} }
/* Attachments */ /* Attachments */

Loading…
Cancel
Save