From 91fec7ce458b7b2f59fd20bb584d15b5a0c4fef6 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 5 Nov 2009 02:57:12 +0000 Subject: [PATCH 001/206] BUGFIX Fixed $ escaping in passwords set by install.php in _config.php (#4676) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90883 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.php b/install.php index d299acf..4e3629f 100644 --- a/install.php +++ b/install.php @@ -694,7 +694,7 @@ global \$databaseConfig; "type" => "$config[database]", "server" => "{$config['mysql']['server']}", "username" => "{$config['mysql']['username']}", - "password" => "{$escapedPassword}", + "password" => '{$escapedPassword}', "database" => "{$config['mysql']['database']}", ); From c449f450f664197154ad592284e547d2f84af3c3 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 5 Nov 2009 03:07:17 +0000 Subject: [PATCH 002/206] MINOR Changed silverstripe.com references to silverstripe.org MINOR Fixed broken wiki links (#4672) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90886 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- config-form.html | 6 +++--- themes/tutorial/templates/Page.ss | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-form.html b/config-form.html index 7d33ea5..b4e2e79 100644 --- a/config-form.html +++ b/config-form.html @@ -37,14 +37,14 @@

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. + 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. + If you are having problems meeting the requirements, see the server requirements wiki page.

hasErrors()) { ?>

@@ -166,7 +166,7 @@

diff --git a/themes/tutorial/templates/Page.ss b/themes/tutorial/templates/Page.ss index df04ce1..aeda36a 100644 --- a/themes/tutorial/templates/Page.ss +++ b/themes/tutorial/templates/Page.ss @@ -19,7 +19,7 @@ $SilverStripeNavigator From 6ffe876398bc82c052da2437373409651cfd7f02 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 5 Nov 2009 03:08:41 +0000 Subject: [PATCH 003/206] MINOR Changed silverstripe.com references to silverstripe.org git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90887 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.php b/install.php index 4e3629f..5b85176 100644 --- a/install.php +++ b/install.php @@ -668,7 +668,7 @@ require_once("conf/ConfigureFromEnv.php"); MySQLDatabase::set_connection_charset('utf8'); // This line set's the current theme. More themes can be -// downloaded from http://www.silverstripe.com/themes/ +// downloaded from http://www.silverstripe.org/themes/ SSViewer::set_theme('$theme'); // enable nested URLs for this site (e.g. page/sub-page/) @@ -700,12 +700,12 @@ global \$databaseConfig; // Sites running on the following servers will be // run in development mode. See -// http://doc.silverstripe.com/doku.php?id=devmode +// http://doc.silverstripe.org/doku.php?id=configuration // for a description of what dev mode does. Director::set_dev_servers($devServers); // This line set's the current theme. More themes can be -// downloaded from http://www.silverstripe.com/themes/ +// downloaded from http://www.silverstripe.org/themes/ SSViewer::set_theme('$theme'); // enable nested URLs for this site (e.g. page/sub-page/) From 371f6c3c1e952f565f5e29e91a32b1fc6e87b558 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 5 Nov 2009 03:10:23 +0000 Subject: [PATCH 004/206] MINOR Setting trunk in .mergesources git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90889 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- .mergesources.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.mergesources.yml b/.mergesources.yml index 7d8deea..f3b1dff 100644 --- a/.mergesources.yml +++ b/.mergesources.yml @@ -1,7 +1,7 @@ # Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist). # Keeps track of all opensource branches of submodules # that could be merged back to the current submodule paths. -2.3: - sapphire: /open/modules/sapphire/branches/2.3 - cms: /open/modules/cms/branches/2.3 - jsparty: /open/modules/jsparty/branches/2.3 \ No newline at end of file +trunk: + sapphire: /open/modules/sapphire/trunk + cms: /open/modules/cms/trunk + jsparty: /open/modules/jsparty/trunk \ No newline at end of file From 1d6f9318b7f27fab7f0edd1b2814435f1f8f0b33 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 19 Nov 2009 20:25:04 +0000 Subject: [PATCH 005/206] MINOR Mergeinfo git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92260 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- .htaccess | 33 +++++++++++++++++---------------- .mergesources.yml | 1 + mysite/_config.php | 34 +++++++++++++++++----------------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.htaccess b/.htaccess index a980233..0152dd5 100644 --- a/.htaccess +++ b/.htaccess @@ -1,19 +1,20 @@ ### SILVERSTRIPE START ### - -DirectorySlash Off - - - -Order deny,allow -Deny from all -Allow from 127.0.0.1 - - -RewriteEngine On - -RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$) - -RewriteCond %{REQUEST_URI} ^(.*)$ -RewriteCond %{REQUEST_FILENAME} !-f + +DirectorySlash Off + + + +Order deny,allow +Deny from all +Allow from 127.0.0.1 + + +RewriteEngine On +RewriteBase /phpinstaller-2.4 + +RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$) + +RewriteCond %{REQUEST_URI} ^(.*)$ +RewriteCond %{REQUEST_FILENAME} !-f RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L] ### SILVERSTRIPE END ### \ No newline at end of file diff --git a/.mergesources.yml b/.mergesources.yml index f3b1dff..bc71aae 100644 --- a/.mergesources.yml +++ b/.mergesources.yml @@ -2,6 +2,7 @@ # Keeps track of all opensource branches of submodules # that could be merged back to the current submodule paths. trunk: + .: /open/phpinstaller/trunk sapphire: /open/modules/sapphire/trunk cms: /open/modules/cms/trunk jsparty: /open/modules/jsparty/trunk \ No newline at end of file diff --git a/mysite/_config.php b/mysite/_config.php index ba9066a..9ac330c 100644 --- a/mysite/_config.php +++ b/mysite/_config.php @@ -1,18 +1,18 @@ - Date: Thu, 19 Nov 2009 20:26:31 +0000 Subject: [PATCH 006/206] MINOR Reverted accidental commit from r92260 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92261 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- .htaccess | 33 ++++++++++++++++----------------- .mergesources.yml | 1 - mysite/_config.php | 34 +++++++++++++++++----------------- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/.htaccess b/.htaccess index 0152dd5..a980233 100644 --- a/.htaccess +++ b/.htaccess @@ -1,20 +1,19 @@ ### SILVERSTRIPE START ### - -DirectorySlash Off - - - -Order deny,allow -Deny from all -Allow from 127.0.0.1 - - -RewriteEngine On -RewriteBase /phpinstaller-2.4 - -RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$) - -RewriteCond %{REQUEST_URI} ^(.*)$ -RewriteCond %{REQUEST_FILENAME} !-f + +DirectorySlash Off + + + +Order deny,allow +Deny from all +Allow from 127.0.0.1 + + +RewriteEngine On + +RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$) + +RewriteCond %{REQUEST_URI} ^(.*)$ +RewriteCond %{REQUEST_FILENAME} !-f RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L] ### SILVERSTRIPE END ### \ No newline at end of file diff --git a/.mergesources.yml b/.mergesources.yml index bc71aae..f3b1dff 100644 --- a/.mergesources.yml +++ b/.mergesources.yml @@ -2,7 +2,6 @@ # Keeps track of all opensource branches of submodules # that could be merged back to the current submodule paths. trunk: - .: /open/phpinstaller/trunk sapphire: /open/modules/sapphire/trunk cms: /open/modules/cms/trunk jsparty: /open/modules/jsparty/trunk \ No newline at end of file diff --git a/mysite/_config.php b/mysite/_config.php index 9ac330c..ba9066a 100644 --- a/mysite/_config.php +++ b/mysite/_config.php @@ -1,18 +1,18 @@ - Date: Thu, 19 Nov 2009 20:26:59 +0000 Subject: [PATCH 007/206] MINOR Mergeinfo git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92262 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- .mergesources.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.mergesources.yml b/.mergesources.yml index f3b1dff..bc71aae 100644 --- a/.mergesources.yml +++ b/.mergesources.yml @@ -2,6 +2,7 @@ # Keeps track of all opensource branches of submodules # that could be merged back to the current submodule paths. trunk: + .: /open/phpinstaller/trunk sapphire: /open/modules/sapphire/trunk cms: /open/modules/cms/trunk jsparty: /open/modules/jsparty/trunk \ No newline at end of file From 00fd98a9b4ba8a7ca67196538efe855497cd5d5d Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 19 Nov 2009 20:29:20 +0000 Subject: [PATCH 008/206] ENHANCEMENT: Installer checks that Query and HTTPResponse classes don't exist before installing. (from r66886) (from r92224) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92264 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/install.php b/install.php index 5b85176..3c59faa 100644 --- a/install.php +++ b/install.php @@ -200,6 +200,10 @@ class InstallRequirements { // Check memory allocation $this->requireMemory(32*1024*1024, 64*1024*1024, array("PHP Configuration", "Memory allocated (PHP config option 'memory_limit')", "SilverStripe needs a minimum of 32M allocated to PHP, but recommends 64M.", ini_get("memory_limit"))); + + // Check that troublesome classes don't exist + $badClasses = array('Query', 'HTTPResponse'); + $this->requireNoClasses($badClasses, array("PHP Configuration", "Check that certain classes haven't been defined by PHP plugins", "Your version of PHP has defined some classes that conflict with SilverStripe's")); // Check allow_call_time_pass_reference $this->suggestPHPSetting('allow_call_time_pass_reference', array(1,'1','on','On'), array("PHP Configuration", "Check that the php.ini setting allow_call_time_pass_reference is on", @@ -316,6 +320,22 @@ class InstallRequirements { else return true; } + /** + * Require that the given class doesn't exist + */ + function requireNoClasses($classNames, $testDetails) { + $this->testing($testDetails); + $badClasses = array(); + foreach($classNames as $className) { + if(class_exists($className)) $badClasses[] = $className; + } + if($badClasses) { + $testDetails[2] .= ". The following classes are at fault: " . implode(', ', $badClasses); + $this->error($testDetails); + } + else return true; + } + function requirePHPVersion($recommendedVersion, $requiredVersion, $testDetails) { $this->testing($testDetails); From 3a562284a53274afb514b041dcd687b77ae86668 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 19 Nov 2009 20:29:42 +0000 Subject: [PATCH 009/206] ENHANCEMENT #3126: Put site into dev mode for installation so you can see error messages. (from r66890) (from r92226) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92266 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install.php b/install.php index 3c59faa..ec98e40 100644 --- a/install.php +++ b/install.php @@ -742,7 +742,11 @@ PHP $_SERVER['SCRIPT_FILENAME'] = dirname(realpath($_SERVER['SCRIPT_FILENAME'])) . '/sapphire/main.php'; chdir('sapphire'); + // Rebuild the manifest $_GET['flush'] = true; + // Show errors as if you're in development mode + $_SESSION['isDev'] = 1; + require_once('core/Core.php'); $this->statusMessage("Building database schema..."); From 2cd8f69c3cd4a04b7f5e726dbc01f41540bd1330 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 19 Nov 2009 20:32:07 +0000 Subject: [PATCH 010/206] 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. (from r66896) (from r92227) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92269 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- check-php.php | 18 -------- config-form.css | 118 ------------------------------------------------ index.html | 9 +--- index.php | 3 -- 4 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 check-php.php delete mode 100644 config-form.css 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/index.html b/index.html index 9ee87ea..ffb964b 100644 --- a/index.html +++ b/index.html @@ -1,14 +1,7 @@ - - -