From 8887b48699cd12d0306ba7c4054a8f088a385860 Mon Sep 17 00:00:00 2001 From: sminnee Date: Fri, 28 Nov 2008 01:58:50 +0000 Subject: [PATCH] BUGFIX: Improved installer operation with PHP4 installed or no PHP installed. API CHANGE: Reduced number of files needed for installer to work, and moved some into sapphire directory. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.3@66896 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- check-php.php | 18 ----- config-form.css | 118 -------------------------------- config-form.html | 173 ----------------------------------------------- index.html | 9 +-- index.php | 3 - install.php | 27 ++++++-- 6 files changed, 24 insertions(+), 324 deletions(-) delete mode 100644 check-php.php delete mode 100644 config-form.css delete mode 100644 config-form.html delete mode 100644 index.php diff --git a/check-php.php b/check-php.php deleted file mode 100644 index 79f8977..0000000 --- a/check-php.php +++ /dev/null @@ -1,18 +0,0 @@ - - - - -No PHP Support - - - -

No PHP Support

-

-

Before I can install SilverStripe 2, you must add PHP support to your webserver.

-

Try again

- - - - \ No newline at end of file diff --git a/config-form.css b/config-form.css deleted file mode 100644 index 182f156..0000000 --- a/config-form.css +++ /dev/null @@ -1,118 +0,0 @@ -body { - text-align: center; -} - -#Container * { - text-align: left; -} -ul#Themes{ - list-style: none; - margin: 5px; -} - ul#Themes li { - clear: both; - padding: 3px 0; - } - ul#Themes input { - float: left; - width: 10px; - height: 10px; - } - ul#Themes label { - margin: -2px 5px 0 15px; - } -.good td { - color: green; -} - -.warning td { - color: #ef7f24; -} -.testResults .error td { - border: 1px #CCC solid; - color: red; -} - -p.error { - padding: 0.5em; - background-color: #ffe9e9; - border: 1px #ff8e8e solid; - color: #f03838; -} -p.warning { - padding: 0.5em; - background-color: #fef1e1; - border: 1px #ffc28b solid; - color: #cb6a1c; -} - p.warning label { - display: inline; - margin-left: 5px; - color: #cb6a1c - } -p.good { - padding: 0.5em; - background-color: #e2fee1; - border: 1px #43cb3e solid; - color: #359318; -} -p.error a, -p.warning a, -p.good a { - color: inherit; - text-decoration: underline; -} -p.error a:hover { - text-decoration: none; -} -span.middleColumn { - width: 312px; - margin-right: 0; - padding: 4px; -} -input.text, textarea, select { - padding: 2px; - border: 1px solid #A7A7A7; - color: #000; - font-size: 1.2em; - font-weight: bold; - width: 305px; -} -#stats { - float: left; - margin: 5px; -} -table.testResults { - border-collapse: collapse; - width: 100%; - margin: 10px 0; -} -#Layout h4 { - font-size: 2em; - clear: left; -} -.testResults td { - border: 1px #CCC solid; - width: 400px; - padding: 4px; -} -.clear { - clear: both; -} -p.mysql, -p.adminAcc, -p.devHelp { - padding-top: 20px; -} -p#mysql_credentials, -p#AdminAccount, -p#DevSites { - width: 330px; - margin-top: 0; - float: left; -} -#Layout input.action { - text-align: center; - width: 160px; - font-size: 1em; -} \ No newline at end of file diff --git a/config-form.html b/config-form.html deleted file mode 100644 index 7d33ea5..0000000 --- a/config-form.html +++ /dev/null @@ -1,173 +0,0 @@ - - - - SilverStripe CMS Installation - - - - - - - - - -
-
- - - -
- -
-
-

Welcome to SilverStripe

-

Thanks for choosing to use SilverStripe! Please follow the instructions below to get SilverStripe installed.

- -
- -

- You aren't currently able to install the software. Please see below for details.
- If you are having problems meeting the requirements, see the server requirements wiki page. -

- - hasWarnings()) { ?> -

- There are some issues that we recommend you look at before installing, however, you are still able to install the software. - Please see below for details.
- If you are having problems meeting the requirements, see the server requirements wiki page. -

- hasErrors()) { ?> -

- You're ready to install!    -

- -

- Template to install: -

-
    -
    • -
    • -
-

You can change the template or download another from the SilverStripe website after installation.

- -
- - - -

- Note: It seems as though SilverStripe is already installed here. If you ask me to install, I will overwrite - the .htaccess and mysite/_config.php files. -
- -

- - -

- - - - - - - -

- - - -

MySQL Database

- hasErrors()) { ?> -

- These database details don't appear to be correct. Please enter the correct details before installing. -

- -

- These database details look all good! -

- - -

- - - - - - - - - -

-

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.

-
-
Details
- showTable("MySQL Configuration"); ?> - -
- -

SilverStripe Administration Account

- -

- - - - - - - - -

-

- We will set up 1 administrator account for you automatically. Enter the email address and password. If you'd - rather log-in with a username instead of an email address, enter that instead. -

- -
- -

Development Servers

-

- - -

-

- SilverStripe allows you to run a site in development mode. - This shows all error messages in the web browser instead of emailing them to the administrator, and allows - the database to be built without logging in as administrator. Please enter the host/domain names for servers - you will be using for development. -

- -
- - -

Requirements

- showTable(); - ?> - -
-
-
- -
-
- - -
- - diff --git a/index.html b/index.html index 9ee87ea..ffb964b 100644 --- a/index.html +++ b/index.html @@ -1,14 +1,7 @@ - - -