? TODO
? pageroute_5_more_fixes.patch
Index: pageroute.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute.module,v
retrieving revision 1.25
diff -u -r1.25 pageroute.module
--- pageroute.module	6 Mar 2007 10:52:42 -0000	1.25
+++ pageroute.module	6 Mar 2007 15:19:22 -0000
@@ -43,7 +43,7 @@
   global $user;
   $items = array();
 
-  if (!$may_cache) {
+  if ($may_cache) {
     $result = db_query("SELECT * FROM {pageroute_routes}");
 
     while ($route = db_fetch_object($result)) {
@@ -185,10 +185,10 @@
     $path = _pageroute_get_path($page);
   }
   else if ($form_values['op']['nid']) {
-    if ($form_values[$form_values['op']['key']] == t('edit')) {
+    if ($form_values[$form_values['op']['key']] == t('Edit')) {
       $path = _pageroute_create_path($page, $page->name .'/edit/'. $form_values['op']['nid']);
     }
-    else if ($form_values[$form_values['op']['key']] == t('delete')) {
+    else if ($form_values[$form_values['op']['key']] == t('Delete')) {
       $path = _pageroute_create_path($page, $page->name .'/delete/'. $form_values['op']['nid']);
     }
   }
Index: pageroute_pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute_pages.inc,v
retrieving revision 1.8
diff -u -r1.8 pageroute_pages.inc
--- pageroute_pages.inc	6 Mar 2007 10:52:42 -0000	1.8
+++ pageroute_pages.inc	6 Mar 2007 15:19:22 -0000
@@ -104,8 +104,8 @@
 function pageroute_form_alter($form_id, &$form) { 
   global $page;
 
-  if ($form_id == 'node_form' && isset($form['type'])
-      && $form['type']['#value'] == $page->options['content-type']) {
+  if (isset($form['type']) && $form['type']['#value'] == $page->options['content-type']
+      && ($form_id == 'node_form' || $form['type']['#value'] .'_node_form')) {
     //this is a node form viewed during a pageroute
 
     $preview = $form['preview'];
@@ -222,7 +222,7 @@
       }
       $page->arg_offset = 3;
       pageroute_invoke('load', $page);
-      return pageroute_node_delete_confirm($node);
+      return drupal_get_form('pageroute_node_delete_confirm', $node);
 
     default:
       drupal_not_found();
@@ -253,22 +253,25 @@
 
 function pageroute_page_manage_overview($content_type, &$form, $sub_page = FALSE, $uid) {
   global $page;
-  
-  $result = db_query(db_rewrite_sql("SELECT nid FROM {node} n WHERE n.type = '%s' AND n.uid = %d AND n.status > 0 ".
-            "ORDER BY n.created"), $content_type, $uid);
+
+  $result = db_query(db_rewrite_sql("
+    SELECT n.nid FROM {node} n
+    WHERE n.type = '%s' AND n.uid = %d AND n.status > 0
+    ORDER BY n.created
+  "), $content_type, $uid);
 
   $output = '';
 
   $i = 1;
   while ($row = db_fetch_object($result)) {
     $node = node_load($row->nid);
-    
+
     $access = array();
     if (node_access('update', $node)) {
-      $access[] = 'edit';
+      $access[] = 'Edit';
     }
     if (node_access('delete', $node)) {
-      $access[] = 'delete';
+      $access[] = 'Delete';
     }
 
     if ($access) {
Index: pageroute_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute_ui.module,v
retrieving revision 1.21
diff -u -r1.21 pageroute_ui.module
--- pageroute_ui.module	6 Mar 2007 10:52:42 -0000	1.21
+++ pageroute_ui.module	6 Mar 2007 15:19:23 -0000
@@ -258,7 +258,7 @@
     db_query("INSERT INTO {pageroute_routes} (prid, path, options) VALUES(%d, '%s', '%s')", 
              $form_values['route']->prid, $form_values['validated'], serialize($form_values['options']));
   }
-  cache_clear_all(NULL, 'cache_menu');
+  cache_clear_all('*', 'cache_menu', TRUE);
   return 'admin/build/pageroute';
 }
 
@@ -286,7 +286,7 @@
 function pageroute_ui_route_delete_confirm_submit($form_id, &$form_values) {
   db_query("DELETE FROM {pageroute_pages} WHERE prid = %d", $form_values['route']->prid);
   db_query("DELETE FROM {pageroute_routes} WHERE prid = %d", $form_values['route']->prid);
-  cache_clear_all(NULL, 'cache_menu');
+  cache_clear_all('*', 'cache_menu', TRUE);
   drupal_set_message('Your route has been deleted.');
   return 'admin/build/pageroute';
 }
@@ -597,7 +597,7 @@
              $form_values['route']->prid, $form_values['name_validated'], $form_values['title'], $form_values['weight'], arg(6), serialize($edit_page->options));
     pageroute_ui_update_neighbours($form_values['route']);
   }
-  cache_clear_all(NULL, 'cache_menu');
+  cache_clear_all('*', 'cache_menu', TRUE);
   return 'admin/build/pageroute/route/'. $form_values['route']->prid;
 }
 
@@ -693,7 +693,7 @@
   db_query("DELETE FROM {pageroute_pages} WHERE prid = %d AND name ='%s'",
            $form_values['page']->prid, $form_values['page']->name);
   pageroute_ui_update_neighbours($route = (object)array('prid' => $form_values['page']->prid));
-  cache_clear_all(NULL, 'cache_menu');
+  cache_clear_all('*', 'cache_menu', TRUE);
   drupal_set_message('Your page has been deleted.');
   return 'admin/build/pageroute/route/'. $form_values['page']->prid;
 }