wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getUrl() fixed for File and File_thumbnail to correct http/https stuff and other

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-01-12 19:22:10 +01:00
parent cbb7ec07a5
commit 3927acdde5
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
classes/File.php
View File

@ -453,11 +453,42 @@ class File extends Managed_DataObject
{ {
return self::path($this->filename); return self::path($this->filename);
} }
public function getUrl() public function getUrl()
{ {
if (!empty($this->filename)) {
// A locally stored file, so let's generate a URL for our instance.
$url = self::url($this->filename);
if ($url != $this->url) {
// For indexing purposes, in case we do a lookup on the 'url' field.
// also we're fixing possible changes from http to https, or paths
$this->updateUrl($url);
}
return $url;
}
// No local filename available, return the URL we have stored
return $this->url; return $this->url;
} }
public function updateUrl($url)
{
$file = File::getKV('url', $url);
if ($file instanceof File) {
throw new ServerException('URL already exists in DB');
}
$sql = 'UPDATE %1$s SET url=%2$s WHERE url=%3$s;';
$result = $this->query(sprintf($sql, $this->__table,
$this->_quote((string)$url),
$this->_quote((string)$this->url)));
if ($result === false) {
common_log_db_error($this, 'UPDATE', __FILE__);
throw new ServerException("Could not UPDATE {$this->__table}.url");
}
return $result;
}
/** /**
* Blow the cache of notices that link to this URL * Blow the cache of notices that link to this URL
* *

30
classes/File_thumbnail.php
View File

@ -110,9 +110,39 @@ class File_thumbnail extends Managed_DataObject
public function getUrl() public function getUrl()
{ {
if (!empty($this->filename)) {
// A locally stored file, so let's generate a URL for our instance.
$url = File::url($this->filename);
if ($url != $this->url) {
// For indexing purposes, in case we do a lookup on the 'url' field.
// also we're fixing possible changes from http to https, or paths
$this->updateUrl($url);
}
return $url;
}
// No local filename available, return the URL we have stored
return $this->url; return $this->url;
} }
public function updateUrl($url)
{
$file = File_thumbnail::getKV('url', $url);
if ($file instanceof File_thumbnail) {
throw new ServerException('URL already exists in DB');
}
$sql = 'UPDATE %1$s SET url=%2$s WHERE url=%3$s;';
$result = $this->query(sprintf($sql, $this->__table,
$this->_quote((string)$url),
$this->_quote((string)$this->url)));
if ($result === false) {
common_log_db_error($this, 'UPDATE', __FILE__);
throw new ServerException("Could not UPDATE {$this->__table}.url");
}
return $result;
}
public function delete($useWhere=false) public function delete($useWhere=false)
{ {
if (!empty($this->filename) && file_exists(File_thumbnail::path($this->filename))) { if (!empty($this->filename) && file_exists(File_thumbnail::path($this->filename))) {