tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47 from hafriedlander/fix/flush_24

Browse Source 
FIX Include flushtoken when install redirects to successfullyinstalled
This commit is contained in:
Ingo Schommer 2013-08-03 04:56:38 -07:00
commit c76cce5e4a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install.php
View File

@ -1124,15 +1124,19 @@ PHP
$this->statusMessage("Checking that friendly URLs work..."); $this->statusMessage("Checking that friendly URLs work...");
$this->checkRewrite(); $this->checkRewrite();
} else { } else {
require_once 'core/startup/ParameterConfirmationToken.php';
$token = new ParameterConfirmationToken('flush');
$params = http_build_query($token->params());
echo <<<HTML echo <<<HTML
<li>SilverStripe successfully installed; I am now redirecting you to your SilverStripe site...</li> <li>SilverStripe successfully installed; I am now redirecting you to your SilverStripe site...</li>
<script> <script>
setTimeout(function() { setTimeout(function() {
window.location = "index.php/home/successfullyinstalled?flush=1"; window.location = "index.php/home/successfullyinstalled?$params";
}, 2000); }, 2000);
</script> </script>
<noscript> <noscript>
<li><a href="index.php/home/successfullyinstalled?flush=1">Click here to access your site.</li> <li><a href="index.php/home/successfullyinstalled?$params">Click here to access your site.</li>
</noscript> </noscript>
HTML; HTML;
} }
@ -1243,13 +1247,17 @@ TEXT;
} }
function checkRewrite() { function checkRewrite() {
require_once 'core/startup/ParameterConfirmationToken.php';
$token = new ParameterConfirmationToken('flush');
$params = http_build_query($token->params());
echo <<<HTML echo <<<HTML
<li id="ModRewriteResult">Testing...</li> <li id="ModRewriteResult">Testing...</li>
<script> <script>
if(typeof $ == 'undefined') { if(typeof $ == 'undefined') {
document.getElemenyById('ModeRewriteResult').innerHTML = "I can't run jQuery ajax to set rewriting; I will redirect you to the homepage to see if everything is working."; document.getElemenyById('ModeRewriteResult').innerHTML = "I can't run jQuery ajax to set rewriting; I will redirect you to the homepage to see if everything is working.";
setTimeout(function() { setTimeout(function() {
window.location = "home/successfullyinstalled?flush=1"; window.location = "home/successfullyinstalled?$params";
}, 10000); }, 10000);
} else { } else {
$.ajax({ $.ajax({
@ -1259,7 +1267,7 @@ TEXT;
if(response.responseText == 'OK') { if(response.responseText == 'OK') {
$('#ModRewriteResult').html("Friendly URLs set up successfully; I am now redirecting you to your SilverStripe site...") $('#ModRewriteResult').html("Friendly URLs set up successfully; I am now redirecting you to your SilverStripe site...")
setTimeout(function() { setTimeout(function() {
window.location = "home/successfullyinstalled?flush=1"; window.location = "home/successfullyinstalled?$params";
}, 2000); }, 2000);
} else { } else {
$('#ModRewriteResult').html("Friendly URLs are not working. This is most likely because a rewrite module isn't configured " $('#ModRewriteResult').html("Friendly URLs are not working. This is most likely because a rewrite module isn't configured "
@ -1274,7 +1282,7 @@ TEXT;
} }
</script> </script>
<noscript> <noscript>
<li><a href="home/successfullyinstalled?flush=1">Click here</a> to check friendly URLs are working. If you get a 404 then something is wrong.</li> <li><a href="home/successfullyinstalled?$params">Click here</a> to check friendly URLs are working. If you get a 404 then something is wrong.</li>
</noscript> </noscript>
HTML; HTML;
} }