tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
13,527 Commits 31 Branches 527 Tags 162 MiB
3644110349
Commit Graph

205 Commits

Author SHA1 Message Date
Ingo Schommer
b0d3f7f3a2 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	api/RSSFeed.php
	dev/SapphireTest.php
	tests/control/RequestHandlingTest.php
 2013-03-26 10:46:41 +01:00
Simon Welsh
a2c64c68e2 Corrects MySQL 'ALTER TABLE' check 2013-03-25 07:53:42 +13:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:20:53 +01:00
Stephen Shkardoon
3ecc840572 Check for ALTER TABLE in installer (fixes #853) 2013-03-24 20:08:19 +13:00
Simon Welsh
7ce010928d Merge pull request #1327 from ss23/patch-2 
BUG Database config values aren't escaped
 2013-03-23 12:16:13 -07:00
Stephen Shkardoon
9b9f367e93 BUG Database config values aren't escaped 
Causes minor UI issues if you try use database configuration values that happen to have " or other values in them.
 2013-03-24 01:05:33 +13:00
Stephen Shkardoon
f27410c257 Missing closing <a> tag in installer 2013-03-24 00:06:54 +13:00
Hamish Friedlander
7efae6b95f Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-18 14:31:57 +13:00
Ingo Schommer
ede381326b BUG Secure composer files from web access (fixes #8011) 
Already applied to root .htaccess, but required for dynamically
generated file from installer as well. Also added upgrade instructions.
 2013-02-17 22:33:04 +01:00
Ingo Schommer
634c91c6ff Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	email/Mailer.php
 2013-01-30 12:46:24 +01:00
Hamish Friedlander
bec5ae1886 Include code to block yaml files in installer generated .htaccess 2013-01-29 14:20:12 +13:00
Daniel Hensby
be78098065 Arbitrary placement of _ss_environment.php in parent folders 
Removes hardcoding to three levels
 2013-01-21 22:33:54 +01:00
Sean Harvey
449cce95a7 Fixing .htaccess to ignore rewriting PHP files directly 2012-12-04 14:36:59 +13:00
Normann Lou
9aaa6b1a7b ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty. 2012-10-05 17:00:39 +13:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Naomi Guyer
69182c21ce BUG: Installer implies empty template used in tutorial 
Have reworded the template options so that installers know that the
simple template is used for the tutorial
 2012-08-22 13:42:53 +12:00
Russell Michell
3ca24a89e9 BUGFIX: Installer failed complaining about rewrite server-capability: XHR response was 3 chars long and therefore !== "OK" 
MINOR: Added charset <meta> declaration to prevent errors cluttering up browser-based debugger console output
 2012-08-15 13:42:54 +12:00
Sam Minnee
2598f6596d NEW: Enable display_errors = on in the installer to assist with diagnosis. 
Installation problems often come down to a 'white screen of death' either during installation or after it.  The WSOD is generally caused by a PHP error that isn't picked up by SilverStripe's error handler.  This change fixes the first of those.

As a bigger fix, I'd like to see us allow the installation of sites in dev mode, the enabling of display_errors=on in dev mode, and perhaps even the ability to easily perform an initial installation in dev mode before switching to live mode.  However, that's a bigger change for another time.
 2012-06-27 09:44:44 +12:00
Ingo Schommer
3a7128d00c MINOR Fixed phpdocs 2012-06-20 23:59:16 +02:00
Sean Harvey
105986392b BUGFIX Supress mkdir() when attempting to create a temp folder, instead 
of the variable. This gives a nicer error in the installer.
 2012-06-15 11:48:42 +12:00
Sean Harvey
aaf91154a2 BUGFIX If there is *any* error connecting to MySQL, expose this to the installer. 2012-05-19 11:29:25 +12:00
Ingo Schommer
eeef41e91f SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205) 2012-05-16 14:59:42 +02:00
Sean Harvey
e095950a50 BUGFIX Installer checks: warn if finfo class not available, re-instating hash check, and remove duplicate iconv check. 2012-05-14 14:18:49 +12:00
Sean Harvey
20a51d6572 MINOR Ensure finfo class exists in installer checks, we need it for MIME 
type detection of files.
 2012-05-12 10:17:53 +12:00
Sean Harvey
01f8e38eee MINOR Using correct URL for tutorial in installer 2012-05-11 14:51:23 +12:00
Ingo Schommer
1671b9c65c BUGFIX Checking for mbstring PHP extension support in installer, as it has been a documented installation requirement for a while. Removing method_exists() checks from mbstring usage in core for the same reasons 2012-05-09 10:25:31 +02:00
Sean Harvey
4e18cc581b BUGFIX Ensure MySQLi is used consistently in MySQLDatabaseConfigurationHelper, not old mysql functions 2012-05-05 11:22:28 +12:00
Ingo Schommer
e929753992 MINOR Using correct $locale format in installer (regression from last commit) 2012-05-03 00:00:51 +02:00
Ingo Schommer
0068b6d5b6 BUGFIX Showing only actually available languages for selection during install (fixes #7260) 2012-05-02 23:35:20 +02:00
Sean Harvey
3ccaa1f864 MINOR Supress any error connecting to the database so the installer 
doesn't show it in the page header
 2012-04-30 11:15:21 +12:00
Sean Harvey
32d4ec837c Merge pull request #374 from oddnoc/installer-email-password-feedback 
BUGFIX: Start a PHP session in installer.
 2012-04-27 21:49:38 -07:00
Sean Harvey
b03cf04dbd BUGFIX Updating MySQLDatabaseConfigurationHelper to check for MySQLi 
instead of mysql_connect and other old function usage, as we've moved to
MySQLi in MySQLDatabase.php now
 2012-04-28 12:13:58 +12:00
Fred Condo
b8228271e6 BUGFIX: Start a PHP session in installer. 
This fixes blank username and password on home/successfullyinstalled
 2012-04-27 16:51:47 -07:00
Fred Condo
df6a249bf0 BUGFIX: Change requirement rubrics to remove confusion 
Resolves #7199

Change all the rubrics to be nouns or questions, rather than a statement of
the desired setting. If the setting is correct, we get a nice green OK; if
not, it was confusing for the rubric to state the opposite of the failure
mode, which is described in the long message.
 2012-04-26 15:04:07 -07:00
Sean Harvey
bda849afeb BUGFIX Check for SimpleXML support in PHP at the installation step 2012-04-22 22:43:06 +12:00
Sean Harvey
cc339c37c4 BUGFIX Ensure the SS3 installer checks for CType support in PHP, as language YAML parser uses this in framework. 2012-04-22 17:45:56 +12:00
Sean Harvey
c55e0b8b95 MINOR Fixing up PHP versions to be consistent with 
33ae83640b
 2012-04-20 15:08:01 +12:00
Sam Minnee
33ae83640b MINOR: Lowered 5.3.10 recommendation to 5.3.4 2012-04-20 14:45:57 +12:00
Will Rossiter
7a4392ca03 Merge pull request #324 from halkyon/installer_fixes 
MINOR: Fix install not loading because of Zend/Translate.php dependency in i18n.php
 2012-04-16 16:34:53 -07:00
Sean Harvey
5f73643e3f BUGFIX Hardcoding locales in installer, because we can't include i18n 
properly, and including core/Core.php is too much.
 2012-04-17 11:02:18 +12:00
Sean Harvey
ad2a21cc92 API CHANGE getSysTempDir() is now deprecated, use sys_get_temp_dir() 
instead!
 2012-04-17 10:53:41 +12:00
Sean Harvey
dc0031cf26 BUGFIX Fixed broken installer trying to include i18n thirdparty Zend 
libs, which depends on Core.php being included first because include
paths are setup there first. This has the effect of removing redundant
code in the installer like temp path discovery, as Core takes care of
that for us.
 2012-04-17 10:53:40 +12:00
Sean Harvey
d0984ec897 MINOR Line break after sentence of message 2012-04-17 10:53:40 +12:00
Sean Harvey
bbf04ee7ea MINOR Removed function_exists() checks which aren't necessary for PHP 5.2+ 2012-04-16 13:15:41 +12:00
Sean Harvey
ebe75fefab MINOR Update locations to server requirements page 2012-04-15 16:29:14 +12:00
Sean Harvey
515a2ccfcc MINOR Updating old URLs in installer, show message about creating admin 
account
 2012-04-15 16:01:06 +12:00
Sean Harvey
e71b8d6215 MINOR Installer cleanups, removing references to old "command line 
installation" which is no longer supported.
MINOR Removed stray semi-colon when showing version in installer
template.
 2012-04-15 15:05:20 +12:00
Sean Harvey
6405c44bc2 MINOR Enable the highest level of error_reporting() in install, to be 
consistent with Core.php
 2012-04-15 10:50:20 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Robert Curry
8b0dafb30d ENHANCEMENT: Change PHP version requirements. Part of #7131. 2012-04-13 13:12:48 +12:00
Ingo Schommer
ca24120a5e MINOR Install screen visual tweaks, more visible disabled state on install button, conditional version number (to avoid it showing without a version), referencing new theme in install screen, using new layout in install progress screen as well 2012-04-11 16:49:31 +02:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration' 
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
 2012-04-11 16:31:12 +02:00
Paul Clarke
4f23ac1722 ENHANCEMENT Installer styling, moving away from blackcandy 2012-04-11 22:51:10 +12:00
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
 2012-04-09 21:10:08 +02:00
Jeremy Bridson
697ffb82a7 ENHANCEMENT:fixed styling on "installing SilverStripe" page. 2012-04-05 12:01:27 +12:00
Jeremy Bridson
c1f6f20114 ENHANCEMENT:added logo to header on ss3 install page - plus compass regenerated icon sprites. 2012-04-05 11:18:11 +12:00
Jeremy Bridson
875eef9992 ENHANCEMENT:Styled the php5 required page and fixed a couple of styling issues on the install page in IE. 2012-04-04 13:26:28 +12:00
Jeremy Bridson
63b23a2155 ENHANCEMENT:incorporating "simple" theme into the the SS3 Install - styling the install page to fit with the "simple" theme 2012-04-03 17:31:40 +12:00
Sean Harvey
68aaae8cc0 MINOR Update docs and version checking for PHP 5.3+ 2012-04-03 09:54:55 +12:00
Stig Lindqvist
1a81c3de27 BUGFIX The SilverStripe installer throwing warning on settings that was legit. 2012-03-28 17:56:57 +13:00
Sean Harvey
3d62832fbb MINOR Removed session_start() call in installer, as it contradicts the requireFunction check for session_start as part of the installer 2012-03-12 10:25:39 +13:00
Sean Harvey
0c30bfc2dd MINOR Tweak text about display_errors 2012-03-12 10:17:57 +13:00
Robert Curry
d34dca675a MINOR: Fix typographical errors. 2012-03-09 17:00:25 +13:00
Robert Curry
ecb279c33e Issue #6667: Check for TEMP_FOLDER _ss_envrionment override in install script. 2012-03-09 15:06:01 +13:00
Ryan O'Hara
63d5927e50 BUGFIX: Added TemplateGlobalProvider include to installer, as required by i18n. 2012-03-09 10:45:24 +13:00
Sam Minnee
f1579a2cdd MINOR: Corrected date in installer copyright (open.ss.org #6833) 2012-03-05 14:51:42 +13:00
Kirk Mayo
c211b7c435 Added some simple code to show the location of the loaded php.ini file when php configuration or file permision errors exist 2012-03-04 21:01:12 +13:00
Ingo Schommer
fcf103cd14 MINOR Check for display_errors=Off during installation (fixes #5779) 2012-02-11 01:19:29 +01:00
dompie
3c09e9dfc4 ENH: Some webhosters require username/password credentials to test for 
existing DB server
 2012-01-11 16:05:19 +01:00
Mark James
e102d9ddc9 BUGFIX: Corrected use of ENT_QUOTES/UTF8 on htmlentities in installer introduced by r3a7ac9759ab8f98eee0bb15db4618fd0ee146ab6. fixes #6806 2011-12-16 22:27:42 +00:00
Ingo Schommer
3a7ac9759a BUGFIX Consistently using multibyte-safe htmlentities() 2011-11-29 10:43:06 +01:00
Hamish Friedlander
436e0f0475 ENHANCEMENT: Make the installer work when CMS module isnt present 2011-10-29 17:23:22 +13:00
Hamish Friedlander
af667eb8ec ENHANCEMENT: Move install.php to sapphire and seperate the PHP version check from the rest of it so we dont have to worry about PHP4 so much. TODO: Allow it to be run directly without needing the stub install.php in the root from silverstripe-installer 2011-10-29 16:40:27 +13:00
Ingo Schommer
b1f27b40ce MINOR Updated image references in sapphire/ folder to local files, rather than requiring cms/ folder (copied a bunch of images files over for this) 2011-03-29 21:34:26 +13:00
Sean Harvey
7395271f7e MINOR Ensure php5-required.html template shows correct minimum and recommended PHP versions (thanks mattcleg!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114915 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-13 23:39:04 +00:00
Sam Minnee
e340ccb1ad MINOR Fixed PHP strict standard where non-variables cannot be passed by reference (from r113968) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114541 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:39:31 +00:00
Sam Minnee
fd7babe5a0 ENHANCEMENT Show "Database Configuration" section of installer requirements for reference (collapsed by default) (from r111873) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112934 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 05:03:16 +00:00
Sam Minnee
2c7d88aade MINOR: repair installer for sqlite (from r109787) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112830 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:26:27 +00:00
Sam Minnee
f20e83eeaf MINOR: Fix links etc, and remove www. from SS urls (from r109105) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112783 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 00:56:25 +00:00
Sam Minnee
c52dfd1e03 BUGFIX Database password input in installer should be password, so that the password is obfuscated when input (from r108432) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112746 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 00:33:12 +00:00
Sam Minnee
a707f925ad BUGFIX: Don't allow reinstalling without first making the user manually delete mysite/_config.php (from r108026) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112710 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-18 22:41:32 +00:00
Ingo Schommer
b839ab2b9f BUGFIX MySQLDatabaseConfigurationHelper::getVersion() will fallback to trying to get the version using a query if mysql_get_server_info() returns nothing (from r106071) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112512 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:54:18 +00:00
Ingo Schommer
74036f9642 ENHANCEMENT Added MySQLDatabaseConfigurationHelper::getDatabaseVersion() which abstracts the version number away from the version check the installer requires (from r105712) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112501 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:50:06 +00:00
Ingo Schommer
cf4a722cc8 MINOR Show better message if couldn't find MySQL version in MySQLDatabaseConfigurationHelper (from r105516) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112499 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:49:35 +00:00
Ingo Schommer
163b358bdf BUGFIX Fixed correct input ID in install.js due to change in r105029 (from r105030) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112437 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:23:00 +00:00
Ingo Schommer
55f1df0f6d BUGFIX Fixed inconsistent styling of reinstall actions at the bottom of the installer, and if using IIS, warn that this will overwrite the web.config file, not .htaccess (from r105029) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112436 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:22:44 +00:00
Ingo Schommer
d135ae6837 MINOR Reverted r104923, as current database releases of mssql and sqlite3 modules don't support this yet (from r104924) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112406 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:17:25 +00:00
Ingo Schommer
84b74a6d23 API CHANGE Added interface method DatabaseConfigurationHelper::requireDatabaseVersion(), all database helpers that implement DatabaseConfigurationHelper must now have this method, which as of now is MySQL, PostgreSQL, SQL Server and SQLite (from r104923) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112405 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:17:08 +00:00
Ingo Schommer
8ea659be69 ENHANCEMENT Added MySQLDatabaseConfigurationHelper::requireDatabaseVersion() to check whether the connected instance is using version 5.0+ (from r104706) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112375 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:10:10 +00:00
Ingo Schommer
0e99090bc7 MINOR Tweaks to positioning of help text in installer (from r104704) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112373 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:04:53 +00:00
Sam Minnee
7fc63deda0 MINOR: use red font instead of gray when displaying error (from r101729) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112029 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:03:46 +00:00
Sam Minnee
d25e326ba0 MINOR Removed fullstop where it wasn't needed (from r101688) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112023 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:00:24 +00:00
Sam Minnee
c4e8624794 MINOR Tidied up the layout of the Themes area of the installer slightly - now consistent helptext as other areas (from r101687) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112022 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:59:55 +00:00
Sam Minnee
d3129b8964 MINOR Updated CMS Admin Account text to be more precise (from r101686) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112021 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:59:23 +00:00
Sam Minnee
d07297aa46 MINOR Altered wording in installer for localised interface (from r101683) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112019 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:58:55 +00:00
Sam Minnee
5aa012335a ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps (from r101661) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112015 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:57:05 +00:00
Sam Minnee
bac6a9d240 ENHANCEMENT: refactored requirements section to hide successful tests (from r101381) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111998 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:45:50 +00:00