Make the installer work with short tags

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42172 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
aoneil 2007-09-17 00:17:51 +00:00
parent 3255bcb4c0
commit decb17bbd6
5 changed files with 14 additions and 18 deletions

View File

@ -1,9 +1,5 @@
<?php
if(ini_get("short_open_tag")) {
header("Location: install.php");
} else {
echo "Please set the PHP option short_open_tag to true, restart your webserver, and then refresh your browser to continue.";
}
<?php
header("Location: install.php");
?>
<!--<?php /*-->
<html>

View File

@ -21,7 +21,7 @@
<div id="Container">
<div id="Header">
<h1>SilverStripe CMS Installation</h1>
<p>Version <?= $silverstripe_version ?></p>
<p>Version <?php= $silverstripe_version ?></p>
</div>
<div id="Layout">
@ -62,14 +62,14 @@
<br />
<input type="checkbox" id="ReIn" name="force_reinstall" onclick="document.getElementById('install_button').disabled = !this.checked" /><label for="ReIn">That's okay, please re-install SilverStripe and overwrite these files.</label>
</p>
<? } ?>
<?php } ?>
<p>
<?php if($alreadyInstalled) { ?>
<input id="install_button" type="submit" disabled="disabled" class="action" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
<?php } else { ?>
<input id="install_button" type="submit" class="action" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
<? } ?>
<?php } ?>
<span id="saving_top" style="display: none">
&nbsp;
@ -93,13 +93,13 @@
<p id="mysql_credentials">
<label for="mysql_server">MySQL server:</label>
<span class="middleColumn"><input id="mysql_server" class="text" type="text" name="mysql[server]" value="<?= $databaseConfig['server'] ?>" /></span>
<span class="middleColumn"><input id="mysql_server" class="text" type="text" name="mysql[server]" value="<?php echo $databaseConfig['server']; ?>" /></span>
<label for="mysql_username">MySQL username:</label>
<span class="middleColumn"><input id="mysql_username" class="text" type="text" name="mysql[username]" value="<?= $databaseConfig['username'] ?>" /></span>
<span class="middleColumn"><input id="mysql_username" class="text" type="text" name="mysql[username]" value="<?php echo $databaseConfig['username']; ?>" /></span>
<label for="mysql_password">MySQL password:</label>
<span class="middleColumn"><input id="mysql_password" class="text" type="password" name="mysql[password]" value="<?= $databaseConfig['password'] ?>" /></span>
<span class="middleColumn"><input id="mysql_password" class="text" type="password" name="mysql[password]" value="<?php echo $databaseConfig['password']; ?>" /></span>
<label for="mysql_database">MySQL database:</label>
<span class="middleColumn"><input id="mysql_database" class="text" type="text" name="mysql[database]" value="<?= $databaseConfig['database'] ?>" onchange="this.value = this.value.replace(/[^A-Za-z0-9_]+/g,'');" /></span>
<span class="middleColumn"><input id="mysql_database" class="text" type="text" name="mysql[database]" value="<?php echo $databaseConfig['database']; ?>" onchange="this.value = this.value.replace(/[^A-Za-z0-9_]+/g,'');" /></span>
<input type="submit" class="action" value="Re-check requirements" />
</p>
<p class="mysql">SilverStripe stores its content in a MySQL database. Please provide the username and password to connect to the server here. If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a database that already exists.</p>

View File

@ -240,7 +240,7 @@ class InstallRequirements {
<p>I have installed SilverStripe CMS successfully!</p>
<p><a href="./admin/" target="_blank">Open the CMS tool</a><br />
<a href="./" target="_blank">Open the site</a></p>
<?
<?php
}
}
@ -518,7 +518,7 @@ class Installer extends InstallRequirements {
<h1>Installing SilverStripe...</h1>
<p>I am now running through the installation steps (this should take about 30 seconds)</p>
<p>If you receive a fatal error, refresh this page to continue the installation
<?
<?php
flush();
// Delete old _config.php files
@ -549,7 +549,7 @@ PHP;
$devServers = $this->var_export_array_nokeys(explode("\n", $_POST['devsites']));
$this->createFile("$template/_config.php", <<<PHP
<?
<?php
error_reporting(E_ALL ^ E_NOTICE);

View File

@ -1,4 +1,4 @@
<?
<?php
class Page extends SiteTree {
static $db = array(

View File

@ -1,4 +1,4 @@
<?
<?php
class Page extends SiteTree {
static $db = array(