eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

try to show HTTPS-encrypted theme files for HTTPS-encrypted pages

This commit is contained in:
Evan Prodromou 2010-10-14 00:46:32 -04:00
parent 40c64388e6
commit d91f894ccb
1 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
lib/theme.php
View File

@ -38,7 +38,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* Themes are directories with some expected sub-directories and files * Themes are directories with some expected sub-directories and files
* in them. They're found in either local/theme (for locally-installed themes) * in them. They're found in either local/theme (for locally-installed themes)
* or theme/ subdir of installation dir. * or theme/ subdir of installation dir.
* *
* Note that the 'local' directory can be overridden as $config['local']['path'] * Note that the 'local' directory can be overridden as $config['local']['path']
* and $config['local']['dir'] etc. * and $config['local']['dir'] etc.
* *
@ -104,56 +104,73 @@ class Theme
/** /**
* Build a full URL to the given theme's base directory, possibly * Build a full URL to the given theme's base directory, possibly
* using an offsite theme server path. * using an offsite theme server path.
* *
* @param string $group configuration section name to pull paths from * @param string $group configuration section name to pull paths from
* @param string $fallbackSubdir default subdirectory under INSTALLDIR * @param string $fallbackSubdir default subdirectory under INSTALLDIR
* @param string $name theme name * @param string $name theme name
* *
* @return string URL * @return string URL
* *
* @todo consolidate code with that for other customizable paths * @todo consolidate code with that for other customizable paths
*/ */
protected function relativeThemePath($group, $fallbackSubdir, $name) protected function relativeThemePath($group, $fallbackSubdir, $name)
{ {
$path = common_config($group, 'path'); if (StatusNet::isHTTPS()) {
if (empty($path)) { $sslserver = common_config($group, 'sslserver');
$path = common_config('site', 'path') . '/';
if ($fallbackSubdir) {
$path .= $fallbackSubdir . '/';
}
}
if ($path[strlen($path)-1] != '/') { if (empty($sslserver)) {
$path .= '/'; $server = common_config('site', 'server');
} $path = common_config('site', 'path') . '/';
if ($fallbackSubdir) {
if ($path[0] != '/') { $path .= $fallbackSubdir . '/';
$path = '/'.$path; }
}
$server = common_config($group, 'server');
if (empty($server)) {
$server = common_config('site', 'server');
}
$ssl = common_config($group, 'ssl');
if (is_null($ssl)) { // null -> guess
if (common_config('site', 'ssl') == 'always' &&
!common_config($group, 'server')) {
$ssl = true;
} else { } else {
$ssl = false; $server = $sslserver;
$path = common_config($group, 'sslpath');
if (empty($path)) {
$path = common_config($group, 'path');
}
} }
if ($path[strlen($path)-1] != '/') {
$path .= '/';
}
if ($path[0] != '/') {
$path = '/'.$path;
}
return 'https://'.$server.$path.$name;
} else {
$path = common_config($group, 'path');
if (empty($path)) {
$path = common_config('site', 'path') . '/';
if ($fallbackSubdir) {
$path .= $fallbackSubdir . '/';
}
}
if ($path[strlen($path)-1] != '/') {
$path .= '/';
}
if ($path[0] != '/') {
$path = '/'.$path;
}
$server = common_config($group, 'server');
if (empty($server)) {
$server = common_config('site', 'server');
}
return 'http://'.$server.$path.$name;
} }
$protocol = ($ssl) ? 'https' : 'http';
$path = $protocol . '://'.$server.$path.$name;
return $path;
} }
/** /**
@ -221,7 +238,7 @@ class Theme
/** /**
* Pull data from the theme's theme.ini file. * Pull data from the theme's theme.ini file.
* @fixme calling getFile will fall back to default theme, this may be unsafe. * @fixme calling getFile will fall back to default theme, this may be unsafe.
* *
* @return associative array of strings * @return associative array of strings
*/ */
function getMetadata() function getMetadata()