Mibew/design
1
0
Fork 0
mirror of https://github.com/Mibew/design.git synced 2024-11-15 17:34:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Thread object creation to /operator/update.php

Browse Source 
Replace direct work with thread table's fields by Thread object
This commit is contained in:
Dmitriy Simushev 2012-10-01 11:39:58 +00:00
parent f553f42460
commit 898ecc3055
1 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/messenger/webim/operator/update.php
View File

@ -47,28 +47,31 @@ $threadstate_key = array(
Thread::STATE_LOADING => "chat.thread.state_loading" Thread::STATE_LOADING => "chat.thread.state_loading"
); );
function thread_to_xml($thread) function thread_to_xml($thread_info)
{ {
global $threadstate_to_string, $threadstate_key, global $threadstate_to_string, $threadstate_key,
$webim_encoding, $operator, $can_viewthreads, $can_takeover; $webim_encoding, $operator, $can_viewthreads, $can_takeover;
$state = $threadstate_to_string[$thread['istate']];
$result = "<thread id=\"" . $thread['threadid'] . "\" stateid=\"$state\""; $thread = $thread_info['thread'];
$state = $threadstate_to_string[$thread->state];
$result = "<thread id=\"" . $thread->id . "\" stateid=\"$state\"";
if ($state == "closed") if ($state == "closed")
return $result . "/>"; return $result . "/>";
$state = getstring($threadstate_key[$thread['istate']]); $state = getstring($threadstate_key[$thread->state]);
$nextagent = $thread['nextagent'] != 0 ? operator_by_id($thread['nextagent']) : null; $nextagent = $thread->nextAgent != 0 ? operator_by_id($thread->nextAgent) : null;
$threadoperator = $nextagent ? get_operator_name($nextagent) $threadoperator = $nextagent ? get_operator_name($nextagent)
: ($thread['agentName'] ? $thread['agentName'] : "-"); : ($thread->agentName ? $thread->agentName : "-");
if ($threadoperator == "-" && $thread['groupname']) { if ($threadoperator == "-" && $thread_info['groupname']) {
$threadoperator = "- " . $thread['groupname'] . " -"; $threadoperator = "- " . $thread_info['groupname'] . " -";
} }
if (!($thread['istate'] == Thread::STATE_CHATTING && $thread['agentId'] != $operator['operatorid'] && !is_capable($can_takeover, $operator))) { if (!($thread->state == Thread::STATE_CHATTING && $thread->agentId != $operator['operatorid'] && !is_capable($can_takeover, $operator))) {
$result .= " canopen=\"true\""; $result .= " canopen=\"true\"";
} }
if ($thread['agentId'] != $operator['operatorid'] && $thread['nextagent'] != $operator['operatorid'] if ($thread->agentId != $operator['operatorid'] && $thread->nextAgent != $operator['operatorid']
&& is_capable($can_viewthreads, $operator)) { && is_capable($can_viewthreads, $operator)) {
$result .= " canview=\"true\""; $result .= " canview=\"true\"";
} }
@ -76,33 +79,35 @@ function thread_to_xml($thread)
$result .= " canban=\"true\""; $result .= " canban=\"true\"";
} }
$banForThread = Settings::get('enableban') == "1" ? ban_for_addr($thread['remote']) : false; $banForThread = Settings::get('enableban') == "1" ? ban_for_addr($thread->remote) : false;
if ($banForThread) { if ($banForThread) {
$result .= " ban=\"blocked\" banid=\"" . $banForThread['banid'] . "\""; $result .= " ban=\"blocked\" banid=\"" . $banForThread['banid'] . "\"";
} }
$result .= " state=\"$state\" typing=\"" . $thread['userTyping'] . "\">"; $result .= " state=\"$state\" typing=\"" . $thread->userTyping . "\">";
$result .= "<name>"; $result .= "<name>";
if ($banForThread) { if ($banForThread) {
$result .= htmlspecialchars(getstring('chat.client.spam.prefix')); $result .= htmlspecialchars(getstring('chat.client.spam.prefix'));
} }
$result .= htmlspecialchars(htmlspecialchars(get_user_name($thread['userName'], $thread['remote'], $thread['userid']))) . "</name>"; $result .= htmlspecialchars(
$result .= "<addr>" . htmlspecialchars(get_user_addr($thread['remote'])) . "</addr>"; htmlspecialchars(get_user_name($thread->userName, $thread->remote, $thread->userId))
) . "</name>";
$result .= "<addr>" . htmlspecialchars(get_user_addr($thread->remote)) . "</addr>";
$result .= "<agent>" . htmlspecialchars(htmlspecialchars($threadoperator)) . "</agent>"; $result .= "<agent>" . htmlspecialchars(htmlspecialchars($threadoperator)) . "</agent>";
$result .= "<time>" . $thread['dtmcreated'] . "000</time>"; $result .= "<time>" . $thread->created . "000</time>";
$result .= "<modified>" . $thread['dtmmodified'] . "000</modified>"; $result .= "<modified>" . $thread->modified . "000</modified>";
if ($banForThread) { if ($banForThread) {
$result .= "<reason>" . $banForThread['comment'] . "</reason>"; $result .= "<reason>" . $banForThread['comment'] . "</reason>";
} }
$userAgent = get_useragent_version($thread['userAgent']); $userAgent = get_useragent_version($thread->userAgent);
$result .= "<useragent>" . $userAgent . "</useragent>"; $result .= "<useragent>" . $userAgent . "</useragent>";
if ($thread["shownmessageid"] != 0) { if ($thread->shownMessageId != 0) {
$db = Database::getInstance(); $db = Database::getInstance();
$line = $db->query( $line = $db->query(
"select tmessage from {chatmessage} where messageid = ?", "select tmessage from {chatmessage} where messageid = ?",
array($thread["shownmessageid"]), array($thread->shownMessageId),
array('return_rows' => Database::RETURN_ONE_ROW) array('return_rows' => Database::RETURN_ONE_ROW)
); );
if ($line) { if ($line) {
@ -120,9 +125,8 @@ function print_pending_threads($groupids, $since)
$db = Database::getInstance(); $db = Database::getInstance();
$revision = $since; $revision = $since;
$query = "select threadid, userName, agentName, dtmcreated, userTyping, " . $query = "select {chatthread}.*, " .
"dtmmodified, lrevision, istate, remote, nextagent, agentId, " . "(select vclocalname from {chatgroup} where {chatgroup}.groupid = {chatthread}.groupid) as groupname " .
"userid, shownmessageid, userAgent, (select vclocalname from {chatgroup} where {chatgroup}.groupid = {chatthread}.groupid) as groupname " .
"from {chatthread} where lrevision > :since " . "from {chatthread} where lrevision > :since " .
($since <= 0 ($since <= 0
? "AND istate <> " . Thread::STATE_CLOSED . " AND istate <> " . Thread::STATE_LEFT . " " ? "AND istate <> " . Thread::STATE_CLOSED . " AND istate <> " . Thread::STATE_LEFT . " "
@ -142,10 +146,16 @@ function print_pending_threads($groupids, $since)
$output = array(); $output = array();
foreach ($rows as $row) { foreach ($rows as $row) {
$thread = thread_to_xml($row); $thread = Thread::createFromDbInfo($row);
$output[] = $thread; $thread_info = array(
if ($row['lrevision'] > $revision) 'thread' => $thread,
$revision = $row['lrevision']; 'groupName' => $row['groupname']
);
$thread_as_xml = thread_to_xml($thread_info);
$output[] = $thread_as_xml;
if ($thread->lastRevision > $revision) {
$revision = $thread->lastRevision;
}
} }
echo "<threads revision=\"$revision\" time=\"" . time() . "000\">"; echo "<threads revision=\"$revision\" time=\"" . time() . "000\">";