'. t('For more information please read the configuration and customization handbook Privatemsg page.', array('%privatemsg' => 'http://www.drupal.org/handbook/modules/privatemsg/')) .'
'; return $output; - case 'admin/modules#description': - return t('Allows private messages between users.'); } } @@ -33,7 +31,7 @@ function privatemsg_link($type, $node = $access[$node->uid] = user_access('access private messages', $author) && $author->uid && (isset($author->privatemsg_allow) ? $author->privatemsg_allow : 1); } if ($access[$node->uid]) { - return array(l(t('write to author'), "privatemsg/msgto/$node->uid")); + $links['privatemsg_links'] = array('title' => t('Write to author'), 'href' => "privatemsg/msgto/$node->uid", 'attributes' => array('title' => t('write to author'))); } } } @@ -42,27 +40,25 @@ function privatemsg_link($type, $node = * Implementation of hook_menu(). */ function privatemsg_menu($may_cache) { - $items = array(); global $user; - - if ($may_cache) { - $items[] = array('path' => 'admin/settings/privatemsg', - 'title' => 'privatemsg', - 'callback' => 'privatemsg_configure'); - } - else { - $new = (int)_privatemsg_get_new_messages(); - $items[] = array('path' => 'privatemsg', - 'title' => t('my inbox') . ($new ? ' ('. $new .')' : ''), - 'callback' => 'privatemsg_page', - 'access' => user_access('access private messages'), - 'type' => $user->uid && (isset($user->privatemsg_allow) ? $user->privatemsg_allow : 1) ? MENU_DYNAMIC_ITEM : MENU_CALLBACK); - - if ($new && (isset($user->privatemsg_setmessage_notify) ? $user->privatemsg_setmessage_notify : 1)) { - $m = drupal_set_message(); - if (empty($m)) { - drupal_set_message(strtr(format_plural($new, 'You have one new private message', 'You have %count new private messages'), array('%url' => url('privatemsg')))); - } + $items = array(); + $items[] = array( + 'path' => 'admin/settings/privatemsg', + 'title' => t('Privatemsg settings'), + 'description' => t('Configure Privatemsg settings.'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('privatemsg_configure')); + $new = (int)_privatemsg_get_new_messages(); + $items[] = array('path' => 'privatemsg', + 'title' => t('My Inbox') . ($new ? ' ('. $new .')' : ''), + 'callback' => 'privatemsg_page', + 'access' => user_access('access private messages'), + 'type' => $user->uid && (isset($user->privatemsg_allow) ? $user->privatemsg_allow : 1) ? MENU_DYNAMIC_ITEM : MENU_CALLBACK); + + if ($new && (isset($user->privatemsg_setmessage_notify) ? $user->privatemsg_setmessage_notify : 1)) { + $m = drupal_set_message(); + if (empty($m)) { + drupal_set_message(strtr(format_plural($new, 'You have one new private message', 'You have @count new private messages'), array('%url' => url('privatemsg')))); } } return $items; @@ -174,7 +170,7 @@ function privatemsg_configure() { '#description' => t('Provide a link to send private messages to users with their comments.') ); - return system_settings_form('privatemsg_settings', $form); + return system_settings_form($form); } /** @@ -240,7 +236,7 @@ To read your messages, follow this link: If you don\'t want to receive these email again, change your preferences here: %link2', array('%name' => $user->name, '%site' => variable_get('site_name', 'drupal'), '%new' => $alert->c, '%link1' => url('user/login', 'destination=privatemsg', NULL, 1), '%link2' => url('user/'. $user->uid .'/edit', NULL, NULL, 1))); - user_mail($user->mail, $subject, $message, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); + user_mail('privatemsg-mailalert', $user->mail, $subject, $from, "X-Mailer: Drupal\n"); // revert to previous (site default) locale $locale = $initial_locale; @@ -252,6 +248,8 @@ function privatemsg_page() { global $user; $breadcrumb = NULL; + // This is preferred per http://drupal.org/node/64279#post_op, but I don't know where $form_values should be coming from so I stuck with $_POST['op']... + // $op = $form_values['op']; $op = $_POST["op"]; $edit = $_POST["edit"]; $recipient = $_POST["recipient"]; @@ -299,9 +297,10 @@ function privatemsg_page() { break; case 'send': case t('Send private message'): - if (!$edit["recipient"]) { - $edit["recipient"] = $recipient; - } + $edit['recipient'] = $_POST['recipient']; + $edit['subject'] = $_POST['subject']; + $edit['privatemsgbody'] = $_POST['privatemsgbody']; + $edit['format'] = $_POST['format']; $breadcrumb = array(l(t('Home'), ''), l(t('private messages'), 'privatemsg')); $output = _privatemsg_edit($edit); break; @@ -426,6 +425,12 @@ function _privatemsg_format_folder($curr } function _privatemsg_form($message = 0) { + $output = drupal_get_form('_privatemsg_form_form', $message); + return $output; +} + +function _privatemsg_form_form($message) { + global $user; $form = array(); @@ -486,7 +491,7 @@ function _privatemsg_form($message = 0) '#name' => 'op' ); - return drupal_get_form('privatemsg_message_form', $form); + return $form; } function _privatemsg_edit($edit) { @@ -623,17 +628,17 @@ function theme_privatemsg_view($message) if ($message->recipient == $user->uid) { $author = user_load(array('uid' => $message->uid)); if ($author->uid && (isset($author->privatemsg_allow) ? $author->privatemsg_allow : 1)) { - $links[] = l(t('Reply to this message'), "privatemsg/reply/$message->id"); + $links['privatemsg-reply'] = array('title' => t('Reply to this message'), 'href' => "privatemsg/reply/$message->id"); } else { - $links[] = t('Sender does not accept replies'); + $links['privatemsg-noreply'] = array('title' => t('Sender does not accept replies'), 'href' => NULL); } } if (($message->recipient == $user->uid) || (variable_get("privatemsg_sent_status", 1))) { - $links[] = l(t('Delete this message'), "privatemsg/delete/$message->id", array('onClick' => "return confirm('".t('Are you sure to delete this message?')."')")); + $links['privatemsg-delete'] = array('title' => t('Delete this message'), 'href' => "privatemsg/delete/$message->id", 'attributes' => array('onClick' => "return confirm('".t('Are you sure to delete this message?')."')")); } - $links[] = l(t('List messages'), 'privatemsg'); + $links['privatemsg-list'] = array('title' => t('List messages'), 'href' => 'privatemsg'); $body .= '