Index: flexinode.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flexinode/flexinode.module,v
retrieving revision 1.50
diff -u -F^f -r1.50 flexinode.module
--- flexinode.module	25 Jul 2005 16:43:34 -0000	1.50
+++ flexinode.module	9 Sep 2005 07:50:08 -0000
@@ -120,7 +120,7 @@ function flexinode_link($type, $node = 0
   if ($type == 'node' && strpos($node->type, 'flexinode-') === 0) {
     /* Don't display a redundant edit link if they are node administrators */
     if (flexinode_access('update', $node) && !user_access('administer nodes')) {
-      $links[] = l(t('edit this %nodename', array('%nodename' => flexinode_node_name($node))), 'node/'. $node->nid .'/edit');
+      $links[] = l(t('edit this %nodename', array('%nodename' => node_get_name($node->type))), 'node/'. $node->nid .'/edit');
     }
   }
 
@@ -493,33 +493,25 @@ function flexinode_page_admin() {
 }
 
 /**
- * Implementation of hook_node_types().
+ * Implementation of hook_node_info().
  */
-function flexinode_node_types() {
+function flexinode_node_info() {
   $types = array();
-  foreach (flexinode_content_types() as $type => $name) {
-    $types[] = 'flexinode-' . $type;
+  foreach (flexinode_content_types() as $type => $ctype) {
+    $type = 'flexinode-' . $type;
+    $types[$type] = array('base' => 'flexinode', 'name' => isset($ctype->name) ? t($ctype->name) : t('flexible content'));
   }
   return $types;
 }
 
 /**
- * Implementation of hook_node_name().
- */
-function flexinode_node_name($node) {
-  $type = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
-  $ctype = flexinode_load_content_type(substr($type, 10));
-  return $ctype->name ? t($ctype->name) : t('flexible content');
-}
-
-/**
  * Implementation of hook_access().
  */
 function flexinode_access($op, $node) {
   global $user;
 
   if ($op == 'create') {
-    return user_access('create '. flexinode_node_name($node) .' content');
+    return user_access('create '. node_get_name($node->type) .' content');
   }
 
   if ($op == 'update') {
@@ -531,7 +523,7 @@ function flexinode_access($op, $node) {
   }
 
   if ($op == 'update' || $op == 'delete') {
-    if (user_access('edit own '. flexinode_node_name($node) .' content') && ($user->uid == $node->uid)) {
+    if (user_access('edit own '. node_get_name($node->type) .' content') && ($user->uid == $node->uid)) {
       return TRUE;
     }
   }
