diff options
| author | friendica <info@friendica.com> | 2013-12-12 18:13:52 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-12 18:13:52 -0800 |
| commit | 65c0b84313ed3c08e4512968e0030631c55bcbb4 (patch) | |
| tree | bfdb56217086f17733e1f664f266af791266cafb /include | |
| parent | 81cf9209f029bbed00a0eaf91fc672984763c5e4 (diff) | |
| download | volse-hubzilla-65c0b84313ed3c08e4512968e0030631c55bcbb4.tar.gz volse-hubzilla-65c0b84313ed3c08e4512968e0030631c55bcbb4.tar.bz2 volse-hubzilla-65c0b84313ed3c08e4512968e0030631c55bcbb4.zip | |
always load css and js sources using the same url as the page that is being visited so there is no http/https mismatch.
Diffstat (limited to 'include')
| -rwxr-xr-x | include/plugin.php | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/include/plugin.php b/include/plugin.php index 5ad467f98..9982a48a2 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -520,10 +520,32 @@ function format_css_if_exists($source) { $path = theme_include($source[0]); if($path) - return '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="' . $source[1] . '" />' . "\r\n"; + return '<link rel="stylesheet" href="' . script_path() . '/' . $path . '" type="text/css" media="' . $source[1] . '" />' . "\r\n"; } +function script_path() { + if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) + $scheme = 'https'; + elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) + $scheme = 'https'; + else + $scheme = 'http'; + + if(x($_SERVER,'SERVER_NAME')) { + $hostname = $_SERVER['SERVER_NAME']; + } + else { + return z_root(); + } + + if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) { + $hostname .= ':' . $_SERVER['SERVER_PORT']; + } + + return $scheme . '://' . $hostname; +} + function head_add_js($src) { get_app()->js_sources[] = $src; } @@ -552,7 +574,7 @@ function format_js_if_exists($source) { else $path = theme_include($source); if($path) - return '<script src="' . z_root() . '/' . $path . '" ></script>' . "\r\n" ; + return '<script src="' . script_path() . '/' . $path . '" ></script>' . "\r\n" ; } |