diff -urNp liquid2/liquid_filters.info liquid/liquid_filters.info
--- liquid2/liquid_filters.info	1969-12-31 19:00:00.000000000 -0500
+++ liquid/liquid_filters.info	2007-01-25 09:50:33.000000000 -0500
@@ -0,0 +1,10 @@
+; $Id: project.info,v 1.1 2006/12/20 01:41:41 dww Exp $
+name = Liquid Filters
+description = Provides wiki filter for liquid wiki module
+package = Liquid
+version = "5.x 0.1 dev "
+
+
+
+
+
diff -urNp liquid2/liquid_filters.module liquid/liquid_filters.module
--- liquid2/liquid_filters.module	2006-03-18 17:53:32.000000000 -0500
+++ liquid/liquid_filters.module	2007-01-22 10:29:35.000000000 -0500
@@ -61,4 +61,4 @@ function liquid_filters_filter($op, $del
   }
 }
 
-?>
\ No newline at end of file
+?>
Binary files liquid2/.liquid_filters.module.swp and liquid/.liquid_filters.module.swp differ
diff -urNp liquid2/liquid.info liquid/liquid.info
--- liquid2/liquid.info	1969-12-31 19:00:00.000000000 -0500
+++ liquid/liquid.info	2007-01-25 09:50:54.000000000 -0500
@@ -0,0 +1,7 @@
+; $Id: project.info,v 1.1 2006/12/20 01:41:41 dww Exp $
+name = Liquid
+description = Liquid Wiki support.
+package = Liquid
+version = "5.x 0.1 dev"
+
+
diff -urNp liquid2/liquid.module liquid/liquid.module
--- liquid2/liquid.module	2006-03-18 17:53:32.000000000 -0500
+++ liquid/liquid.module	2007-01-25 09:46:09.000000000 -0500
@@ -45,9 +45,9 @@ function liquid_help($section ='') {
   $output = '';
 
   switch($section) {
-  case 'admin/modules#description':
+  /*case 'admin/modules#description':
     $output = t('The base module of the Liquid Wiki Engine.');
-    break;
+    break;*/
   case 'admin/help#liquid':
     $output = t('The base module of the Liquid Wiki Engine.');
     break;
@@ -88,7 +88,7 @@ function liquid_settings() {
 					  '#title' => t('Default content type'),
 					  '#description' => t('This is the content type that will be created when'.
 							      'somebody tries to change a nonexisting wiki page.'),
-					  '#options' => node_get_types()
+					  '#options' => node_get_types('names')
 					  );
 
   $form[PREF_LIQUID_DEFAULT_PAGE] = array('#type' => 'textfield',
@@ -103,8 +103,8 @@ function liquid_settings() {
 						'#default_value' => variable_get(PREF_LIQUID_DEFAULT_EMPTY_PAGE, PREF_LIQUID_DEFAULT_EMPTY_PAGE_DEFAULT),
 						'#description' => t('This is the page that will be shown when a nonexisting wiki node is requested.')
 						);
-						  
-  return $form;
+					  
+  return system_settings_form($form);
 }
 
 /*
@@ -143,6 +143,15 @@ function liquid_menu($may_cache) {
 		     'access' => true,
 		     'type' => MENU_CALLBACK);
 
+    $items[] = array(
+      'path' => 'admin/settings/liquid',
+      'title' => t('liquid'),
+      'description' => t('Set Liquid Settings.'),
+      'callback' => 'drupal_get_form',
+      'callback arguments' => array('liquid_settings'),
+      'access' => user_access('administer liquid'),
+      'type' => MENU_NORMAL_ITEM, // optional
+     );
   } else {
     // "wiki" tab in node display
     $items[] = array('path' => 'node/'.arg(1).'/wiki/status',
@@ -165,7 +174,9 @@ function liquid_menu($may_cache) {
       // "delete" tab in node display
       $items[] = array('path' => 'node/'.arg(1).'/wiki/delete',
 		       'title' => t('delete'),
-		       'callback' => 'node_delete_confirm',
+		       'callback' => 'drupal_get_form',
+		       'callback arguments' => array('node_delete_confirm', node_load(arg(1))),
+		       //'callback' => 'node_delete_confirm',
 		       'access' => node_access('delete', node_load(arg(1))),
 		       'type' => MENU_LOCAL_TASK,
 		       'weight' => 50);
@@ -267,38 +278,11 @@ function liquid_page() {
   return $output;
 }
 
-function liquid_insert_page() {
+function liquid_insert_page(&$status,&$instructions) {
   $nid = arg(1);
   $node = node_load($nid);
   $error_message = '';
 
-  if (isset($_POST['op']) && isset($_POST['edit']) && $_POST['op'] == t("Insert")) {
-    $edit = $_POST['edit'];
-    $wikiID = $edit['wikiID'];
-    
-    if (!liquid_validate_wid($wikiID)) {
-      $error_message = t("The wiki ID '%wikiID' is invalid.", array('%wikiID'=>$wikiID));
-
-    } else if (liquid_is_in_wiki($wikiID)) {
-      $error_message = t("Wiki ID '%wikiID' allready taken.", array('%wikiID'=>$wikiID));
-
-    } else if (liquid_insert($wikiID, $node->nid)) {
-
-      // modify title, if required
-      if (variable_get($node->type . "_bind_title", false)) {
-	$node = node_load($nid, NULL, true);
-	$node->title = liquid_decode($wikiID);
-	node_save($node);
-      }
-
-      drupal_set_message(t("The node has been inserted into the wiki."));
-      drupal_goto("node/$nid");
-    }
-  }
-
-  $status = t('The node is not inserted into the wiki.');
-  $instructions = t('Use the form below to insert the node.');
-
   $form['insert']             = array('#type' => 'fieldset',
 				      '#title' => t("Insert into Wiki"),
 				      '#collapsible' => true,
@@ -324,35 +308,41 @@ function liquid_insert_page() {
     drupal_set_message($error_message, 'error');
 
   drupal_set_title($node->title);
-  return "<p>$status</p><p>$instructions</p>".drupal_get_form('liquid_insert_page', $form);
+  return $form;
 }
 
-function liquid_manage_page() {
+function liquid_insert_page_submit($formid,$form_values) {
   $nid = arg(1);
   $node = node_load($nid);
-  $wikiID = liquid_lookup_wid($nid);
+  $error_message = '';
 
-  if (isset($_POST['op']) && isset($_POST['edit'])) {
-    switch ($_POST['op']) {
-    case t("Remove"):
-      if (liquid_remove(liquid_lookup_wid($node->nid))) {
-	drupal_set_message(t("The node has been removed from the wiki."));
-	drupal_goto("node/$nid");
-      }
-      break;
-    case t("Update"):
-      liquid_set_access_level($nid, $_POST['edit']['level']);
-      $level = array('none', 'normal', 'protected');
-      drupal_set_message(t("Wiki access level has been set to %level", array('%level' => $level[$_POST['edit']['level']])));
-      unset($_POST['edit']);
-      break;
+  $wikiID = $form_values['wikiID'];
+
+  if (!liquid_validate_wid($wikiID)) {
+    $error_message = t("The wiki ID '%wikiID' is invalid.", array('%wikiID'=>$wikiID));
+  } else if (liquid_is_in_wiki($wikiID)) {
+    $error_message = t("Wiki ID '%wikiID' allready taken.", array('%wikiID'=>$wikiID));
+  } else if (liquid_insert($wikiID, $node->nid)) {
+
+    // modify title, if required
+    if (variable_get($node->type . "_bind_title", false)) {
+      $node = node_load($nid, NULL, true);
+      $node->title = liquid_decode($wikiID);
+      node_save($node);
     }
-  }
 
-  $status = t('The node is inserted in the wiki with wiki ID: <i>%wikiID</i>.', array('%wikiID'=>$wikiID));
-  $instructions =t('Use the form below to manage wiki settings for the node or to remove it from the wiki.');
+    drupal_set_message(t("The node has been inserted into the wiki."));
+    drupal_goto("node/$nid");
+  }
 
+  if ($error_message)
+    drupal_set_message($error_message, 'error');
+}
 
+function liquid_manage_page(&$status,&$instructions) {
+  $nid = arg(1);
+  $node = node_load($nid);
+  $wikiID = liquid_lookup_wid($nid);
 
   $form['access']            = array('#type' => 'fieldset',
 				     '#title' => t("Wiki Access Level"),
@@ -378,42 +368,53 @@ function liquid_manage_page() {
 
 
   drupal_set_title($node->title);
-  return "<p>$status</p><p>$instructions</p>".drupal_get_form('liquid_manage_page', $form);
-}
-
-function liquid_wikistatus_page() {
-  $nid = arg(1);
-  if (!liquid_is_in_wiki($nid))
-    return liquid_insert_page();
-  else
-    return liquid_manage_page();
+  return $form;
 }
 
-function liquid_move_page() {
+function liquid_manage_page_submit($formid,$form_values) {
   $nid = arg(1);
   $node = node_load($nid);
-  $error_message = '';
+  $wikiID = liquid_lookup_wid($nid);
 
-  if (isset($_POST['op']) && isset($_POST['edit']) && $_POST['op'] == t("Move")) {
-    $edit = $_POST['edit'];
-    $new_id = $edit['new_id'];
-    if (!liquid_validate_wid($new_id)) {
-      $error_message = t("The wiki ID '%wikiID' is invalid.", array('%wikiID'=>$new_id));
-    } else if (liquid_is_in_wiki($new_id)) {
-      $error_message = t("Wiki ID '%wikiID' allready taken.", array('%wikiID'=>$new_id));
-    } else if (liquid_move(liquid_lookup_wid($node->nid), $new_id)) {
-     
-      // update title, if nessecary
-      if (variable_get($node->type . "_bind_title", false)) {
-	$node = node_load($nid, NULL, true);
-	$node->title = liquid_decode($new_id);
-	node_save($node);
-      }
+  $wiki_level=$form_values['level'];
 
-      drupal_set_message(t("The node has been moved to %newname.", array('%newname' => $new_id)));
-      drupal_goto("node/$nid");
+  switch ($form_values['op']) {
+    case t("Remove"):
+      if (liquid_remove(liquid_lookup_wid($node->nid))) {
+        drupal_set_message(t("The node has been removed from the wiki."));
+        drupal_goto("node/$nid");
+      }
+      break;
+    case t("Update"):
+      liquid_set_access_level($nid, $wiki_level);
+      $level = array('none', 'normal', 'protected');
+      drupal_set_message(t("Wiki access level has been set to %level", array('%level' => $level[$wiki_level])));
+      //unset($_POST['edit']);
+      break;
     }
+
+}
+
+function liquid_wikistatus_page() {
+  $nid = arg(1);
+  $wikiID = liquid_lookup_wid($nid);
+
+  if (!liquid_is_in_wiki($nid)) {
+    $output = t('<p>The node is not inserted into the wiki.</p>');
+    $output .= t('<p>Use the form below to insert the node.</p>');
+    $output .= drupal_get_form('liquid_insert_page',$status,$instructions);
+  }
+  else {
+    $output = t('<p>The node is inserted in the wiki with wiki ID: <i>%wikiID</i>.</p>', array('%wikiID'=>$wikiID));
+    $output .= t('<p>Use the form below to manage wiki settings for the node or to remove it from the wiki.</p>');
+    $output .= drupal_get_form('liquid_manage_page',$status,$instructions);
   }
+  return $output;
+}
+
+function liquid_move_page_form() {
+  $nid = arg(1);
+  $node = node_load($nid);
 
   $form['move']              = array('#type' => 'fieldset',
 				     '#title' => t("Move"),
@@ -432,20 +433,57 @@ function liquid_move_page() {
   $form['move']['move']      = array('#type' => 'submit',
 				     '#value' => t("Move"),
 				     '#weight' => 20);
-    
-  if ($error_message) 
-    drupal_set_message($error_message, 'error');
 
   drupal_set_title($node->title);
-  return drupal_get_form('liquid_move_page', $form);
+
+  return $form;
 }
 
+function liquid_move_page_form_submit($form_id, $form_values) {
+  $nid = arg(1);
+  $node = node_load($nid);
+
+  $new_id = $form_values['new_id'];
+
+  if (!liquid_validate_wid($new_id)) {
+    $error_message = t("The wiki ID '%wikiID' is invalid.", array('%wikiID'=>$new_id));
+  } else if (liquid_is_in_wiki($new_id)) {
+    $error_message = t("Wiki ID '%wikiID' allready taken.", array('%wikiID'=>$new_id));
+  } else if (liquid_move(liquid_lookup_wid($node->nid), $new_id)) {
+    // update title, if nessecary
+    if (variable_get($node->type . "_bind_title", false)) {
+      $node = node_load($nid, NULL, true);
+      $node->title = liquid_decode($new_id);
+      node_save($node);
+    }
+
+    drupal_set_message(t("The node has been moved to %newname.", array('%newname' => $new_id)));
+    drupal_goto("node/$nid");
+  }
+
+  if ($error_message)
+    drupal_set_message($error_message, 'error');
+}
+
+function liquid_move_page() {
+  $nid = arg(1);
+  $node = node_load($nid);
+  $error_message = '';
+
+  $output = 'Move Page';
+  $output .= drupal_get_form('liquid_move_page_form');
+
+  if ($error_message)
+    drupal_set_message($error_message, 'error');
+
+  return $output;
+}
 
 function liquid_nodeapi(&$node, $op, $arg) {
   if (true) {
     switch ($op) {
       case 'validate':
-	if ($node->wiki_insert && (user_access(PERM_CREATE_WIKI_CONTENT) || user_access(PERM_MANAGE_WIKI))) {
+	if ($node->wiki_insert  && (user_access(PERM_CREATE_WIKI_CONTENT) || user_access(PERM_MANAGE_WIKI))) {
 	  if (variable_get($node->type . PREF_LIQUID_BIND_TITLE, PREF_LIQUID_BIND_TITLE_DEFAULT)) {
 	    $idField = 'title';
 	    $wikiID = liquid_encode($node->title);
@@ -476,7 +514,7 @@ function liquid_nodeapi(&$node, $op, $ar
 	break;
 
       case 'insert':
-	if ($node->wiki_insert && (user_access(PERM_CREATE_WIKI_CONTENT) || user_access(PERM_MANAGE_WIKI))) {
+	if ($node->wiki_insert  && (user_access(PERM_CREATE_WIKI_CONTENT) || user_access(PERM_MANAGE_WIKI))) {
 	  if (variable_get($node->type . PREF_LIQUID_BIND_TITLE, PREF_LIQUID_BIND_TITLE_DEFAULT))
 	    $wikiID = liquid_encode($node->title);
 	  else
@@ -593,7 +631,7 @@ function liquid_move_access($op, $nid) {
 function liquid_node_grants($user, $op) {
   $grants = array();
 
-  switch ($op) {
+  /*switch ($op) {
     case 'view':
       if (user_access(PERM_VIEW_WIKI_CONTENT, $user)) {
 	$grants[] = 1;
@@ -615,7 +653,7 @@ function liquid_node_grants($user, $op) 
 	  $grants[] = 2;
       }
       break;
-  }
+  }*/
   return array('wiki_access' => $grants);
 }
 
@@ -672,7 +710,7 @@ function liquid_insert($wid, $nid, $chec
   db_query("INSERT INTO {wiki_name} VALUES ('$wid', $nid)");
 
   // create the path alias, if required
-  if (module_exist('path') && variable_get(PREF_LIQUID_USE_PATH_ALIAS, PREF_LIQUID_USE_PATH_ALIAS_DEFAULT)) {
+  if (module_exists('path') && variable_get(PREF_LIQUID_USE_PATH_ALIAS, PREF_LIQUID_USE_PATH_ALIAS_DEFAULT)) {
     path_set_alias("node/$nid", drupal_urlencode("wiki/$wid"));
   }
 
@@ -704,7 +742,7 @@ function liquid_move($wid, $new_wid, $ch
   db_query("UPDATE {wiki_name} SET wid ='$new_wid' WHERE wid = '$wid'");
   
   // move path alias, if required
-  if (module_exist('path') && variable_get(PREF_LIQUID_USE_PATH_ALIAS, PREF_LIQUID_USE_PATH_ALIAS_DEFAULT)) {
+  if (module_exists('path') && variable_get(PREF_LIQUID_USE_PATH_ALIAS, PREF_LIQUID_USE_PATH_ALIAS_DEFAULT)) {
     path_set_alias(NULL, drupal_urlencode("wiki/$wid"));
     $nid = liquid_lookup_nid($new_wid);
     path_set_alias("node/$nid", drupal_urlencode("wiki/$new_wid"));
@@ -733,7 +771,7 @@ function liquid_remove($wid, $check_acce
   db_query("DELETE FROM {wiki_name} WHERE wid='$wid'");
 
   // remove path alias, if required
-  if (module_exist('path') && variable_get(PREF_LIQUID_USE_PATH_ALIAS, PREF_LIQUID_USE_PATH_ALIAS_DEFAULT))
+  if (module_exists('path') && variable_get(PREF_LIQUID_USE_PATH_ALIAS, PREF_LIQUID_USE_PATH_ALIAS_DEFAULT))
     path_set_alias(NULL, drupal_urlencode("wiki/$wid"));    
 
   // remove wiki access grants
@@ -816,4 +854,4 @@ function liquid_validate_wid($wid) {
   return $wid && !is_numeric($wid) && drupal_urlencode($wid)==$wid;
 }
 
-?>
\ No newline at end of file
+?>
Binary files liquid2/.liquid.module.old.swp and liquid/.liquid.module.old.swp differ
diff -urNp liquid2/liquid_wikipage.info liquid/liquid_wikipage.info
--- liquid2/liquid_wikipage.info	1969-12-31 19:00:00.000000000 -0500
+++ liquid/liquid_wikipage.info	2007-01-25 09:51:10.000000000 -0500
@@ -0,0 +1,6 @@
+; $Id: project.info,v 1.1 2006/12/20 01:41:41 dww Exp $
+name = Liquid Wikipage
+description = Provides support for Liquid wiki wikipage node type.
+package = Liquid
+version = "5.x 0.1 dev"
+
diff -urNp liquid2/liquid_wikipage.module liquid/liquid_wikipage.module
--- liquid2/liquid_wikipage.module	2006-03-18 17:53:32.000000000 -0500
+++ liquid/liquid_wikipage.module	2007-01-25 09:07:16.000000000 -0500
@@ -25,7 +25,7 @@ function liquid_wikipage_help($section) 
  * Implementation of hook_node_info().
  */
 function liquid_wikipage_node_info() {
-  return array('wikipage' => array('name' => t('wiki page'), 'base' => 'liquid_wikipage'));
+  return array('wikipage' => array('name' => t('wiki page'), 'module' => 'liquid_wikipage', 'description' => 'Create a liquid wiki page'));
 }
 
 /**
@@ -67,14 +67,6 @@ function liquid_wikipage_menu($may_cache
 }
 
 /**
- * Implementation of hook_validate().
- */
-function liquid_wikipage_validate($node) {
-  node_validate_title($node);
-}
-
-
-/**
  * Implementation of hook_form().
  */
 function liquid_wikipage_form(&$node) {
@@ -84,3 +76,5 @@ function liquid_wikipage_form(&$node) {
   return $form;
 }
 
+
+
diff -urNp liquid2/project.info liquid/project.info
--- liquid2/project.info	1969-12-31 19:00:00.000000000 -0500
+++ liquid/project.info	2007-01-22 10:16:50.000000000 -0500
@@ -0,0 +1,10 @@
+; $Id: project.info,v 1.1 2006/12/20 01:41:41 dww Exp $
+name = Project
+description = Provides a project node type and browsing of projects.
+package = Project
+version = "$Name: HEAD $"
+
+; Information added by drupal.org packaging script on 2007-01-19
+version = "5.x-0.x-dev"
+project = "project"
+