include entry title when deleting

diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php
index 1430a4f682af7b8f34b733e07274ab55eb5ed6ee..db03e8ed1e8652980aad0bbc8d31f04b5339eb84 100644 (file)
--- a/include/admin/entries.inc.php
+++ b/include/admin/entries.inc.php
@@ -208,7 +208,7 @@ function serendipity_drawList() {
 <?php
         // Print the entries
         $rows = 0;
-        foreach ( $entries as $entry ) {
+        foreach ($entries as $entry) {
             $rows++;
             // Find out if the entry has been modified later than 30 minutes after creation
             if ($entry['timestamp'] <= ($entry['last_modified'] - 60*30)) {
@@ -250,10 +250,12 @@ function serendipity_drawList() {
                     }
                     echo implode(', ', $cats);
                 }
+                $entry['link']      = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp']));
                 ?>
 
                         </td>
                         <td align="right">
+                            <a target="_blank" href="<?php echo $entry['link']; ?>" title="<?php echo VIEW . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><?php echo VIEW ?></a>
                             <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="<?php echo EDIT . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
                             <a href="?<?php echo serendipity_setFormToken('url'); ?>&amp;serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="<?php echo DELETE . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
                         </td>
@@ -440,8 +442,10 @@ switch($serendipity['GET']['adminAction']) {
         if (!serendipity_checkFormToken()) {
             break;
         }
+
+        $entry = serendipity_fetchEntry('id', $serendipity['GET']['id'], 1, 1);
         serendipity_deleteEntry((int)$serendipity['GET']['id']);
-        printf(RIP_ENTRY, (int)$serendipity['GET']['id']);
+        printf(RIP_ENTRY, $entry['id'] . ' - ' . htmlspecialchars($entry['title']));
         echo '<br />';
 
     case 'editSelect':
@@ -453,7 +457,9 @@ switch($serendipity['GET']['adminAction']) {
             break;
         }
         $newLoc = '?' . serendipity_setFormToken('url') . '&amp;serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=doDelete&amp;serendipity[id]=' . (int)$serendipity['GET']['id'];
-        printf(DELETE_SURE, (int)$serendipity['GET']['id']);
+
+        $entry = serendipity_fetchEntry('id', $serendipity['GET']['id'], 1, 1);
+        printf(DELETE_SURE, $entry['id'] . ' - ' . htmlspecialchars($entry['title']));
 ?>
 <br />
 <br />