--- cck_fieldgroup_tabs.module	2008-09-29 16:46:50.000000000 -0400
+++ cck_fieldgroup_tabs.module.new	2009-05-08 16:25:16.000000000 -0400
@@ -60,6 +60,18 @@ function cck_fieldgroup_tabs_admin_setti
     '#description' => t('Enter a weight for the "Basics" tab.'),
     '#default_value' => variable_get('cck_fieldset_tabs_residual_weight', -20),
   );
+  
+  $form['cck_fieldset_statuses'] = array('#type' => 'fieldset', '#title' => t('Node Types to Use Tabs'));
+  foreach (node_get_types() as $type => $object) {
+  	$status_checkboxes[$type] = t('@type', array('@type' => $object->name));
+  }
+  
+	$form['cck_fieldset_statuses']['cck_fieldset_tabs_statuses'] = array(
+	  '#type' => 'checkboxes',
+	  '#options' => $status_checkboxes,
+	  '#default_value' => variable_get('cck_fieldset_tabs_statuses', array()),
+	);
+  
   $form['cck_fieldset_titles'] = array('#type' => 'fieldset', '#title' => t('Basics Tab Titles'));
   foreach (node_get_types() as $type => $object) {
     $form['cck_fieldset_titles']['cck_fieldset_tabs_residual_title_'.$type] = array(
@@ -77,6 +89,8 @@ function cck_fieldgroup_tabs_admin_setti
  * Implementation of hook_form_alter()
  */
 function cck_fieldgroup_tabs_form_alter(&$form, $form_state, $form_id) {
+	if (!cck_fieldgroup_tabs_enabled($form['type']['#value'])) { return; }
+
   if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
     foreach (fieldgroup_groups($form['type']['#value']) as $group_name => $group) {
       if (isset($form[$group_name]) && $group['settings']['form']['style'] == 'tabs' && (!isset($form[$group_name]['#access']) || $form[$group_name]['#access'])) {
@@ -144,6 +158,9 @@ function cck_fieldgroup_tabs_form_alter(
 }
 
 function cck_fieldgroup_tabs_nodeapi(&$node, $op, $teaser, $page) {
+
+	if (!cck_fieldgroup_tabs_enabled($node->type)) { return; }
+
   switch ($op) {
     case 'view':
       $context = $teaser ? 'teaser' : 'full';
@@ -206,3 +223,11 @@ function cck_fieldgroup_tabs_prerender_e
   }
   return $elements;
 }
+
+/*
+ * Check if tabs are enabled for this node type 
+ */
+function cck_fieldgroup_tabs_enabled($node_type) {
+	$enabled = variable_get('cck_fieldset_tabs_statuses', array());
+  return (@$enabled[$node_type]) ? true : false; 
+}