Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-02-08 00:34:42 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extract redirection logic from "Chat\Operator\ChatController"

Browse Source
This commit is contained in:
Dmitriy Simushev 2014-06-02 13:05:34 +00:00
parent 7ceb242814
commit e31b03ccdf
8 changed files with 98 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mibew/js/compiled/chat/model_views/controls/redirect.js
View File

@ -5,5 +5,5 @@
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
*/
(function(a,d,e){a.Views.RedirectControl=a.Views.Control.extend({template:d.templates.chat_controls_redirect,events:e.extend({},a.Views.Control.prototype.events,{click:"redirect"}),initialize:function(){a.Objects.Models.user.on("change",this.render,this)},serializeData:function(){var b=this.model.toJSON();b.user=a.Objects.Models.user.toJSON();return b},redirect:function(){var b=a.Objects.Models.user;if(b.get("isAgent")&&b.get("canPost")&&(b=this.model.get("link"))){var c=a.Objects.Models.page.get("style");
window.location.href=b.replace(/\&amp\;/g,"&")+(c?"&style="+c:"")}}})})(Mibew,Handlebars,_);
(function(b,e,f){b.Views.RedirectControl=b.Views.Control.extend({template:e.templates.chat_controls_redirect,events:f.extend({},b.Views.Control.prototype.events,{click:"redirect"}),initialize:function(){b.Objects.Models.user.on("change",this.render,this)},serializeData:function(){var a=this.model.toJSON();a.user=b.Objects.Models.user.toJSON();return a},redirect:function(){var a=b.Objects.Models.user;if(a.get("isAgent")&&a.get("canPost")&&(a=this.model.get("link"))){var c=b.Objects.Models.page.get("style"),
d="";c&&(d=(-1===a.indexOf("?")?"?":"&")+"style="+c);window.location.href=a.replace(/\&amp\;/g,"&")+d}}})})(Mibew,Handlebars,_);

4
src/mibew/js/compiled/chat_app.js
View File

@ -208,8 +208,8 @@ changeGroupDescription:function(){var a=this.ui.groupSelect.prop("selectedIndex"
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
*/
(function(a,d,e){a.Views.RedirectControl=a.Views.Control.extend({template:d.templates.chat_controls_redirect,events:e.extend({},a.Views.Control.prototype.events,{click:"redirect"}),initialize:function(){a.Objects.Models.user.on("change",this.render,this)},serializeData:function(){var b=this.model.toJSON();b.user=a.Objects.Models.user.toJSON();return b},redirect:function(){var b=a.Objects.Models.user;if(b.get("isAgent")&&b.get("canPost")&&(b=this.model.get("link"))){var c=a.Objects.Models.page.get("style");
window.location.href=b.replace(/\&amp\;/g,"&")+(c?"&style="+c:"")}}})})(Mibew,Handlebars,_);
(function(b,e,f){b.Views.RedirectControl=b.Views.Control.extend({template:e.templates.chat_controls_redirect,events:f.extend({},b.Views.Control.prototype.events,{click:"redirect"}),initialize:function(){b.Objects.Models.user.on("change",this.render,this)},serializeData:function(){var a=this.model.toJSON();a.user=b.Objects.Models.user.toJSON();return a},redirect:function(){var a=b.Objects.Models.user;if(a.get("isAgent")&&a.get("canPost")&&(a=this.model.get("link"))){var c=b.Objects.Models.page.get("style"),
d="";c&&(d=(-1===a.indexOf("?")?"?":"&")+"style="+c);window.location.href=a.replace(/\&amp\;/g,"&")+d}}})})(Mibew,Handlebars,_);
/*
Copyright 2005-2014 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License").

7
src/mibew/js/source/chat/model_views/controls/redirect.js
View File

@ -62,8 +62,13 @@
if (link) {
// Redirect browser to user redirection page
var style = Mibew.Objects.Models.page.get('style');
var styleArg = '';
if (style) {
styleArg = ((link.indexOf('?') === -1) ? '?' : '&')
+ 'style=' + style;
}
window.location.href = link.replace(/\&amp\;/g, '&')
+ (style ? ('&style=' + style) : '');
+ styleArg;
}
}
}

6
src/mibew/libs/chat.php
View File

@ -613,10 +613,8 @@ function setup_chatview_for_operator(Thread $thread, $operator)
$data['chat']['messageForm']['predefinedAnswers'] = $predefined_answers;
}
// Set link to user redirection page
$params = "thread=" . $thread->id . "&token=" . $thread->lastToken;
$data['chat']['links']['redirect'] = MIBEW_WEB_ROOT . "/operator/chat?"
. $params
. "&redirect=1";
$data['chat']['links']['redirect'] = MIBEW_WEB_ROOT . "/operator/chat/"
. $thread->id . '/' . $thread->lastToken . '/redirection-links';
$data['namePostfix'] = "";

18
src/mibew/libs/classes/Mibew/Controller/Chat/Operator/ChatController.php
View File

@ -76,21 +76,11 @@ class ChatController extends AbstractController
$page = setup_chatview_for_operator($thread, $operator);
if ($request->query->get('redirect')) {
$page = array_merge_recursive(
$page,
setup_redirect_links($thread_id, $operator, $token)
);
// Build js application options
$page['chatOptions'] = json_encode($page['chat']);
// Render the page with redirection links.
return $this->render('redirect', $page);
} else {
// Build js application options
$page['chatOptions'] = json_encode($page['chat']);
// Render the page with chat.
return $this->render('chat', $page);
}
// Render the page with chat.
return $this->render('chat', $page);
}
/**

76
src/mibew/libs/classes/Mibew/Controller/Chat/Operator/RedirectController.php
View File

@ -20,6 +20,7 @@ namespace Mibew\Controller\Chat\Operator;
use Mibew\Controller\Chat\AbstractController;
use Mibew\Database;
use Mibew\Http\Exception\BadRequestException;
use Mibew\Http\Exception\NotFoundException;
use Mibew\Thread;
use Symfony\Component\HttpFoundation\Request;
@ -29,31 +30,64 @@ use Symfony\Component\HttpFoundation\Request;
class RedirectController extends AbstractController
{
/**
* Process chat's redirections.
* Renders a page with redirections links.
*
* @param Request $request Incoming request.
* @return string|\Symfony\Component\HttpFoundation\RedirectResponse Rendered
* page content or a redirect response.
* @throws BadRequestException If the thread cannot be loaded by some
* reasons.
* @throws NotFoundException If the thread with specified ID and token is
* not found.
*/
public function indexAction(Request $request)
public function showRedirectionLinksAction(Request $request)
{
// Get and validate thread id
$thread_id = $request->query->get('thread');
if (!preg_match("/^\d{1,10}$/", $thread_id)) {
throw new BadRequestException('Wrong value of "thread" argument.');
// Check if we should force the user to use SSL
$ssl_redirect = $this->sslRedirect($request);
if ($ssl_redirect !== false) {
return $ssl_redirect;
}
// Get and validate token
$token = $request->query->get('token');
if (!preg_match("/^\d{1,10}$/", $token)) {
throw new BadRequestException('Wrong value of "token" argument.');
}
$operator = $this->getOperator();
$thread_id = $request->attributes->get('thread_id');
$token = $request->attributes->get('token');
$thread = Thread::load($thread_id, $token);
if (!$thread) {
throw new BadRequestException('Wrong thread.');
throw new NotFoundException('The thread is not found.');
}
if ($thread->agentId != $operator['operatorid']) {
$page = array('errors' => array('Can redirect only own threads.'));
return $this->render('error', $page);
}
$page = array_merge_recursive(
setup_chatview_for_operator($thread, $operator),
setup_redirect_links($this->getRouter()->getGenerator(), $thread_id, $operator, $token)
);
// Render the page with redirection links.
return $this->render('redirect', $page);
}
/**
* Process chat thread redirection.
*
* @param Request $request Incoming request.
* @return string|\Symfony\Component\HttpFoundation\RedirectResponse Rendered
* page content or a redirect response.
* @throws NotFoundException If the thread with specified ID and token is
* not found.
* @throws BadRequestException If one or more arguments have a wrong format.
*/
public function redirectAction(Request $request)
{
$thread_id = $request->attributes->get('thread_id');
$token = $request->attributes->get('token');
$thread = Thread::load($thread_id, $token);
if (!$thread) {
throw new NotFoundException('The thread is not found.');
}
$page = array(
@ -109,6 +143,13 @@ class RedirectController extends AbstractController
}
}
/**
* Redirects a chat thread to the group with the specified ID.
*
* @param \Mibew\Thread $thread Chat thread to redirect.
* @param int $group_id ID of the target group.
* @return boolean True if the thread was redirected and false on failure.
*/
protected function redirectToGroup(Thread $thread, $group_id)
{
if ($thread->state != Thread::STATE_CHATTING) {
@ -138,6 +179,13 @@ class RedirectController extends AbstractController
return true;
}
/**
* Redirects a chat thread to the operator with the specified ID.
*
* @param \Mibew\Thread $thread Chat thread to redirect.
* @param int $group_id ID of the target operator.
* @return boolean True if the thread was redirected and false on failure.
*/
protected function redirectToOperator(Thread $thread, $operator_id)
{
if ($thread->state != Thread::STATE_CHATTING) {

11
src/mibew/libs/operator.php
View File

@ -19,6 +19,7 @@
use Mibew\Database;
use Mibew\EventDispatcher;
use Mibew\Settings;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
* Name of the cookie to remember an operator
@ -603,7 +604,7 @@ function get_logged_in()
: false;
}
function setup_redirect_links($threadid, $operator, $token)
function setup_redirect_links(UrlGeneratorInterface $url_generator, $threadid, $operator, $token)
{
$result = array();
@ -637,7 +638,7 @@ function setup_redirect_links($threadid, $operator, $token)
$groups = array_slice($groups, $p['start'], $p['end'] - $p['start']);
$agent_list = "";
$params = array('thread' => $threadid, 'token' => $token);
$params = array('thread_id' => $threadid, 'token' => $token);
foreach ($operators as $agent) {
$params['nextAgent'] = $agent['operatorid'];
$status = $agent['time'] < Settings::get('online_timeout')
@ -645,7 +646,7 @@ function setup_redirect_links($threadid, $operator, $token)
? getlocal("char.redirect.operator.online_suff")
: getlocal("char.redirect.operator.away_suff"))
: "";
$agent_list .= "<li><a href=\"" . add_params(MIBEW_WEB_ROOT . "/operator/chat/redirect", $params)
$agent_list .= "<li><a href=\"" . $url_generator->generate('chat_operator_redirect', $params)
. "\" title=\"" . get_operator_name($agent) . "\">"
. get_operator_name($agent)
. "</a> $status</li>";
@ -654,13 +655,13 @@ function setup_redirect_links($threadid, $operator, $token)
$group_list = "";
if (Settings::get('enablegroups') == "1") {
$params = array('thread' => $threadid, 'token' => $token);
$params = array('thread_id' => $threadid, 'token' => $token);
foreach ($groups as $group) {
$params['nextGroup'] = $group['groupid'];
$status = group_is_online($group)
? getlocal("char.redirect.operator.online_suff")
: (group_is_away($group) ? getlocal("char.redirect.operator.away_suff") : "");
$group_list .= "<li><a href=\"" . add_params(MIBEW_WEB_ROOT . "/operator/chat/redirect", $params)
$group_list .= "<li><a href=\"" . $url_generator->generate('chat_operator_redirect', $params)
. "\" title=\"" . get_group_name($group) . "\">"
. get_group_name($group)
. "</a> $status</li>";

16
src/mibew/libs/routing.yml
View File

@ -8,10 +8,22 @@ chat_operator:
_access_check: Mibew\AccessControl\Check\LoggedInCheck
chat_operator_redirect:
path: /operator/chat/redirect
path: /operator/chat/{thread_id}/{token}/redirect
defaults:
_controller: Mibew\Controller\Chat\Operator\RedirectController::indexAction
_controller: Mibew\Controller\Chat\Operator\RedirectController::redirectAction
_access_check: Mibew\AccessControl\Check\LoggedInCheck
requirements:
thread_id: \d{1,10}
token: \d{1,10}
chat_operator_redirection_links:
path: /operator/chat/{thread_id}/{token}/redirection-links
defaults:
_controller: Mibew\Controller\Chat\Operator\RedirectController::showRedirectionLinksAction
_access_check: Mibew\AccessControl\Check\LoggedInCheck
requirements:
thread_id: \d{1,10}
token: \d{1,10}
## User's chat
chat_user: