Ingo Schommer
6e8ec778c3
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
lang/en.yml
2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/install/install.php5
docs/en/index.md
tests/core/CoreTest.php
2013-10-07 16:18:20 +02:00
Sean Harvey
dd49834b9e
BUG Fixing installer not checking display_errors correctly.
...
Fixes issue #2479 . Installer sets display_errors on, but it checks
the changed value and not the original one set in php.ini.
2013-10-04 10:05:28 +13:00
Ingo Schommer
2a35f2f928
Merge remote-tracking branch 'origin/3.1'
2013-08-07 17:34:11 +02:00
Ingo Schommer
afe06661ef
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
admin/templates/Includes/ModelAdmin_ImportSpec.ss
admin/templates/Includes/ModelAdmin_Tools.ss
admin/templates/LeftAndMain.ss
admin/templates/ModelSidebar.ss
i18n/i18n.php
templates/ComplexTableField.ss
templates/ComplexTableField_popup.ss
templates/FileIFrameField_iframe.ss
templates/Includes/GridFieldItemEditView.ss
templates/Includes/TableListField_PageControls.ss
templates/RelationComplexTableField.ss
templates/TableField.ss
templates/TableListField.ss
2013-08-07 17:14:47 +02:00
Ingo Schommer
b159284c6c
Fixed "session started" error on install.php
2013-08-07 16:28:54 +02:00
Hamish Friedlander
2110493466
Merge branch '3.0' into 3.1
2013-08-07 09:43:52 +12:00
Hamish Friedlander
a685a8dee9
FIX Include flushtoken when install redirects to successfullyinstalled
2013-08-02 11:00:26 +12:00
Ingo Schommer
88536998b9
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-05-31 18:08:59 +02:00
Ingo Schommer
5d97f615ce
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-05-31 17:52:24 +02:00
Simon Welsh
e90012787d
Merge branch 'hackfest_may_2013' of https://github.com/NightJar/sapphire into 3.1
...
Conflicts:
docs/en/changelogs/3.1.0.md
2013-05-25 20:07:54 +12:00
Nightjar
5ec8158977
Check that Webserver is not Apache/1.x in light of installer assets/.htaccess alterations
2013-05-25 20:03:36 +12:00
Sam Minnée
f6fbd78cd9
Merge pull request #1786 from colymba/3.0-htaccess-fix
...
vendor folder is blocked only if outside themes
2013-05-24 23:50:41 -07:00
Stephen Shkardoon
aa3699ff0a
Deprecate magic_quotes and fix bad install opts
...
Change the in_array call to not do bad things with strict casting off
Add a deprecated message if you run with magic_quotes on
Change the requirement for magic_quotes to an error
2013-05-25 12:42:52 +12:00
Daniel Hensby
ac989cc3c0
Regression due to previous patch
...
Fixing installer regression due to patch #1972
2013-05-24 15:29:39 +01:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Daniel Hensby
bc9567c9ef
FIX Environment file finder logic
...
Fixing the logic that searches for environment files so that warnings
due to open_basedir are suppressed and both the 'realdir' and the server
path are spidered for the environment file.
2013-05-22 14:35:33 +01:00
Daniel Hensby
9a6a6ec75d
Arbitrary placement of _ss_environment.php in parent folders
...
Removes hardcoding to three levels
2013-05-14 13:39:43 +02:00
Ingo Schommer
8c9dd02d73
Merge pull request #1876 from wilr/open6449
...
Suggest users install curl, tidy on their machines.
2013-05-12 14:21:50 -07:00
Zauberfisch
6f11f92f5b
Reverted 9a52dae207
& ed19bbc3ba
2013-05-11 18:50:02 +00:00
Will Rossiter
e56abaca4f
Suggest users install curl, tidy on their machines.
2013-05-11 18:31:02 +12:00
Will Rossiter
22e8ba6ff6
FIX: Check for POST support in installer
...
Also two minor fixes for Web server configuration
* Prevent notice on unsupported setups.
* Show successful message.
Conflicts:
dev/install/install.php5
2013-05-08 22:51:27 +12:00
colymba
41c0f8080e
FIX Only block root vendor folder
...
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.
2013-04-27 16:03:35 +03:00
Ingo Schommer
0343a77d30
Merge remote-tracking branch 'origin/3.1'
2013-04-11 11:42:04 +02:00
Ingo Schommer
9856fcef21
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
javascript/DateField.js
model/DataQuery.php
model/Versioned.php
tests/forms/RequirementsTest.php
tests/model/DataObjectLazyLoadingTest.php
view/Requirements.php
2013-04-09 14:45:35 +02:00
Ingo Schommer
9a52dae207
Removed LOLCAT locale from installer ( fixes #1457 )
2013-04-04 11:18:40 +02:00
Sean Harvey
a99c829ed1
Ensure composer files aren't accessible using IIS
2013-04-03 15:59:14 +13:00
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