Commit Graph

60 Commits

Author SHA1 Message Date
Hamish Friedlander
82f65fded4 FIX Dont pop up basic auth dialog when trying to flush and isDev=1, just redirect to Security/login like normal 2014-02-12 14:51:33 +13:00
Hamish Friedlander
604d9bf7dc Split Core.php into Constants.php and Core.php and adjust main.php startup
The recent flush filter fix had a problem that you couldnt set a custom
BASE_PATH in _ss_environment because that file didnt get included until
after checking the confirmation token. This patch pulls the part of Core.php
that defines BASE_PATH into a seperate file that can be included earlier
in the startup sequence so that ParameterConfirmationToken can access it.

Core.php includes Constants.php with a require_once call, so for startup
scripts that dont pull in Constants.php themselves (like cli-script.php)
no change is needed.
2013-07-22 13:52:00 +12:00
Hamish Friedlander
1298d4a5bd FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692) 2013-07-19 12:24:32 +12:00
Sean Harvey
8b607db0a2 BUGFIX Fixing bootstrap.php to work with FakeController properly for
running tests using phpunit.xml file.
2012-05-09 23:05:38 +12:00
Sean Harvey
f63d137d49 ENHANCEMENT Session::start() now only called when there is changed
session data to be saved, and started on Director::direct() when there
is a cookie (or request var) containing the current PHP session name.
2012-04-27 16:28:46 +12:00
Sean Harvey
c55e0b8b95 MINOR Fixing up PHP versions to be consistent with
33ae83640b
2012-04-20 15:08:01 +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
Robert Curry
8b0dafb30d ENHANCEMENT: Change PHP version requirements. Part of #7131. 2012-04-13 13:12:48 +12:00
Sean Harvey
68aaae8cc0 MINOR Update docs and version checking for PHP 5.3+ 2012-04-03 09:54:55 +12:00
Ingo Schommer
755663a00a BUGFIX Set default mbstring encoding in Core.php instead of main.php and cli-script.php so phpunit binary test runs behave consistently (same as running through TestRunner+cli-script.php). Fixes URLSegmentFilterTest 2011-12-04 13:32:03 +01:00
Simon Welsh
75b16f6e1b Don't try redirecting to install.php if there is no install.php to redirect to. 2011-10-29 10:31:58 +13:00
Ingo Schommer
823cae3f32 BUGFIX Setting mbstring defaults in cli-script.php (same as main.php), and default mb_regex_encoding() to UTF-8 as well (in both files) 2011-10-07 14:12:46 +02:00
Sam Minnee
7fbb919ce8 API CHANGE: Introduce DataModel object, as a representation of the project's entire data model, and tie it to $this->model an all DataObjects, Controllers, and RequestHandlers for easy non-static access.
API CHANGE: Add DataList::newObject(), which creates a new object on that DataList.
API CHANGE: RequestHandler::handleRequest() now needs to handle a $model argument, if you override it.
2011-05-01 17:33:02 +12:00
Ingo Schommer
9b29616710 API CHANGE Rearranged files in sapphire to reflect core dependencies more accurately, and have the tests/ folder mirror its folder structure 2011-03-31 09:56:21 +13:00
Sam Minnee
077a119cfb MINOR Database quoting in TreeDropdownField (fixes #5484) (from r103515)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:56:48 +00:00
Ingo Schommer
0a5321dd10 BUGFIX Installer now opens if mod_rewrite is disabled. Using index.php instead of rewriting the URL didn't quite work with the new BASE_URL, so we need to take this case into account as well (from r98895)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:47:37 +00:00
Ingo Schommer
bf01c286b0 BUGFIX Fixed big problem on Windows when redirecting to install.php - because of SCRIPT_NAME backslashes caused a bit of havoc and need special treatment (from r98869)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102808 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:46:40 +00:00
Ingo Schommer
40466ccb02 BUG FIX: The 5.1 replacement array_fill_keys function now made available to the cron jobs (from r97300)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102441 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 05:00:40 +00:00
Ingo Schommer
04857b811f BUGFIX: Check for an empty list of keys before attempting to create an array with them (from r96997)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:30:19 +00:00
Ingo Schommer
c29cf7d302 BUGFIX: array_fill_keys function created for version prior to PHP 5.2 (from r96680)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:43:18 +00:00
Sean Harvey
ae083e3c9f MINOR Update the main.php PHP version numbers at the top doc block (from r93449)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93751 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:26:35 +00:00
Sam Minnee
cac8686b3b MINOR: Use version_compare to test for correct PHP version.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-11 03:50:40 +00:00
Ingo Schommer
d2dc9ececc BUGFIX Disabled ?debug_profile=1 on live environment types
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80057 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-25 09:53:51 +00:00
Sam Minnee
0fbe39262f BUGFIX: Fix URL parsing for certain IIS configurations.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 23:14:51 +00:00
Ingo Schommer
b12a00c391 MINOR phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-22 22:59:14 +00:00
Ingo Schommer
8960c03376 BUGFIX Removed header('Content-Type... from main.php bootstrapping - was defaulting to text/html - an invalid assumption at such an early stage (see #3685)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72682 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-09 20:31:12 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-01 23:49:53 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 06:19:48 +00:00
Ingo Schommer
d26f08b481 MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@67465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:32 +00:00
Sam Minnee
3d9532db83 Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:37 +00:00
Andrew O'Neil
f96dceecc9 BUGFIX: #2588 Fix issue with IIS not stripping GET variables from the URL (mackeyn)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 23:04:55 +00:00
Hayden Smith
f2474a0ae2 Moved error_reporting setting from main.php to Core.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 03:35:28 +00:00
Sam Minnee
2af039785c ENHANCEMENT: Updated cli-script handling to be more in line with web calls, and improved Director::setBaseURL() calls.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 23:41:50 +00:00
Ingo Schommer
21944a2e06 BUGFIX Moved *_PATH and PR_*constants from main.php/cli-script.php back to Core.php - was causing problems with installer (directly includes Core.php, but doesn't run through main.php) - see ticket #2867 for improvement suggestions in bootstrapping code to avoid these bugs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63290 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 12:33:07 +00:00
Ingo Schommer
a30532becb BUGFIX Moved TEMP_FOLDER define back from main.php/cli-script.php to Core.php, as it was causing problems with the installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-28 23:03:28 +00:00
Ingo Schommer
8c8cde6e75 MINOR Reverted accidental commit to main.php from r63177
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-28 13:16:39 +00:00
Ingo Schommer
3f3346fd93 API CHANGE Removed Text->Att(), use Text->ATT_val() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-28 13:14:03 +00:00
Ingo Schommer
9371f4688b ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 16:02:38 +00:00
Ingo Schommer
12a73455ac ENHANCEMENT Moved procedural bootstrapping code hiding away between function definitions in Core.php to main.php and cli-script.php (TEMP_FOLDER and PR_* constants)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 13:17:58 +00:00
Ingo Schommer
67e427cdf6 BUGFIX Reinstated error_handling(E_ALL) for dev environments in main.php after clarifying with sam - we want to force developers to recard notice-level errors unless they expicitly opt-out in their _config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 21:49:52 +00:00
Ingo Schommer
be2d56e7d7 BUGFIX Disabled mandatory override of default PHP error handler to E_ALL when in dev mode (which means you have no way of overriding error_reporting() in your _config.php, and by that no way of disabling e.g. E_NOTICE level errors)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 08:24:14 +00:00
Hayden Smith
ef08421ed7 Merged [47081]: Modified construction of manifest to allow custom definition of MANIFEST_FILE constant filename in _config.php.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 21:59:32 +00:00
Ingo Schommer
8d0166e298 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:29:30 +00:00
Ingo Schommer
6bd5da7e6e (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:29:30 +00:00
Sam Minnee
c03e56137b Moved director rules from main.php into _config.php so that they work with cli-script
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-15 08:45:21 +00:00
Sam Minnee
a93e0dc8ef Fixed the dev/tests and dev/tests/(classname) URLs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-15 07:14:07 +00:00
Sam Minnee
b0c384d6c1 Merged revisions 53150,53681,53700,53820,54200,54459 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/roa

........
  r53150 | ischommer | 2008-04-22 11:12:43 +1200 (Tue, 22 Apr 2008) | 1 line
  
  FEATURE Added a "test mode" for /db/build which allows mock-DataObject-subclasses which are just built in a test run
........
  r53681 | mrickerby | 2008-04-29 15:26:52 +1200 (Tue, 29 Apr 2008) | 1 line
  
  adding default wrapping header and footer methods, and configurable reporting to the TestRunner
........
  r53700 | mrickerby | 2008-04-29 16:41:57 +1200 (Tue, 29 Apr 2008) | 1 line
  
  FEATURE: adding support for /dev/tests --> DevelopmentAdmin-->tests() --> TestRunner, /dev/tasks --> DevelopmentAdmin-->tasks() --> TaskRunner
........
  r53820 | mrickerby | 2008-04-30 19:27:52 +1200 (Wed, 30 Apr 2008) | 1 line
  
  BUGFIX fixing up BuildTask interface and task runner action
........
  r54200 | sminnee | 2008-05-09 00:28:44 +1200 (Fri, 09 May 2008) | 1 line
  
  Added TestSession object to help with the testing of forms
........
  r54459 | sminnee | 2008-05-13 17:28:25 +1200 (Tue, 13 May 2008) | 1 line
  
  Added a basic menu of options to /dev
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-13 05:57:09 +00:00
Sam Minnee
e747282dfa Added first cut of RestfulServer - simple get support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-30 23:18:04 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00