Skip to content

Check for secure port in url() function #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andranikbadalyan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check for secure port in url() function #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa77d00
Check for secure port in url() function
andranikbadalyan Aug 30, 2018
f4222c2
Check is secure
andranikbadalyan Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions src/Stylist/Html/ThemeHtmlBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,17 @@ public function image($url, $alt = null, $attributes = array(), $secure = null)
}

/**
* Returns the theme's public URI location. This is not a full URL. If you wish
* for a full URL, simply add the site's URL configuration to this path.
* Checks if HTTPS / HTTP and returns full URL.
*
* @param string $file
* @return string
*/
public function url($file = '')
{
if ($this->isSecure()) {
return secure_url($this->assetUrl($file));
}

return url($this->assetUrl($file));
}

Expand Down Expand Up @@ -130,4 +133,22 @@ protected function assetUrl($url)

return $url;
}

protected function isSecure(){

if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
return true;
}

if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) {
return true;
}

// AWS Load Balancer
if (isset($_SERVER['HTTP_X_FORWARDED_PORT']) && $_SERVER['HTTP_X_FORWARDED_PORT']??'' == 443) {
return true;
}

return false;
}
}