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 remote-tracking branch 'origin/2.4' into post-2.4

Browse Source 
Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2013-08-07 21:54:34 +02:00
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

4
composer.json
View File

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

18
install.php
View File

@ -1121,15 +1121,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;
} }
@ -1240,13 +1244,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({
@ -1256,7 +1264,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 "
@ -1271,7 +1279,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;
} }