summaryrefslogtreecommitdiff
path: root/actions/newnotice.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-23 07:29:43 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-23 07:29:43 -0700
commita21a9f26c5f0eb034ea389659dd63ffad400de5b (patch)
treee314cb9cd4280481931bc814eeb013f2a672fa2b /actions/newnotice.php
parente2becdb25138350170b58ae8f0d1ecd715533cf5 (diff)
append uploads to content rather than showing them double
Diffstat (limited to 'actions/newnotice.php')
-rw-r--r--actions/newnotice.php104
1 files changed, 80 insertions, 24 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php
index b7d9ec1dd..a5f87d1be 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -224,16 +224,40 @@ class NewnoticeAction extends Action
}
}
+ if (isset($mimetype)) {
+ $filename = $this->saveFile($mimetype);
+ if (empty($filename)) {
+ $this->clientError(_('Couldn\'t save file.'));
+ }
+ $fileurl = File::url($filename);
+ $short_fileurl = common_shorten_url($fileurl);
+ $content_shortened .= ' ' . $short_fileurl;
+ if (mb_strlen($content_shortened) > 140) {
+ $this->deleteFile($filename);
+ $this->clientError(_('Max notice size is 140 chars, including attachment URL.'));
+ }
+ }
+
+ common_debug("newnotice.php - before Notice::saveNew()");
+
$notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
($replyto == 'false') ? null : $replyto);
+ common_debug("newnotice.php - after Notice::saveNew()");
+
if (is_string($notice)) {
+ if (isset($filename)) {
+ $this->deleteFile($filename);
+ }
$this->clientError($notice);
}
+ common_debug("newnotice.php - after Notice::saveNew()");
+
if (isset($mimetype)) {
- $this->storeFile($notice, $mimetype);
+ $this->attachFile($notice, $filename, $mimetype, $short_fileurl);
}
+
common_broadcast_notice($notice);
if ($this->boolean('ajax')) {
@@ -259,7 +283,13 @@ class NewnoticeAction extends Action
}
}
- function storeFile($notice, $mimetype) {
+ function saveFile($mimetype) {
+
+ $cur = common_current_user();
+
+ if (empty($cur)) {
+ $this->serverError(_('Somehow lost the login in saveFile'));
+ }
common_debug("NewnoticeAction::storeFile()");
@@ -267,7 +297,7 @@ class NewnoticeAction extends Action
common_debug("Basename: $basename");
- $filename = File::filename($notice->id, $basename);
+ $filename = File::filename($cur->getProfile(), $basename, $mimetype);
common_debug("filename: $filename");
@@ -276,33 +306,59 @@ class NewnoticeAction extends Action
common_debug("filepath: $filepath");
if (move_uploaded_file($_FILES['attach']['tmp_name'], $filepath)) {
+ return $filename;
+ } else {
+ $this->clientError(_('File could not be moved to destination directory.'));
+ }
+ }
- $file = new File;
- $file->filename = $filename;
+ function deleteFile($filename)
+ {
+ $filepath = File::path($filename);
+ @unlink($filepath);
+ }
- $file->url = common_local_url('file', array('notice' => $notice->id));
+ function attachFile($notice, $filename, $mimetype, $short)
+ {
+ $file = new File;
+ $file->filename = $filename;
- common_debug("file->url =". $file->url);
+ $file->url = common_local_url('file', array('notice' => $notice->id));
- $file->size = filesize($filepath);
- $file->date = time();
- $file->mimetype = $mimetype;
+ common_debug("file->url =". $file->url);
- if ($file_id = $file->insert()) {
- $file_redir = new File_redirection;
- $file_redir->url = File::url($filename);
- $file_redir->file_id = $file_id;
- $file_redir->insert();
+ $filepath = File::path($filename);
- $f2p = new File_to_post;
- $f2p->file_id = $file_id;
- $f2p->post_id = $notice->id;
- $f2p->insert();
- } else {
- $this->clientError(_('There was a database error while saving your file. Please try again.'));
- }
- } else {
- $this->clientError(_('File could not be moved to destination directory.'));
+ $file->size = filesize($filepath);
+ $file->date = time();
+ $file->mimetype = $mimetype;
+
+ $file_id = $file->insert();
+
+ if (!$file_id) {
+ common_log_db_error($file, "INSERT", __FILE__);
+ $this->clientError(_('There was a database error while saving your file. Please try again.'));
+ }
+
+ $file_redir = new File_redirection;
+ $file_redir->url = File::url($filename);
+ $file_redir->file_id = $file_id;
+
+ $result = $file_redir->insert();
+
+ if (!$result) {
+ common_log_db_error($file_redir, "INSERT", __FILE__);
+ $this->clientError(_('There was a database error while saving your file. Please try again.'));
+ }
+
+ $f2p = new File_to_post;
+ $f2p->file_id = $file_id;
+ $f2p->post_id = $notice->id;
+ $f2p->insert();
+
+ if (!$result) {
+ common_log_db_error($f2p, "INSERT", __FILE__);
+ $this->clientError(_('There was a database error while saving your file. Please try again.'));
}
}