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

trac31 shorten all URLs even if notice is already <

Browse Source 
darcs-hash:20081113153216-099f7-81c4aba01babca97edeaf55b230dee300dbeb57a.gz
This commit is contained in:
millette 2008-11-13 10:32:16 -05:00
parent 14f69f8d2e
commit 5fc9f11677
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/newmessage.php
View File

@ -34,7 +34,6 @@ class NewmessageAction extends Action {
} }
function save_new_message() { function save_new_message() {
$user = common_current_user(); $user = common_current_user();
assert($user); # XXX: maybe an error instead... assert($user); # XXX: maybe an error instead...
@ -52,8 +51,8 @@ class NewmessageAction extends Action {
if (!$content) { if (!$content) {
$this->show_form(_('No content!')); $this->show_form(_('No content!'));
return; return;
} else if (mb_strlen($content) > 140) { // } else if (mb_strlen($content) > 140) {
} else {
$content = common_shorten_links($content); $content = common_shorten_links($content);
if (mb_strlen($content) > 140) { if (mb_strlen($content) > 140) {

11
actions/newnotice.php
View File

@ -36,13 +36,6 @@ class NewnoticeAction extends Action {
function save_new_notice() { function save_new_notice() {
# CSRF protection - token set in common_notice_form()
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
$this->client_error(_('There was a problem with your session token. Try again, please.'));
return;
}
$user = common_current_user(); $user = common_current_user();
assert($user); # XXX: maybe an error instead... assert($user); # XXX: maybe an error instead...
$content = $this->trimmed('status_textarea'); $content = $this->trimmed('status_textarea');
@ -50,8 +43,8 @@ class NewnoticeAction extends Action {
if (!$content) { if (!$content) {
$this->show_form(_('No content!')); $this->show_form(_('No content!'));
return; return;
} else if (mb_strlen($content) > 140) { // } else if (mb_strlen($content) > 140) {
} else {
$content = common_shorten_links($content); $content = common_shorten_links($content);
if (mb_strlen($content) > 140) { if (mb_strlen($content) > 140) {

4
actions/postnotice.php
View File

@ -58,13 +58,13 @@ class PostnoticeAction extends Action {
return false; return false;
} }
$content = $req->get_parameter('omb_notice_content'); $content = $req->get_parameter('omb_notice_content');
if (!$content || strlen($content) > 140) { // if (!$content || strlen($content) > 140) {
$content = common_shorten_links($content); $content = common_shorten_links($content);
if (mb_strlen($content) > 140) { if (mb_strlen($content) > 140) {
common_user_error(_('Invalid notice content'), 400); common_user_error(_('Invalid notice content'), 400);
return false; return false;
} }
} // }
$notice_uri = $req->get_parameter('omb_notice'); $notice_uri = $req->get_parameter('omb_notice');
if (!Validate::uri($notice_uri) && if (!Validate::uri($notice_uri) &&
!common_valid_tag($notice_uri)) { !common_valid_tag($notice_uri)) {