diff options
| author | Greg Roach <fisharebest@gmail.com> | 2017-11-22 22:18:29 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2017-11-22 22:23:57 +0000 |
| commit | 7bab898203532f027df8f69be3d10f56be1bf2de (patch) | |
| tree | 8784df93bc7e044012d7c4c734d48bca6cf6c522 /app/Module/UserMessagesModule.php | |
| parent | 52cadeb3aa2345be8eb1dd9b9bc2f483fdb470c4 (diff) | |
| download | webtrees-7bab898203532f027df8f69be3d10f56be1bf2de.tar.gz webtrees-7bab898203532f027df8f69be3d10f56be1bf2de.tar.bz2 webtrees-7bab898203532f027df8f69be3d10f56be1bf2de.zip | |
Fix #1456 - messages no longer use popup windows
Diffstat (limited to 'app/Module/UserMessagesModule.php')
| -rw-r--r-- | app/Module/UserMessagesModule.php | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php index ee30bf65bd..c819e5be29 100644 --- a/app/Module/UserMessagesModule.php +++ b/app/Module/UserMessagesModule.php @@ -84,19 +84,25 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface return $user->getUserId() !== Auth::id() && $user->getPreference('verified_by_admin') && $user->getPreference('contactmethod') !== 'none'; }); - $content = '<form id="messageform" name="messageform" method="post" action="module.php?mod=user_messages&mod_action=delete" onsubmit="return confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\');">'; - $content .= '<input type="hidden" name="ged" value="' . $ctype . '">'; - $content .= '<input type="hidden" name="ctype" value="' . $WT_TREE->getNameHtml() . '">'; + $content = ''; if ($users) { - $content .= '<label for="touser">' . I18N::translate('Send a message') . '</label>'; - $content .= '<select id="touser" name="touser">'; + $url = route('user-page', ['ged' => $WT_TREE->getName()]); + $content .= '<form action="message.php" onsubmit="return $("#to").val() !== """>'; + $content .= '<input type="hidden" name="ged" value="' . Html::escape($WT_TREE->getName()) . '">'; + $content .= '<input type="hidden" name="url" value="' . Html::escape($url) . '">'; + $content .= '<label for="to">' . I18N::translate('Send a message') . '</label>'; + $content .= '<select id="to" name="to">'; $content .= '<option value="">' . I18N::translate('<select>') . '</option>'; foreach ($users as $user) { $content .= sprintf('<option value="%1$s">%2$s - %1$s</option>', Html::escape($user->getUserName()), Html::escape($user->getRealName())); } $content .= '</select>'; - $content .= '<input type="button" value="' . I18N::translate('Send') . '" onclick="return message(document.messageform.touser.options[document.messageform.touser.selectedIndex].value, \'messaging2\', \'\');"><br><br>'; + $content .= '<button type="submit">' . I18N::translate('Send') . '</button><br><br>'; + $content .= '</form>'; } + $content .= '<form id="messageform" name="messageform" method="post" action="module.php?mod=user_messages&mod_action=delete" onsubmit="return confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\');">'; + $content .= '<input type="hidden" name="ged" value="' . $ctype . '">'; + $content .= '<input type="hidden" name="ctype" value="' . $WT_TREE->getNameHtml() . '">'; if ($messages) { $content .= '<table class="list_table"><tr>'; $content .= '<th class="list_label">' . I18N::translate('Delete') . '<br><a href="#" onclick="$(\'#block-' . $block_id . ' :checkbox\').prop(\'checked\', true); return false;">' . I18N::translate('All') . '</a></th>'; |