diff options
| -rw-r--r-- | actions/newmessage.php | 37 | ||||
| -rw-r--r-- | lib/mailbox.php | 8 | ||||
| -rw-r--r-- | lib/util.php | 40 |
3 files changed, 44 insertions, 41 deletions
diff --git a/actions/newmessage.php b/actions/newmessage.php index f6c4e31ac..25ce6c694 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -92,43 +92,8 @@ class NewmessageAction extends Action { list($content, $user, $to) = $params; assert(!is_null($user)); - - common_element_start('form', array('id' => 'message_form', - 'method' => 'post', - 'action' => $this->self_url())); - - $mutual_users = $user->mutuallySubscribedUsers(); - - $mutual = array(); - - while ($mutual_users->fetch()) { - if ($mutual_users->id != $user->id) { - $mutual[$mutual_users->id] = $mutual_users->nickname; - } - } - $mutual_users->free(); - unset($mutual_users); - - common_dropdown('to', _('To'), $mutual, NULL, FALSE, $to->id); - - common_element_start('p'); - - common_element('textarea', array('id' => 'message_content', - 'cols' => 60, - 'rows' => 3, - 'name' => 'content'), - ($content) ? $content : ''); - - common_element('input', array('id' => 'message_send', - 'name' => 'message_send', - 'type' => 'submit', - 'value' => _('Send'))); - - common_hidden('token', common_session_token()); - - common_element_end('p'); - common_element_end('form'); + common_message_form($content, $user, $to); } function show_form($msg=NULL) { diff --git a/lib/mailbox.php b/lib/mailbox.php index 42eeee97e..4ed8d1758 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -69,12 +69,10 @@ class MailboxAction extends PersonalAction { } function show_top() { + + $cur = common_current_user(); - $inst = $this->get_instructions(); - $output = common_markup_to_html($inst); - common_element_start('div', 'instructions'); - common_raw($output); - common_element_end('div'); + common_message_form(NULL, $cur, NULL); $this->views_menu(); } diff --git a/lib/util.php b/lib/util.php index e663eb861..624d3b7e7 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1688,3 +1688,43 @@ function common_keyize($str) { $str = preg_replace('/\s/', '_', $str); return $str; } + +function common_message_form($content, $user, $to) { + + common_element_start('form', array('id' => 'message_form', + 'method' => 'post', + 'action' => $this->self_url())); + + $mutual_users = $user->mutuallySubscribedUsers(); + + $mutual = array(); + + while ($mutual_users->fetch()) { + if ($mutual_users->id != $user->id) { + $mutual[$mutual_users->id] = $mutual_users->nickname; + } + } + + $mutual_users->free(); + unset($mutual_users); + + common_dropdown('to', _('To'), $mutual, NULL, FALSE, $to->id); + + common_element_start('p'); + + common_element('textarea', array('id' => 'message_content', + 'cols' => 60, + 'rows' => 3, + 'name' => 'content'), + ($content) ? $content : ''); + + common_element('input', array('id' => 'message_send', + 'name' => 'message_send', + 'type' => 'submit', + 'value' => _('Send'))); + + common_hidden('token', common_session_token()); + + common_element_end('p'); + common_element_end('form'); +}
\ No newline at end of file |