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

maildaemon correctly checks max notice length

This commit is contained in:
Evan Prodromou 2009-08-21 08:21:55 -04:00
parent a94a5fb51a
commit 1285c11d0a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/maildaemon.php
View File

@ -66,9 +66,10 @@ class MailerDaemon
}
$msg = $this->cleanup_msg($msg);
$msg = common_shorten_links($msg);
if (mb_strlen($msg) > 140) {
$this->error($from,_('That\'s too long. '.
'Max notice size is 140 chars.'));
if (Notice::contentTooLong($msg)) {
$this->error($from, sprintf(_('That\'s too long. '.
'Max notice size is %d chars.'),
Notice::maxContent()));
}
$fileRecords = array();
foreach($attachments as $attachment){
@ -96,9 +97,10 @@ class MailerDaemon
$short_fileurl = common_shorten_url($fileurl);
$msg .= ' ' . $short_fileurl;
if (mb_strlen($msg) > 140) {
if (Notice::contentTooLong($msg)) {
$this->deleteFile($filename);
$this->error($from,_('Max notice size is 140 chars, including attachment URL.'));
$this->error($from, sprintf(_('Max notice size is %d chars, including attachment URL.'),
Notice::maxContent()));
}
// Also, not sure this is necessary -- Zach