--- userpoints_nodelimit.module	2011-03-25 05:09:02.000000000 -0400
+++ userpoints_nodelimit.module.working	2011-04-16 13:12:58.000000000 -0400
@@ -20,21 +20,23 @@ define('USERPOINTS_NODELIMIT_ENABLED', 1
  * Implementation of hook_form_alter().
  */
 function userpoints_nodelimit_form_alter(&$form, $form_state, $form_id) {
-
   if (isset($form['#node_type']) && 'node_type_form' == $form_id) {
     userpoints_nodelimit_node_settings_form($form);
   }
   else {
     if (isset($form['#node']) && isset($form['#method']) && $form['#node']->type .'_node_form' == $form_id) {
-      $type = $form['#node']->type;
+      $type = $form['type']['#value'];
       // This is a node form; user is either adding a new node or editing an existing one.
-      // Don't check if user is editing node.  Access check has happened already, so user is assumed to have access to edit / create this node type.
+      // Don't check if user is editing node.
+      // Access check has happened already, so user is assumed to have access to edit / create this node type.
       if (userpoints_nodelimit_get_setting($type) == USERPOINTS_NODELIMIT_ENABLED) {
         // check the number of available user points against the requirements for this node
         // Only check when user is adding a new node.  $form['#node']->nid is unset when adding a new node.
         if (!isset($form['#node']->nid) && !userpoints_nodelimit_check($type)) {
-          $friendly_name = node_get_types('name', $form['#node']); 
-          drupal_set_message(theme('userpoints_nodelimit_insufficent_points_message', $type, $friendly_name), 'error');
+          $this_type = node_type_get_type($form['#node']);
+          $friendly_name = $this_type->name;
+          $variables = array('node_type' => $type, 'friendly_name' => $friendly_name);
+          drupal_set_message(theme('userpoints_nodelimit_insufficent_points_message', $variables), 'error');
       	  //destroy the form
       	  $form = NULL;
       	  //return a simple hidden field so that function doesn't fail
@@ -58,20 +60,25 @@ function userpoints_nodelimit_form_alter
   */ 
 function userpoints_nodelimit_validate($form, &$form_state) {
   // check the user points and confirm they have enough
-  $type = $form['#node']->type;
+  $type = $form['type']['#value'];
   // check the number of available user points against the requirements for this node
   // Only check when user is adding a new node.  $form['#node']->nid is unset when adding a new node.
   if (!isset($form['#node']->nid) && !userpoints_nodelimit_check($type)) {
-    $friendly_name = node_get_types('name', $form['#node']); 
-    form_set_error('userpoints_nodelimit_details', theme('userpoints_nodelimit_insufficent_points_message',$type, $friendly_name));
+    $this_type = node_type_get_type($form['#node']);
+    $friendly_name = $this_type->name;
+    $variables = array('node_type' => $type, 'friendly_name' => $friendly_name);
+    form_set_error('userpoints_nodelimit_details', theme('userpoints_nodelimit_insufficent_points_message', $variables));
   }
 }
 
 /**
   * Node Limit Error Message
   */
-function theme_userpoints_nodelimit_insufficent_points_message($node_type, $friendly_name) {
-	$html_message =	t('You do not have enough !points to create @friendly content.<br />You currently have @user_points !points, you need @node_points !points to create a @friendly.', 
+function theme_userpoints_nodelimit_insufficent_points_message($variables) {
+  $node_type = $variables['node_type'];
+  $friendly_name = $variables['friendly_name'];
+	$html_message =	t('You do not have enough !points to create @friendly content.<br />'.
+	  'You currently have @user_points !points, you need @node_points !points to create a @friendly.', 
     array_merge(userpoints_translation(), 
     array('@user_points' => userpoints_get_current_points($user->uid), 
       '@node_points' => variable_get('userpoints_nodelimit_nodepoints_'.$node_type, '?'),
@@ -94,14 +101,12 @@ function userpoints_nodelimit_node_setti
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
-  
   $form['userpoints_nodelimit']['userpoints_nodelimit'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable User Points Node Limit for this type.'),
     '#description' => t('Node Limit will check to ensure users trying to create this node type have the required number of user points.'),
     '#default_value' => userpoints_nodelimit_get_setting($form['#node_type']->type),
   );
-    
   $form['userpoints_nodelimit']['userpoints_nodelimit_nodepoints'] = array(
     '#type' => 'textfield',
     '#title' => t('User Points Required'),
@@ -118,22 +123,22 @@ function userpoints_nodelimit_get_settin
 }
 
 /**
- * Implementation of hook_node_type().
+ * Implementation of hook_node_type_delete().
  */
-function userpoints_nodelimit_node_type($op, $info) {
-  switch ($op) {
-    case 'delete':
-      variable_del('userpoints_nodelimit_'. $info->type);
-      variable_del('userpoints_nodelimit_nodepoints_'. $info->type);
-      break;
-    case 'update':
-      if (!empty($info->old_type) && $info->old_type != $info->type) {
-        variable_set('userpoints_nodelimit_'. $info->type, userpoints_nodelimit_get_setting($info->old_type));
-        variable_set('userpoints_nodelimit_nodepoints_'. $info->type, variable_get('userpoints_nodelimit_nodepoints_'. $info->old_type, ''));
-        variable_del('userpoints_nodelimit_'. $info->old_type);
-        variable_del('userpoints_nodelimit_nodepoints_'. $info->old_type);
-      }
-      break;
+function userpoints_nodelimit_node_type_delete($info) {
+  variable_del('userpoints_nodelimit_'. $info->type);
+  variable_del('userpoints_nodelimit_nodepoints_'. $info->type);
+}
+
+/**
+ * Implementation of hook_node_type_update().
+ */
+function userpoints_nodelimit_node_type_update($info) {
+  if (!empty($info->old_type) && $info->old_type != $info->type) {
+    variable_set('userpoints_nodelimit_'. $info->type, userpoints_nodelimit_get_setting($info->old_type));
+    variable_set('userpoints_nodelimit_nodepoints_'. $info->type, variable_get('userpoints_nodelimit_nodepoints_'. $info->old_type, ''));
+    variable_del('userpoints_nodelimit_'. $info->old_type);
+    variable_del('userpoints_nodelimit_nodepoints_'. $info->old_type);
   }
 }
 
@@ -142,7 +147,6 @@ function userpoints_nodelimit_node_type(
  */
 function userpoints_nodelimit_check($nodetype) {
   global $user;
-
   $current_points = userpoints_get_current_points($user->uid);
   $node_points = variable_get('userpoints_nodelimit_nodepoints_'. $nodetype, 0);
   if ($current_points >= $node_points) {
@@ -156,10 +160,10 @@ function userpoints_nodelimit_check($nod
 /**
  * Implementation of hook_theme()
  */
-
 function userpoints_nodelimit_theme($existing, $type, $theme, $path) {
   return array(
     'userpoints_nodelimit_insufficent_points_message' => array(
-      'arguments' => array('node_type' => NULL, 'friendly_name' => NULL),
-      ));
+      'variables' => array('node_type' => NULL, 'friendly_name' => NULL),
+    )
+  );
 }
\ No newline at end of file