Index: modules/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog.module,v
retrieving revision 1.126
diff -u -r1.126 watchdog.module
--- modules/watchdog.module	25 Aug 2005 21:14:17 -0000	1.126
+++ modules/watchdog.module	13 Sep 2005 22:22:54 -0000
@@ -77,13 +77,13 @@
     $_SESSION['watchdog_overview_filter'] = 'all';
   }
 
-  $op = $_POST['op'];
-  if ($op == t('Filter') && isset($_POST['edit']['filter'])) {
-    $_SESSION['watchdog_overview_filter'] = $_POST['edit']['filter'];
-  }
-
-  $form  = form_select(t('Filter by message type'), 'filter', $_SESSION['watchdog_overview_filter'], $names);
-  $form .= form_submit(t('Filter'));
+  $form['filter'] = array(
+    type => 'select',
+    title => t('Filter by message type'),
+    options => $names,
+    default_value => $_SESSION['watchdog_overview_filter']
+  );
+  $form['submit'] = array(type => 'submit', value =>t('Filter'));
 
   $header = array(
     ' ',
@@ -122,10 +122,19 @@
     $rows[] = array(array('data' => $pager, 'colspan' => '7'));
   }
 
-  $output  = '<div class="container-inline">'. form($form) .'</div>';
-  $output .= theme('table', $header, $rows);
+  return drupal_get_form('watchdog_form_overview', $form) . theme('table', $header, $rows);
+}
 
-  return $output;
+function theme_watchdog_form_overview($form) {
+  return '<div class="container-inline">'. form_render($form) .'</div>';
+}
+
+function watchdog_form_overview_execute($form_id, $form) {
+  global $form_values;
+
+  if ($_POST['op'] == t('Filter') && isset($form_values['filter'])) {
+    $_SESSION['watchdog_overview_filter'] = $form_values['filter'];
+  }
 }
 
 /**
@@ -159,6 +168,4 @@
   }
 
   return $types;
-}
-
-
+}
\ No newline at end of file