Make HTTPS urls in File::url() if necessary
This commit is contained in:
parent
ecb582e419
commit
b31c49c5d4
5
README
5
README
@ -1355,6 +1355,11 @@ ssl: whether to use HTTPS for file URLs. Defaults to null, meaning to
|
|||||||
filecommand: command to use for determining the type of a file. May be
|
filecommand: command to use for determining the type of a file. May be
|
||||||
skipped if fileinfo extension is installed. Defaults to
|
skipped if fileinfo extension is installed. Defaults to
|
||||||
'/usr/bin/file'.
|
'/usr/bin/file'.
|
||||||
|
sslserver: if specified, this server will be used when creating HTTPS
|
||||||
|
URLs. Otherwise, the site SSL server will be used, with /file/ path.
|
||||||
|
sslpath: if this and the sslserver are specified, this path will be used
|
||||||
|
when creating HTTPS URLs. Otherwise, the attachments|path value
|
||||||
|
will be used.
|
||||||
|
|
||||||
group
|
group
|
||||||
-----
|
-----
|
||||||
|
@ -261,13 +261,51 @@ class File extends Memcached_DataObject
|
|||||||
// TRANS: Client exception thrown if a file upload does not have a valid name.
|
// TRANS: Client exception thrown if a file upload does not have a valid name.
|
||||||
throw new ClientException(_("Invalid filename."));
|
throw new ClientException(_("Invalid filename."));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (common_config('site','private')) {
|
if (common_config('site','private')) {
|
||||||
|
|
||||||
return common_local_url('getfile',
|
return common_local_url('getfile',
|
||||||
array('filename' => $filename));
|
array('filename' => $filename));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StatusNet::isHTTPS()) {
|
||||||
|
|
||||||
|
$sslserver = common_config('attachments', 'sslserver');
|
||||||
|
|
||||||
|
if (empty($sslserver)) {
|
||||||
|
// XXX: this assumes that background dir == site dir + /file/
|
||||||
|
// not true if there's another server
|
||||||
|
if (is_string(common_config('site', 'sslserver')) &&
|
||||||
|
mb_strlen(common_config('site', 'sslserver')) > 0) {
|
||||||
|
$server = common_config('site', 'sslserver');
|
||||||
|
} else if (common_config('site', 'server')) {
|
||||||
|
$server = common_config('site', 'server');
|
||||||
|
}
|
||||||
|
$path = common_config('site', 'path') . '/file/';
|
||||||
} else {
|
} else {
|
||||||
|
$server = $sslserver;
|
||||||
|
$path = common_config('attachments', 'sslpath');
|
||||||
|
if (empty($path)) {
|
||||||
$path = common_config('attachments', 'path');
|
$path = common_config('attachments', 'path');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$protocol = 'https';
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$path = common_config('attachments', 'path');
|
||||||
|
$server = common_config('attachments', 'server');
|
||||||
|
|
||||||
|
if (empty($server)) {
|
||||||
|
$server = common_config('site', 'server');
|
||||||
|
}
|
||||||
|
|
||||||
|
$ssl = common_config('attachments', 'ssl');
|
||||||
|
|
||||||
|
$protocol = ($ssl) ? 'https' : 'http';
|
||||||
|
}
|
||||||
|
|
||||||
if ($path[strlen($path)-1] != '/') {
|
if ($path[strlen($path)-1] != '/') {
|
||||||
$path .= '/';
|
$path .= '/';
|
||||||
@ -277,28 +315,8 @@ class File extends Memcached_DataObject
|
|||||||
$path = '/'.$path;
|
$path = '/'.$path;
|
||||||
}
|
}
|
||||||
|
|
||||||
$server = common_config('attachments', 'server');
|
|
||||||
|
|
||||||
if (empty($server)) {
|
|
||||||
$server = common_config('site', 'server');
|
|
||||||
}
|
|
||||||
|
|
||||||
$ssl = common_config('attachments', 'ssl');
|
|
||||||
|
|
||||||
if (is_null($ssl)) { // null -> guess
|
|
||||||
if (common_config('site', 'ssl') == 'always' &&
|
|
||||||
!common_config('attachments', 'server')) {
|
|
||||||
$ssl = true;
|
|
||||||
} else {
|
|
||||||
$ssl = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$protocol = ($ssl) ? 'https' : 'http';
|
|
||||||
|
|
||||||
return $protocol.'://'.$server.$path.$filename;
|
return $protocol.'://'.$server.$path.$filename;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function getEnclosure(){
|
function getEnclosure(){
|
||||||
$enclosure = (object) array();
|
$enclosure = (object) array();
|
||||||
|
@ -210,6 +210,8 @@ $default =
|
|||||||
array('server' => null,
|
array('server' => null,
|
||||||
'dir' => INSTALLDIR . '/file/',
|
'dir' => INSTALLDIR . '/file/',
|
||||||
'path' => $_path . '/file/',
|
'path' => $_path . '/file/',
|
||||||
|
'sslserver' => null,
|
||||||
|
'sslpath' => null,
|
||||||
'ssl' => null,
|
'ssl' => null,
|
||||||
'supported' => array('image/png',
|
'supported' => array('image/png',
|
||||||
'image/jpeg',
|
'image/jpeg',
|
||||||
|
Loading…
Reference in New Issue
Block a user