Skip to content

Prevent redirect for xhttp #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SintezCode wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Prevent redirect for xhttp #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions core/components/login/controllers/web/Login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ class LoginLoginController extends LoginController {
public $isAuthenticated = false;
/** @var LoginDictionary $dictionary */
public $dictionary;
private $_content='';
private $form_render=true;

public function initialize() {
$this->setDefaultProperties(array(
Expand Down Expand Up @@ -66,8 +68,8 @@ public function process() {
if (!empty($_REQUEST[$this->getProperty('actionKey','service')])) {
$this->handleRequest();
}
$content = $this->renderForm();
return $this->output($content);
if($this->form_render)$this->_content .= $this->renderForm();
return $this->output($this->_content);
}

/**
Expand Down Expand Up @@ -335,12 +337,12 @@ public function redirectAfterLogin(modProcessorResponse $response) {
$loginResourceParams = $this->modx->fromJSON($loginResourceParams);
}
$url = $this->modx->makeUrl($loginResourceId,'',$loginResourceParams,'full');
$this->modx->sendRedirect($url);
} elseif (!empty($responseArray) && !empty($responseArray['url'])) {
$this->modx->sendRedirect($responseArray['url']);
$url=$responseArray['url'];
} else {
$this->modx->sendRedirect($this->modx->getOption('site_url'));
$url=$this->modx->getOption('site_url');
}
$this->isXHttp()?$this->XHttpRedirect($url):$this->modx->sendRedirect($url);
}

public function logout() {
Expand Down Expand Up @@ -435,17 +437,25 @@ public function redirectAfterLogout(modProcessorResponse $response) {
/* redirect */
$logoutResourceId = $this->getProperty('logoutResourceId',0);
if (!empty($responseArray) && !empty($responseArray['url'])) {
$this->modx->sendRedirect($responseArray['url']);
$url = $responseArray['url'];
} elseif (!empty($logoutResourceId)) {
$logoutResourceParams = $this->getProperty('logoutResourceParams','');
if (!empty($logoutResourceParams)) {
$logoutResourceParams = $this->modx->fromJSON($logoutResourceParams);
}
$url = $this->modx->makeUrl($logoutResourceId,'',$logoutResourceParams,'full');
$this->modx->sendRedirect($url);
} else {
$this->modx->sendRedirect($_SERVER['REQUEST_URI']);
$url = $_SERVER['REQUEST_URI'];
}
$this->isXHttp()?$this->XHttpRedirect($url):$this->modx->sendRedirect($url);
}

private function isXHttp(){
return !empty($_SERVER['HTTP_X_REQUESTED_WITH'])&&strtolower($_SERVER['HTTP_X_REQUESTED_WITH'])=='xmlhttprequest';
}
private function XHttpRedirect($url){
$this->_content=json_encode(array('redirect'=>true,'location'=>$url));
$this->form_render=false;
}
}
return 'LoginLoginController';
return 'LoginLoginController';