From 2b234e8e1d5fa974199de0769927b8ea3321a8b7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 28 Dec 2014 00:50:35 -0500
Subject: [PATCH] #91 Finished date custom fields

---
 admin/admin_submit_ticket.php |  2 +-
 admin/admin_ticket.php        | 24 ++++++++++++++++++++----
 submit_ticket.php             | 13 ++++++++++++-
 ticket.php                    | 24 ++++++++++++++++++++----
 4 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index 723ff577..a0d347af 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -95,7 +95,7 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v)
         // Date will be handled by the jQuery datepicker
         if( $v['type'] == 'date' && $_POST[$k] != '')
         {
-            $tmpvar[$k] = hesk_date($_POST[$k]);
+            $tmpvar[$k] = strtotime($_POST[$k]);
         } else if (is_array($_POST[$k]))
         {
 			$tmpvar[$k]='';
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 64b9bef9..bb67be44 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1036,8 +1036,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 		                    {
 			                    if ($v['use'] && $v['place']==0)
 		                        {
-		                            echo '
-				                    <p>'.$v['name'].': '.$ticket[$k].'</p>';
+		                            echo '<p>'.$v['name'].': ';
+                                    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'])
 		                        {
-		                            echo '
-				                    <p>'.$v['name'].': '.$ticket[$k].'</p>';
+                                    echo '<p>'.$v['name'].': ';
+                                    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 */
diff --git a/submit_ticket.php b/submit_ticket.php
index f2e436eb..bcd094e7 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -238,10 +238,21 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v)
             {
             	$hesk_error_buffer[$k]=$hesklang['fill_all'].': '.$v['name'];
             }
+
+            if ($v['type'] == 'date')
+            {
+                $tmpvar[$k] = strtotime($_POST[$k]);
+            }
         }
 		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);
 	}
diff --git a/ticket.php b/ticket.php
index 2ac6e220..1bddc135 100644
--- a/ticket.php
+++ b/ticket.php
@@ -330,8 +330,16 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                             {
                                 if ($v['use'] && $v['place']==0)
                                 {
-                                    echo '
-                                    <p>'.$v['name'].': '.$ticket[$k].'</p>';
+                                    echo '<p>'.$v['name'].': ';
+                                    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'])
                             {
-                                echo '
-                                <p>'.$v['name'].': '.$ticket[$k].'</p>';
+                                echo '<p>'.$v['name'].': ';
+                                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 */