tonyair
/
silverstripe-installer
mirror of https://github.com/silverstripe/silverstripe-installer
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.4' into post-2.4 

Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2013-08-07 21:54:34 +02:00
parent 9d73194e22 69889ec786
commit 9c0c049b64
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/Uploads/SilverStripeLogo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 19 KiB

6
composer.json
View File

@ -3,14 +3,14 @@
"description": "The SilverStripe Framework Installer",
"require": {
"php": ">=5.2.4",
"silverstripe/cms": "2.5.*",
"silverstripe/framework": "2.5.*",
"silverstripe/cms": "self.version",
"silverstripe/framework": "self.version",
"silverstripe-themes/blackcandy": "2.4.*"
},
"minimum-stability": "dev",
"extra": {
"installer-paths": {
"sapphire": ["silverstripe/framework"]
}
}
}
}

18
install.php
View File

@ -1121,15 +1121,19 @@ PHP
$this->statusMessage("Checking that friendly URLs work...");
$this->checkRewrite();
} else {
require_once 'core/startup/ParameterConfirmationToken.php';
$token = new ParameterConfirmationToken('flush');
$params = http_build_query($token->params());
echo <<<HTML
<li>SilverStripe successfully installed; I am now redirecting you to your SilverStripe site...</li>
<script>
setTimeout(function() {
window.location = "index.php/home/successfullyinstalled?flush=1";
window.location = "index.php/home/successfullyinstalled?$params";
}, 2000);
</script>
<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>
HTML;
}
@ -1240,13 +1244,17 @@ TEXT;
}
function checkRewrite() {
require_once 'core/startup/ParameterConfirmationToken.php';
$token = new ParameterConfirmationToken('flush');
$params = http_build_query($token->params());
echo <<<HTML
<li id="ModRewriteResult">Testing...</li>
<script>
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.";
setTimeout(function() {
window.location = "home/successfullyinstalled?flush=1";
window.location = "home/successfullyinstalled?$params";
}, 10000);
} else {
$.ajax({
@ -1256,7 +1264,7 @@ TEXT;
if(response.responseText == 'OK') {
$('#ModRewriteResult').html("Friendly URLs set up successfully; I am now redirecting you to your SilverStripe site...")
setTimeout(function() {
window.location = "home/successfullyinstalled?flush=1";
window.location = "home/successfullyinstalled?$params";
}, 2000);
} else {
$('#ModRewriteResult').html("Friendly URLs are not working. This is most likely because a rewrite module isn't configured "
@ -1271,7 +1279,7 @@ TEXT;
}
</script>
<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>
HTML;
}