1 files changed, 37 insertions, 42 deletions

diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index 0a4682db759..51e17cb9076 100755
--- a/src/server/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
@@ -31,45 +31,32 @@ inline float GetAge(uint64 t) { return float(time(NULL) - t) / DAY; }
 // GM ticket
 GmTicket::GmTicket() { }
 
-GmTicket::GmTicket(Player* player, WorldPacket& recv_data) : _createTime(time(NULL)), _lastModifiedTime(time(NULL)), _closedBy(0), _assignedTo(0), _completed(false), _escalatedStatus(TICKET_UNASSIGNED)
+GmTicket::GmTicket(Player* player, WorldPacket& recvData) : _createTime(time(NULL)), _lastModifiedTime(time(NULL)), _closedBy(0), _assignedTo(0), _completed(false), _escalatedStatus(TICKET_UNASSIGNED), _haveTicket(false)
 {
     _id = sTicketMgr->GenerateTicketId();
     _playerName = player->GetName();
     _playerGuid = player->GetGUID();
 
     uint32 mapId;
-    recv_data >> mapId; // Map is sent as UInt32!
+    recvData >> mapId;                      // Map is sent as UInt32!
     _mapId = mapId;
 
-    recv_data >> _posX;
-    recv_data >> _posY;
-    recv_data >> _posZ;
-    recv_data >> _message;
+    recvData >> _posX;
+    recvData >> _posY;
+    recvData >> _posZ;
+    recvData >> _message;
     uint32 needResponse;
-    recv_data >> needResponse;
-    _needResponse = (needResponse == 17); // Requires GM response. 17 = true, 1 = false (17 is default)
-    uint8 unk1;
-    recv_data >> unk1; // Requests further GM interaction on a ticket to which a GM has already responded
-
-    recv_data.rfinish();
-    /*
-    recv_data >> uint32(count); // text lines
-    for (int i = 0; i < count; i++)
-        recv_data >> uint32();
-
-    if (something)
-        recv_data >> uint32();
-    else
-        compressed uint32 + string;
-    */
+    recvData >> needResponse;
+    _needResponse = (needResponse == 17);   // Requires GM response. 17 = true, 1 = false (17 is default)
+    recvData >> _haveTicket;                // Requests further GM interaction on a ticket to which a GM has already responded. Basically means "has a new ticket"
 }
 
 GmTicket::~GmTicket() { }
 
 bool GmTicket::LoadFromDB(Field* fields)
 {
-    //     0       1     2      3          4        5      6     7     8           9            10         11         12        13        14        15
-    // ticketId, guid, name, message, createTime, mapId, posX, posY, posZ, lastModifiedTime, closedBy, assignedTo, comment, completed, escalated, viewed
+    //     0       1     2      3          4        5      6     7     8           9            10         11         12       13        14         15        16        17
+    // ticketId, guid, name, message, createTime, mapId, posX, posY, posZ, lastModifiedTime, closedBy, assignedTo, comment, response, completed, escalated, viewed, haveTicket
     uint8 index = 0;
     _id                 = fields[  index].GetUInt32();
     _playerGuid         = MAKE_NEW_GUID(fields[++index].GetUInt32(), 0, HIGHGUID_PLAYER);
@@ -84,9 +71,11 @@ bool GmTicket::LoadFromDB(Field* fields)
     _closedBy           = fields[++index].GetInt32();
     _assignedTo         = MAKE_NEW_GUID(fields[++index].GetUInt32(), 0, HIGHGUID_PLAYER);
     _comment            = fields[++index].GetString();
+    _response           = fields[++index].GetString();
     _completed          = fields[++index].GetBool();
     _escalatedStatus    = GMTicketEscalationStatus(fields[++index].GetUInt8());
     _viewed             = fields[++index].GetBool();
+    _haveTicket         = fields[++index].GetBool();
     return true;
 }
 
@@ -109,9 +98,11 @@ void GmTicket::SaveToDB(SQLTransaction& trans) const
     stmt->setInt32 (++index, GUID_LOPART(_closedBy));
     stmt->setUInt32(++index, GUID_LOPART(_assignedTo));
     stmt->setString(++index, _comment);
+    stmt->setString(++index, _response);
     stmt->setBool  (++index, _completed);
     stmt->setUInt8 (++index, uint8(_escalatedStatus));
     stmt->setBool  (++index, _viewed);
+    stmt->setBool  (++index, _haveTicket);
 
     CharacterDatabase.ExecuteOrAppend(trans, stmt);
 }
@@ -125,6 +116,10 @@ void GmTicket::DeleteFromDB()
 
 void GmTicket::WritePacket(WorldPacket& data) const
 {
+    data << uint32(GMTICKET_STATUS_HASTEXT);
+    data << uint32(_id);
+    data << _message;
+    data << uint8(_haveTicket);
     data << GetAge(_lastModifiedTime);
     if (GmTicket* ticket = sTicketMgr->GetOldestOpenTicket())
         data << GetAge(ticket->GetLastModifiedTime());
@@ -223,6 +218,20 @@ void GmTicket::TeleportTo(Player* player) const
     player->TeleportTo(_mapId, _posX, _posY, _posZ, 0.0f, 0);
 }
 
+void GmTicket::SetChatLog(std::list<uint32> time, std::string const& log)
+{
+    std::stringstream ss(log);
+    std::stringstream newss;
+    std::string line;
+    while (std::getline(ss, line))
+    {
+        newss << secsToTimeString(time.front()) << ": " << line << "\n";
+        time.pop_front();
+    }
+
+    _chatLog = newss.str();
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Ticket manager
 TicketMgr::TicketMgr() : _status(true), _lastTicketId(0), _lastSurveyId(0), _openTicketCount(0), _lastChange(time(NULL)) { }
@@ -365,26 +374,12 @@ void TicketMgr::ShowEscalatedList(ChatHandler& handler) const
 
 void TicketMgr::SendTicket(WorldSession* session, GmTicket* ticket) const
 {
-    uint32 status = GMTICKET_STATUS_DEFAULT;
-    std::string message;
-    if (ticket)
-    {
-        message = ticket->GetMessage();
-        status = GMTICKET_STATUS_HASTEXT;
-    }
-
-    WorldPacket data(SMSG_GMTICKET_GETTICKET, (4 + 4 + (ticket ? message.length() + 1 + 4 + 4 + 4 + 1 + 1 : 0)));
-    data << uint32(status);                         // standard 0x0A, 0x06 if text present
-    data << uint32(ticket ? ticket->GetId() : 0);   // ticketID
+    WorldPacket data(SMSG_GMTICKET_GETTICKET, (ticket ? (4 + 4 + 1 + 4 + 4 + 4 + 1 + 1) : 4));
 
     if (ticket)
-    {
-        data << message.c_str();                    // ticket text
-        data << uint8(0x7);                         // ticket category; why is this hardcoded? does it make a diff re: client?
-
-        // we've got the easy stuff done by now.
-        // Now we need to go through the client logic for displaying various levels of ticket load
         ticket->WritePacket(data);
-    }
+    else
+        data << uint32(GMTICKET_STATUS_DEFAULT);
+
     session->SendPacket(&data);
 }