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

BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found (from r101668)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112016 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-13 00:57:45 +00:00
parent 5aa012335a
commit 7d3d9a005e
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/model/RedirectorPage.php
View File

@ -104,6 +104,15 @@ class RedirectorPage extends Page {
} }
} }
function onBeforeWrite() {
parent::onBeforeWrite();
// Prefix the URL with "http://" if no prefix is found
if($this->ExternalURL && (strpos($this->ExternalURL, '://') === false)) {
$this->ExternalURL = 'http://' . $this->ExternalURL;
}
}
function getCMSFields() { function getCMSFields() {
Requirements::javascript(SAPPHIRE_DIR . "/javascript/RedirectorPage.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/RedirectorPage.js");
@ -170,4 +179,3 @@ class RedirectorPage_Controller extends Page_Controller {
"</p>"; "</p>";
} }
} }
?>

4
javascript/tiny_mce_improvements.js vendored
View File

@ -200,6 +200,10 @@ LinkForm.prototype = {
case 'external': case 'external':
default: default:
href = this.elements.external.value; href = this.elements.external.value;
// Prefix the URL with "http://" if no prefix is found
if(href.indexOf('://') == -1) {
href = 'http://' + href;
}
if($('Form_EditorToolbarLinkForm_TargetBlank')) { if($('Form_EditorToolbarLinkForm_TargetBlank')) {
if($('Form_EditorToolbarLinkForm_TargetBlank').checked) target = '_blank'; if($('Form_EditorToolbarLinkForm_TargetBlank').checked) target = '_blank';
} }

9
tests/RedirectorPageTest.php
View File

@ -43,6 +43,11 @@ class RedirectorPageTest extends FunctionalTest {
$response = $this->get(Director::makeRelative($page->Link())); $response = $this->get(Director::makeRelative($page->Link()));
$this->assertEquals(Director::baseURL() . "redirection-dest/", $response->getHeader("Location")); $this->assertEquals(Director::baseURL() . "redirection-dest/", $response->getHeader("Location"));
} }
}
?> function testExternalURLGetsPrefixIfNotSet() {
$page = $this->objFromFixture('RedirectorPage', 'externalnoprefix');
$this->assertEquals($page->ExternalURL, 'http://google.com', 'onBeforeWrite has prefixed with http');
$page->write();
$this->assertEquals($page->ExternalURL, 'http://google.com', 'onBeforeWrite will not double prefix if written again!');
}
}

5
tests/RedirectorPageTest.yml
View File

@ -18,6 +18,11 @@ RedirectorPage:
Title: Bad External Title: Bad External
RedirectionType: External RedirectionType: External
URLSegment: bad-external URLSegment: bad-external
externalnoprefix:
Title: External no prefix
RedirectionType: External
URLSegment: external-no-prefix
ExternalURL: google.com
badinternal: badinternal:
Title: Bad Internal Title: Bad Internal
RedirectionType: Internal RedirectionType: Internal