tonyair
/
silverstripe-iframe
mirror of https://github.com/silverstripe/silverstripe-iframe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX: Use new resource loading syntax for javascript 

SilverStripe 4 vendormodule types make use of an 'expose' composer
directive to allow assets they provide to be accessed by a web request.
Previously the javascript for the iFrame resizing business tried to load
from a static path that no longer exists (referenced inside PHP), which
caused a fatal error. This has been fixed along with making the
conditional code for enforcing a protocol on the page's request a bit more
readable & easily digestable to developers.
This commit is contained in:
Dylan Wagstaff 2017-11-22 17:11:34 +13:00
parent e394d9098c
commit 4fb947d0c7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/IFramePageController.php
View File

@ -11,17 +11,19 @@ class IFramePageController extends ContentController
protected function init() protected function init()
{ {
parent::init(); parent::init();
$currentProtocol = Director::protocol();
if ($this->ForceProtocol) { $desiredProtocol = $this->ForceProtocol;
if ($this->ForceProtocol == 'http://' && Director::protocol() != 'http://') { if ($desiredProtocol && $currentProtocol !== $desiredProtocol) {
return $this->redirect(preg_replace('#https://#', 'http://', $this->AbsoluteLink())); $enforcedLocation = preg_replace(
} elseif ($this->ForceProtocol == 'https://' && Director::protocol() != 'https://') { "#^${currentProtocol}#",
return $this->redirect(preg_replace('#http://#', 'https://', $this->AbsoluteLink())); $desiredProtocol,
} $this->AbsoluteLink()
);
return $this->redirect($enforcedLocation);
} }
if ($this->IFrameURL) { if ($this->IFrameURL) {
Requirements::javascript('iframe/javascript/iframe_page.js'); Requirements::javascript('silverstripe/iframe: javascript/iframe_page.js');
} }
} }
} }