Commit Graph

414 Commits

Author SHA1 Message Date
Sam Minnee
c07e870b4d BUGFIX ContentController::SiteConfig() should look to the SiteTree record so an alternate SiteConfig is considered, if this method doesn't exist on the data record then fall back to the default SiteConfig (from r111255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 03:49:13 +00:00
Sam Minnee
b573414486 MINOR Spelling corrections to Director comments (from r111123)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 03:47:11 +00:00
Sam Minnee
0154fbae0f BUGFIX: makeRelative would return "false" for the root path, empty string is expected - fix that
BUGFIX: change the check in forceSSL to work on Windows - it sets the $_SERVER['https'] to off, instead of null (from r109712)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:25:50 +00:00
Sam Minnee
fcc20b5e1a BUGFIX Fixed ContentNegotiator to handle HTML and XHTML base tags properly when converting, regression from r108413 (from r108421)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:20:07 +00:00
Sam Minnee
ea1157f5b2 MINOR Doc update for Director::forceSSL() (from r109152)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:58:52 +00:00
Sam Minnee
43f4500cd6 MINOR Fixed tests not working on the web side as redirection to https would occur (from r108666)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:50:37 +00:00
Sam Minnee
50e9025bbb BUGFIX Undefined variable destURL in Director::forceWWW() (regression from r107094) (from r108492)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:37:22 +00:00
Sam Minnee
6a83da1455 MINOR Fixed Director::forceSSL() breaking unit tests because headers were already sent (from r108435)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112749 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:36:06 +00:00
Sam Minnee
63e425b418 ENHANCEMENT #2856 Limiting of relative URLs for Director::forceSSL() using a map of PCRE regular expressions (from r108428)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:32:42 +00:00
Sam Minnee
c4a72efd52 BUGFIX: Added condition to avoid error creating "PastMember" cookie on dev/build (ticket #5780) Thanks simon_w (from r108397)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-18 22:53:03 +00:00
Sam Minnee
cc15a7935e MINOR Added warning about Director::set_dev_servers() (from r108049)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112714 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-18 22:42:31 +00:00
Sam Minnee
298a6d320b BUGFIX: Don't have any host-based dev servers set by default. (from r108027)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-18 22:41:51 +00:00
Sam Minnee
93eb6214b7 ENHANCEMENT Allowing custom messages and permission codes in BasicAuth::protect_entire_site()
ENHANCEMENT Making $permissionCode argument optional for BasicAuth::requireLogin(). If not set the logic only checks for a valid account (but no group memberships)
ENHANCEMENT Using SS_HTTPResponse_Exception instead of header()/die() in BasicAuth::requireLogin() to make it more testable (from r107867)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-18 22:29:35 +00:00
Ingo Schommer
6ee6ab4ee7 ENHANCEMENT: abstracted protocol detection out to Director::protocol() #5450 (from r107094)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112550 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:09:32 +00:00
Ingo Schommer
fbbe0b4b39 BUGFIX: prevented HTTPRequest->shift() throwing notices when shifting multiple elements. APICHANGE: SS_HTTPRequest->shift($multiple) no longer returns an array of size $multiple spaced with nulls, it returns an array up to the size of $multiple. (from r107090)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:08:39 +00:00
Ingo Schommer
7fb414818a BUGFIX: fixed notice level errors getting through (from r107089)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112547 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:08:23 +00:00
Ingo Schommer
716b5cd6c5 BUGFIX: reverted revision 105890 to fix build (from r105903)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:53:31 +00:00
Ingo Schommer
3b4d0a7422 ENHANCEMENT: Added method for $this->request->latestParam() backwards compatibility with Director::urlParam() (from r105890)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:53:11 +00:00
Ingo Schommer
2b65c57f7c BUGFIX: Director::test() shouldn't break if $_SESSION isn't set. (from r104670)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112364 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:34:18 +00:00
Ingo Schommer
deb533238c BUGFIX: Generate stage/live links using Controller::join_links() instead of string concatenation. (from r104581)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:29:53 +00:00
Ingo Schommer
9cc825e769 BUGFIX: Fixed Controller::join_links() handling of fragment identifiers (from r104580)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:29:29 +00:00
Ingo Schommer
971d0f108f BUGFIX: When finding an old page in the 404 handler, favour existing subpages over historical ones. (from r104468)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112349 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:28:02 +00:00
Ingo Schommer
253c27e2a8 BUGFIX: Fix legacy URL redirection for pre-nestedurls URLs, after it has been enabled. (from r104463)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112347 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:05:18 +00:00
Ingo Schommer
ea32270eac MINOR: Recognize and allow HTTP/422 response code (from r104092)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112333 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-14 23:56:33 +00:00
Sam Minnee
ce06320134 BUGFIX: Better handling off calling Controller redirect() methods when handleRequest() hasn't been called.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:59:22 +00:00
Sam Minnee
752869e23b BUGFIX Renamed Nested URLs are automatically redirected to their new location with 301 HTTP status code in ModelAsController/ContentController (fixes #5393, thanks cbarberis) (from r103461)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:55:34 +00:00
Sam Minnee
6387f735e3 BUGFIX Only replace double slashes in SS_HTTPRequest->__construct() for relative- its a failsafe against wrongly formatted URLs like 'admin//assets' instead of 'admin/assets', but breaks absolute URLs with 'http://' prefix (from r103099)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:31:53 +00:00
Sam Minnee
eef3ff8021 BUGFIX: disallow numeric actions - numeric array indexes are incorrectly picked up as allowed actions (#5331) (from r103092)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112118 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:30:54 +00:00
Sam Minnee
83f117f58c MINOR Using canView() instead of deprecated can('view') in ContentController (from r102909)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112070 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:46:33 +00:00
Sam Minnee
64a561f96c BUGFIX Fixing RquestHandler->checkAccessAction() on PHP 5.2 - ReflectionMethod->class returns inconsisent results in older PHP versions. (see r102003) (from r102730)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112069 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:46:02 +00:00
Sam Minnee
e8e7065ff4 MINOR Fixed indentation (from r102009)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112055 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:26:16 +00:00
Sam Minnee
1d61bf7100 BUGFIX Prevent handling of controller actions which return $this avoid infinite loops in RequestHandler->handleRequest (thanks Hamish!) (from r102004)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112054 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:24:53 +00:00
Sam Minnee
740e49061f API CHANGE Disallow methods/actions in RequestHandler->checkAccessAction() which are implemented on parent classes (e.g. ViewableData and Object), unless access is controlled through $allowed_actions. This limits information exposure from getters used in template contexts. (from r102003)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:24:15 +00:00
Sam Minnee
28c2c67355 BUGFIX Checking for existing redirections in FormResponse::respond (fixes #5208) (from r101958)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112050 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:21:45 +00:00
Sam Minnee
2996e2a60d BUGFIX: disable function re-enabled (from r101792)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:07:35 +00:00
Sam Minnee
1e860727db BUGFIX: put back into the SSNavigator the archived site link (#5251) (from r101623)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112011 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:55:11 +00:00
Sam Minnee
9246add340 MINOR: fixed notice level error (from r101600)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:50:16 +00:00
Sam Minnee
559a05b059 MINOR Removed rewritest.php places in sapphire since it's no longer part of the phpinstaller/branches/2.4 package (from r101353)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111995 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:43:39 +00:00
Sam Minnee
1dcc5401f6 MINOR Fixed missing closing <div> in ContentController->successfullyinstalled() (from r101254)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:58:09 +00:00
Sam Minnee
51e34da550 BUGFIX Don't delete index.php after successful installation - in ContentController->deleteinstallfiles(). URL routing might rely on it without mod_rewrite.
BUGFIX Require ADMIN permissions for ContentController->deleteinstallfiles() - together with retaining index.php this removed a vulnerability where unauthenticated users can disrupt mod_rewrite-less URL routing. (from r101227)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111974 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:56:06 +00:00
Sam Minnee
9f2ca79c67 BUGFIX Cookies set to a value other than NULL (effectively unsetting the cookie) will now use the httpOnly parameter by default for better XSS protection (from r101045) (from r101046)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:40:50 +00:00
Sam Minnee
94d98b18ac ENHANCEMENT Redirecting to translated page when original is requested with a 'locale' GET parameter (e.g. 'about-us/?locale=de_DE' will redirect to 'ueber-uns' with a 301 HTTP response). Implemented in ContentController->handleRequest(). (see #5001) (from r100937)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111545 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:24:01 +00:00
Sam Minnee
ddce6c2210 BUGFIX RequestHandler::handleRequest is now compatible with Controller::handleRequest in that SS_HTTPRequest is the type hint for the $request parameter (from r100919)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111540 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:20:49 +00:00
Andreas Piening
e59e0431e4 MINOR: Director::currentPage() is deprecated but shouldn't throw a notice-level error until the next major release. (from r100670)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@108761 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-02 00:43:51 +00:00
Ingo Schommer
56ba78b2a5 API CHANGE Removed deprecated function RootURLController::get_homepage_urlsegment(), please use RootURLController::get_homepage_link() instead! (from r100493)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:58:22 +00:00
Ingo Schommer
584e8a5ee6 MINOR Changed @deprecated note for Director::redirectBack to 2.5 as it's still widely used (from r100483)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105573 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:54:29 +00:00
Ingo Schommer
3dc4486f3b MINOR Added Requirements for SilverStripeNavigator (see r99080) (from r99097)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:08:02 +00:00
Ingo Schommer
14fb2a387f BUGFIX: Only show live link when page has been published (from r97839) (from r99089)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:07:26 +00:00
Ingo Schommer
ab9dffb735 BUGFIX: Make sure draft/published links go to the right subsite (from r97747) (from r99087)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:06:43 +00:00
Ingo Schommer
fc6ffa5e94 FEATURE: Add Link to silverstripe navigator (from r97407) (from r99080)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:03:40 +00:00