php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 22:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2883 from kartik-v/patch-14

Browse Source 
Simplify inline script code
This commit is contained in:
Alexander Makarov
2014-03-26 14:28:20 +03:00
parent 3a5e0c7f61 cd4038bfa8
commit 0d3e85caff
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/authclient/views/redirect.php
View File

@@ -5,8 +5,11 @@ use yii\helpers\Json;
/* @var $this \yii\base\View */ /* @var $this \yii\base\View */
/* @var $url string */ /* @var $url string */
/* @var $enforceRedirect boolean */ /* @var $enforceRedirect boolean */
?>
$redirectJavaScript = <<<EOL <!DOCTYPE html>
<html>
<head>
<script>
function popupWindowRedirect(url, enforceRedirect) function popupWindowRedirect(url, enforceRedirect)
{ {
if (window.opener && !window.opener.closed) { if (window.opener && !window.opener.closed) {
@@ -19,15 +22,8 @@ function popupWindowRedirect(url, enforceRedirect)
window.location = url; window.location = url;
} }
} }
EOL; popupWindowRedirect(<?= Json::encode($url) ?>, <?= Json::encode($enforceRedirect) ?>);
</script>
$redirectJavaScript .= 'popupWindowRedirect(' . Json::encode($url) . ', ' . Json::encode($enforceRedirect) . ');';
?>
<!DOCTYPE html>
<html>
<head>
<?= Html::script($redirectJavaScript) ?>
</head> </head>
<body> <body>
<h2 id="title" style="display:none;">Redirecting back to the &quot;<?= Yii::$app->name ?>&quot;...</h2> <h2 id="title" style="display:none;">Redirecting back to the &quot;<?= Yii::$app->name ?>&quot;...</h2>