* "Return to sender" for deleting entries

* Remember cookie settings for entry edit panel

diff --git a/docs/NEWS b/docs/NEWS
index c6e96f980f42d1de2bb35356369d023974fb1234..4de155fabd90366dffccc571a0de82c5114dd221 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,10 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * "Edit entries" panel can now delete entries and returns to the 
+      originating panel. Also it now utilizes Cookies (via JS) to remember 
+      the last used settings (sortorder, filters) (garvinhicking)
+
     * Major update for korean language file plus some plugin translations
       by Wesley Hwang-Chung
 

diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php
index b2a9b5722021f9f41f1b60ea8320a7ff748d8170..a9dc08f1c0b6496d266c22835014f195eb2d07ad 100644 (file)
--- a/include/admin/entries.inc.php
+++ b/include/admin/entries.inc.php
@@ -23,6 +23,18 @@ $per_page = array('12', '16', '50', '100');
 function serendipity_drawList() {
     global $serendipity, $sort_order, $per_page;
 
+    $filter_import = array('author', 'category');
+    $sort_import   = array('perPage', 'ordermode', 'order');
+    foreach($filter_import AS $f_import) {
+        serendipity_restoreVar($serendipity['COOKIE']['entrylist_filter_' . $f_import], $serendipity['GET']['filter'][$f_import]);
+        serendipity_JSsetCookie('entrylist_filter_' . $f_import, $serendipity['GET']['filter'][$f_import]);
+    }
+
+    foreach($sort_import AS $s_import) {
+        serendipity_restoreVar($serendipity['COOKIE']['entrylist_sort_' . $s_import], $serendipity['GET']['sort'][$s_import]);
+        serendipity_JSsetCookie('entrylist_sort_' . $s_import, $serendipity['GET']['sort'][$s_import]);
+    }
+
     $perPage = (!empty($serendipity['GET']['sort']['perPage']) ? $serendipity['GET']['sort']['perPage'] : $per_page[0]);
     $page    = (int)$serendipity['GET']['page'];
     $offSet  = $perPage*$page;
@@ -38,6 +50,7 @@ function serendipity_drawList() {
     }
 
     $filter = array();
+
     if (!empty($serendipity['GET']['filter']['author'])) {
         $filter[] = "e.authorid = '" . serendipity_db_escape_string($serendipity['GET']['filter']['author']) . "'";
     }
@@ -368,6 +381,11 @@ switch($serendipity['GET']['adminAction']) {
 
         break;
 
+    case 'doDelete':
+        serendipity_deleteEntry($serendipity['GET']['id']);
+        printf(RIP_ENTRY, $serendipity['GET']['id']);
+        echo '<br />';
+
     case 'editSelect':
         serendipity_drawList();
         break;
@@ -386,11 +404,6 @@ switch($serendipity['GET']['adminAction']) {
 <?php
         break;
 
-    case 'doDelete':
-        serendipity_deleteEntry($serendipity['GET']['id']);
-        printf(RIP_ENTRY, $serendipity['GET']['id']);
-        break;
-
     case 'edit':
         $entry = serendipity_fetchEntry('id', $serendipity['GET']['id'], 1, 1);