GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make shorturls in notice content point to AttachmentAction urls

Browse Source
This commit is contained in:
Zach Copley 2009-06-25 15:42:17 -07:00
parent 4662a4fa0d
commit 37796a8dc6
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/attachment.php
View File

@ -111,7 +111,16 @@ class AttachmentAction extends Action
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);
$this->showPage();
if (empty($this->attachment->filename)) {
// if it's not a local file, gtfo
common_redirect($this->attachment->url, 303);
} else {
$this->showPage();
}
} }
/** /**

26
actions/newnotice.php
View File

@ -229,14 +229,25 @@ class NewnoticeAction extends Action
if (empty($filename)) { if (empty($filename)) {
$this->clientError(_('Couldn\'t save file.')); $this->clientError(_('Couldn\'t save file.'));
} }
$fileurl = File::url($filename);
$fileRecord = $this->storeFile($filename, $mimetype);
$fileurl = common_local_url('attachment',
array('attachment' => $fileRecord->id));
// not sure this is necessary -- Zach
$this->maybeAddRedir($fileRecord->id, $fileurl);
$short_fileurl = common_shorten_url($fileurl); $short_fileurl = common_shorten_url($fileurl);
$content_shortened .= ' ' . $short_fileurl; $content_shortened .= ' ' . $short_fileurl;
if (mb_strlen($content_shortened) > 140) { if (mb_strlen($content_shortened) > 140) {
$this->deleteFile($filename); $this->deleteFile($filename);
$this->clientError(_('Max notice size is 140 chars, including attachment URL.')); $this->clientError(_('Max notice size is 140 chars, including attachment URL.'));
} }
$fileRecord = $this->rememberFile($filename, $mimetype, $short_fileurl);
// Also, not sure this is necessary -- Zach
$this->maybeAddRedir($fileRecord->id, $short_fileurl);
} }
$notice = Notice::saveNew($user->id, $content_shortened, 'web', 1, $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
@ -305,8 +316,8 @@ class NewnoticeAction extends Action
@unlink($filepath); @unlink($filepath);
} }
function rememberFile($filename, $mimetype, $short) function storeFile($filename, $mimetype) {
{
$file = new File; $file = new File;
$file->filename = $filename; $file->filename = $filename;
@ -325,11 +336,14 @@ class NewnoticeAction extends Action
$this->clientError(_('There was a database error while saving your file. Please try again.')); $this->clientError(_('There was a database error while saving your file. Please try again.'));
} }
$this->maybeAddRedir($file_id, $short);
return $file; return $file;
} }
function rememberFile($file, $short)
{
$this->maybeAddRedir($file->id, $short);
}
function maybeAddRedir($file_id, $url) function maybeAddRedir($file_id, $url)
{ {
$file_redir = File_redirection::staticGet('url', $url); $file_redir = File_redirection::staticGet('url', $url);