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

remove string-checks from code using Notice::saveNew()

Browse Source
This commit is contained in:
Evan Prodromou 2009-09-29 17:25:52 -04:00
parent 0a57d1ccee
commit 89ac81c344
6 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/newnotice.php
View File

@ -255,13 +255,6 @@ class NewnoticeAction extends Action
$notice = Notice::saveNew($user->id, $content_shortened, 'web', 1, $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
($replyto == 'false') ? null : $replyto); ($replyto == 'false') ? null : $replyto);
if (is_string($notice)) {
if (isset($filename)) {
$this->deleteFile($filename);
}
$this->clientError($notice);
}
if (isset($mimetype)) { if (isset($mimetype)) {
$this->attachFile($notice, $fileRecord); $this->attachFile($notice, $fileRecord);
} }

5
actions/twitapistatuses.php
View File

@ -297,11 +297,6 @@ class TwitapistatusesAction extends TwitterapiAction
html_entity_decode($status, ENT_NOQUOTES, 'UTF-8'), html_entity_decode($status, ENT_NOQUOTES, 'UTF-8'),
$source, 1, $reply_to); $source, 1, $reply_to);
if (is_string($notice)) {
$this->serverError($notice);
return;
}
common_broadcast_notice($notice); common_broadcast_notice($notice);
$apidata['api_arg'] = $notice->id; $apidata['api_arg'] = $notice->id;
} }

10
lib/facebookaction.php
View File

@ -468,11 +468,11 @@ class FacebookAction extends Action
$replyto = $this->trimmed('inreplyto'); $replyto = $this->trimmed('inreplyto');
$notice = Notice::saveNew($user->id, $content, try {
'web', 1, ($replyto == 'false') ? null : $replyto); $notice = Notice::saveNew($user->id, $content,
'web', 1, ($replyto == 'false') ? null : $replyto);
if (is_string($notice)) { } catch (Exception $e) {
$this->showPage($notice); $this->showPage($e->getMessage());
return; return;
} }

5
lib/oauthstore.php
View File

@ -156,7 +156,6 @@ class StatusNetOAuthDataStore extends OAuthDataStore
return $this->new_access_token($consumer); return $this->new_access_token($consumer);
} }
/** /**
* Revoke specified OAuth token * Revoke specified OAuth token
* *
@ -363,9 +362,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
false, false,
null, null,
$omb_notice->getIdentifierURI()); $omb_notice->getIdentifierURI());
if (is_string($notice)) {
throw new Exception($notice);
}
common_broadcast_notice($notice, true); common_broadcast_notice($notice, true);
} }

9
scripts/maildaemon.php
View File

@ -260,10 +260,11 @@ class MailerDaemon
function add_notice($user, $msg, $fileRecords) function add_notice($user, $msg, $fileRecords)
{ {
$notice = Notice::saveNew($user->id, $msg, 'mail'); try {
if (is_string($notice)) { $notice = Notice::saveNew($user->id, $msg, 'mail');
$this->log(LOG_ERR, $notice); } catch (Exception $e) {
return $notice; $this->log(LOG_ERR, $e->getMessage());
return $e->getMessage();
} }
foreach($fileRecords as $fileRecord){ foreach($fileRecords as $fileRecord){
$this->attachFile($notice, $fileRecord); $this->attachFile($notice, $fileRecord);

11
scripts/xmppdaemon.php
View File

@ -323,12 +323,15 @@ class XMPPDaemon extends Daemon
mb_strlen($content_shortened))); mb_strlen($content_shortened)));
return; return;
} }
$notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
if (is_string($notice)) { try {
$this->log(LOG_ERR, $notice); $notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
$this->from_site($user->jabber, $notice); } catch (Exception $e) {
$this->log(LOG_ERR, $e->getMessage());
$this->from_site($user->jabber, $e->getMessage());
return; return;
} }
common_broadcast_notice($notice); common_broadcast_notice($notice);
$this->log(LOG_INFO, $this->log(LOG_INFO,
'Added notice ' . $notice->id . ' from user ' . $user->nickname); 'Added notice ' . $notice->id . ' from user ' . $user->nickname);